Merge remote-tracking branch 'origin/develop' into MAGETWO-58051

Author: fascinosum

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at engcom@magento.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

app/bootstrap.php

@@ -63,5 +63,5 @@
 date_default_timezone_set('UTC');
 
 /*  Adjustment of precision value for several versions of PHP */
-ini_set('precision', 17);
-ini_set('serialize_precision', 17);
+ini_set('precision', 15);
+ini_set('serialize_precision', 15);

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

@@ -652,8 +652,13 @@ protected function _initAttributes()
      */
     protected function deleteOptionsAndSelections($productIds)
     {
+        if (empty($productIds)) {
+            return $this;
+        }
+
         $optionTable = $this->_resource->getTableName('catalog_product_bundle_option');
         $optionValueTable = $this->_resource->getTableName('catalog_product_bundle_option_value');
+        $selectionTable = $this->_resource->getTableName('catalog_product_bundle_selection');
         $valuesIds =  $this->connection->fetchAssoc($this->connection->select()->from(
             ['bov' => $optionValueTable],
             ['value_id']
@@ -666,17 +671,16 @@ protected function deleteOptionsAndSelections($productIds)
             $productIds
         ));
         $this->connection->delete(
-            $optionTable,
+            $optionValueTable,
             $this->connection->quoteInto('value_id IN (?)', array_keys($valuesIds))
         );
-        $productIdsInWhere = $this->connection->quoteInto('parent_id IN (?)', $productIds);
         $this->connection->delete(
             $optionTable,
-            $this->connection->quoteInto('parent_id IN (?)', $productIdsInWhere)
+            $this->connection->quoteInto('parent_id IN (?)', $productIds)
         );
         $this->connection->delete(
-            $optionTable,
-            $this->connection->quoteInto('parent_product_id IN (?)', $productIdsInWhere)
+            $selectionTable,
+            $this->connection->quoteInto('parent_product_id IN (?)', $productIds)
         );
         return $this;
     }

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php

@@ -128,7 +128,7 @@ private function isUniqueAdminValues(array $optionsValues, array $deletedOptions
             }
         }
         $uniqueValues = array_unique($adminValues);
-        return ($uniqueValues === $adminValues);
+        return array_diff_assoc($adminValues, $uniqueValues);
     }
 
     /**
@@ -157,10 +157,16 @@ private function checkUniqueOption(DataObject $response, array $options = null)
         if (is_array($options)
             && !empty($options['value'])
             && !empty($options['delete'])
-            && !$this->isUniqueAdminValues($options['value'], $options['delete'])
         ) {
-            $this->setMessageToResponse($response, [__("The value of Admin must be unique.")]);
-            $response->setError(true);
+            $duplicates = $this->isUniqueAdminValues($options['value'], $options['delete']);
+            if ($duplicates) {
+                $this->setMessageToResponse(
+                    $response,
+                    [__('The value of Admin must be unique. (%1)', implode(', ', $duplicates))]
+                );
+
+                $response->setError(true);
+            }
         }
         return $this;
     }

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/ImageEntryConverter.php

@@ -100,16 +100,16 @@ public function convertFrom(ProductAttributeMediaGalleryEntryInterface $entry)
     protected function convertFromMediaGalleryEntryContentInterface(
         ImageContentInterface $content = null
     ) {
-        if ($content == null) {
+        if ($content === null) {
             return null;
-        } else {
-            return [
-                'data' => [
-                    ImageContentInterface::BASE64_ENCODED_DATA => $content->getBase64EncodedData(),
-                    ImageContentInterface::TYPE => $content->getType(),
-                    ImageContentInterface::NAME => $content->getName(),
-                ],
-            ];
         }
+
+        return [
+            'data' => [
+                ImageContentInterface::BASE64_ENCODED_DATA => $content->getBase64EncodedData(),
+                ImageContentInterface::TYPE => $content->getType(),
+                ImageContentInterface::NAME => $content->getName(),
+            ],
+        ];
     }
 }

app/code/Magento/Catalog/Pricing/Price/TierPrice.php

@@ -72,7 +72,7 @@ public function __construct(
         Session $customerSession,
         GroupManagementInterface $groupManagement
     ) {
-        $quantity = $quantity ?: 1;
+        $quantity = floatval($quantity) ? $quantity : 1;
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->customerSession = $customerSession;
         $this->groupManagement = $groupManagement;

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

@@ -717,3 +717,4 @@ none,none
 Overview,Overview
 Details,Details
 "The value of Admin must be unique.", "The value of Admin must be unique."
+"The value of Admin must be unique. (%1)", "The value of Admin must be unique. (%1)"

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/attribute/unique-validate.js

@@ -10,11 +10,17 @@ define([
     'use strict';
 
     return function (config) {
-        var _config = jQuery.extend({
-            element: null,
-            message: '',
-            uniqueClass: 'required-unique'
-        }, config);
+        var msg = '',
+            _config = jQuery.extend({
+                element: null,
+                message: '',
+                uniqueClass: 'required-unique'
+            }, config),
+
+            /** @inheritdoc */
+            messager = function () {
+                return msg;
+            };
 
         if (typeof _config.element === 'string') {
             jQuery.validator.addMethod(
@@ -25,21 +31,27 @@ define([
                             .closest('table')
                             .find('.' + _config.uniqueClass + ':visible'),
                         valuesHash = {},
-                        isValid = true;
+                        isValid = true,
+                        duplicates = [];
 
                     inputs.each(function (el) {
                         var inputValue = inputs[el].value;
 
                         if (typeof valuesHash[inputValue] !== 'undefined') {
                             isValid = false;
+                            duplicates.push(inputValue);
                         }
                         valuesHash[inputValue] = el;
                     });
 
+                    if (!isValid) {
+                        msg = _config.message + ' (' + duplicates.join(', ') + ')';
+                    }
+
                     return isValid;
                 },
 
-                _config.message
+                messager
             );
         }
     };

app/code/Magento/Catalog/view/frontend/templates/product/list.phtml

@@ -42,11 +42,10 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
     $pos = $block->getPositioned();
     ?>
     <div class="products wrapper <?= /* @escapeNotVerified */ $viewMode ?> products-<?= /* @escapeNotVerified */ $viewMode ?>">
-        <?php $iterator = 1; ?>
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
-                <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+            <li class="item product product-item">
                 <div class="product-item-info" data-container="product-grid">
                     <?php
                     $productImage = $block->getImage($_product, $image);
@@ -112,7 +111,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                         </div>
                     </div>
                 </div>
-                <?= ($iterator == count($_productCollection)+1) ? '</li>' : '' ?>
+            </li>
             <?php endforeach; ?>
         </ol>
     </div>

app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml

@@ -174,7 +174,6 @@ switch ($type = $block->getType()) {
         <?php endif; ?>
         <div class="products wrapper grid products-grid products-<?= /* @escapeNotVerified */ $type ?>">
             <ol class="products list items product-items">
-                <?php $iterator = 1; ?>
                 <?php foreach ($items as $_item): ?>
                 <?php $available = ''; ?>
                 <?php if (!$_item->isComposite() && $_item->isSaleable() && $type == 'related'): ?>
@@ -183,9 +182,9 @@ switch ($type = $block->getType()) {
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php if ($type == 'related' || $type == 'upsell'): ?>
-                    <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item" style="display: none;">' : '</li><li class="item product product-item" style="display: none;">' ?>
+                    <li class="item product product-item" style="display: none;">
                 <?php else: ?>
-                    <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+                    <li class="item product product-item">
                 <?php endif; ?>
                 <div class="product-item-info <?= /* @escapeNotVerified */ $available ?>">
                     <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
@@ -252,7 +251,7 @@ switch ($type = $block->getType()) {
                             <?php endif; ?>
                         </div>
                     </div>
-                    <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
+                </li>
                 <?php endforeach ?>
             </ol>
         </div>