Merge remote-tracking branch 'origin/MC-33069' into 2.4-develop-php74-pr41

Author: zakdma

lib/internal/Magento/Framework/View/Helper/PathPattern.php

@@ -39,7 +39,7 @@ public function translatePatternFromGlob($path)
     protected function translateGroupsFromGlob($pattern)
     {
         preg_match_all('~\\\\\\{[^,\\}]+(?:,[^,\\}]*)*\\\\\\}~', $pattern, $matches, PREG_OFFSET_CAPTURE);
-        for ($index = count($matches[0]) - 1; $index >= 0; --$index) {
+        for ($index = count($matches[0]) - 1; $index >= 0; $index -= 1) {
             list($match, $offset) = $matches[0][$index];
             $replacement = substr_replace($match, '(?:', 0, 2);
             $replacement = substr_replace($replacement, ')', -2);
@@ -65,9 +65,9 @@ protected function translateGroupsFromGlob($pattern)
     protected function translateCharacterGroupsFromGlob($pattern)
     {
         preg_match_all('~\\\\\\[(\\\\\\!)?[^\\]]+\\\\\\]~i', $pattern, $matches, PREG_OFFSET_CAPTURE);
-        for ($index = count($matches[0]) - 1; $index >= 0; --$index) {
+        for ($index = count($matches[0]) - 1; $index >= 0; $index -= 1) {
             list($match, $offset) = $matches[0][$index];
-            $exclude = !empty($matches[1][$index][0]);
+            $exclude = !empty($matches[1][$index]);
             $replacement = substr_replace($match, '[' . ($exclude ? '^' : ''), 0, $exclude ? 4 : 2);
             $replacement = substr_replace($replacement, ']', -2);
             $replacement = str_replace('\\-', '-', $replacement);

setup/src/Magento/Setup/Fixtures/Quote/QuoteGenerator.php

@@ -689,7 +689,7 @@ private function prepareConfigurableProducts(array $productIds = [])
             foreach ($options as $option) {
                 $attributesInfo[] = [
                     "label" => $option->getLabel(),
-                    "value" => isset($option['options']) ? $option['options']['0']['label'] : null,
+                    "value" => $option['options']['0']['label'] ?? null,
                     "option_id" => $option->getAttributeId(),
                     "option_value" => $option->getValues()[0]->getValueIndex()
                 ];