Merge pull request #1714 from magento-helix/MAGETWO-80419

HELIX-merge-2.1

CHANGELOG.md

@@ -1,4 +1,4 @@
-2.1.10-dev
+2.1.10
 =============
 * GitHub issues:
     * [#6718](https://github.com/magento/magento2/issues/6718) -- Custom composer modules break Component Manager (fixed in [#9692](https://github.com/magento/magento2/pull/9692))
@@ -18,6 +18,33 @@
     * [#5651](https://github.com/magento/magento2/issues/5651) -- Purchase date on admin screen is always *:07:00 (fixed in [#10260](https://github.com/magento/magento2/pull/10260))
     * [#9619](https://github.com/magento/magento2/issues/9619) -- Impossible to create Text Swatch 0 (Zero) (fixed in [#10282](https://github.com/magento/magento2/pull/10282))
     * [#10266](https://github.com/magento/magento2/issues/10266) -- Product Attributes - Size 0 (fixed in [#10282](https://github.com/magento/magento2/pull/10282))
+    * [#6622](https://github.com/magento/magento2/issues/6622) -- String wont translate: "Please enter a valid number in this field." (fixed in [#10745](https://github.com/magento/magento2/pull/10745))
+    * [#4883](https://github.com/magento/magento2/issues/4883) -- Not translated "Please enter a valid email address (Ex: johndoe@domain.com)." (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5883](https://github.com/magento/magento2/issues/5883) -- Untranslatable string "Minimum length of this field must be equal..." (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5861](https://github.com/magento/magento2/issues/5861) -- [Magento 2.1.0] Translation (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5820](https://github.com/magento/magento2/issues/5820) -- js validation messages translation not working in customer account (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5509](https://github.com/magento/magento2/issues/5509) -- Translate messages on password strength (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#6022](https://github.com/magento/magento2/issues/6022) -- Translation Issue on Magento 2.1v (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5995](https://github.com/magento/magento2/issues/5995) -- JS translation not working for some fields (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#7525](https://github.com/magento/magento2/issues/7525) -- Magento 2.1.0 Js Translations Not Working (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#9967](https://github.com/magento/magento2/issues/9967) -- Some messages in Customer Account Create not translated (fixed in [#10747](https://github.com/magento/magento2/pull/10747))
+    * [#5519](https://github.com/magento/magento2/issues/5519) -- Getting PHP Fatal Error on  getPrice()  (fixed in [#10750](https://github.com/magento/magento2/pull/10750))
+    * [#10206](https://github.com/magento/magento2/issues/10206) -- Getting PHP Fatal Error on getPrice() (fixed in [#10750](https://github.com/magento/magento2/pull/10750))
+    * [#4387](https://github.com/magento/magento2/issues/4387) -- News From Date and Design Active From is set when setting Special Price for product. (fixed in [#10751](https://github.com/magento/magento2/pull/10751))
+    * [#7448](https://github.com/magento/magento2/issues/7448) -- Can't remove "Set Product as New From" value (fixed in [#10751](https://github.com/magento/magento2/pull/10751))
+    * [#3754](https://github.com/magento/magento2/issues/3754) -- Must override at least one static content file or custom theme static content won't deploy  (fixed in [#10753](https://github.com/magento/magento2/pull/10753))
+    * [#4725](https://github.com/magento/magento2/issues/4725) -- Static files are not generated for custom theme (fixed in [#10753](https://github.com/magento/magento2/pull/10753))
+    * [#7569](https://github.com/magento/magento2/issues/7569) -- Theme with no static files won't get deployed (fixed in [#10753](https://github.com/magento/magento2/pull/10753))
+    * [#7311](https://github.com/magento/magento2/issues/7311) -- Vimeo videos in product gallery do not work over https (fixed in [#10748](https://github.com/magento/magento2/pull/10748))
+    * [#8574](https://github.com/magento/magento2/issues/8574) -- Product Gallery Vimeo Videos Don't Play Over  HTTPS (fixed in [#10748](https://github.com/magento/magento2/pull/10748))
+    * [#6081](https://github.com/magento/magento2/issues/6081) -- Broken HTML in base template file (fixed in [#10934](https://github.com/magento/magento2/pull/10934))
+    * [#10510](https://github.com/magento/magento2/issues/10510) -- Magento 2.1.8 w/Sample Data is not responsive in categories with text containers (fixed in [#10929](https://github.com/magento/magento2/pull/10929))
+    * [#10738](https://github.com/magento/magento2/issues/10738) -- Empty attribute label is displayed on product page when other language used. (fixed in [#10932](https://github.com/magento/magento2/pull/10932))
+    * [#10417](https://github.com/magento/magento2/issues/10417) -- Wysywig editor shows broken image icons (fixed in [#11309](https://github.com/magento/magento2/pull/11309))
+    * [#10007](https://github.com/magento/magento2/issues/10007) -- ProductAlert: Product alerts not showing in admin side product edit page (fixed in [#11448](https://github.com/magento/magento2/pull/11448))
+    * [#10795](https://github.com/magento/magento2/issues/10795) -- Shipping method radios have duplicate IDs on cart page (fixed in [#11456](https://github.com/magento/magento2/pull/11456))
+    * [#10231](https://github.com/magento/magento2/issues/10231) -- Custom URL Rewrite Not working (fixed in [#11469](https://github.com/magento/magento2/pull/11469))
+    * [#11207](https://github.com/magento/magento2/issues/11207) -- Shipment API won't append comment to email (fixed in [#11386](https://github.com/magento/magento2/pull/11386))
 * GitHub pull requests:
     * [#9692](https://github.com/magento/magento2/pull/9692) -- Backport of MAGETWO-59256 for 2.1: Custom composer modules break Component Manager #6718 (by @JTimNolan)
     * [#9809](https://github.com/magento/magento2/pull/9809) -- Fix issue #6999: Configurable attribute cache was never hit (by @thlassche)
@@ -32,7 +59,31 @@
     * [#10188](https://github.com/magento/magento2/pull/10188) -- magento/magento2:#6175 Fixed Unable to generate unsecure URL if current URL is secure (by @arshadpkm)
     * [#10260](https://github.com/magento/magento2/pull/10260) -- Fix order date format in Orders Grid (by @ihor-sviziev)
     * [#10282](https://github.com/magento/magento2/pull/10282) -- 2.1 - Allow to use text swatch 0 (by @ihor-sviziev)
-
+    * [#10482](https://github.com/magento/magento2/pull/10482) -- Updated root composer.json file with current release (by @okorshenko)
+    * [#10569](https://github.com/magento/magento2/pull/10569) -- Fix for url_rewrite on page delete via api (by @avdb)
+    * [#10695](https://github.com/magento/magento2/pull/10695) -- Fix checking active carrier against store (by @bardkalbakk)
+    * [#10714](https://github.com/magento/magento2/pull/10714) -- Bugfix - Multiple filter_url_params  (by @bardkalbakk)
+    * [#10745](https://github.com/magento/magento2/pull/10745) -- Backport of PR-5725 for Magento 2.1 - Fix translations issues in... (by @hostep)
+    * [#10747](https://github.com/magento/magento2/pull/10747) -- Backport of MAGETWO-55900 for Magento 2.1: [GitHub] Translate message… (by @hostep)
+    * [#10750](https://github.com/magento/magento2/pull/10750) -- Backport of MAGETWO-65607 for Magento 2.1: [GitHub][PR] Check return … (by @hostep)
+    * [#10751](https://github.com/magento/magento2/pull/10751) -- Backport of MAGETWO-52577 for Magento 2.1: [GitHub] Set Product as Ne… (by @hostep)
+    * [#10557](https://github.com/magento/magento2/pull/10557) -- [BUGFIX] Flat Category reindexList of AllChildren if the url_key of t… (by @lewisvoncken)
+    * [#10753](https://github.com/magento/magento2/pull/10753) -- Backport of MAGETWO-52102 for Magento 2.1: [Github] Custom theme stat… (by @hostep)
+    * [#10749](https://github.com/magento/magento2/pull/10749) -- Backport PR-9713 & PR-9711 for Magento 2.1 - Google Analytics fixes when Cookie Restrictions is enabled (by @hostep)
+    * [#10748](https://github.com/magento/magento2/pull/10748) -- Backport PR-7919 for Magento 2.1 - Using Dynamic Protocol Concatination (by @hostep)
+    * [#10934](https://github.com/magento/magento2/pull/10934) -- [Backport] Fixed unclosed span tag (by @Igloczek)
+    * [#10929](https://github.com/magento/magento2/pull/10929) -- #10510 - fix RWD with installed Sample Data (by @szafran89)
+    * [#10932](https://github.com/magento/magento2/pull/10932) -- Backport #10739 - fix for translated attribute label comparison. (by @Januszpl)
+    * [#11201](https://github.com/magento/magento2/pull/11201) -- Delete CallExit function for After plugin logic execution 2.1-develop [BackPort] (by @osrecio)
+    * [#11309](https://github.com/magento/magento2/pull/11309) -- [2.1-Develop] Fix #10417 (by @PieterCappelle)
+    * [#11448](https://github.com/magento/magento2/pull/11448) -- Show product alerts in admin product detail [backport 2.1] (by @raumatbel)
+    * [#10975](https://github.com/magento/magento2/pull/10975) -- Checkout page could hang for Javascript error (by @angelo983)
+    * [#11456](https://github.com/magento/magento2/pull/11456) -- Added carrier code to ID to distinguish shipping methods [backport 2.1] (by @peterjaap)
+    * [#11506](https://github.com/magento/magento2/pull/11506) -- [Backport-2.1] Retain additional cron history by default (by @mpchadwick)
+    * [#11361](https://github.com/magento/magento2/pull/11361) -- [Backport 2.1-develop] cron:install and cron:remove commands, support to manage multiple instances in the same crontab, based on installation directory (by @adrian-martinez-interactiv4)
+    * [#11386](https://github.com/magento/magento2/pull/11386) -- [Backport 2.1] Append shipment comment to shipment if appendComment is true (by @JeroenVanLeusden)
+    * [#11469](https://github.com/magento/magento2/pull/11469) -- FR#10231_21 Custom URL Rewrite Not working (by @mrodespin)    
+
 2.1.8
 =============
 * GitHub issues:

app/code/Magento/Backend/composer.json

@@ -22,7 +22,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Braintree/composer.json

@@ -24,7 +24,7 @@
         "magento/module-checkout-agreements": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.6",
+    "version": "100.1.7",
     "license": [
         "proprietary"
     ],

app/code/Magento/Bundle/composer.json

@@ -25,7 +25,7 @@
         "magento/module-bundle-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/BundleImportExport/composer.json

@@ -11,7 +11,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.3",
+    "version": "100.1.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Catalog/composer.json

@@ -33,7 +33,7 @@
         "magento/module-catalog-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "101.0.9",
+    "version": "101.0.10",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogImportExport/composer.json

@@ -16,7 +16,7 @@
         "ext-ctype": "*"
     },
     "type": "magento2-module",
-    "version": "100.1.6",
+    "version": "100.1.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogRule/composer.json

@@ -17,7 +17,7 @@
         "magento/module-catalog-rule-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogSearch/composer.json

@@ -15,7 +15,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.7",
+    "version": "100.1.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogUrlRewrite/composer.json

@@ -14,7 +14,7 @@
         "magento/module-ui": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -233,7 +233,12 @@ protected function getConditions()
             : $this->getData('conditions');
 
         if ($conditions) {
-            $conditions = $this->conditionsHelper->decode($conditions);
+            try {
+                $conditions = $this->conditionsHelper->decode($conditions);
+            } catch (\InvalidArgumentException $e) {
+                $this->_logger->critical($e);
+                $conditions = '';
+            }
         }
 
         $this->rule->loadPost(['conditions' => $conditions]);

app/code/Magento/CatalogWidget/composer.json

@@ -14,7 +14,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.3",
+    "version": "100.1.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Checkout/composer.json

@@ -27,7 +27,7 @@
         "magento/module-cookie": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.8",
+    "version": "100.1.9",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CheckoutAgreements/composer.json

@@ -10,7 +10,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.2",
+    "version": "100.1.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Cms/composer.json

@@ -18,7 +18,7 @@
         "magento/module-cms-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "101.0.7",
+    "version": "101.0.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CmsUrlRewrite/composer.json

@@ -9,7 +9,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.2",
+    "version": "100.1.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/ConfigurableProduct/composer.json

@@ -23,7 +23,7 @@
         "magento/module-product-links-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.9",
+    "version": "100.1.10",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Cookie/composer.json

@@ -10,7 +10,7 @@
         "magento/module-backend": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.2",
+    "version": "100.1.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Cron/composer.json

@@ -10,7 +10,7 @@
         "magento/module-config": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.3",
+    "version": "100.1.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Customer/composer.json

@@ -29,7 +29,7 @@
         "magento/module-customer-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.8",
+    "version": "100.1.9",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Deploy/Model/Filesystem.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Validator\Locale;
 use Magento\User\Model\ResourceModel\User\Collection as UserCollection;
 
 /**
@@ -88,6 +89,11 @@ class Filesystem
      */
     private $userCollection;
 
+    /**
+     * @var Locale
+     */
+    private $locale;
+
     /**
      * @param \Magento\Framework\App\DeploymentConfig\Writer $writer
      * @param \Magento\Framework\App\DeploymentConfig\Reader $reader
@@ -96,7 +102,10 @@ class Filesystem
      * @param \Magento\Framework\App\Filesystem\DirectoryList $directoryList
      * @param \Magento\Framework\Filesystem\Driver\File $driverFile
      * @param \Magento\Store\Model\Config\StoreView $storeView
-     * @param \Magento\Framework\Shell $shell
+     * @param \Magento\Framework\ShellInterface $shell
+     * @param UserCollection|null $userCollection
+     * @param Locale|null $locale
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\DeploymentConfig\Writer $writer,
@@ -106,7 +115,9 @@ public function __construct(
         \Magento\Framework\App\Filesystem\DirectoryList $directoryList,
         \Magento\Framework\Filesystem\Driver\File $driverFile,
         \Magento\Store\Model\Config\StoreView $storeView,
-        \Magento\Framework\ShellInterface $shell
+        \Magento\Framework\ShellInterface $shell,
+        UserCollection $userCollection = null,
+        Locale $locale = null
     ) {
         $this->writer = $writer;
         $this->reader = $reader;
@@ -116,6 +127,8 @@ public function __construct(
         $this->driverFile = $driverFile;
         $this->storeView = $storeView;
         $this->shell = $shell;
+        $this->userCollection = $userCollection ?: $this->objectManager->get(UserCollection::class);
+        $this->locale = $locale ?: $this->objectManager->get(Locale::class);
         $this->functionCallPath =
             PHP_BINARY . ' -f ' . BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ';
     }
@@ -180,40 +193,38 @@ protected function deployStaticContent(
     private function getAdminUserInterfaceLocales()
     {
         $locales = [];
-        foreach ($this->getUserCollection() as $user) {
+        foreach ($this->userCollection as $user) {
             $locales[] = $user->getInterfaceLocale();
         }
         return $locales;
     }
 
     /**
-     * Get used store and admin user locales
+     * Get used store and admin user locales.
      *
-     * @return []string
+     * @return array
+     * @throws \InvalidArgumentException if unknown locale is provided by the store configuration
      */
     private function getUsedLocales()
     {
         $usedLocales = array_merge(
             $this->storeView->retrieveLocales(),
             $this->getAdminUserInterfaceLocales()
         );
-        return array_unique($usedLocales);
-    }
 
-    /**
-     * Get user collection
-     *
-     * @return UserCollection
-     * @deprecated
-     */
-    private function getUserCollection()
-    {
-        if (!($this->userCollection instanceof UserCollection)) {
-            return \Magento\Framework\App\ObjectManager::getInstance()->get(
-                UserCollection::class
-            );
-        }
-        return $this->userCollection;
+        return array_map(
+            function ($locale) {
+                if (!$this->locale->isValid($locale)) {
+                    throw new \InvalidArgumentException(
+                        $locale .
+                        ' argument has invalid value, run info:language:list for list of available locales'
+                    );
+                }
+
+                return $locale;
+            },
+            array_unique($usedLocales)
+        );
     }
 
     /**