abterphp / admin

tests/Databases/Queries/UserAuthLoaderTest.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
         $username            = 'foo';
         $userGroupIdentifier = 'bar';
 
-        $sql0          = 'SELECT u.username AS v0, ug.identifier AS v1 FROM users AS u INNER JOIN users_user_groups AS uug ON uug.user_id = u.id AND uug.deleted_at IS NULL INNER JOIN user_groups AS ug ON uug.user_group_id = ug.id AND ug.deleted_at IS NULL WHERE (u.deleted_at IS NULL)'; // phpcs:ignore
+        $sql0 = 'SELECT u.username AS v0, ug.identifier AS v1 FROM users AS u INNER JOIN users_user_groups AS uug ON uug.user_id = u.id AND uug.deleted_at IS NULL INNER JOIN user_groups AS ug ON uug.user_group_id = ug.id AND ug.deleted_at IS NULL WHERE (u.deleted_at IS NULL)'; // phpcs:ignore
         $valuesToBind = [];
         $returnValues = [
             [
@@ -33,7 +33,7 @@ 
                 'v1' => $userGroupIdentifier,
             ],
         ];
-        $statement0    = MockStatementFactory::createReadStatement($this, $valuesToBind, $returnValues);
+        $statement0 = MockStatementFactory::createReadStatement($this, $valuesToBind, $returnValues);
 
         $this->readConnectionMock
             ->expects($this->exactly(1))

tests/Databases/Queries/BlockCacheTest.php

Spacing +8 added lines, -8 removed lines

@@ -25,15 +25,15 @@ 
         $identifiers = ['foo', 'bar'];
         $cacheTime   = 'baz';
 
-        $sql0          = 'SELECT COUNT(*) AS count FROM blocks LEFT JOIN block_layouts AS layouts ON layouts.id = blocks.layout_id WHERE (blocks.deleted_at IS NULL) AND (blocks.identifier IN (?,?)) AND (blocks.updated_at > ? OR layouts.updated_at > ?)'; // phpcs:ignore
+        $sql0 = 'SELECT COUNT(*) AS count FROM blocks LEFT JOIN block_layouts AS layouts ON layouts.id = blocks.layout_id WHERE (blocks.deleted_at IS NULL) AND (blocks.identifier IN (?,?)) AND (blocks.updated_at > ? OR layouts.updated_at > ?)'; // phpcs:ignore
         $valuesToBind = [
             [$identifiers[0], \PDO::PARAM_STR],
             [$identifiers[1], \PDO::PARAM_STR],
             [$cacheTime, \PDO::PARAM_STR],
             [$cacheTime, \PDO::PARAM_STR],
         ];
-        $returnValue  = '0';
-        $statement0    = MockStatementFactory::createReadColumnStatement($this, $valuesToBind, $returnValue);
+        $returnValue = '0';
+        $statement0 = MockStatementFactory::createReadColumnStatement($this, $valuesToBind, $returnValue);
 
         $this->readConnectionMock
             ->expects($this->once())
@@ -51,15 +51,15 @@ 
         $identifiers = ['foo', 'bar'];
         $cacheTime   = 'baz';
 
-        $sql0          = 'SELECT COUNT(*) AS count FROM blocks LEFT JOIN block_layouts AS layouts ON layouts.id = blocks.layout_id WHERE (blocks.deleted_at IS NULL) AND (blocks.identifier IN (?,?)) AND (blocks.updated_at > ? OR layouts.updated_at > ?)'; // phpcs:ignore
+        $sql0 = 'SELECT COUNT(*) AS count FROM blocks LEFT JOIN block_layouts AS layouts ON layouts.id = blocks.layout_id WHERE (blocks.deleted_at IS NULL) AND (blocks.identifier IN (?,?)) AND (blocks.updated_at > ? OR layouts.updated_at > ?)'; // phpcs:ignore
         $valuesToBind = [
             [$identifiers[0], \PDO::PARAM_STR],
             [$identifiers[1], \PDO::PARAM_STR],
             [$cacheTime, \PDO::PARAM_STR],
             [$cacheTime, \PDO::PARAM_STR],
         ];
-        $returnValue  = '2';
-        $statement0    = MockStatementFactory::createReadColumnStatement($this, $valuesToBind, $returnValue);
+        $returnValue = '2';
+        $statement0 = MockStatementFactory::createReadColumnStatement($this, $valuesToBind, $returnValue);
 
         $this->readConnectionMock
             ->expects($this->once())
@@ -81,14 +81,14 @@ 
         $this->expectException(Database::class);
         $this->expectExceptionCode($errorInfo[1]);
 
-        $sql0          = 'SELECT COUNT(*) AS count FROM blocks LEFT JOIN block_layouts AS layouts ON layouts.id = blocks.layout_id WHERE (blocks.deleted_at IS NULL) AND (blocks.identifier IN (?,?)) AND (blocks.updated_at > ? OR layouts.updated_at > ?)'; // phpcs:ignore
+        $sql0 = 'SELECT COUNT(*) AS count FROM blocks LEFT JOIN block_layouts AS layouts ON layouts.id = blocks.layout_id WHERE (blocks.deleted_at IS NULL) AND (blocks.identifier IN (?,?)) AND (blocks.updated_at > ? OR layouts.updated_at > ?)'; // phpcs:ignore
         $valuesToBind = [
             [$identifiers[0], \PDO::PARAM_STR],
             [$identifiers[1], \PDO::PARAM_STR],
             [$cacheTime, \PDO::PARAM_STR],
             [$cacheTime, \PDO::PARAM_STR],
         ];
-        $statement0    = MockStatementFactory::createErrorStatement($this, $valuesToBind, $errorInfo);
+        $statement0 = MockStatementFactory::createErrorStatement($this, $valuesToBind, $errorInfo);
 
         $this->readConnectionMock
             ->expects($this->once())

tests/Databases/Queries/LoginThrottleTest.php

Spacing +12 added lines, -12 removed lines

@@ -26,13 +26,13 @@ 
         $username        = 'bar';
         $maxFailureCount = 11;
 
-        $sql0          = 'SELECT COUNT(*) AS count FROM login_attempts AS la WHERE (la.ip_hash = ? OR la.username = ?) AND (la.created_at > NOW() - INTERVAL 1 HOUR)'; // phpcs:ignore
+        $sql0 = 'SELECT COUNT(*) AS count FROM login_attempts AS la WHERE (la.ip_hash = ? OR la.username = ?) AND (la.created_at > NOW() - INTERVAL 1 HOUR)'; // phpcs:ignore
         $valuesToBind = [
             [$ipHash, \PDO::PARAM_STR],
             [$username, \PDO::PARAM_STR],
         ];
-        $returnValue  = 2;
-        $statement0    = MockStatementFactory::createReadColumnStatement($this, $valuesToBind, $returnValue);
+        $returnValue = 2;
+        $statement0 = MockStatementFactory::createReadColumnStatement($this, $valuesToBind, $returnValue);
 
         $this->readConnectionMock
             ->expects($this->once())
@@ -51,13 +51,13 @@ 
         $username        = 'bar';
         $maxFailureCount = 11;
 
-        $sql0          = 'SELECT COUNT(*) AS count FROM login_attempts AS la WHERE (la.ip_hash = ? OR la.username = ?) AND (la.created_at > NOW() - INTERVAL 1 HOUR)'; // phpcs:ignore
+        $sql0 = 'SELECT COUNT(*) AS count FROM login_attempts AS la WHERE (la.ip_hash = ? OR la.username = ?) AND (la.created_at > NOW() - INTERVAL 1 HOUR)'; // phpcs:ignore
         $valuesToBind = [
             [$ipHash, \PDO::PARAM_STR],
             [$username, \PDO::PARAM_STR],
         ];
-        $returnValue  = 14;
-        $statement0    = MockStatementFactory::createReadColumnStatement($this, $valuesToBind, $returnValue);
+        $returnValue = 14;
+        $statement0 = MockStatementFactory::createReadColumnStatement($this, $valuesToBind, $returnValue);
 
         $this->readConnectionMock
             ->expects($this->exactly(1))
@@ -81,12 +81,12 @@ 
         $username        = 'bar';
         $maxFailureCount = 11;
 
-        $sql0          = 'SELECT COUNT(*) AS count FROM login_attempts AS la WHERE (la.ip_hash = ? OR la.username = ?) AND (la.created_at > NOW() - INTERVAL 1 HOUR)'; // phpcs:ignore
+        $sql0 = 'SELECT COUNT(*) AS count FROM login_attempts AS la WHERE (la.ip_hash = ? OR la.username = ?) AND (la.created_at > NOW() - INTERVAL 1 HOUR)'; // phpcs:ignore
         $valuesToBind = [
             [$ipHash, \PDO::PARAM_STR],
             [$username, \PDO::PARAM_STR],
         ];
-        $statement0    = MockStatementFactory::createErrorStatement($this, $valuesToBind, $errorInfo);
+        $statement0 = MockStatementFactory::createErrorStatement($this, $valuesToBind, $errorInfo);
 
         $this->readConnectionMock
             ->expects($this->exactly(1))
@@ -102,12 +102,12 @@ 
         $ipHash   = 'foo';
         $username = 'bar';
 
-        $sql0          = 'DELETE FROM login_attempts WHERE (login_attempts.ip_hash = ?) AND (login_attempts.username = ?) AND (login_attempts.created_at > NOW() - INTERVAL 1 HOUR)'; // phpcs:ignore
+        $sql0 = 'DELETE FROM login_attempts WHERE (login_attempts.ip_hash = ?) AND (login_attempts.username = ?) AND (login_attempts.created_at > NOW() - INTERVAL 1 HOUR)'; // phpcs:ignore
         $valuesToBind = [
             [$ipHash, \PDO::PARAM_STR],
             [$username, \PDO::PARAM_STR],
         ];
-        $statement0    = MockStatementFactory::createWriteStatement($this, $valuesToBind);
+        $statement0 = MockStatementFactory::createWriteStatement($this, $valuesToBind);
 
         $this->writeConnectionMock
             ->expects($this->exactly(1))
@@ -128,12 +128,12 @@ 
         $ipHash   = 'foo';
         $username = 'bar';
 
-        $sql0          = 'DELETE FROM login_attempts WHERE (login_attempts.ip_hash = ?) AND (login_attempts.username = ?) AND (login_attempts.created_at > NOW() - INTERVAL 1 HOUR)'; // phpcs:ignore
+        $sql0 = 'DELETE FROM login_attempts WHERE (login_attempts.ip_hash = ?) AND (login_attempts.username = ?) AND (login_attempts.created_at > NOW() - INTERVAL 1 HOUR)'; // phpcs:ignore
         $valuesToBind = [
             [$ipHash, \PDO::PARAM_STR],
             [$username, \PDO::PARAM_STR],
         ];
-        $statement0    = MockStatementFactory::createErrorStatement($this, $valuesToBind, $errorInfo);
+        $statement0 = MockStatementFactory::createErrorStatement($this, $valuesToBind, $errorInfo);
 
         $this->writeConnectionMock
             ->expects($this->exactly(1))

tests/Databases/Queries/AdminResourceAuthLoaderTest.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
                 'v1' => $adminResourceIdentifier,
             ],
         ];
-        $statement0   = MockStatementFactory::createReadStatement($this, $valuesToBind, $returnValues);
+        $statement0 = MockStatementFactory::createReadStatement($this, $valuesToBind, $returnValues);
 
         $this->readConnectionMock
             ->expects($this->once())

tests/Orm/DataMappers/UserSqlDataMapperTest.php

Spacing +12 added lines, -12 removed lines

@@ -36,8 +36,8 @@ 
         $canLogin          = true;
         $isGravatarAllowed = true;
 
-        $sql0       = 'INSERT INTO users (id, username, email, password, user_language_id, can_login, is_gravatar_allowed) VALUES (?, ?, ?, ?, ?, ?, ?)'; // phpcs:ignore
-        $values    = [
+        $sql0 = 'INSERT INTO users (id, username, email, password, user_language_id, can_login, is_gravatar_allowed) VALUES (?, ?, ?, ?, ?, ?, ?)'; // phpcs:ignore
+        $values = [
             [$nextId, \PDO::PARAM_STR],
             [$username, \PDO::PARAM_STR],
             [$email, \PDO::PARAM_STR],
@@ -169,7 +169,7 @@ 
         $canLogin          = true;
         $isGravatarAllowed = true;
 
-        $sql0          = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) GROUP BY users.id'; // phpcs:ignore
+        $sql0 = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) GROUP BY users.id'; // phpcs:ignore
         $values       = [];
         $expectedData = [
             [
@@ -209,7 +209,7 @@ 
         $userGroupIdentifiers = 'ug-1,ug-2';
         $userGroupNames       = 'UG #1,UG #2';
 
-        $sql0          = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) GROUP BY users.id'; // phpcs:ignore
+        $sql0 = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) GROUP BY users.id'; // phpcs:ignore
         $values       = [];
         $expectedData = [
             [
@@ -249,7 +249,7 @@ 
         $canLogin          = true;
         $isGravatarAllowed = true;
 
-        $sql0          = 'SELECT SQL_CALC_FOUND_ROWS users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) GROUP BY users.id ORDER BY username ASC LIMIT 10 OFFSET 0'; // phpcs:ignore
+        $sql0 = 'SELECT SQL_CALC_FOUND_ROWS users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) GROUP BY users.id ORDER BY username ASC LIMIT 10 OFFSET 0'; // phpcs:ignore
         $values       = [];
         $expectedData = [
             [
@@ -289,7 +289,7 @@ 
         $orders     = ['ac.description ASC'];
         $conditions = ['ac.description LIKE \'abc%\'', 'abc.description LIKE \'%bca\''];
 
-        $sql0          = 'SELECT SQL_CALC_FOUND_ROWS users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND (ac.description LIKE \'abc%\') AND (abc.description LIKE \'%bca\') GROUP BY users.id ORDER BY ac.description ASC LIMIT 10 OFFSET 0'; // phpcs:ignore
+        $sql0 = 'SELECT SQL_CALC_FOUND_ROWS users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND (ac.description LIKE \'abc%\') AND (abc.description LIKE \'%bca\') GROUP BY users.id ORDER BY ac.description ASC LIMIT 10 OFFSET 0'; // phpcs:ignore
         $values       = [];
         $expectedData = [
             [
@@ -326,7 +326,7 @@ 
         $canLogin          = true;
         $isGravatarAllowed = true;
 
-        $sql0          = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND (users.id = :user_id) GROUP BY users.id'; // phpcs:ignore
+        $sql0 = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND (users.id = :user_id) GROUP BY users.id'; // phpcs:ignore
         $values       = ['user_id' => [$id, \PDO::PARAM_STR]];
         $expectedData = [
             [
@@ -363,7 +363,7 @@ 
         $canLogin          = true;
         $isGravatarAllowed = true;
 
-        $sql0          = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND (`username` = :username) GROUP BY users.id'; // phpcs:ignore
+        $sql0 = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND (`username` = :username) GROUP BY users.id'; // phpcs:ignore
         $values       = ['username' => [$username, \PDO::PARAM_STR]];
         $expectedData = [
             [
@@ -400,7 +400,7 @@ 
         $canLogin          = true;
         $isGravatarAllowed = true;
 
-        $sql0          = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND (email = :email) GROUP BY users.id'; // phpcs:ignore
+        $sql0 = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND (email = :email) GROUP BY users.id'; // phpcs:ignore
         $values       = ['email' => [$email, \PDO::PARAM_STR]];
         $expectedData = [
             [
@@ -437,7 +437,7 @@ 
         $canLogin          = true;
         $isGravatarAllowed = true;
 
-        $sql0          = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND ((username = :identifier OR email = :identifier)) GROUP BY users.id'; // phpcs:ignore
+        $sql0 = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND ((username = :identifier OR email = :identifier)) GROUP BY users.id'; // phpcs:ignore
         $values       = ['identifier' => [$username, \PDO::PARAM_STR]];
         $expectedData = [
             [
@@ -474,7 +474,7 @@ 
         $canLogin          = true;
         $isGravatarAllowed = true;
 
-        $sql0          = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND ((username = :identifier OR email = :identifier)) GROUP BY users.id'; // phpcs:ignore
+        $sql0 = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND ((username = :identifier OR email = :identifier)) GROUP BY users.id'; // phpcs:ignore
         $values       = ['identifier' => [$email, \PDO::PARAM_STR]];
         $expectedData = [
             [
@@ -512,7 +512,7 @@ 
         $isGravatarAllowed = true;
         $clientId          = '063b730f-3458-49dc-b60e-8171cefacabf';
 
-        $sql0          = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL INNER JOIN api_clients AS ac ON ac.user_id = users.id AND ac.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND (ac.id = :client_id) GROUP BY users.id'; // phpcs:ignore
+        $sql0 = 'SELECT users.id, users.username, users.email, users.password, users.user_language_id, ul.identifier AS user_language_identifier, users.can_login, users.is_gravatar_allowed, GROUP_CONCAT(ug.id) AS user_group_ids, GROUP_CONCAT(ug.identifier) AS user_group_identifiers, GROUP_CONCAT(ug.name) AS user_group_names FROM users INNER JOIN user_languages AS ul ON ul.id = users.user_language_id AND ul.deleted_at IS NULL INNER JOIN api_clients AS ac ON ac.user_id = users.id AND ac.deleted_at IS NULL LEFT JOIN users_user_groups AS uug ON uug.user_id = users.id AND uug.deleted_at IS NULL LEFT JOIN user_groups AS ug ON ug.id = uug.user_group_id AND ug.deleted_at IS NULL WHERE (users.deleted_at IS NULL) AND (ac.id = :client_id) GROUP BY users.id'; // phpcs:ignore
         $values       = ['client_id' => [$clientId, \PDO::PARAM_STR]];
         $expectedData = [
             [

tests/Orm/DataMappers/LoginAttemptSqlDataMapperTest.php

Spacing +3 added lines, -3 removed lines

@@ -119,7 +119,7 @@ 
             ['id' => $id0, 'ip_hash' => $ipHash0, 'username' => $username0, 'ip_address' => null],
             ['id' => $id1, 'ip_hash' => $ipHash1, 'username' => $username1, 'ip_address' => $ipAddress1],
         ];
-        $statement0   = MockStatementFactory::createReadStatement($this, $values, $expectedData);
+        $statement0 = MockStatementFactory::createReadStatement($this, $values, $expectedData);
 
         $this->readConnectionMock
             ->expects($this->once(0))
@@ -138,12 +138,12 @@ 
         $ipHash   = 'foo';
         $username = 'Foo';
 
-        $sql0          = 'SELECT login_attempts.id, login_attempts.ip_hash, login_attempts.username, login_attempts.ip_address FROM login_attempts WHERE (login_attempts.id = :login_attempt_id)'; // phpcs:ignore
+        $sql0 = 'SELECT login_attempts.id, login_attempts.ip_hash, login_attempts.username, login_attempts.ip_address FROM login_attempts WHERE (login_attempts.id = :login_attempt_id)'; // phpcs:ignore
         $values       = ['login_attempt_id' => [$id, \PDO::PARAM_STR]];
         $expectedData = [
             ['id' => $id, 'ip_hash' => $ipHash, 'username' => $username, 'ip_address' => null],
         ];
-        $statement0    = MockStatementFactory::createReadStatement($this, $values, $expectedData);
+        $statement0 = MockStatementFactory::createReadStatement($this, $values, $expectedData);
 
         $this->readConnectionMock
             ->expects($this->once())

tests/Orm/DataMappers/UserLanguageSqlDataMapperTest.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
             ['id' => $id0, 'identifier' => $identifier0, 'name' => $name0],
             ['id' => $id1, 'identifier' => $identifier1, 'name' => $name1],
         ];
-        $statement0   = MockStatementFactory::createReadStatement($this, $values, $expectedData);
+        $statement0 = MockStatementFactory::createReadStatement($this, $values, $expectedData);
 
         $this->readConnectionMock
             ->expects($this->once())
@@ -113,7 +113,7 @@ 
             ['id' => $id0, 'identifier' => $identifier0, 'name' => $name0],
             ['id' => $id1, 'identifier' => $identifier1, 'name' => $name1],
         ];
-        $statement0   = MockStatementFactory::createReadStatement($this, $values, $expectedData);
+        $statement0 = MockStatementFactory::createReadStatement($this, $values, $expectedData);
 
         $this->readConnectionMock
             ->expects($this->once())

tests/Orm/DataMappers/TokenSqlDataMapperTest.php

Spacing +3 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
         $expiresAt   = new \DateTimeImmutable();
 
         $sql0       = 'UPDATE tokens AS tokens SET deleted_at = NOW() WHERE (id = ?)'; // phpcs:ignore
-        $values    = [[$id, \PDO::PARAM_STR]];
+        $values = [[$id, \PDO::PARAM_STR]];
         $statement0 = MockStatementFactory::createWriteStatement($this, $values);
 
         $this->writeConnectionMock
@@ -120,7 +120,7 @@ 
             ['id' => $id0, 'api_client_id' => $apiClientId0, 'expires_at' => $expiresAt0, 'revoked_at' => $revokedAt0],
             ['id' => $id1, 'api_client_id' => $apiClientId1, 'expires_at' => $expiresAt1, 'revoked_at' => $revokedAt1],
         ];
-        $statement0   = MockStatementFactory::createReadStatement($this, $values, $expectedData);
+        $statement0 = MockStatementFactory::createReadStatement($this, $values, $expectedData);
 
         $this->readConnectionMock
             ->expects($this->once())
@@ -179,7 +179,7 @@ 
                 'revoked_at'    => $revokedAt,
             ],
         ];
-        $statement0   = MockStatementFactory::createReadStatement($this, $values, $expectedData);
+        $statement0 = MockStatementFactory::createReadStatement($this, $values, $expectedData);
 
         $this->readConnectionMock
             ->expects($this->once())

tests/Orm/DataMappers/UserGroupSqlDataMapperTest.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
         $name       = 'bar';
 
         $sql0       = 'INSERT INTO user_groups (id, identifier, name) VALUES (?, ?, ?)'; // phpcs:ignore
-        $values    = [[$nextId, \PDO::PARAM_STR], [$identifier, \PDO::PARAM_STR], [$name, \PDO::PARAM_STR]];
+        $values = [[$nextId, \PDO::PARAM_STR], [$identifier, \PDO::PARAM_STR], [$name, \PDO::PARAM_STR]];
         $statement0 = MockStatementFactory::createWriteStatement($this, $values);
 
         $this->writeConnectionMock
@@ -123,7 +123,7 @@ 
         $identifier = 'foo';
         $name       = 'bar';
 
-        $sql0          = 'SELECT ug.id, ug.identifier, ug.name, GROUP_CONCAT(ugar.admin_resource_id) AS admin_resource_ids FROM user_groups AS ug LEFT JOIN user_groups_admin_resources AS ugar ON ugar.user_group_id = ug.id WHERE (ug.deleted_at IS NULL) GROUP BY ug.id'; // phpcs:ignore
+        $sql0 = 'SELECT ug.id, ug.identifier, ug.name, GROUP_CONCAT(ugar.admin_resource_id) AS admin_resource_ids FROM user_groups AS ug LEFT JOIN user_groups_admin_resources AS ugar ON ugar.user_group_id = ug.id WHERE (ug.deleted_at IS NULL) GROUP BY ug.id'; // phpcs:ignore
         $values       = [];
         $expectedData = [
             [
@@ -134,7 +134,7 @@ 
                 // phpcs:ignore
             ],
         ];
-        $statement0    = MockStatementFactory::createReadStatement($this, $values, $expectedData);
+        $statement0 = MockStatementFactory::createReadStatement($this, $values, $expectedData);
 
         $this->readConnectionMock
             ->expects($this->once())