Code modernizations for PHP 8.3

PHPWatch · Dec 30, 2023 · 4c89a1d · 4c89a1d
1 parent ad3a49f
commit 4c89a1d
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 25 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "php": "^8.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.5.5"
     },
     "license": "MIT",
     "authors": [

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" forceCoversAnnotation="false" beStrictAboutCoversAnnotation="true" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" cacheResult="true" colors="true" verbose="true">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" beStrictAboutOutputDuringTests="true" cacheResult="true" colors="true" cacheDirectory=".phpunit.cache" requireCoverageMetadata="false" beStrictAboutCoverageMetadata="true">
+  <coverage>
     <report>
       <html outputDirectory="build/coverage-html"/>
       <text outputFile="php://stdout" showUncoveredFiles="false"/>
@@ -15,4 +12,9 @@
     </testsuite>
   </testsuites>
   <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Container.php b/src/Container.php
@@ -7,6 +7,7 @@
 use PHPWatch\SimpleContainer\Exception\NotFoundException;
 use Psr\Container\ContainerInterface;
 use function array_key_exists;
+use function gettype;
 use function is_callable;
 use function sprintf;
 
@@ -20,7 +21,7 @@ public function __construct(array $definitions = []) {
 		$this->definitions = $definitions;
 	}
 
-	private function getService(string $id) {
+	private function getService(string $id): mixed {
 		if (!$this->has($id)) {
 			throw new NotFoundException(sprintf('Container key "%s" is not defined', $id));
 		}
@@ -40,7 +41,7 @@ private function getService(string $id) {
 		return $this->generated[$id] = $this->definitions[$id]($this);
 	}
 
-	public function set(string $id, $value): void {
+	public function set(string $id, mixed $value): void {
 		if (array_key_exists($id, $this->definitions)) {
 			unset($this->generated[$id], $this->factories[$id], $this->protected[$id]);
 		}
@@ -70,32 +71,32 @@ private function getDefaultDefinition(string $id, string $exception_message): ca
 			throw new BadMethodCallException($exception_message);
 		}
 		if (!is_callable($this->definitions[$id])) {
-			throw new BadMethodCallException(sprintf('Definition for "%s" expected to be a callable, "%s" found', $id, \gettype($this->definitions[$id])));
+			throw new BadMethodCallException(sprintf('Definition for "%s" expected to be a callable, "%s" found', $id, gettype($this->definitions[$id])));
 		}
 
 		return $this->definitions[$id];
 	}
 
-	public function offsetSet($id, $value): void {
-		$this->set($id, $value);
+	public function offsetSet(mixed $offset, mixed $value): void {
+		$this->set($offset, $value);
 	}
 
-	public function offsetUnset($id): void {
-		unset($this->definitions[$id], $this->generated[$id], $this->factories[$id], $this->protected[$id]);
+	public function offsetUnset(mixed $offset): void {
+		unset($this->definitions[$offset], $this->generated[$offset], $this->factories[$offset], $this->protected[$offset]);
 	}
 
-	public function offsetExists(mixed $id): bool {
-		return array_key_exists($id, $this->definitions);
+	public function offsetExists(mixed $offset): bool {
+		return array_key_exists($offset, $this->definitions);
 	}
 
-	public function offsetGet(mixed $id): mixed {
-		return $this->getService($id);
+	public function offsetGet(mixed $offset): mixed {
+		return $this->getService($offset);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function get(string $id) {
+	public function get(string $id): mixed {
 		return $this->getService($id);
 	}
 

diff --git a/tests/ContainerFactoryTest.php b/tests/ContainerFactoryTest.php
@@ -5,9 +5,18 @@
 use PHPWatch\SimpleContainer\Container;
 use PHPUnit\Framework\TestCase;
 
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+
+use const PHP_INT_MAX;
+
 class ContainerFactoryTest extends TestCase {
+    /**
+     * @throws NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     */
     public function testFactoryReturnsDifferentValues(): void {
-        $random = fn() => random_int(43, \PHP_INT_MAX);
+        $random = static fn() => random_int(43, PHP_INT_MAX);
         $container = new Container(['foo' => $random]);
 
         $this->assertGreaterThan(42, $container->get('foo'));

diff --git a/tests/ContainerProtectedTest.php b/tests/ContainerProtectedTest.php
@@ -7,7 +7,7 @@
 
 class ContainerProtectedTest extends TestCase {
     public function testProtectedFromDefinition(): void {
-        $item = fn() => 42;
+        $item = static fn() => 42;
         $container = new Container(['foo' => $item, 'bar' => 42]);
 
         $this->assertSame(42, $container['foo']);

diff --git a/tests/ContainerServiceCacheTest.php b/tests/ContainerServiceCacheTest.php
@@ -6,6 +6,9 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
+use const PHP_INT_MAX;
+use const PHP_INT_MIN;
+
 class ContainerServiceCacheTest extends TestCase {
     public function testStandardServiceResolutionInInit(): void {
         $container = new Container(
@@ -23,7 +26,7 @@ public function testStandardServiceResolutionInInit(): void {
 
     public function testStandardServiceResolution(): void {
         $container = new Container();
-        $random = fn() => random_int(\PHP_INT_MIN, \PHP_INT_MAX);
+        $random = fn() => random_int(PHP_INT_MIN, PHP_INT_MAX);
         $container->set('bar', $random);
 
         $value = $container['bar'];
@@ -38,7 +41,7 @@ public function testStandardServiceResolution(): void {
     }
 
     public function testServiceOverrides(): void {
-        $random = fn() => random_int(43, \PHP_INT_MAX);
+        $random = static fn() => random_int(43, PHP_INT_MAX);
         $static = 42;
 
         $container = new Container(['foo' => $random]);

diff --git a/tests/ContainerStaticValuesTest.php b/tests/ContainerStaticValuesTest.php
@@ -5,6 +5,7 @@
 use Exception;
 use PHPWatch\SimpleContainer\Container;
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
 use stdClass;
 
 class ContainerStaticValuesTest extends TestCase {
@@ -74,7 +75,7 @@ public function testIssetWorks(): void {
     public function testIssetDoesNotExecute(): void {
         $container = new Container();
         $container->set('kill', static function() {
-            throw new Exception('Must not execute');
+            throw new RuntimeException('Must not execute');
         });
 
         $this->assertTrue(isset($container['kill']));

diff --git a/tests/Exception/BadMethodCallExceptionTest.php b/tests/Exception/BadMethodCallExceptionTest.php
@@ -13,7 +13,7 @@ public function testMarkProtectedWithoutClosure(): void {
         $container->setProtected('foo');
     }
 
-    public function testMarkFactorydWithoutClosure(): void {
+    public function testMarkFactoryWithoutClosure(): void {
         $container = new Container();
         $this->expectException(BadMethodCallException::class);
         $container->setFactory('foo');

diff --git a/tests/Exception/NotFoundExceptionTest.php b/tests/Exception/NotFoundExceptionTest.php
@@ -20,7 +20,7 @@ public function testNulledValuesDoNotThrow(): void {
 
     public function testClosureNullReturnsDoNotThrow(): void {
         $container = new Container();
-        $container['foo'] = fn(): ?string => null;
+        $container['foo'] = static fn(): ?string => null;
         $this->assertNull($container['foo']);
         $this->assertNull($container['foo']); // Trigger cached result