bug #24365 [DependencyInjection] fix tests (xabbuh)

ogizanagi · ogizanagi · commit 73ef4a909bfc · 2017-09-28T19:31:45.000+02:00
This PR was merged into the 4.0-dev branch. Discussion ---------- [DependencyInjection] fix tests | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | adapt tests from #22200 | License | MIT | Doc PR | Commits ------- 08deb37 [DependencyInjection] fix tests
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -274,8 +274,8 @@ use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 // Returns the public 'tagged_iterator' shared service.
 
 return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
-    yield 0 => ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->load(__DIR__.'/getFooService.php')) && false ?: '_'};
-    yield 1 => ${($_ = isset($this->services['tagged_iterator_foo']) ? $this->services['tagged_iterator_foo'] : $this->services['tagged_iterator_foo'] = new \Bar()) && false ?: '_'};
+    yield 0 => ($this->services['foo'] ?? $this->load(__DIR__.'/getFooService.php'));
+    yield 1 => ($this->privates['tagged_iterator_foo'] ?? $this->privates['tagged_iterator_foo'] = new \Bar());
 }, 2));
 
     [Container%s/getTaggedIteratorFooService.php] => <?php
@@ -285,7 +285,7 @@ use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 // Returns the private 'tagged_iterator_foo' shared service.
 
-return $this->services['tagged_iterator_foo'] = new \Bar();
+return $this->privates['tagged_iterator_foo'] = new \Bar();
 
     [Container%s/Container.php] => <?php
 
@@ -348,7 +348,6 @@ class Container%s extends Container
             'new_factory_service' => __DIR__.'/getNewFactoryServiceService.php',
             'service_from_static_method' => __DIR__.'/getServiceFromStaticMethodService.php',
             'tagged_iterator' => __DIR__.'/getTaggedIteratorService.php',
-            'tagged_iterator_foo' => __DIR__.'/getTaggedIteratorFooService.php',
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -53,7 +53,6 @@ public function __construct()
             'new_factory_service' => 'getNewFactoryServiceService',
             'service_from_static_method' => 'getServiceFromStaticMethodService',
             'tagged_iterator' => 'getTaggedIteratorService',
-            'tagged_iterator_foo' => 'getTaggedIteratorFooService',
         );
         $this->aliases = array(
             'alias_for_alias' => 'foo',
@@ -382,8 +381,8 @@ protected function getServiceFromStaticMethodService()
     protected function getTaggedIteratorService()
     {
         return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
-            yield 0 => ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'};
-            yield 1 => ${($_ = isset($this->services['tagged_iterator_foo']) ? $this->services['tagged_iterator_foo'] : $this->services['tagged_iterator_foo'] = new \Bar()) && false ?: '_'};
+            yield 0 => ($this->services['foo'] ?? $this->getFooService());
+            yield 1 => ($this->privates['tagged_iterator_foo'] ?? $this->privates['tagged_iterator_foo'] = new \Bar());
         }, 2));
     }
 
@@ -401,16 +400,6 @@ protected function getFactorySimpleService()
         return $this->privates['factory_simple'] = new \SimpleFactoryClass('foo');
     }
 
-    /**
-     * Gets the private 'tagged_iterator_foo' shared service.
-     *
-     * @return \Bar
-     */
-    protected function getTaggedIteratorFooService()
-    {
-        return $this->services['tagged_iterator_foo'] = new \Bar();
-    }
-
     /**
      * {@inheritdoc}
      */
