Merge branch '2.3' into 2.7

stof · stof · commit 87b80a203d8b · 2015-12-05T12:06:38.000+01:00
* 2.3:
  [Process] Unset callback after stop to free memory
  Improve error message for undefined DIC aliases
  Fix typo
  CS: remove unneeded parentheses around control statements
diff --git a/Compiler/ReplaceAliasByActualDefinitionPass.php b/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -45,7 +45,7 @@ public function process(ContainerBuilder $container)
             try {
                 $definition = $container->getDefinition($aliasId);
             } catch (InvalidArgumentException $e) {
-                throw new InvalidArgumentException(sprintf('Unable to replace alias "%s" with "%s".', $alias, $id), null, $e);
+                throw new InvalidArgumentException(sprintf('Unable to replace alias "%s" with actual definition "%s".', $id, $alias), null, $e);
             }
 
             if ($definition->isPublic()) {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function process(ContainerBuilder $container)`
`45`	`45`	`try {`
`46`	`46`	`$definition = $container->getDefinition($aliasId);`
`47`	`47`	`} catch (InvalidArgumentException $e) {`
`48`		`- throw new InvalidArgumentException(sprintf('Unable to replace alias "%s" with "%s".', $alias, $id), null, $e);`
	`48`	`+ throw new InvalidArgumentException(sprintf('Unable to replace alias "%s" with actual definition "%s".', $id, $alias), null, $e);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`if ($definition->isPublic()) {`