Merge pull request #4 from moufmouf/extend_service_not_found

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

Hide file tree

Showing 7 changed files with 62 additions and 40 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "phpstan/phpstan": "^0.8.5",
         "thecodingmachine/phpstan-strict-rules": "^0.8.4",
         "satooshi/php-coveralls": "^1.0.1",
-        "mnapoli/simplex": "^0.3",
+        "mnapoli/simplex": "^0.4.1",
         "bamarni/composer-bin-plugin": "^1.1"
     },
     "autoload": {

diff --git a/src/ExtensionDefinition.php b/src/ExtensionDefinition.php
@@ -60,6 +60,9 @@ public function buildExtensionCode(string $functionName) : string
                 } else {
                     $previousTypeCode = '\\'.(string) $previousType.' ';
                 }
+                if ($previousParameter->allowsNull()) {
+                    $previousTypeCode = '?'.$previousTypeCode;
+                }
             }
             $previousParameterCode = ', '.$previousTypeCode.'$previous';
             if ($previousParameter->isDefaultValueAvailable()) {

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -321,7 +321,7 @@ private function buildTagsCode(string $tagMethodName, array $taggedServices): st
 
         return sprintf(
             <<<EOF
-    public static function %s(ContainerInterface \$container, ?\SplPriorityQueue \$queue): \SplPriorityQueue
+    public static function %s(ContainerInterface \$container, ?\SplPriorityQueue \$queue = null): \SplPriorityQueue
     {
         \$queue = \$queue ?: new \SplPriorityQueue();
 %s

diff --git a/tests/ExtensionDefinitionTest.php b/tests/ExtensionDefinitionTest.php
@@ -86,7 +86,7 @@ public function testBuildExtension2()
         $code = $extensionDefinition->buildExtensionCode('foo');
 
         $this->assertSame(<<<EOF
-    public static function foo(ContainerInterface \$container, \DateTimeInterface \$previous = NULL): \DateTimeInterface
+    public static function foo(ContainerInterface \$container, ?\DateTimeInterface \$previous = NULL): \DateTimeInterface
     {
         return \TheCodingMachine\Funky\Fixtures\TestServiceProvider::testExtension2(\$previous);
     }

diff --git a/tests/Fixtures/TestServiceProvider.php b/tests/Fixtures/TestServiceProvider.php
@@ -69,4 +69,14 @@ public static function taggedService3() : string
     {
         return 'bar';
     }
+
+    /**
+     * @Extension(
+     *     name="extendNonExistent"
+     * )
+     */
+    public static function extendNotExistent(string $value = 'foo') : string
+    {
+        return $value;
+    }
 }
diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -149,8 +149,7 @@ public function testTags()
         $this->assertArrayHasKey('mytag2', $extensions);
         $this->assertArrayHasKey('mytag3', $extensions);
 
-        $simplex = new Container();
-        $simplex->register($sp);
+        $simplex = new Container([$sp]);
 
         $mytag1 = $simplex->get('mytag1');
         /* @var $mytag1 \SplPriorityQueue */
@@ -160,4 +159,14 @@ public function testTags()
         $this->assertSame('foo', $mytag1array[0]);
         $this->assertSame('bar', $mytag1array[1]);
     }
+
+    public function testExtendNonExistentService()
+    {
+        $sp = new TestServiceProvider();
+
+        $simplex = new Container([$sp]);
+
+        $value = $simplex->get('extendNonExistent');
+        $this->assertSame('foo', $value);
+    }
 }
diff --git a/vendor-bin/infection/composer.lock b/vendor-bin/infection/composer.lock