Skip to content

Commit

Permalink
Merge pull request #171 from erikn69/patch-14
Browse files Browse the repository at this point in the history
Laravel 11 Support
  • Loading branch information
topclaudy committed Feb 28, 2024
2 parents bf0e53c + fc978c9 commit 25a4ed2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down Expand Up @@ -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.*
Expand Down Expand Up @@ -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
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"email": "[email protected]"
}
],
"require": {
"illuminate/database": ">=5.6 <11.0"
"require": {
"illuminate/database": ">=5.6 <12.0"
},
"require-dev": {
"ext-sqlite3": "*",
"fakerphp/faker": "^1.18",
"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": {
Expand Down
4 changes: 3 additions & 1 deletion tests/Unit/HasManyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 25a4ed2

Please sign in to comment.