symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Lines changed: 8 additions & 12 deletions b/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Lines changed: 8 additions & 12 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
Lines changed: 1 addition & 2 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator_php55.php renamed to ‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator_php55.php renamed to ‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator_php70.php
Lines changed: 0 additions & 110 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator_php70.php
Lines changed: 0 additions & 110 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator_php71.php
Lines changed: 0 additions & 110 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator_php71.php
Lines changed: 0 additions & 110 deletions
@@ -1687,23 +1687,19 @@ private function dumpValue($value, $interpolate = true)
 
     private function dumpServiceClosure(Reference $reference, $interpolate, $oneLine)
     {
-        $type = '';
-        if (PHP_VERSION_ID >= 70000 && $reference instanceof TypedReference) {
-            $type = $reference->getType();
-            if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE === $reference->getInvalidBehavior()) {
-                $type = ': \\'.$type;
-            } elseif (PHP_VERSION_ID >= 70100) {
-                $type = ': ?\\'.$type;
-            } else {
-                $type = '';
-            }
+        $code = $this->dumpValue($reference, $interpolate);
+
+        if ($reference instanceof TypedReference) {
+            $code = sprintf('$f = function (\\%s $v%s) { return $v; }; return $f(%s);', $reference->getType(), ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior() ? ' = null' : '', $code);
+        } else {
+            $code = sprintf('return %s;', $code);
         }
 
         if ($oneLine) {
-            return sprintf('function ()%s { return %s; }', $type, $this->dumpValue($reference, $interpolate));
+            return sprintf('function () { %s }', $code);
         }
 
-        return sprintf("function ()%s {\n            return %s;\n        }", $type, $this->dumpValue($reference, $interpolate));
+        return sprintf("function () {\n            %s\n        }", $code);
     }
 
     /**
 
@@ -648,7 +648,6 @@ public function testServiceLocator()
 
         $dumper = new PhpDumper($container);
 
-        $suffix = PHP_VERSION_ID >= 70100 ? '71' : (PHP_VERSION_ID >= 70000 ? '70' : '55');
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_locator_php'.$suffix.'.php', $dumper->dump());
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_locator.php', $dumper->dump());
     }
 }
@@ -87,7 +87,7 @@ protected function getFooServiceService()
         return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(array('bar' => function () {
             return ${($_ = isset($this->services['bar_service']) ? $this->services['bar_service'] : $this->get('bar_service')) && false ?: '_'};
         }, 'baz' => function () {
-            return ${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->getBazServiceService()) && false ?: '_'};
+            $f = function (\stdClass $v) { return $v; }; return $f(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->getBazServiceService()) && false ?: '_'});
         }));
     }
Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,6 @@ public function testServiceLocator()`
`648`	`648`
`649`	`649`	`$dumper = new PhpDumper($container);`
`650`	`650`
`651`		`- $suffix = PHP_VERSION_ID >= 70100 ? '71' : (PHP_VERSION_ID >= 70000 ? '70' : '55');`
`652`		`- $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_locator_php'.$suffix.'.php', $dumper->dump());`
	`651`	`+ $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_locator.php', $dumper->dump());`
`653`	`652`	`}`
`654`	`653`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ protected function getFooServiceService()`
`87`	`87`	`return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(array('bar' => function () {`
`88`	`88`	`return ${($_ = isset($this->services['bar_service']) ? $this->services['bar_service'] : $this->get('bar_service')) && false ?: '_'};`
`89`	`89`	`}, 'baz' => function () {`
`90`		`- return ${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->getBazServiceService()) && false ?: '_'};`
	`90`	`+ $f = function (\stdClass $v) { return $v; }; return $f(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->getBazServiceService()) && false ?: '_'});`
`91`	`91`	`}));`
`92`	`92`	`}`
`93`	`93`