minor #17497 [SecurityBundle] Optimize dependency injection tests (paradajozsef)

fabpot · fabpot · commit 93b831b39568 · 2016-01-23T10:46:31.000+01:00
This PR was squashed before being merged into the 2.3 branch (closes #17497). Discussion ---------- [SecurityBundle] Optimize dependency injection tests | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17366 | License | MIT | Doc PR | - Tests building the same container multiple times. The same solution can be applied as here: #17399. This time I ran comparison tests only on 2.3. (my laptop is really slow) **2.3 before** ```go Time: 14.79 seconds, Memory: 48.25Mb OK (77 tests, 227 assertions) OK src/Symfony/Bundle/SecurityBundle/ ``` **2.3 after** ```go Time: 9.78 seconds, Memory: 48.75Mb OK (77 tests, 227 assertions) OK src/Symfony/Bundle/SecurityBundle/ ``` Commits ------- bf56d2f [SecurityBundle] Optimize dependency injection tests
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -19,6 +19,8 @@
 
 abstract class CompleteConfigurationTest extends \PHPUnit_Framework_TestCase
 {
+    private static $containerCache = array();
+
     abstract protected function loadFromFile(ContainerBuilder $container, $file);
 
     public function testRolesHierarchy()
@@ -182,6 +184,9 @@ public function testCustomAclProvider()
 
     protected function getContainer($file)
     {
+        if (isset(self::$containerCache[$file])) {
+            return self::$containerCache[$file];
+        }
         $container = new ContainerBuilder();
         $security = new SecurityExtension();
         $container->registerExtension($security);
@@ -194,6 +199,6 @@ protected function getContainer($file)
         $container->getCompilerPassConfig()->setRemovingPasses(array());
         $container->compile();
 
-        return $container;
+        return self::$containerCache[$file] = $container;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`
`20`	`20`	`abstract class CompleteConfigurationTest extends \PHPUnit_Framework_TestCase`
`21`	`21`	`{`
	`22`	`+ private static $containerCache = array();`
	`23`	`+`
`22`	`24`	`abstract protected function loadFromFile(ContainerBuilder $container, $file);`
`23`	`25`
`24`	`26`	`public function testRolesHierarchy()`
`@@ -182,6 +184,9 @@ public function testCustomAclProvider()`
`182`	`184`
`183`	`185`	`protected function getContainer($file)`
`184`	`186`	`{`
	`187`	`+ if (isset(self::$containerCache[$file])) {`
	`188`	`+ return self::$containerCache[$file];`
	`189`	`+ }`
`185`	`190`	`$container = new ContainerBuilder();`
`186`	`191`	`$security = new SecurityExtension();`
`187`	`192`	`$container->registerExtension($security);`
`@@ -194,6 +199,6 @@ protected function getContainer($file)`
`194`	`199`	`$container->getCompilerPassConfig()->setRemovingPasses(array());`
`195`	`200`	`$container->compile();`
`196`	`201`
`197`		`- return $container;`
	`202`	`+ return self::$containerCache[$file] = $container;`
`198`	`203`	`}`
`199`	`204`	`}`