MAGETWO-43454: Contribute Ogre Sprint 38 Bugs and Tasks

- fully qualify class names to prevent static error
magento · Oct 8, 2015 · 0c99de0 · 0c99de0
1 parent ab13480
commit 0c99de0
Showing 1 changed file with 19 additions and 28 deletions.
diff --git a/setup/src/Magento/Setup/Controller/ComponentGrid.php b/setup/src/Magento/Setup/Controller/ComponentGrid.php
@@ -6,19 +6,10 @@
 
 namespace Magento\Setup\Controller;
 
-use Magento\Framework\Composer\ComposerInformation;
-use Magento\Framework\Module\ModuleList;
-use Magento\Setup\Model\ObjectManagerProvider;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\JsonModel;
-use Zend\View\Model\ViewModel;
-use Magento\Setup\Model\ConnectManager;
-use Magento\Setup\Model\UpdatePackagesCache;
-
 /**
  * Controller for component grid tasks
  */
-class ComponentGrid extends AbstractActionController
+class ComponentGrid extends \Zend\Mvc\Controller\AbstractActionController
 {
     /**
      * @var \Magento\Framework\Composer\ComposerInformation
@@ -33,7 +24,7 @@ class ComponentGrid extends AbstractActionController
     private $packageInfo;
 
     /**
-     * @var ConnectManager
+     * @var \Magento\Setup\Model\ConnectManager
      */
     private $connectManager;
 
@@ -55,16 +46,16 @@ class ComponentGrid extends AbstractActionController
     private $updatePackagesCache;
 
     /**
-     * @param ComposerInformation $composerInformation
-     * @param ObjectManagerProvider $objectManagerProvider
-     * @param ConnectManager $connectManager
-     * @param UpdatePackagesCache $updatePackagesCache
+     * @param \Magento\Framework\Composer\ComposerInformation $composerInformation
+     * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
+     * @param \Magento\Setup\Model\ConnectManager $connectManager
+     * @param \Magento\Setup\Model\UpdatePackagesCache $updatePackagesCache
      */
     public function __construct(
-        ComposerInformation $composerInformation,
-        ObjectManagerProvider $objectManagerProvider,
-        UpdatePackagesCache $updatePackagesCache,
-        ConnectManager $connectManager
+        \Magento\Framework\Composer\ComposerInformation $composerInformation,
+        \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider,
+        \Magento\Setup\Model\UpdatePackagesCache $updatePackagesCache,
+        \Magento\Setup\Model\ConnectManager $connectManager
     ) {
         $this->composerInformation = $composerInformation;
         $objectManager = $objectManagerProvider->get();
@@ -78,19 +69,19 @@ public function __construct(
     /**
      * Index page action
      *
-     * @return ViewModel
+     * @return \Zend\View\Model\ViewModel
      */
     public function indexAction()
     {
-        $view = new ViewModel();
+        $view = new \Zend\View\Model\ViewModel();
         $view->setTerminal(true);
         return $view;
     }
 
     /**
      * Get Components info action
      *
-     * @return JsonModel
+     * @return \Zend\View\Model\JsonModel
      * @throws \RuntimeException
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -105,7 +96,7 @@ public function componentsAction()
             $components[$component['name']]['uninstall'] = false;
             $components[$component['name']]['moduleName'] = $this->packageInfo->getModuleName($component['name']);
             if ($this->composerInformation->isPackageInComposerJson($component['name'])
-                && ($component['type'] !== ComposerInformation::METAPACKAGE_PACKAGE_TYPE)) {
+                && ($component['type'] !== \Magento\Framework\Composer\ComposerInformation::METAPACKAGE_PACKAGE_TYPE)) {
                 $components[$component['name']]['uninstall'] = true;
                 if (isset($lastSyncData['packages'][$component['name']]['latestVersion'])
                     && version_compare(
@@ -116,7 +107,7 @@ public function componentsAction()
                     $components[$component['name']]['update'] = true;
                 }
             }
-            if ($component['type'] === ComposerInformation::MODULE_PACKAGE_TYPE) {
+            if ($component['type'] === \Magento\Framework\Composer\ComposerInformation::MODULE_PACKAGE_TYPE) {
                 $components[$component['name']]['enable'] =
                     $this->enabledModuleList->has($components[$component['name']]['moduleName']);
                 $components[$component['name']]['disable'] = !$components[$component['name']]['enable'];
@@ -134,7 +125,7 @@ public function componentsAction()
             isset($packagesForInstall['packages']) ? count($packagesForInstall['packages']) : 0;
         $lastSyncData['countOfUpdate'] = isset($lastSyncData['packages']) ? count($lastSyncData['packages']) : 0;
 
-        return new JsonModel(
+        return new \Zend\View\Model\JsonModel(
             [
                 'success' => true,
                 'components' => array_values($components),
@@ -147,7 +138,7 @@ public function componentsAction()
     /**
      * Sync action
      *
-     * @return JsonModel
+     * @return \Zend\View\Model\JsonModel
      */
     public function syncAction()
     {
@@ -162,7 +153,7 @@ public function syncAction()
         $lastSyncData['countOfUpdate'] = isset($lastSyncData['packages']) ? count($lastSyncData['packages']) : 0;
 
 
-        return new JsonModel(
+        return new \Zend\View\Model\JsonModel(
             [
                 'success' => true,
                 'lastSyncData' => $lastSyncData
@@ -182,7 +173,7 @@ private function getAllModules()
         foreach ($allModules as $module) {
             $moduleName = $this->packageInfo->getPackageName($module);
             $modules[$moduleName]['name'] = $moduleName;
-            $modules[$moduleName]['type'] = ComposerInformation::MODULE_PACKAGE_TYPE;
+            $modules[$moduleName]['type'] = \Magento\Framework\Composer\ComposerInformation::MODULE_PACKAGE_TYPE;
             $modules[$moduleName]['version'] = $this->packageInfo->getVersion($module);
         }
         return $modules;