From 7352b7cc7616b4b0de0ee3109983ec64abb7ccd8 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov <bkorablov@magento.com> Date: Wed, 5 Oct 2016 12:39:53 +0300 Subject: [PATCH] MAGETWO-59256: [GitHub] Custom composer modules break Component Manager #6718 --- .../Magento/Setup/Test/Unit/Model/PackagesDataTest.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php b/setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php index c3dc8dace3e..a72751b25f2 100644 --- a/setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php @@ -55,12 +55,16 @@ class PackagesDataTest extends \PHPUnit_Framework_TestCase public function setUp() { $this->composerInformation = $this->getComposerInformation(); - $this->timeZoneProvider = $this->getMock(\Magento\Setup\Model\DateTime\TimeZoneProvider::class, [], [], '', false); + $this->timeZoneProvider = $this->getMockBuilder(\Magento\Setup\Model\DateTime\TimeZoneProvider::class) + ->disableOriginalConstructor() + ->getMock(); $timeZone = $this->getMock(\Magento\Framework\Stdlib\DateTime\Timezone::class, [], [], '', false); $this->timeZoneProvider->expects($this->any())->method('get')->willReturn($timeZone); $this->packagesAuth = $this->getMock(\Magento\Setup\Model\PackagesAuth::class, [], [], '', false); $this->filesystem = $this->getMock(\Magento\Framework\Filesystem::class, [], [], '', false); - $this->objectManagerProvider = $this->getMock(\Magento\Setup\Model\ObjectManagerProvider::class, [], [], '', false); + $this->objectManagerProvider = $this->getMockBuilder(\Magento\Setup\Model\ObjectManagerProvider::class) + ->disableOriginalConstructor() + ->getMock(); $objectManager = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class); $applicationFactory = $this->getMock( \Magento\Framework\Composer\MagentoComposerApplicationFactory::class, -- GitLab