Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/syntax-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
php: ['8.1', '8.3']
php: ['8.2', '8.3']

name: PHP Syntax ${{ matrix.php }}

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
19 changes: 15 additions & 4 deletions app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
9 changes: 3 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"type": "magento-source",
"require": {
"php": ">=8.1 <8.4",
"php": ">=8.2 <8.4",
"ext-ctype": "*",
"ext-curl": "*",
"ext-dom": "*",
Expand All @@ -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",
Expand Down Expand Up @@ -119,7 +116,7 @@
"cweagans/composer-patches": true
},
"platform": {
"php": "8.1"
"php": "8.2"
},
"sort-packages": true
}
Expand Down
Loading
Loading