fix issues with conflicting container instances

lsmith77 · wouterj · commit e721ebfd56d2 · 2015-10-28T11:28:58.000+01:00
Conflicts:
	composer.json
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';

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';`