PHP 8.4+

codemasher · codemasher · commit 4a5e46bbabb5 · 2026-03-22T00:25:18.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,9 +34,6 @@ jobs:
       fail-fast: true
       matrix:
         php-version:
-          - "8.1"
-          - "8.2"
-          - "8.3"
           - "8.4"
           - "8.5"
 
@@ -80,9 +77,6 @@ jobs:
           - ubuntu-latest
           - windows-latest
         php-version:
-          - "8.1"
-          - "8.2"
-          - "8.3"
           - "8.4"
           - "8.5"
 
diff --git a/.phan/config.php b/.phan/config.php
@@ -17,7 +17,7 @@
 	// that functions removed in php 7.0 exist.
 	// (See `backward_compatibility_checks` for additional options)
 	'target_php_version'              => null,
-	'minimum_target_php_version'      => '8.1',
+	'minimum_target_php_version'      => '8.4',
 
 	// A list of directories that should be parsed for class and
 	// method information. After excluding the directories
diff --git a/README.md b/README.md
@@ -23,11 +23,11 @@ Add [PSR-17](https://www.php-fig.org/psr/psr-17/) factories and a [PSR-18](https
 
 ### Features
 
-A PSR-18 HTTP client and PSR-17 factories for your unit tetss. That's it.
+A PSR-18 HTTP client and PSR-17 factories for your unit tets. That's it.
 
 ### Requirements
 
-- PHP 8.1+
+- PHP 8.4+
   - required extensions may vary depending on the used HTTP client
 
 
@@ -40,12 +40,12 @@ Add this library along with PHPUnit and an optional HTTP client to the `require-
 ```json
 {
 	"require": {
-		"php": "^8.1"
+		"php": "^8.4"
 	},
 	"require-dev": {
-		"chillerlan/phpunit-http": "^1.0",
-		"guzzlehttp/guzzle": "^7.8",
-		"phpunit/phpunit": "^10.5"
+		"chillerlan/phpunit-http": "^2.0",
+		"guzzlehttp/guzzle": "^7.10",
+		"phpunit/phpunit": "^13.0"
 	}
 }
 ```
diff --git a/composer.json b/composer.json
@@ -23,15 +23,15 @@
 	"minimum-stability": "stable",
 	"prefer-stable": true,
 	"require": {
-		"php": "^8.1"
+		"php": "^8.4"
 	},
 	"require-dev": {
 		"chillerlan/php-httpinterface": "^6.0",
 		"guzzlehttp/guzzle": "^7.10",
 		"phan/phan": "^6.0.2",
 		"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",
 		"squizlabs/php_codesniffer": "^4.0"
 	},
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -110,9 +110,8 @@
 		<exclude-pattern>examples</exclude-pattern>
 	</rule>
 
-	<rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat">
+	<rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
 		<properties>
-			<property name="withSpaces" value="no"/>
 			<property name="shortNullable" value="no"/>
 			<property name="nullPosition" value="last"/>
 		</properties>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -11,3 +11,21 @@ parameters:
 			identifier: property.protected
 			count: 1
 			path: src/ChillerlanHttpClientFactory.php
+
+		-
+			rawMessage: Cannot unset property chillerlan\PHPUnitHttpTest\PHPUnitHttpFactoryTestAbstract::$REQUEST_FACTORY because it might have hooks in a subclass.
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: tests/PHPUnitHttpFactoryTestAbstract.php
+
+		-
+			rawMessage: Cannot unset property chillerlan\PHPUnitHttpTest\PHPUnitHttpFactoryTestAbstract::$httpClient because it might have hooks in a subclass.
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: tests/PHPUnitHttpFactoryTestAbstract.php
+
+		-
+			rawMessage: Cannot unset property chillerlan\PHPUnitHttpTest\PHPUnitHttpFactoryTestAbstract::$httpClientFactory because it might have hooks in a subclass.
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: tests/PHPUnitHttpFactoryTestAbstract.php
diff --git a/src/HttpClientFactoryInterface.php b/src/HttpClientFactoryInterface.php
@@ -16,7 +16,7 @@
 
 interface HttpClientFactoryInterface{
 
-	public const USER_AGENT = 'chillerlanPHPUnitHttp/1.0.0 +https://github.com/chillerlan/phpunit-http';
+	public const string USER_AGENT = 'chillerlanPHPUnitHttp/2.0.0 +https://github.com/chillerlan/phpunit-http';
 
 	/**
 	 * Returns a fully prepared http client instance
diff --git a/src/HttpFactoryTrait.php b/src/HttpFactoryTrait.php
@@ -25,11 +25,9 @@
 trait HttpFactoryTrait{
 
 	/**
-	 * @todo: constants in traits are allowed as of PHP 8.2
-	 *
 	 * @var array<string, string>
 	 */
-	private array $FACTORIES = [
+	final protected const array FACTORIES = [
 		'requestFactory'       => 'REQUEST_FACTORY',
 		'responseFactory'      => 'RESPONSE_FACTORY',
 		'streamFactory'        => 'STREAM_FACTORY',
@@ -55,7 +53,7 @@ trait HttpFactoryTrait{
 	 */
 	protected function initFactories(string $cacert = ''):void{
 
-		foreach($this->FACTORIES as $property => $const){
+		foreach($this::FACTORIES as $property => $const){
 			$class = $this->getFactoryClass($const);
 
 			// some interfaces may not always be needed or implemented
diff --git a/tests/ChillerlanFactoryTest.php b/tests/ChillerlanFactoryTest.php
@@ -23,7 +23,7 @@ class ChillerlanFactoryTest extends PHPUnitHttpFactoryTestAbstract{
 	protected string $URI_FACTORY         = HTTPFactory::class;
 	protected string $HTTP_CLIENT_FACTORY = ChillerlanHttpClientFactory::class;
 
-	public function testHttpClientInstance():void{
+	public function httpClientInstance():void{
 		$this::assertInstanceOf(CurlClient::class, $this->httpClient);
 	}
 
diff --git a/tests/GuzzleFactoryTest.php b/tests/GuzzleFactoryTest.php
@@ -23,7 +23,7 @@ class GuzzleFactoryTest extends PHPUnitHttpFactoryTestAbstract{
 	protected string $URI_FACTORY         = HTTPFactory::class;
 	protected string $HTTP_CLIENT_FACTORY = GuzzleHttpClientFactory::class;
 
-	public function testHttpClientInstance():void{
+	public function httpClientInstance():void{
 		$this::assertInstanceOf(Client::class, $this->httpClient);
 	}
 
diff --git a/tests/PHPUnitHttpFactoryTestAbstract.php b/tests/PHPUnitHttpFactoryTestAbstract.php
@@ -14,14 +14,15 @@
 use chillerlan\PHPUnitHttp\HttpFactoryTrait;
 use chillerlan\PHPUnitHttp\HttpClientFactoryInterface;
 use InvalidArgumentException;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Throwable;
 use function json_decode;
 
 abstract class PHPUnitHttpFactoryTestAbstract extends TestCase{
 	use HttpFactoryTrait;
 
-	protected const CACERT = __DIR__.'/cacert.pem';
+	protected const string CACERT = __DIR__.'/cacert.pem';
 
 	protected string $REQUEST_FACTORY;
 	protected string $RESPONSE_FACTORY;
@@ -39,9 +40,11 @@ protected function setUp():void{
 
 	}
 
-	abstract public function testHttpClientInstance():void;
+	#[Test]
+	abstract public function httpClientInstance():void;
 
-	public function testSendRequest():void{
+	#[Test]
+	public function sendRequest():void{
 		// wrapping this in try/catch as httpbin may have an outage
 		try{
 			$uri      = $this->uriFactory->createUri('https://httpbin.org/get');
@@ -67,7 +70,8 @@ public function testSendRequest():void{
 
 	}
 
-	public function testInvalidClassException():void{
+	#[Test]
+	public function invalidClassException():void{
 		$this->expectException(InvalidArgumentException::class);
 		$this->expectExceptionMessage('invalid class: "whatever"');
 
@@ -76,7 +80,8 @@ public function testInvalidClassException():void{
 		$this->initFactories('');
 	}
 
-	public function testVonstantNotDefinedException():void{
+	#[Test]
+	public function constantNotDefinedException():void{
 		$this->expectException(InvalidArgumentException::class);
 		$this->expectExceptionMessage('constant "REQUEST_FACTORY" not defined');
 		/** @phan-suppress-next-line PhanTypeObjectUnsetDeclaredProperty */
@@ -85,14 +90,16 @@ public function testVonstantNotDefinedException():void{
 		$this->initFactories('');
 	}
 
-	public function testNoCacertException():void{
+	#[Test]
+	public function noCacertException():void{
 		$this->expectException(InvalidArgumentException::class);
 		$this->expectExceptionMessage('invalid CA bundle: "foo"');
 
 		$this->initFactories('foo');
 	}
 
-	public function testInvokeWithoutHttpClient():void{
+	#[Test]
+	public function invokeWithoutHttpClient():void{
 		/** @phan-suppress-next-line PhanTypeObjectUnsetDeclaredProperty, PhanUndeclaredProperty */
 		unset($this->httpClientFactory, $this->httpClient, $this->HTTP_CLIENT_FACTORY);
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class ChillerlanFactoryTest extends PHPUnitHttpFactoryTestAbstract{`
`23`	`23`	`protected string $URI_FACTORY = HTTPFactory::class;`
`24`	`24`	`protected string $HTTP_CLIENT_FACTORY = ChillerlanHttpClientFactory::class;`
`25`	`25`
`26`		`- public function testHttpClientInstance():void{`
	`26`	`+ public function httpClientInstance():void{`
`27`	`27`	`$this::assertInstanceOf(CurlClient::class, $this->httpClient);`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class GuzzleFactoryTest extends PHPUnitHttpFactoryTestAbstract{`
`23`	`23`	`protected string $URI_FACTORY = HTTPFactory::class;`
`24`	`24`	`protected string $HTTP_CLIENT_FACTORY = GuzzleHttpClientFactory::class;`
`25`	`25`
`26`		`- public function testHttpClientInstance():void{`
	`26`	`+ public function httpClientInstance():void{`
`27`	`27`	`$this::assertInstanceOf(Client::class, $this->httpClient);`
`28`	`28`	`}`
`29`	`29`