Merge remote-tracking branch 'mainline/develop' into MAGETWO-23407-memory-usage

Author: mazhalai

.php_cs

@@ -15,7 +15,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->exclude('dev/tests/functional/vendor')
     ->exclude('dev/tests/integration/tmp')
     ->exclude('dev/tests/integration/var')
-    ->exclude('lib/internal/Apache')
     ->exclude('lib/internal/CardinalCommerce')
     ->exclude('lib/internal/Cm')
     ->exclude('lib/internal/Credis')

CHANGELOG.md

@@ -1,3 +1,36 @@
+0.42.0-beta11
+=============
+* Various improvements:
+    * Added LICENSE to Developer module
+    * Refactored Catalog and related module to use mutable data object interface
+    * Refactored Sales and related modules to use mutable data interfaces
+* Setup:
+    * Added styles for new module enabling / disabling section in Installation wizard
+    * Modules Install and upgrade capabilities are refactored to implement interfaces used by Setup application
+* Framework:
+    * Moved/refactored Magento\IO\Sftp adapter into Filesystem library
+    * Removed Magento IO library
+    * Implemented Dynamic Types Binding in SOAP
+    * Implemented Extensible Attributes generation
+    * Improved Web API Related Code Quality
+    * Moved Specific Helper Components From the Magento/Core Module to Magento/Framework
+* Performance:
+    * Inline JS code is eliminated
+    * Created fixture for changing Magento config update via Performance Toolkit Generator
+* Fixed bugs:
+    * Issue with  multiple addresses checkout
+    * Issue with catalog page update after a product status changes
+    * Issue with distance between "Log in" & "or" & "Register" in Frontend header
+    * Issue with tax details and amounts in frontend and backend order
+    * JavaScript error when clicking on toggle arrow to show FPT in shopping cart
+    * PHP Warning when trying to checkout with Multiple Addresses on review order page
+* Functional tests:
+    * Refactored end-to-end test for order placement from backend and for OnePageCheckout
+* GitHub requests:
+    * [#1035] (https://github.com/magento/magento2/issues/1035) -- Bug in Magento\Framework\Simplexml\Element::appendChild
+    * [#1053] (https://github.com/magento/magento2/issues/1053) -- #865: add getParams/setParam to RequestInterface
+    * [#1066] (https://github.com/magento/magento2/issues/1066) -- PHP 5.5.16-1+deb.sury.org~precise+1
+
 0.42.0-beta10
 =============
 * Framework

app/bootstrap.php

@@ -35,5 +35,5 @@
     \Magento\Framework\Profiler::applyConfig($_SERVER['MAGE_PROFILER'], BP, !empty($_REQUEST['isAjax']));
 }
 if (ini_get('date.timezone') == '') {
-    date_default_timezone_set(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::DEFAULT_TIMEZONE);
+    date_default_timezone_set('UTC');
 }

app/code/Magento/AdminNotification/Block/System/Messages.php

@@ -121,8 +121,10 @@ public function getSystemMessageDialogJson()
             [
                 'systemMessageDialog' => [
                     'autoOpen' => false,
-                    'width' => 600,
-                    'ajaxUrl' => $this->_getMessagesUrl(),
+                    'width' => '75%',
+                    'modal' => true,
+                    'dialogClass' => 'ui-dialog-active ui-popup-message',
+                    'ajaxUrl' => $this->_getMessagesUrl()
                 ],
             ]
         );

app/code/Magento/AdminNotification/Block/ToolbarEntry.php

@@ -18,7 +18,17 @@ class ToolbarEntry extends \Magento\Backend\Block\Template
     /**
      * Number of notifications showed on expandable window
      */
-    const NOTIFICATIONS_NUMBER = 4;
+    const NOTIFICATIONS_NUMBER = 3;
+
+    /**
+     * Number of notifications showed on icon
+     */
+    const NOTIFICATIONS_COUNTER_MAX = 99;
+
+    /**
+     * Length of notification description showed by default
+     */
+    const NOTIFICATION_DESCRIPTION_LENGTH = 150;
 
     /**
      * Collection of latest unread notifications
@@ -41,6 +51,26 @@ public function __construct(
         $this->_notificationList = $notificationList;
     }
 
+    /**
+     * Retrieve notification description start length
+     *
+     * @return int
+     */
+    public function getNotificationDescriptionLength()
+    {
+        return self::NOTIFICATION_DESCRIPTION_LENGTH;
+    }
+
+    /**
+     * Retrieve notification counter max value
+     *
+     * @return int
+     */
+    public function getNotificationCounterMax()
+    {
+        return self::NOTIFICATIONS_COUNTER_MAX;
+    }
+
     /**
      * Retrieve number of unread notifications
      *
@@ -69,13 +99,18 @@ public function getLatestUnreadNotifications()
      */
     public function formatNotificationDate($dateString)
     {
-        if (date('Ymd') == date('Ymd', strtotime($dateString))) {
-            return $this->formatTime(
-                $dateString,
-                \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT,
-                false
+        $date = new \DateTime($dateString);
+        if ($date == new \DateTime('today')) {
+            return $this->_localeDate->formatDateTime(
+                $date,
+                \IntlDateFormatter::NONE,
+                \IntlDateFormatter::SHORT
             );
         }
-        return $this->formatDate($dateString, \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_MEDIUM, true);
+        return $this->_localeDate->formatDateTime(
+            $date,
+            \IntlDateFormatter::MEDIUM,
+            \IntlDateFormatter::MEDIUM
+        );
     }
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

@@ -8,24 +8,56 @@
 
 class ListAction extends \Magento\Backend\App\AbstractAction
 {
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    protected $jsonHelper;
+
+    /**
+     * @var \Magento\AdminNotification\Model\Resource\System\Message\Collection
+     */
+    protected $messageCollection;
+
+    /**
+     * Initialize ListAction
+     *
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection $messageCollection
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
+        \Magento\AdminNotification\Model\Resource\System\Message\Collection $messageCollection
+    ) {
+        $this->jsonHelper = $jsonHelper;
+        $this->messageCollection = $messageCollection;
+        parent::__construct($context);
+    }
+
     /**
      * @return void
      */
     public function execute()
     {
         $severity = $this->getRequest()->getParam('severity');
-        $messageCollection = $this->_objectManager->get(
-            'Magento\AdminNotification\Model\Resource\System\Message\Collection'
-        );
         if ($severity) {
-            $messageCollection->setSeverity($severity);
+            $this->messageCollection->setSeverity($severity);
         }
         $result = [];
-        foreach ($messageCollection->getItems() as $item) {
-            $result[] = ['severity' => $item->getSeverity(), 'text' => $item->getText()];
+        foreach ($this->messageCollection->getItems() as $item) {
+            $result[] = [
+                'severity' => $item->getSeverity(),
+                'text' => $item->getText(),
+            ];
+        }
+        if (empty($result)) {
+            $result[] = [
+                'severity' => (string)\Magento\Framework\Notification\MessageInterface::SEVERITY_NOTICE,
+                'text' => 'You have viewed and resolved all recent system notices. '
+                    . 'Please refresh the web page to clear the notice alert.',
+            ];
         }
-        $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Framework\Json\Helper\Data')->jsonEncode($result)
-        );
+        $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
     }
 }

dev/tests/unit/testsuite/Magento/AdminNotification/Block/ToolbarEntryTest.php renamed to app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php

@@ -9,7 +9,7 @@
 /**
  * Test class for \Magento\AdminNotification\Block\ToolbarEntry
  */
-namespace Magento\AdminNotification\Block;
+namespace Magento\AdminNotification\Test\Unit\Block;
 
 class ToolbarEntryTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,7 +21,7 @@ class ToolbarEntryTest extends \PHPUnit_Framework_TestCase
      */
     protected function _getBlockInstance($unreadNotifications)
     {
-        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         // mock collection of unread notifications
         $notificationList = $this->getMock(
             'Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread',
@@ -49,7 +49,7 @@ public function testGetUnreadNotificationCount()
 
     public function testGetLatestUnreadNotifications()
     {
-        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         // 1. Create mocks
         $notificationList = $this->getMockBuilder('Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread')

dev/tests/unit/testsuite/Magento/AdminNotification/Model/FeedTest.php renamed to app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\AdminNotification\Model;
+namespace Magento\AdminNotification\Test\Unit\Model;
 
-use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)

dev/tests/unit/testsuite/Magento/AdminNotification/Model/NotificationServiceTest.php renamed to app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php

@@ -7,7 +7,7 @@
 /**
  * Test class for \Magento\AdminNotification\Model\NotificationService
  */
-namespace Magento\AdminNotification\Model;
+namespace Magento\AdminNotification\Test\Unit\Model;
 
 class NotificationServiceTest extends \PHPUnit_Framework_TestCase
 {