PHP 8.4+

Author: codemasher

.github/workflows/ci.yml

@@ -31,11 +31,8 @@ jobs:
       fail-fast: true
       matrix:
         php-version:
-          - "8.1"
-          - "8.2"
-          - "8.3"
           - "8.4"
-#          - "8.5"
+          - "8.5"
 
     steps:
       - name: "Checkout"
@@ -105,9 +102,6 @@ jobs:
           - ubuntu-latest
           - windows-latest
         php-version:
-          - "8.1"
-          - "8.2"
-          - "8.3"
           - "8.4"
           - "8.5"
 

README.md

@@ -35,7 +35,7 @@ A container class for settings objects - decouple configuration logic from your
 ```json
 {
 	"require": {
-		"php": "^8.1",
+		"php": "^8.4",
 		"chillerlan/php-settings-container": "dev-main"
 	}
 }

composer.json

@@ -20,16 +20,16 @@
 		"source": "https://github.com/chillerlan/php-settings-container"
 	},
 	"require": {
-		"php": "^8.1",
+		"php": "^8.4",
 		"ext-json": "*"
 	},
 	"require-dev": {
-		"phan/phan": "^5.5.2",
+		"phan/phan": "^6.0.2",
 		"phpmd/phpmd": "^2.15",
-		"phpstan/phpstan": "^2.1.31",
-		"phpstan/phpstan-deprecation-rules": "^2.0.3",
-		"phpunit/phpunit": "^10.5",
-		"slevomat/coding-standard": "^8.22",
+		"phpstan/phpstan": "^2.1.41",
+		"phpstan/phpstan-deprecation-rules": "^2.0.4",
+		"phpunit/phpunit": "^13.0",
+		"slevomat/coding-standard": "^8.28",
 		"squizlabs/php_codesniffer": "^4.0"
 	},
 	"autoload": {

phpunit.xml.dist

@@ -2,7 +2,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         cacheResultFile=".build/phpunit.result.cache"
+         cacheDirectory=".build/phpunit-cache"
          colors="true"
 >
 	<testsuites>

src/Attributes/ThrowOnInvalidProperty.php

@@ -14,15 +14,15 @@
 use Attribute;
 
 /**
- * Tells the magic get/set methods whether to throw when a properety is inaccessible
+ * Tells the magic get/set methods whether to throw when a property is inaccessible
  *
  * @see \chillerlan\Settings\SettingsContainerAbstract::throwOnInvalidProperty()
  */
 #[Attribute(Attribute::TARGET_CLASS)]
-final class ThrowOnInvalidProperty{
+final readonly class ThrowOnInvalidProperty{
 
 	public function __construct(
-		public readonly bool $throwOnInvalid,
+		public bool $throwOnInvalid,
 	){}
 
 }

src/SettingsContainerAbstract.php

@@ -12,16 +12,16 @@
 namespace chillerlan\Settings;
 
 use chillerlan\Settings\Attributes\ThrowOnInvalidProperty;
-use InvalidArgumentException, JsonException, ReflectionException, ReflectionObject,
+use InvalidArgumentException, JsonException, PropertyHookType, ReflectionException, ReflectionObject,
 	ReflectionProperty, ReflectionAttribute, RuntimeException;
 use function is_object, json_decode, json_encode, json_last_error_msg,
 	method_exists, property_exists, serialize, sprintf, unserialize;
-use const JSON_THROW_ON_ERROR, PHP_VERSION_ID;
+use const JSON_THROW_ON_ERROR;
 
 abstract class SettingsContainerAbstract implements SettingsContainerInterface{
 
-	protected const SET_PREFIX = 'set_';
-	protected const GET_PREFIX = 'get_';
+	protected const string SET_PREFIX = 'set_';
+	protected const string GET_PREFIX = 'get_';
 
 	/**
 	 * SettingsContainerAbstract constructor.
@@ -42,7 +42,7 @@ public function __construct(iterable|null $properties = null){
 	 * (remember pre-php5 classname constructors? yeah, basically this.)
 	 */
 	protected function construct():void{
-		$traits = (new ReflectionObject($this))->getTraits();
+		$traits = new ReflectionObject($this)->getTraits();
 
 		foreach($traits as $trait){
 			$method = $trait->getShortName();
@@ -109,44 +109,34 @@ public function __toString():string{
 	}
 
 	/**
-	 * @internal Checks if a property is private
+	 * Checks if a property is private
 	 */
 	final protected function isPrivate(string $property):bool{
-		return (new ReflectionProperty($this, $property))->isPrivate();
+		return new ReflectionProperty($this, $property)->isPrivate();
 	}
 
 	/**
-	 * @internal Checks if a property has a "set" hook
+	 * Checks if a property has a "set" hook
 	 */
 	final protected function hasSetHook(string $property):bool{
-
-		if(PHP_VERSION_ID < 80400){
-			return false;
-		}
-		/** @phan-suppress-next-line PhanUndeclaredMethod, PhanUndeclaredClassConstant */
-		return (new ReflectionProperty($this, $property))->hasHook(\PropertyHookType::Set);
+		return new ReflectionProperty($this, $property)->hasHook(PropertyHookType::Set);
 	}
 
 	/**
-	 * @internal Checks if a property has a "get" hook
+	 * Checks if a property has a "get" hook
 	 */
 	final protected function hasGetHook(string $property):bool{
-
-		if(PHP_VERSION_ID < 80400){
-			return false;
-		}
-		/** @phan-suppress-next-line PhanUndeclaredMethod, PhanUndeclaredClassConstant */
-		return (new ReflectionProperty($this, $property))->hasHook(\PropertyHookType::Get);
+		return new ReflectionProperty($this, $property)->hasHook(PropertyHookType::Get);
 	}
 
 	/**
-	 * @internal Checks for the attribute "ThrowOnInvalidProperty", used in the magic get/set
+	 * Checks for the attribute "ThrowOnInvalidProperty", used in the magic get/set
 	 *
 	 * @see \chillerlan\Settings\Attributes\ThrowOnInvalidProperty
 	 */
 	final protected function throwOnInvalidProperty():bool{
 
-		$attributes = (new ReflectionObject($this))
+		$attributes = new ReflectionObject($this)
 			->getAttributes(ThrowOnInvalidProperty::class, ReflectionAttribute::IS_INSTANCEOF)
 		;
 
@@ -161,7 +151,7 @@ final protected function throwOnInvalidProperty():bool{
 
 	public function toArray():array{
 
-		$properties = (new ReflectionObject($this))
+		$properties = new ReflectionObject($this)
 			->getProperties(~(ReflectionProperty::IS_STATIC | ReflectionProperty::IS_READONLY | ReflectionProperty::IS_PRIVATE))
 		;
 
@@ -240,10 +230,8 @@ public function unserialize(string $data):void{
 		$data       = [];
 
 		foreach($properties as $reflectionProperty){
-			$data[$reflectionProperty->name] = (PHP_VERSION_ID < 80400)
-				? $reflectionProperty->getValue($obj)
-				/** @phan-suppress-next-line PhanUndeclaredMethod */
-				: $reflectionProperty->getRawValue($obj);
+			// bypass existing property hooks
+			$data[$reflectionProperty->name] = $reflectionProperty->getRawValue($obj);
 		}
 
 		$this->__unserialize($data);
@@ -257,18 +245,15 @@ public function unserialize(string $data):void{
 	 */
 	public function __serialize():array{
 
-		$properties = (new ReflectionObject($this))
+		$properties = new ReflectionObject($this)
 			->getProperties(~(ReflectionProperty::IS_STATIC | ReflectionProperty::IS_READONLY))
 		;
 
 		$data = [];
 
 		foreach($properties as $reflectionProperty){
-			// bypass existing property hooks for PHP >= 8.4
-			$data[$reflectionProperty->name] = (PHP_VERSION_ID < 80400)
-				? $reflectionProperty->getValue($this)
-				/** @phan-suppress-next-line PhanUndeclaredMethod */
-				: $reflectionProperty->getRawValue($this);
+			// bypass existing property hooks
+			$data[$reflectionProperty->name] = $reflectionProperty->getRawValue($this);
 		}
 
 		return $data;
@@ -291,11 +276,8 @@ public function __unserialize(array $data):void{
 					continue; // @codeCoverageIgnore
 				}
 
-				(PHP_VERSION_ID < 80400)
-					? $reflectionProperty->setValue($this, $value)
-					/** @phan-suppress-next-line PhanUndeclaredMethod */
-					: $reflectionProperty->setRawValue($this, $value);
-
+				// bypass existing property hooks
+				$reflectionProperty->setRawValue($this, $value);
 			}
 			// @codeCoverageIgnoreStart
 			catch(ReflectionException){

tests/PropertyHooksTest.php

@@ -19,7 +19,6 @@
 /**
  * Tests to ensure that properties with hooks (PHP 8.4+) produce the same results as the custom get/set methods
  */
-#[RequiresPhp('>= 8.4')]
 final class PropertyHooksTest extends TestCase{
 
 	#[Test]