Allow installation with Symfony v7 Series

Signed-off-by: George Steel <george@net-glue.co.uk>
laminas · Nov 29, 2023 · c8696c9 · c8696c9
1 parent bc3086a
commit c8696c9
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 133 deletions.
diff --git a/composer.json b/composer.json
@@ -30,19 +30,19 @@
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "composer-runtime-api": "^2.0.0",
         "psr/container": "^1.0 || ^2.0",
-        "symfony/console": "^5.3.7 || ^6.0",
-        "symfony/event-dispatcher": "^5.0 || ^6.0",
+        "symfony/console": "^5.3.7 || ^6.0 || ^7.0",
+        "symfony/event-dispatcher": "^5.0 || ^6.0 || ^7.0",
         "symfony/polyfill-php80": "^1.17",
         "webmozart/assert": "^1.10"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.5.0",
-        "laminas/laminas-mvc": "^3.6.1",
+        "laminas/laminas-mvc": "^3.7.0",
         "laminas/laminas-servicemanager": "^3.22.1",
         "mikey179/vfsstream": "2.0.x-dev",
         "phpunit/phpunit": "^10.4.2",
         "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.15"
+        "vimeo/psalm": "^5.16"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,19 +3,26 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
         bootstrap="./vendor/autoload.php"
-        colors="true">
-  <coverage/>
-  <testsuites>
-    <testsuite name="laminas-cli">
-      <directory>./test/</directory>
-    </testsuite>
-  </testsuites>
-  <source>
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-    <exclude>
-      <file>./src/autoload.php</file>
-    </exclude>
-  </source>
+        colors="true"
+        displayDetailsOnSkippedTests="true"
+        displayDetailsOnIncompleteTests="true"
+        displayDetailsOnTestsThatTriggerDeprecations="true"
+        displayDetailsOnTestsThatTriggerErrors="true"
+        displayDetailsOnTestsThatTriggerNotices="true"
+        displayDetailsOnTestsThatTriggerWarnings="true"
+>
+    <coverage/>
+    <testsuites>
+        <testsuite name="laminas-cli">
+            <directory>./test/</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <exclude>
+            <file>./src/autoload.php</file>
+        </exclude>
+    </source>
 </phpunit>
diff --git a/src/Input/AbstractParamAwareInput.php b/src/Input/AbstractParamAwareInput.php
@@ -306,4 +306,9 @@ static function (mixed $value) use ($originalValidator) {
 
         return $originalValidator;
     }
+
+    public function __toString(): string
+    {
+        return '';
+    }
 }
diff --git a/src/Input/ParamAwareInput.php b/src/Input/ParamAwareInput.php
@@ -29,17 +29,13 @@ public function hasParameterOption($values, bool $onlyParams = false): bool
     /**
      * @param string|array                     $values
      * @param string|bool|int|float|array|null $default
-     * @return mixed
      */
-    public function getParameterOption($values, $default = false, bool $onlyParams = false)
+    public function getParameterOption($values, $default = false, bool $onlyParams = false): mixed
     {
         return $this->input->getParameterOption($values, $default, $onlyParams);
     }
 
-    /**
-     * @return mixed
-     */
-    public function getArgument(string $name)
+    public function getArgument(string $name): mixed
     {
         return $this->input->getArgument($name);
     }
@@ -52,10 +48,7 @@ public function setArgument(string $name, $value): void
         $this->input->setArgument($name, $value);
     }
 
-    /**
-     * @return mixed
-     */
-    public function getOption(string $name)
+    public function getOption(string $name): mixed
     {
         return $this->input->getOption($name);
     }