diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 5eeb21f9..4e8eed14 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -9,12 +9,14 @@ jobs: steps: - uses: actions/checkout@master + - name: Delete composer files to avoid installing dependencies run: rm -v composer.json + - name: PHP-CS-Fixer - uses: docker://jakzal/phpqa:1.80.0-php7.4-alpine + uses: docker://jakzal/phpqa:1.96.3-php8.2-alpine with: - args: php-cs-fixer --dry-run --diff --no-interaction --ansi fix + args: php-cs-fixer --dry-run --diff --no-interaction --ansi fix --show-progress none composer-validate: name: Composer validate diff --git a/doc/contributing.md b/doc/contributing.md index 35467ad2..9a49cc50 100644 --- a/doc/contributing.md +++ b/doc/contributing.md @@ -23,3 +23,11 @@ Now you can execute the tests with the following command: ```bash docker-compose exec php-fpm ./vendor/bin/phpunit --exclude-group "" ``` + +## Apply changes suggested by PHP-CS-Fixer + +Use it through Docker: + +```bash +docker run --rm -it --volume .:/app --workdir /app jakzal/phpqa:1.96.3-php8.2-alpine php-cs-fixer --diff --no-interaction --ansi fix --show-progress none +``` diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 37c4b346..e3615792 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -21,9 +21,6 @@ */ class Configuration implements ConfigurationInterface { - /** - * {@inheritdoc} - */ public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('liip_test_fixtures'); diff --git a/src/Factory/ConnectionFactory.php b/src/Factory/ConnectionFactory.php index 80740c50..ab183640 100644 --- a/src/Factory/ConnectionFactory.php +++ b/src/Factory/ConnectionFactory.php @@ -27,12 +27,9 @@ class ConnectionFactory extends BaseConnectionFactory /** * Create a connection by name. * - * @param Configuration $config - * @param EventManager $eventManager - * * @return Connection */ - public function createConnection(array $params, Configuration $config = null, EventManager $eventManager = null, array $mappingTypes = []) + public function createConnection(array $params, ?Configuration $config = null, ?EventManager $eventManager = null, array $mappingTypes = []) { return parent::createConnection($params, $config, $eventManager, $mappingTypes); } diff --git a/src/Services/DatabaseToolCollection.php b/src/Services/DatabaseToolCollection.php index efc35838..f72c1a13 100644 --- a/src/Services/DatabaseToolCollection.php +++ b/src/Services/DatabaseToolCollection.php @@ -48,7 +48,7 @@ public function add(AbstractDatabaseTool $databaseTool): void $this->items[$databaseTool->getType()][$databaseTool->getDriverName()] = $databaseTool; } - public function get($omName = null, $registryName = 'doctrine', int $purgeMode = null): AbstractDatabaseTool + public function get($omName = null, $registryName = 'doctrine', ?int $purgeMode = null): AbstractDatabaseTool { /** @var ManagerRegistry $registry */ $registry = $this->container->get($registryName); diff --git a/src/Services/DatabaseTools/AbstractDatabaseTool.php b/src/Services/DatabaseTools/AbstractDatabaseTool.php index bca47e83..495d36a5 100644 --- a/src/Services/DatabaseTools/AbstractDatabaseTool.php +++ b/src/Services/DatabaseTools/AbstractDatabaseTool.php @@ -96,7 +96,7 @@ public function isDatabaseCacheEnabled(): bool return $this->databaseCacheEnabled; } - public function setObjectManagerName(string $omName = null): void + public function setObjectManagerName(?string $omName = null): void { $this->omName = $omName; $this->om = $this->registry->getManager($omName); @@ -107,7 +107,7 @@ public function setRegistryName(string $registryName): void $this->registryName = $registryName; } - public function setPurgeMode(int $purgeMode = null): void + public function setPurgeMode(?int $purgeMode = null): void { $this->purgeMode = $purgeMode; } @@ -151,7 +151,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[] = $fixture::class; } } diff --git a/src/Services/DatabaseTools/AbstractDbalDatabaseTool.php b/src/Services/DatabaseTools/AbstractDbalDatabaseTool.php index 7392f199..30ce62e0 100755 --- a/src/Services/DatabaseTools/AbstractDbalDatabaseTool.php +++ b/src/Services/DatabaseTools/AbstractDbalDatabaseTool.php @@ -22,7 +22,7 @@ abstract class AbstractDbalDatabaseTool extends AbstractDatabaseTool { protected Connection $connection; - public function setObjectManagerName(string $omName = null): void + public function setObjectManagerName(?string $omName = null): void { parent::setObjectManagerName($omName); $this->connection = $this->registry->getConnection($omName); diff --git a/src/Services/DatabaseTools/MongoDBDatabaseTool.php b/src/Services/DatabaseTools/MongoDBDatabaseTool.php index 2c68ab52..9d952920 100644 --- a/src/Services/DatabaseTools/MongoDBDatabaseTool.php +++ b/src/Services/DatabaseTools/MongoDBDatabaseTool.php @@ -101,7 +101,7 @@ public function loadFixtures(array $classNames = [], bool $append = false): Abst return $executor; } - protected function getExecutor(MongoDBPurger $purger = null): MongoDBExecutor + protected function getExecutor(?MongoDBPurger $purger = null): MongoDBExecutor { return new MongoDBExecutor($this->om, $purger); } diff --git a/src/Services/DatabaseTools/ORMDatabaseTool.php b/src/Services/DatabaseTools/ORMDatabaseTool.php index 7026133c..60c26b6c 100644 --- a/src/Services/DatabaseTools/ORMDatabaseTool.php +++ b/src/Services/DatabaseTools/ORMDatabaseTool.php @@ -141,7 +141,7 @@ public function loadFixtures(array $classNames = [], bool $append = false): Abst return $executor; } - protected function getExecutor(ORMPurger $purger = null): ORMExecutor + protected function getExecutor(?ORMPurger $purger = null): ORMExecutor { return new ORMExecutor($this->om, $purger); } diff --git a/src/Services/FixturesLoaderFactory.php b/src/Services/FixturesLoaderFactory.php index d3afc18f..062e83cd 100644 --- a/src/Services/FixturesLoaderFactory.php +++ b/src/Services/FixturesLoaderFactory.php @@ -27,7 +27,7 @@ final class FixturesLoaderFactory implements FixturesLoaderFactoryInterface private ?SymfonyFixturesLoader $loader; - public function __construct(ContainerInterface $container, SymfonyFixturesLoader $loader = null) + public function __construct(ContainerInterface $container, ?SymfonyFixturesLoader $loader = null) { $this->container = $container; $this->loader = $loader; diff --git a/src/Services/MongoDBFixturesLoaderFactory.php b/src/Services/MongoDBFixturesLoaderFactory.php index 936840b7..546ee791 100755 --- a/src/Services/MongoDBFixturesLoaderFactory.php +++ b/src/Services/MongoDBFixturesLoaderFactory.php @@ -24,7 +24,7 @@ class MongoDBFixturesLoaderFactory implements FixturesLoaderFactoryInterface private ?SymfonyFixturesLoader $loader; - public function __construct(ContainerInterface $container, SymfonyFixturesLoader $loader = null) + public function __construct(ContainerInterface $container, ?SymfonyFixturesLoader $loader = null) { $this->container = $container; $this->loader = $loader; diff --git a/tests/App/DataFixtures/ORM/LoadDependentUserData.php b/tests/App/DataFixtures/ORM/LoadDependentUserData.php index 51063412..c866cd76 100644 --- a/tests/App/DataFixtures/ORM/LoadDependentUserData.php +++ b/tests/App/DataFixtures/ORM/LoadDependentUserData.php @@ -20,9 +20,6 @@ class LoadDependentUserData extends AbstractFixture implements DependentFixtureInterface { - /** - * {@inheritdoc} - */ public function load(ObjectManager $manager): void { /** @var User $user */ @@ -41,9 +38,6 @@ public function load(ObjectManager $manager): void $manager->flush(); } - /** - * {@inheritdoc} - */ public function getDependencies(): array { return [ diff --git a/tests/App/DataFixtures/ORM/LoadDependentUserWithServiceData.php b/tests/App/DataFixtures/ORM/LoadDependentUserWithServiceData.php index 003198b0..a0e36061 100644 --- a/tests/App/DataFixtures/ORM/LoadDependentUserWithServiceData.php +++ b/tests/App/DataFixtures/ORM/LoadDependentUserWithServiceData.php @@ -29,9 +29,6 @@ public function __construct(DummyService $dummyService) $this->dummyService = $dummyService; } - /** - * {@inheritdoc} - */ public function load(ObjectManager $manager): void { /** @var User $user */ @@ -51,9 +48,6 @@ public function load(ObjectManager $manager): void $manager->flush(); } - /** - * {@inheritdoc} - */ public function getDependencies(): array { return [ diff --git a/tests/App/DataFixtures/ORM/LoadSecondUserData.php b/tests/App/DataFixtures/ORM/LoadSecondUserData.php index e5979767..6e76f556 100644 --- a/tests/App/DataFixtures/ORM/LoadSecondUserData.php +++ b/tests/App/DataFixtures/ORM/LoadSecondUserData.php @@ -19,9 +19,6 @@ class LoadSecondUserData extends AbstractFixture { - /** - * {@inheritdoc} - */ public function load(ObjectManager $manager): void { $user = new User(); diff --git a/tests/App/DataFixtures/ORM/LoadUserData.php b/tests/App/DataFixtures/ORM/LoadUserData.php index 19b4b652..59b30983 100644 --- a/tests/App/DataFixtures/ORM/LoadUserData.php +++ b/tests/App/DataFixtures/ORM/LoadUserData.php @@ -19,9 +19,6 @@ class LoadUserData extends AbstractFixture { - /** - * {@inheritdoc} - */ public function load(ObjectManager $manager): void { $user = new User(); diff --git a/tests/App/DataFixtures/ORM/LoadUserDataInGroup.php b/tests/App/DataFixtures/ORM/LoadUserDataInGroup.php index bd95b225..9baf023b 100644 --- a/tests/App/DataFixtures/ORM/LoadUserDataInGroup.php +++ b/tests/App/DataFixtures/ORM/LoadUserDataInGroup.php @@ -23,9 +23,6 @@ */ class LoadUserDataInGroup extends AbstractFixture implements FixtureGroupInterface { - /** - * {@inheritdoc} - */ public function load(ObjectManager $manager): void { $user = new User(); @@ -53,9 +50,6 @@ public function load(ObjectManager $manager): void $manager->flush(); } - /** - * {@inheritdoc} - */ public static function getGroups(): array { return ['myGroup']; diff --git a/tests/App/DataFixtures/ORM/LoadUserWithServiceData.php b/tests/App/DataFixtures/ORM/LoadUserWithServiceData.php index 369de2e3..0ef66829 100644 --- a/tests/App/DataFixtures/ORM/LoadUserWithServiceData.php +++ b/tests/App/DataFixtures/ORM/LoadUserWithServiceData.php @@ -31,9 +31,6 @@ public function __construct(DummyService $dummyService) $this->dummyService = $dummyService; } - /** - * {@inheritdoc} - */ public function load(ObjectManager $manager): void { $user = new User(); diff --git a/tests/App/Entity/User.php b/tests/App/Entity/User.php index a77b4632..2e328824 100644 --- a/tests/App/Entity/User.php +++ b/tests/App/Entity/User.php @@ -18,6 +18,7 @@ /** * @ORM\Entity + * * @ORM\Table(name="liip_user") */ #[ORM\Entity] @@ -26,7 +27,9 @@ class User { /** * @ORM\Id + * * @ORM\Column(type="integer") + * * @ORM\GeneratedValue(strategy="AUTO") */ #[ORM\Id] diff --git a/tests/AppConfig/AppConfigKernel.php b/tests/AppConfig/AppConfigKernel.php index 3b1a067b..66ce1aa2 100644 --- a/tests/AppConfig/AppConfigKernel.php +++ b/tests/AppConfig/AppConfigKernel.php @@ -19,9 +19,6 @@ class AppConfigKernel extends AppConfigSqliteKernel { - /** - * {@inheritdoc} - */ public function getCacheDir(): string { return __DIR__.'/var/cache/'; diff --git a/tests/AppConfigEvents/AppConfigEventsKernel.php b/tests/AppConfigEvents/AppConfigEventsKernel.php index 8a63fc22..4fb5f44f 100644 --- a/tests/AppConfigEvents/AppConfigEventsKernel.php +++ b/tests/AppConfigEvents/AppConfigEventsKernel.php @@ -19,9 +19,6 @@ class AppConfigEventsKernel extends AppConfigKernel { - /** - * {@inheritdoc} - */ public function getCacheDir(): string { return __DIR__.'/var/cache/'; diff --git a/tests/AppConfigMongodb/AppConfigMongodbKernel.php b/tests/AppConfigMongodb/AppConfigMongodbKernel.php index 14cfa9c3..799ae821 100755 --- a/tests/AppConfigMongodb/AppConfigMongodbKernel.php +++ b/tests/AppConfigMongodb/AppConfigMongodbKernel.php @@ -20,9 +20,6 @@ class AppConfigMongodbKernel extends AppConfigKernel { - /** - * {@inheritdoc} - */ public function getCacheDir(): string { return __DIR__.'/var/cache/'; diff --git a/tests/AppConfigMongodb/DataFixtures/MongoDB/LoadUserDataFixture.php b/tests/AppConfigMongodb/DataFixtures/MongoDB/LoadUserDataFixture.php index ca8809b2..f18f2d2d 100755 --- a/tests/AppConfigMongodb/DataFixtures/MongoDB/LoadUserDataFixture.php +++ b/tests/AppConfigMongodb/DataFixtures/MongoDB/LoadUserDataFixture.php @@ -20,13 +20,10 @@ class LoadUserDataFixture extends Fixture { - /** - * {@inheritdoc} - */ public function load(ObjectManager $manager): void { if (!$manager instanceof DocumentManager) { - $class = \get_class($manager); + $class = $manager::class; throw new \RuntimeException("Fixture requires a MongoDB ODM DocumentManager instance, instance of '{$class}' given."); } diff --git a/tests/AppConfigMongodb/Document/User.php b/tests/AppConfigMongodb/Document/User.php index bbc7f127..74a85ab9 100755 --- a/tests/AppConfigMongodb/Document/User.php +++ b/tests/AppConfigMongodb/Document/User.php @@ -21,16 +21,16 @@ class User #[ODM\Id] private ?string $id = null; - #[ODM\Field(type: "string")] + #[ODM\Field(type: 'string')] private string $name; - #[ODM\Field(type: "string")] + #[ODM\Field(type: 'string')] private string $salt; - #[ODM\Field(type: "string")] + #[ODM\Field(type: 'string')] private string $email; - #[ODM\Field(type: "string")] + #[ODM\Field(type: 'string')] private ?string $dummyText = null; public function __construct() diff --git a/tests/AppConfigMysql/AppConfigMysqlKernel.php b/tests/AppConfigMysql/AppConfigMysqlKernel.php index 42c40e1c..efb96682 100644 --- a/tests/AppConfigMysql/AppConfigMysqlKernel.php +++ b/tests/AppConfigMysql/AppConfigMysqlKernel.php @@ -19,9 +19,6 @@ class AppConfigMysqlKernel extends AppKernel { - /** - * {@inheritdoc} - */ public function getCacheDir(): string { return __DIR__.'/var/cache/'; diff --git a/tests/AppConfigMysqlCacheDb/AppConfigMysqlKernelCacheDb.php b/tests/AppConfigMysqlCacheDb/AppConfigMysqlKernelCacheDb.php index 6d17b9b5..48cb78a8 100644 --- a/tests/AppConfigMysqlCacheDb/AppConfigMysqlKernelCacheDb.php +++ b/tests/AppConfigMysqlCacheDb/AppConfigMysqlKernelCacheDb.php @@ -19,9 +19,6 @@ class AppConfigMysqlKernelCacheDb extends AppConfigMysqlKernel { - /** - * {@inheritdoc} - */ public function getCacheDir(): string { return __DIR__.'/var/cache/'; diff --git a/tests/AppConfigMysqlKeepDatabaseAndSchema/AppConfigMysqlKernelKeepDatabaseAndSchema.php b/tests/AppConfigMysqlKeepDatabaseAndSchema/AppConfigMysqlKernelKeepDatabaseAndSchema.php index 29a76bfa..7c7758c9 100644 --- a/tests/AppConfigMysqlKeepDatabaseAndSchema/AppConfigMysqlKernelKeepDatabaseAndSchema.php +++ b/tests/AppConfigMysqlKeepDatabaseAndSchema/AppConfigMysqlKernelKeepDatabaseAndSchema.php @@ -19,9 +19,6 @@ class AppConfigMysqlKernelKeepDatabaseAndSchema extends AppConfigMysqlKernel { - /** - * {@inheritdoc} - */ public function getCacheDir(): string { return __DIR__.'/var/cache/'; diff --git a/tests/AppConfigMysqlUrl/AppConfigMysqlUrlKernel.php b/tests/AppConfigMysqlUrl/AppConfigMysqlUrlKernel.php index a6fd263d..62561444 100644 --- a/tests/AppConfigMysqlUrl/AppConfigMysqlUrlKernel.php +++ b/tests/AppConfigMysqlUrl/AppConfigMysqlUrlKernel.php @@ -19,9 +19,6 @@ class AppConfigMysqlUrlKernel extends AppKernel { - /** - * {@inheritdoc} - */ public function getCacheDir(): string { return __DIR__.'/var/cache/'; diff --git a/tests/AppConfigPgsql/AppConfigPgsqlKernel.php b/tests/AppConfigPgsql/AppConfigPgsqlKernel.php index c18bf017..be2c4a10 100644 --- a/tests/AppConfigPgsql/AppConfigPgsqlKernel.php +++ b/tests/AppConfigPgsql/AppConfigPgsqlKernel.php @@ -19,9 +19,6 @@ class AppConfigPgsqlKernel extends AppKernel { - /** - * {@inheritdoc} - */ public function getCacheDir(): string { return __DIR__.'/var/cache/'; diff --git a/tests/AppConfigSqlite/AppConfigSqliteKernel.php b/tests/AppConfigSqlite/AppConfigSqliteKernel.php index 48def4b4..a75ea7c2 100644 --- a/tests/AppConfigSqlite/AppConfigSqliteKernel.php +++ b/tests/AppConfigSqlite/AppConfigSqliteKernel.php @@ -19,9 +19,6 @@ class AppConfigSqliteKernel extends AppKernel { - /** - * {@inheritdoc} - */ public function getCacheDir(): string { return __DIR__.'/var/cache/'; diff --git a/tests/AppConfigSqliteUrl/AppConfigSqliteUrlKernel.php b/tests/AppConfigSqliteUrl/AppConfigSqliteUrlKernel.php index 75e83a06..41b3f0d9 100644 --- a/tests/AppConfigSqliteUrl/AppConfigSqliteUrlKernel.php +++ b/tests/AppConfigSqliteUrl/AppConfigSqliteUrlKernel.php @@ -19,9 +19,6 @@ class AppConfigSqliteUrlKernel extends AppKernel { - /** - * {@inheritdoc} - */ public function getCacheDir(): string { return __DIR__.'/var/cache/'; diff --git a/tests/Test/ConfigMongodbTest.php b/tests/Test/ConfigMongodbTest.php index 2ad83367..1155ea6a 100755 --- a/tests/Test/ConfigMongodbTest.php +++ b/tests/Test/ConfigMongodbTest.php @@ -75,7 +75,7 @@ public function testLoadFixturesMongodb(): void ]); $this->assertInstanceOf( - \Doctrine\Common\DataFixtures\Executor\MongoDBExecutor::class, + Doctrine\Common\DataFixtures\Executor\MongoDBExecutor::class, $fixtures );