From 8160ffaba7acd5f11c0eafda4fb6a804edbb1e3d Mon Sep 17 00:00:00 2001 From: erikn69 Date: Wed, 28 Feb 2024 16:09:03 -0500 Subject: [PATCH] Laravel 11 Support --- .github/workflows/run-tests.yml | 8 ++++++-- composer.json | 8 ++++---- tests/Unit/HasManyTest.php | 4 +++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d21cb45..189ef1a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - laravel: [10.*, 9.*, 8.*] + laravel: [11.*, 10.*, 9.*, 8.*] php: ['8.3', '8.2', '8.1', '8.0'] include: - laravel: 8.* @@ -44,6 +44,10 @@ jobs: - laravel: 5.6 php: '7.1' exclude: + - laravel: 11.* + php: '8.1' + - laravel: 11.* + php: '8.0' - laravel: 10.* php: '8.0' - laravel: 8.* @@ -77,4 +81,4 @@ jobs: run: | echo "Laravel ${{ matrix.laravel }}" php -v | head -1 - ./vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml + ./vendor/bin/phpunit diff --git a/composer.json b/composer.json index e15a30b..8df2c10 100755 --- a/composer.json +++ b/composer.json @@ -13,13 +13,13 @@ "email": "cdaniel@awobaz.com" } ], - "require": { - "illuminate/database": ">=5.6 <11.0", - "fakerphp/faker": "^1.18" + "require": { + "illuminate/database": ">=5.6 <12.0" }, "require-dev": { "ext-sqlite3": "*", - "phpunit/phpunit": "^6.0|^8.0|^9.0" + "fakerphp/faker": "^1.18", + "phpunit/phpunit": "^6.0|^8.0|^9.0|^10.0" }, "autoload": { "psr-4": { diff --git a/tests/Unit/HasManyTest.php b/tests/Unit/HasManyTest.php index a6e2d73..11c1dd0 100644 --- a/tests/Unit/HasManyTest.php +++ b/tests/Unit/HasManyTest.php @@ -30,7 +30,9 @@ class HasManyTest extends TestCase */ public function broken_Compoships_hasOneOrMany_whereInMethod__missingRelationColumn() { - $this->markAsRisky(); + if (method_exists($this, 'markAsRisky')) { + $this->markAsRisky(); + } $this->markTestIncomplete('This test is broken, because relation columns are required on selections!'); $allocation = $this->createAllocation(); $allocation->trackingTasks()