Merge pull request #8064 from magento-gl/AC-6762-v1

Regression_issues_246_09jan22

Author: sidolov

app/code/Magento/Backend/Block/Widget/Grid/Extended.php

@@ -1067,10 +1067,11 @@ public function getCsv()
             $data = [];
             foreach ($this->getColumns() as $column) {
                 if (!$column->getIsSystem()) {
+                    $exportField = (string)$column->getRowFieldExport($item);
                     $data[] = '"' . str_replace(
                         ['"', '\\'],
                         ['""', '\\\\'],
-                        $column->getRowFieldExport($item) ?: ''
+                        $exportField ?: ''
                     ) . '"';
                 }
             }

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -36,8 +36,6 @@ class Bundle extends AbstractView
     protected $options;
 
     /**
-     * Catalog product
-     *
      * @var \Magento\Catalog\Helper\Product
      */
     protected $catalogProduct;
@@ -405,7 +403,7 @@ private function getConfigData(Product $product, array $options)
      */
     private function processOptions(string $optionId, array $options, DataObject $preConfiguredValues)
     {
-        $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/${optionId}") ?? [];
+        $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/{$optionId}") ?? [];
         $selections = $options[$optionId]['selections'];
         array_walk(
             $selections,

app/code/Magento/Paypal/Model/PayLaterConfig.php

@@ -15,17 +15,17 @@ class PayLaterConfig
     /**
      * Configuration key for Styles settings
      */
-    const CONFIG_KEY_STYLE = 'style';
+    public const CONFIG_KEY_STYLE = 'style';
 
     /**
      * Configuration key for Position setting
      */
-    const CONFIG_KEY_POSITION = 'position';
+    public const CONFIG_KEY_POSITION = 'position';
 
     /**
      * Checkout payment step placement
      */
-    const CHECKOUT_PAYMENT_PLACEMENT = 'checkout_payment';
+    public const CHECKOUT_PAYMENT_PLACEMENT = 'checkout_payment';
 
     /**
      * @var Config
@@ -91,11 +91,11 @@ public function getSectionConfig(string $section, string $key)
     {
         if (!array_key_exists($section, $this->configData)) {
             $sectionName = $section === self::CHECKOUT_PAYMENT_PLACEMENT
-                ? self::CHECKOUT_PAYMENT_PLACEMENT : "${section}page";
+                ? self::CHECKOUT_PAYMENT_PLACEMENT : "{$section}page";
 
             $this->configData[$section] = [
-                'display' => (boolean)$this->config->getPayLaterConfigValue("${sectionName}_display"),
-                'position' => $this->config->getPayLaterConfigValue("${sectionName}_position"),
+                'display' => (boolean)$this->config->getPayLaterConfigValue("{$sectionName}_display"),
+                'position' => $this->config->getPayLaterConfigValue("{$sectionName}_position"),
                 'style' => $this->getConfigStyles($sectionName)
             ];
         }
@@ -113,17 +113,17 @@ private function getConfigStyles(string $sectionName): array
     {
         $logoType = $logoPosition = $textColor = $textSize = null;
         $color = $ratio = null;
-        $styleLayout = $this->config->getPayLaterConfigValue("${sectionName}_stylelayout");
+        $styleLayout = $this->config->getPayLaterConfigValue("{$sectionName}_stylelayout");
         if ($styleLayout === 'text') {
-            $logoType = $this->config->getPayLaterConfigValue("${sectionName}_logotype");
+            $logoType = $this->config->getPayLaterConfigValue("{$sectionName}_logotype");
             if ($logoType === 'primary' || $logoType === 'alternative') {
-                $logoPosition = $this->config->getPayLaterConfigValue("${sectionName}_logoposition");
+                $logoPosition = $this->config->getPayLaterConfigValue("{$sectionName}_logoposition");
             }
-            $textColor = $this->config->getPayLaterConfigValue("${sectionName}_textcolor");
-            $textSize = $this->config->getPayLaterConfigValue("${sectionName}_textsize");
+            $textColor = $this->config->getPayLaterConfigValue("{$sectionName}_textcolor");
+            $textSize = $this->config->getPayLaterConfigValue("{$sectionName}_textsize");
         } elseif ($styleLayout === 'flex') {
-            $color = $this->config->getPayLaterConfigValue("${sectionName}_color");
-            $ratio = $this->config->getPayLaterConfigValue("${sectionName}_ratio");
+            $color = $this->config->getPayLaterConfigValue("{$sectionName}_color");
+            $ratio = $this->config->getPayLaterConfigValue("{$sectionName}_ratio");
         }
 
         return [

app/code/Magento/Quote/Model/Quote/Address/Rate.php

@@ -43,6 +43,13 @@ class Rate extends AbstractModel
     protected $_address;
 
     /**
+     * @var carrier_sort_order
+     */
+    public $carrier_sort_order;
+
+    /**
+     * Check the Quote rate
+     *
      * @return void
      */
     protected function _construct()
@@ -51,6 +58,8 @@ protected function _construct()
     }
 
     /**
+     * Set Address id with address before save
+     *
      * @return $this
      */
     public function beforeSave()
@@ -63,6 +72,8 @@ public function beforeSave()
     }
 
     /**
+     * Set address
+     *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
      */
@@ -73,6 +84,8 @@ public function setAddress(\Magento\Quote\Model\Quote\Address $address)
     }
 
     /**
+     * Get Method for address
+     *
      * @return \Magento\Quote\Model\Quote\Address
      */
     public function getAddress()
@@ -81,6 +94,8 @@ public function getAddress()
     }
 
     /**
+     * Import shipping rate
+     *
      * @param \Magento\Quote\Model\Quote\Address\RateResult\AbstractResult $rate
      * @return $this
      */

composer.json

@@ -14,12 +14,6 @@
         "preferred-install": "dist",
         "sort-packages": true
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/wikimedia/less.php"
-        }
-    ],
     "require": {
         "php": "~8.1.0||~8.2.0",
         "ext-bcmath": "*",
@@ -92,7 +86,7 @@
         "tubalmartin/cssmin": "^4.1",
         "web-token/jwt-framework": "^3.1",
         "webonyx/graphql-php": "^14.11",
-        "wikimedia/less.php": "dev-main"
+        "wikimedia/less.php": "^3.2"
     },
     "require-dev": {
         "allure-framework/allure-phpunit": "^2",

composer.lock

@@ -37,6 +37,11 @@
  */
 class ProductPriceTest extends GraphQlAbstract
 {
+    /**
+     * @var float
+     */
+    private const EPSILON = 0.0000000001;
+
     /** @var ObjectManager $objectManager */
     private $objectManager;
 
@@ -692,7 +697,7 @@ public function testConfigurableProductWithVariantsHavingSpecialAndTierPrices()
                 'customer_group_id' => Group::CUST_GROUP_ALL,
                 'percentage_value'=> null,
                 'qty'=> 2,
-                'value'=> 20
+                'value'=> 20,
             ]
         ];
         foreach ($configurableProductVariants as $configurableProductVariant) {
@@ -1218,8 +1223,16 @@ private function assertPrices($expectedPrices, $actualPrices, $currency = 'USD')
                 $expected['final_price']['currency'] ?? $currency,
                 $actual['final_price']['currency']
             );
-            $this->assertEquals($expected['discount']['amount_off'], $actual['discount']['amount_off']);
-            $this->assertEquals($expected['discount']['percent_off'], $actual['discount']['percent_off']);
+            $this->assertEqualsWithDelta(
+                $expected['discount']['amount_off'],
+                $actual['discount']['amount_off'],
+                self::EPSILON
+            );
+            $this->assertEqualsWithDelta(
+                $expected['discount']['percent_off'],
+                $actual['discount']['percent_off'],
+                self::EPSILON
+            );
         }
     }