Merge branch '2.3' into 2.5

fabpot · fabpot · commit 816352f05bc7 · 2014-12-11T20:53:06.000+01:00
* 2.3:
  Revert "[DependencyInjection] backport perf optim"
  [WebProfilerBundle] replaced pattern to path attribute in routes definitions.
  [FrameworkBundle][Template name] avoid  error message for the shortcut notation.
  [DependencyInjection] perf optim: call dirname() at most 5x
  [DependencyInjection] backport perf optim
  [2.3] Remove possible call_user_func()

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
diff --git a/Tests/Functional/app/AppKernel.php b/Tests/Functional/app/AppKernel.php
@@ -105,7 +105,8 @@ public function serialize()
 
     public function unserialize($str)
     {
-        call_user_func_array(array($this, '__construct'), unserialize($str));
+        $a = unserialize($str);
+        $this->__construct($a[0], $a[1], $a[2], $a[3]);
     }
 
     protected function getKernelParameters()

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ public function serialize()`
`105`	`105`
`106`	`106`	`public function unserialize($str)`
`107`	`107`	`{`
`108`		`- call_user_func_array(array($this, '__construct'), unserialize($str));`
	`108`	`+ $a = unserialize($str);`
	`109`	`+ $this->__construct($a[0], $a[1], $a[2], $a[3]);`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`protected function getKernelParameters()`