MAGETWO-94826: Create Branches for 2.1.16 Release

- Merged branch 2.1.15-develop 2.1.16-develop

Author: aakimov

CHANGELOG.md

@@ -7,19 +7,28 @@
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Exception\NotFoundException;
 
 class DeleteGroupPost extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
-        $itemId = $this->getRequest()->getParam('item_id');
-
+        /** @var HttpRequest $request */
+        $request = $this->getRequest();
         /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-        $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $redirectResult = $this->resultFactory->create(
+            ResultFactory::TYPE_REDIRECT
+        );
+        if (!$request->isPost()) {
+            throw new NotFoundException(__('Page not found.'));
+        }
 
+        $itemId = $request->getParam('item_id');
         if (!($model = $this->_objectManager->create('Magento\Store\Model\Group')->load($itemId))) {
             $this->messageManager->addError(__('Something went wrong. Please try again.'));
             return $redirectResult->setPath('adminhtml/*/');

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php

@@ -6,21 +6,31 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NotFoundException;
 
 class DeleteStorePost extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * Delete store view post action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
-        $itemId = $this->getRequest()->getParam('item_id');
-
+        /** @var HttpRequest $request */
+        $request = $this->getRequest();
         /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-        $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $redirectResult = $this->resultFactory->create(
+            ResultFactory::TYPE_REDIRECT
+        );
+        if (!$request->isPost()) {
+            throw new NotFoundException(__('Page not found.'));
+        }
+
+        $itemId = $request->getParam('item_id');
         if (!($model = $this->_objectManager->create('Magento\Store\Model\Store')->load($itemId))) {
             $this->messageManager->addError(__('Something went wrong. Please try again.'));
             return $redirectResult->setPath('adminhtml/*/');

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php

@@ -7,21 +7,30 @@
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Exception\NotFoundException;
 
 class DeleteWebsitePost extends \Magento\Backend\Controller\Adminhtml\System\Store
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
-        $itemId = $this->getRequest()->getParam('item_id');
-        $model = $this->_objectManager->create('Magento\Store\Model\Website');
-        $model->load($itemId);
-
+        /** @var HttpRequest $request */
+        $request = $this->getRequest();
         /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-        $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $redirectResult = $this->resultFactory->create(
+            ResultFactory::TYPE_REDIRECT
+        );
+        if (!$request->isPost()) {
+            throw new NotFoundException(__('Page not found.'));
+        }
 
+        $itemId = $request->getParam('item_id');
+        $model = $this->_objectManager->create('Magento\Store\Model\Website');
+        $model->load($itemId);
         if (!$model) {
             $this->messageManager->addError(__('Something went wrong. Please try again.'));
             return $redirectResult->setPath('adminhtml/*/');

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php

@@ -42,7 +42,7 @@
             <% if (data.items.length) { %>
             <% _.each(data.items, function(value){ %>
             <li class="item"
-                <%- data.optionData(value) %>
+                <%= data.optionData(value) %>
                 >
                 <a href="<%- value.url %>" class="title"><%- value.name %></a>
                 <span class="type"><%- value.type %></span>

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

@@ -53,14 +53,6 @@ public function execute()
         $imageId = $this->_request->getParam('param_name', 'image');
         try {
             $result = $this->imageUploader->saveFileToTmpDir($imageId);
-
-            $result['cookie'] = [
-                'name' => $this->_getSession()->getName(),
-                'value' => $this->_getSession()->getSessionId(),
-                'lifetime' => $this->_getSession()->getCookieLifetime(),
-                'path' => $this->_getSession()->getCookiePath(),
-                'domain' => $this->_getSession()->getCookieDomain(),
-            ];
         } catch (\Exception $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }

app/code/Magento/Catalog/Controller/Adminhtml/Category/Image/Upload.php

@@ -9,6 +9,7 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Catalog\Controller\Adminhtml\Product\Builder;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
@@ -45,9 +46,14 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
         $collection = $this->filter->getCollection($this->collectionFactory->create());
         $productDeleted = 0;
         foreach ($collection->getItems() as $product) {

app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php

@@ -142,7 +142,7 @@ public function prepareForCart()
 
             if ($this->_dateExists()) {
                 if ($this->useCalendar()) {
-                    $timestamp += $this->_localeDate->date($value['date'], null, true)->getTimestamp();
+                    $timestamp += $this->_localeDate->date($value['date'], null, true, false)->getTimestamp();
                 } else {
                     $timestamp += mktime(0, 0, 0, $value['month'], $value['day'], $value['year']);
                 }

app/code/Magento/Catalog/Model/Product/Option/Type/Date.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\Product\Option\Type\File;
+
+/**
+ * Validator for existing (already saved) files.
+ */
+class ExistingValidate extends \Zend_Validate
+{
+    /**
+     * @inheritDoc
+     *
+     * @param string $value File's full path.
+     * @param string|null $originalName Original file's name (when uploaded).
+     */
+    public function isValid($value, $originalName = null)
+    {
+        $this->_messages = [];
+        $this->_errors = [];
+
+        if (!is_string($value)) {
+            $this->_messages[] = __('Full file path is expected.')->render();
+            return false;
+        }
+
+        $result = true;
+        $fileInfo = null;
+        if ($originalName) {
+            $fileInfo = ['name' => $originalName];
+        }
+        foreach ($this->_validators as $element) {
+            $validator = $element['instance'];
+            if ($validator->isValid($value, $fileInfo)) {
+                continue;
+            }
+            $result = false;
+            $messages = $validator->getMessages();
+            $this->_messages = array_merge($this->_messages, $messages);
+            $this->_errors = array_merge($this->_errors, array_keys($messages));
+            if ($element['breakChainOnFailure']) {
+                break;
+            }
+        }
+        return $result;
+    }
+}

app/code/Magento/Catalog/Model/Product/Option/Type/File/ExistingValidate.php

@@ -13,6 +13,6 @@ class ValidateFactory
      */
     public function create()
     {
-        return new \Zend_Validate();
+        return new ExistingValidate();
     }
 }