Skip to content

Commit 0af5b86

Browse files
Merge pull request #86 from forkcms/php85
PHP 8.5
2 parents 576e572 + 93bacd0 commit 0af5b86

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+893
-1079
lines changed

.github/workflows/run-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: true
1010
matrix:
11-
php: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
11+
php: [8.5]
1212
testsuite: ["unit"]
1313
name: PHPUnit - ${{ matrix.testsuite }} (PHP ${{ matrix.php }})
1414
services:
@@ -22,10 +22,10 @@ jobs:
2222
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v5
2626

2727
- name: Cache dependencies
28-
uses: actions/cache@v2
28+
uses: actions/cache@v4
2929
with:
3030
path: ~/.composer/cache/files
3131
key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
composer.lock
12
/vendor
23
spoon/tests/tmp/spoon.zip
4+
.phpunit.result.cache

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
}
1212
],
1313
"require": {
14-
"php": "^7.1|^8.0"
14+
"php": "^8.5"
1515
},
1616
"require-dev": {
17-
"symfony/phpunit-bridge": "^5.3"
17+
"symfony/phpunit-bridge": "^7.2",
18+
"rector/rector": "*"
1819
}
1920
}

composer.lock

Lines changed: 0 additions & 171 deletions
This file was deleted.

rector.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use Rector\Config\RectorConfig;
6+
use Rector\Php84\Rector\Param\ExplicitNullableParamTypeRector;
7+
8+
return RectorConfig::configure()
9+
->withPaths([
10+
__DIR__ . '/spoon',
11+
])
12+
// uncomment to reach your current PHP version
13+
->withPhpSets(php85: true)
14+
->withTypeCoverageLevel(0)
15+
->withDeadCodeLevel(0)
16+
->withCodeQualityLevel(0);

spoon/CHANGELOG

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2.0.0 (2025-xx-xx)
2+
---
3+
- Upgrade to PHP 8.5
4+
- The default value for SpoonFilter::getValue parameter defaultValue is now null
5+
- E_STRICT is no longer supported
6+
- Replaced PDO::MYSQL_ATTR_USE_BUFFERED_QUERY with Pdo\Mysql::ATTR_USE_BUFFERED_QUERY (deprecated in PHP 8.5)
7+
- Removed curl_close, as it does nothing since PHP 8.0 (deprecated in PHP 8.5)
8+
19
1.3.5 (xxxx-xx-xx)
210
----
311
Bugfixes:

0 commit comments

Comments
 (0)