Merge branch 'develop' of github.com:magento/magento2ce into develop-prs

ishakhsuvarov · ishakhsuvarov · commit ed9e6981583b · 2017-06-01T09:59:45.000+03:00
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js b/app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js
@@ -19,7 +19,10 @@ define([
     quote.shippingAddress.subscribe(function () {
         var type = quote.shippingAddress().getType();
 
-        if (quote.isVirtual()) {
+        if (
+            quote.isVirtual() ||
+            window.checkoutConfig.activeCarriers && window.checkoutConfig.activeCarriers.length === 0
+        ) {
             // update totals block when estimated address was set
             totalsProcessors['default'] = totalsDefaultProvider;
             totalsProcessors[type] ?
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/default-validation-rules.js b/app/code/Magento/Checkout/view/frontend/web/js/model/default-validation-rules.js
@@ -0,0 +1,21 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    return {
+        /**
+         * @return {Object}
+         */
+        getRules: function () {
+            return {
+                'country_id': {
+                    'required': true
+                }
+            };
+        }
+    };
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/default-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/default-validator.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mageUtils',
+    './default-validation-rules',
+    'mage/translate'
+], function ($, utils, validationRules, $t) {
+    'use strict';
+
+    return {
+        validationErrors: [],
+
+        /**
+         * @param {Object} address
+         * @return {Boolean}
+         */
+        validate: function (address) {
+            var self = this;
+
+            this.validationErrors = [];
+            $.each(validationRules.getRules(), function (field, rule) {
+                var message;
+
+                if (rule.required && utils.isEmpty(address[field])) {
+                    message = $t('Field ') + field + $t(' is required.');
+
+                    self.validationErrors.push(message);
+                }
+            });
+
+            return !this.validationErrors.length;
+        }
+    };
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
@@ -13,6 +13,7 @@ define([
     '../model/address-converter',
     '../action/select-shipping-address',
     './postcode-validator',
+    './default-validator',
     'mage/translate',
     'uiRegistry',
     'Magento_Checkout/js/model/shipping-address/form-popup-state',
@@ -24,6 +25,7 @@ define([
     addressConverter,
     selectShippingAddress,
     postcodeValidator,
+    defaultValidator,
     $t,
     uiRegistry,
     formPopUpState
@@ -36,6 +38,8 @@ define([
         postcodeElement = null,
         postcodeElementName = 'postcode';
 
+    validators.push(defaultValidator);
+
     return {
         validateAddressTimeout: 0,
         validateDelay: 2000,
diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
@@ -130,6 +130,13 @@
                 <public_files_valid_paths>
                     <protected>
                         <app>/app/*/*</app>
+                        <bin>/bin/*/*</bin>
+                        <dev>/dev/*/*</dev>
+                        <generated>/generated/*/*</generated>
+                        <lib>/lib/*/*</lib>
+                        <setup>/setup/*/*</setup>
+                        <update>/update/*/*</update>
+                        <vendor>/vendor/*/*</vendor>
                     </protected>
                 </public_files_valid_paths>
             </file>
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/DataObjectProcessorTest.php b/app/code/Magento/Webapi/Test/Unit/Model/DataObjectProcessorTest.php
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -344,8 +344,7 @@ public function testProductLinks()
             "link_type" => "related",
             "linked_product_sku" => "product_simple_500",
             "linked_product_type" => "simple",
-            "position" => 0,
-            "extension_attributes" => []
+            "position" => 0
         ];
         $productWithRelatedData = [
             ProductInterface::SKU => "product_simple_with_related_500",
@@ -373,8 +372,7 @@ public function testProductLinks()
             "link_type" => "upsell",
             "linked_product_sku" => "product_simple_500",
             "linked_product_type" => "simple",
-            "position" => 0,
-            "extension_attributes" => []
+            "position" => 0
         ];
         $productWithUpsellData = [
             ProductInterface::SKU => "product_simple_with_related_500",
diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ConfigurableProductManagementTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ConfigurableProductManagementTest.php
@@ -69,8 +69,7 @@ public function testGetVariation()
                         'value' => $attributeOptionValue
                     ]
                 ],
-                'tier_prices' => [],
-                'extension_attributes' => []
+                'tier_prices' => []
             ]
         ];
         ksort($expectedItems);
diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php
@@ -162,7 +162,7 @@ public function testProductLinks()
                             "position" => 0, "extension_attributes" => ["qty" => 4]];
         $productLinkData2 = ["sku" => "group_product_500", "link_type" => "upsell",
                              "linked_product_sku" => "product_simple_500", "linked_product_type" => "simple",
-                             "position" => 0, "extension_attributes" => []];
+                             "position" => 0];
         $productWithGroupData =  [
             ProductInterface::SKU => "group_product_500",
             ProductInterface::NAME => "Group Product 500",
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
@@ -99,8 +99,16 @@ public function tearDown()
      */
     public function testGetCustomer()
     {
-        $expectedCustomerData = $this->_loadCustomer()->__toArray();
-        $actualCustomerData = $this->_block->getCustomer()->__toArray();
+        $expectedCustomer = $this->_loadCustomer();
+        $expectedCustomerData = $this->_dataObjectProcessor->buildOutputDataArray(
+            $expectedCustomer,
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        $actualCustomer = $this->_block->getCustomer();
+        $actualCustomerData = $this->_dataObjectProcessor->buildOutputDataArray(
+            $actualCustomer,
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
         foreach ($expectedCustomerData as $property => $value) {
             $expectedValue = is_numeric($value) ? intval($value) : $value;
             $actualValue = isset($actualCustomerData[$property]) ? $actualCustomerData[$property] : null;
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\Phrase;
-use Zend\Code\Reflection\MethodReflection;
 
 /**
  * Data object processor for array serialization using class reflection
@@ -75,7 +74,6 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
         $methods = $this->methodsMapProcessor->getMethodsMap($dataObjectType);
         $outputData = [];
 
-        /** @var MethodReflection $method */
         foreach (array_keys($methods) as $methodName) {
             if (!$this->methodsMapProcessor->isMethodValidForDataField($dataObjectType, $methodName)) {
                 continue;
@@ -100,6 +98,9 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
                 $value = $this->customAttributesProcessor->buildOutputDataArray($dataObject, $dataObjectType);
             } elseif ($key === "extension_attributes") {
                 $value = $this->extensionAttributesProcessor->buildOutputDataArray($value, $returnType);
+                if (empty($value)) {
+                    continue;
+                }
             } else {
                 if (is_object($value) && !($value instanceof Phrase)) {
                     $value = $this->buildOutputDataArray($value, $returnType);
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Reflection\Test\Unit;
+
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Framework\Reflection\ExtensionAttributesProcessor;
+
+class DataObjectProcessorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var DataObjectProcessor
+     */
+    private $dataObjectProcessor;
+
+    /**
+     * @var ExtensionAttributesProcessor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $extensionAttributesProcessorMock;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $methodsMapProcessor = $objectManager->getObject(
+            \Magento\Framework\Reflection\MethodsMap::class,
+            [
+                'fieldNamer' => $objectManager->getObject(\Magento\Framework\Reflection\FieldNamer::class),
+                'typeProcessor' => $objectManager->getObject(\Magento\Framework\Reflection\TypeProcessor::class),
+            ]
+        );
+        $serializerMock = $this->getMock(SerializerInterface::class);
+        $serializerMock->method('serialize')
+            ->willReturn('serializedData');
+        $serializerMock->method('unserialize')
+            ->willReturn(['unserializedData']);
+
+        $objectManager->setBackwardCompatibleProperty(
+            $methodsMapProcessor,
+            'serializer',
+            $serializerMock
+        );
+
+        $this->extensionAttributesProcessorMock = $this->getMockBuilder(ExtensionAttributesProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->dataObjectProcessor = $objectManager->getObject(
+            \Magento\Framework\Reflection\DataObjectProcessor::class,
+            [
+                'methodsMapProcessor' => $methodsMapProcessor,
+                'typeCaster' => $objectManager->getObject(\Magento\Framework\Reflection\TypeCaster::class),
+                'fieldNamer' => $objectManager->getObject(\Magento\Framework\Reflection\FieldNamer::class),
+                'extensionAttributesProcessor' => $this->extensionAttributesProcessorMock
+            ]
+        );
+    }
+
+    /**
+     * @param array $extensionAttributes
+     * @param array $expectedOutputDataArray
+     *
+     * @dataProvider buildOutputDataArrayDataProvider
+     */
+    public function testBuildOutputDataArray($extensionAttributes, $expectedOutputDataArray)
+    {
+        $objectManager =  new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        /** @var \Magento\Framework\Reflection\Test\Unit\TestDataObject $testDataObject */
+        $testDataObject = $objectManager->getObject(
+            \Magento\Framework\Reflection\Test\Unit\TestDataObject::class,
+            [
+                'extensionAttributes' => $this->getMockForAbstractClass(
+                    \Magento\Framework\Api\ExtensionAttributesInterface::class
+                )
+            ]
+        );
+
+        $this->extensionAttributesProcessorMock->expects($this->once())
+            ->method('buildOutputDataArray')
+            ->willReturn($extensionAttributes);
+
+        $outputData = $this->dataObjectProcessor
+            ->buildOutputDataArray($testDataObject, \Magento\Framework\Reflection\Test\Unit\TestDataInterface::class);
+        $this->assertEquals($expectedOutputDataArray, $outputData);
+    }
+
+    public function buildOutputDataArrayDataProvider()
+    {
+        $expectedOutputDataArray = [
+            'id' => '1',
+            'address' => 'someAddress',
+            'default_shipping' => 'true',
+            'required_billing' => 'false',
+        ];
+        $extensionAttributeArray = [
+            'attribute1' => 'value1',
+            'attribute2' => 'value2'
+        ];
+
+        return [
+            'No Attributes' => [[], $expectedOutputDataArray],
+            'With Attributes' => [
+                $extensionAttributeArray,
+                array_merge(
+                    $expectedOutputDataArray,
+                    ['extension_attributes' => $extensionAttributeArray]
+                )
+            ]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataInterface.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataInterface.php
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataObject.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TestDataObject.php

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,7 @@ public function testGetVariation()`
`69`	`69`	`'value' => $attributeOptionValue`
`70`	`70`	`]`
`71`	`71`	`],`
`72`		`- 'tier_prices' => [],`
`73`		`- 'extension_attributes' => []`
	`72`	`+ 'tier_prices' => []`
`74`	`73`	`]`
`75`	`74`	`];`
`76`	`75`	`ksort($expectedItems);`