Modernize for PHP 8.2

f3l1x · f3l1x · commit e269badb77ae · 2025-12-15T10:23:28.000+01:00
- Bump minimum PHP version to 8.2
- Update CI workflows for PHP 8.2-8.4
- Update PHPStan target to PHP 8.2
- Update CodeSniffer ruleset to 8.2
- Fix code style issues
- Update documentation
diff --git a/.docs/README.md b/.docs/README.md
@@ -9,6 +9,7 @@ This package is based on great [guzzle/psr7](https://github.com/guzzle/psr7) imp
 - [Setup](#setup)
 - [Psr7Request](#psr7request)
 - [Psr7Response](#psr7response)
+- [Bridge](#bridge)
 
 ## Setup
 
@@ -113,6 +114,18 @@ Additional methods (against PSR7 interface):
 - sendHeaders(): void
 - sendBody(): void
 
+## Bridge
+
+### `Psr7Response`
+
+Nette Application response that wraps a PSR-7 `ResponseInterface`. Allows sending PSR-7 responses directly from Nette presenters.
+
+```php
+use Contributte\Psr7\Bridge\Psr7Response;
+
+$this->sendResponse(new Psr7Response($psr7));
+```
+
 ## API
 
 **MessageInterface**
diff --git a/.github/workflows/codesniffer.yml b/.github/workflows/codesniffer.yml
@@ -15,4 +15,4 @@ jobs:
     name: "Codesniffer"
     uses: contributte/.github/.github/workflows/codesniffer.yml@master
     with:
-      php: "8.2"
+      php: "8.3"
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -15,4 +15,4 @@ jobs:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester-coverage-v2.yml@master
     with:
-      php: "8.2"
+      php: "8.3"
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -15,4 +15,4 @@ jobs:
     name: "Phpstan"
     uses: contributte/.github/.github/workflows/phpstan.yml@master
     with:
-      php: "8.2"
+      php: "8.3"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,33 +5,33 @@ on:
   workflow_dispatch:
 
   push:
-    branches: [ "*" ]
+    branches: ["*"]
 
   schedule:
     - cron: "0 8 * * 1"
 
 jobs:
-  test83:
+  test84:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.3"
+      php: "8.4"
 
-  test82:
+  test83:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.2"
+      php: "8.3"
 
-  test81:
+  test82:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.1"
+      php: "8.2"
 
   testlower:
     name: "Nette Tester"
     uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.1"
+      php: "8.2"
       composer: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest"
diff --git a/README.md b/README.md
@@ -34,8 +34,8 @@ For details on how to use this package, check out our [documentation](.docs).
 
 | State       | Version | Branch   | Nette | PHP     |
 |-------------|---------|----------|-------|---------|
-| dev         | `^0.10` | `master` | 3.2+  | `>=8.1` |
-| stable      | `^0.9`  | `master` | 3.2+  | `>=8.1` |
+| dev         | `^0.10` | `master` | 3.2+  | `>=8.2` |
+| stable      | `^0.9`  | `master` | 3.2+  | `>=8.2` |
 
 ## Development
 
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     }
   ],
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.2",
     "guzzlehttp/psr7": "^2.6.1",
     "nette/utils": "^v4.0.2"
   },
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,7 +3,7 @@ includes:
 
 parameters:
 	level: 9
-	phpVersion: 80100
+	phpVersion: 80200
 
 	scanDirectories:
 		- src
diff --git a/ruleset.xml b/ruleset.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset name="Contributte" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
 	<!-- Rulesets -->
-	<rule ref="./vendor/contributte/qa/ruleset-8.0.xml"/>
+	<rule ref="./vendor/contributte/qa/ruleset-8.2.xml"/>
 
 	<!-- Rules -->
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
diff --git a/src/Extra/ExtraResponseTrait.php b/src/Extra/ExtraResponseTrait.php
@@ -64,10 +64,6 @@ public function getContents(bool $rewind = true): string
 		return $this->getBody()->getContents();
 	}
 
-	/*
-	 * HEADERS ****************************************************************
-	 */
-
 	/**
 	 * @param string[]|string[][] $headers
 	 */
@@ -81,10 +77,6 @@ public function withHeaders(array $headers): static
 		return $new;
 	}
 
-	/*
-	 * REDIRECT ***************************************************************
-	 */
-
 	public function withRedirect(string $url, int $statusCode = 302): static
 	{
 		return $this
diff --git a/src/NullStream.php b/src/NullStream.php
@@ -79,10 +79,7 @@ public function write(string $data): int
 		throw new RuntimeException('Null streams cannot write');
 	}
 
-	/**
-	 * @return null
-	 */
-	public function getMetadata(?string $key = null)
+	public function getMetadata(?string $key = null): mixed
 	{
 		return null;
 	}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`	`],`
`21`	`21`	`"require": {`
`22`		`- "php": ">=8.1",`
	`22`	`+ "php": ">=8.2",`
`23`	`23`	`"guzzlehttp/psr7": "^2.6.1",`
`24`	`24`	`"nette/utils": "^v4.0.2"`
`25`	`25`	`},`
Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,6 @@ public function getContents(bool $rewind = true): string`
`64`	`64`	`return $this->getBody()->getContents();`
`65`	`65`	`}`
`66`	`66`
`67`		`- /*`
`68`		`- * HEADERS ****************************************************************`
`69`		`- */`
`70`		`-`
`71`	`67`	`/**`
`72`	`68`	`* @param string[]\|string[][] $headers`
`73`	`69`	`*/`
`@@ -81,10 +77,6 @@ public function withHeaders(array $headers): static`
`81`	`77`	`return $new;`
`82`	`78`	`}`
`83`	`79`
`84`		`- /*`
`85`		`- * REDIRECT ***************************************************************`
`86`		`- */`
`87`		`-`
`88`	`80`	`public function withRedirect(string $url, int $statusCode = 302): static`
`89`	`81`	`{`
`90`	`82`	`return $this`