Merge branch 'MAGETWO-55903' of https://github.com/magento-falcons/magento2ce into MAGETWO-55903

Bohdan Korablov · Bohdan Korablov · commit eeefc7ccf28d · 2016-07-27T14:42:02.000+03:00
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Model/ObjectManagerProviderTest.php b/dev/tests/integration/testsuite/Magento/Setup/Model/ObjectManagerProviderTest.php
@@ -23,7 +23,7 @@ class ObjectManagerProviderTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->locator = $this->getMockForAbstractClass('Zend\ServiceManager\ServiceLocatorInterface');
-        $this->object = new ObjectManagerProvider($this->locator);
+        $this->object = new ObjectManagerProvider($this->locator, new Bootstrap());
     }
 
     public function testGet()

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class ObjectManagerProviderTest extends \PHPUnit_Framework_TestCase`
`23`	`23`	`protected function setUp()`
`24`	`24`	`{`
`25`	`25`	`$this->locator = $this->getMockForAbstractClass('Zend\ServiceManager\ServiceLocatorInterface');`
`26`		`- $this->object = new ObjectManagerProvider($this->locator);`
	`26`	`+ $this->object = new ObjectManagerProvider($this->locator, new Bootstrap());`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public function testGet()`