Merge pull request #214 from phpcr/symfony-7

dbu · web-flow · commit 84c51df91214 · 2023-11-27T15:36:14.000+01:00
WIP: test with symfony 7 and php 8.3
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -22,10 +22,10 @@ jobs:
                     - php-version: '7.3'
                     - php-version: '7.4'
                     - php-version: '8.0'
-                    - php-version: '8.0'
-                      dev-dependencies: true
                     - php-version: '8.1'
                     - php-version: '8.2'
+                    - php-version: '8.3'
+                    - php-version: '8.3'
 
         steps:
             - name: Checkout project
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+2.x
+---
+
+2.0.0 (unreleased)
+------------------
+
+* Support Symfony 7
+* Test with PHP 8.3
+* Adjusted commands to have the return type declarations.
+
 1.x
 ---
 
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     "require": {
         "php": "^7.2 || ^8.0",
         "phpcr/phpcr": "~2.1.0",
-        "symfony/console": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
+        "symfony/console": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "ramsey/uuid": "^3.5",
diff --git a/src/PHPCR/Util/Console/Command/NodeDumpCommand.php b/src/PHPCR/Util/Console/Command/NodeDumpCommand.php
@@ -23,12 +23,7 @@
  */
 class NodeDumpCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidArgumentException
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('phpcr:node:dump')
@@ -56,13 +51,11 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @throws InvalidArgumentException
      * @throws Exception
      * @throws RepositoryException
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $session = $this->getPhpcrSession();
         $dumperHelper = $this->getPhpcrConsoleDumperHelper();
diff --git a/src/PHPCR/Util/Console/Command/NodeMoveCommand.php b/src/PHPCR/Util/Console/Command/NodeMoveCommand.php
@@ -17,12 +17,7 @@
  */
 class NodeMoveCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidArgumentException
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('phpcr:node:move')
@@ -43,11 +38,9 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @throws InvalidArgumentException
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $session = $this->getPhpcrSession();
 
diff --git a/src/PHPCR/Util/Console/Command/NodeRemoveCommand.php b/src/PHPCR/Util/Console/Command/NodeRemoveCommand.php
@@ -21,12 +21,7 @@
  */
 class NodeRemoveCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @throws CliInvalidArgumentException
-     */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -53,12 +48,10 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @throws CliInvalidArgumentException
      * @throws InvalidArgumentException
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $session = $this->getPhpcrSession();
 
diff --git a/src/PHPCR/Util/Console/Command/NodeTouchCommand.php b/src/PHPCR/Util/Console/Command/NodeTouchCommand.php
@@ -21,12 +21,7 @@
  */
 class NodeTouchCommand extends BaseNodeManipulationCommand
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidArgumentException
-     */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -73,11 +68,9 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @throws InvalidArgumentException
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $helper = $this->getPhpcrHelper();
         $session = $this->getPhpcrSession();
diff --git a/src/PHPCR/Util/Console/Command/NodeTypeListCommand.php b/src/PHPCR/Util/Console/Command/NodeTypeListCommand.php
@@ -15,10 +15,7 @@
  */
 class NodeTypeListCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('phpcr:node-type:list')
@@ -31,10 +28,7 @@ protected function configure()
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $session = $this->getPhpcrSession();
         $ntm = $session->getWorkspace()->getNodeTypeManager();
diff --git a/src/PHPCR/Util/Console/Command/NodeTypeRegisterCommand.php b/src/PHPCR/Util/Console/Command/NodeTypeRegisterCommand.php
@@ -26,10 +26,7 @@
  */
 class NodeTypeRegisterCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('phpcr:node-type:register')
@@ -62,11 +59,9 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @throws InvalidArgumentException
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $definitions = $input->getArgument('cnd-file');
 
diff --git a/src/PHPCR/Util/Console/Command/NodesUpdateCommand.php b/src/PHPCR/Util/Console/Command/NodesUpdateCommand.php
@@ -20,12 +20,7 @@
  */
 class NodesUpdateCommand extends BaseNodeManipulationCommand
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @throws CliInvalidArgumentException
-     */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -85,12 +80,10 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @throws CliInvalidArgumentException
      * @throws InvalidArgumentException
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $query = $input->getOption('query');
         $queryLanguage = strtoupper($input->getOption('query-language'));
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceCreateCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceCreateCommand.php
@@ -18,10 +18,7 @@
  */
 class WorkspaceCreateCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('phpcr:workspace:create')
@@ -42,10 +39,7 @@ protected function configure()
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $session = $this->getPhpcrSession();
 
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceDeleteCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceDeleteCommand.php
@@ -17,10 +17,7 @@
  */
 class WorkspaceDeleteCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('phpcr:workspace:delete')
@@ -37,10 +34,7 @@ protected function configure()
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $session = $this->getPhpcrSession();
 
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceExportCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceExportCommand.php
@@ -17,10 +17,7 @@
  */
 class WorkspaceExportCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -42,10 +39,7 @@ protected function configure()
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $session = $this->getPhpcrSession();
         $repo = $session->getRepository();
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceImportCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceImportCommand.php
@@ -24,10 +24,7 @@ class WorkspaceImportCommand extends BaseCommand
         'throw'   => ImportUUIDBehaviorInterface::IMPORT_UUID_COLLISION_THROW,
     ];
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -62,10 +59,7 @@ protected function configure()
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $filename = $input->getArgument('filename');
         $parentPath = $input->getOption('parentpath');
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceListCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceListCommand.php
@@ -14,10 +14,7 @@
  */
 class WorkspaceListCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('phpcr:workspace:list')
@@ -29,10 +26,7 @@ protected function configure()
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $session = $this->getPhpcrSession();
 
diff --git a/src/PHPCR/Util/Console/Command/WorkspacePurgeCommand.php b/src/PHPCR/Util/Console/Command/WorkspacePurgeCommand.php
@@ -17,10 +17,7 @@
  */
 class WorkspacePurgeCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -36,10 +33,7 @@ protected function configure()
             );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $session = $this->getPhpcrSession();
         $force = $input->getOption('force');
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceQueryCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceQueryCommand.php
@@ -18,10 +18,7 @@
  */
 class WorkspaceQueryCommand extends BaseCommand
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -34,10 +31,7 @@ protected function configure()
             ->setHelp('The <info>query</info> command executes a JCR query statement on the content repository');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $sql = $input->getArgument('query');
         $language = $input->getOption('language');
diff --git a/src/PHPCR/Util/Console/Helper/PhpcrConsoleDumperHelper.php b/src/PHPCR/Util/Console/Helper/PhpcrConsoleDumperHelper.php
diff --git a/src/PHPCR/Util/Console/Helper/PhpcrHelper.php b/src/PHPCR/Util/Console/Helper/PhpcrHelper.php

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,7 @@`
`17`	`17`	`*/`
`18`	`18`	`class NodeMoveCommand extends BaseCommand`
`19`	`19`	`{`
`20`		`- /**`
`21`		`- * {@inheritdoc}`
`22`		`- *`
`23`		`- * @throws InvalidArgumentException`
`24`		`- */`
`25`		`- protected function configure()`
	`20`	`+ protected function configure(): void`
`26`	`21`	`{`
`27`	`22`	`$this`
`28`	`23`	`->setName('phpcr:node:move')`
`@@ -43,11 +38,9 @@ protected function configure()`
`43`	`38`	`}`
`44`	`39`
`45`	`40`	`/**`
`46`		`- * {@inheritdoc}`
`47`		`- *`
`48`	`41`	`* @throws InvalidArgumentException`
`49`	`42`	`*/`
`50`		`- protected function execute(InputInterface $input, OutputInterface $output)`
	`43`	`+ protected function execute(InputInterface $input, OutputInterface $output): int`
`51`	`44`	`{`
`52`	`45`	`$session = $this->getPhpcrSession();`
`53`	`46`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class NodeRemoveCommand extends BaseCommand`
`23`	`23`	`{`
`24`		`- /**`
`25`		`- * {@inheritdoc}`
`26`		`- *`
`27`		`- * @throws CliInvalidArgumentException`
`28`		`- */`
`29`		`- protected function configure()`
	`24`	`+ protected function configure(): void`
`30`	`25`	`{`
`31`	`26`	`parent::configure();`
`32`	`27`
`@@ -53,12 +48,10 @@ protected function configure()`
`53`	`48`	`}`
`54`	`49`
`55`	`50`	`/**`
`56`		`- * {@inheritdoc}`
`57`		`- *`
`58`	`51`	`* @throws CliInvalidArgumentException`
`59`	`52`	`* @throws InvalidArgumentException`
`60`	`53`	`*/`
`61`		`- protected function execute(InputInterface $input, OutputInterface $output)`
	`54`	`+ protected function execute(InputInterface $input, OutputInterface $output): int`
`62`	`55`	`{`
`63`	`56`	`$session = $this->getPhpcrSession();`
`64`	`57`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`class NodeTypeListCommand extends BaseCommand`
`17`	`17`	`{`
`18`		`- /**`
`19`		`- * {@inheritdoc}`
`20`		`- */`
`21`		`- protected function configure()`
	`18`	`+ protected function configure(): void`
`22`	`19`	`{`
`23`	`20`	`$this`
`24`	`21`	`->setName('phpcr:node-type:list')`
`@@ -31,10 +28,7 @@ protected function configure()`
`31`	`28`	`);`
`32`	`29`	`}`
`33`	`30`
`34`		`- /**`
`35`		`- * {@inheritdoc}`
`36`		`- */`
`37`		`- protected function execute(InputInterface $input, OutputInterface $output)`
	`31`	`+ protected function execute(InputInterface $input, OutputInterface $output): int`
`38`	`32`	`{`
`39`	`33`	`$session = $this->getPhpcrSession();`
`40`	`34`	`$ntm = $session->getWorkspace()->getNodeTypeManager();`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,7 @@`
`26`	`26`	`*/`
`27`	`27`	`class NodeTypeRegisterCommand extends BaseCommand`
`28`	`28`	`{`
`29`		`- /**`
`30`		`- * {@inheritdoc}`
`31`		`- */`
`32`		`- protected function configure()`
	`29`	`+ protected function configure(): void`
`33`	`30`	`{`
`34`	`31`	`$this`
`35`	`32`	`->setName('phpcr:node-type:register')`
`@@ -62,11 +59,9 @@ protected function configure()`
`62`	`59`	`}`
`63`	`60`
`64`	`61`	`/**`
`65`		`- * {@inheritdoc}`
`66`		`- *`
`67`	`62`	`* @throws InvalidArgumentException`
`68`	`63`	`*/`
`69`		`- protected function execute(InputInterface $input, OutputInterface $output)`
	`64`	`+ protected function execute(InputInterface $input, OutputInterface $output): int`
`70`	`65`	`{`
`71`	`66`	`$definitions = $input->getArgument('cnd-file');`
`72`	`67`