Merge pull request #300 from koriym/php8.5-support

Add PHP 8.5 support

Author: koriym

.github/workflows/continuous-integration.yml

@@ -9,6 +9,6 @@ jobs:
   ci:
     uses: ray-di/.github/.github/workflows/continuous-integration.yml@v1
     with:
-      old_stable: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'
-      current_stable: 8.4
+      old_stable: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]'
+      current_stable: 8.5
       script: demo/run.php

.sonarcloud.properties

@@ -0,0 +1,2 @@
+# Exclude GitHub workflow files from security hotspot analysis
+sonar.exclusions=.github/workflows/**

phpcs.xml

@@ -28,6 +28,7 @@
         <!-- Base -->
         <exclude name="Generic.Formatting.MultipleStatementAlignment.NotSame"/>
         <exclude name="Squiz.Strings.DoubleQuoteUsage.ContainsVar"/>
+        <exclude name="Squiz.WhiteSpace.LanguageConstructSpacing"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming.SuperfluousSuffix"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>
@@ -54,6 +55,7 @@
     </rule>
 
     <!-- Additional Rules -->
+    <rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
     <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
         <properties>
             <property name="searchAnnotations" value="true"/>

src/di/Injector.php

@@ -39,7 +39,7 @@ public function __construct($module = null, string $tmpDir = '')
         /** @var non-empty-string $classDir */
         $classDir = is_dir($tmpDir) ? $tmpDir : sys_get_temp_dir();
         if (! is_writable($classDir)) {
-            throw new DirectoryNotWritable($classDir); // @CodeCoverageIgnore
+            throw new DirectoryNotWritable($classDir); // @codeCoverageIgnore
         }
 
         $this->classDir = $classDir;

tests/di/SetterMethodTest.php

@@ -7,6 +7,7 @@
 use PHPUnit\Framework\TestCase;
 use Ray\Di\Exception\Unbound;
 use ReflectionMethod;
+use ReflectionParameter;
 
 use function spl_object_hash;
 
@@ -41,4 +42,115 @@ public function testUnbound(): void
         $car = new FakeCar(new FakeEngine());
         $this->setterMethods->__invoke($car, $container);
     }
+
+    public function testAcceptWithUnboundException(): void
+    {
+        $this->expectException(Unbound::class);
+        $method = new ReflectionMethod(FakeCar::class, 'setTires');
+        $setterMethod = new SetterMethod($method, new Name(Name::ANY));
+
+        $visitor = new class implements VisitorInterface
+        {
+            public function visitSetterMethod(string $method, Arguments $arguments): void
+            {
+                throw new Unbound(FakeTyreInterface::class);
+            }
+
+            public function visitDependency(NewInstance $newInstance, ?string $postConstruct, bool $isSingleton): void
+            {
+            }
+
+            public function visitProvider(Dependency $dependency, string $context, bool $isSingleton): string
+            {
+                return '';
+            }
+
+            /** @param mixed $value */
+            public function visitInstance($value): string
+            {
+                return '';
+            }
+
+            public function visitAspectBind(\Ray\Aop\Bind $aopBind): void
+            {
+            }
+
+            public function visitNewInstance(string $class, SetterMethods $setterMethods, ?Arguments $arguments, ?AspectBind $bind): void
+            {
+            }
+
+            /** @param array<SetterMethod> $setterMethods */
+            public function visitSetterMethods(array $setterMethods): void
+            {
+            }
+
+            /** @param array<Argument> $arguments */
+            public function visitArguments(array $arguments): void
+            {
+            }
+
+            /** @param mixed $defaultValue */
+            public function visitArgument(string $index, bool $isDefaultAvailable, $defaultValue, ReflectionParameter $parameter): void
+            {
+            }
+        };
+
+        $setterMethod->accept($visitor);
+    }
+
+    public function testAcceptWithUnboundExceptionOptional(): void
+    {
+        $method = new ReflectionMethod(FakeCar::class, 'setTires');
+        $setterMethod = new SetterMethod($method, new Name(Name::ANY));
+        $setterMethod->setOptional();
+
+        $visitor = new class implements VisitorInterface
+        {
+            public function visitSetterMethod(string $method, Arguments $arguments): void
+            {
+                throw new Unbound(FakeTyreInterface::class);
+            }
+
+            public function visitDependency(NewInstance $newInstance, ?string $postConstruct, bool $isSingleton): void
+            {
+            }
+
+            public function visitProvider(Dependency $dependency, string $context, bool $isSingleton): string
+            {
+                return '';
+            }
+
+            /** @param mixed $value */
+            public function visitInstance($value): string
+            {
+                return '';
+            }
+
+            public function visitAspectBind(\Ray\Aop\Bind $aopBind): void
+            {
+            }
+
+            public function visitNewInstance(string $class, SetterMethods $setterMethods, ?Arguments $arguments, ?AspectBind $bind): void
+            {
+            }
+
+            /** @param array<SetterMethod> $setterMethods */
+            public function visitSetterMethods(array $setterMethods): void
+            {
+            }
+
+            /** @param array<Argument> $arguments */
+            public function visitArguments(array $arguments): void
+            {
+            }
+
+            /** @param mixed $defaultValue */
+            public function visitArgument(string $index, bool $isDefaultAvailable, $defaultValue, ReflectionParameter $parameter): void
+            {
+            }
+        };
+
+        $result = $setterMethod->accept($visitor);
+        $this->assertNull($result);
+    }
 }