support for PHP 8.5

Author: dg

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.1', '8.2', '8.3', '8.4']
+                php: ['8.1', '8.2', '8.3', '8.4', '8.5']
 
             fail-fast: false
 

composer.json

@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": "8.1 - 8.4",
+		"php": "8.1 - 8.5",
 		"ext-tokenizer": "*",
 		"ext-ctype": "*",
 		"nette/neon": "^3.3",

readme.md

@@ -39,7 +39,7 @@ The recommended way to install is via Composer:
 composer require nette/di
 ```
 
-It requires PHP version 8.1 and supports PHP up to 8.4.
+It requires PHP version 8.1 and supports PHP up to 8.5.
 
  <!---->
 

src/DI/Resolver.php

@@ -51,13 +51,13 @@ public function getContainerBuilder(): ContainerBuilder
 
 	public function resolveDefinition(Definition $def): void
 	{
-		if ($this->recursive->contains($def)) {
+		if (isset($this->recursive[$def])) {
 			$names = array_map(fn($item) => $item->getName(), iterator_to_array($this->recursive));
 			throw new ServiceCreationException(sprintf('Circular reference detected for services: %s.', implode(', ', $names)));
 		}
 
 		try {
-			$this->recursive->attach($def);
+			$this->recursive[$def] = true;
 
 			$def->resolveType($this);
 
@@ -68,7 +68,7 @@ public function resolveDefinition(Definition $def): void
 			throw $this->completeException($e, $def);
 
 		} finally {
-			$this->recursive->detach($def);
+			unset($this->recursive[$def]);
 		}
 	}
 

tests/DI/ContainerBuilder.metadata.phpt

@@ -16,7 +16,6 @@ require __DIR__ . '/../bootstrap.php';
 function getPropertyValue($obj, string $name)
 {
 	$prop = (new ReflectionObject($obj))->getProperty($name);
-	$prop->setAccessible(true);
 	return $prop->getValue($obj);
 }