MAGETWO-43188: Unable to rename theme by editing theme.xml file

Author: Oleksandr Karpenko

app/code/Magento/Theme/Model/Theme/Plugin/Registration.php

@@ -11,12 +11,21 @@
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\App\State as AppState;
+use Magento\Theme\Model\Theme\Collection as ThemeCollection;
+use Magento\Theme\Model\ResourceModel\Theme\Collection as ThemeLoader;
+use Magento\Framework\Config\Theme;
 
 class Registration
 {
     /** @var ThemeRegistration */
     protected $themeRegistration;
 
+    /** @var ThemeCollection */
+    protected $themeCollection;
+
+    /** @var ThemeLoader */
+    protected $themeLoader;
+
     /** @var LoggerInterface */
     protected $logger;
 
@@ -25,21 +34,27 @@ class Registration
 
     /**
      * @param ThemeRegistration $themeRegistration
+     * @param ThemeCollection $themeCollection
+     * @param ThemeLoader $themeLoader
      * @param LoggerInterface $logger
      * @param AppState $appState
      */
     public function __construct(
         ThemeRegistration $themeRegistration,
+        ThemeCollection $themeCollection,
+        ThemeLoader $themeLoader,
         LoggerInterface $logger,
         AppState $appState
     ) {
         $this->themeRegistration = $themeRegistration;
+        $this->themeCollection = $themeCollection;
+        $this->themeLoader = $themeLoader;
         $this->logger = $logger;
         $this->appState = $appState;
     }
 
     /**
-     * Add new theme from filesystem
+     * Add new theme from filesystem and update exists
      *
      * @param AbstractAction $subject
      * @param RequestInterface $request
@@ -54,9 +69,25 @@ public function beforeDispatch(
         try {
             if ($this->appState->getMode() != AppState::MODE_PRODUCTION) {
                 $this->themeRegistration->register();
+                $this->updateThemeData();
             }
         } catch (LocalizedException $e) {
             $this->logger->critical($e);
         }
     }
+
+    protected function updateThemeData()
+    {
+        $themesData = $this->themeCollection->loadData();
+        /** @var \Magento\Theme\Model\Theme $themeData */
+        foreach ($themesData as $themeData) {
+            /** @var \Magento\Theme\Model\Theme $theme */
+            $theme = $this->themeLoader->getThemeByFullPath(
+                $themeData->getArea()
+                . Theme::THEME_PATH_SEPARATOR
+                . $themeData->getThemePath()
+            );
+            $theme->addData($themeData->toArray())->save();
+        }
+    }
 }

app/code/Magento/Theme/Test/Unit/Model/Theme/Plugin/RegistrationTest.php

@@ -26,39 +26,74 @@ class RegistrationTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject */
     protected $appState;
 
+    /** @var \Magento\Theme\Model\Theme\Collection|\PHPUnit_Framework_MockObject_MockObject */
+    protected $themeCollection;
+
+    /** @var \Magento\Theme\Model\ResourceModel\Theme\Collection|\PHPUnit_Framework_MockObject_MockObject */
+    protected $themeLoader;
+
+    /** @var Registration */
+    protected $plugin;
+
     public function setUp()
     {
         $this->themeRegistration = $this->getMock('Magento\Theme\Model\Theme\Registration', [], [], '', false);
         $this->logger = $this->getMockForAbstractClass('Psr\Log\LoggerInterface', [], '', false);
         $this->abstractAction = $this->getMockForAbstractClass('Magento\Backend\App\AbstractAction', [], '', false);
         $this->request = $this->getMockForAbstractClass('Magento\Framework\App\RequestInterface', [], '', false);
         $this->appState = $this->getMock('Magento\Framework\App\State', [], [], '', false);
+        $this->themeCollection = $this->getMock('Magento\Theme\Model\Theme\Collection', [], [], '', false);
+        $this->themeLoader = $this->getMock('Magento\Theme\Model\ResourceModel\Theme\Collection', [], [], '', false);
+        $this->plugin = new Registration(
+            $this->themeRegistration,
+            $this->themeCollection,
+            $this->themeLoader,
+            $this->logger,
+            $this->appState
+        );
     }
 
     public function testBeforeDispatch()
     {
+        $theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
         $this->appState->expects($this->once())->method('getMode')->willReturn('default');
         $this->themeRegistration->expects($this->once())->method('register');
-        $this->logger->expects($this->never())->method('critical');
-        $object = new Registration($this->themeRegistration, $this->logger, $this->appState);
-        $object->beforeDispatch($this->abstractAction, $this->request);
+        $this->themeCollection->expects($this->once())->method('loadData')->willReturn([$theme]);
+        $theme->expects($this->once())->method('getArea')->willReturn('frontend');
+        $theme->expects($this->once())->method('getThemePath')->willReturn('Magento/luma');
+        $this->themeLoader->expects($this->once())
+            ->method('getThemeByFullPath')
+            ->with('frontend/Magento/luma')
+            ->willReturn($theme);
+        $theme->expects($this->once())
+            ->method('toArray')
+            ->willReturn([
+                'title' => 'Magento Luma'
+            ]);
+        $theme->expects($this->once())
+            ->method('addData')
+            ->with([
+                'title' => 'Magento Luma'
+            ])
+            ->willReturnSelf();
+        $theme->expects($this->once())
+            ->method('save');
+
+        $this->plugin->beforeDispatch($this->abstractAction, $this->request);
     }
 
     public function testBeforeDispatchWithProductionMode()
     {
         $this->appState->expects($this->once())->method('getMode')->willReturn('production');
-        $this->themeRegistration->expects($this->never())->method('register');
-        $this->logger->expects($this->never())->method('critical');
-        $object = new Registration($this->themeRegistration, $this->logger, $this->appState);
-        $object->beforeDispatch($this->abstractAction, $this->request);
+        $this->plugin->beforeDispatch($this->abstractAction, $this->request);
     }
 
     public function testBeforeDispatchWithException()
     {
         $exception = new LocalizedException(new Phrase('Phrase'));
         $this->themeRegistration->expects($this->once())->method('register')->willThrowException($exception);
         $this->logger->expects($this->once())->method('critical');
-        $object = new Registration($this->themeRegistration, $this->logger, $this->appState);
-        $object->beforeDispatch($this->abstractAction, $this->request);
+
+        $this->plugin->beforeDispatch($this->abstractAction, $this->request);
     }
 }