Merge pull request #830 from magento-engcom/develop-prs

[EngCom] Public Pull Requests

Public Pull Requests

#8356
#8474
#8487
#8217
#8413

Author: Oleksii Korshenko

app/code/Magento/Captcha/Model/DefaultModel.php

@@ -53,6 +53,10 @@ protected function setUp()
      */
     public function testGetCaptcha()
     {
+        if (!function_exists("imageftbbox")) {
+            $this->markTestSkipped('imageftbbox is not available on the test environment');
+        }
+
         $this->configMock->expects(
             $this->once()
         )->method(

app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php

@@ -88,6 +88,9 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
+        if (!function_exists("imageftbbox")) {
+            $this->markTestSkipped('imageftbbox is not available on the test environment');
+        }
         $this->session = $this->_getSessionStub();
 
         $this->_storeManager = $this->getMock(

app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php

@@ -8,7 +8,9 @@
         "magento/module-checkout": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/framework": "100.2.*",
-        "zendframework/zend-db": "~2.4.6"
+        "zendframework/zend-db": "~2.4.6",
+        "zendframework/zend-captcha": "~2.4.6",
+        "zendframework/zend-session": "~2.4.6"
     },
     "type": "magento2-module",
     "version": "100.2.0-dev",

app/code/Magento/Captcha/composer.json

@@ -38,7 +38,9 @@ public function __construct(
     }
 
     /**
-     * @return \Magento\Framework\Phrase|mixed
+     * Get validation message.
+     *
+     * @return \Magento\Framework\Phrase
      * @throws \Zend_Currency_Exception
      */
     public function getMessage()
@@ -56,6 +58,9 @@ public function getMessage()
                 )
             );
             $message = __('Minimum order amount is %1', $minimumAmount);
+        } else {
+            //Added in order to address the issue: https://github.com/magento/magento2/issues/8287
+            $message = __($message);
         }
 
         return $message;

app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Quote\Test\Unit\Model\Quote\Validator\MinimumOrderAmount;
 
+use Magento\Framework\Phrase;
+
 class ValidationMessageTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -60,7 +62,6 @@ public function testGetMessage()
         $storeMock->expects($this->once())->method('getCurrentCurrencyCode')->willReturn($currencyCode);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
 
-
         $currencyMock = $this->getMock(\Magento\Framework\Currency::class, [], [], '', false);
         $this->currencyMock->expects($this->once())
             ->method('getCurrency')
@@ -86,6 +87,9 @@ public function testGetConfigMessage()
             ->with('sales/minimum_order/description', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->willReturn($configMessage);
 
-        $this->assertEquals($configMessage, $this->model->getMessage());
+        $message = $this->model->getMessage();
+
+        $this->assertEquals(Phrase::class, get_class($message));
+        $this->assertEquals($configMessage, $message->__toString());
     }
 }

app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php

@@ -6,8 +6,12 @@
 
 namespace Magento\Translation\Model\Js;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * DataProvider for js translation
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DataProvider implements DataProviderInterface
 {
@@ -103,9 +107,15 @@ public function getData($themePath)
             $read = $this->fileReadFactory->create($filePath[0], \Magento\Framework\Filesystem\DriverPool::FILE);
             $content = $read->readAll();
             foreach ($this->getPhrases($content) as $phrase) {
-                $translatedPhrase = $this->translate->render([$phrase], []);
-                if ($phrase != $translatedPhrase) {
-                    $dictionary[$phrase] = $translatedPhrase;
+                try {
+                    $translatedPhrase = $this->translate->render([$phrase], []);
+                    if ($phrase != $translatedPhrase) {
+                        $dictionary[$phrase] = $translatedPhrase;
+                    }
+                } catch (\Exception $e) {
+                    throw new LocalizedException(
+                        sprintf(__('Error while translating phrase "%s" in file %s.'), $phrase, $filePath[0])
+                    );
                 }
             }
         }
@@ -118,7 +128,7 @@ public function getData($themePath)
      *
      * @param string $content
      * @return string[]
-     * @throws \Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function getPhrases($content)
     {
@@ -134,8 +144,8 @@ protected function getPhrases($content)
                 }
             }
             if (false === $result) {
-                throw new \Exception(
-                    sprintf('Error while generating js translation dictionary: "%s"', error_get_last())
+                throw new LocalizedException(
+                    sprintf(__('Error while generating js translation dictionary: "%s"'), error_get_last())
                 );
             }
         }

app/code/Magento/Translation/Model/Js/DataProvider.php

@@ -32,6 +32,8 @@
         "zendframework/zend-log": "~2.4.6",
         "zendframework/zend-http": "~2.4.6",
         "zendframework/zend-db": "~2.4.6",
+        "zendframework/zend-captcha": "~2.4.6",
+        "zendframework/zend-session": "~2.4.6",
         "magento/zendframework1": "~1.12.16",
         "colinmollenhour/credis": "1.6",
         "colinmollenhour/php-redis-session-abstract": "1.2",

composer.json

@@ -23,4 +23,5 @@
         \Magento\TestFramework\Db\ConnectionAdapter::class,
     \Magento\Framework\Filesystem\DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
     \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class,
+    \Magento\Captcha\Model\DefaultModel::class => \Magento\TestFramework\Captcha\DefaultModel::class,
 ];

composer.lock

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Captcha;
+
+/**
+ * Implementation of \Zend\Captcha\Image for integration test environment.
+ *
+ * With introducing "zendframework/zend-captcha": "~2.4.6" (see https://github.com/magento/magento2/pull/8356)
+ * validation happens in \Zend\Captcha\Image class constructor that blocks testing on Travis CI, even for cases
+ * when this functionality is not needed.
+ * For test environment that supports freetype functional behaviour should not be changed.
+ */
+class DefaultModel extends \Magento\Captcha\Model\DefaultModel
+{
+    /**
+     * Do not pass onto the parent constructor as imageftbbox is not initialized on travis
+     *
+     * @param \Magento\Framework\Session\SessionManagerInterface $session
+     * @param \Magento\Captcha\Helper\Data $captchaData
+     * @param \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory
+     * @param string $formId
+     */
+    public function __construct(
+        \Magento\Framework\Session\SessionManagerInterface $session,
+        \Magento\Captcha\Helper\Data $captchaData,
+        \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory,
+        $formId
+    ) {
+        /**
+         * Workaround for test environments that do not support freetype.
+         */
+        if (function_exists("imageftbbox")) {
+            parent::__construct($session, $captchaData, $resLogFactory, $formId);
+        } else {
+            $this->session = $session;
+            $this->captchaData = $captchaData;
+            $this->resLogFactory = $resLogFactory;
+            $this->formId = $formId;
+        }
+    }
+}

dev/tests/integration/etc/di/preferences/ce.php

@@ -8,9 +8,11 @@
 namespace Magento\Framework\App;
 
 use Magento\Framework\App;
-use Magento\Framework\App\Area;
 use Magento\Framework\ObjectManagerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Cron implements \Magento\Framework\AppInterface
 {
     /**
@@ -35,6 +37,11 @@ class Cron implements \Magento\Framework\AppInterface
      */
     private $objectManager;
 
+    /**
+     * @var \Magento\Framework\App\AreaList
+     */
+    private $areaList;
+
     /**
      * Inject dependencies
      *
@@ -43,19 +50,22 @@ class Cron implements \Magento\Framework\AppInterface
      * @param Console\Response $response
      * @param ObjectManagerInterface $objectManager
      * @param array $parameters
+     * @param AreaList|null          $areaList
      */
     public function __construct(
         State $state,
         Console\Request $request,
         Console\Response $response,
         ObjectManagerInterface $objectManager,
-        array $parameters = []
+        array $parameters = [],
+        \Magento\Framework\App\AreaList $areaList = null
     ) {
         $this->_state = $state;
         $this->_request = $request;
         $this->_request->setParams($parameters);
         $this->_response = $response;
         $this->objectManager = $objectManager;
+        $this->areaList = $areaList ? $areaList : $this->objectManager->get(\Magento\Framework\App\AreaList::class);
     }
 
     /**
@@ -69,6 +79,8 @@ public function launch()
         $configLoader = $this->objectManager->get(\Magento\Framework\ObjectManager\ConfigLoaderInterface::class);
         $this->objectManager->configure($configLoader->load(Area::AREA_CRONTAB));
 
+        $this->areaList->getArea(Area::AREA_CRONTAB)->load(Area::PART_TRANSLATE);
+
         /** @var \Magento\Framework\Event\ManagerInterface $eventManager */
         $eventManager = $this->objectManager->get(\Magento\Framework\Event\ManagerInterface::class);
         $eventManager->dispatch('default');