Merge pull request #5 from moufmouf/fix_nullable_previous

Extending a service that does not exist always fails
thecodingmachine · Nov 29, 2017 · 842a244 · 842a244
2 parents 00ecab4 + 09fce5f
commit 842a244
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/ExtensionDefinition.php b/src/ExtensionDefinition.php
@@ -40,10 +40,11 @@ public function buildExtensionCode(string $functionName) : string
         $returnTypeCode = '';
         $returnType = $this->reflectionMethod->getReturnType();
         if ($returnType) {
+            $allowsNull = $returnType->allowsNull() ? '?':'';
             if ($returnType->isBuiltin()) {
-                $returnTypeCode = ': '.$this->reflectionMethod->getReturnType();
+                $returnTypeCode = ': '.$allowsNull.$returnType;
             } else {
-                $returnTypeCode = ': \\'.$this->reflectionMethod->getReturnType();
+                $returnTypeCode = ': '.$allowsNull.'\\'.$returnType;
             }
         }
 
@@ -67,6 +68,10 @@ public function buildExtensionCode(string $functionName) : string
             $previousParameterCode = ', '.$previousTypeCode.'$previous';
             if ($previousParameter->isDefaultValueAvailable()) {
                 $previousParameterCode .= ' = '.var_export($previousParameter->getDefaultValue(), true);
+            } elseif ($previousParameter->allowsNull()) {
+                // If a first argument has no default null value but is nullable (because of ?),
+                // we still put the null default value.
+                $previousParameterCode .= ' = null';
             }
         }
 

diff --git a/tests/Fixtures/TestServiceProvider.php b/tests/Fixtures/TestServiceProvider.php
@@ -79,4 +79,14 @@ public static function extendNotExistent(string $value = 'foo') : string
     {
         return $value;
     }
+
+    /**
+     * @Extension(
+     *     name="extendNonExistentNullable"
+     * )
+     */
+    public static function extendNotExistentNullable(?string $value) : ?string
+    {
+        return $value;
+    }
 }
diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -169,4 +169,14 @@ public function testExtendNonExistentService()
         $value = $simplex->get('extendNonExistent');
         $this->assertSame('foo', $value);
     }
+
+    public function testExtendNonExistentNullableService()
+    {
+        $sp = new TestServiceProvider();
+
+        $simplex = new Container([$sp]);
+
+        $value = $simplex->get('extendNonExistentNullable');
+        $this->assertNull($value);
+    }
 }