Merge pull request #134 from alexislefebvre/use-stricter-rules-for-ph…

…p-cs-fixer Use stricter rules for PHP-CS-Fixer
liip · Jun 21, 2021 · da7a451 · da7a451
2 parents 160f4a2 + e2b7bef
commit da7a451
Show file tree

Hide file tree

Showing 24 changed files with 91 additions and 47 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,7 +10,7 @@ jobs:
       - name: PHP-CS-Fixer
         uses: docker://jakzal/phpqa:1.58.7-php7.4-alpine
         with:
-          args: php-cs-fixer --dry-run --diff --no-interaction --ansi --rules=@PhpCsFixer fix
+          args: php-cs-fixer --dry-run --diff --no-interaction --ansi fix
 
   tests:
     name: Symfony ${{ matrix.symfony-version }} on PHP ${{ matrix.php-version }} flags ${{ matrix.composer-flags }}

diff --git a/src/DependencyInjection/LiipTestFixturesExtension.php b/src/DependencyInjection/LiipTestFixturesExtension.php
@@ -37,7 +37,7 @@ public function load(array $configs, ContainerBuilder $container): void
             // "liip_test_fixtures.cache_db.mysql"
             // instead of an array "liip_test_fixtures.cache_db"
             // with a "mysql" key.
-            if (is_array($value)) {
+            if (\is_array($value)) {
                 foreach ($value as $key2 => $value2) {
                     $container->setParameter($this->getAlias().'.'.$key.
                         '.'.$key2, $value2);

diff --git a/src/LiipTestFixturesEvents.php b/src/LiipTestFixturesEvents.php
@@ -21,17 +21,17 @@
 final class LiipTestFixturesEvents
 {
     /** @see PreFixtureBackupRestoreEvent */
-    const PRE_FIXTURE_BACKUP_RESTORE = 'liip_test_fixtures.pre_fixture_backup_restore';
+    public const PRE_FIXTURE_BACKUP_RESTORE = 'liip_test_fixtures.pre_fixture_backup_restore';
 
     /** @see FixtureEvent */
-    const POST_FIXTURE_SETUP = 'liip_test_fixtures.post_fixture_setup';
+    public const POST_FIXTURE_SETUP = 'liip_test_fixtures.post_fixture_setup';
 
     /** @see PostFixtureBackupRestoreEvent */
-    const POST_FIXTURE_BACKUP_RESTORE = 'liip_test_fixtures.post_fixture_backup_restore';
+    public const POST_FIXTURE_BACKUP_RESTORE = 'liip_test_fixtures.post_fixture_backup_restore';
 
     /** @see ReferenceSaveEvent */
-    const PRE_REFERENCE_SAVE = 'liip_test_fixtures.pre_reference_save';
+    public const PRE_REFERENCE_SAVE = 'liip_test_fixtures.pre_reference_save';
 
     /** @see ReferenceSaveEvent */
-    const POST_REFERENCE_SAVE = 'liip_test_fixtures.post_reference_save';
+    public const POST_REFERENCE_SAVE = 'liip_test_fixtures.post_reference_save';
 }
diff --git a/src/Services/DatabaseBackup/AbstractDatabaseBackup.php b/src/Services/DatabaseBackup/AbstractDatabaseBackup.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *
@@ -65,7 +67,7 @@ public function init(array $metadatas, array $classNames, bool $append = false):
      */
     protected function isBackupUpToDate(string $backup): bool
     {
-        $backupLastModifiedDateTime = DateTime::createFromFormat('U', filemtime($backup));
+        $backupLastModifiedDateTime = DateTime::createFromFormat('U', (string) filemtime($backup));
 
         $loader = $this->fixturesLoaderFactory->getFixtureLoader($this->classNames);
 

diff --git a/src/Services/DatabaseBackup/DatabaseBackupInterface.php b/src/Services/DatabaseBackup/DatabaseBackupInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *

diff --git a/src/Services/DatabaseBackup/MongodbDatabaseBackup.php b/src/Services/DatabaseBackup/MongodbDatabaseBackup.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *

diff --git a/src/Services/DatabaseBackup/MysqlDatabaseBackup.php b/src/Services/DatabaseBackup/MysqlDatabaseBackup.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *
@@ -53,14 +55,14 @@ public function backup(AbstractExecutor $executor): void
             $params = $params['master'];
         }
 
-        $dbName = isset($params['dbname']) ? $params['dbname'] : '';
-        $dbHost = isset($params['host']) ? $params['host'] : '';
+        $dbName = $params['dbname'] ?? '';
+        $dbHost = $params['host'] ?? '';
 
         // Define parameter only if there's a value, to avoid warning from mysqldump:
         // mysqldump: [Warning] mysqldump: Empty value for 'port' specified. Will throw an error in future versions
         $port = isset($params['port']) && $params['port'] ? '--port='.$params['port'] : '';
 
-        $dbUser = isset($params['user']) ? $params['user'] : '';
+        $dbUser = $params['user'] ?? '';
         // Set password through environment variable to remove warning
         $dbPass = isset($params['password']) && $params['password'] ? 'MYSQL_PWD='.$params['password'].' ' : '';
 
@@ -82,7 +84,7 @@ public function restore(AbstractExecutor $executor, array $excludedTables = []):
         foreach ($this->metadatas as $classMetadata) {
             $tableName = $classMetadata->table['name'];
 
-            if (!in_array($tableName, $excludedTables)) {
+            if (!\in_array($tableName, $excludedTables, true)) {
                 $truncateSql[] = 'DELETE FROM '.$tableName; // in small tables it's really faster than truncate
             }
         }
@@ -121,7 +123,7 @@ protected function getReferenceBackup(): string
         return file_get_contents($this->getReferenceBackupFilePath());
     }
 
-    protected function updateSchemaIfNeed(EntityManager $em)
+    protected function updateSchemaIfNeed(EntityManager $em): void
     {
         if (!self::$schemaUpdatedFlag) {
             $schemaTool = new SchemaTool($em);

diff --git a/src/Services/DatabaseBackup/SqliteDatabaseBackup.php b/src/Services/DatabaseBackup/SqliteDatabaseBackup.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *

diff --git a/src/Services/DatabaseToolCollection.php b/src/Services/DatabaseToolCollection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *

diff --git a/src/Services/DatabaseTools/AbstractDatabaseTool.php b/src/Services/DatabaseTools/AbstractDatabaseTool.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *
@@ -28,8 +30,8 @@
  */
 abstract class AbstractDatabaseTool
 {
-    const KEEP_DATABASE_AND_SCHEMA_PARAMETER_NAME = 'liip_test_fixtures.keep_database_and_schema';
-    const CACHE_METADATA_PARAMETER_NAME = 'liip_test_fixtures.cache_metadata';
+    public const KEEP_DATABASE_AND_SCHEMA_PARAMETER_NAME = 'liip_test_fixtures.keep_database_and_schema';
+    public const CACHE_METADATA_PARAMETER_NAME = 'liip_test_fixtures.cache_metadata';
 
     protected $container;
 
@@ -44,7 +46,7 @@ abstract class AbstractDatabaseTool
     protected $registry;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     protected $omName;
 
@@ -64,7 +66,7 @@ abstract class AbstractDatabaseTool
     protected $connection;
 
     /**
-     * @var null|int
+     * @var int|null
      */
     protected $purgeMode;
 
@@ -126,15 +128,15 @@ public function getDriverName(): string
         return 'default';
     }
 
-    public function withPurgeMode(int $purgeMode): AbstractDatabaseTool
+    public function withPurgeMode(int $purgeMode): self
     {
         $newTool = clone $this;
         $newTool->setPurgeMode($purgeMode);
 
         return $newTool;
     }
 
-    public function withDatabaseCacheEnabled(bool $databaseCacheEnabled): AbstractDatabaseTool
+    public function withDatabaseCacheEnabled(bool $databaseCacheEnabled): self
     {
         $newTool = clone $this;
         $newTool->setDatabaseCacheEnabled($databaseCacheEnabled);
@@ -158,7 +160,7 @@ public function loadAllFixtures(array $groups = []): ?AbstractExecutor
             $loader = $this->container->get('test.service_container')->get('doctrine.fixtures.loader');
             $fixtures = $loader->getFixtures($groups);
             foreach ($fixtures as $fixture) {
-                $fixtureClasses[] = get_class($fixture);
+                $fixtureClasses[] = \get_class($fixture);
             }
         }
 
@@ -199,7 +201,7 @@ protected function getBackupService(): ?DatabaseBackupInterface
 
         if ($this->container->hasParameter($backupServiceParamName)) {
             $backupServiceName = $this->container->getParameter($backupServiceParamName);
-            if (is_string($backupServiceName) && $this->container->has($backupServiceName)) {
+            if (\is_string($backupServiceName) && $this->container->has($backupServiceName)) {
                 $backupService = $this->container->get($backupServiceName);
             } else {
                 @trigger_error("Could not find {$backupServiceName} in container. Possible misconfiguration.");

diff --git a/src/Services/DatabaseTools/MongoDBDatabaseTool.php b/src/Services/DatabaseTools/MongoDBDatabaseTool.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *

diff --git a/src/Services/DatabaseTools/ORMDatabaseTool.php b/src/Services/DatabaseTools/ORMDatabaseTool.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *
@@ -88,7 +90,7 @@ public function loadFixtures(array $classNames = [], bool $append = false): Abst
         // TODO: handle case when using persistent connections. Fail loudly?
         if (false === $this->getKeepDatabaseAndSchemaParameter()) {
             $schemaTool = new SchemaTool($this->om);
-            if (count($this->excludedDoctrineTables) > 0 || true === $append) {
+            if (\count($this->excludedDoctrineTables) > 0 || true === $append) {
                 if (!empty($this->getMetadatas())) {
                     $schemaTool->updateSchema($this->getMetadatas());
                 }
@@ -148,7 +150,7 @@ protected function createDatabaseIfNotExists(): void
         if (isset($params['master'])) {
             $params = $params['master'];
         }
-        $dbName = isset($params['dbname']) ? $params['dbname'] : '';
+        $dbName = $params['dbname'] ?? '';
 
         unset($params['dbname'], $params['url']);
 
@@ -158,7 +160,7 @@ protected function createDatabaseIfNotExists(): void
         $tmpConnection = DriverManager::getConnection($params);
         $tmpConnection->connect();
 
-        if (!in_array($dbName, $tmpConnection->getSchemaManager()->listDatabases())) {
+        if (!\in_array($dbName, $tmpConnection->getSchemaManager()->listDatabases(), true)) {
             $tmpConnection->getSchemaManager()->createDatabase($dbName);
         }
 

diff --git a/src/Services/DatabaseTools/ORMSqliteDatabaseTool.php b/src/Services/DatabaseTools/ORMSqliteDatabaseTool.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *

diff --git a/src/Services/DatabaseTools/PHPCRDatabaseTool.php b/src/Services/DatabaseTools/PHPCRDatabaseTool.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *

diff --git a/src/Services/FixturesLoaderFactory.php b/src/Services/FixturesLoaderFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Liip/TestFixturesBundle
  *

diff --git a/src/Services/SymfonyFixturesLoaderWrapper.php b/src/Services/SymfonyFixturesLoaderWrapper.php
@@ -1,5 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * This file is part of the Liip/TestFixturesBundle
+ *
+ * (c) Lukas Kahwe Smith <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 namespace Liip\TestFixturesBundle\Services;
 
 use Doctrine\Bundle\FixturesBundle\Loader\SymfonyFixturesLoader;
@@ -14,7 +25,7 @@ public function __construct(SymfonyFixturesLoader $symfonyFixturesLoader)
         $this->symfonyFixturesLoader = $symfonyFixturesLoader;
     }
 
-    public function loadFixturesClass($className)
+    public function loadFixturesClass($className): void
     {
         $this->addFixture($this->symfonyFixturesLoader->getFixture($className));
     }

diff --git a/tests/AppConfigEvents/EventListener/FixturesSubscriber.php b/tests/AppConfigEvents/EventListener/FixturesSubscriber.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of the Liip/TestFixturesBundle
+ *
+ * (c) Lukas Kahwe Smith <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 namespace Liip\Acme\Tests\AppConfigEvents\EventListener;
 
 use Liip\TestFixturesBundle\Event\FixtureEvent;

diff --git a/tests/AppConfigPhpcr/DataFixtures/PHPCR/LoadTaskData.php b/tests/AppConfigPhpcr/DataFixtures/PHPCR/LoadTaskData.php
@@ -25,7 +25,7 @@ class LoadTaskData implements FixtureInterface
     public function load(ObjectManager $manager): void
     {
         if (!$manager instanceof DocumentManager) {
-            $class = get_class($manager);
+            $class = \get_class($manager);
 
             throw new RuntimeException("Fixture requires a PHPCR ODM DocumentManager instance, instance of '{$class}' given.");
         }

diff --git a/tests/Test/ConfigEventsTest.php b/tests/Test/ConfigEventsTest.php
@@ -37,7 +37,7 @@
  */
 class ConfigEventsTest extends KernelTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/Test/ConfigMysqlTest.php b/tests/Test/ConfigMysqlTest.php
@@ -58,7 +58,7 @@ class ConfigMysqlTest extends KernelTestCase
     /** @var AbstractDatabaseTool */
     protected $databaseTool;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -71,7 +71,7 @@ public function setUp(): void
         $this->databaseTool = self::$container->get(DatabaseToolCollection::class)->get();
     }
 
-    public function testToolType()
+    public function testToolType(): void
     {
         $this->assertInstanceOf(ORMDatabaseTool::class, $this->databaseTool);
     }
@@ -219,7 +219,7 @@ public function testLoadFixturesAndExcludeFromPurge(): void
         // Check that there are 2 users.
         $this->assertSame(
             2,
-            count($this->userRepository->findAll())
+            \count($this->userRepository->findAll())
         );
 
         $this->databaseTool->setExcludedDoctrineTables(['liip_user']);
@@ -231,7 +231,7 @@ public function testLoadFixturesAndExcludeFromPurge(): void
         // The exclusion from purge worked, the user table is still alive and well.
         $this->assertSame(
             2,
-            count($this->userRepository->findAll())
+            \count($this->userRepository->findAll())
         );
     }
 
@@ -296,7 +296,7 @@ public function testLoadFixturesAndPurge(): void
         // The purge worked: there is no user.
         $this->assertSame(
             0,
-            count($this->userRepository->findAll())
+            \count($this->userRepository->findAll())
         );
     }
 
@@ -323,7 +323,7 @@ public function testLoadFixturesFiles(): void
 
         $this->assertSame(
             10,
-            count($users)
+            \count($users)
         );
 
         /** @var User $user */

diff --git a/tests/Test/ConfigPgsqlTest.php b/tests/Test/ConfigPgsqlTest.php
@@ -38,7 +38,7 @@
  */
 class ConfigPgsqlTest extends ConfigMysqlTest
 {
-    public function testToolType()
+    public function testToolType(): void
     {
         $this->assertInstanceOf(ORMDatabaseTool::class, $this->databaseTool);
     }