Skip to content

Commit

Permalink
Ignore PHP dependencies constrain in CI when PHP 8.4 is used
Browse files Browse the repository at this point in the history
  • Loading branch information
roxblnfk committed Dec 9, 2024
1 parent 9b3feb4 commit d77ad58
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 9 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/run-test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,30 @@ jobs:
php-${{ matrix.php }}-${{ matrix.os }}-composer-
- name: Install lowest dependencies from composer.json
if: matrix.dependencies == 'lowest'
if: matrix.dependencies == 'lowest' && matrix.php != '8.4'
run: composer update --no-interaction --no-progress --prefer-lowest

- name: Install lowest dependencies from composer.json
if: matrix.dependencies == 'lowest' && matrix.php == '8.4'
run: composer update --no-interaction --no-progress --prefer-lowest --ignore-platform-req php


- name: Validate lowest dependencies
if: matrix.dependencies == 'lowest'
if: matrix.dependencies == 'lowest' && matrix.php == '8.1'
env:
COMPOSER_POOL_OPTIMIZER: 0
run: vendor/bin/validate-prefer-lowest


- name: Install highest dependencies from composer.json
if: matrix.dependencies == 'highest'
if: matrix.dependencies == 'highest' && matrix.php != '8.4'
run: composer update --no-interaction --no-progress

- name: Download RoadRunner
- name: Install highest dependencies from composer.json
if: matrix.dependencies == 'highest' && matrix.php == '8.4'
run: composer update --no-interaction --no-progress --ignore-platform-req php

- name: Download binaries
if: inputs.download-binaries == true
run: composer get:binaries

Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"phpunit/phpunit": "^10.5",
"spiral/code-style": "~2.1.2",
"spiral/core": "^3.13",
"symfony/var-dumper": "^6.0 || ^7.0",
"ta-tikoma/phpunit-architecture-test": "^0.8.4",
"vimeo/psalm": "^4.30 || ^5.4"
},
Expand Down
15 changes: 11 additions & 4 deletions tests/Unit/Exception/FailureConverterTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,17 @@ public function testStackTraceStringForAdditionalContextEvenWhenClassIsNotPresen
$trace,
);

self::assertStringContainsString(
'Temporal\Tests\Unit\Exception\FailureConverterTestCase->Temporal\Tests\Unit\Exception\{closure}()',
$trace,
);
if (\PHP_VERSION_ID < 80400) {
self::assertStringContainsString(
'Temporal\Tests\Unit\Exception\FailureConverterTestCase->Temporal\Tests\Unit\Exception\{closure}()',
$trace,
);
} else {
self::assertStringContainsString(
'Temporal\Tests\Unit\Exception\FailureConverterTestCase->{closure:Temporal\Tests\Unit\Exception\FailureConverterTestCase::testStackTraceStringForAdditionalContextEvenWhenClassIsNotPresented()',
$trace,
);
}

self::assertStringContainsString(
'call_user_func(Closure)',
Expand Down

0 comments on commit d77ad58

Please sign in to comment.