[EngCom] Public Pull Requests - 2.3-develop

 - merged latest code from mainline branch

CHANGELOG.md

@@ -785,7 +785,7 @@ Tests:
     * Refactored controller actions in the Product area
     * Moved commands cache.php, indexer.php, log.php, test.php, compiler.php, singletenant\_compiler.php, generator.php, pack.php, deploy.php and file\_assembler.php to the new bin/magento CLI framework
 * Data Migration Tool
-    * The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
+    * The Data Migration Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
 * Fixed bugs
     * Fixed an issue where error appeared during placing order with virtual product
     * Fixed an issue where billing and shipping sections didn't contain address information on order print

app/code/Magento/Contact/view/frontend/web/css/source/_module.less

@@ -21,6 +21,16 @@
     }
 }
 
+//
+//  Desktop
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+    .contact-index-index .column:not(.sidebar-additional) .form.contact {
+        min-width: 600px;
+    }
+}
+
 //  Mobile
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .contact-index-index {

app/code/Magento/Customer/Model/Address.php

@@ -122,7 +122,7 @@ public function __construct(
     }
 
     /**
-     * Init model
+     * Initialize address model
      *
      * @return void
      */
@@ -167,7 +167,14 @@ public function updateData(AddressInterface $address)
     }
 
     /**
-     * @inheritdoc
+     * Create address data object based on current address model.
+     *
+     * @param int|null $defaultBillingAddressId
+     * @param int|null $defaultShippingAddressId
+     * @return AddressInterface
+     * Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
+     * the instance of Api/Data/AddressInterface
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
@@ -257,7 +264,7 @@ public function getDefaultAttributeCodes()
     }
 
     /**
-     * Clone object handler
+     * Clone address
      *
      * @return void
      */
@@ -356,7 +363,11 @@ public function reindex()
     }
 
     /**
-     * @inheritdoc
+     * Get a list of custom attribute codes.
+     *
+     * By default, entity can be extended only using extension attributes functionality.
+     *
+     * @return string[]
      * @since 100.0.6
      */
     protected function getCustomAttributesCodes()

app/code/Magento/Customer/Model/Customer.php

@@ -1054,17 +1054,6 @@ public function resetErrors()
         return $this;
     }
 
-    /**
-     * Prepare customer for delete
-     *
-     * @return $this
-     */
-    public function beforeDelete()
-    {
-        //TODO : Revisit and figure handling permissions in MAGETWO-11084 Implementation: Service Context Provider
-        return parent::beforeDelete();
-    }
-
     /**
      * Processing object after save data
      *
@@ -1305,7 +1294,7 @@ public function getResetPasswordLinkExpirationPeriod()
     }
 
     /**
-     * Create address instance
+     * Create Address from Factory
      *
      * @return Address
      */
@@ -1315,7 +1304,7 @@ protected function _createAddressInstance()
     }
 
     /**
-     * Create address collection instance
+     * Create Address Collection from Factory
      *
      * @return \Magento\Customer\Model\ResourceModel\Address\Collection
      */
@@ -1325,7 +1314,7 @@ protected function _createAddressCollection()
     }
 
     /**
-     * Returns templates types
+     * Get Template Types
      *
      * @return array
      */

app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php

@@ -171,7 +171,14 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Create or update a customer.
+     *
+     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @param string $passwordHash
+     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @throws \Magento\Framework\Exception\InputException If bad input is provided
+     * @throws \Magento\Framework\Exception\State\InputMismatchException If the provided email is already used
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -304,7 +311,13 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =
     }
 
     /**
-     * @inheritdoc
+     * Retrieve customer.
+     *
+     * @param string $email
+     * @param int|null $websiteId
+     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified email does not exist.
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function get($email, $websiteId = null)
     {
@@ -313,7 +326,12 @@ public function get($email, $websiteId = null)
     }
 
     /**
-     * @inheritdoc
+     * Get customer by Customer ID.
+     *
+     * @param int $customerId
+     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified ID does not exist.
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getById($customerId)
     {
@@ -322,7 +340,15 @@ public function getById($customerId)
     }
 
     /**
-     * @inheritdoc
+     * Retrieve customers which match a specified criteria.
+     *
+     * This call returns an array of objects, but detailed information about each object’s attributes might not be
+     * included. See http://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
+     * which call to use to get detailed information about all attributes for an object.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\Customer\Api\Data\CustomerSearchResultsInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -362,15 +388,24 @@ public function getList(SearchCriteriaInterface $searchCriteria)
     }
 
     /**
-     * @inheritdoc
+     * Delete customer.
+     *
+     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @return bool true on success
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function delete(CustomerInterface $customer)
     {
         return $this->deleteById($customer->getId());
     }
 
     /**
-     * @inheritdoc
+     * Delete customer by Customer ID.
+     *
+     * @param int $customerId
+     * @return bool true on success
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function deleteById($customerId)
     {

app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php

@@ -72,13 +72,15 @@ public function __construct(
      */
     public function getFields(array $productIds, $storeId)
     {
+        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+
         $priceData = $this->dataProvider->getSearchableAttribute('price')
             ? $this->resourceIndex->getPriceIndexData($productIds, $storeId)
             : [];
 
         $fields = [];
         foreach ($productIds as $productId) {
-            $fields[$productId] = $this->getProductPriceData($productId, $storeId, $priceData);
+            $fields[$productId] = $this->getProductPriceData($productId, $websiteId, $priceData);
         }
 
         return $fields;

app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php

@@ -408,7 +408,9 @@ protected function _saveValidatedBunches()
             if ($source->valid()) {
                 try {
                     $rowData = $source->current();
-                    $skuSet[$rowData['sku']] = true;
+                    if (array_key_exists('sku', $rowData)) {
+                        $skuSet[$rowData['sku']] = true;
+                    }
                 } catch (\InvalidArgumentException $e) {
                     $this->addRowError($e->getMessage(), $this->_processedRowsCount);
                     $this->_processedRowsCount++;
@@ -436,7 +438,7 @@ protected function _saveValidatedBunches()
                 $source->next();
             }
         }
-        $this->_processedEntitiesCount = count($skuSet);
+        $this->_processedEntitiesCount = (count($skuSet)) ? : $this->_processedRowsCount;
 
         return $this;
     }

app/code/Magento/Paypal/README.md

@@ -1,6 +1,6 @@
 Module Magento\PayPal implements integration with the PayPal payment system. Namely, it enables the following payment methods:
-*PayPal Express Checkout
-*PayPal Payments Standard
-*PayPal Payments Pro
-*PayPal Credit
-*PayFlow Payment Gateway
+* PayPal Express Checkout
+* PayPal Payments Standard
+* PayPal Payments Pro
+* PayPal Credit
+* PayFlow Payment Gateway