Skip to content

Commit e74d9a7

Browse files
committed
MAGETWO-52000: [Github][PR]impossible to see what is wrong with cron - unhelpful error message #3189
- Using OM to create TImeZoneProvider.
1 parent 75a3c2a commit e74d9a7

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

Diff for: setup/src/Magento/Setup/Model/PackagesData.php

+3-9
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ class PackagesData
4040
*/
4141
private $packagesAuth;
4242

43-
/**
44-
* @var \Magento\Setup\Model\DateTime\TimeZoneProvider
45-
*/
46-
private $timeZoneProvider;
47-
4843
/**
4944
* @var \Magento\Setup\Model\ObjectManagerProvider
5045
*/
@@ -54,21 +49,18 @@ class PackagesData
5449
* PackagesData constructor.
5550
*
5651
* @param \Magento\Framework\Composer\ComposerInformation $composerInformation,
57-
* @param \Magento\Setup\Model\DateTime\TimeZoneProvider $timeZoneProvider,
5852
* @param \Magento\Setup\Model\PackagesAuth $packagesAuth,
5953
* @param \Magento\Framework\Filesystem $filesystem,
6054
* @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
6155
*/
6256
public function __construct(
6357
\Magento\Framework\Composer\ComposerInformation $composerInformation,
64-
\Magento\Setup\Model\DateTime\TimeZoneProvider $timeZoneProvider,
6558
\Magento\Setup\Model\PackagesAuth $packagesAuth,
6659
\Magento\Framework\Filesystem $filesystem,
6760
\Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
6861
) {
6962
$this->objectManagerProvider = $objectManagerProvider;
7063
$this->composerInformation = $composerInformation;
71-
$this->timeZoneProvider = $timeZoneProvider;
7264
$this->packagesAuth = $packagesAuth;
7365
$this->filesystem = $filesystem;
7466
}
@@ -133,7 +125,9 @@ private function formatLastSyncData($packagesForInstall, $lastSyncData)
133125
*/
134126
private function formatSyncDate($syncDate)
135127
{
136-
$timezone = $this->timeZoneProvider->get();
128+
$objectManager = $this->objectManagerProvider->get();
129+
$timeZoneProvider = $objectManager->get('Magento\Setup\Model\DateTime\TimeZoneProvider');
130+
$timezone = $timeZoneProvider->get();
137131
return [
138132
'date' => $timezone->formatDateTime(
139133
new \DateTime('@'.$syncDate),

Diff for: setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ public function setUp()
5151
$applicationFactory->expects($this->any())->method('create')->willReturn($application);
5252
$objectManager->expects($this->any())
5353
->method('get')
54-
->with('Magento\Framework\Composer\MagentoComposerApplicationFactory')
55-
->willReturn($applicationFactory);
54+
->will($this->returnValueMap([
55+
['Magento\Framework\Composer\MagentoComposerApplicationFactory', $applicationFactory],
56+
['Magento\Setup\Model\DateTime\TimeZoneProvider', $timeZoneProvider]
57+
]));
5658
$objectManagerProvider->expects($this->any())->method('get')->willReturn($objectManager);
5759

5860
$directoryWrite = $this->getMockForAbstractClass('\Magento\Framework\Filesystem\Directory\WriteInterface');
@@ -86,7 +88,6 @@ public function setUp()
8688

8789
$this->packagesData = new PackagesData(
8890
$composerInformation,
89-
$timeZoneProvider,
9091
$packagesAuth,
9192
$filesystem,
9293
$objectManagerProvider

0 commit comments

Comments
 (0)