Merge branch 'main' into rector/php81/FirstClassCallableRector

Author: sreichel

.all-contributorsrc

@@ -1716,6 +1716,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "vernad",
+      "name": "vernad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/51973447?v=4",
+      "profile": "https://github.com/vernad",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitType": "docs"

.github/workflows/spellcheck.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
       - name: Check Spelling
-        uses: rojopolis/spellcheck-github-actions@0.53.0
+        uses: rojopolis/spellcheck-github-actions@0.54.0
         with:
           config_path: .github/spellcheck.yml
           task_name: Markdown

.php-cs-fixer.dist.php

@@ -27,7 +27,9 @@
         // Docblocks should have the same indentation as the documented subject.
         'phpdoc_indent' => true,
         // Annotations in PHPDoc should be ordered in defined sequence.
-        'phpdoc_order' => true,
+        'phpdoc_order' => ['order' => ['param', 'return', 'throws', 'deprecated', 'see', 'SuppressWarnings', 'phpstan-ignore']],
+        // Order PHPDoc tags by value.
+        'phpdoc_order_by_value' => ['annotations' => ['author', 'covers', 'group', 'method', 'throws', 'uses']],
         // Orders all @param annotations in DocBlocks according to method signature.
         'phpdoc_param_order' => true,
         // PHPDoc should start and end with content, excluding the very first and last line of the docblocks.

.phpstan.dist.baseline.neon

@@ -96,37 +96,18 @@ parameters:
                 - app/design/adminhtml/default/default/template/tax/class/page/edit.phtml
                 - app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml
                 - app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml
-                - app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml
-                - app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml
-                - app/design/frontend/base/default/template/catalog/category/page.phtml
-                - app/design/frontend/base/default/template/catalog/category/widget/link/link_block.phtml
-                - app/design/frontend/base/default/template/catalog/category/widget/link/link_inline.phtml
-                - app/design/frontend/base/default/template/catalog/product/view/price.phtml
-                - app/design/frontend/base/default/template/catalog/product/widget/link/link_block.phtml
-                - app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml
-                - app/design/frontend/base/default/template/checkout/cart/render/default.phtml
-                - app/design/frontend/base/default/template/checkout/cart/render/simple.phtml
-                - app/design/frontend/base/default/template/cms/widget/link/link_block.phtml
-                - app/design/frontend/base/default/template/cms/widget/link/link_inline.phtml
-                - app/design/frontend/base/default/template/cms/widget/static_block/default.phtml
-                - app/design/frontend/base/default/template/core/messages.phtml
-                - app/design/frontend/base/default/template/customer/address.phtml
-                - app/design/frontend/base/default/template/customer/balance.phtml
-                - app/design/frontend/base/default/template/customer/form/address.phtml
-                - app/design/frontend/base/default/template/customer/form/changepassword.phtml
-                - app/design/frontend/base/default/template/customer/orders.phtml
-                - app/design/frontend/base/default/template/customer/wishlist.phtml
-                - app/design/frontend/base/default/template/directory/currency/switch.phtml
-                - app/design/frontend/base/default/template/page/redirect.phtml
-                - app/design/frontend/base/default/template/paypal/hss/review/button.phtml
-                - app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml
-                - app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml
-                - app/design/frontend/rwd/default/template/customer/form/address.phtml
-                - app/design/frontend/rwd/default/template/customer/form/changepassword.phtml
-                - app/design/frontend/rwd/default/template/paypal/express/review/address.phtml
-                - app/design/install/default/default/template/page.phtml
+        -
+            # update phpstan plugin
+            identifier: method.protected
+            paths:
+                - app/design/*/*/template/*
         -
             identifier: phpunit.coversMethod
+        -
+            # update phpstan plugin
+            identifier: property.protected
+            paths:
+                - app/design/*/*/template/*
         -
             identifier: variable.undefined
             paths:

.phpstan.dist.neon

@@ -55,6 +55,9 @@
         <testsuite name="Mage_Core">
             <directory>tests/unit/Mage/Core</directory>
         </testsuite>
+        <testsuite name="Mage_Csp">
+            <directory>tests/unit/Mage/Csp</directory>
+        </testsuite>
         <testsuite name="Mage_Customer">
             <directory>tests/unit/Mage/Customer</directory>
         </testsuite>

.phpunit.dist.xml

@@ -0,0 +1,91 @@
+--- /dev/null
++++ ../library/Zend/Cache/Backend.php
+@@ -137,7 +137,7 @@
+      * if $specificLifetime is not false, the given specific life time is used
+      * else, the global lifetime is used
+      *
+-     * @param  int $specificLifetime
++     * @param  false|int $specificLifetime
+      * @return int Cache life time
+      */
+     public function getLifetime($specificLifetime)
+
+--- /dev/null
++++ ../library/Zend/Controller/Response/Abstract.php
+@@ -454,7 +454,7 @@
+      * $spec is a string and matches a named segment, returns the contents of
+      * that segment; otherwise, returns null.
+      *
+-     * @param boolean $spec
++     * @param bool|string $spec
+      * @return string|array|null
+      */
+     public function getBody($spec = false)
+
+--- /dev/null
++++ ../library/Zend/Currency.php
+@@ -138,8 +138,8 @@
+     /**
+      * Returns a localized currency string
+      *
+-     * @param  integer|float $value   OPTIONAL Currency value
+-     * @param  array         $options OPTIONAL options to set temporary
++     * @param  array|int|float|string $value   OPTIONAL Currency value
++     * @param  array                  $options OPTIONAL options to set temporary
+      * @throws Zend_Currency_Exception When the value is not a number
+      * @return string
+      */
+
+--- /dev/null
++++ ../library/Zend/Db/Select.php
+@@ -486,7 +486,7 @@
+      * @param  string $cond Join on this condition.
+      * @param  array|string $cols The columns to select from the joined table.
+      * @param  string $schema The database name to specify, if any.
+-     * @return Zend_Db_Select This Zend_Db_Select object.
++     * @return $this This Zend_Db_Select object.
+      */
+     public function joinStraight($name, $cond, $cols = self::SQL_WILDCARD, $schema = null)
+     {
+
+--- /dev/null
++++ ../library/Zend/Measure/Abstract.php
+@@ -75,7 +75,7 @@
+      * Zend_Measure_Abstract is an abstract class for the different measurement types
+      *
+      * @param  mixed       $value  Value as string, integer, real or float
+-     * @param  int         $type   OPTIONAL a measure type f.e. Zend_Measure_Length::METER
++     * @param  string      $type   OPTIONAL a measure type f.e. Zend_Measure_Length::METER
+      * @param  Zend_Locale $locale OPTIONAL a Zend_Locale Type
+      * @throws Zend_Measure_Exception
+      */
+
+--- /dev/null
++++ ../library/Zend/Cache/Backend/Memcached.php
+@@ -205,10 +205,10 @@
+      * Note : $data is always "string" (serialization is done by the
+      * core not by the backend)
+      *
+-     * @param  string $data             Datas to cache
+-     * @param  string $id               Cache id
+-     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
+-     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
++     * @param  string $data                Datas to cache
++     * @param  string $id                  Cache id
++     * @param  array  $tags                Array of strings, the cache record will be tagged by each string entry
++     * @param  false|int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+      * @return boolean True if no problem
+      */
+     public function save($data, $id, $tags = [], $specificLifetime = false)
+
+--- /dev/null
++++ ../library/Zend/Translate.php
+@@ -63,7 +63,7 @@
+     /**
+      * Generates the standard translation object
+      *
+-     * @param  array|Zend_Config|Zend_Translate_Adapter $options Options to use
++     * @param  array|string|Zend_Config|Zend_Translate_Adapter $options Options to use
+      * @param  string|array [$content] Path to content, or content itself
+      * @param  string|Zend_Locale [$locale]
+      * @throws Zend_Translate_Exception

.vendor-patches/PHPSTAN-ZF1F.patch

@@ -277,6 +277,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="http://www.denisahac.xyz"><img src="https://avatars.githubusercontent.com/u/6700576?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Den Isahac</b></sub></a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lc-excell"><img src="https://avatars.githubusercontent.com/u/158118232?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>lc-excell</b></sub></a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/warley-elias-531a4116/"><img src="https://avatars.githubusercontent.com/u/5356619?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Warley Elias</b></sub></a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vernard"><img src="https://avatars.githubusercontent.com/u/6733673?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>vernard</b></sub></a></td>
     </tr>
   </tbody>
 </table>

README.md

@@ -13,22 +13,21 @@
  * @package    Mage_Admin
  *
  * @method Mage_Admin_Model_Resource_Acl_Role _getResource()
- * @method Mage_Admin_Model_Resource_Acl_Role getResource()
  * @method Mage_Admin_Model_Resource_Acl_Role_Collection getCollection()
- * @method Mage_Admin_Model_Resource_Acl_Role_Collection getResourceCollection()
- *
  * @method int getParentId()
- * @method $this setParentId(int $value)
- * @method int getTreeLevel()
- * @method $this setTreeLevel(int $value)
- * @method int getSortOrder()
- * @method $this setSortOrder(int $value)
+ * @method Mage_Admin_Model_Resource_Acl_Role getResource()
+ * @method Mage_Admin_Model_Resource_Acl_Role_Collection getResourceCollection()
+ * @method string getRoleName()
  * @method string getRoleType()
- * @method $this setRoleType(string $value)
+ * @method int getSortOrder()
+ * @method int getTreeLevel()
  * @method int getUserId()
- * @method $this setUserId(int $value)
- * @method string getRoleName()
+ * @method $this setParentId(int $value)
  * @method $this setRoleName(string $value)
+ * @method $this setRoleType(string $value)
+ * @method $this setSortOrder(int $value)
+ * @method $this setTreeLevel(int $value)
+ * @method $this setUserId(int $value)
  */
 class Mage_Admin_Model_Acl_Role extends Mage_Core_Model_Abstract
 {

app/code/core/Mage/Admin/Model/Acl/Role.php

@@ -13,12 +13,11 @@
  * @package    Mage_Adminhtml
  *
  * @method Mage_Admin_Model_Resource_Block _getResource()
- * @method Mage_Admin_Model_Resource_Block getResource()
- * @method Mage_Admin_Model_Resource_Block_Collection getCollection()
- * @method Mage_Admin_Model_Resource_Block_Collection getResourceCollection()
- *
  * @method string getBlockName()
+ * @method Mage_Admin_Model_Resource_Block_Collection getCollection()
  * @method string getIsAllowed()
+ * @method Mage_Admin_Model_Resource_Block getResource()
+ * @method Mage_Admin_Model_Resource_Block_Collection getResourceCollection()
  */
 class Mage_Admin_Model_Block extends Mage_Core_Model_Abstract
 {
@@ -31,9 +30,9 @@ protected function _construct()
     }
 
     /**
+     * @return array|true
      * @throws Exception
      * @throws Zend_Validate_Exception
-     * @return array|true
      */
     public function validate()
     {