MDVA-267: Portdown MAGETWO-51807

- Backward-compatibility fixes

Author: isitnikov

setup/src/Magento/Setup/Controller/ComponentGrid.php

@@ -53,28 +53,57 @@ class ComponentGrid extends \Zend\Mvc\Controller\AbstractActionController
      */
     private $timezone;
 
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
     /**
      * @param \Magento\Framework\Composer\ComposerInformation $composerInformation
      * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
      * @param \Magento\Setup\Model\UpdatePackagesCache $updatePackagesCache
      * @param \Magento\Setup\Model\MarketplaceManager $marketplaceManager
-     * @param TimezoneProvider $tzProvider
      */
     public function __construct(
         \Magento\Framework\Composer\ComposerInformation $composerInformation,
         \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider,
         \Magento\Setup\Model\UpdatePackagesCache $updatePackagesCache,
-        \Magento\Setup\Model\MarketplaceManager $marketplaceManager,
-        TimezoneProvider $tzProvider
+        \Magento\Setup\Model\MarketplaceManager $marketplaceManager
     ) {
         $this->composerInformation = $composerInformation;
-        $objectManager = $objectManagerProvider->get();
-        $this->enabledModuleList = $objectManager->get('Magento\Framework\Module\ModuleList');
-        $this->fullModuleList = $objectManager->get('Magento\Framework\Module\FullModuleList');
-        $this->packageInfo = $objectManager->get('Magento\Framework\Module\PackageInfoFactory')->create();
+        $this->objectManager = $objectManagerProvider->get();
+        $this->enabledModuleList = $this->objectManager->get('Magento\Framework\Module\ModuleList');
+        $this->fullModuleList = $this->objectManager->get('Magento\Framework\Module\FullModuleList');
+        $this->packageInfo = $this->objectManager->get('Magento\Framework\Module\PackageInfoFactory')->create();
         $this->marketplaceManager = $marketplaceManager;
         $this->updatePackagesCache = $updatePackagesCache;
-        $this->timezone = $tzProvider->get();
+    }
+
+    /**
+     * Get timezone
+     *
+     * @return \Magento\Framework\Stdlib\DateTime\TimezoneInterface|null
+     */
+    private function getTimezone()
+    {
+        if ($this->timezone === null) {
+            $this->timezone = $this->objectManager->get('Magento\Setup\Model\DateTime\TimezoneProvider')->get();
+        }
+        return $this->timezone;
+    }
+
+    /**
+     * Set timezone
+     *
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone
+     * @throws \Exception
+     */
+    public function setTimezone(\Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone)
+    {
+        if ($this->timezone !== null) {
+            throw new \Exception('timezone is already set');
+        }
+        $this->timezone = $timezone;
     }
 
     /**
@@ -218,12 +247,12 @@ private function formatLastSyncData($packagesForInstall, $lastSyncData)
     private function formatSyncDate($syncDate)
     {
         return [
-            'date' => $this->timezone->formatDateTime(
+            'date' => $this->getTimezone()->formatDateTime(
                 new \DateTime('@'.$syncDate),
                 \IntlDateFormatter::MEDIUM,
                 \IntlDateFormatter::NONE
             ),
-            'time' => $this->timezone->formatDateTime(
+            'time' => $this->getTimezone()->formatDateTime(
                 new \DateTime('@'.$syncDate),
                 \IntlDateFormatter::NONE,
                 \IntlDateFormatter::MEDIUM

setup/src/Magento/Setup/Model/ConfigGenerator.php

@@ -61,6 +61,23 @@ public function __construct(Random $random, DeploymentConfig $deploymentConfig)
         $this->deploymentConfig = $deploymentConfig;
     }
 
+    /**
+     * Creates install segment config data
+     *
+     * @deprecated
+     *
+     * @return ConfigData
+     */
+    public function createInstallConfig()
+    {
+        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+
+        if ($this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE) === null) {
+            $configData->set(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE, date('r'));
+        }
+        return $configData;
+    }
+
     /**
      * Creates encryption key config data
      * @param array $data

setup/src/Magento/Setup/Model/Installer.php

@@ -1111,6 +1111,24 @@ private function deleteDeploymentConfig()
         }
     }
 
+    /**
+     * Validates that deployment configuration exists
+     *
+     * @deprecated
+     *
+     * @throws \Magento\Setup\Exception
+     * @return void
+     */
+    private function assertDeploymentConfigExists()
+    {
+        if (!$this->deploymentConfig->isAvailable()) {
+            throw new \Magento\Setup\Exception(
+                "Can't run this operation: deployment configuration is absent."
+                . " Run 'magento setup:config:set --help' for options."
+            );
+        }
+    }
+
     /**
      * Validates that MySQL is accessible and MySQL version is supported
      *

setup/src/Magento/Setup/Model/UpdatePackagesCache.php

@@ -11,6 +11,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Composer\MagentoComposerApplicationFactory;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Class UpdatePackagesCache manages information about available for update packages though the cache file.
@@ -51,13 +52,19 @@ class UpdatePackagesCache
      */
     private $pathToCacheFile = 'update_composer_packages.json';
 
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
     /**
      * Constructor
      *
      * @param MagentoComposerApplicationFactory $applicationFactory
      * @param \Magento\Framework\Filesystem $filesystem
      * @param ComposerInformation $composerInformation
      * @param ObjectManagerProvider $objectManagerProvider
+     * @throws \Exception
      */
     public function __construct(
         MagentoComposerApplicationFactory $applicationFactory,
@@ -67,11 +74,39 @@ public function __construct(
     ) {
         $this->application = $applicationFactory->create();
         $this->directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $this->objectManager = $objectManagerProvider->get();
         $this->dateTime = $objectManagerProvider->get()
             ->get('Magento\Setup\Model\DateTime\DateTimeProvider')->get();
         $this->composerInformation = $composerInformation;
     }
 
+    /**
+     * Get datetime
+     *
+     * @return \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private function getDateTime()
+    {
+        if ($this->dateTime === null) {
+            $this->dateTime = $this->objectManager->get('Magento\Setup\Model\DateTime\DateTimeProvider')->get();
+        }
+        return $this->dateTime;
+    }
+
+    /**
+     * Set datetime
+     *
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @throws \Exception
+     */
+    public function setDateTime(\Magento\Framework\Stdlib\DateTime\DateTime $dateTime)
+    {
+        if ($this->dateTime !== null) {
+            throw new \Exception('dateTime is already set');
+        }
+        $this->dateTime = $dateTime;
+    }
+
     /**
      * Sync and cache list of available for update versions for packages
      *
@@ -172,7 +207,7 @@ private function getPackageAvailableVersions($package)
     private function savePackagesForUpdateToCache($availableVersions)
     {
         $syncInfo = [];
-        $syncInfo['lastSyncDate'] = $this->dateTime->gmtTimestamp();
+        $syncInfo['lastSyncDate'] = $this->getDateTime()->gmtTimestamp();
         $syncInfo['packages'] = $availableVersions;
         $data = json_encode($syncInfo, JSON_UNESCAPED_SLASHES);
         try {

setup/src/Magento/Setup/Test/Unit/Controller/ComponentGridTest.php

@@ -170,9 +170,9 @@ public function setUp()
             $this->composerInformationMock,
             $objectManagerProvider,
             $this->updatePackagesCacheMock,
-            $this->marketplaceManagerMock,
-            $timezoneProviderMock
+            $this->marketplaceManagerMock
         );
+        $this->controller->setTimezone($timezoneProviderMock->get());
     }
 
     public function testIndexAction()

setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php

@@ -40,6 +40,16 @@ public function testCreateCryptConfigWithoutInput()
         $this->assertEquals(['crypt' => ['key' => md5('key')]], $returnValue->getData());
     }
 
+    /**
+     * @deprecated
+     */
+    public function testCreateInstallConfig()
+    {
+        $returnValue = $this->configGeneratorObject->createInstallConfig([]);
+        $this->assertInstanceOf('Magento\Framework\Config\Data\ConfigData', $returnValue);
+        $this->assertEquals(ConfigFilePool::APP_ENV, $returnValue->getFileKey());
+    }
+
     public function testCreateSessionConfigWithInput()
     {
         $testData = [ConfigOptionsListConstants::INPUT_KEY_SESSION_SAVE => 'files'];