PHP8.2 is now the minimum version for v21 (#3920)

OpenMage · Apr 2, 2024 · deacb2b · deacb2b
1 parent 873b074
commit deacb2b
Show file tree

Hide file tree

Showing 12 changed files with 149 additions and 204 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.1', '8.3']
+        php-versions: ['8.2', '8.3']
 
     steps:
       - name: Setup PHP

diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -16,7 +16,7 @@ jobs:
       max-parallel: 5
       matrix:
         os: [ubuntu-latest]
-        php: ['8.1', '8.2']
+        php: ['8.2', '8.3']
     steps:
       - uses: actions/checkout@v4
       - name: Setup PHP

diff --git a/.github/workflows/syntax-php.yml b/.github/workflows/syntax-php.yml
@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['8.1', '8.3']
+        php: ['8.2', '8.3']
 
     name: PHP Syntax ${{ matrix.php }}
 

diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ In a nutshell:
 
 ## Requirements
 
-- PHP 8.1+ for OM v21, PHP 7.4+ for OpenMage v19/v20
+- PHP 8.2+ for OM v21, PHP 7.4+ for OpenMage v19/v20
 - MySQL 5.7+ (8.0+ recommended) or MariaDB
 - optional: Redis 5.x, 6.x and 7.0.x are supported
 
@@ -265,7 +265,7 @@ UPS shut down their old CGI APIs so we removed the support for it from the Mage_
 
 ### Between OpenMage 20.x and 21.x (unreleased, available on branch `next`)
 
-- PHP 8.1 as minimum required version
+- PHP 8.2 as minimum required version
 - Removed scriptaculous/dragdrop.js (#3215)
 - RWD theme: updated jQuery to 3.7.0 (#3204)
 - Unified CSRF configuration (#3147) and added form key validation to Contacts form (#3146)

diff --git a/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php
@@ -20,10 +20,14 @@
  * @package    Mage_Directory
  *
  * @property string $_url
- * @property array $_messages
  */
 abstract class Mage_Directory_Model_Currency_Import_Abstract
 {
+    /**
+     * @var array
+     */
+    protected $_messages;
+
     /**
      * Retrieve currency codes
      *

diff --git a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php
@@ -18,13 +18,24 @@
  *
  * @category   Mage
  * @package    Mage_ImportExport
- *
- * @property resource $_fileHandler
- * @property string $_delimiter
- * @property string $_enclosure
  */
 abstract class Mage_ImportExport_Model_Export_Adapter_Abstract
 {
+    /**
+     * @var resource
+     */
+    protected $_fileHandler;
+
+    /**
+     * @var string
+     */
+    protected $_delimiter;
+
+    /**
+     * @var string
+     */
+    protected $_enclosure;
+
     /**
      * Destination file path.
      *

diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php
@@ -42,6 +42,16 @@ class Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder
      */
     protected $_page;
 
+    /**
+     * @var Zend_Pdf_Resource_Font
+     */
+    protected $_fontNormal;
+
+    /**
+     * @var  Zend_Pdf_Resource_Font
+     */
+    protected $_fontBold;
+
     /**
      * Create font instances
      */

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     ],
     "type": "magento-source",
     "require": {
-        "php": ">=8.1 <8.4",
+        "php": ">=8.2 <8.4",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-dom": "*",
@@ -30,10 +30,7 @@
         "pelago/emogrifier": "^7.0",
         "phpseclib/mcrypt_compat": "^2.0.3",
         "phpseclib/phpseclib": "^3.0.14",
-        "shardj/zf1-future": "1.24.0",
-        "symfony/polyfill-php74": "^1.27",
-        "symfony/polyfill-php80": "^1.27",
-        "symfony/polyfill-php81": "^1.27"
+        "shardj/zf1-future": "1.24.0"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
@@ -119,7 +116,7 @@
             "cweagans/composer-patches": true
         },
         "platform": {
-            "php": "8.1"
+            "php": "8.2"
         },
         "sort-packages": true
     }