Merge remote-tracking branch 'upstream/develop' into develop

Author: dvynograd

.htaccess

@@ -32,34 +32,6 @@
 
     DirectoryIndex index.php
 
-<IfModule mod_php5.c>
-
-############################################
-## adjust memory limit
-
-    php_value memory_limit 768M
-    php_value max_execution_time 18000
-
-############################################
-## disable automatic session start
-## before autoload was initialized
-
-    php_flag session.auto_start off
-
-############################################
-## enable resulting html compression
-
-    #php_flag zlib.output_compression on
-
-###########################################
-## disable user agent verification to not break multiple image upload
-
-    php_flag suhosin.session.cryptua off
-
-</IfModule>
-
-<IfModule mod_php7.c>
-
 ############################################
 ## adjust memory limit
 
@@ -82,8 +54,6 @@
 
     php_flag suhosin.session.cryptua off
 
-</IfModule>
-
 <IfModule mod_security.c>
 ###########################################
 ## disable POST processing to not break multiple image upload

.htaccess.sample

@@ -32,34 +32,6 @@
 
     DirectoryIndex index.php
 
-<IfModule mod_php5.c>
-
-############################################
-## adjust memory limit
-
-    php_value memory_limit 768M
-    php_value max_execution_time 18000
-
-############################################
-## disable automatic session start
-## before autoload was initialized
-
-    php_flag session.auto_start off
-
-############################################
-## enable resulting html compression
-
-    #php_flag zlib.output_compression on
-
-###########################################
-## disable user agent verification to not break multiple image upload
-
-    php_flag suhosin.session.cryptua off
-
-</IfModule>
-
-<IfModule mod_php7.c>
-
 ############################################
 ## adjust memory limit
 
@@ -82,8 +54,6 @@
 
     php_flag suhosin.session.cryptua off
 
-</IfModule>
-
 <IfModule mod_security.c>
 ###########################################
 ## disable POST processing to not break multiple image upload

ISSUE_TEMPLATE.md

@@ -1,16 +1,24 @@
-Steps to reproduce
---
-1. Install Magento from `develop` branch.
-2. [Example] Add Configurable Product to the cart.
-3. ...
+<!--- Provide a general summary of the issue in the Title above -->
+<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
 
-Expected result
---
-1. [Example] Configurable product added to the shopping cart.
-2. ...
+### Preconditions
+<!--- Provide a more detailed information of environment you use -->
+<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
+1. 
+2. 
 
-Actual result
---
-1. [Example] Error message appears: "Cannot save quote".
-2. [Screenshot, logs]
-3. ...
+### Steps to reproduce
+<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant  -->
+1. 
+2. 
+3. 
+
+### Expected result
+<!--- Tell us what should happen -->
+1. 
+
+### Actual result
+<!--- Tell us what happens instead -->
+1. [Screenshot, logs]
+
+<!--- (This may be platform independent comment) -->

app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

@@ -18,9 +18,8 @@ class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
     public function render(\Magento\Framework\DataObject $row)
     {
         return '<span class="grid-row-title">' .
-            $row->getTitle() .
+            $this->escapeHtml($row->getTitle()) .
             '</span>' .
-            ($row->getDescription() ? '<br />' .
-            $row->getDescription() : '');
+            ($row->getDescription() ? '<br />' . $this->escapeHtml($row->getDescription()) : '');
     }
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

@@ -22,7 +22,7 @@ public function execute()
         $responseData = [];
         try {
             $this->_objectManager->create(
-                'Magento\AdminNotification\Model\NotificationService'
+                \Magento\AdminNotification\Model\NotificationService::class
             )->markAsRead(
                 $notificationId
             );
@@ -31,7 +31,7 @@ public function execute()
             $responseData['success'] = false;
         }
         $this->getResponse()->representJson(
-            $this->_objectManager->create('Magento\Framework\Json\Helper\Data')->jsonEncode($responseData)
+            $this->_objectManager->create(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($responseData)
         );
     }
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

@@ -24,7 +24,7 @@ public function execute()
         if ($notificationId) {
             try {
                 $this->_objectManager->create(
-                    'Magento\AdminNotification\Model\NotificationService'
+                    \Magento\AdminNotification\Model\NotificationService::class
                 )->markAsRead(
                     $notificationId
                 );

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

@@ -27,7 +27,7 @@ public function execute()
         } else {
             try {
                 foreach ($ids as $id) {
-                    $model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
+                    $model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
                     if ($model->getId()) {
                         $model->setIsRead(1)->save();
                     }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

@@ -27,7 +27,7 @@ public function execute()
         } else {
             try {
                 foreach ($ids as $id) {
-                    $model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
+                    $model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
                     if ($model->getId()) {
                         $model->setIsRemove(1)->save();
                     }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

@@ -22,7 +22,7 @@ class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notificatio
     public function execute()
     {
         if ($id = $this->getRequest()->getParam('id')) {
-            $model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
+            $model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
 
             if (!$model->getId()) {
                 $this->_redirect('adminhtml/*/');

app/code/Magento/AdminNotification/Model/Inbox.php

@@ -38,7 +38,7 @@ class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierIn
      */
     protected function _construct()
     {
-        $this->_init('Magento\AdminNotification\Model\ResourceModel\Inbox');
+        $this->_init(\Magento\AdminNotification\Model\ResourceModel\Inbox::class);
     }
 
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

@@ -19,7 +19,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     protected function _construct()
     {
-        $this->_init('Magento\AdminNotification\Model\Inbox', 'Magento\AdminNotification\Model\ResourceModel\Inbox');
+        $this->_init(
+            \Magento\AdminNotification\Model\Inbox::class,
+            \Magento\AdminNotification\Model\ResourceModel\Inbox::class
+        );
     }
 
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php

@@ -16,7 +16,10 @@ class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\Abst
      */
     protected function _construct()
     {
-        $this->_init('Magento\AdminNotification\Model\Inbox', 'Magento\AdminNotification\Model\ResourceModel\Inbox');
+        $this->_init(
+            \Magento\AdminNotification\Model\Inbox::class,
+            \Magento\AdminNotification\Model\ResourceModel\Inbox::class
+        );
     }
 
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php

@@ -51,8 +51,8 @@ public function __construct(
     protected function _construct()
     {
         $this->_init(
-            'Magento\AdminNotification\Model\System\Message',
-            'Magento\AdminNotification\Model\ResourceModel\System\Message'
+            \Magento\AdminNotification\Model\System\Message::class,
+            \Magento\AdminNotification\Model\ResourceModel\System\Message::class
         );
     }
 

app/code/Magento/AdminNotification/Model/System/Message.php

@@ -15,7 +15,7 @@ class Message extends \Magento\Framework\Model\AbstractModel implements \Magento
      */
     protected function _construct()
     {
-        $this->_init('Magento\AdminNotification\Model\ResourceModel\System\Message');
+        $this->_init(\Magento\AdminNotification\Model\ResourceModel\System\Message::class);
     }
 
     /**

app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php

@@ -24,7 +24,7 @@ protected function _getBlockInstance($unreadNotifications)
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         // mock collection of unread notifications
         $notificationList = $this->getMock(
-            'Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread',
+            \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread::class,
             ['getSize', 'setCurPage', 'setPageSize'],
             [],
             '',
@@ -33,7 +33,7 @@ protected function _getBlockInstance($unreadNotifications)
         $notificationList->expects($this->any())->method('getSize')->will($this->returnValue($unreadNotifications));
 
         $block = $objectManagerHelper->getObject(
-            'Magento\AdminNotification\Block\ToolbarEntry',
+            \Magento\AdminNotification\Block\ToolbarEntry::class,
             ['notificationList' => $notificationList]
         );
 
@@ -52,12 +52,14 @@ public function testGetLatestUnreadNotifications()
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         // 1. Create mocks
-        $notificationList = $this->getMockBuilder('Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread')
+        $notificationList = $this->getMockBuilder(
+            \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         /** @var \Magento\AdminNotification\Block\ToolbarEntry $model */
-        $model = $helper->getObject('Magento\AdminNotification\Block\ToolbarEntry',
+        $model = $helper->getObject(
+            \Magento\AdminNotification\Block\ToolbarEntry::class,
             ['notificationList' => $notificationList]
         );
 

app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

@@ -52,13 +52,25 @@ class FeedTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->inboxFactory = $this->getMock('Magento\AdminNotification\Model\InboxFactory', ['create'], [], '', false);
-        $this->curlFactory = $this->getMock('Magento\Framework\HTTP\Adapter\CurlFactory', ['create'], [], '', false);
-        $this->curl = $this->getMockBuilder('Magento\Framework\HTTP\Adapter\Curl')
+        $this->inboxFactory = $this->getMock(
+            \Magento\AdminNotification\Model\InboxFactory::class,
+            ['create'],
+            [],
+            '',
+            false
+        );
+        $this->curlFactory = $this->getMock(
+            \Magento\Framework\HTTP\Adapter\CurlFactory::class,
+            ['create'],
+            [],
+            '',
+            false
+        );
+        $this->curl = $this->getMockBuilder(\Magento\Framework\HTTP\Adapter\Curl::class)
             ->disableOriginalConstructor()->getMock();
-        $this->appState = $this->getMock('Magento\Framework\App\State', ['getInstallDate'], [], '', false);
+        $this->appState = $this->getMock(\Magento\Framework\App\State::class, ['getInstallDate'], [], '', false);
         $this->inboxModel = $this->getMock(
-            'Magento\AdminNotification\Model\Inbox',
+            \Magento\AdminNotification\Model\Inbox::class,
             [
                 '__wakeup',
                 'parse'
@@ -68,15 +80,15 @@ protected function setUp()
             false
         );
         $this->backendConfig = $this->getMock(
-            'Magento\Backend\App\ConfigInterface',
+            \Magento\Backend\App\ConfigInterface::class,
             [
                 'getValue',
                 'setValue',
                 'isSetFlag'
             ]
         );
         $this->cacheManager = $this->getMock(
-            'Magento\Framework\App\CacheInterface',
+            \Magento\Framework\App\CacheInterface::class,
             [
                 'load',
                 'getFrontend',
@@ -86,18 +98,18 @@ protected function setUp()
             ]
         );
 
-        $this->deploymentConfig = $this->getMockBuilder('Magento\Framework\App\DeploymentConfig')
+        $this->deploymentConfig = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
             ->disableOriginalConstructor()->getMock();
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
-        $this->productMetadata = $this->getMockBuilder('Magento\Framework\App\ProductMetadata')
+        $this->productMetadata = $this->getMockBuilder(\Magento\Framework\App\ProductMetadata::class)
             ->disableOriginalConstructor()->getMock();
 
-        $this->urlBuilder = $this->getMock('Magento\Framework\UrlInterface');
+        $this->urlBuilder = $this->getMock(\Magento\Framework\UrlInterface::class);
 
         $this->feed = $this->objectManagerHelper->getObject(
-            'Magento\AdminNotification\Model\Feed',
+            \Magento\AdminNotification\Model\Feed::class,
             [
                 'backendConfig' => $this->backendConfig,
                 'cacheManager' => $this->cacheManager,

app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php

@@ -24,14 +24,14 @@ protected function _getServiceInstanceForMarkAsReadTest($notificationId)
          *  $notificationFactory \PHPUnit_Framework_MockObject_MockObject|\Magento\AdminNotification\Model\InboxFactory
          */
         $notificationFactory = $this->getMock(
-            'Magento\AdminNotification\Model\InboxFactory',
+            \Magento\AdminNotification\Model\InboxFactory::class,
             ['create'],
             [],
             '',
             false
         );
         $notification = $this->getMock(
-            'Magento\AdminNotification\Model\Inbox',
+            \Magento\AdminNotification\Model\Inbox::class,
             ['load', 'getId', 'save', 'setIsRead', '__sleep', '__wakeup'],
             [],
             '',