MAGETWO-80417: Prepare codebase for 2.1.10

Author: vzabaznov

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/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)
+        );
     }
 
     /**

app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php

@@ -5,11 +5,37 @@
  */
 namespace Magento\Eav\Model\Entity\Attribute\Backend;
 
+use Magento\Framework\Unserialize\SecureUnserializer;
+use Magento\Framework\App\ObjectManager;
+use Psr\Log\LoggerInterface;
+
 /**
  * "Serialized" attribute backend
  */
 class Serialized extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
+    /**
+     * @var SecureUnserializer
+     */
+    private $unserializer;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param SecureUnserializer|null $unserializer
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        SecureUnserializer $unserializer = null,
+        LoggerInterface $logger = null
+    ) {
+        $this->unserializer = $unserializer ?: ObjectManager::getInstance()->get(SecureUnserializer::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
+    }
+    
     /**
      * Serialize before saving
      *
@@ -64,9 +90,12 @@ protected function _unserialize(\Magento\Framework\DataObject $object)
         $attrCode = $this->getAttribute()->getAttributeCode();
         if ($object->getData($attrCode)) {
             try {
-                $unserialized = unserialize($object->getData($attrCode));
+                $unserialized = $this->unserializer->unserialize($object->getData($attrCode));
                 $object->setData($attrCode, $unserialized);
-            } catch (\Exception $e) {
+            } catch (\InvalidArgumentException $e) {
+                $this->logger->critical($e);
+                $object->unsetData($attrCode);
+            } catch (\Exception $e){
                 $object->unsetData($attrCode);
             }
         }

app/code/Magento/Eav/Model/Entity/Attribute/Backend/Serialized.php

@@ -1017,7 +1017,7 @@ public function filter($value)
             if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
                 $value = sprintf(__('Error filtering template: %s'), $e->getMessage());
             } else {
-                $value = __("We're sorry, an error has occurred while generating this email.");
+                $value = __("We're sorry, an error has occurred while generating this content.");
             }
             $this->_logger->critical($e);
         }

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

@@ -39,10 +39,10 @@ public function __construct(
      */
     public function execute()
     {
-        $fileName = $this->getRequest()->getParam('filename');
+        $fileName = basename($this->getRequest()->getParam('filename'));
 
         /** @var \Magento\ImportExport\Helper\Report $reportHelper */
-        $reportHelper = $this->_objectManager->get('Magento\ImportExport\Helper\Report');
+        $reportHelper = $this->_objectManager->get(\Magento\ImportExport\Helper\Report::class);
 
         if (!$reportHelper->importFileExists($fileName)) {
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */