🔃 [EngCom] Public Pull Requests - 2.3-develop

magento-engcom-team · web-flow · commit b7ca0490eada · 2018-04-04T08:42:11.000+03:00
Accepted Public Pull Requests: - #14506: [Forwardport] [FIX] Simplify ternary operators for catalog module (by @mastiuhin-olexandr) - #14503: [Forwardport] Update process-reviews.js (by @mastiuhin-olexandr) - #14501: [Forwardport] Added spanish Bolivia locale to allowedLocales list (by @mastiuhin-olexandr) - #14499: [Forwardport] Correct function return statement. (by @mastiuhin-olexandr) - #14346: Fixed decimal handling in order quantities (by @barbazul) - #14195: [Forwardport] Performance: remove count() form the condition section of a loop (by @dimonovp) Fixed GitHub Issues: - #14328: Qty to ship and Qty to invoice are handling decimals poorly (reported by @barbazul) has been fixed in #14346 by @barbazul in 2.3-develop branch Related commits: 1. 7a0534a 2. 5b58a34 3. 3c65999
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/Parser.php b/app/code/Magento/Backend/Model/Widget/Grid/Parser.php
@@ -30,8 +30,9 @@ public function parseExpression($expression)
         $expression = trim($expression);
         foreach ($this->_operations as $operation) {
             $splittedExpr = preg_split('/\\' . $operation . '/', $expression, -1, PREG_SPLIT_DELIM_CAPTURE);
-            if (count($splittedExpr) > 1) {
-                for ($i = 0; $i < count($splittedExpr); $i++) {
+            $count = count($splittedExpr);
+            if ($count > 1) {
+                for ($i = 0; $i < $count; $i++) {
                     $stack = array_merge($stack, $this->parseExpression($splittedExpr[$i]));
                     if ($i > 0) {
                         $stack[] = $operation;
diff --git a/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php b/app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilter.php
@@ -21,7 +21,7 @@ class ProductCategoryFilter implements CustomFilterInterface
      */
     public function apply(Filter $filter, AbstractDb $collection)
     {
-        $conditionType = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
+        $conditionType = $filter->getConditionType() ?: 'eq';
         $categoryFilter = [$conditionType => [$filter->getValue()]];
 
         /** @var Collection $collection */
diff --git a/app/code/Magento/Catalog/Model/CategoryRepository.php b/app/code/Magento/Catalog/Model/CategoryRepository.php
@@ -129,7 +129,7 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
      */
     public function get($categoryId, $storeId = null)
     {
-        $cacheKey = null !== $storeId ? $storeId : 'all';
+        $cacheKey = $storeId ?? 'all';
         if (!isset($this->instances[$categoryId][$cacheKey])) {
             /** @var Category $category */
             $category = $this->categoryFactory->create();
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
@@ -282,7 +282,8 @@ public function getMaxPrice()
     public function getPriorFilters($filterParams)
     {
         $priorFilters = [];
-        for ($i = 1; $i < count($filterParams); ++$i) {
+        $count = count($filterParams);
+        for ($i = 1; $i < $count; ++$i) {
             $priorFilter = $this->validateFilter($filterParams[$i]);
             if ($priorFilter) {
                 $priorFilters[] = $priorFilter;
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
@@ -2006,7 +2006,7 @@ public function getIsVirtual()
      */
     public function addCustomOption($code, $value, $product = null)
     {
-        $product = $product ? $product : $this;
+        $product = $product ?: $this;
         $option = $this->_itemOptionFactory->create()->addData(
             ['product_id' => $product->getId(), 'product' => $product, 'code' => $code, 'value' => $value]
         );
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
@@ -127,7 +127,7 @@ public function __construct(
         $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->validatorInfo = $validatorInfo;
         $this->validatorFile = $validatorFile;
-        $this->serializer = $serializer ? $serializer : ObjectManager::getInstance()->get(Json::class);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
         parent::__construct($checkoutSession, $scopeConfig, $data);
     }
 
diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
@@ -102,6 +102,6 @@ public function getLimit()
     public function getCurrentPage()
     {
         $page = (int) $this->request->getParam(self::PAGE_PARM_NAME);
-        return $page ? $page : 1;
+        return $page ?: 1;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -341,7 +341,7 @@ public function getTierPrice($qty, $product)
             }
         }
 
-        return $prices ? $prices : [];
+        return $prices ?: [];
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -740,7 +740,7 @@ protected function addFilterGroupToCollection(
         $fields = [];
         $categoryFilter = [];
         foreach ($filterGroup->getFilters() as $filter) {
-            $conditionType = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
+            $conditionType = $filter->getConditionType() ?: 'eq';
 
             if ($filter->getField() == 'category_id') {
                 $categoryFilter[$conditionType][] = $filter->getValue();
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Api/SearchCriteria/CollectionProcessor/FilterProcessor/ProductCategoryFilterTest.php
@@ -31,7 +31,7 @@ public function testApply()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $filterMock->expects($this->exactly(2))
+        $filterMock->expects($this->exactly(1))
             ->method('getConditionType')
             ->willReturn('condition');
         $filterMock->expects($this->once())
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/MapperTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/Dependency/MapperTest.php
@@ -98,7 +98,8 @@ public function testGetDependenciesWhenDependentIsInvisible($isValueSatisfy)
     {
         $expected = [];
         $rowData = array_values($this->_testData);
-        for ($i = 0; $i < count($this->_testData); ++$i) {
+        $count = count($this->_testData);
+        for ($i = 0; $i < $count; ++$i) {
             $data = $rowData[$i];
             $dependentPath = 'some path ' . $i;
             $field = $this->_getField(
@@ -158,7 +159,8 @@ public function testGetDependenciesIsVisible()
     {
         $expected = [];
         $rowData = array_values($this->_testData);
-        for ($i = 0; $i < count($this->_testData); ++$i) {
+        $count = count($this->_testData);
+        for ($i = 0; $i < $count; ++$i) {
             $data = $rowData[$i];
             $field = $this->_getField(
                 true,
diff --git a/app/code/Magento/Paypal/Model/Report/Settlement.php b/app/code/Magento/Paypal/Model/Report/Settlement.php
@@ -369,7 +369,8 @@ public function parseCsv($localCsv, $format = 'new')
                     // Section columns.
                     // In case ever the column order is changed, we will have the items recorded properly
                     // anyway. We have named, not numbered columns.
-                    for ($i = 1; $i < count($line); $i++) {
+                    $count = count($line);
+                    for ($i = 1; $i < $count; $i++) {
                         $sectionColumns[$line[$i]] = $i;
                     }
                     $flippedSectionColumns = array_flip($sectionColumns);
diff --git a/app/code/Magento/Review/view/frontend/web/js/process-reviews.js b/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
@@ -50,15 +50,15 @@ define([
 
         $(function () {
             $('.product-info-main .reviews-actions a').click(function (event) {
-                var acnchor;
+                var anchor;
 
                 event.preventDefault();
-                acnchor = $(this).attr('href').replace(/^.*?(#|$)/, '');
+                anchor = $(this).attr('href').replace(/^.*?(#|$)/, '');
                 $('.product.data.items [data-role="content"]').each(function (index) { //eslint-disable-line
                     if (this.id == 'reviews') { //eslint-disable-line eqeqeq
                         $('.product.data.items').tabs('activate', index);
                         $('html, body').animate({
-                            scrollTop: $('#' + acnchor).offset().top - 50
+                            scrollTop: $('#' + anchor).offset().top - 50
                         }, 300);
                     }
                 });
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
@@ -233,7 +233,7 @@ public function getQtyToShip()
     public function getSimpleQtyToShip()
     {
         $qty = $this->getQtyOrdered() - $this->getQtyShipped() - $this->getQtyRefunded() - $this->getQtyCanceled();
-        return max($qty, 0);
+        return max(round($qty, 8), 0);
     }
 
     /**
@@ -248,7 +248,7 @@ public function getQtyToInvoice()
         }
 
         $qty = $this->getQtyOrdered() - $this->getQtyInvoiced() - $this->getQtyCanceled();
-        return max($qty, 0);
+        return max(round($qty, 8), 0);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
@@ -235,4 +235,114 @@ public function getProductOptionsDataProvider()
             ]
         ];
     }
+
+    /**
+     * Test different combinations of item qty setups
+     *
+     * @param array $options
+     * @param float $expectedResult
+     *
+     * @dataProvider getItemQtyVariants
+     */
+    public function testGetSimpleQtyToMethods(array $options, $expectedResult)
+    {
+        $this->model->setData($options);
+        $this->assertSame($this->model->getSimpleQtyToShip(), $expectedResult['to_ship']);
+        $this->assertSame($this->model->getQtyToInvoice(), $expectedResult['to_invoice']);
+    }
+
+    /**
+     * Provides different combinations of qty options for an item and the
+     * expected qtys pending shipment and invoice
+     *
+     * @return array
+     */
+    public function getItemQtyVariants()
+    {
+        return [
+            'empty_item' => [
+                'options' => [
+                    'qty_ordered' => 0, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 0,
+                    'qty_canceled' => 0
+                ],
+                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
+            ],
+            'ordered_item' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 0,
+                    'qty_canceled' => 0
+                ],
+                'expectedResult' => ['to_ship' => 12.0, 'to_invoice' => 12.0]
+            ],
+            'partially_invoiced' => [
+                'options' => ['qty_ordered' => 12, 'qty_invoiced' => 4, 'qty_refunded' => 0, 'qty_shipped' => 0,
+                    'qty_canceled' => 0,
+                ],
+                'expectedResult' => ['to_ship' => 12.0, 'to_invoice' => 8.0]
+            ],
+            'completely_invoiced' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 0, 'qty_shipped' => 0,
+                    'qty_canceled' => 0,
+                ],
+                'expectedResult' => ['to_ship' => 12.0, 'to_invoice' => 0.0]
+            ],
+            'partially_invoiced_refunded' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 5, 'qty_refunded' => 5, 'qty_shipped' => 0,
+                    'qty_canceled' => 0,
+                ],
+                'expectedResult' => ['to_ship' => 7.0, 'to_invoice' => 7.0]
+            ],
+            'partially_refunded' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 5, 'qty_shipped' => 0,
+                    'qty_canceled' => 0,
+                ],
+                'expectedResult' => ['to_ship' => 7.0, 'to_invoice' => 0.0]
+            ],
+            'partially_shipped' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 4,
+                    'qty_canceled' => 0
+                ],
+                'expectedResult' => ['to_ship' => 8.0, 'to_invoice' => 12.0]
+            ],
+            'partially_refunded_partially_shipped' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 5, 'qty_shipped' => 4,
+                    'qty_canceled' => 0
+                ],
+                'expectedResult' => ['to_ship' => 3.0, 'to_invoice' => 0.0]
+            ],
+            'complete' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 0, 'qty_shipped' => 12,
+                    'qty_canceled' => 0
+                ],
+                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
+            ],
+            'canceled' => [
+                'options' => [
+                    'qty_ordered' => 12, 'qty_invoiced' => 0, 'qty_refunded' => 0, 'qty_shipped' => 0,
+                    'qty_canceled' => 12
+                ],
+                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
+            ],
+            'completely_shipped_using_decimals' => [
+                'options' => [
+                    'qty_ordered' => 4.4, 'qty_invoiced' => 0.4, 'qty_refunded' => 0.4, 'qty_shipped' => 4,
+                    'qty_canceled' => 0,
+                ],
+                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 4.0]
+            ],
+            'completely_invoiced_using_decimals' => [
+                'options' => [
+                    'qty_ordered' => 4.4, 'qty_invoiced' => 4, 'qty_refunded' => 0, 'qty_shipped' => 4,
+                    'qty_canceled' => 0.4
+                ],
+                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 0.0]
+            ]
+        ];
+    }
 }
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
@@ -74,7 +74,7 @@ protected function _initRule()
     /**
      * Initiate action
      *
-     * @return this
+     * @return $this
      */
     protected function _initAction()
     {
diff --git a/app/code/Magento/Security/Model/AdminSessionInfo.php b/app/code/Magento/Security/Model/AdminSessionInfo.php
@@ -164,7 +164,7 @@ public function isOtherSessionsTerminated()
      * Setter for isOtherSessionsTerminated
      *
      * @param bool $isOtherSessionsTerminated
-     * @return this
+     * @return $this
      * @since 100.1.0
      */
     public function setIsOtherSessionsTerminated($isOtherSessionsTerminated)
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
@@ -2054,7 +2054,8 @@ protected function _parseZip($zipString, $returnFull = false)
         if (preg_match('/[\\d\\w]{5}\\-[\\d\\w]{4}/', $zipString) != 0) {
             $zip = explode('-', $zipString);
         }
-        for ($i = 0; $i < count($zip); ++$i) {
+        $count = count($zip);
+        for ($i = 0; $i < $count; ++$i) {
             if (strlen($zip[$i]) == 5) {
                 $zip5 = $zip[$i];
             } elseif (strlen($zip[$i]) == 4) {
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -749,7 +749,8 @@ private function handlePrimitive($name, $prefix)
     private function convertPathParams($uri)
     {
         $parts = explode('/', $uri);
-        for ($i=0; $i < count($parts); $i++) {
+        $count = count($parts);
+        for ($i=0; $i < $count; $i++) {
             if (strpos($parts[$i], ':') === 0) {
                 $parts[$i] = '{' . substr($parts[$i], 1) . '}';
             }
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy.php b/app/code/Magento/Webapi/Model/Soap/Wsdl/ComplexTypeStrategy.php
@@ -229,7 +229,8 @@ public function addAnnotation(\DOMElement $element, $documentation, $default = n
         $this->_processElementType($elementType, $documentation, $appInfoNode);
 
         if (preg_match_all('/{([a-z]+):(.+)}/Ui', $documentation, $matches)) {
-            for ($i = 0; $i < count($matches[0]); $i++) {
+            $count = count($matches[0]);
+            for ($i = 0; $i < $count; $i++) {
                 $appinfoTag = $matches[0][$i];
                 $tagName = $matches[1][$i];
                 $tagValue = $matches[2][$i];
diff --git a/lib/internal/Magento/Framework/Locale/Config.php b/lib/internal/Magento/Framework/Locale/Config.php
@@ -102,6 +102,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
         'lo_LA', /*Laotian*/
         'es_VE', /*Spanish (Venezuela)*/
         'en_IE', /*English (Ireland)*/
+        'es_BO', /*Spanish (Bolivia)*/
     ];
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ProductCategoryFilter implements CustomFilterInterface`
`21`	`21`	`*/`
`22`	`22`	`public function apply(Filter $filter, AbstractDb $collection)`
`23`	`23`	`{`
`24`		`- $conditionType = $filter->getConditionType() ? $filter->getConditionType() : 'eq';`
	`24`	`+ $conditionType = $filter->getConditionType() ?: 'eq';`
`25`	`25`	`$categoryFilter = [$conditionType => [$filter->getValue()]];`
`26`	`26`
`27`	`27`	`/** @var Collection $collection */`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)`
`129`	`129`	`*/`
`130`	`130`	`public function get($categoryId, $storeId = null)`
`131`	`131`	`{`
`132`		`- $cacheKey = null !== $storeId ? $storeId : 'all';`
	`132`	`+ $cacheKey = $storeId ?? 'all';`
`133`	`133`	`if (!isset($this->instances[$categoryId][$cacheKey])) {`
`134`	`134`	`/** @var Category $category */`
`135`	`135`	`$category = $this->categoryFactory->create();`
Original file line number	Diff line number	Diff line change
`@@ -2006,7 +2006,7 @@ public function getIsVirtual()`
`2006`	`2006`	`*/`
`2007`	`2007`	`public function addCustomOption($code, $value, $product = null)`
`2008`	`2008`	`{`
`2009`		`- $product = $product ? $product : $this;`
	`2009`	`+ $product = $product ?: $this;`
`2010`	`2010`	`$option = $this->_itemOptionFactory->create()->addData(`
`2011`	`2011`	`['product_id' => $product->getId(), 'product' => $product, 'code' => $code, 'value' => $value]`
`2012`	`2012`	`);`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function __construct(`
`127`	`127`	`$this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);`
`128`	`128`	`$this->validatorInfo = $validatorInfo;`
`129`	`129`	`$this->validatorFile = $validatorFile;`
`130`		`- $this->serializer = $serializer ? $serializer : ObjectManager::getInstance()->get(Json::class);`
	`130`	`+ $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);`
`131`	`131`	`parent::__construct($checkoutSession, $scopeConfig, $data);`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,6 @@ public function getLimit()`
`102`	`102`	`public function getCurrentPage()`
`103`	`103`	`{`
`104`	`104`	`$page = (int) $this->request->getParam(self::PAGE_PARM_NAME);`
`105`		`- return $page ? $page : 1;`
	`105`	`+ return $page ?: 1;`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ public function getTierPrice($qty, $product)`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
`344`		`- return $prices ? $prices : [];`
	`344`	`+ return $prices ?: [];`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`/**`