Drop PHP 7 and fix compatibility with SF6 (#121)

Nyholm · web-flow · commit b289decf95b1 · 2022-05-28T19:25:01.000+02:00
* Drop PHP 7 and fix compatibility with SF6

* Fixed ci

* Update PHP cs fixer

* tryign to fix more CI issues

* Update psalm baseline

* Upgrade to larvel 9
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         package: ${{ fromJson(needs.matrix.outputs.list) }}
-        php: [ '7.4', '8.0' ]
+        php: [ '8.0', '8.1' ]
         strategy: [ 'highest', 'lowest' ]
 
     steps:
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           coverage: none
           tools: phpstan:1.4.6, cs2pr
 
@@ -50,9 +50,9 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           coverage: none
-          tools: php-cs-fixer:2.19.0, cs2pr
+          tools: php-cs-fixer:3.8.0, cs2pr
 
       - name: PHP-CS-Fixer
         run: php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
@@ -74,9 +74,9 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           coverage: none
-          tools: vimeo/psalm:4.8.1
+          tools: vimeo/psalm:4.23.0
 
       - name: Download dependencies
         uses: ramsey/composer-install@v2
@@ -92,7 +92,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           coverage: none
           tools: composer-normalize
 
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -4,7 +4,7 @@
     ->in(__DIR__.'/src')
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setCacheFile(__DIR__.'/.github/.cache/php-cs-fixer/.php_cs.cache')
     ->setRiskyAllowed(true)
     ->setRules([
diff --git a/composer.json b/composer.json
@@ -10,6 +10,7 @@
         }
     ],
     "require": {
+        "php": ">=8.0.5",
         "bref/bref": "^1.3",
         "clue/arguments": "^2.1",
         "guzzlehttp/psr7": "^1.8 || ^2.0",
diff --git a/psalm.baseline.xml b/psalm.baseline.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.20.0@f82a70e7edfc6cf2705e9374c8a0b6a974a779ed">
-  <file src="src/bref/src/BrefRunner.php">
-    <InvalidReturnType occurrences="1">
-      <code>int</code>
-    </InvalidReturnType>
-  </file>
-  <file src="src/bref/src/ConsoleApplicationRunner.php">
-    <InvalidReturnType occurrences="1">
-      <code>int</code>
-    </InvalidReturnType>
-  </file>
+<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
   <file src="src/bref/src/SymfonyRequestBridge.php">
     <InvalidArgument occurrences="1">
       <code>$response-&gt;headers-&gt;all()</code>
     </InvalidArgument>
   </file>
+  <file src="src/google-cloud/router.php">
+    <MissingFile occurrences="1">
+      <code>require_once $_SERVER['SCRIPT_FILENAME'] = $defaultSource</code>
+    </MissingFile>
+  </file>
   <file src="src/psr-laminas/src/Runtime.php">
     <InvalidArgument occurrences="2">
       <code>['emitter' =&gt; $this-&gt;options['laminas_emitter'] ?? null]</code>
diff --git a/src/bref/composer.json b/src/bref/composer.json
@@ -10,19 +10,20 @@
         }
     ],
     "require": {
+        "php": ">=8.0.5",
         "ext-json": "*",
         "ext-sockets": "*",
         "clue/arguments": "^2.1",
         "psr/http-server-handler": "^1.0",
-        "riverline/multipart-parser": "^2.0",
+        "riverline/multipart-parser": "^2.0.9",
         "runtime/bref-layer": "^1.3",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "bref/bref": "^1.3",
         "guzzlehttp/test-server": "^0.1",
         "phpunit/phpunit": "^9.5",
-        "symfony/http-foundation": "^5.3 || ^6.0",
+        "symfony/http-foundation": "^5.4 || ^6.0",
         "symfony/http-kernel": "^5.4 || ^6.0"
     },
     "minimum-stability": "dev",
diff --git a/src/google-cloud/composer.json b/src/google-cloud/composer.json
@@ -10,9 +10,9 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=8.0.5",
         "ext-json": "*",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
diff --git a/src/google-cloud/google/CloudEvent.php b/src/google-cloud/google/CloudEvent.php
@@ -130,7 +130,7 @@ public static function fromArray(array $arr)
         return new static(...$args);
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return [
             'id' => $this->id,
diff --git a/src/google-cloud/src/Runtime.php b/src/google-cloud/src/Runtime.php
@@ -28,10 +28,7 @@ class Runtime extends GenericRuntime
         'time',
     ];
 
-    /**
-     * @return mixed
-     */
-    protected function getArgument(\ReflectionParameter $parameter, ?string $type)
+    protected function getArgument(\ReflectionParameter $parameter, ?string $type): mixed
     {
         if (CloudEvent::class === $type) {
             return $this->createCloudEvent();
diff --git a/src/laravel/composer.json b/src/laravel/composer.json
@@ -10,13 +10,14 @@
         }
     ],
     "require": {
+        "php": ">=8.0.5",
         "illuminate/contracts": "^8.33",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "illuminate/http": "^8.33",
         "phpunit/phpunit": "^9.5",
-        "symfony/console": "^4.4 || ^5.2 || ^6.0"
+        "symfony/console": "^5.4 || ^6.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
diff --git a/src/psr-17/composer.json b/src/psr-17/composer.json
@@ -10,10 +10,11 @@
         }
     ],
     "require": {
+        "php": ">=8.0.5",
         "nyholm/psr7-server": "^1.0",
         "psr/http-factory-implementation": "^1.0",
         "psr/http-server-handler": "^1.0",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "nyholm/psr7": "^1.4",
diff --git a/src/psr-17/src/Runtime.php b/src/psr-17/src/Runtime.php
@@ -49,10 +49,7 @@ public function getRunner(?object $application): RunnerInterface
         return parent::getRunner($application);
     }
 
-    /**
-     * @return mixed
-     */
-    protected function getArgument(\ReflectionParameter $parameter, ?string $type)
+    protected function getArgument(\ReflectionParameter $parameter, ?string $type): mixed
     {
         if (ServerRequestInterface::class === $type) {
             return $this->createRequest();
diff --git a/src/psr-guzzle/composer.json b/src/psr-guzzle/composer.json
@@ -10,9 +10,10 @@
         }
     ],
     "require": {
+        "php": ">=8.0.5",
         "guzzlehttp/psr7": "^1.8 || ^2.0",
         "psr/http-server-handler": "^1.0",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
diff --git a/src/psr-guzzle/src/Runtime.php b/src/psr-guzzle/src/Runtime.php
@@ -29,10 +29,7 @@ public function getRunner(?object $application): RunnerInterface
         return parent::getRunner($application);
     }
 
-    /**
-     * @return mixed
-     */
-    protected function getArgument(\ReflectionParameter $parameter, ?string $type)
+    protected function getArgument(\ReflectionParameter $parameter, ?string $type): mixed
     {
         if (ServerRequestInterface::class === $type) {
             return ServerRequest::fromGlobals();
diff --git a/src/psr-laminas/composer.json b/src/psr-laminas/composer.json
@@ -10,9 +10,10 @@
         }
     ],
     "require": {
+        "php": ">=8.0.5",
         "laminas/laminas-diactoros": "^2.5",
         "laminas/laminas-httphandlerrunner": "^1.2",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
diff --git a/src/psr-laminas/src/Runtime.php b/src/psr-laminas/src/Runtime.php
@@ -39,10 +39,7 @@ public function getRunner(?object $application): RunnerInterface
         return parent::getRunner($application);
     }
 
-    /**
-     * @return mixed
-     */
-    protected function getArgument(\ReflectionParameter $parameter, ?string $type)
+    protected function getArgument(\ReflectionParameter $parameter, ?string $type): mixed
     {
         if (ServerRequestInterface::class === $type) {
             return ServerRequestFactory::fromGlobals();
diff --git a/src/psr-nyholm-laminas/composer.json b/src/psr-nyholm-laminas/composer.json
@@ -10,10 +10,11 @@
         }
     ],
     "require": {
+        "php": ">=8.0.5",
         "laminas/laminas-httphandlerrunner": "^1.2",
         "nyholm/psr7": "^1.3",
         "nyholm/psr7-server": "^1.0",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
diff --git a/src/psr-nyholm-laminas/src/Runtime.php b/src/psr-nyholm-laminas/src/Runtime.php
@@ -51,10 +51,7 @@ public function getRunner(?object $application): RunnerInterface
         return parent::getRunner($application);
     }
 
-    /**
-     * @return mixed
-     */
-    protected function getArgument(\ReflectionParameter $parameter, ?string $type)
+    protected function getArgument(\ReflectionParameter $parameter, ?string $type): mixed
     {
         if (ServerRequestInterface::class === $type) {
             return $this->createRequest();
diff --git a/src/psr-nyholm/composer.json b/src/psr-nyholm/composer.json
@@ -10,10 +10,11 @@
         }
     ],
     "require": {
+        "php": ">=8.0.5",
         "nyholm/psr7": "^1.3",
         "nyholm/psr7-server": "^1.0",
         "psr/http-server-handler": "^1.0",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
diff --git a/src/psr-nyholm/src/Runtime.php b/src/psr-nyholm/src/Runtime.php
@@ -35,10 +35,7 @@ public function getRunner(?object $application): RunnerInterface
         return parent::getRunner($application);
     }
 
-    /**
-     * @return mixed
-     */
-    protected function getArgument(\ReflectionParameter $parameter, ?string $type)
+    protected function getArgument(\ReflectionParameter $parameter, ?string $type): mixed
     {
         if (ServerRequestInterface::class === $type) {
             return $this->createRequest();
diff --git a/src/reactphp/composer.json b/src/reactphp/composer.json
@@ -10,9 +10,10 @@
         }
     ],
     "require": {
+        "php": ">=8.0.5",
         "psr/http-server-handler": "^1.0",
         "react/http": "^1.6",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
diff --git a/src/reactphp/tests/RunnerTest.php b/src/reactphp/tests/RunnerTest.php
@@ -17,7 +17,7 @@ public function testRun(): void
         $handler = function () {};
         $loop = $this->createMock(LoopInterface::class);
         Loop::set($loop);
-        $server = new HttpServer($handler); //final, cannot be mocked
+        $server = new HttpServer($handler); // final, cannot be mocked
         $factory = $this->createMock(ServerFactory::class);
         $application = $this->createMock(RequestHandlerInterface::class);
 
diff --git a/src/roadrunner-nyholm/composer.json b/src/roadrunner-nyholm/composer.json
@@ -15,6 +15,7 @@
         "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
+        "php": ">=8.0.5",
         "phpunit/phpunit": "^9.5",
         "psr/http-server-handler": "^1.0"
     },
diff --git a/src/roadrunner-symfony-nyholm/composer.json b/src/roadrunner-symfony-nyholm/composer.json
@@ -10,13 +10,13 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=8.0.5",
         "nyholm/psr7": "^1.4",
         "spiral/roadrunner": "^2.0",
-        "symfony/dependency-injection": "^5.3 || ^6.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0",
         "symfony/http-kernel": "^5.4 || ^6.0",
         "symfony/psr-http-message-bridge": "^2.1",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
diff --git a/src/swoole-nyholm/composer.json b/src/swoole-nyholm/composer.json
@@ -10,9 +10,10 @@
         }
     ],
     "require": {
+        "php": ">=8.0.5",
         "nyholm/psr7": "^1.4",
         "psr/http-server-handler": "^1.0",
-        "symfony/runtime": "^5.3 || ^6.0"
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"
diff --git a/src/swoole/composer.json b/src/swoole/composer.json
@@ -10,13 +10,14 @@
         }
     ],
     "require": {
-        "symfony/runtime": "^5.3 || ^6.0"
+        "php": ">=8.0.5",
+        "symfony/runtime": "^5.4 || ^6.0"
     },
     "require-dev": {
-        "illuminate/http": "^8.48",
+        "illuminate/http": "^9.14",
         "phpunit/phpunit": "^9.5",
         "swoole/ide-helper": "^4.6",
-        "symfony/http-foundation": "^5.3 || ^6.0",
+        "symfony/http-foundation": "^5.4 || ^6.0",
         "symfony/http-kernel": "^5.4 || ^6.0"
     },
     "conflict": {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`->in(__DIR__.'/src')`
`5`	`5`	`;`
`6`	`6`
`7`		`-return PhpCsFixer\Config::create()`
	`7`	`+return (new PhpCsFixer\Config())`
`8`	`8`	`->setCacheFile(__DIR__.'/.github/.cache/php-cs-fixer/.php_cs.cache')`
`9`	`9`	`->setRiskyAllowed(true)`
`10`	`10`	`->setRules([`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"require": {`
	`13`	`+ "php": ">=8.0.5",`
`13`	`14`	`"bref/bref": "^1.3",`
`14`	`15`	`"clue/arguments": "^2.1",`
`15`	`16`	`"guzzlehttp/psr7": "^1.8 \|\| ^2.0",`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public static function fromArray(array $arr)`
`130`	`130`	`return new static(...$args);`
`131`	`131`	`}`
`132`	`132`
`133`		`- public function jsonSerialize()`
	`133`	`+ public function jsonSerialize(): mixed`
`134`	`134`	`{`
`135`	`135`	`return [`
`136`	`136`	`'id' => $this->id,`