fix optional nullable parameters with another case

Author: mikey179

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 8.0.6 (2024-01-17)
+
+* Fixed optional nullable parameters with another case
+
 ## 8.0.5 (2024-01-14)
 
 * Restrict deprecated support for methods and functions without a return type to user-defined methods and functions

src/main/php/internal/Parameters.php

@@ -80,8 +80,7 @@ private function isNonOptionalNullable(ReflectionParameter $parameter): bool
         $type = $parameter->getType();
         return $type instanceof ReflectionNamedType
             && 'mixed' !== $type->getName()
-            && !$parameter->isOptional()
-            && $parameter->allowsNull();
+            && ($parameter->isOptional() || $parameter->allowsNull());
     }
 
     private function defaultValue(ReflectionParameter $parameter): string

src/test/php/NonOptionalNullableTest.php

@@ -10,6 +10,7 @@
  */
 namespace bovigo\callmap;
 
+use PDOStatement;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\Attributes\Test;
@@ -22,19 +23,34 @@
  * @since 8.0.4
  */
 #[Group('bug_nonoptional_nullable')]
-#[RequiresPhpExtension('xsl')]
 class NonOptionalNullableTest extends TestCase
 {
     /**
      * XSLTProcessor::setProfiling(?string $filename) has
      * a non-optional nullable parameter.
      */
     #[Test]
+    #[Group('xsl')]
+    #[RequiresPhpExtension('xsl')]
     public function canCreateClassProxy(): void
     {
         assertInstanceOf(
             ClassProxy::class,
             NewInstance::of(XSLTProcessor::class)
         );
     }
+
+    /**
+     * @since 8.0.6
+     */
+    #[Test]
+    #[Group('pdo')]
+    #[RequiresPhpExtension('pdo')]
+    public function canCreatePdoStatementProxy(): void
+    {
+        assertInstanceOf(
+            ClassProxy::class,
+            NewInstance::of(PDOStatement::class)
+        );
+    }
 }