Add support for Symfony 8 (cont)

.github/workflows/test-application.yaml

@@ -19,11 +19,17 @@ jobs:
                 include:
                     - php-version: '8.0'
                       dependencies: 'lowest'
+                      symfony-version: '*'
                     - php-version: '8.1'
+                      symfony-version: '6.*'
                     - php-version: '8.2'
+                      symfony-version: '7.*'
                     - php-version: '8.3'
+                      symfony-version: '7.*'
                     - php-version: '8.4'
+                      symfony-version: '8.*'
                     - php-version: '8.5'
+                      symfony-version: '8.*'
 
         steps:
             - name: Checkout project
@@ -33,7 +39,11 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php-version }}
-                  tools: 'composer:v2'
+                  tools: 'composer:v2, flex'
+
+            - name: Symfony version
+              if: matrix.symfony-version != '*'
+              run: composer config extra.symfony.require ${{ matrix.symfony-version }}
 
             - name: Allow unstable dependencies
               if: matrix.dev-dependencies == true

CHANGELOG.md

@@ -4,6 +4,12 @@ Changelog
 2.x
 ---
 
+2.0.3
+-----
+
+* Allow installation with Symfony Console 8.x.
+* Test with PHP 8.5.
+
 2.0.2
 -----
 

composer.json

@@ -29,7 +29,7 @@
     "require": {
         "php": "^8.0",
         "phpcr/phpcr": "~2.1.0",
-        "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+        "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0"
     },
     "require-dev": {
         "ramsey/uuid": "^3.5",

tests/PHPCR/Tests/Util/Console/Command/BaseCommandTest.php

@@ -17,6 +17,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -110,6 +111,22 @@ public function setUp(): void
         $this->application->setHelperSet($this->helperSet);
     }
 
+    protected function addCommand(callable|Command $command): void
+    {
+        /* @phpstan-ignore function.alreadyNarrowedType */
+        if (method_exists($this->application, 'addCommand')) {
+            $this->application->addCommand($command);
+
+            return;
+        }
+
+        if (!$command instanceof Command) {
+            throw new \InvalidArgumentException('Until we remove support for symfony console < 7.4, all commands must extend the base class');
+        }
+
+        $this->application->add($command);
+    }
+
     /**
      * Build and execute the command tester.
      *

tests/PHPCR/Tests/Util/Console/Command/NodeDumpCommandTest.php

@@ -23,7 +23,7 @@ public function setUp(): void
             ->getMock();
 
         $ndCommand = new NodeDumpCommand();
-        $this->application->add($ndCommand);
+        $this->addCommand($ndCommand);
     }
 
     public function testCommand(): void

tests/PHPCR/Tests/Util/Console/Command/NodeMoveCommandTest.php

@@ -37,7 +37,7 @@ public function testCommand(array $args): void
         $this->session->expects($this->once())
             ->method('save');
 
-        $this->application->add(new NodeMoveCommand());
+        $this->addCommand(new NodeMoveCommand());
         $this->executeCommand('phpcr:node:move', $args);
     }
 }

tests/PHPCR/Tests/Util/Console/Command/NodeRemoveCommandTest.php

@@ -12,7 +12,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new NodeRemoveCommand());
+        $this->addCommand(new NodeRemoveCommand());
     }
 
     public function testRemove(): void

tests/PHPCR/Tests/Util/Console/Command/NodeTouchCommandTest.php

@@ -26,7 +26,7 @@ public function setUp(): void
         parent::setUp();
 
         $command = new NodeTouchCommand();
-        $this->application->add($command);
+        $this->addCommand($command);
 
         // Override default concrete instance with mock
         $this->phpcrHelper = $this->getMockBuilder(PhpcrHelper::class)

tests/PHPCR/Tests/Util/Console/Command/NodeTypeListCommandTest.php

@@ -19,7 +19,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new NodeTypeListCommand());
+        $this->addCommand(new NodeTypeListCommand());
         $this->nodeTypeManager = $this->getMockBuilder(MockNodeTypeManager::class)
             ->disableOriginalConstructor()
             ->getMock();

tests/PHPCR/Tests/Util/Console/Command/NodeTypeRegisterCommandTest.php

@@ -19,7 +19,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new NodeTypeRegisterCommand());
+        $this->addCommand(new NodeTypeRegisterCommand());
         $this->nodeTypeManager = $this->getMockBuilder(MockNodeTypeManager::class)
             ->disableOriginalConstructor()
             ->getMock();

tests/PHPCR/Tests/Util/Console/Command/NodesUpdateCommandTest.php

@@ -19,7 +19,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new NodesUpdateCommand());
+        $this->addCommand(new NodesUpdateCommand());
         $this->query = $this->createMock(QueryInterface::class);
     }
 

tests/PHPCR/Tests/Util/Console/Command/WorkspaceCreateCommandTest.php

@@ -13,7 +13,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new WorkspaceCreateCommand());
+        $this->addCommand(new WorkspaceCreateCommand());
     }
 
     public function testCreate(): void

tests/PHPCR/Tests/Util/Console/Command/WorkspaceDeleteCommandTest.php

@@ -13,7 +13,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new WorkspaceDeleteCommand());
+        $this->addCommand(new WorkspaceDeleteCommand());
     }
 
     public function testDelete(): void

tests/PHPCR/Tests/Util/Console/Command/WorkspaceExportCommandTest.php

@@ -13,7 +13,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new WorkspaceExportCommand());
+        $this->addCommand(new WorkspaceExportCommand());
     }
 
     public function tearDown(): void

tests/PHPCR/Tests/Util/Console/Command/WorkspaceImportCommandTest.php

@@ -14,7 +14,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new WorkspaceImportCommand());
+        $this->addCommand(new WorkspaceImportCommand());
     }
 
     public function testImport(): void

tests/PHPCR/Tests/Util/Console/Command/WorkspaceListCommandTest.php

@@ -12,7 +12,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new WorkspaceListCommand());
+        $this->addCommand(new WorkspaceListCommand());
     }
 
     public function testNodeTypeList(): void

tests/PHPCR/Tests/Util/Console/Command/WorkspacePurgeCommandTest.php

@@ -12,7 +12,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new WorkspacePurgeCommand());
+        $this->addCommand(new WorkspacePurgeCommand());
     }
 
     public function testNodeTypePurge(): void

tests/PHPCR/Tests/Util/Console/Command/WorkspaceQueryCommandTest.php

@@ -19,7 +19,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->application->add(new WorkspaceQueryCommand());
+        $this->addCommand(new WorkspaceQueryCommand());
         $this->query = $this->createMock(QueryInterface::class);
     }