MAGETWO-38567: Dependency Validation of Physical Non-Composer Theme from Uninstalled Theme

- removed dependency to App\State

Author: eddielau

app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php

@@ -9,7 +9,7 @@
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Cache;
 use Magento\Framework\App\MaintenanceMode;
-use Magento\Framework\App\State;
+use Magento\Framework\App\State\CleanupFiles;
 use Magento\Framework\Composer\ComposerInformation;
 use Magento\Framework\Composer\DependencyChecker;
 use Magento\Framework\Composer\Remove;
@@ -89,13 +89,6 @@ class ThemeUninstallCommand extends Command
      */
     private $themeProvider;
 
-    /**
-     * Application States
-     *
-     * @var State
-     */
-    private $appState;
-
     /**
      * System cache model
      *
@@ -106,7 +99,7 @@ class ThemeUninstallCommand extends Command
     /**
      * Cleaning up application state service
      *
-     * @var State\CleanupFiles
+     * @var CleanupFiles
      */
     private $cleanupFiles;
 
@@ -121,29 +114,27 @@ class ThemeUninstallCommand extends Command
      * Constructor
      *
      * @param Cache $cache
-     * @param State\CleanupFiles $cleanupFiles
+     * @param CleanupFiles $cleanupFiles
      * @param ComposerInformation $composer
      * @param MaintenanceMode $maintenanceMode
      * @param Filesystem $filesystem
      * @param DependencyChecker $dependencyChecker
      * @param Collection $themeCollection
      * @param ThemeProvider $themeProvider
      * @param Remove $remove
-     * @param State $appState
      * @param BackupRollbackFactory $backupRollbackFactory
      * @throws LocalizedException
      */
     public function __construct(
         Cache $cache,
-        State\CleanupFiles $cleanupFiles,
+        CleanupFiles $cleanupFiles,
         ComposerInformation $composer,
         MaintenanceMode $maintenanceMode,
         Filesystem $filesystem,
         DependencyChecker $dependencyChecker,
         Collection $themeCollection,
         ThemeProvider $themeProvider,
         Remove $remove,
-        State $appState,
         BackupRollbackFactory $backupRollbackFactory
     ) {
         $this->cache = $cache;
@@ -155,8 +146,6 @@ public function __construct(
         $this->remove = $remove;
         $this->themeCollection = $themeCollection;
         $this->themeProvider = $themeProvider;
-        $this->appState = $appState;
-        $this->appState->setAreaCode(Area::AREA_ADMIN);
         $this->backupRollbackFactory = $backupRollbackFactory;
         parent::__construct();
     }

app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php

@@ -91,7 +91,6 @@ public function setUp()
         $this->cache = $this->getMock('Magento\Framework\App\Cache', [], [], '', false);
         $this->cleanupFiles = $this->getMock('Magento\Framework\App\State\CleanupFiles', [], [], '', false);
         $this->themeProvider = $this->getMock('Magento\Theme\Model\Theme\ThemeProvider', [], [], '', false);
-        $state = $this->getMock('Magento\Framework\App\State', [], [], '', false);
         $this->backupRollbackFactory = $this->getMock(
             'Magento\Framework\Setup\BackupRollbackFactory',
             [],
@@ -109,7 +108,6 @@ public function setUp()
             $this->collection,
             $this->themeProvider,
             $this->remove,
-            $state,
             $this->backupRollbackFactory
         );
         $this->tester = new CommandTester($this->command);