Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-90349

Author: ameysar

.github/CONTRIBUTING.md

@@ -1,34 +1,34 @@
 # Contributing to Magento 2 code
 
 Contributions to the Magento 2 codebase are done using the fork & pull model.
-This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes (hence the phrase “pull request”).
+This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes. For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
 
-Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions.
+Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
 
-The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor for two weeks, the issue is closed.
+The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor within two weeks, the pull request will be closed.
 
 
 ## Contribution requirements
 
-1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v2.0/coding-standards/bk-coding-standards.html).
-2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
-3. Commits must be accompanied by meaningful commit messages.
-4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
+1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.2/coding-standards/bk-coding-standards.html).
+2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
+3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.2-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
+4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
 3. PRs which include new logic or new features must be submitted along with:
-* Unit/integration test coverage (we will be releasing more information on writing test coverage in the near future).
-* Proposed [documentation](http://devdocs.magento.com) update. Documentation contributions can be submitted [here](https://github.com/magento/devdocs).
-4. For large features or changes, please [open an issue](https://github.com/magento/magento2/issues) and discuss first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
-5. All automated tests are passed successfully (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
+* Unit/integration test coverage
+* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
+4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
+5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
 
 ## Contribution process
 
-If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
+If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests.
 
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
-5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
+4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
+5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
 
 ## Code of Conduct
 

app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

@@ -62,8 +62,10 @@ public function execute()
         if (empty($result)) {
             $result[] = [
                 'severity' => (string)\Magento\Framework\Notification\MessageInterface::SEVERITY_NOTICE,
-                'text' => 'You have viewed and resolved all recent system notices. '
-                    . 'Please refresh the web page to clear the notice alert.',
+                'text' => __(
+                    'You have viewed and resolved all recent system notices. '
+                    . 'Please refresh the web page to clear the notice alert.'
+                )
             ];
         }
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */

app/code/Magento/AdminNotification/i18n/en_US.csv

@@ -48,3 +48,4 @@ Severity,Severity
 "Date Added","Date Added"
 Message,Message
 Actions,Actions
+"You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert.","You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert."

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -411,6 +411,7 @@ public function saveData()
                     $this->populateExistingOptions();
                     $this->insertOptions();
                     $this->insertSelections();
+                    $this->insertParentChildRelations();
                     $this->clear();
                 }
             }
@@ -659,6 +660,32 @@ protected function insertSelections()
         return $this;
     }
 
+    /**
+     * Insert parent/child product relations
+     *
+     * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
+     */
+    private function insertParentChildRelations()
+    {
+        foreach ($this->_cachedOptions as $productId => $options) {
+            $childIds = [];
+            foreach ($options as $option) {
+                foreach ($option['selections'] as $selection) {
+                    if (!isset($selection['parent_product_id'])) {
+                        if (!isset($this->_cachedSkuToProducts[$selection['sku']])) {
+                            continue;
+                        }
+                        $childIds[] = $this->_cachedSkuToProducts[$selection['sku']];
+                    }
+                }
+
+                $this->relationsDataSaver->saveProductRelations($productId, $childIds);
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Initialize attributes parameters for all attributes' sets.
      *

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle/RelationsDataSaver.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\BundleImportExport\Model\Import\Product\Type\Bundle;
 
+use Magento\Catalog\Model\ResourceModel\Product\Relation;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * A bundle product relations (options, selections, etc.) data saver.
  *
@@ -17,13 +20,22 @@ class RelationsDataSaver
      */
     private $resource;
 
+    /**
+     * @var Relation
+     */
+    private $productRelation;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param Relation                                  $productRelation
      */
     public function __construct(
-        \Magento\Framework\App\ResourceConnection $resource
+        \Magento\Framework\App\ResourceConnection $resource,
+        Relation $productRelation = null
     ) {
-        $this->resource = $resource;
+        $this->resource        = $resource;
+        $this->productRelation = $productRelation
+            ?: ObjectManager::getInstance()->get(Relation::class);
     }
 
     /**
@@ -92,4 +104,17 @@ public function saveSelections(array $selections)
             );
         }
     }
+
+    /**
+     * Saves given parent/child relations.
+     *
+     * @param int $parentId
+     * @param array $childIds
+     *
+     * @return void
+     */
+    public function saveProductRelations($parentId, $childIds)
+    {
+        $this->productRelation->processRelations($parentId, $childIds);
+    }
 }

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/Bundle/RelationsDataSaverTest.php

@@ -7,6 +7,7 @@
 namespace Magento\BundleImportExport\Test\Unit\Model\Import\Product\Type\Bundle;
 
 use Magento\BundleImportExport\Model\Import\Product\Type\Bundle\RelationsDataSaver;
+use Magento\Catalog\Model\ResourceModel\Product\Relation;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 
@@ -30,6 +31,11 @@ class RelationsDataSaverTest extends \PHPUnit\Framework\TestCase
      */
     private $connectionMock;
 
+    /**
+     * @var Relation|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productRelationMock;
+
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -39,12 +45,16 @@ protected function setUp()
         $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resourceMock->expects($this->once())->method('getConnection')->willReturn($this->connectionMock);
+
+        $this->productRelationMock = $this->getMockBuilder(Relation::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->relationsDataSaver = $helper->getObject(
             RelationsDataSaver::class,
             [
-                'resource' => $this->resourceMock
+                'resource' => $this->resourceMock,
+                'productRelation' => $this->productRelationMock
             ]
         );
     }
@@ -53,7 +63,7 @@ public function testSaveOptions()
     {
         $options = [1, 2];
         $table_name= 'catalog_product_bundle_option';
-
+        $this->resourceMock->expects($this->once())->method('getConnection')->willReturn($this->connectionMock);
         $this->resourceMock->expects($this->once())
             ->method('getTableName')
             ->with('catalog_product_bundle_option')
@@ -78,6 +88,7 @@ public function testSaveOptionValues()
         $optionsValues = [1, 2];
         $table_name= 'catalog_product_bundle_option_value';
 
+        $this->resourceMock->expects($this->once())->method('getConnection')->willReturn($this->connectionMock);
         $this->resourceMock->expects($this->once())
             ->method('getTableName')
             ->with('catalog_product_bundle_option_value')
@@ -98,6 +109,7 @@ public function testSaveSelections()
         $selections = [1, 2];
         $table_name= 'catalog_product_bundle_selection';
 
+        $this->resourceMock->expects($this->once())->method('getConnection')->willReturn($this->connectionMock);
         $this->resourceMock->expects($this->once())
             ->method('getTableName')
             ->with('catalog_product_bundle_selection')
@@ -121,4 +133,16 @@ public function testSaveSelections()
 
         $this->relationsDataSaver->saveSelections($selections);
     }
+
+    public function testSaveProductRelations()
+    {
+        $parentId = 1;
+        $children = [2, 3];
+
+        $this->productRelationMock->expects($this->once())
+            ->method('processRelations')
+            ->with($parentId, $children);
+
+        $this->relationsDataSaver->saveProductRelations($parentId, $children);
+    }
 }

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

@@ -895,18 +895,4 @@ public function setIsFilterableInGrid($isFilterableInGrid)
         $this->setData(self::IS_FILTERABLE_IN_GRID, $isFilterableInGrid);
         return $this;
     }
-
-    /**
-     * @return \Magento\Eav\Api\Data\AttributeExtensionInterface
-     */
-    public function getExtensionAttributes()
-    {
-        $extensionAttributes = $this->_getExtensionAttributes();
-        if (null === $extensionAttributes) {
-            /** @var \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes */
-            $extensionAttributes = $this->eavAttributeFactory->create();
-            $this->setExtensionAttributes($extensionAttributes);
-        }
-        return $extensionAttributes;
-    }
 }

app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php

@@ -141,6 +141,11 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
         'static',
     ];
 
+    /**
+     * @var \Magento\Eav\Api\Data\AttributeExtensionFactory
+     */
+    private $eavExtensionFactory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -157,6 +162,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\Eav\Api\Data\AttributeExtensionFactory|null $eavExtensionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
      */
@@ -175,7 +181,8 @@ public function __construct(
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Eav\Api\Data\AttributeExtensionFactory $eavExtensionFactory = null
     ) {
         parent::__construct(
             $context,
@@ -194,6 +201,8 @@ public function __construct(
         $this->optionDataFactory = $optionDataFactory;
         $this->dataObjectProcessor = $dataObjectProcessor;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->eavExtensionFactory = $eavExtensionFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Eav\Api\Data\AttributeExtensionFactory::class);
     }
 
     /**
@@ -1314,7 +1323,13 @@ public function setValidationRules(array $validationRules = null)
      */
     public function getExtensionAttributes()
     {
-        return $this->_getExtensionAttributes();
+        $extensionAttributes = $this->_getExtensionAttributes();
+        if (!($extensionAttributes instanceof \Magento\Eav\Api\Data\AttributeExtensionInterface)) {
+            /** @var \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes */
+            $extensionAttributes = $this->eavExtensionFactory->create();
+            $this->setExtensionAttributes($extensionAttributes);
+        }
+        return $extensionAttributes;
     }
 
     /**

app/code/Magento/Signifyd/etc/adminhtml/system.xml

@@ -13,7 +13,7 @@
             <resource>Magento_Sales::fraud_protection</resource>
             <group id="signifyd" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
                 <fieldset_css>signifyd-logo-header</fieldset_css>
-                <group id="about" translate="label" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
+                <group id="about" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
                     <frontend_model>Magento\Signifyd\Block\Adminhtml\System\Config\Fieldset\Info</frontend_model>
                     <fieldset_css>signifyd-about-header</fieldset_css>
                     <label><![CDATA[Protect your store from fraud with Guaranteed Fraud Protection by Signifyd.]]></label>
@@ -26,12 +26,12 @@
                     </comment>
                     <more_url>https://www.signifyd.com/magento-guaranteed-fraud-protection</more_url>
                 </group>
-                <group id="config" translate="label" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
+                <group id="config" translate="label comment" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
                     <fieldset_css>signifyd-about-header</fieldset_css>
                     <label>Configuration</label>
                     <comment><![CDATA[<a href="https://www.signifyd.com/resources/manual/magento-2/signifyd-on-magento-integration-guide/" target="_blank">View our setup guide</a> for step-by-step instructions on how to integrate Signifyd with Magento.<br />For support contact <a href="mailto:support@signifyd.com">support@signifyd.com</a>.]]>
                     </comment>
-                    <field id="active" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="active" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Enable this Solution</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <config_path>fraud_protection/signifyd/active</config_path>

app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml

@@ -11,10 +11,10 @@
     <?= $block->getSaveButtonHtml() ?>
 </div>
 <?= $block->getRenameFormHtml() ?>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>').mage('form').mage('validation');
-
-});
+<script type="text/x-magento-init">
+    {
+        "#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>": {
+            "Magento_Tax/js/page/validate": {}
+        }
+    }
 </script>