bug #13035 Added the function providers as container resources (stof)

fabpot · fabpot · commit b4434597347c · 2014-12-20T12:36:51.000+01:00
This PR was merged into the 2.6 branch. Discussion ---------- Added the function providers as container resources | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Changing the way an expression is compiled should invalidate the container, so that the change is taken into account. Commits ------- 513ebff Added the function providers as container resources
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1500,6 +1500,12 @@ private function getExpressionLanguage()
             }
             $providers = array_merge($this->container->getExpressionLanguageProviders(), $this->expressionLanguageProviders);
             $this->expressionLanguage = new ExpressionLanguage(null, $providers);
+
+            if ($this->container->isTrackingResources()) {
+                foreach ($providers as $provider) {
+                    $this->container->addObjectResource($provider);
+                }
+            }
         }
 
         return $this->expressionLanguage;

Original file line number	Diff line number	Diff line change
`@@ -1500,6 +1500,12 @@ private function getExpressionLanguage()`
`1500`	`1500`	`}`
`1501`	`1501`	`$providers = array_merge($this->container->getExpressionLanguageProviders(), $this->expressionLanguageProviders);`
`1502`	`1502`	`$this->expressionLanguage = new ExpressionLanguage(null, $providers);`
	`1503`	`+`
	`1504`	`+ if ($this->container->isTrackingResources()) {`
	`1505`	`+ foreach ($providers as $provider) {`
	`1506`	`+ $this->container->addObjectResource($provider);`
	`1507`	`+ }`
	`1508`	`+ }`
`1503`	`1509`	`}`
`1504`	`1510`
`1505`	`1511`	`return $this->expressionLanguage;`