PHP 8.4+

codemasher · codemasher · commit 52beda83adea · 2026-03-30T21:49:18.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,9 +26,6 @@ jobs:
       fail-fast: true
       matrix:
         php-version:
-          - "8.1"
-          - "8.2"
-          - "8.3"
           - "8.4"
           - "8.5"
 
@@ -72,7 +69,7 @@ jobs:
       - name: "Install PHP"
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
+          php-version: "8.4"
           extensions: ${{ env.PHP_EXTENSIONS }}
           ini-values: ${{ env.PHP_INI_VALUES }}
           coverage: none
@@ -101,9 +98,6 @@ jobs:
           - ubuntu-latest
           - windows-latest
         php-version:
-          - "8.1"
-          - "8.2"
-          - "8.3"
           - "8.4"
           - "8.5"
 
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
 		"psr/http-client-implementation": "1.0"
 	},
 	"require": {
-		"php": "^8.1",
+		"php": "^8.4",
 		"ext-fileinfo": "*",
 		"ext-intl": "*",
 		"ext-json": "*",
@@ -36,13 +36,13 @@
 	},
 	"require-dev": {
 		"ext-curl": "*",
-		"chillerlan/phpunit-http": "^1.0",
+		"chillerlan/phpunit-http": "^2.0",
 		"guzzlehttp/guzzle": "^7.10",
 		"phan/phan": "^6.0.5",
 		"phpmd/phpmd": "^2.15",
 		"phpstan/phpstan": "^2.1.42",
 		"phpstan/phpstan-deprecation-rules": "^2.0.4",
-		"phpunit/phpunit": "^10.5",
+		"phpunit/phpunit": "^13.0",
 		"slevomat/coding-standard": "^8.28.1",
 		"squizlabs/php_codesniffer": "^4.0"
 	},
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -201,7 +201,7 @@
 	<rule ref="Squiz.PHP.InnerFunctions"/>
 	<rule ref="Squiz.PHP.LowercasePHPFunctions"/>
 	<rule ref="Squiz.PHP.NonExecutableCode"/>
-	<rule ref="Squiz.Scope.MemberVarScope"/>
+	<!--<rule ref="Squiz.Scope.MemberVarScope"/>-->
 	<rule ref="Squiz.Scope.MethodScope"/>
 	<rule ref="Squiz.Scope.StaticThisUsage"/>
 	<rule ref="Squiz.Strings.DoubleQuoteUsage"/>
@@ -220,7 +220,7 @@
 
 
 	<!--
-		Configurable built-in https://github.com/squizlabs/PHP_CodeSniffer/wiki/Customisable-Sniff-Properties
+		Configurable built-in https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Customisable-Sniff-Properties
 	-->
 
 	<rule ref="Generic.ControlStructures.InlineControlStructure">
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/src/Client/URLExtractor.php b/src/Client/URLExtractor.php
@@ -26,7 +26,7 @@
 class URLExtractor implements ClientInterface{
 
 	/** @var \Psr\Http\Message\ResponseInterface[] */
-	protected array                   $responses = [];
+	protected(set) array              $responses = [];
 	protected ClientInterface         $http;
 	protected RequestFactoryInterface $requestFactory;
 
@@ -83,6 +83,7 @@ public function extract(UriInterface|string $shortURL):string|null{
 	/**
 	 * @return \Psr\Http\Message\ResponseInterface[]
 	 */
+	#[\Deprecated(message: 'Use the property URLExtractor::$responses instead.', since: '3.0.0')]
 	public function getResponses():array{
 		return $this->responses;
 	}
diff --git a/src/Cookie.php b/src/Cookie.php
@@ -19,7 +19,8 @@
  */
 class Cookie{
 
-	public const RESERVED_CHARACTERS = ["\t", "\n", "\v", "\f", "\r", "\x0E", ' ', ',', ';', '='];
+	/** @var string[] */
+	public const array RESERVED_CHARACTERS = ["\t", "\n", "\v", "\f", "\r", "\x0E", ' ', ',', ';', '='];
 
 	protected string                 $name;
 	protected string                 $value;
diff --git a/src/Emitter/ResponseEmitterAbstract.php b/src/Emitter/ResponseEmitterAbstract.php
@@ -186,7 +186,7 @@ protected function parseContentRange():array|null{
 	/**
 	 * emits the given buffer
 	 *
-	 * @codeCoverageIgnore (overridden in test)
+	 * @codeCoverageIgnore
 	 */
 	protected function emitBuffer(string $buffer):void{
 		echo $buffer;
diff --git a/src/Emitter/SapiEmitter.php b/src/Emitter/SapiEmitter.php
@@ -77,7 +77,7 @@ protected function emitHeaders():void{
 	/**
 	 * Allow to intercept header calls in tests
 	 *
-	 * @codeCoverageIgnore (overridden in test)
+	 * @codeCoverageIgnore
 	 */
 	protected function sendHeader(string $header, bool $replace, int $response_code = 0):void{
 		header($header, $replace, $response_code);
diff --git a/src/HeaderUtil.php b/src/HeaderUtil.php
@@ -116,7 +116,7 @@ protected static function normalizeKV(mixed $value):array{
 	 *
 	 * Spaces and tabs ought to be excluded by parsers when extracting the field value from a header field.
 	 *
-	 * header-field = field-name ":" OWS field-value OWS
+	 * header-field = field-name ":" OWS field-value
 	 * OWS          = *( SP / HTAB )
 	 *
 	 * @see https://tools.ietf.org/html/rfc7230#section-3.2.4
diff --git a/src/MessageUtil.php b/src/MessageUtil.php
@@ -241,7 +241,7 @@ public static function setCookie(
 		string|null                             $sameSite = null,
 	):ResponseInterface{
 
-		$cookie = (new Cookie($name, $value))
+		$cookie = new Cookie($name, $value)
 			->withExpiry($expiry)
 			->withDomain($domain)
 			->withPath($path)
diff --git a/src/MimeTypeUtil.php b/src/MimeTypeUtil.php
@@ -21,9 +21,11 @@ final class MimeTypeUtil{
 	 * @see https://www.iana.org/assignments/media-types/media-types.xhtml
 	 * @see https://github.com/jshttp/mime-db
 	 * @see https://github.com/patrickmccallum/mimetype-io
+	 *
+	 * @var array<string, string>
 	 */
 	// phpcs:ignore
-	public const MIMETYPES = [
+	public const array MIMETYPES = [
 		'1km' => 'application/vnd.1000minds.decision-model+xml',
 		'3dml' => 'text/vnd.in3d.3dml',
 		'3ds' => 'image/x-3ds',
@@ -1317,8 +1319,7 @@ public static function getFromFilename(string $filename):string|null{
 	 * Get the mime type from the given content
 	 */
 	public static function getFromContent(string $content):string|null{
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		$mime  = $finfo->buffer($content);
+		$mime  = new finfo(FILEINFO_MIME_TYPE)->buffer($content);
 
 		if($mime === false){
 			return null; // @codeCoverageIgnore
diff --git a/src/QueryUtil.php b/src/QueryUtil.php
@@ -19,12 +19,12 @@
 
 final class QueryUtil{
 
-	public const BOOLEANS_AS_BOOL       = 0;
-	public const BOOLEANS_AS_INT        = 1;
-	public const BOOLEANS_AS_STRING     = 2;
-	public const BOOLEANS_AS_INT_STRING = 3;
+	public const int BOOLEANS_AS_BOOL       = 0;
+	public const int BOOLEANS_AS_INT        = 1;
+	public const int BOOLEANS_AS_STRING     = 2;
+	public const int BOOLEANS_AS_INT_STRING = 3;
 
-	public const NO_ENCODING = -1;
+	public const int NO_ENCODING = -1;
 
 	/**
 	 * Cleans/normalizes an array of query parameters
diff --git a/src/UriUtil.php b/src/UriUtil.php
@@ -17,7 +17,8 @@
 
 final class UriUtil{
 
-	public const URI_DEFAULT_PORTS = [
+	/** @var array<string, int> */
+	public const array URI_DEFAULT_PORTS = [
 		'http'   => 80,
 		'https'  => 443,
 		'ftp'    => 21,
diff --git a/tests/Client/Factories/LoggingClientFactory.php b/tests/Client/Factories/LoggingClientFactory.php
@@ -23,8 +23,8 @@
 final class LoggingClientFactory implements HttpClientFactoryInterface{
 
 	public function getClient(string $cacert, ResponseFactoryInterface $responseFactory):ClientInterface{
-		$http   = (new GuzzleHttpClientFactory)->getClient($cacert, $responseFactory);
-		$logger = new class () extends AbstractLogger{
+		$http   = new GuzzleHttpClientFactory()->getClient($cacert, $responseFactory);
+		$logger = new class extends AbstractLogger{
 			public function log($level, string|Stringable $message, array $context = []):void{ // phpcs:ignore
 				printf("\n[%s][%s] LoggingClientTest: %s", date('Y-m-d H:i:s'), $level, $message);
 			}
diff --git a/tests/Client/URLExtractorTest.php b/tests/Client/URLExtractorTest.php
@@ -38,7 +38,7 @@ public function testSendRequest():void{
 				'',
 			];
 
-			$responses = $this->httpClient->getResponses();
+			$responses = $this->httpClient->responses;
 
 			$this::assertCount(5, $responses);
 
diff --git a/tests/CookieTest.php b/tests/CookieTest.php
@@ -45,7 +45,7 @@ public function testInvalidCharactersInNameException(string $char):void{
 	 * @return array<string, array{0: DateTimeInterface|DateInterval|int, 1: string, 2: int}>
 	 */
 	public static function expiryProvider():array{
-		$dt     = (new DateTimeImmutable)->setTimezone(new DateTimeZone('GMT'));
+		$dt     = new DateTimeImmutable()->setTimezone(new DateTimeZone('GMT'));
 		$now    = $dt->getTimestamp();
 
 		return [
@@ -70,7 +70,7 @@ public static function expiryProvider():array{
 
 	#[DataProvider('expiryProvider')]
 	public function testSetExpiry(DateTimeInterface|DateInterval|int $expiry, string $expectedDate, int $expectedMaxAge):void{
-		$cookie = (new Cookie('test', 'expiry'))->withExpiry($expiry);
+		$cookie = new Cookie('test', 'expiry')->withExpiry($expiry);
 
 		try{
 			$this::assertSame(sprintf('test=expiry; Expires=%s; Max-Age=%s', $expectedDate, $expectedMaxAge), (string)$cookie);
@@ -85,7 +85,7 @@ public function testSetExpiry(DateTimeInterface|DateInterval|int $expiry, string
 
 	public function testExpiryWithEmptyValue():void{
 		// an empty value is supposed to delete the cookie - no matter what the expiry says
-		$cookie = (new Cookie('test', ''))->withExpiry(69);
+		$cookie = new Cookie('test', '')->withExpiry(69);
 
 		$this::assertSame('test=; Expires=Thursday, 01-Jan-1970 12:34:56 GMT; Max-Age=0', (string)$cookie);
 	}
@@ -103,7 +103,7 @@ public static function domainProvider():array{
 
 	#[DataProvider('domainProvider')]
 	public function testSetDomain(string $domain, bool $punycode, string $expected):void{
-		$cookie = (new Cookie('test', 'domain'))->withDomain($domain, $punycode);
+		$cookie = new Cookie('test', 'domain')->withDomain($domain, $punycode);
 
 		$this::assertSame(sprintf('test=domain; Domain=%s', $expected), (string)$cookie);
 		// test unset
@@ -123,7 +123,7 @@ public static function pathProvider():array{
 
 	#[DataProvider('pathProvider')]
 	public function testPath(string $path, string $expected):void{
-		$cookie = (new Cookie('test', 'path'))->withPath($path);
+		$cookie = new Cookie('test', 'path')->withPath($path);
 
 		$this::assertSame(sprintf('test=path; Path=%s', $expected), (string)$cookie);
 		// test unset
@@ -148,18 +148,18 @@ public function testSameSiteInvalidValueException():void{
 		$this->expectException(InvalidArgumentException::class);
 		$this->expectExceptionMessage('The same site attribute must be "lax", "strict" or "none"');
 
-		(new Cookie('test', 'samesite'))->withSameSite('foo');
+		new Cookie('test', 'samesite')->withSameSite('foo');
 	}
 
 	public function testSameSiteNoneWithoutSecureException():void{
 		$this->expectException(InvalidArgumentException::class);
 		$this->expectExceptionMessage('The same site attribute can only be "none" when secure is set to true');
 		/** @phan-suppress-next-line PhanNoopCast */
-		(string)(new Cookie('test', 'samesite'))->withSameSite('none');
+		(string)new Cookie('test', 'samesite')->withSameSite('none');
 	}
 
 	public function testSameSite():void{
-		$cookie = (new Cookie('test', 'samesite'))->withSameSite('strict');
+		$cookie = new Cookie('test', 'samesite')->withSameSite('strict');
 
 		$this::assertSame('test=samesite; SameSite=strict', (string)$cookie);
 		// test unset
diff --git a/tests/Emitter/SapiEmitterTest.php b/tests/Emitter/SapiEmitterTest.php
@@ -7,7 +7,7 @@
  * @copyright    2023 smiley
  * @license      MIT
  *
- * @phan-file-suppress PhanUndeclaredMethod
+ * @phan-file-suppress PhanUndeclaredMethod, PhanUndeclaredProperty
  */
 declare(strict_types=1);
 
@@ -30,10 +30,10 @@ final class SapiEmitterTest extends UtilTestAbstract{
 	 */
 	protected function initEmitter(ResponseInterface $response, int $bufferSize = 8192):ResponseEmitterInterface{
 		return new class ($response, $bufferSize) extends SapiEmitter{
-			/** @var array<string, array{0: string, 1: bool, 2: int}> */
-			protected array $headers = [];
+			/** @var array<int, array{0: string, 1: bool, 2: int}> */
+			protected(set) array $headers = [];
 			/** @var string[] */
-			protected array $content = [];
+			protected(set) array $content = [];
 
 			protected function sendHeader(string $header, bool $replace, int $response_code = 0):void{
 				/** @phan-suppress-next-line PhanTypeMismatchProperty */
@@ -44,16 +44,6 @@ protected function emitBuffer(string $buffer):void{
 				$this->content[] = $buffer;
 			}
 
-			/** @return array<string, array{0: string, 1: bool, 2: int}> */
-			public function getHeaders():array{
-				return $this->headers;
-			}
-
-			/** @return string[] */
-			public function getBody():array{
-				return $this->content;
-			}
-
 			public function getBodyContent():string{
 				return implode('', $this->content);
 			}
@@ -75,7 +65,7 @@ public function testSetHeaders():void{
 		$this->emitter = $this->initEmitter($response);
 		$this->emitter->emit();
 
-		$headers  = array_column($this->emitter->getHeaders(), 'header');
+		$headers  = array_column($this->emitter->headers, 'header');
 		$status   = array_pop($headers); // status line should be last
 		$expected = [
 			'X-Foo: bar',
@@ -100,7 +90,7 @@ public function testEmit():void{
 		$this->emitter = $this->initEmitter($response);
 		$this->emitter->emit();
 
-		$headers = $this->emitter->getHeaders();
+		$headers = $this->emitter->headers;
 
 		$this::assertSame($expected, $this->emitter->getBodyContent());
 		$this::assertSame('Content-Length: '.strlen($expected), $headers[0]['header']);
@@ -164,7 +154,7 @@ public function testEmitContentRange(
 
 		$content = $this->emitter->getBodyContent();
 
-		foreach($this->emitter->getHeaders() as $line){
+		foreach($this->emitter->headers as $line){
 			[$headerName, $headerContent] = array_map(trim(...), explode(':', $line['header'], 2));
 
 			if($headerName === 'Content-Length'){
@@ -193,7 +183,7 @@ public function testInvalidContentRangeRemovesHeader():void{
 		$this->emitter = $this->initEmitter($response);
 		$this->emitter->emit();
 
-		$headers  = array_column($this->emitter->getHeaders(), 'header');
+		$headers  = array_column($this->emitter->headers, 'header');
 
 		$expected = [
 			'Content-Length: 3',
@@ -214,7 +204,7 @@ public function testEmitPartialContent():void{
 		$this->emitter = $this->initEmitter($response);
 		$this->emitter->emit();
 
-		$headers  = array_column($this->emitter->getHeaders(), 'header');
+		$headers  = array_column($this->emitter->headers, 'header');
 
 		$expected = [
 			'Content-Length: 5',
diff --git a/tests/StreamUtilTest.php b/tests/StreamUtilTest.php
@@ -14,8 +14,6 @@
 use chillerlan\HTTP\Utils\StreamUtil;
 use InvalidArgumentException, RuntimeException;
 use function fclose, fopen, stream_get_meta_data, strlen, substr;
-use function sprintf;
-use const PHP_VERSION_ID;
 
 final class StreamUtilTest extends UtilTestAbstract{
 
@@ -148,13 +146,8 @@ public function testTryFopenThrowsExceptionInsteadOfWarning():void{
 	}
 
 	public function testTryFopenThrowsExceptionInsteadOfValueError():void{
-
-		$expectedMessage = PHP_VERSION_ID < 80400
-			? 'Path cannot be empty'
-			: 'Path must not be empty';
-
 		$this->expectException(RuntimeException::class);
-		$this->expectExceptionMessage(sprintf('Unable to open "" using mode "r": %s', $expectedMessage));
+		$this->expectExceptionMessage('Unable to open "" using mode "r": Path must not be empty');
 
 		StreamUtil::tryFopen('', 'r');
 	}
@@ -175,13 +168,8 @@ public function testTryGetContentsThrowsExceptionOnUnreadableResource():void{
 	}
 
 	public function testTryGetContentsThrowsExceptionOnInvalidResource():void{
-
-		$expectedMessage = PHP_VERSION_ID < 80500
-			? 'supplied resource is not a valid stream resource'
-			: 'Unable to read stream contents: stream_get_contents(): Argument #1 ($stream) must be an open stream resource';
-
 		$this->expectException(RuntimeException::class);
-		$this->expectExceptionMessage($expectedMessage);
+		$this->expectExceptionMessage('Unable to read stream contents: stream_get_contents(): Argument #1 ($stream) must be an open stream resource'); // phpcs:ignore
 
 		$resource = StreamUtil::tryFopen(__DIR__.'/fopen-test.txt', 'r');
 		fclose($resource);
diff --git a/tests/UriUtilTest.php b/tests/UriUtilTest.php
diff --git a/tests/UtilTestAbstract.php b/tests/UtilTestAbstract.php

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ protected function parseContentRange():array\|null{`
`186`	`186`	`/**`
`187`	`187`	`* emits the given buffer`
`188`	`188`	`*`
`189`		`- * @codeCoverageIgnore (overridden in test)`
	`189`	`+ * @codeCoverageIgnore`
`190`	`190`	`*/`
`191`	`191`	`protected function emitBuffer(string $buffer):void{`
`192`	`192`	`echo $buffer;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ protected function emitHeaders():void{`
`77`	`77`	`/**`
`78`	`78`	`* Allow to intercept header calls in tests`
`79`	`79`	`*`
`80`		`- * @codeCoverageIgnore (overridden in test)`
	`80`	`+ * @codeCoverageIgnore`
`81`	`81`	`*/`
`82`	`82`	`protected function sendHeader(string $header, bool $replace, int $response_code = 0):void{`
`83`	`83`	`header($header, $replace, $response_code);`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ protected static function normalizeKV(mixed $value):array{`
`116`	`116`	`*`
`117`	`117`	`* Spaces and tabs ought to be excluded by parsers when extracting the field value from a header field.`
`118`	`118`	`*`
`119`		`- * header-field = field-name ":" OWS field-value OWS`
	`119`	`+ * header-field = field-name ":" OWS field-value`
`120`	`120`	`* OWS = *( SP / HTAB )`
`121`	`121`	`*`
`122`	`122`	`* @see https://tools.ietf.org/html/rfc7230#section-3.2.4`