Skip to content
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'
coverage: none # disable xdebug, pcov
tools: cs2pr

Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
with:
php-version: '8.4'
php-version: '8.5'
coverage: none # disable xdebug, pcov

- name: Composer install
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ jobs:

- name: Run psalm analysis
if: github.event_name != 'repository_dispatch'
run: vendor/bin/psalm --show-info=false --shepherd --diff --output-format=github
run: |
php -i
vendor/bin/psalm --show-info=false --shepherd --diff --output-format=github

- name: Check psalm baseline and show type coverage
id: baseline
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
strategy:
matrix:
include:
- php-version: '8.4'
- php-version: '8.5'
db-image: 'mysql:8.0'
composer-flags: '--prefer-lowest'
- php-version: '8.5'
db-image: 'mysql:8.4'
- php-version: '8.6'
db-image: 'mysql:latest'
composer-flags: '--ignore-platform-req=php'
- php-version: '8.4'
- php-version: '8.5'
db-image: 'mariadb:10.4'
- php-version: '8.5'
db-image: 'mariadb:latest'
Expand Down
2 changes: 1 addition & 1 deletion .tools/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
// For static analysis we do not boot redaxo.
// But to avoid errors about non-existing constants (usually defined while booting redaxo), we define them here.

define('REX_MIN_PHP_VERSION', '8.4');
define('REX_MIN_PHP_VERSION', '8.5');
2 changes: 1 addition & 1 deletion addons/debug/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],

"require": {
"php": "^8.4",
"php": "^8.5",
"ext-zip": "*",
"redaxo/core": "@dev",
"itsgoingd/clockwork": "^5.3.5"
Expand Down
2 changes: 1 addition & 1 deletion addons/test/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],

"require": {
"php": "^8.4",
"php": "^8.5",
"redaxo/core": "@dev"
}
}
2 changes: 1 addition & 1 deletion boot/core.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* URL_PROVIDER [Required] Url provider
*/

define('REX_MIN_PHP_VERSION', '8.4');
define('REX_MIN_PHP_VERSION', '8.5');

if (version_compare(PHP_VERSION, REX_MIN_PHP_VERSION) < 0) {
echo 'Ooops, something went wrong!<br>';
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
],

"require": {
"php": "^8.4",
"php": "^8.5",
"ext-ctype": "*",
"ext-gd": "*",
"ext-iconv": "*",
Expand Down Expand Up @@ -75,7 +75,8 @@
"symfony/polyfill-php81": "*",
"symfony/polyfill-php82": "*",
"symfony/polyfill-php83": "*",
"symfony/polyfill-php84": "*"
"symfony/polyfill-php84": "*",
"symfony/polyfill-php85": "*"
},

"conflict": {
Expand Down Expand Up @@ -183,7 +184,7 @@

"config": {
"platform": {
"php": "8.4.5"
"php": "8.5.4"
},
"sort-packages": true,
"allow-plugins": {
Expand Down
2 changes: 1 addition & 1 deletion phpstan.dist.neon
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ includes:

parameters:
level: 6
phpVersion: 80400 # PHP 8.4
phpVersion: 80500 # PHP 8.5
treatPhpDocTypesAsCertain: false
editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'
featureToggles:
Expand Down
2 changes: 1 addition & 1 deletion rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
'tests/',
])
->withParallel()
->withPhpVersion(PhpVersion::PHP_84)
->withPhpVersion(PhpVersion::PHP_85)
->withPreparedSets(typeDeclarations: false, privatization: true)
// ->withPhpSets()
->withImportNames()
Expand Down
4 changes: 2 additions & 2 deletions setup/update.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
throw new UserMessageException(sprintf('The REDAXO version "%s" is too old for this update, please update to 5.16 before.', escape(Core::getVersion())));
}

if (PHP_VERSION_ID < 80400) {
throw new UserMessageException(I18n::msg('setup_201', PHP_VERSION, '8.4'));
if (PHP_VERSION_ID < 80500) {
throw new UserMessageException(I18n::msg('setup_201', PHP_VERSION, '8.5'));
}

$minExtensions = ['ctype', 'fileinfo', 'filter', 'iconv', 'intl', 'mbstring', 'pcre', 'pdo', 'pdo_mysql', 'session', 'tokenizer'];
Expand Down
Loading