Merge branch 'main' into sitemap

.gitattributes

@@ -9,7 +9,6 @@
 /.all-contributorsrc export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.gitpod.yml export-ignore
 
 /.php-cs-fixer.dist.php export-ignore
 /.phpcs.ecg.xml.dist export-ignore
@@ -21,6 +20,8 @@
 /.phpstan.dist.neon export-ignore
 /.rector.php export-ignore
 
+/CNAME export-ignore
+
 /README.md export-ignore
 
 # Enforce checkout with linux lf consistent over all platforms

.github/labeler.yml

@@ -5,6 +5,13 @@
       .github/**/*
     ]
 
+'git':
+  - changed-files:
+    - any-glob-to-any-file: [
+      .gitattributes,
+      .gitignore
+    ]
+
 'htaccess':
   - changed-files:
     - any-glob-to-any-file: [
@@ -903,6 +910,7 @@
     - any-glob-to-any-file: [
       .phpunit*,
       tests/*,
+      tests/**/*,
       .github/workflows/phpunit.yml
     ]
 

.github/workflows/docs.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV

.gitignore

@@ -23,10 +23,8 @@
 /app/etc/modules/Cm_RedisSession.xml
 /lib/Credis
 
-# Add Gitpod online IDE config
-# https://github.com/OpenMage/magento-lts/pull/1836
-/dev/gitpod/docker-magento
-/dev/gitpod/.env
+# TinyMCE library
+/js/tinymce
 
 # Add development environment setup files and README
 # https://github.com/OpenMage/magento-lts/pull/1012

.phpmd.dist.baseline.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <phpmd-baseline>
-  <violation rule="PHPMD\Rule\UnusedPrivateMethod" file="app/code/core/Mage/Admin/Model/Resource/User.php" method="_encryptPassword"/>
   <violation rule="PHPMD\Rule\Design\EmptyCatchBlock" file="app/code/core/Mage/Admin/Model/Session.php"/>
   <violation rule="PHPMD\Rule\Design\EmptyCatchBlock" file="app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php"/>
   <violation rule="PHPMD\Rule\UnusedPrivateMethod" file="app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php" method="_sortHistoryByTimestamp"/>
@@ -9,16 +8,11 @@
   <violation rule="PHPMD\Rule\Design\CountInLoopExpression" file="app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php"/>
   <violation rule="PHPMD\Rule\Design\EmptyCatchBlock" file="app/code/core/Mage/Catalog/Model/Product/Api.php"/>
   <violation rule="PHPMD\Rule\Design\EmptyCatchBlock" file="app/code/core/Mage/Catalog/Model/Product/Api/V2.php"/>
-  <violation rule="PHPMD\Rule\UnusedPrivateMethod" file="app/code/core/Mage/Checkout/Block/Cart/Sidebar.php" method="_addTax"/>
-  <violation rule="PHPMD\Rule\UnusedPrivateField" file="app/code/core/Mage/Checkout/Block/Onepage/Success.php"/>
   <violation rule="PHPMD\Rule\Design\EmptyCatchBlock" file="app/code/core/Mage/Core/Model/Cache.php"/>
   <violation rule="PHPMD\Rule\Design\CountInLoopExpression" file="app/code/core/Mage/Core/Model/Layout.php"/>
   <violation rule="PHPMD\Rule\Design\EmptyCatchBlock" file="app/code/core/Mage/GiftMessage/Model/Observer.php"/>
   <violation rule="PHPMD\Rule\Design\EmptyCatchBlock" file="app/code/core/Mage/GiftMessage/controllers/IndexController.php"/>
   <violation rule="PHPMD\Rule\Design\EmptyCatchBlock" file="app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php"/>
-  <violation rule="PHPMD\Rule\UnusedPrivateMethod" file="app/code/core/Mage/Log/Model/Aggregation.php" method="_removeEmpty"/>
-  <violation rule="PHPMD\Rule\UnusedPrivateMethod" file="app/code/core/Mage/Paypal/Model/Config.php" method="_matchBnCountryCode"/>
   <violation rule="PHPMD\Rule\Design\CountInLoopExpression" file="app/code/core/Mage/Paypal/Model/Report/Settlement.php"/>
-  <violation rule="PHPMD\Rule\UnusedPrivateField" file="app/code/core/Mage/Sales/Model/Order/Status/History.php"/>
   <violation rule="PHPMD\Rule\Design\CountInLoopExpression" file="app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php"/>
 </phpmd-baseline>

.phpmd.dist.xml

@@ -71,25 +71,25 @@
 
     <!-- NAMING
     [-] BooleanGetMethodName
-    [ ] ConstantNamingConventions
-    [ ] ConstructorWithNameAsEnclosingClass
+    [x] ConstantNamingConventions
+    [x] ConstructorWithNameAsEnclosingClass
     [-] LongClassName
-    [ ] ShortClassName
+    [x] ShortClassName
     [-] LongVariable
-    [?] ShortVariable - TMP disabled
-    [ ] ShortMethodName
+    [x] ShortVariable
+    [x] ShortMethodName - TMP disabled
     -->
-<!--    <rule ref="rulesets/naming.xml/ShortVariable">-->
-<!--        <properties>-->
-<!--            <property name="exceptions" value="a,b,e,id,idx,io,ip,to,x,y,x1,x2,y1,y2" />-->
-<!--        </properties>-->
-<!--    </rule>-->
     <rule ref="rulesets/naming.xml">
         <exclude name="BooleanGetMethodName" />
         <exclude name="LongClassName" />
         <exclude name="LongVariable" />
         <exclude name="ShortVariable" />
     </rule>
+<!--    <rule ref="rulesets/naming.xml/ShortVariable">-->
+<!--        <properties>-->
+<!--            <property name="exceptions" value="a,b,x,y,x1,x2,y1,y2" />-->
+<!--        </properties>-->
+<!--    </rule>-->
     <rule ref="rulesets/naming.xml/ShortMethodName" />
 
     <!-- DESIGN

.phpstan.dist.baseline.neon

@@ -25,11 +25,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Admin/Model/Resource/Roles.php
 
-		-
-			message: "#^Method Mage_Admin_Model_Resource_User\\:\\:_encryptPassword\\(\\) is unused\\.$#"
-			count: 1
-			path: app/code/core/Mage/Admin/Model/Resource/User.php
-
 		-
 			message: "#^Call to an undefined method Mage_Admin_Model_Resource_Roles\\:\\:update\\(\\)\\.$#"
 			count: 1
@@ -2380,11 +2375,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Checkout/Block/Cart/Shipping.php
 
-		-
-			message: "#^Method Mage_Checkout_Block_Cart_Sidebar\\:\\:_addTax\\(\\) is unused\\.$#"
-			count: 1
-			path: app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
-
 		-
 			message: "#^Method Mage_Checkout_Block_Onepage_Billing\\:\\:_getTaxvat\\(\\) should return Mage_Customer_Block_Widget_Taxvat but returns Mage_Core_Block_Abstract\\|false\\.$#"
 			count: 1
@@ -2400,11 +2390,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Checkout/Block/Onepage/Progress.php
 
-		-
-			message: "#^Property Mage_Checkout_Block_Onepage_Success\\:\\:\\$_order is unused\\.$#"
-			count: 1
-			path: app/code/core/Mage/Checkout/Block/Onepage/Success.php
-
 		-
 			message: "#^PHPDoc tag @var with type Mage_Sales_Model_Quote_Item is not subtype of native type null\\.$#"
 			count: 1
@@ -2545,16 +2530,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Controller/Front/Action.php
 
-		-
-			message: "#^Call to an undefined method Zend_Controller_Router_Interface\\:\\:addRoute\\(\\)\\.$#"
-			count: 1
-			path: app/code/core/Mage/Core/Controller/Front/Router.php
-
-		-
-			message: "#^Parameter \\#1 \\$type of static method Mage\\:\\:getBaseUrl\\(\\) expects string, array given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Core/Controller/Front/Router.php
-
 		-
 			message: "#^Constructor of class Mage_Core_Controller_Varien_Action has an unused parameter \\$invokeArgs\\.$#"
 			count: 1
@@ -4065,11 +4040,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Log/Model/Aggregation.php
 
-		-
-			message: "#^Method Mage_Log_Model_Aggregation\\:\\:_removeEmpty\\(\\) is unused\\.$#"
-			count: 1
-			path: app/code/core/Mage/Log/Model/Aggregation.php
-
 		-
 			message: "#^Parameter \\#1 \\$id of method Mage_Log_Model_Aggregation\\:\\:_update\\(\\) expects int, string given\\.$#"
 			count: 1
@@ -4220,11 +4190,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Paypal/Model/Cart.php
 
-		-
-			message: "#^Method Mage_Paypal_Model_Config\\:\\:_matchBnCountryCode\\(\\) is unused\\.$#"
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Config.php
-
 		-
 			message: "#^Negated boolean expression is always true\\.$#"
 			count: 1
@@ -4950,16 +4915,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php
 
-		-
-			message: "#^Method Mage_Sales_Model_Order_Status_History\\:\\:getStatusLabel\\(\\) should return string but return statement is missing\\.$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Order/Status/History.php
-
-		-
-			message: "#^Property Mage_Sales_Model_Order_Status_History\\:\\:\\$_shouldSetOrderBeforeSave is never read, only written\\.$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Order/Status/History.php
-
 		-
 			message: "#^Parameter \\#2 \\$totalConfig of method Mage_Sales_Model_Config_Ordered\\:\\:_prepareConfigArray\\(\\) expects Mage_Core_Model_Config_Element, array given\\.$#"
 			count: 1

.phpstorm.meta.php/magento_blocks.meta.php

@@ -1053,6 +1053,7 @@
             'install/locale' => \Mage_Install_Block_Locale::class,
             'install/state' => \Mage_Install_Block_State::class,
             'newsletter/subscribe' => \Mage_Newsletter_Block_Subscribe::class,
+            'newsletter/widget_subscribe' => \Mage_Newsletter_Block_Widget_Subscribe::class,
             'oauth/adminhtml_oauth_admin_token' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token::class,
             'oauth/adminhtml_oauth_admin_token_grid' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token_Grid::class,
             'oauth/adminhtml_oauth_authorize' => \Mage_Oauth_Block_Adminhtml_Oauth_Authorize::class,

.phpstorm.meta.php/magento_blocks_methods.meta.php

@@ -1053,6 +1053,7 @@
             'install/locale' => \Mage_Install_Block_Locale::class,
             'install/state' => \Mage_Install_Block_State::class,
             'newsletter/subscribe' => \Mage_Newsletter_Block_Subscribe::class,
+            'newsletter/widget_subscribe' => \Mage_Newsletter_Block_Widget_Subscribe::class,
             'oauth/adminhtml_oauth_admin_token' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token::class,
             'oauth/adminhtml_oauth_admin_token_grid' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token_Grid::class,
             'oauth/adminhtml_oauth_authorize' => \Mage_Oauth_Block_Adminhtml_Oauth_Authorize::class,