Skip to content

Commit 61d108d

Browse files
committed
Merge branch '9.0'
# Conflicts: # .gitignore # CHANGELOG.md # phpunit.xml.dist
2 parents b86ed88 + afc4028 commit 61d108d

File tree

3 files changed

+6
-20
lines changed

3 files changed

+6
-20
lines changed

phpunit.xml.dist

+2-16
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
backupGlobals="false"
4-
bootstrap="vendor/autoload.php"
5-
colors="true"
6-
processIsolation="false"
7-
stopOnFailure="false"
8-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
9-
cacheDirectory=".phpunit.cache"
10-
backupStaticProperties="false"
11-
>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
123
<testsuites>
134
<testsuite name="Package Test Suite">
14-
<directory suffix=".php">./tests/</directory>
15-
<exclude>./tests/views/</exclude>
16-
<exclude>./tests/DataTables/</exclude>
17-
<exclude>./tests/Providers/</exclude>
18-
<exclude>./tests/Models/</exclude>
19-
<exclude>./tests/TestCase.php</exclude>
5+
<directory suffix="Test.php">./tests/</directory>
206
</testsuite>
217
</testsuites>
228
</phpunit>

src/Contracts/DataTableScope.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface DataTableScope
77
/**
88
* Apply a query scope.
99
*
10-
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Relations\Relation $query
10+
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Relations\Relation|\Illuminate\Support\Collection $query
1111
* @return mixed
1212
*/
1313
public function apply($query);

src/Services/DataTable.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -710,10 +710,10 @@ public function __get(string $key)
710710
/**
711711
* Apply query scopes.
712712
*
713-
* @param EloquentBuilder|QueryBuilder|EloquentRelation $query
714-
* @return EloquentBuilder|QueryBuilder|EloquentRelation
713+
* @param EloquentBuilder|QueryBuilder|EloquentRelation|Collection $query
714+
* @return EloquentBuilder|QueryBuilder|EloquentRelation|Collection
715715
*/
716-
protected function applyScopes(EloquentBuilder|QueryBuilder|EloquentRelation $query): EloquentBuilder|QueryBuilder|EloquentRelation
716+
protected function applyScopes(EloquentBuilder|QueryBuilder|EloquentRelation|Collection $query): EloquentBuilder|QueryBuilder|EloquentRelation|Collection
717717
{
718718
foreach ($this->scopes as $scope) {
719719
$scope->apply($query);

0 commit comments

Comments
 (0)