Merge branch 'main' into trait-sessions

OpenMage · Jan 18, 2025 · 9f13287 · 9f13287
2 parents 804caff + 5496d8a
commit 9f13287
Show file tree

Hide file tree

Showing 15 changed files with 99 additions and 58 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -6,10 +6,10 @@
   "files": [
     "README.md"
   ],
-  "imageSize": 35,
+  "imageSize": 100,
   "commit": true,
   "commitConvention": "none",
-  "contributorsPerLine": 20,
+  "contributorsPerLine": 7,
   "contributorTemplate": "<a href=\"<%= contributor.profile %>\"><img src=\"<%= contributor.avatar_url %>\" loading=\"lazy\" width=\"<%= options.imageSize %>\" alt=\"\"/><br /><sub><b><%= contributor.name %></b></sub></a>",
   "badgeTemplate": "<a href=\"#contributors-\"><img src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\" alt=\"All Contributors\"></a>",
   "wrapperTemplate": "\n<table>\n  <tbody><%= bodyContent %>  </tbody>\n<%= tableFooterContent %></table>\n\n",
@@ -1475,6 +1475,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "bucha",
+      "name": "Alexander Buch",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1931120?v=4",
+      "profile": "http://www.cartware.de",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitType": "docs"

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -8,17 +8,13 @@ on:
 jobs:
   phpstan:
     name: Analyze
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      matrix:
-        operating-system: [ubuntu-latest]
-        php-versions: ['7.4', '8.4']
+    runs-on: [ubuntu-latest]
 
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: 7.4
 
       - uses: actions/checkout@v4
 
@@ -40,7 +36,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: .phpstan.cache
-          key: phpstan-result-cache-${{ matrix.php-versions }}-${{ github.run_id }}
+          key: phpstan-result-cache-${{ github.run_id }}
           restore-keys: |
             phpstan-result-cache-
 
@@ -52,4 +48,4 @@ jobs:
         if: always()
         with:
           path: .phpstan.cache
-          key: phpstan-result-cache-${{ matrix.php-versions }}-${{ github.run_id }}
+          key: phpstan-result-cache-${{ github.run_id }}
diff --git a/.phpstan.dist.neon b/.phpstan.dist.neon
@@ -3,6 +3,9 @@ includes:
     - .phpstan.dist.baseline.neon
     - phar://phpstan.phar/conf/bleedingEdge.neon
 parameters:
+    phpVersion:
+        min: 70433
+        max: 80499
     magentoRootPath: %currentWorkingDirectory%
     fileExtensions:
       - php

diff --git a/README.md b/README.md
@@ -218,6 +218,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="5%"><a href="https://www.vianetz.com/"><img src="https://avatars.githubusercontent.com/u/26252058?v=4" loading="lazy" width="35" alt=""/><br /><sub><b>Christoph Massmann</b></sub></a></td>
       <td align="center" valign="top" width="5%"><a href="https://github.com/ragnese"><img src="https://avatars.githubusercontent.com/u/7927565?v=4" loading="lazy" width="35" alt=""/><br /><sub><b>Rob Agnese</b></sub></a></td>
+      <td align="center" valign="top" width="5%"><a href="http://www.cartware.de"><img src="https://avatars.githubusercontent.com/u/1931120?v=4" loading="lazy" width="35" alt=""/><br /><sub><b>Alexander Buch</b></sub></a></td>
     </tr>
   </tbody>
 </table>

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php
@@ -85,7 +85,7 @@ protected function _prepareForm()
 
             $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element');
             if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-                $fieldset->setRenderer($renderer);
+                $field->setRenderer($renderer);
             }
         } else {
             $fieldset->addField('store_id', 'hidden', [

diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
@@ -168,7 +168,7 @@ function(v, elem){
 
                 $renderer = $this->getLayout()->createBlock('adminhtml/customer_edit_renderer_newpass');
                 if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-                    $fieldset->setRenderer($renderer);
+                    $field->setRenderer($renderer);
                 }
 
                 // Prepare customer confirmation control (only for existing customers)
@@ -209,7 +209,7 @@ function(v, elem){
 
                     $renderer = $this->getLayout()->createBlock('adminhtml/customer_edit_renderer_adminpass');
                     if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-                        $fieldset->setRenderer($renderer);
+                        $field->setRenderer($renderer);
                     }
                 }
             }
@@ -233,7 +233,7 @@ function(v, elem){
 
             $renderer = $this->getLayout()->createBlock('adminhtml/customer_edit_renderer_newpass');
             if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-                $fieldset->setRenderer($renderer);
+                $field->setRenderer($renderer);
             }
 
             // Prepare send welcome email checkbox

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -345,7 +345,10 @@ public function addColumnDefaultData(array $column): array
     {
         $config = $this->getConfigDefaultColumnSettings();
         $columnHasIndex = array_key_exists('index', $column);
-        if ($columnHasIndex && array_key_exists($column['index'], $config['index'])) {
+        if ($columnHasIndex &&
+            !is_array($column['index']) &&
+            array_key_exists($column['index'], $config['index'])
+        ) {
             $column += $config['index'][$column['index']];
         }
 

diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml
@@ -267,6 +267,9 @@
                         <sortable>false</sortable>
                         <width>40</width>
                     </action>
+                    <concat>
+                        <separator> </separator>
+                    </concat>
                     <currency>
                         <align>right</align>
                         <index>price</index>

diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
@@ -208,7 +208,7 @@ protected function _prepareResourceModelName($resource)
      * Login user and Retrieve session id
      *
      * @param string $username
-     * @param string|null $apiKey
+     * @param string $apiKey
      * @return stdClass|string|void
      */
     public function login($username, $apiKey = null)

diff --git a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php
@@ -42,6 +42,7 @@ public function resultAction()
                     ->setQueryParams($this->getRequest()->getQuery())
                     ->getUrl('*/*/'),
             );
+            return;
         }
         $this->_initLayoutMessages($this->getCatalogSessionStorage());
         $this->renderLayout();

diff --git a/app/code/core/Mage/Rule/Model/Action/Abstract.php b/app/code/core/Mage/Rule/Model/Action/Abstract.php
@@ -254,52 +254,58 @@ public function getTypeElement()
      */
     public function getAttributeElement()
     {
-        $renderer = Mage::getBlockSingleton('rule/editable');
-        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-            $this->getForm()::setFieldsetRenderer($renderer);
-        }
-
-        return $this->getForm()->addField('action:' . $this->getId() . ':attribute', 'select', [
+        $element = $this->getForm()->addField('action:' . $this->getId() . ':attribute', 'select', [
             'name' => 'rule[actions][' . $this->getId() . '][attribute]',
             'values' => $this->getAttributeSelectOptions(),
             'value' => $this->getAttribute(),
             'value_name' => $this->getAttributeName(),
         ]);
+
+        $renderer = Mage::getBlockSingleton('rule/editable');
+        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
+            $element->setRenderer($renderer);
+        }
+
+        return $element;
     }
 
     /**
      * @return Varien_Data_Form_Element_Abstract
      */
     public function getOperatorElement()
     {
-        $renderer = Mage::getBlockSingleton('rule/editable');
-        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-            $this->getForm()::setFieldsetRenderer($renderer);
-        }
-
-        return $this->getForm()->addField('action:' . $this->getId() . ':operator', 'select', [
+        $element = $this->getForm()->addField('action:' . $this->getId() . ':operator', 'select', [
             'name' => 'rule[actions][' . $this->getId() . '][operator]',
             'values' => $this->getOperatorSelectOptions(),
             'value' => $this->getOperator(),
             'value_name' => $this->getOperatorName(),
         ]);
+
+        $renderer = Mage::getBlockSingleton('rule/editable');
+        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
+            $element->setRenderer($renderer);
+        }
+
+        return $element;
     }
 
     /**
      * @return Varien_Data_Form_Element_Abstract
      */
     public function getValueElement()
     {
-        $renderer = Mage::getBlockSingleton('rule/editable');
-        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-            $this->getForm()::setFieldsetRenderer($renderer);
-        }
-
-        return $this->getForm()->addField('action:' . $this->getId() . ':value', 'text', [
+        $element = $this->getForm()->addField('action:' . $this->getId() . ':value', 'text', [
             'name' => 'rule[actions][' . $this->getId() . '][value]',
             'value' => $this->getValue(),
             'value_name' => $this->getValueName(),
         ]);
+
+        $renderer = Mage::getBlockSingleton('rule/editable');
+        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
+            $element->setRenderer($renderer);
+        }
+
+        return $element;
     }
 
     /**

diff --git a/app/code/core/Mage/Rule/Model/Action/Collection.php b/app/code/core/Mage/Rule/Model/Action/Collection.php
@@ -108,16 +108,18 @@ public function asHtml()
      */
     public function getNewChildElement()
     {
-        $renderer = Mage::getBlockSingleton('rule/newchild');
-        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-            $this->getForm()::setFieldsetRenderer($renderer);
-        }
-
-        return $this->getForm()->addField('action:' . $this->getId() . ':new_child', 'select', [
+        $element = $this->getForm()->addField('action:' . $this->getId() . ':new_child', 'select', [
             'name' => 'rule[actions][' . $this->getId() . '][new_child]',
             'values' => $this->getNewChildSelectOptions(),
             'value_name' => $this->getNewChildName(),
         ]);
+
+        $renderer = Mage::getBlockSingleton('rule/newchild');
+        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
+            $element->setRenderer($renderer);
+        }
+
+        return $element;
     }
 
     /**

diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
@@ -509,17 +509,19 @@ public function getAttributeElement()
             }
         }
 
-        $renderer = Mage::getBlockSingleton('rule/editable');
-        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-            $this->getForm()::setFieldsetRenderer($renderer);
-        }
-
-        return $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__attribute', 'select', [
+        $element = $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__attribute', 'select', [
             'name'       => 'rule[' . $this->getPrefix() . '][' . $this->getId() . '][attribute]',
             'values'     => $this->getAttributeSelectOptions(),
             'value'      => $this->getAttribute(),
             'value_name' => $this->getAttributeName(),
         ]);
+
+        $renderer = Mage::getBlockSingleton('rule/editable');
+        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
+            $element->setRenderer($renderer);
+        }
+
+        return $element;
     }
 
     /**

diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php
@@ -147,17 +147,19 @@ public function getAggregatorElement()
             }
         }
 
-        $renderer = Mage::getBlockSingleton('rule/editable');
-        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-            $this->getForm()::setFieldsetRenderer($renderer);
-        }
-
-        return $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__aggregator', 'select', [
+        $element = $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__aggregator', 'select', [
             'name' => 'rule[' . $this->getPrefix() . '][' . $this->getId() . '][aggregator]',
             'values' => $this->getAggregatorSelectOptions(),
             'value' => $this->getAggregator(),
             'value_name' => $this->getAggregatorName(),
         ]);
+
+        $renderer = Mage::getBlockSingleton('rule/editable');
+        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
+            $element->setRenderer($renderer);
+        }
+
+        return $element;
     }
     /* end aggregator methods */
 
@@ -308,16 +310,18 @@ public function asHtml()
      */
     public function getNewChildElement()
     {
-        $renderer = Mage::getBlockSingleton('rule/newchild');
-        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
-            $this->getForm()::setFieldsetRenderer($renderer);
-        }
-
-        return $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__new_child', 'select', [
+        $element = $this->getForm()->addField($this->getPrefix() . '__' . $this->getId() . '__new_child', 'select', [
             'name' => 'rule[' . $this->getPrefix() . '][' . $this->getId() . '][new_child]',
             'values' => $this->getNewChildSelectOptions(),
             'value_name' => $this->getNewChildName(),
         ]);
+
+        $renderer = Mage::getBlockSingleton('rule/newchild');
+        if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
+            $element->setRenderer($renderer);
+        }
+
+        return $element;
     }
 
     /**

diff --git a/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php b/tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php
@@ -72,6 +72,17 @@ public function provideAddColumnDefaultData(): Generator
                 'type' => 'text',
             ],
         ];
+        yield 'index array - ref #4475' => [
+            [
+                'index' => ['firstname', 'lastname'],
+                'type' => 'concat',
+                'separator' => ' ',
+            ],
+            [
+                'index'     => ['firstname', 'lastname'],
+                'type'      => 'concat',
+            ],
+        ];
         yield 'type action' => [
             [
                 'type' => 'action',