Skip to content

Commit 174f86f

Browse files
committed
Ignore PHP dependencies constrain in CI when PHP 8.4 is used
1 parent 9b3feb4 commit 174f86f

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

.github/workflows/run-test-suite.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,20 +91,30 @@ jobs:
9191
php-${{ matrix.php }}-${{ matrix.os }}-composer-
9292
9393
- name: Install lowest dependencies from composer.json
94-
if: matrix.dependencies == 'lowest'
94+
if: matrix.dependencies == 'lowest' == 'highest' && matrix.php != '8.4'
9595
run: composer update --no-interaction --no-progress --prefer-lowest
9696

97+
- name: Install lowest dependencies from composer.json
98+
if: matrix.dependencies == 'lowest' == 'highest' && matrix.php == '8.4'
99+
run: composer update --no-interaction --no-progress --prefer-lowest --ignore-platform-req php
100+
101+
97102
- name: Validate lowest dependencies
98-
if: matrix.dependencies == 'lowest'
103+
if: matrix.dependencies == 'lowest' && matrix.php == '8.1'
99104
env:
100105
COMPOSER_POOL_OPTIMIZER: 0
101106
run: vendor/bin/validate-prefer-lowest
102107

108+
103109
- name: Install highest dependencies from composer.json
104-
if: matrix.dependencies == 'highest'
110+
if: matrix.dependencies == 'highest' && matrix.php != '8.4'
105111
run: composer update --no-interaction --no-progress
106112

107-
- name: Download RoadRunner
113+
- name: Install highest dependencies from composer.json
114+
if: matrix.dependencies == 'highest' && matrix.php == '8.4'
115+
run: composer update --no-interaction --no-progress --ignore-platform-req php
116+
117+
- name: Download binaries
108118
if: inputs.download-binaries == true
109119
run: composer get:binaries
110120

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
"phpunit/phpunit": "^10.5",
6262
"spiral/code-style": "~2.1.2",
6363
"spiral/core": "^3.13",
64-
"symfony/var-dumper": "^6.0 || ^7.0",
6564
"ta-tikoma/phpunit-architecture-test": "^0.8.4",
6665
"vimeo/psalm": "^4.30 || ^5.4"
6766
},

tests/Unit/Exception/FailureConverterTestCase.php

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,17 @@ public function testStackTraceStringForAdditionalContextEvenWhenClassIsNotPresen
7272
$trace,
7373
);
7474

75-
self::assertStringContainsString(
76-
'Temporal\Tests\Unit\Exception\FailureConverterTestCase->Temporal\Tests\Unit\Exception\{closure}()',
77-
$trace,
78-
);
75+
if (\PHP_VERSION_ID < 80400) {
76+
self::assertStringContainsString(
77+
'Temporal\Tests\Unit\Exception\FailureConverterTestCase->Temporal\Tests\Unit\Exception\{closure}()',
78+
$trace,
79+
);
80+
} else {
81+
self::assertStringContainsString(
82+
'Temporal\Tests\Unit\Exception\FailureConverterTestCase->{closure:Temporal\Tests\Unit\Exception\FailureConverterTestCase::testStackTraceStringForAdditionalContextEvenWhenClassIsNotPresented()',
83+
$trace,
84+
);
85+
}
7986

8087
self::assertStringContainsString(
8188
'call_user_func(Closure)',

0 commit comments

Comments
 (0)