Allow Symfony 7 versions of packages (#172)

alexander-schranz · web-flow · commit 4ea3670d8e35 · 2024-04-07T19:34:10.000+02:00
* Allow Symfony 7 versions of packages

* Add more PHP versions to test matrix

* Fix compatibility to Symfony 7
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -67,9 +67,17 @@ jobs:
                       php-cs-fixer: false
                       max-phpunit-version: '8'
 
-                    - php-version: '8.1'
+                    - php-version: '8.2'
                       elasticsearch-version: '7.11.1'
                       elasticsearch-package-constraint: '~7.11.0'
+                      minimum-stability: 'stable'
+                      dependency-versions: 'highest'
+                      tools: 'composer:v2'
+                      php-cs-fixer: false
+
+                    - php-version: '8.3'
+                      elasticsearch-version: '7.17.19'
+                      elasticsearch-package-constraint: '~7.17.0'
                       minimum-stability: 'dev'
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
diff --git a/Command/IndexRebuildCommand.php b/Command/IndexRebuildCommand.php
@@ -29,7 +29,7 @@ public function configure()
         $this->setName(self::$defaultName);
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $formatterHelper = new FormatterHelper();
         $output->writeln(
diff --git a/Command/InitCommand.php b/Command/InitCommand.php
@@ -18,6 +18,8 @@
 
 /**
  * Initializes the search adapter.
+ *
+ * @final
  */
 class InitCommand extends Command
 {
@@ -41,7 +43,7 @@ public function configure()
         $this->setHelp('This command will simply call the initialize method of the currently active search adapter.');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->adapter->initialize();
 
diff --git a/Command/OptimizeCommand.php b/Command/OptimizeCommand.php
@@ -17,6 +17,9 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+/**
+ * @final
+ */
 class OptimizeCommand extends Command
 {
     protected static $defaultName = 'massive:search:optimize';
@@ -38,7 +41,7 @@ public function configure()
         $this->setDescription('Optimize all search indices. Affects only indices that are managed with the zend_lucene adapter at the moment.');
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         if (!$this->adapter instanceof OptimizeableAdapterInterface) {
             $output->writeln(\sprintf('Adapter "%s" does not support index optimization.', \get_class($this->adapter)));
diff --git a/Command/PurgeCommand.php b/Command/PurgeCommand.php
@@ -21,6 +21,8 @@
 
 /**
  * Command to purge search indexes.
+ *
+ * @final
  */
 class PurgeCommand extends Command
 {
@@ -65,7 +67,7 @@ public function configure()
         $this->addOption('force', null, InputOption::VALUE_NONE, 'Do not ask for confirmation.');
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $indexes = $input->getOption('index');
         $all = $input->getOption('all');
diff --git a/Command/QueryCommand.php b/Command/QueryCommand.php
@@ -21,6 +21,8 @@
 
 /**
  * Command to execute a query on the configured search engine.
+ *
+ * @final
  */
 class QueryCommand extends Command
 {
@@ -54,7 +56,7 @@ public function configure()
         );
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $query = $input->getArgument('query');
         $indexes = $input->getOption('index');
diff --git a/Command/ReindexCommand.php b/Command/ReindexCommand.php
@@ -29,6 +29,8 @@
 
 /**
  * Command to build (or rebuild) the search index.
+ *
+ * @final
  */
 class ReindexCommand extends Command
 {
@@ -89,7 +91,7 @@ public function configure()
         $this->addOption('provider', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Provider name');
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $formatterHelper = new FormatterHelper();
 
diff --git a/Command/StatusCommand.php b/Command/StatusCommand.php
@@ -21,6 +21,8 @@
 /**
  * This command returns some vendor specific information about
  * the currently configured search implementation.
+ *
+ * @final
  */
 class StatusCommand extends Command
 {
@@ -48,7 +50,7 @@ public function configure()
         );
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $status = $this->searchManager->getStatus();
 
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -18,10 +18,8 @@ class Configuration implements ConfigurationInterface
 {
     /**
      * Returns the config tree builder.
-     *
-     * @return TreeBuilder
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('massive_search');
         $treeBuilder->getRootNode()
diff --git a/composer.json b/composer.json
@@ -10,30 +10,30 @@
     ],
     "require": {
         "jms/metadata": "^2.6",
-        "symfony/config": "^4.3 || ^5.0 || ^6.0",
-        "symfony/console": "^4.3 || ^5.0 || ^6.0",
-        "symfony/event-dispatcher": "^4.3 || ^5.0 || ^6.0",
-        "symfony/expression-language": "^4.3 || ^5.0 || ^6.0",
-        "symfony/dependency-injection": "^4.3 || ^5.0 || ^6.0",
-        "symfony/property-access": "^4.3 || ^5.0 || ^6.0",
+        "symfony/config": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/console": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/event-dispatcher": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/expression-language": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/property-access": "^4.3 || ^5.0 || ^6.0 || ^7.0",
         "php": "^7.2 || ^8.0"
     },
     "require-dev": {
         "handcraftedinthealps/zendsearch": "^2.0",
         "elasticsearch/elasticsearch": "^2.1 || ^5.0 || ^7.0",
-        "symfony-cmf/testing": "^3.0 || ^4.0@dev",
-        "symfony/filesystem": "^4.3.2 || ^5.0 || ^6.0",
-        "symfony/finder": "^4.3 || ^5.0 || ^6.0",
-        "symfony/http-kernel": "^4.3 || ^5.0 || ^6.0",
-        "symfony/framework-bundle": "^4.3 || ^5.0 || ^6.0",
-        "symfony/form": "^4.3 || ^5.0 || ^6.0",
-        "symfony/monolog-bridge": "^4.3 || ^5.0 || ^6.0",
+        "symfony-cmf/testing": "^3.0 || ^4.0 || ^5.0",
+        "symfony/filesystem": "^4.3.2 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/finder": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/http-kernel": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/framework-bundle": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/form": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/monolog-bridge": "^4.3 || ^5.0 || ^6.0 || ^7.0",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/security-bundle": "^4.3 || ^5.0 || ^6.0",
-        "symfony/twig-bundle": "^4.3 || ^5.0 || ^6.0",
-        "symfony/validator": "^4.3 || ^5.0 || ^6.0",
-        "symfony/phpunit-bridge": "^5.0.4 || ^6.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
+        "symfony/security-bundle": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/twig-bundle": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/validator": "^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/phpunit-bridge": "^5.0.4 || ^6.0 || ^7.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
         "doctrine/doctrine-bundle": "^1.10 || ^2.0",
         "doctrine/orm": "^2.5",
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function configure()`
`29`	`29`	`$this->setName(self::$defaultName);`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function execute(InputInterface $input, OutputInterface $output)`
	`32`	`+ public function execute(InputInterface $input, OutputInterface $output): int`
`33`	`33`	`{`
`34`	`34`	`$formatterHelper = new FormatterHelper();`
`35`	`35`	`$output->writeln(`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* Initializes the search adapter.`
	`21`	`+ *`
	`22`	`+ * @final`
`21`	`23`	`*/`
`22`	`24`	`class InitCommand extends Command`
`23`	`25`	`{`
`@@ -41,7 +43,7 @@ public function configure()`
`41`	`43`	`$this->setHelp('This command will simply call the initialize method of the currently active search adapter.');`
`42`	`44`	`}`
`43`	`45`
`44`		`- protected function execute(InputInterface $input, OutputInterface $output)`
	`46`	`+ protected function execute(InputInterface $input, OutputInterface $output): int`
`45`	`47`	`{`
`46`	`48`	`$this->adapter->initialize();`
`47`	`49`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@`
`17`	`17`	`use Symfony\Component\Console\Input\InputInterface;`
`18`	`18`	`use Symfony\Component\Console\Output\OutputInterface;`
`19`	`19`
	`20`	`+/**`
	`21`	`+ * @final`
	`22`	`+ */`
`20`	`23`	`class OptimizeCommand extends Command`
`21`	`24`	`{`
`22`	`25`	`protected static $defaultName = 'massive:search:optimize';`
`@@ -38,7 +41,7 @@ public function configure()`
`38`	`41`	`$this->setDescription('Optimize all search indices. Affects only indices that are managed with the zend_lucene adapter at the moment.');`
`39`	`42`	`}`
`40`	`43`
`41`		`- public function execute(InputInterface $input, OutputInterface $output)`
	`44`	`+ public function execute(InputInterface $input, OutputInterface $output): int`
`42`	`45`	`{`
`43`	`46`	`if (!$this->adapter instanceof OptimizeableAdapterInterface) {`
`44`	`47`	`$output->writeln(\sprintf('Adapter "%s" does not support index optimization.', \get_class($this->adapter)));`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* Command to purge search indexes.`
	`24`	`+ *`
	`25`	`+ * @final`
`24`	`26`	`*/`
`25`	`27`	`class PurgeCommand extends Command`
`26`	`28`	`{`
`@@ -65,7 +67,7 @@ public function configure()`
`65`	`67`	`$this->addOption('force', null, InputOption::VALUE_NONE, 'Do not ask for confirmation.');`
`66`	`68`	`}`
`67`	`69`
`68`		`- public function execute(InputInterface $input, OutputInterface $output)`
	`70`	`+ public function execute(InputInterface $input, OutputInterface $output): int`
`69`	`71`	`{`
`70`	`72`	`$indexes = $input->getOption('index');`
`71`	`73`	`$all = $input->getOption('all');`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`
`30`	`30`	`/**`
`31`	`31`	`* Command to build (or rebuild) the search index.`
	`32`	`+ *`
	`33`	`+ * @final`
`32`	`34`	`*/`
`33`	`35`	`class ReindexCommand extends Command`
`34`	`36`	`{`
`@@ -89,7 +91,7 @@ public function configure()`
`89`	`91`	`$this->addOption('provider', null, InputOption::VALUE_REQUIRED \| InputOption::VALUE_IS_ARRAY, 'Provider name');`
`90`	`92`	`}`
`91`	`93`
`92`		`- public function execute(InputInterface $input, OutputInterface $output)`
	`94`	`+ public function execute(InputInterface $input, OutputInterface $output): int`
`93`	`95`	`{`
`94`	`96`	`$formatterHelper = new FormatterHelper();`
`95`	`97`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,8 @@ class Configuration implements ConfigurationInterface`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`	`20`	`* Returns the config tree builder.`
`21`		`- *`
`22`		`- * @return TreeBuilder`
`23`	`21`	`*/`
`24`		`- public function getConfigTreeBuilder()`
	`22`	`+ public function getConfigTreeBuilder(): TreeBuilder`
`25`	`23`	`{`
`26`	`24`	`$treeBuilder = new TreeBuilder('massive_search');`
`27`	`25`	`$treeBuilder->getRootNode()`