Merge remote-tracking branch 'origin/2.1-develop' into 2.1-develop-pr56

Author: zakdma

app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php

@@ -106,7 +106,9 @@ protected function isValidOptionTitle($title, $storeId)
         if ($storeId > \Magento\Store\Model\Store::DEFAULT_STORE_ID && $title === null) {
             return true;
         }
-        if ($this->isEmpty($title)) {
+
+        // checking whether title is null and is empty string
+        if ($title === null || $title === '') {
             return false;
         }
 

app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php

@@ -256,7 +256,8 @@ protected function _saveValueTitles(AbstractModel $object)
                 $object->unsetData('title');
             }
 
-            if ($object->getTitle()) {
+            /*** Checking whether title is not null ***/
+            if ($object->getTitle()!= null) {
                 if ($existInCurrentStore) {
                     if ($storeId == $object->getStoreId()) {
                         $where = [

app/code/Magento/Config/Model/ResourceModel/Config.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Config\Model\ResourceModel;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 /**
  * Core Resource Resource Model
  *
@@ -32,7 +34,7 @@ protected function _construct()
      * @param int $scopeId
      * @return $this
      */
-    public function saveConfig($path, $value, $scope, $scopeId)
+    public function saveConfig($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0)
     {
         $connection = $this->getConnection();
         $select = $connection->select()->from(
@@ -68,7 +70,7 @@ public function saveConfig($path, $value, $scope, $scopeId)
      * @param int $scopeId
      * @return $this
      */
-    public function deleteConfig($path, $scope, $scopeId)
+    public function deleteConfig($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0)
     {
         $connection = $this->getConnection();
         $connection->delete(

app/code/Magento/Quote/Model/CouponManagement.php

@@ -55,6 +55,9 @@ public function set($cartId, $couponCode)
         if (!$quote->getItemsCount()) {
             throw new NoSuchEntityException(__('Cart %1 doesn\'t contain products', $cartId));
         }
+        if (!$quote->getStoreId()) {
+            throw new NoSuchEntityException(__('Cart isn\'t assigned to correct store'));
+        }
         $quote->getShippingAddress()->setCollectShippingRates(true);
 
         try {

app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php

@@ -51,6 +51,7 @@ protected function setUp()
                 'save',
                 'getShippingAddress',
                 'getCouponCode',
+                'getStoreId',
                 '__wakeup'
             ],
             [],
@@ -112,6 +113,9 @@ public function testSetWhenCouldNotApplyCoupon()
         $cartId = 33;
         $couponCode = '153a-ABC';
 
+        $this->storeMock->expects($this->any())->method('getId')->will($this->returnValue(1));
+        $this->quoteMock->expects($this->once())->method('getStoreId')->willReturn($this->returnValue(1));
+
         $this->quoteRepositoryMock->expects($this->once())
             ->method('getActive')->with($cartId)->will($this->returnValue($this->quoteMock));
         $this->quoteMock->expects($this->once())->method('getItemsCount')->will($this->returnValue(12));
@@ -139,6 +143,9 @@ public function testSetWhenCouponCodeIsInvalid()
         $cartId = 33;
         $couponCode = '153a-ABC';
 
+        $this->storeMock->expects($this->any())->method('getId')->will($this->returnValue(1));
+        $this->quoteMock->expects($this->once())->method('getStoreId')->willReturn($this->returnValue(1));
+
         $this->quoteRepositoryMock->expects($this->once())
             ->method('getActive')->with($cartId)->will($this->returnValue($this->quoteMock));
         $this->quoteMock->expects($this->once())->method('getItemsCount')->will($this->returnValue(12));
@@ -158,6 +165,9 @@ public function testSet()
         $cartId = 33;
         $couponCode = '153a-ABC';
 
+        $this->storeMock->expects($this->any())->method('getId')->will($this->returnValue(1));
+        $this->quoteMock->expects($this->once())->method('getStoreId')->willReturn($this->returnValue(1));
+
         $this->quoteRepositoryMock->expects($this->once())
             ->method('getActive')->with($cartId)->will($this->returnValue($this->quoteMock));
         $this->quoteMock->expects($this->once())->method('getItemsCount')->will($this->returnValue(12));

app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php

@@ -127,7 +127,8 @@ public function draw()
                     'feed' => 35,
                 ];
 
-                if ($option['value']) {
+                // Checking whether option value is not null
+                if ($option['value']!= null) {
                     if (isset($option['print_value'])) {
                         $printValue = $option['print_value'];
                     } else {

app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php

@@ -89,7 +89,7 @@ public function draw()
                 ];
 
                 // draw options value
-                if ($option['value']) {
+                if ($option['value']!= null) {
                     $printValue = isset(
                         $option['print_value']
                     ) ? $option['print_value'] : $this->filterManager->stripTags(

app/code/Magento/Store/Model/Address/Renderer.php

@@ -15,6 +15,12 @@
  */
 class Renderer
 {
+    const DEFAULT_TEMPLATE = "{{var name}}\n" .
+        "{{var street_line1}}\n" .
+        "{{depend street_line2}}{{var street_line2}}\n{{/depend}}" .
+        "{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" .
+        "{{var country}}";
+
     /**
      * @var EventManager
      */
@@ -25,18 +31,26 @@ class Renderer
      */
     protected $filterManager;
 
+    /**
+     * @var string
+     */
+    private $template;
+
     /**
      * Constructor
      *
      * @param EventManager $eventManager
      * @param FilterManager $filterManager
+     * @param string $template
      */
     public function __construct(
         EventManager $eventManager,
-        FilterManager $filterManager
+        FilterManager $filterManager,
+        $template = self::DEFAULT_TEMPLATE
     ) {
         $this->eventManager = $eventManager;
         $this->filterManager = $filterManager;
+        $this->template = $template;
     }
 
     /**
@@ -50,8 +64,7 @@ public function format(DataObject $storeInfo, $type = 'html')
     {
         $this->eventManager->dispatch('store_address_format', ['type' => $type, 'store_info' => $storeInfo]);
         $address = $this->filterManager->template(
-            "{{var name}}\n{{var street_line1}}\n{{depend street_line2}}{{var street_line2}}\n{{/depend}}"
-            . "{{var city}}, {{var region}} {{var postcode}},\n{{var country}}",
+            $this->template,
             ['variables' => $storeInfo->getData()]
         );
 

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php

@@ -220,7 +220,7 @@ public function testAddNegative($optionData)
         ];
 
         if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
-            if (isset($optionDataPost['title']) && empty($optionDataPost['title'])) {
+            if ($optionDataPost['title'] === null || $optionDataPost['title'] === '') {
                 $this->setExpectedException('SoapFault', 'Missed values for option required fields');
             } else {
                 $this->setExpectedException('SoapFault', 'Invalid option');

dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_negative.php

@@ -6,7 +6,7 @@
 
 return [
     'empty_required_field' => [
-        'title' => '',
+        'title' => null,
         'type' => 'field',
         'sort_order' => 1,
         'is_require' => 1,
@@ -54,7 +54,7 @@
                 'price' => 10.0,
                 'price_type' => 'fixed',
                 'sku' => 'radio option 1 sku',
-                'title' => '',
+                'title' => null,
                 'sort_order' => 1,
             ],
         ],