Merge pull request #411 from doctrine/cs-fixer

upgrade to phpstan 2 and apply latest php-cs-fixer fixes

Author: dbu

.github/workflows/test-application.yaml

@@ -11,7 +11,7 @@ on:
 jobs:
     test:
         name: "PHP ${{ matrix.php-version }}, Symfony ${{ matrix.symfony-version }}"
-        runs-on: "ubuntu-20.04"
+        runs-on: "ubuntu-latest"
         env:
           SYMFONY_REQUIRE: ${{matrix.symfony-require}}
 

CHANGELOG.md

@@ -4,6 +4,11 @@ Changelog
 Version 3
 =========
 
+3.0.3
+-----
+
+* PHPCRExecutor no longer extends Doctrine\Common\DataFixtures\Executor\PHPCRExecutor because that class is final since `doctrine/data-fixtures` version 2.
+
 3.0.2
 -----
 

composer.json

@@ -40,16 +40,17 @@
     },
     "require-dev": {
         "ext-libxml": "*",
+        "doctrine/data-fixtures": "^2.0",
         "doctrine/doctrine-bundle": "^2.0.3",
         "doctrine/phpcr-odm": "^2.0",
         "doctrine/orm": "^2.0 || ^3.0",
         "jackalope/jackalope-doctrine-dbal": "^2.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0",
         "phpcr/phpcr-shell": "^1.6",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-doctrine": "^1.3",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "phpstan/phpstan-symfony": "^1.3",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-doctrine": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-symfony": "^2.0",
         "phpunit/phpunit": "^9.5",
         "symfony/asset": "^5.4 || ^6.0 || ^7.0",
         "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0",

src/Command/MigratorMigrateCommand.php

@@ -16,7 +16,7 @@ class MigratorMigrateCommand extends BaseCommand
     private const NAME = 'doctrine:phpcr:migrator:migrate';
 
     public function __construct(
-        private ContainerInterface $container
+        private ContainerInterface $container,
     ) {
         parent::__construct(self::NAME);
     }

src/Command/NodeDumpCommand.php

@@ -20,7 +20,7 @@ class NodeDumpCommand extends BaseDumpCommand
 
     public function __construct(
         private PhpcrConsoleDumperHelper $consoleDumper,
-        private int $dumpMaxLineLength
+        private int $dumpMaxLineLength,
     ) {
         parent::__construct(self::NAME);
     }

src/Command/RepositoryInitCommand.php

@@ -19,7 +19,7 @@ class RepositoryInitCommand extends Command
     private const NAME = 'doctrine:phpcr:repository:init';
 
     public function __construct(
-        private InitializerManager $initializerManager
+        private InitializerManager $initializerManager,
     ) {
         parent::__construct(self::NAME);
     }

src/DataFixtures/PHPCRExecutor.php

@@ -3,6 +3,7 @@
 namespace Doctrine\Bundle\PHPCRBundle\DataFixtures;
 
 use Doctrine\Bundle\PHPCRBundle\Initializer\InitializerManager;
+use Doctrine\Common\DataFixtures\Executor\AbstractExecutor;
 use Doctrine\Common\DataFixtures\Executor\PHPCRExecutor as BasePHPCRExecutor;
 use Doctrine\Common\DataFixtures\Purger\PHPCRPurger;
 use Doctrine\ODM\PHPCR\DocumentManagerInterface;
@@ -12,14 +13,17 @@
  *
  * @author Daniel Leech <[email protected]>
  */
-final class PHPCRExecutor extends BasePHPCRExecutor
+final class PHPCRExecutor extends AbstractExecutor
 {
+    private BasePHPCRExecutor $wrappedExecutor;
+
     public function __construct(
         DocumentManagerInterface $dm,
         ?PHPCRPurger $purger = null,
-        private ?InitializerManager $initializerManager = null
+        private ?InitializerManager $initializerManager = null,
     ) {
-        parent::__construct($dm, $purger);
+        parent::__construct($dm);
+        $this->wrappedExecutor = new BasePHPCRExecutor($dm, $purger);
     }
 
     public function purge(): void
@@ -31,4 +35,14 @@ public function purge(): void
             $this->initializerManager->initialize();
         }
     }
+
+    public function execute(array $fixtures, bool $append = false): void
+    {
+        $this->wrappedExecutor->execute($fixtures, $append);
+    }
+
+    public function getObjectManager(): DocumentManagerInterface
+    {
+        return $this->wrappedExecutor->getObjectManager();
+    }
 }

src/EventListener/JackalopeDoctrineDbalSchemaListener.php

@@ -18,7 +18,7 @@
 class JackalopeDoctrineDbalSchemaListener
 {
     public function __construct(
-        private RepositorySchema $schema
+        private RepositorySchema $schema,
     ) {
     }
 

src/ManagerRegistry.php

@@ -22,7 +22,7 @@ public function __construct(
         array $entityManagers,
         string $defaultConnectionName,
         string $defaultEntityManagerName,
-        string $proxyInterfaceName
+        string $proxyInterfaceName,
     ) {
         $this->container = $container;
 

src/OptionalCommand/ODM/LoadFixtureCommand.php

@@ -28,7 +28,7 @@ class LoadFixtureCommand extends BaseCommand
     private const NAME = 'doctrine:phpcr:fixtures:load';
 
     public function __construct(
-        private InitializerManager $initializerManager
+        private InitializerManager $initializerManager,
     ) {
         parent::__construct(self::NAME);
     }