Merge branch 'main' into fix-4620

Author: sreichel

.phpstan.dist.baseline.neon

@@ -5010,6 +5010,36 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php
 
+		-
+			message: '#^Access to protected property Mage_Paypal_Model_Api_Nvp\:\:\$_setExpressCheckoutResponse\.$#'
+			identifier: property.protected
+			count: 1
+			path: app/code/core/Mage/PaypalUk/Model/Api/Express/Nvp.php
+
+		-
+			message: '#^Access to protected property Mage_Paypal_Model_Api_Nvp\:\:\$_doCaptureResponse\.$#'
+			identifier: property.protected
+			count: 1
+			path: app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
+
+		-
+			message: '#^Access to protected property Mage_Paypal_Model_Api_Nvp\:\:\$_getTransactionDetailsResponse\.$#'
+			identifier: property.protected
+			count: 1
+			path: app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
+
+		-
+			message: '#^Access to protected property Mage_Paypal_Model_Api_Nvp\:\:\$_paymentInformationResponse\.$#'
+			identifier: property.protected
+			count: 1
+			path: app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
+
+		-
+			message: '#^Access to protected property Mage_Paypal_Model_Api_Nvp\:\:\$_refundTransactionResponse\.$#'
+			identifier: property.protected
+			count: 1
+			path: app/code/core/Mage/PaypalUk/Model/Api/Nvp.php
+
 		-
 			message: '#^Return type \(void\) of method Mage_PaypalUk_Model_Pro\:\:fetchTransactionInfo\(\) should be compatible with return type \(array\) of method Mage_Paypal_Model_Pro\:\:fetchTransactionInfo\(\)$#'
 			identifier: method.childReturnType
@@ -5347,7 +5377,7 @@ parameters:
 			path: app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php
 
 		-
-			message: '#^Method Mage_Rule_Model_Condition_Product_Abstract\:\:getAttributeObject\(\) should return Mage_Catalog_Model_Resource_Eav_Attribute but returns Varien_Object\|false\.$#'
+			message: '#^Method Mage_Rule_Model_Condition_Product_Abstract\:\:getAttributeObject\(\) should return Mage_Catalog_Model_Resource_Eav_Attribute but returns Mage_Eav_Model_Entity_Attribute_Abstract\|Varien_Object\|false\.$#'
 			identifier: return.type
 			count: 1
 			path: app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php

.rector.php

@@ -24,6 +24,7 @@
     ->withSets([
         PHPUnitSetList::PHPUNIT_90,
         SetList::PRIVATIZATION,
+        SetList::PHP_52,
     ])
     ->withRules([
         CodeQuality\BooleanNot\ReplaceMultipleBooleanNotRector::class,

app/code/core/Mage/Adminhtml/Block/Page/Menu.php

@@ -133,6 +133,8 @@ protected function _buildMenuArray(Varien_Simplexml_Element $parent, $path = '',
 
             $menuArr = [];
 
+            $menuArr['id'] = str_replace(['/'], ['-'], $aclResource);
+
             $menuArr['label'] = $this->_getHelperValue($child);
 
             $menuArr['sort_order'] = $child->sort_order ? (int) $child->sort_order : $sortOrder;
@@ -269,6 +271,7 @@ public function getMenuLevel($menu, $level = 0)
                 . (!empty($item['children']) ? ' parent' : '')
                 . (!empty($level) && !empty($item['last']) ? ' last' : '')
                 . ' level' . $level . '"> <a href="' . $item['url'] . '" '
+                . (!empty($item['id']) ? 'id="nav-' . $item['id'] . '"' : '') . ' '
                 . (!empty($item['title']) ? 'title="' . $item['title'] . '"' : '') . ' '
                 . (!empty($item['target']) ? 'target="' . $item['target'] . '"' : '') . ' '
                 . (!empty($item['click']) ? 'onclick="' . $item['click'] . '"' : '') . ' class="'

composer.json

@@ -146,6 +146,9 @@
         },
         "sort-packages": true
     },
+    "suggest": {
+        "n98/magerun": "The n98 magerun cli tools provides some handy tools to work with Magento from command line."
+    },
     "scripts": {
         "php-cs-fixer:test": "vendor/bin/php-cs-fixer fix --dry-run --diff",
         "php-cs-fixer:fix": "vendor/bin/php-cs-fixer fix",
@@ -156,7 +159,7 @@
         "phpunit:coverage": "XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration .phpunit.dist.xml --testdox",
         "phpunit:coverage-local": "XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration .phpunit.dist.xml --coverage-html build/coverage",
         "rector:test": "vendor/bin/rector process --config .rector.php --dry-run",
-        "rector:fix": "vendor/bin/rector --config .rector.php process",
+        "rector:fix": "vendor/bin/rector process --config .rector.php",
         "test": [
             "@php-cs-fixer:test",
             "@phpstan",