diff --git a/setup/src/Magento/Setup/Model/PackagesData.php b/setup/src/Magento/Setup/Model/PackagesData.php index 4d113728a8b7ebfced96d32f64a6166872db2c18..f2a759aca54211295e4dd427932bab4eb00c63ec 100644 --- a/setup/src/Magento/Setup/Model/PackagesData.php +++ b/setup/src/Magento/Setup/Model/PackagesData.php @@ -40,11 +40,6 @@ class PackagesData */ private $packagesAuth; - /** - * @var \Magento\Setup\Model\DateTime\TimeZoneProvider - */ - private $timeZoneProvider; - /** * @var \Magento\Setup\Model\ObjectManagerProvider */ @@ -54,21 +49,18 @@ class PackagesData * PackagesData constructor. * * @param \Magento\Framework\Composer\ComposerInformation $composerInformation, - * @param \Magento\Setup\Model\DateTime\TimeZoneProvider $timeZoneProvider, * @param \Magento\Setup\Model\PackagesAuth $packagesAuth, * @param \Magento\Framework\Filesystem $filesystem, * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider */ public function __construct( \Magento\Framework\Composer\ComposerInformation $composerInformation, - \Magento\Setup\Model\DateTime\TimeZoneProvider $timeZoneProvider, \Magento\Setup\Model\PackagesAuth $packagesAuth, \Magento\Framework\Filesystem $filesystem, \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider ) { $this->objectManagerProvider = $objectManagerProvider; $this->composerInformation = $composerInformation; - $this->timeZoneProvider = $timeZoneProvider; $this->packagesAuth = $packagesAuth; $this->filesystem = $filesystem; } @@ -133,7 +125,9 @@ class PackagesData */ private function formatSyncDate($syncDate) { - $timezone = $this->timeZoneProvider->get(); + $objectManager = $this->objectManagerProvider->get(); + $timeZoneProvider = $objectManager->get('Magento\Setup\Model\DateTime\TimeZoneProvider'); + $timezone = $timeZoneProvider->get(); return [ 'date' => $timezone->formatDateTime( new \DateTime('@'.$syncDate), diff --git a/setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php b/setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php index 3c096fa1faf6f98c497e0b5c80c9a8b1da0ba323..60623b5eeb1e9bfaaf3b2cd95ed5417c9bef3e59 100644 --- a/setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php @@ -51,8 +51,10 @@ class PackagesDataTest extends \PHPUnit_Framework_TestCase $applicationFactory->expects($this->any())->method('create')->willReturn($application); $objectManager->expects($this->any()) ->method('get') - ->with('Magento\Framework\Composer\MagentoComposerApplicationFactory') - ->willReturn($applicationFactory); + ->will($this->returnValueMap([ + ['Magento\Framework\Composer\MagentoComposerApplicationFactory', $applicationFactory], + ['Magento\Setup\Model\DateTime\TimeZoneProvider', $timeZoneProvider] + ])); $objectManagerProvider->expects($this->any())->method('get')->willReturn($objectManager); $directoryWrite = $this->getMockForAbstractClass('\Magento\Framework\Filesystem\Directory\WriteInterface'); @@ -86,7 +88,6 @@ class PackagesDataTest extends \PHPUnit_Framework_TestCase $this->packagesData = new PackagesData( $composerInformation, - $timeZoneProvider, $packagesAuth, $filesystem, $objectManagerProvider