🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - magento-engcom/magento2ce#1149: magento/magento2#NONE: Fix vault_payment_token install script type where column defaults were not set (PR #12965 backport 2.1) (by @p-bystritsky)
 - #12958: [Backport to 2.1-develop] Fix #9243 - Upgrade ZF components. Zend_Service (by @dverkade)
 - #12959: [Backport to 2.1-develop] Fix #10812: htaccess Options override (by @dverkade)
 - #12930: Fix wishlist item getBuyRequest with no options (by @jameshalsall)


Fixed GitHub Issues:
 - #9243: Upgrade ZF components. Zend_Service (reported by @okorshenko) has been fixed in #12958 by @dverkade in 2.1-develop branch
   Related commits:
     1. abc7bc6

 - #10812: htaccess Options override (reported by @s3rj1k) has been fixed in #12959 by @dverkade in 2.1-develop branch
   Related commits:
     1. 704960a

Author: Oleksii Korshenko

app/code/Magento/Vault/Setup/InstallSchema.php

@@ -90,13 +90,13 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'is_active',
                 Table::TYPE_BOOLEAN,
                 null,
-                ['nullable' => false, 'dafault' => true],
+                ['nullable' => false, 'default' => true],
                 'Is active flag'
             )->addColumn(
                 'is_visible',
                 Table::TYPE_BOOLEAN,
                 null,
-                ['nullable' => false, 'dafault' => true],
+                ['nullable' => false, 'default' => true],
                 'Is visible flag'
             )->addIndex(
                 $setup->getIdxName(

app/code/Magento/Wishlist/Model/Item.php

@@ -472,7 +472,7 @@ public function getProductUrl()
     public function getBuyRequest()
     {
         $option = $this->getOptionByCode('info_buyRequest');
-        $initialData = $option ? unserialize($option->getValue()) : null;
+        $initialData = $option ? unserialize($option->getValue()) : [];
 
         if ($initialData instanceof \Magento\Framework\DataObject) {
             $initialData = $initialData->getData();

app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php

@@ -323,4 +323,15 @@ public function testGetProduct()
             ->willReturn($productMock);
         $this->assertEquals($productMock, $this->model->getProduct());
     }
+
+    public function testGetBuyRequestWithNoOption()
+    {
+        $buyRequest = $this->model->getBuyRequest();
+
+        $this->assertInstanceOf(\Magento\Framework\DataObject::class, $buyRequest);
+        $this->assertEquals([
+            'qty' => 0,
+            'original_qty' => null
+        ], $buyRequest->getData());
+    }
 }

lib/internal/Magento/Framework/CurrencyInterface.php

@@ -239,15 +239,19 @@ public function isLess($value, $currency = null);
     /**
      * Returns the set service class
      *
-     * @return \Zend_Service
+     * @return \Zend_Currency_CurrencyInterface
+     * @deprecated
+     * @see \Magento\Directory\Model\Currency\Import\ImportInterface
      */
     public function getService();
 
     /**
      * Sets a new exchange service
      *
-     * @param string|\Magento\Framework\Locale\CurrencyInterface $service Service class
-     * @return \Magento\Framework\CurrencyInterface
+     * @param string|\Zend_Currency_CurrencyInterface $service Service class
+     * @return \Zend_Currency_CurrencyInterface
+     * @deprecated
+     * @see \Magento\Directory\Model\Currency\Import\ImportInterface
      */
     public function setService($service);
 }

pub/media/.htaccess

@@ -1,4 +1,4 @@
-Options All -Indexes
+Options -Indexes
 
 <IfModule mod_php5.c>
 php_flag engine 0

pub/media/theme_customization/.htaccess

@@ -1,4 +1,4 @@
-Options All -Indexes
+Options -Indexes
 <Files ~ "\.xml$">
     Order allow,deny
     Deny from all