Merge remote-tracking branch 'mainline/develop' into MAGETWO-49512

Author: slavvka

.htaccess

@@ -4,12 +4,6 @@
 
 #   SetEnv MAGE_MODE developer
 
-############################################
-## overrides default umask value to allow using different
-## file permissions
-
-#   SetEnv MAGE_UMASK 022
-
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name
@@ -281,6 +275,10 @@
         order allow,deny
         deny from all
     </Files>
+    <Files magento_umask>
+            order allow,deny
+            deny from all
+    </Files>
 
 ################################
 ## If running in cluster environment, uncomment this

.htaccess.sample

@@ -274,6 +274,10 @@
         order allow,deny
         deny from all
     </Files>
+    <Files magento_umask>
+        order allow,deny
+        deny from all
+    </Files>
 
 ################################
 ## If running in cluster environment, uncomment this

app/bootstrap.php

@@ -10,10 +10,6 @@
 error_reporting(E_ALL);
 #ini_set('display_errors', 1);
 
-/* Custom umask value may be provided in MAGE_UMASK environment variable */
-$mask = isset($_SERVER['MAGE_UMASK']) ? octdec($_SERVER['MAGE_UMASK']) : 002;
-umask($mask);
-
 /* PHP version validation */
 if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 50522) {
     if (PHP_SAPI == 'cli') {
@@ -34,6 +30,11 @@
 require_once __DIR__ . '/autoload.php';
 require_once BP . '/app/functions.php';
 
+/* Custom umask value may be provided in optional mage_umask file in root */
+$umaskFile = BP . '/magento_umask';
+$mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
+umask($mask);
+
 if (!empty($_SERVER['MAGE_PROFILER'])
     && isset($_SERVER['HTTP_ACCEPT'])
     && strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false

app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php

@@ -80,7 +80,14 @@ protected function _prepareColumns()
 
         $this->addColumn(
             'orders_count',
-            ['header' => __('Orders'), 'sortable' => false, 'index' => 'orders_count', 'type' => 'number']
+            [
+                'header' => __('Orders'),
+                'sortable' => false,
+                'index' => 'orders_count',
+                'type' => 'number',
+                'header_css_class' => 'col-orders',
+                'column_css_class' => 'col-orders'
+            ]
         );
 
         $baseCurrencyCode = (string)$this->_storeManager->getStore(

app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php

@@ -78,7 +78,14 @@ protected function _prepareColumns()
 
         $this->addColumn(
             'orders_count',
-            ['header' => __('Orders'), 'sortable' => false, 'index' => 'orders_count', 'type' => 'number']
+            [
+                'header' => __('Orders'),
+                'sortable' => false,
+                'index' => 'orders_count',
+                'type' => 'number',
+                'header_css_class' => 'col-orders',
+                'column_css_class' => 'col-orders'
+            ]
         );
 
         $baseCurrencyCode = (string)$this->_storeManager->getStore(

app/code/Magento/Backend/Block/Widget/Grid/Export.php

@@ -257,6 +257,7 @@ public function _exportIterateCollection($callback, array $args)
         $break = false;
 
         while ($break !== true) {
+            $originalCollection->clear();
             $originalCollection->setPageSize($this->getExportPageSize());
             $originalCollection->setCurPage($page);
             $originalCollection->load();

app/code/Magento/Backend/Model/Session/Quote.php

@@ -7,6 +7,8 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Quote\Api\CartManagementInterface;
 
 /**
  * Adminhtml quote session
@@ -79,6 +81,11 @@ class Quote extends \Magento\Framework\Session\SessionManager
      */
     protected $quoteFactory;
 
+    /**
+     * @var \Magento\Quote\Api\CartManagementInterface;
+     */
+    private $cartManagement;
+
     /**
      * @param \Magento\Framework\App\Request\Http $request
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -143,15 +150,15 @@ public function __construct(
      */
     public function getQuote()
     {
+        $cartManagement = $this->getCartManagement();
+
         if ($this->_quote === null) {
-            $this->_quote = $this->quoteFactory->create();
             if ($this->getStoreId()) {
                 if (!$this->getQuoteId()) {
-                    $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId())
-                        ->setIsActive(false)
-                        ->setStoreId($this->getStoreId());
-                    $this->quoteRepository->save($this->_quote);
-                    $this->setQuoteId($this->_quote->getId());
+                    $this->setQuoteId($cartManagement->createEmptyCart());
+                    $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);
+                    $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId());
+                    $this->_quote->setIsActive(false);
                 } else {
                     $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);
                     $this->_quote->setStoreId($this->getStoreId());
@@ -169,6 +176,18 @@ public function getQuote()
         return $this->_quote;
     }
 
+    /**
+     * @return CartManagementInterface
+     * @deprecated
+     */
+    private function getCartManagement()
+    {
+        if ($this->cartManagement === null) {
+            $this->cartManagement = ObjectManager::getInstance()->get(CartManagementInterface::class);
+        }
+        return $this->cartManagement;
+    }
+
     /**
      * Retrieve store model object
      *

app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php

@@ -112,7 +112,7 @@ public function testSetCookiePathNonDefault()
     public function testSetSessionSettingsByConstructor($secureRequest)
     {
         $sessionName = 'admin';
-        $this->requestMock->expects($this->once())->method('isSecure')->willReturn($secureRequest);
+        $this->requestMock->expects($this->exactly(2))->method('isSecure')->willReturn($secureRequest);
 
         $validatorMock = $this->getMockBuilder('Magento\Framework\Validator\ValidatorInterface')
             ->disableOriginalConstructor()

app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php

@@ -92,6 +92,11 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
      */
     protected $quoteFactoryMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $cartManagementMock;
+
     /**
      * Set up
      *
@@ -197,9 +202,16 @@ protected function setUp()
         );
 
         $this->quoteFactoryMock = $this->getMock('\Magento\Quote\Model\QuoteFactory', ['create'], [], '', false);
+        $this->cartManagementMock = $this->getMock(
+            \Magento\Quote\Api\CartManagementInterface::class,
+            [],
+            [],
+            '',
+            false
+        );
 
         $this->quote = $this->getMock(
-            'Magento\Backend\Model\Session\Quote',
+            \Magento\Backend\Model\Session\Quote::class,
             ['getStoreId', 'getQuoteId', 'setQuoteId', 'hasCustomerId', 'getCustomerId'],
             [
                 'request' => $this->requestMock,
@@ -217,10 +229,12 @@ protected function setUp()
                 'storeManager' => $this->storeManagerMock,
                 'groupManagement' => $this->groupManagementMock,
                 'quoteFactory' => $this->quoteFactoryMock
-            ],
-            '',
-            true
+            ]
         );
+
+        $this->prepareObjectManager([
+            [\Magento\Quote\Api\CartManagementInterface::class, $this->cartManagementMock]
+        ]);
     }
 
     /**
@@ -235,6 +249,8 @@ public function testGetQuoteWithoutQuoteId()
         $customerId = 66;
         $customerGroupId = 77;
 
+        $this->cartManagementMock->expects($this->once())->method('createEmptyCart')->willReturn($quoteId);
+
         $this->quote->expects($this->any())
             ->method('getQuoteId')
             ->will($this->returnValue(null));
@@ -271,7 +287,6 @@ public function testGetQuoteWithoutQuoteId()
                 'setStoreId',
                 'setCustomerGroupId',
                 'setIsActive',
-                'getId',
                 'assignCustomer',
                 'setIgnoreOldQty',
                 'setIsSuperMode',
@@ -281,9 +296,7 @@ public function testGetQuoteWithoutQuoteId()
             '',
             false
         );
-        $quoteMock->expects($this->once())
-            ->method('setStoreId')
-            ->with($storeId);
+        $this->quoteRepositoryMock->expects($this->once())->method('get')->willReturn($quoteMock);
         $quoteMock->expects($this->once())
             ->method('setCustomerGroupId')
             ->with($customerGroupId)
@@ -292,9 +305,6 @@ public function testGetQuoteWithoutQuoteId()
             ->method('setIsActive')
             ->with(false)
             ->will($this->returnSelf());
-        $quoteMock->expects($this->once())
-            ->method('getId')
-            ->will($this->returnValue($quoteId));
         $quoteMock->expects($this->once())
             ->method('assignCustomer')
             ->with($dataCustomerMock);
@@ -305,13 +315,6 @@ public function testGetQuoteWithoutQuoteId()
             ->method('setIsSuperMode')
             ->with(true);
 
-        $this->quoteFactoryMock->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($quoteMock));
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('save')
-            ->with($quoteMock);
-
         $this->assertEquals($quoteMock, $this->quote->getQuote());
     }
 
@@ -380,9 +383,6 @@ public function testGetQuoteWithQuoteId($customerId, $quoteCustomerId, $expected
             ->method('getCustomerId')
             ->will($this->returnValue($quoteCustomerId));
 
-        $this->quoteFactoryMock->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($quoteMock));
         $this->quoteRepositoryMock->expects($this->once())
             ->method('get')
             ->with($quoteId)
@@ -401,4 +401,19 @@ public function getQuoteDataProvider()
             'customer ids same' => [66, 66, 'never'],
         ];
     }
+
+    /**
+     * @param array $map
+     * @deprecated
+     */
+    private function prepareObjectManager($map)
+    {
+        $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $objectManagerMock->expects($this->any())->method('getInstance')->willReturnSelf();
+        $objectManagerMock->expects($this->any())->method('get')->will($this->returnValueMap($map));
+        $reflectionClass = new \ReflectionClass('Magento\Framework\App\ObjectManager');
+        $reflectionProperty = $reflectionClass->getProperty('_instance');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($objectManagerMock);
+    }
 }

app/code/Magento/Backend/etc/di.xml

@@ -149,7 +149,7 @@
             <argument name="storage" xsi:type="object">Magento\Backend\Model\Session\Quote\Storage</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Console\CommandList">
+    <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">
                 <item name="cacheEnableCommand" xsi:type="object">Magento\Backend\Console\Command\CacheEnableCommand</item>