Merge pull request #713 from magento-api/API-M11-Bug-Fixes

[API] M11 Bug Fixes

Author: Korshenko, Olexii(okorshenko)

app/code/Magento/Email/Model/Template/Filter.php

@@ -214,7 +214,6 @@ public function setUseAbsoluteLinks($flag)
 
     /**
      * Setter whether SID is allowed in store directive
-     * Doesn't set anything intentionally, since SID is not allowed in any kind of emails
      *
      * @param bool $flag
      * @return $this

dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/AbstractTestCase.php

@@ -22,6 +22,15 @@ protected function _createPhraseError($phrase)
         return "\nPhrase: {$phrase['phrase']} \nFile: {$phrase['file']} \nLine: {$phrase['line']}";
     }
 
+    /**
+     * @param array $phrase
+     * @return string
+     */
+    protected function _createMissedPhraseError($phrase)
+    {
+        return "\nMissed Phrase: File: {$phrase['file']} \nLine: {$phrase['line']}";
+    }
+
     /**
      * @return \RegexIterator
      */

dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/ArgumentsTest.php

@@ -44,27 +44,39 @@ protected function setUp()
 
     public function testArguments()
     {
-        $errors = [];
+        $incorrectNumberOfArgumentsErrors = [];
+        $missedPhraseErrors = [];
         foreach ($this->_getFiles() as $file) {
             if (in_array($file, $this->blackList)) {
                 continue;
             }
             $this->_phraseCollector->parse($file);
             foreach ($this->_phraseCollector->getPhrases() as $phrase) {
+                if (empty(trim($phrase['phrase'], "'\"\t\n\r\0\x0B"))) {
+                    $missedPhraseErrors[] = $this->_createMissedPhraseError($phrase);
+                }
                 if (preg_match_all('/%(\d+)/', $phrase['phrase'], $matches) || $phrase['arguments']) {
                     $placeholdersInPhrase = array_unique($matches[1]);
                     if (count($placeholdersInPhrase) != $phrase['arguments']) {
-                        $errors[] = $this->_createPhraseError($phrase);
+                        $incorrectNumberOfArgumentsErrors[] = $this->_createPhraseError($phrase);
                     }
                 }
             }
         }
         $this->assertEmpty(
-            $errors,
+            $missedPhraseErrors,
+            sprintf(
+                "\n%d missed phrases were discovered: \n%s",
+                count($missedPhraseErrors),
+                implode("\n\n", $missedPhraseErrors)
+            )
+        );
+        $this->assertEmpty(
+            $incorrectNumberOfArgumentsErrors,
             sprintf(
                 "\n%d usages of inconsistency the number of arguments and placeholders were discovered: \n%s",
-                count($errors),
-                implode("\n\n", $errors)
+                count($incorrectNumberOfArgumentsErrors),
+                implode("\n\n", $incorrectNumberOfArgumentsErrors)
             )
         );
     }

lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php

@@ -54,7 +54,7 @@ public function run()
         new \Magento\Framework\Archive\Gz();
         new \Magento\Framework\Archive\Helper\File('');
         new \Magento\Framework\Archive\Helper\File\Gz('');
-        new \Magento\Framework\Exception\LocalizedException(new \Magento\Framework\Phrase(''));
+        new \Magento\Framework\Exception\LocalizedException(new \Magento\Framework\Phrase('dummy'));
 
         $fsHelper->rm($this->_snapshot->getRootDir(), $this->_snapshot->getIgnorePaths());
         $archiver->unpack($snapshotPath, $this->_snapshot->getRootDir());

lib/internal/Magento/Framework/HTTP/Client.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\HTTP;
+
+/**
+ * Factory for HTTP client classes
+ *
+ * @author      Magento Core Team <core@magentocommerce.com>
+ */
+class ClientFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $_objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    protected $_instanceName = null;
+
+    /**
+     * Factory constructor (default creates Curl client)
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = 'Magento\Framework\HTTP\Client\Curl'
+    ) {
+        $this->_objectManager = $objectManager;
+        $this->_instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Framework\Flag
+     */
+    public function create(array $data = [])
+    {
+        return $this->_objectManager->create($this->_instanceName, $data);
+    }
+}

lib/internal/Magento/Framework/HTTP/ClientFactory.php

@@ -68,7 +68,15 @@ public function setUp()
         $this->resource = $this->getMock('\Magento\Framework\Translate\ResourceInterface', [], [], '', false);
         $this->locale = $this->getMock('\Magento\Framework\Locale\ResolverInterface', [], [], '', false);
         $this->appState = $this->getMock('\Magento\Framework\App\State', [], [], '', false);
-        $this->request = $this->getMock('\Magento\Framework\App\RequestInterface', [], [], '', false);
+        $this->request = $this->getMockForAbstractClass(
+            '\Magento\Framework\App\RequestInterface',
+            [],
+            '',
+            false,
+            false,
+            true,
+            ['getParam', 'getControllerModule']
+        );
         $this->csvParser = $this->getMock('\Magento\Framework\File\Csv', [], [], '', false);
         $this->packDictionary = $this->getMock('\Magento\Framework\App\Language\Dictionary', [], [], '', false);
         $this->directory = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadInterface', [], [], '', false);

lib/internal/Magento/Framework/Test/Unit/TranslateTest.php

@@ -204,6 +204,9 @@ protected function setConfig($config)
         if (!isset($this->_config['theme'])) {
             $this->_config['theme'] = $this->_viewDesign->getDesignTheme()->getId();
         }
+        if (!isset($this->_config['module'])) {
+            $this->_config['module'] = $this->getControllerModuleName();
+        }
         return $this;
     }
 
@@ -232,14 +235,39 @@ protected function getConfig($key)
         return null;
     }
 
+    /**
+     * Retrieve name of the current module
+     * @return mixed
+     */
+    protected function getControllerModuleName()
+    {
+        return $this->request->getControllerModule();
+    }
+
     /**
      * Load data from module translation files
      *
      * @return $this
      */
     protected function _loadModuleTranslation()
     {
-        foreach ($this->_moduleList->getNames() as $module) {
+        $currentModule = $this->getControllerModuleName();
+        $allModulesExceptCurrent = array_diff($this->_moduleList->getNames(), [$currentModule]);
+
+        $this->loadModuleTranslationByModulesList($allModulesExceptCurrent);
+        $this->loadModuleTranslationByModulesList([$currentModule]);
+        return $this;
+    }
+
+    /**
+     * Load data from module translation files by list of modules
+     *
+     * @param array $modules
+     * @return $this
+     */
+    protected function loadModuleTranslationByModulesList(array $modules)
+    {
+        foreach ($modules as $module) {
             $moduleFilePath = $this->_getModuleTranslationFile($module, $this->getLocale());
             $this->_addData($this->_getFileData($moduleFilePath));
         }
@@ -428,6 +456,9 @@ protected function getCacheId($forceReload = false)
             if (isset($this->_config['theme'])) {
                 $this->_cacheId .= '_' . $this->_config['theme'];
             }
+            if (isset($this->_config['module'])) {
+                $this->_cacheId .= '_' . $this->_config['module'];
+            }
         }
         return $this->_cacheId;
     }

lib/internal/Magento/Framework/Translate.php

@@ -237,4 +237,41 @@ public function getKey()
     {
         return $this->getPhrase() . '::' . $this->getContextType();
     }
+
+    /**
+     * Compile PHP string based on quotes type it enclosed with
+     *
+     * @return string
+     */
+    public function getCompiledPhrase()
+    {
+        return $this->getCompiledString($this->getPhrase());
+    }
+
+    /**
+     * Compile PHP string based on quotes type it enclosed with
+     *
+     * @return string
+     */
+    public function getCompiledTranslation()
+    {
+        return $this->getCompiledString($this->getTranslation());
+    }
+
+    /**
+     * Compile PHP string based on quotes type it enclosed with
+     *
+     * @param string $string
+     * @return string
+     *
+     * @SuppressWarnings(PHPMD.EvalExpression)
+     */
+    private function getCompiledString($string)
+    {
+        $encloseQuote = $this->getQuote() == Phrase::QUOTE_DOUBLE ? Phrase::QUOTE_DOUBLE : Phrase::QUOTE_SINGLE;
+
+        $evalString = 'return ' . $encloseQuote . $string . $encloseQuote . ';';
+        $result = @eval($evalString);
+        return is_string($result) ? $result :  $string;
+    }
 }

setup/src/Magento/Setup/Module/I18n/Dictionary/Phrase.php

@@ -41,10 +41,7 @@ public function __construct($outputFilename)
      */
     public function write(Phrase $phrase)
     {
-        $fields = [$phrase->getPhrase(), $phrase->getTranslation()];
-        $encloseQuote = $phrase->getQuote() == Phrase::QUOTE_DOUBLE ? Phrase::QUOTE_DOUBLE : Phrase::QUOTE_SINGLE;
-        $fields[0] = $this->compileString($fields[0], $encloseQuote);
-        $fields[1] = $this->compileString($fields[1], $encloseQuote);
+        $fields = [$phrase->getCompiledPhrase(), $phrase->getCompiledTranslation()];
         if (($contextType = $phrase->getContextType()) && ($contextValue = $phrase->getContextValueAsString())) {
             $fields[] = $contextType;
             $fields[] = $contextValue;
@@ -53,22 +50,6 @@ public function write(Phrase $phrase)
         fputcsv($this->_fileHandler, $fields, ',', '"');
     }
 
-    /**
-     * Compile PHP string based on quotes type it enclosed with
-     *
-     * @param string $string
-     * @param string $encloseQuote
-     * @return string
-     *
-     * @SuppressWarnings(PHPMD.EvalExpression)
-     */
-    protected function compileString($string, $encloseQuote)
-    {
-        $evalString = 'return ' . $encloseQuote . $string . $encloseQuote . ';';
-        $result = @eval($evalString);
-        return is_string($result) ? $result : $string;
-    }
-
     /**
      * Close file handler
      *