MAGETWO-58594: Static Assets deployment throws errors when redis is used for cache after PR 389

code style fixes

Author: AVoskoboinikov

app/code/Magento/Deploy/Console/Command/DeployStaticContentCommand.php

@@ -3,7 +3,6 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Deploy\Console\Command;
 
 use Magento\Framework\App\Utility\Files;
@@ -19,6 +18,8 @@
 use Magento\Framework\App\State;
 use Magento\Deploy\Console\Command\DeployStaticOptionsInterface as Options;
 use Magento\Deploy\Model\DeployManager;
+use Magento\Framework\App\Cache;
+use Magento\Framework\App\Cache\Type\Dummy as DummyCache;
 
 /**
  * Deploy static content command
@@ -29,7 +30,7 @@ class DeployStaticContentCommand extends Command
     /**
      * Key for dry-run option
      * @deprecated
-     * @see Magento\Deploy\Console\Command\DeployStaticOptionsInterface::DRY_RUN
+     * @see \Magento\Deploy\Console\Command\DeployStaticOptionsInterface::DRY_RUN
      */
     const DRY_RUN_OPTION = 'dry-run';
 
@@ -87,6 +88,7 @@ class DeployStaticContentCommand extends Command
      * @param ObjectManagerFactory $objectManagerFactory
      * @param Locale $validator
      * @param ObjectManagerInterface $objectManager
+     * @throws \LogicException When the command name is empty
      */
     public function __construct(
         ObjectManagerFactory $objectManagerFactory,
@@ -374,6 +376,7 @@ private function getDeployableEntities($entities, $includedEntities, $excludedEn
     /**
      * {@inheritdoc}
      * @throws \InvalidArgumentException
+     * @throws LocalizedException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -395,9 +398,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         list ($deployableLanguages, $deployableAreaThemeMap, $requestedThemes)
             = $this->prepareDeployableEntities($filesUtil);
 
-        $output->writeln("Requested languages: " . implode(', ', $deployableLanguages));
-        $output->writeln("Requested areas: " . implode(', ', array_keys($deployableAreaThemeMap)));
-        $output->writeln("Requested themes: " . implode(', ', $requestedThemes));
+        $output->writeln('Requested languages: ' . implode(', ', $deployableLanguages));
+        $output->writeln('Requested areas: ' . implode(', ', array_keys($deployableAreaThemeMap)));
+        $output->writeln('Requested themes: ' . implode(', ', $requestedThemes));
 
         /** @var $deployManager DeployManager */
         $deployManager = $this->objectManager->create(
@@ -427,6 +430,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     /**
      * @param Files $filesUtil
+     * @throws \InvalidArgumentException
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -484,20 +488,26 @@ private function prepareDeployableEntities($filesUtil)
         return [$deployableLanguages, $deployableAreaThemeMap, $requestedThemes];
     }
 
+    /**
+     * Mock Cache class with dummy implementation
+     */
     private function disableCache()
     {
         $this->objectManager->configure([
             'preferences' => [
-                \Magento\Framework\App\Cache::class => \Magento\Framework\App\Cache\Type\Dummy::class
+                Cache::class => DummyCache::class
             ]
         ]);
     }
 
+    /**
+     * Unmock Cache class
+     */
     private function enableCache()
     {
         $this->objectManager->configure([
             'preferences' => [
-                \Magento\Framework\App\Cache::class => \Magento\Framework\App\Cache::class
+                Cache::class => Cache::class
             ]
         ]);
     }

lib/internal/Magento/Framework/App/Cache/Type/Dummy.php

@@ -1,69 +1,72 @@
-<?php
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\App\Cache\Type;
-
-use \Magento\Framework\App\CacheInterface;
-
-class Dummy implements CacheInterface
-{
-    /**
-     * Required by CacheInterface
-     *
-     * @return Null
-     */
-    public function getFrontend()
-    {
-        return null;
-    }
-
-    /**
-     * Pretend to load data from cache by id
-     *
-     * @param  string $identifier
-     * @return null
-     */
-    public function load($identifier)
-    {
-        return null;
-    }
-
-    /**
-     * Pretend to save data
-     *
-     * @param string $data
-     * @param string $identifier
-     * @param array $tags
-     * @param int $lifeTime
-     * @return bool
-     */
-    public function save($data, $identifier, $tags = [], $lifeTime = null)
-    {
-        return false;
-    }
-
-    /**
-     * Pretend to remove cached data by identifier
-     *
-     * @param string $identifier
-     * @return bool
-     */
-    public function remove($identifier)
-    {
-        return true;
-    }
-
-    /**
-     * Pretend to clean cached data by specific tag
-     *
-     * @param array $tags
-     * @return bool
-     */
-    public function clean($tags = [])
-    {
-        return true;
-    }
-}
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App\Cache\Type;
+
+use \Magento\Framework\App\CacheInterface;
+
+class Dummy implements CacheInterface
+{
+    /**
+     * Required by CacheInterface
+     *
+     * @return Null
+     */
+    public function getFrontend()
+    {
+        return null;
+    }
+
+    /**
+     * Pretend to load data from cache by id
+     *
+     * @param  string $identifier
+     * @return null
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function load($identifier)
+    {
+        return null;
+    }
+
+    /**
+     * Pretend to save data
+     *
+     * @param string $data
+     * @param string $identifier
+     * @param array $tags
+     * @param int $lifeTime
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function save($data, $identifier, $tags = [], $lifeTime = null)
+    {
+        return false;
+    }
+
+    /**
+     * Pretend to remove cached data by identifier
+     *
+     * @param string $identifier
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function remove($identifier)
+    {
+        return true;
+    }
+
+    /**
+     * Pretend to clean cached data by specific tag
+     *
+     * @param array $tags
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function clean($tags = [])
+    {
+        return true;
+    }
+}