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

Make php-8.1 minimum requirement #4124

Draft
wants to merge 26 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3d7eaf6
Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)
sreichel Jul 22, 2024
53ee2f8
Merge branch 'OpenMage:main' into main
sreichel Jul 24, 2024
89cc37c
Merge branch 'OpenMage:main' into main
sreichel Jul 24, 2024
591a218
Revert "Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)"
sreichel Jul 28, 2024
464bc5f
Drop php7 support
sreichel Jul 28, 2024
28d6783
Updated README.md (draft)
sreichel Jul 28, 2024
0df34c3
Update composer.json
sreichel Aug 7, 2024
b5bb7b8
Merge branch 'main' into drop-php7
sreichel Sep 4, 2024
e0ad5ac
Update
sreichel Sep 4, 2024
c0c1e24
Merge branch 'main' into drop-php7
sreichel Oct 29, 2024
7da2e88
update baseline
sreichel Oct 29, 2024
aa8059c
Merge branch 'main' into drop-php7
sreichel Feb 2, 2025
26253f4
Merge branch 'main' into drop-php7
sreichel Feb 11, 2025
7c2db70
composer update
sreichel Feb 11, 2025
269c07c
Merge branch 'main' into drop-php7
sreichel Mar 5, 2025
e757f24
Merge branch 'main' into drop-php7
colinmollenhour Mar 6, 2025
c259075
fix rector (unit tests)
sreichel Mar 9, 2025
98f0624
Merge remote-tracking branch 'origin/drop-php7' into drop-php7
sreichel Mar 9, 2025
d3f68fa
fix rector (incomplete unit tests)
sreichel Mar 9, 2025
4c71a05
fix phpunit tests (null is not a valid value)
sreichel Mar 9, 2025
a70c59d
phpstan (unit tests)
sreichel Mar 9, 2025
354c611
fix php8 deprecation
sreichel Mar 9, 2025
f3b7763
phpunit (comment test - doesNotPerformAssertions)
sreichel Mar 9, 2025
0fe82cb
phpcs-fixer
sreichel Mar 9, 2025
8d06e88
removed libxml_disable_entity_loader calls
sreichel Mar 9, 2025
1426165
replace strftime with date
sreichel Mar 9, 2025
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: 7.4
php-version: 8.1

- 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: 7.4
php-version: 8.1

- 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: ['7.4', '8.3']
php-versions: ['8.1', '8.4']

steps:
- name: Setup PHP
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['7.4']
php-versions: ['8.1']
steps:
- name: Checkout repository
uses: actions/checkout@master
Expand Down Expand Up @@ -38,6 +38,10 @@ jobs:
if: startsWith(github.event.release.tag_name, 'v19')
run: composer require --no-install --prefer-dist --no-progress --ignore-platform-req=ext-* openmage/module-mage-pagecache

- name: Require Mage_Poll on v19
if: startsWith(github.event.release.tag_name, 'v19')
run: composer require --no-install --prefer-dist --no-progress --ignore-platform-req=ext-* openmage/module-mage-poll

- name: Composer install
run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-* --no-dev

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: ['7.4', '8.1']
php: ['8.1', '8.4']
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: ['7.4', '8.3']
php: ['8.1', '8.4']

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

Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ In a nutshell:

## Requirements

- PHP 7.4 to 8.3
- PHP 8.0 to 8.4
- MySQL 5.7+ (8.0+ recommended) or MariaDB
- optional: Redis 5.x, 6.x and 7.0.x are supported

Expand Down Expand Up @@ -263,6 +263,10 @@ If you see SQL errors after upgrading please remember to check for this specific

UPS shut down their old CGI APIs so we removed the support for it from the Mage_Usa module.

### Since OpenMage 20.11.0

PHP 8.0 is now the minimum required version.

### Between OpenMage 20.x and 21.x (unreleased, available on branch `next`)

- PHP 8.2 as minimum required version
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/Install/etc/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
<ctype/>
<curl/>
<dom/>
<ftp/>
<gd/>
<hash/>
<iconv/>
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Media/Model/File/Image.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function delete(Mage_Media_Model_Image $object)
* Create image resource for operation from file
*
* @param Mage_Media_Model_Image $object
* @return bool|false|resource
* @return false|GdImage|resource
* @throws Mage_Core_Exception
*/
public function getImage(Mage_Media_Model_Image $object)
Expand Down Expand Up @@ -116,7 +116,7 @@ public function getImage(Mage_Media_Model_Image $object)
* Create tmp image resource for operations
*
* @param Mage_Media_Model_Image $object
* @return resource
* @return GdImage|false
*/
public function getTmpImage(Mage_Media_Model_Image $object)
{
Expand Down
16 changes: 9 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{
"name": "openmage/magento-lts",
"description": "A fork of Magento-1 that is accepting bug fixes (backward compatible, drop in replacement for official Magento)",
"homepage": "https://www.openmage.org/",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"type": "magento-source",
"require": {
"php": ">=7.4 <8.5",
"php": ">=8.1 <8.5",
"ext-ctype": "*",
"ext-curl": "*",
"ext-dom": "*",
"ext-ftp": "*",
"ext-gd": "*",
"ext-hash": "*",
"ext-iconv": "*",
Expand All @@ -31,10 +33,10 @@
"phpseclib/mcrypt_compat": "^2.0.3",
"phpseclib/phpseclib": "^3.0.14",
"shardj/zf1-future": "1.24.0",
"symfony/polyfill-php74": "^1.29",
"symfony/polyfill-php80": "^1.29",
"symfony/polyfill-php81": "^1.29",
"symfony/polyfill-php82": "^1.29"
"symfony/polyfill-php81": "^1.30",
"symfony/polyfill-php82": "^1.30",
"symfony/polyfill-php83": "^1.30",
"symfony/polyfill-php84": "^1.30"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
Expand All @@ -44,7 +46,7 @@
"openmage/dev-meta-package": "^1.0",
"phpcompatibility/php-compatibility": "^9.3",
"phpmd/phpmd": "^2.13",
"phpstan/phpstan": "^1.11",
"phpstan/phpstan": "^1.12.1",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.7",
"symplify/vendor-patches": "^11.1"
Expand Down Expand Up @@ -120,7 +122,7 @@
"cweagans/composer-patches": true
},
"platform": {
"php": "7.4"
"php": "8.1"
},
"sort-packages": true
}
Expand Down
Loading
Loading