fix issues with conflicting container instances

lsmith77 · lsmith77 · commit 0859f4874935 · 2015-06-23T21:09:24.000+02:00
diff --git a/Tests/WebTest/RedirectTest.php b/Tests/WebTest/RedirectTest.php
@@ -19,9 +19,10 @@ class RedirectTest extends BaseTestCase
 {
     public function setUp(array $options = array(), $routebase = null)
     {
-        parent::setUp($options, $routebase);
         $this->client = $this->createClient();
 
+        parent::setUp($options, $routebase);
+
         $article = new SeoArticle();
         $article->title = 'SEO Article';
         $article->path = '/test/article-1';
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "jms/metadata": "1.5.*"
     },
     "require-dev": {
-        "symfony-cmf/testing": "~1.2,>=1.2.6",
+        "symfony-cmf/testing": "dev-fix_container_creation as 1.2.7",
         "symfony/yaml": "~2.1",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
         "matthiasnoback/symfony-config-test": "0.*",

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,10 @@ class RedirectTest extends BaseTestCase`
`19`	`19`	`{`
`20`	`20`	`public function setUp(array $options = array(), $routebase = null)`
`21`	`21`	`{`
`22`		`- parent::setUp($options, $routebase);`
`23`	`22`	`$this->client = $this->createClient();`
`24`	`23`
	`24`	`+ parent::setUp($options, $routebase);`
	`25`	`+`
`25`	`26`	`$article = new SeoArticle();`
`26`	`27`	`$article->title = 'SEO Article';`
`27`	`28`	`$article->path = '/test/article-1';`