Skip to content

Commit

Permalink
~ Attempt L11 update
Browse files Browse the repository at this point in the history
  • Loading branch information
tylernathanreed committed Mar 20, 2024
1 parent 3e1804c commit a927739
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 57 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.phpunit.coverage.json
.phpunit.coverage.xml
.phpunit.result.cache
/.phpunit.cache
/vendor/
composer.lock
composer.lock
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Laravel Relation Joins

[![Laravel Version](https://img.shields.io/badge/Laravel-9.x%2F10.x%2F11.x-blue)](https://laravel.com/)
[![Laravel Version](https://img.shields.io/badge/Laravel-10.x%2F11.x-blue)](https://laravel.com/)
[![Tests](https://github.com/tylernathanreed/laravel-relation-joins/actions/workflows/tests.yml/badge.svg)](https://github.com/tylernathanreed/laravel-relation-joins/actions/workflows/tests.yml)
[![Lint](https://github.com/tylernathanreed/laravel-relation-joins/actions/workflows/coding-standards.yml/badge.svg)](https://github.com/tylernathanreed/laravel-relation-joins/actions/workflows/coding-standards.yml)
[![Code Coverage](https://coveralls.io/repos/github/tylernathanreed/laravel-relation-joins/badge.svg?branch=master)](https://coveralls.io/github/tylernathanreed/laravel-relation-joins?branch=master)
Expand Down Expand Up @@ -64,13 +64,14 @@ Reedware\LaravelRelationJoins\LaravelRelationJoinServiceProvider::class

This package is maintained with the latest version of Laravel in mind, but support follows Laravel's [Support Policy](https://laravel.com/docs/master/releases#support-policy).

| Package | Laravel | PHP |
| :-----: | :--------: | :--------: |
| 5.x | 9.x - 11.x | 8.0 - 8.2+ |
| 4.x | 8.x - 10.x | 7.3 - 8.0+ |
| 3.x | 7.x - 9.x | 7.2 - 8.0+ |
| 2.x | 6.x - 8.x | 7.2 - 8.0+ |
| 1.x | 5.5 - 8.x | 7.1 - 8.0+ |
| Package | Laravel | PHP |
| :-----: | :---------: | :--------: |
| 6.x | 10.x - 11.x | 8.1 - 8.2+ |
| 5.x | 9.x - 10.x | 8.0 - 8.2+ |
| 4.x | 8.x - 10.x | 7.3 - 8.0+ |
| 3.x | 7.x - 9.x | 7.2 - 8.0+ |
| 2.x | 6.x - 8.x | 7.2 - 8.0+ |
| 1.x | 5.5 - 8.x | 7.1 - 8.0+ |

<a name="usage"></a>
## Usage
Expand Down
15 changes: 8 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@
}
],
"require": {
"php": ">=8.0",
"illuminate/contracts": "^9.52|^10.0",
"illuminate/database": "^9.52|^10.0",
"illuminate/support": "^9.52|^10.0"
"php": ">=8.1",
"illuminate/contracts": "^10.0|^11.0",
"illuminate/database": "^10.0|^11.0",
"illuminate/support": "^10.0|^11.0"
},
"require-dev": {
"illuminate/container": "^9.52|^10.0",
"illuminate/container": "^10.0|^11.0",
"laravel/pint": "^1.5",
"mockery/mockery": "^1.6.6",
"php-coveralls/php-coveralls": "^2.4",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^9.5"
"phpunit/phpunit": "^10.5",
"symfony/var-dumper": "^7.0"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -59,6 +60,6 @@
"test:static": "phpstan",
"test:style": "pint --test",
"test:style-fix": "pint",
"test:suite": "phpunit --verbose"
"test:suite": "phpunit"
}
}
57 changes: 28 additions & 29 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
backupGlobals="false"
backupStaticAttributes="false"
beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="tests/bootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
verbose="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
backupGlobals="false"
beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="tests/bootstrap.php"
displayDetailsOnTestsThatTriggerDeprecations="true"
failOnDeprecation ="true"
colors="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
cacheDirectory=".phpunit.cache"
backupStaticProperties="false"
>
<testsuites>
<testsuite name="Laravel Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<coverage
processUncoveredFiles="true"
>
<include>
<directory suffix=".php">./src</directory>
</include>
<report>
<clover outputFile=".phpunit.coverage.xml"/>
</report>
</coverage>
<testsuites>
<testsuite name="Laravel Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<coverage>
<report>
<clover outputFile=".phpunit.coverage.xml"/>
</report>
</coverage>
<source>
<include>
<directory suffix=".php">./src</directory>
</include>
</source>
</phpunit>
1 change: 0 additions & 1 deletion src/Mixins/JoinsRelationships.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Database\Query\Builder as Query;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Arr;
use LogicException;
Expand Down
10 changes: 0 additions & 10 deletions tests/CustomBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,4 @@

class CustomBuilder extends Builder
{
/**
* The methods that should be returned from query builder.
*
* @var array
*/
protected $passthru = [
'insert', 'insertGetId', 'getBindings', 'toSql',
'exists', 'doesntExist', 'count', 'min', 'max', 'avg', 'sum', 'getConnection',
'myCustomOverrideforTesting',
];
}
2 changes: 1 addition & 1 deletion tests/Unit/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected function tearDown(): void
*
* @return array
*/
public function queryDataProvider()
public static function queryDataProvider()
{
$newQuery = function ($model) {
return $model->useCustomBuilder(false)->newQuery();
Expand Down

0 comments on commit a927739

Please sign in to comment.