Merge branch 'main' into zend-measure

sreichel · sreichel · commit 6e17ac956999 · 2025-12-03T22:59:45.000+01:00
# Conflicts:
#	composer.lock
diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml
@@ -70,7 +70,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -34,7 +34,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get composer cache directory
         id: composer-cache
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -14,7 +14,7 @@ jobs:
         webserver: ['nginx-fpm']
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup DDEV
         uses: ddev/github-action-setup-ddev@v1
         with:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -21,7 +21,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: 3.x
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -17,7 +17,7 @@ jobs:
           php-version: 8.1
 
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get composer cache directory
         id: composer-cache
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -17,7 +17,7 @@ jobs:
           php-version: 8.1
 
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get composer cache directory
         id: composer-cache
diff --git a/.github/workflows/phpmd.yml b/.github/workflows/phpmd.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get composer cache directory
         id: composer-cache
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           php-version: 8.1
     
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get composer cache directory
         id: composer-cache
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -46,7 +46,7 @@ jobs:
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get composer cache directory
         id: composer-cache
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -17,7 +17,7 @@ jobs:
           php-version: 8.1
 
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get composer cache directory
         id: composer-cache
diff --git a/.github/workflows/security-php.yml b/.github/workflows/security-php.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/cache@v4
         id: cache-db
diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml
@@ -11,9 +11,9 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Check Spelling
-        uses: rojopolis/spellcheck-github-actions@0.54.0
+        uses: rojopolis/spellcheck-github-actions@0.55.0
         with:
           config_path: .github/spellcheck.yml
           task_name: Markdown
diff --git a/.github/workflows/syntax-php.yml b/.github/workflows/syntax-php.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/syntax-xml.yml b/.github/workflows/syntax-xml.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Update APT repositories
         run: "sudo apt update"
diff --git a/.github/workflows/update-phpstorm-meta.yml b/.github/workflows/update-phpstorm-meta.yml
@@ -20,7 +20,7 @@ jobs:
           php-version: 8.1
 
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: main
           fetch-depth: 0
diff --git a/.rector.php b/.rector.php
@@ -43,6 +43,13 @@
         ->withRules([
             Php85\ArrayDimFetch\ArrayFirstLastRector::class,
         ])
+        ->withConfiguredRule(RenameClassConstFetchRector::class, [
+            new RenameClassAndConstFetch('Zend_Measure_Length', 'CENTIMETER', 'Mage_Core_Helper_Measure_Weight', 'CENTIMETER'),
+            new RenameClassAndConstFetch('Zend_Measure_Length', 'INCH', 'Mage_Core_Helper_Measure_Weight', 'INCH'),
+            new RenameClassAndConstFetch('Zend_Measure_Weight', 'KILOGRAM', 'Mage_Core_Helper_Measure_Weight', 'KILOGRAM'),
+            new RenameClassAndConstFetch('Zend_Measure_Weight', 'OUNCE', 'Mage_Core_Helper_Measure_Weight', 'OUNCE'),
+            new RenameClassAndConstFetch('Zend_Measure_Weight', 'POUND', 'Mage_Core_Helper_Measure_Weight', 'POUND'),
+        ])
         ->withSkip([
             CodeQuality\BooleanNot\SimplifyDeMorganBinaryRector::class,
             # skip: causes issues with Mage_Api2_Model_Auth_Adapter_Oauth::getUserParams()
diff --git a/app/design/frontend/rwd/default/template/email/order/shipment/track.phtml b/app/design/frontend/rwd/default/template/email/order/shipment/track.phtml
@@ -24,7 +24,7 @@
     <tbody>
     <?php $i = 0;
     foreach ($_shipment->getAllTracks() as $_item): $i++ ?>
-    <tbody>
+        <tr>
             <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getTitle()) ?></td>
             <td align="center" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getNumber()) ?></td>
         </tr>
diff --git a/composer.json b/composer.json
@@ -71,7 +71,7 @@
         "phpunit/phpunit": "^9.6",
         "rector/rector": "^2.1.7",
         "squizlabs/php_codesniffer": "^3.7",
-        "symplify/vendor-patches": "^11.1"
+        "symplify/vendor-patches": "^12.0"
     },
     "conflict": {
         "n98/n98_layouthelper": "*"
@@ -122,21 +122,21 @@
     "extra": {
         "patches": {
             "shardj/zf1-future": {
-                "MAG-1.1.1": ".vendor-patches/MAG-1.1.1.patch",
-                "MAG-1.9.3.0": ".vendor-patches/MAG-1.9.3.0.patch",
-                "MAG-1.9.3.7 - SUPEE-10415": ".vendor-patches/MAG-1.9.3.7.patch",
-                "OM-918 - Add runtime cache to Zend_Locale_Data": ".vendor-patches/OM-918.patch",
-                "OM-1081 - Not detecting HTTPS behind a proxy": ".vendor-patches/OM-1081.patch",
-                "OM-2047 - Pass delimiter char to preg_quote": ".vendor-patches/OM-2047.patch",
-                "OM-2050 - Prevent checking known date codes": ".vendor-patches/OM-2050.patch",
-                "OM-4297 - PHP 8.4 compability": ".vendor-patches/OM-4297.patch",
-                "PHPSTAN-ZF1F - temporary fixes": ".vendor-patches/PHPSTAN-ZF1F.patch"
+                "MAG-1.1.1": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/MAG-1.1.1.patch",
+                "MAG-1.9.3.0": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/MAG-1.9.3.0.patch",
+                "MAG-1.9.3.7 - SUPEE-10415": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/MAG-1.9.3.7.patch",
+                "OM-918 - Add runtime cache to Zend_Locale_Data": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-918.patch",
+                "OM-1081 - Not detecting HTTPS behind a proxy": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-1081.patch",
+                "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-2047.patch",
+                "OM-2050 - Prevent checking known date codes": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-2050.patch",
+                "OM-4297 - PHP 8.4 compability": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-4297.patch",
+                "PHPSTAN-ZF1F - temporary fixes": "https://raw.githubusercontent.com/OpenMage/magento-lts/8e345d5907d2b6881a0ed84d5cf9863e4bf93d02/.vendor-patches/PHPSTAN-ZF1F.patch"
             },
             "magento-ecg/coding-standard": {
-                "ECG-72 - Fix LoopSniff": ".vendor-patches/ECG-72.patch"
+                "ECG-72 - Fix LoopSniff": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/ECG-72.patch"
             },
             "phpseclib/mcrypt_compat": {
-                "OM-4891 - PHP 8.5 compability": ".vendor-patches/OM-4891.patch"
+                "OM-4891 - PHP 8.5 compability": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-4891.patch"
             }
         },
         "magento-root-dir": ".",
diff --git a/composer.lock b/composer.lock
diff --git a/tests/unit/Mage/Catalog/Model/ProductTest.php b/tests/unit/Mage/Catalog/Model/ProductTest.php
diff --git a/tests/unit/Mage/Catalog/Model/UrlTest.php b/tests/unit/Mage/Catalog/Model/UrlTest.php
diff --git a/tests/unit/Mage/Core/Model/AppTest.php b/tests/unit/Mage/Core/Model/AppTest.php
diff --git a/tests/unit/Mage/Core/Model/LayoutTest.php b/tests/unit/Mage/Core/Model/LayoutTest.php
diff --git a/tests/unit/Mage/Rule/Model/AbstractTest.php b/tests/unit/Mage/Rule/Model/AbstractTest.php
