MAGETWO-57820: [GITHUB] php bin/magento i18n:pack creates unwanted dir #6260

Author: Bohdan Korablov

setup/src/Magento/Setup/Module/I18n/Context.php

@@ -95,6 +95,7 @@ private function getComponentName($componentType, $path)
      * @param array $value
      * @return string
      * @throws \InvalidArgumentException
+     * @throws UnregisteredComponentException
      */
     public function buildPathToLocaleDirectoryByContext($type, $value)
     {
@@ -111,6 +112,11 @@ public function buildPathToLocaleDirectoryByContext($type, $value)
             default:
                 throw new \InvalidArgumentException(sprintf('Invalid context given: "%s".', $type));
         }
+
+        if (null === $path) {
+            throw new UnregisteredComponentException();
+        }
+
         return $path . '/' . self::LOCALE_DIRECTORY . '/';
     }
 }

setup/src/Magento/Setup/Module/I18n/Pack/Writer/File/AbstractFile.php

@@ -10,6 +10,7 @@
 use Magento\Setup\Module\I18n\Factory;
 use Magento\Setup\Module\I18n\Locale;
 use Magento\Setup\Module\I18n\Pack\WriterInterface;
+use Magento\Setup\Module\I18n\UnregisteredComponentException;
 
 /**
  * Abstract pack writer
@@ -120,6 +121,8 @@ protected function _buildPackFilesData(Dictionary $dictionary)
                     $path = $this->_context->buildPathToLocaleDirectoryByContext($phrase->getContextType(), $context);
                 } catch (\InvalidArgumentException $e) {
                     throw new \InvalidArgumentException($e->getMessage() . ' Row #' . ($key + 1) . '.');
+                } catch (UnregisteredComponentException $e) {
+                    continue;
                 }
                 $filename = $path . $this->_locale . '.' . $this->_getFileExtension();
                 $files[$filename][$phrase->getPhrase()] = $phrase;

setup/src/Magento/Setup/Module/I18n/UnregisteredComponentException.php

@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Module\I18n;
+
+/**
+ * This exception should be thrown when Component not found for install language pack
+ */
+class UnregisteredComponentException extends \Exception
+{
+}

setup/src/Magento/Setup/Test/Unit/Module/I18n/ContextTest.php

@@ -41,7 +41,7 @@ public function testGetContextByPath($context, $path, $pathValues)
     {
         $this->componentRegistrar->expects($this->any())
             ->method('getPaths')
-            ->will($this->returnValueMap($pathValues));
+            ->willReturnMap($pathValues);
         $this->context = new Context($this->componentRegistrar);
         $this->assertEquals($context, $this->context->getContextByPath($path));
     }
@@ -108,10 +108,8 @@ public function testBuildPathToLocaleDirectoryByContext($path, $context, $regist
             $paths[$module[1]] = $module[2];
         }
         $this->componentRegistrar->expects($this->any())
-            ->method('getPaths')
-            ->with(ComponentRegistrar::MODULE)
-            ->willReturn($paths);
-        $this->componentRegistrar->expects($this->any())->method('getPath')->will($this->returnValueMap($registrar));
+            ->method('getPath')
+            ->willReturnMap($registrar);
         $this->context = new Context($this->componentRegistrar);
         $this->assertEquals($path, $this->context->buildPathToLocaleDirectoryByContext($context[0], $context[1]));
     }
@@ -127,7 +125,11 @@ public function dataProviderPathToLocaleDirectoryByContext()
                 [Context::CONTEXT_TYPE_MODULE, 'Magento_Module'],
                 [[ComponentRegistrar::MODULE, 'Magento_Module', BP . '/app/code/Magento/Module']]
             ],
-            ['/i18n/', [Context::CONTEXT_TYPE_THEME, 'theme/test.phtml'], []],
+            [
+                BP . '/app/design/frontend/Magento/luma/i18n/',
+                [Context::CONTEXT_TYPE_THEME, 'rontend/Magento/luma'],
+                [[ComponentRegistrar::THEME, 'rontend/Magento/luma', BP . '/app/design/frontend/Magento/luma']]
+            ],
             [BP . '/lib/web/i18n/', [Context::CONTEXT_TYPE_LIB, 'lib/web/module/test.phtml'], []],
         ];
     }
@@ -138,11 +140,23 @@ public function dataProviderPathToLocaleDirectoryByContext()
      */
     public function testBuildPathToLocaleDirectoryByContextWithInvalidType()
     {
-        $this->componentRegistrar->expects($this->any())
-            ->method('getPaths')
-            ->with(ComponentRegistrar::MODULE)
-            ->willReturn(['module' => '/path/to/module']);
+        $this->componentRegistrar->expects($this->never())
+            ->method('getPath');
         $this->context = new Context($this->componentRegistrar);
         $this->context->buildPathToLocaleDirectoryByContext('invalid_type', 'Magento_Module');
     }
+
+    /**
+     * @expectedException \Magento\Setup\Module\I18n\UnregisteredComponentException
+     */
+    public function testBuildPathToLocaleDirectoryByContextWithUnregisteredComponent()
+    {
+        $moduleName = 'Magento_Module';
+        $this->componentRegistrar->expects($this->once())
+            ->method('getPath')
+            ->with(ComponentRegistrar::MODULE, $moduleName)
+            ->willReturn(null);
+        $this->context = new Context($this->componentRegistrar);
+        $this->context->buildPathToLocaleDirectoryByContext(ComponentRegistrar::MODULE, $moduleName);
+    }
 }