Skip to content
Snippets Groups Projects
Commit e74d9a75 authored by Maddy Chellathurai's avatar Maddy Chellathurai
Browse files

MAGETWO-52000: [Github][PR]impossible to see what is wrong with cron -...

MAGETWO-52000: [Github][PR]impossible to see what is wrong with cron - unhelpful error message #3189

- Using OM to create TImeZoneProvider.
parent 75a3c2ab
Branches
No related merge requests found
...@@ -40,11 +40,6 @@ class PackagesData ...@@ -40,11 +40,6 @@ class PackagesData
*/ */
private $packagesAuth; private $packagesAuth;
/**
* @var \Magento\Setup\Model\DateTime\TimeZoneProvider
*/
private $timeZoneProvider;
/** /**
* @var \Magento\Setup\Model\ObjectManagerProvider * @var \Magento\Setup\Model\ObjectManagerProvider
*/ */
...@@ -54,21 +49,18 @@ class PackagesData ...@@ -54,21 +49,18 @@ class PackagesData
* PackagesData constructor. * PackagesData constructor.
* *
* @param \Magento\Framework\Composer\ComposerInformation $composerInformation, * @param \Magento\Framework\Composer\ComposerInformation $composerInformation,
* @param \Magento\Setup\Model\DateTime\TimeZoneProvider $timeZoneProvider,
* @param \Magento\Setup\Model\PackagesAuth $packagesAuth, * @param \Magento\Setup\Model\PackagesAuth $packagesAuth,
* @param \Magento\Framework\Filesystem $filesystem, * @param \Magento\Framework\Filesystem $filesystem,
* @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
*/ */
public function __construct( public function __construct(
\Magento\Framework\Composer\ComposerInformation $composerInformation, \Magento\Framework\Composer\ComposerInformation $composerInformation,
\Magento\Setup\Model\DateTime\TimeZoneProvider $timeZoneProvider,
\Magento\Setup\Model\PackagesAuth $packagesAuth, \Magento\Setup\Model\PackagesAuth $packagesAuth,
\Magento\Framework\Filesystem $filesystem, \Magento\Framework\Filesystem $filesystem,
\Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
) { ) {
$this->objectManagerProvider = $objectManagerProvider; $this->objectManagerProvider = $objectManagerProvider;
$this->composerInformation = $composerInformation; $this->composerInformation = $composerInformation;
$this->timeZoneProvider = $timeZoneProvider;
$this->packagesAuth = $packagesAuth; $this->packagesAuth = $packagesAuth;
$this->filesystem = $filesystem; $this->filesystem = $filesystem;
} }
...@@ -133,7 +125,9 @@ class PackagesData ...@@ -133,7 +125,9 @@ class PackagesData
*/ */
private function formatSyncDate($syncDate) private function formatSyncDate($syncDate)
{ {
$timezone = $this->timeZoneProvider->get(); $objectManager = $this->objectManagerProvider->get();
$timeZoneProvider = $objectManager->get('Magento\Setup\Model\DateTime\TimeZoneProvider');
$timezone = $timeZoneProvider->get();
return [ return [
'date' => $timezone->formatDateTime( 'date' => $timezone->formatDateTime(
new \DateTime('@'.$syncDate), new \DateTime('@'.$syncDate),
......
...@@ -51,8 +51,10 @@ class PackagesDataTest extends \PHPUnit_Framework_TestCase ...@@ -51,8 +51,10 @@ class PackagesDataTest extends \PHPUnit_Framework_TestCase
$applicationFactory->expects($this->any())->method('create')->willReturn($application); $applicationFactory->expects($this->any())->method('create')->willReturn($application);
$objectManager->expects($this->any()) $objectManager->expects($this->any())
->method('get') ->method('get')
->with('Magento\Framework\Composer\MagentoComposerApplicationFactory') ->will($this->returnValueMap([
->willReturn($applicationFactory); ['Magento\Framework\Composer\MagentoComposerApplicationFactory', $applicationFactory],
['Magento\Setup\Model\DateTime\TimeZoneProvider', $timeZoneProvider]
]));
$objectManagerProvider->expects($this->any())->method('get')->willReturn($objectManager); $objectManagerProvider->expects($this->any())->method('get')->willReturn($objectManager);
$directoryWrite = $this->getMockForAbstractClass('\Magento\Framework\Filesystem\Directory\WriteInterface'); $directoryWrite = $this->getMockForAbstractClass('\Magento\Framework\Filesystem\Directory\WriteInterface');
...@@ -86,7 +88,6 @@ class PackagesDataTest extends \PHPUnit_Framework_TestCase ...@@ -86,7 +88,6 @@ class PackagesDataTest extends \PHPUnit_Framework_TestCase
$this->packagesData = new PackagesData( $this->packagesData = new PackagesData(
$composerInformation, $composerInformation,
$timeZoneProvider,
$packagesAuth, $packagesAuth,
$filesystem, $filesystem,
$objectManagerProvider $objectManagerProvider
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment