MAGETWO-52000: [Github][PR]impossible to see what is wrong with cron - unhelpful error message #3189

- merging mainline

Author: mazhalai

.htaccess

@@ -101,7 +101,7 @@
     # Insert filter on all content
     ###SetOutputFilter DEFLATE
     # Insert filter on selected content types only
-    #AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
+    #AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript application/json image/svg+xml
 
     # Netscape 4.x has some problems...
     #BrowserMatch ^Mozilla/4 gzip-only-text/html
@@ -190,6 +190,7 @@
 
     AddDefaultCharset Off
     #AddDefaultCharset UTF-8
+    AddType 'text/html; charset=UTF-8' html
 
 <IfModule mod_expires.c>
 
@@ -285,3 +286,38 @@
 ## http://developer.yahoo.com/performance/rules.html#etags
 
     #FileETag none
+
+# ######################################################################
+# # INTERNET EXPLORER                                                  #
+# ######################################################################
+
+# ----------------------------------------------------------------------
+# | Document modes                                                     |
+# ----------------------------------------------------------------------
+
+# Force Internet Explorer 8/9/10 to render pages in the highest mode
+# available in the various cases when it may not.
+#
+# https://hsivonen.fi/doctype/#ie8
+#
+# (!) Starting with Internet Explorer 11, document modes are deprecated.
+# If your business still relies on older web apps and services that were
+# designed for older versions of Internet Explorer, you might want to
+# consider enabling `Enterprise Mode` throughout your company.
+#
+# https://msdn.microsoft.com/en-us/library/ie/bg182625.aspx#docmode
+# http://blogs.msdn.com/b/ie/archive/2014/04/02/stay-up-to-date-with-enterprise-mode-for-internet-explorer-11.aspx
+
+<IfModule mod_headers.c>
+
+    Header set X-UA-Compatible "IE=edge"
+
+    # `mod_headers` cannot match based on the content-type, however,
+    # the `X-UA-Compatible` response header should be send only for
+    # HTML documents and not for the other resources.
+
+    <FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|webmanifest|woff2?|xloc|xml|xpi)$">
+        Header unset X-UA-Compatible
+    </FilesMatch>
+
+</IfModule>

.htaccess.sample

@@ -100,7 +100,7 @@
     # Insert filter on all content
     ###SetOutputFilter DEFLATE
     # Insert filter on selected content types only
-    #AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
+    #AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript application/json image/svg+xml
 
     # Netscape 4.x has some problems...
     #BrowserMatch ^Mozilla/4 gzip-only-text/html
@@ -189,6 +189,7 @@
 
     AddDefaultCharset Off
     #AddDefaultCharset UTF-8
+    AddType 'text/html; charset=UTF-8' html
 
 <IfModule mod_expires.c>
 
@@ -284,3 +285,38 @@
 ## http://developer.yahoo.com/performance/rules.html#etags
 
     #FileETag none
+
+# ######################################################################
+# # INTERNET EXPLORER                                                  #
+# ######################################################################
+
+# ----------------------------------------------------------------------
+# | Document modes                                                     |
+# ----------------------------------------------------------------------
+
+# Force Internet Explorer 8/9/10 to render pages in the highest mode
+# available in the various cases when it may not.
+#
+# https://hsivonen.fi/doctype/#ie8
+#
+# (!) Starting with Internet Explorer 11, document modes are deprecated.
+# If your business still relies on older web apps and services that were
+# designed for older versions of Internet Explorer, you might want to
+# consider enabling `Enterprise Mode` throughout your company.
+#
+# https://msdn.microsoft.com/en-us/library/ie/bg182625.aspx#docmode
+# http://blogs.msdn.com/b/ie/archive/2014/04/02/stay-up-to-date-with-enterprise-mode-for-internet-explorer-11.aspx
+
+<IfModule mod_headers.c>
+
+    Header set X-UA-Compatible "IE=edge"
+
+    # `mod_headers` cannot match based on the content-type, however,
+    # the `X-UA-Compatible` response header should be send only for
+    # HTML documents and not for the other resources.
+
+    <FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|webmanifest|woff2?|xloc|xml|xpi)$">
+        Header unset X-UA-Compatible
+    </FilesMatch>
+
+</IfModule>

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/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>

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js

@@ -24,7 +24,8 @@ define([
                  * {String}
                  */
                 id: 'co-transparent-form-braintree'
-            }
+            },
+            isValidCardNumber: false
         },
 
         /**
@@ -113,11 +114,7 @@ define([
                 }
 
                 if (event.target.fieldKey === 'number' && event.card) {
-                    if (event.isValid) {
-                        self.cardNumber = event.card;
-                    } else {
-                        self.cardNumber = null;
-                    }
+                    self.isValidCardNumber = event.isValid;
                     self.selectedCardType(
                         validator.getMageCardType(event.card.type, self.getCcAvailableTypes())
                     );
@@ -137,7 +134,7 @@ define([
 
             $selector.removeClass(invalidClass);
 
-            if (this.selectedCardType() === null) {
+            if (this.selectedCardType() === null || !this.isValidCardNumber) {
                 $(this.getSelector('cc_number')).addClass(invalidClass);
 
                 return false;

app/code/Magento/Bundle/view/base/web/js/price-bundle.js

@@ -180,7 +180,7 @@ define([
                         };
                     });
 
-                    $option.text(template(toTemplate));
+                    $option.html(template(toTemplate));
                 });
             });
         },

app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php

@@ -824,6 +824,7 @@ public function afterDelete()
      */
     public function __sleep()
     {
+        $this->unsetData('entity_type');
         return array_diff(
             parent::__sleep(),
             ['_indexerEavProcessor', '_productFlatIndexerProcessor', '_productFlatIndexerHelper', 'attrLockValidator']