Make service not shared when prototype scope is set

wouterj · wouterj · commit 5fb9f3de7bec · 2015-06-24T22:07:11.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -649,6 +649,10 @@ public function setScope($scope, $triggerDeprecationError = true)
             @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
+        if ('prototype' === $scope) {
+            $this->setShared(false);
+        }
+
         $this->scope = $scope;
 
         return $this;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services9.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services9.xml
@@ -33,6 +33,6 @@
       <configurator class="%baz_class%" method="configureStatic1"/>
     </service>
     <service id="factory_service" class="Bar" factory-method="getInstance" factory-service="foo.baz"/>
-    <service id="foo_bar" class="%foo_class%" scope="prototype"/>
+    <service id="foo_bar" class="%foo_class%" shared="false" scope="prototype"/>
   </services>
 </container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services9.yml
@@ -29,4 +29,5 @@ services:
         factory_service: foo.baz
     foo_bar:
         class: %foo_class%
+        shared: false
         scope: prototype

Original file line number	Diff line number	Diff line change
`@@ -649,6 +649,10 @@ public function setScope($scope, $triggerDeprecationError = true)`
`649`	`649`	`@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);`
`650`	`650`	`}`
`651`	`651`
	`652`	`+ if ('prototype' === $scope) {`
	`653`	`+ $this->setShared(false);`
	`654`	`+ }`
	`655`	`+`
`652`	`656`	`$this->scope = $scope;`
`653`	`657`
`654`	`658`	`return $this;`