From b07c31e165208cc1654eae143c08bfe0ffe2e865 Mon Sep 17 00:00:00 2001 From: Martin Linzmayer Date: Mon, 1 Dec 2025 15:56:01 +0100 Subject: [PATCH 1/7] ref(ci): add `--no-security-blocking` to composer install --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6505f6ba..51ea0b7f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -66,7 +66,7 @@ jobs: --no-interaction --no-update # Actually run the composer installation - composer install --no-interaction --prefer-dist --no-progress + composer install --no-interaction --prefer-dist --no-progress ----no-security-blocking - name: Run phpunit run: vendor/bin/phpunit --coverage-clover=coverage.xml --coverage-filter=src/Sentry @@ -175,7 +175,7 @@ jobs: --no-interaction --no-update # Actually run the composer installation - composer install --no-interaction --prefer-dist --no-progress + composer install --no-interaction --prefer-dist --no-progress --no-security-blocking - name: Run phpunit run: vendor/bin/phpunit --coverage-clover=coverage.xml --whitelist=src/Sentry From a5be8132db5d9db2b5728ca27ac0a7b20748805c Mon Sep 17 00:00:00 2001 From: Martin Linzmayer Date: Mon, 1 Dec 2025 15:56:31 +0100 Subject: [PATCH 2/7] fix --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 51ea0b7f..451406ca 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -66,7 +66,7 @@ jobs: --no-interaction --no-update # Actually run the composer installation - composer install --no-interaction --prefer-dist --no-progress ----no-security-blocking + composer install --no-interaction --prefer-dist --no-progress --no-security-blocking - name: Run phpunit run: vendor/bin/phpunit --coverage-clover=coverage.xml --coverage-filter=src/Sentry From 844d3b5e29bbb4c52c6c84a282752fd19de32c43 Mon Sep 17 00:00:00 2001 From: Martin Linzmayer Date: Mon, 1 Dec 2025 16:05:12 +0100 Subject: [PATCH 3/7] use env --- .github/workflows/ci.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 451406ca..752ea477 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,6 +21,7 @@ jobs: runs-on: ubuntu-latest env: COMPOSER_NO_INTERACTION: 1 + COMPOSER_NO_SECURITY_BLOCKING: 1 strategy: fail-fast: false @@ -66,7 +67,7 @@ jobs: --no-interaction --no-update # Actually run the composer installation - composer install --no-interaction --prefer-dist --no-progress --no-security-blocking + composer install --no-interaction --prefer-dist --no-progress - name: Run phpunit run: vendor/bin/phpunit --coverage-clover=coverage.xml --coverage-filter=src/Sentry @@ -80,6 +81,7 @@ jobs: runs-on: ubuntu-latest env: COMPOSER_NO_INTERACTION: 1 + COMPOSER_NO_SECURITY_BLOCKING: 1 strategy: fail-fast: false @@ -175,7 +177,7 @@ jobs: --no-interaction --no-update # Actually run the composer installation - composer install --no-interaction --prefer-dist --no-progress --no-security-blocking + composer install --no-interaction --prefer-dist --no-progress - name: Run phpunit run: vendor/bin/phpunit --coverage-clover=coverage.xml --whitelist=src/Sentry From 97e7e3151df78b9de9d85c2c9cf7e122368b3989 Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Tue, 2 Dec 2025 10:05:58 +0100 Subject: [PATCH 4/7] exclude Laravel 8.0 on PHP 7.3 --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 752ea477..00078ce2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -103,6 +103,9 @@ jobs: - php: "7.2" packages: { laravel: ^9.0, testbench: ^7.0, phpunit: 9.5.* } + # Technically Laravel 8 should work on PHP 7.3 but some Laravel Cloud code seems to break this, so we exclude it from the matrix. + - php: "7.3" + packages: { laravel: ^8.0, testbench: ^6.0, phpunit: 9.3.* } - php: "7.3" packages: { laravel: ^9.0, testbench: ^7.0, phpunit: 9.5.* } From 4bc1bd49d775e079e310c7cd4968c538e26a906f Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Tue, 2 Dec 2025 10:13:58 +0100 Subject: [PATCH 5/7] Exclude console scheduling tests on specific Laravel test version --- .../Sentry/Features/ConsoleSchedulingIntegrationTest.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php b/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php index d8e2fd6e..9ddf5a87 100644 --- a/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php +++ b/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php @@ -12,6 +12,15 @@ class ConsoleSchedulingIntegrationTest extends TestCase { + protected function setUp(): void + { + if (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70400 && version_compare($this->app->version(), '8', '>=') && version_compare($this->app->version(), '9', '<')) { + $this->markTestSkipped('These tests don\'t run on Laravel 8 with PHP 7.3.'); + } + + parent::setUp(); + } + public function testScheduleMacro(): void { /** @var Event $scheduledEvent */ From cd4fb462d7bed9815cd52d9d29d12ea4ed1deff8 Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Tue, 2 Dec 2025 10:14:04 +0100 Subject: [PATCH 6/7] Revert "exclude Laravel 8.0 on PHP 7.3" This reverts commit 97e7e3151df78b9de9d85c2c9cf7e122368b3989. --- .github/workflows/ci.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 00078ce2..752ea477 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -103,9 +103,6 @@ jobs: - php: "7.2" packages: { laravel: ^9.0, testbench: ^7.0, phpunit: 9.5.* } - # Technically Laravel 8 should work on PHP 7.3 but some Laravel Cloud code seems to break this, so we exclude it from the matrix. - - php: "7.3" - packages: { laravel: ^8.0, testbench: ^6.0, phpunit: 9.3.* } - php: "7.3" packages: { laravel: ^9.0, testbench: ^7.0, phpunit: 9.5.* } From 8fba5df792f3abe2b649b374be9b2f42e7f6d230 Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Tue, 2 Dec 2025 10:17:43 +0100 Subject: [PATCH 7/7] Fix getting Laravel version --- test/Sentry/Features/ConsoleSchedulingIntegrationTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php b/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php index 9ddf5a87..12b949af 100644 --- a/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php +++ b/test/Sentry/Features/ConsoleSchedulingIntegrationTest.php @@ -6,6 +6,7 @@ use Illuminate\Bus\Queueable; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Foundation\Application; use RuntimeException; use Sentry\Laravel\Tests\TestCase; use Illuminate\Console\Scheduling\Event; @@ -14,7 +15,7 @@ class ConsoleSchedulingIntegrationTest extends TestCase { protected function setUp(): void { - if (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70400 && version_compare($this->app->version(), '8', '>=') && version_compare($this->app->version(), '9', '<')) { + if (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70400 && version_compare(Application::VERSION, '8', '>=') && version_compare(Application::VERSION, '9', '<')) { $this->markTestSkipped('These tests don\'t run on Laravel 8 with PHP 7.3.'); }