Merge branch '2.8' into 3.0

fabpot · fabpot · commit 27e1770d32cd · 2016-02-28T17:35:35.000+01:00
* 2.8:
  fixed tests
diff --git a/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php b/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
@@ -55,8 +55,8 @@ public function testPrivateAliasesInFactory()
     {
         $container = new ContainerBuilder();
 
-        $container->register('a', 'FooClass');
-        $container->register('b', 'FooClass')
+        $container->register('a', 'Bar\FooClass');
+        $container->register('b', 'Bar\FooClass')
             ->setFactoryService('a')
             ->setFactoryMethod('getInstance');
 
@@ -65,7 +65,7 @@ public function testPrivateAliasesInFactory()
 
         $this->process($container);
 
-        $this->assertInstanceOf('FooClass', $container->get('b'));
+        $this->assertInstanceOf('Bar\FooClass', $container->get('b'));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ public function testPrivateAliasesInFactory()`
`55`	`55`	`{`
`56`	`56`	`$container = new ContainerBuilder();`
`57`	`57`
`58`		`- $container->register('a', 'FooClass');`
`59`		`- $container->register('b', 'FooClass')`
	`58`	`+ $container->register('a', 'Bar\FooClass');`
	`59`	`+ $container->register('b', 'Bar\FooClass')`
`60`	`60`	`->setFactoryService('a')`
`61`	`61`	`->setFactoryMethod('getInstance');`
`62`	`62`
`@@ -65,7 +65,7 @@ public function testPrivateAliasesInFactory()`
`65`	`65`
`66`	`66`	`$this->process($container);`
`67`	`67`
`68`		`- $this->assertInstanceOf('FooClass', $container->get('b'));`
	`68`	`+ $this->assertInstanceOf('Bar\FooClass', $container->get('b'));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`