Skip to content

Commit 5c9bb34

Browse files
aaa2000aaa2000
authored
ci: php 8.5 (#7585)
1 parent 359a128 commit 5c9bb34

File tree

13 files changed

+69
-56
lines changed

13 files changed

+69
-56
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
matrix:
2222
php:
23-
- '8.4'
23+
- '8.5'
2424
fail-fast: false
2525
steps:
2626
- name: Checkout
@@ -80,7 +80,7 @@ jobs:
8080
strategy:
8181
matrix:
8282
php:
83-
- '8.4'
83+
- '8.5'
8484
fail-fast: false
8585
steps:
8686
- name: Checkout
@@ -117,7 +117,7 @@ jobs:
117117
strategy:
118118
matrix:
119119
php:
120-
- '8.4'
120+
- '8.5'
121121
fail-fast: false
122122
env:
123123
APP_DEBUG: '1' # https://github.com/phpstan/phpstan-symfony/issues/37
@@ -186,10 +186,12 @@ jobs:
186186
- '8.2'
187187
- '8.3'
188188
- '8.4'
189+
- '8.5'
189190
include:
190191
- php: '8.2'
191192
- php: '8.3'
192193
- php: '8.4'
194+
- php: '8.5'
193195
coverage: true
194196
fail-fast: false
195197
steps:
@@ -257,10 +259,11 @@ jobs:
257259
- version: '8.2'
258260
- version: '8.3'
259261
- version: '8.4'
262+
- version: '8.5'
260263
coverage: true
261-
- version: '8.4'
264+
- version: '8.5'
262265
lowest: true
263-
- version: '8.4'
266+
- version: '8.5'
264267
minimal-changes: true
265268
component:
266269
- api-platform/doctrine-common
@@ -341,7 +344,7 @@ jobs:
341344
strategy:
342345
matrix:
343346
php:
344-
- version: '8.4'
347+
- version: '8.5'
345348
component:
346349
- api-platform/doctrine-common
347350
- api-platform/doctrine-orm
@@ -394,10 +397,12 @@ jobs:
394397
- '8.2'
395398
- '8.3'
396399
- '8.4'
400+
- '8.5'
397401
include:
398402
- php: '8.2'
399403
- php: '8.3'
400404
- php: '8.4'
405+
- php: '8.5'
401406
coverage: true
402407
fail-fast: false
403408
steps:
@@ -472,7 +477,7 @@ jobs:
472477
strategy:
473478
matrix:
474479
php:
475-
- '8.4'
480+
- '8.5'
476481
fail-fast: false
477482
env:
478483
APP_ENV: postgres
@@ -522,7 +527,7 @@ jobs:
522527
strategy:
523528
matrix:
524529
php:
525-
- '8.4'
530+
- '8.5'
526531
fail-fast: false
527532
services:
528533
mysql:
@@ -572,7 +577,7 @@ jobs:
572577
strategy:
573578
matrix:
574579
php:
575-
- '8.4'
580+
- '8.5'
576581
fail-fast: false
577582
env:
578583
APP_ENV: mongodb
@@ -660,7 +665,7 @@ jobs:
660665
strategy:
661666
matrix:
662667
php:
663-
- '8.4'
668+
- '8.5'
664669
fail-fast: false
665670
env:
666671
APP_ENV: mercure
@@ -750,7 +755,7 @@ jobs:
750755
strategy:
751756
matrix:
752757
php:
753-
- '8.4'
758+
- '8.5'
754759
fail-fast: false
755760
env:
756761
APP_ENV: elasticsearch
@@ -802,7 +807,7 @@ jobs:
802807
strategy:
803808
matrix:
804809
php:
805-
- '8.4'
810+
- '8.5'
806811
fail-fast: false
807812
env:
808813
APP_ENV: elasticsearch
@@ -908,7 +913,7 @@ jobs:
908913
strategy:
909914
matrix:
910915
php:
911-
- '8.4'
916+
- '8.5'
912917
fail-fast: false
913918
steps:
914919
- name: Checkout
@@ -947,7 +952,7 @@ jobs:
947952
strategy:
948953
matrix:
949954
php:
950-
- '8.4'
955+
- '8.5'
951956
fail-fast: false
952957
steps:
953958
- name: Checkout
@@ -990,7 +995,7 @@ jobs:
990995
strategy:
991996
matrix:
992997
php:
993-
- '8.4'
998+
- '8.5'
994999
fail-fast: false
9951000
steps:
9961001
- name: Checkout
@@ -1035,7 +1040,7 @@ jobs:
10351040
strategy:
10361041
matrix:
10371042
php:
1038-
- '8.4'
1043+
- '8.5'
10391044
fail-fast: false
10401045
env:
10411046
APP_ENV: sqlite
@@ -1132,7 +1137,7 @@ jobs:
11321137
strategy:
11331138
matrix:
11341139
php:
1135-
- '8.4'
1140+
- '8.5'
11361141
fail-fast: false
11371142
steps:
11381143
- name: Checkout
@@ -1178,9 +1183,9 @@ jobs:
11781183
strategy:
11791184
matrix:
11801185
php:
1181-
- '8.4'
1186+
- '8.5'
11821187
include:
1183-
- php: '8.4'
1188+
- php: '8.5'
11841189
coverage: true
11851190
fail-fast: false
11861191
steps:
@@ -1256,7 +1261,7 @@ jobs:
12561261
strategy:
12571262
matrix:
12581263
php:
1259-
- '8.4'
1264+
- '8.5'
12601265
fail-fast: false
12611266
steps:
12621267
- name: Checkout
@@ -1304,7 +1309,7 @@ jobs:
13041309
strategy:
13051310
matrix:
13061311
php:
1307-
- '8.4'
1312+
- '8.5'
13081313
fail-fast: false
13091314
steps:
13101315
- name: Checkout
@@ -1355,10 +1360,12 @@ jobs:
13551360
- '8.2'
13561361
- '8.3'
13571362
- '8.4'
1363+
- '8.5'
13581364
include:
13591365
- php: '8.2'
13601366
- php: '8.3'
13611367
- php: '8.4'
1368+
- php: '8.5'
13621369
coverage: true
13631370
fail-fast: false
13641371
steps:
@@ -1384,7 +1391,7 @@ jobs:
13841391
working-directory: 'src/Laravel'
13851392

13861393
laravel-e2e:
1387-
name: Laravel E2E installation (PHP 8.4)
1394+
name: Laravel E2E installation (PHP 8.5)
13881395
runs-on: ubuntu-latest
13891396
timeout-minutes: 20
13901397
steps:
@@ -1393,7 +1400,7 @@ jobs:
13931400
- name: Setup PHP
13941401
uses: shivammathur/setup-php@v2
13951402
with:
1396-
php-version: 8.4
1403+
php-version: 8.5
13971404
tools: pecl, composer
13981405
extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite, mongodb
13991406
ini-values: memory_limit=-1

‎src/Doctrine/Odm/Filter/ExistsFilter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function __construct(?ManagerRegistry $managerRegistry = null, ?LoggerInt
129129
public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
130130
{
131131
$parameter = $context['parameter'] ?? null;
132-
if (null !== ($value = $context['filters'][$parameter?->getProperty()] ?? null)) {
132+
if (null !== ($value = $context['filters'][$parameter?->getProperty() ?? ''] ?? null)) {
133133
$this->filterProperty($this->denormalizePropertyName($parameter->getProperty()), $value, $aggregationBuilder, $resourceClass, $operation, $context);
134134

135135
return;

‎src/Doctrine/Odm/Filter/OrderFilter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, ?Opera
239239
}
240240

241241
$parameter = $context['parameter'] ?? null;
242-
if (null !== ($value = $context['filters'][$parameter?->getProperty()] ?? null)) {
242+
if (null !== ($value = $context['filters'][$parameter?->getProperty() ?? ''] ?? null)) {
243243
$this->filterProperty($this->denormalizePropertyName($parameter->getProperty()), $value, $aggregationBuilder, $resourceClass, $operation, $context);
244244

245245
return;

‎src/Doctrine/Orm/Filter/ExistsFilter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $q
136136
{
137137
$parameter = $context['parameter'] ?? null;
138138

139-
if (null !== ($value = $context['filters'][$parameter?->getProperty()] ?? null)) {
139+
if (null !== ($value = $context['filters'][$parameter?->getProperty() ?? ''] ?? null)) {
140140
$this->filterProperty($this->denormalizePropertyName($parameter->getProperty()), $value, $queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);
141141

142142
return;

‎src/Doctrine/Orm/Filter/OrderFilter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $q
238238
}
239239

240240
$parameter = $context['parameter'] ?? null;
241-
if (null !== ($value = $context['filters'][$parameter?->getProperty()] ?? null)) {
241+
if (null !== ($value = $context['filters'][$parameter?->getProperty() ?? ''] ?? null)) {
242242
$this->filterProperty($this->denormalizePropertyName($parameter->getProperty()), $value, $queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);
243243

244244
return;

‎src/Doctrine/Orm/Tests/Extension/PaginationExtensionTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ public function testGetResultWithFetchJoinCollection(bool $paginationFetchJoinCo
387387
$this->assertInstanceOf(PaginatorInterface::class, $result);
388388

389389
$doctrinePaginatorReflectionProperty = new \ReflectionProperty(AbstractPaginator::class, 'paginator');
390-
$doctrinePaginatorReflectionProperty->setAccessible(true);
391390

392391
$doctrinePaginator = $doctrinePaginatorReflectionProperty->getValue($result);
393392
$this->assertSame($expected, $doctrinePaginator->getFetchJoinCollection());
@@ -435,7 +434,6 @@ public function testGetResultWithUseOutputWalkers(bool $paginationUseOutputWalke
435434
$this->assertInstanceOf(PaginatorInterface::class, $result);
436435

437436
$doctrinePaginatorReflectionProperty = new \ReflectionProperty(AbstractPaginator::class, 'paginator');
438-
$doctrinePaginatorReflectionProperty->setAccessible(true);
439437

440438
$doctrinePaginator = $doctrinePaginatorReflectionProperty->getValue($result);
441439
$this->assertSame($expected, $doctrinePaginator->getUseOutputWalkers());

‎src/Hal/Tests/Serializer/ItemNormalizerTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ public function testMaxDepth(): void
295295
{
296296
$setId = function (MaxDepthDummy $dummy, int $id): void {
297297
$prop = new \ReflectionProperty($dummy, 'id');
298-
$prop->setAccessible(true);
299298
$prop->setValue($dummy, $id);
300299
};
301300

‎src/Metadata/Extractor/PhpFileResourceExtractor.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ protected function extractPath(string $path): void
3838
$resourceReflection = new \ReflectionClass($resource);
3939

4040
foreach ($resourceReflection->getProperties() as $property) {
41-
$property->setAccessible(true);
4241
$resolvedValue = $this->resolve($property->getValue($resource));
4342
$property->setValue($resource, $resolvedValue);
4443
}

0 commit comments

Comments
 (0)