Skip to content

Commit

Permalink
Merge 94066f6 into dd7a1c0
Browse files Browse the repository at this point in the history
  • Loading branch information
crynobone committed Jul 27, 2021
2 parents dd7a1c0 + 94066f6 commit 401f213
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analyse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
dependencies:
- "locked"
laravel:
- "8.x"
- "9.x"
experimental:
- false

Expand Down
93 changes: 91 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,102 @@ jobs:
- "ubuntu-latest"
- "windows-latest"
php:
- "7.3"
- "7.4"
- "8.0"
dependencies:
- "locked"
- "highest"
- "lowest"
laravel:
- "8.x"
- "9.x"
experimental:
- false

name: Laravel ${{ matrix.laravel }} on PHP${{ matrix.php }}-${{ matrix.os }} (${{ matrix.dependencies }})

steps:
- name: Checkout code
uses: actions/checkout@v1

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlite3, pdo_sqlite, bcmath, fileinfo
coverage: none

- name: Install Laravel Framework ${{ matrix.laravel }}
run: |
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
- name: Install dependencies
uses: "ramsey/composer-install@v1"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "--prefer-dist"

- name: Execute tests
run: vendor/bin/phpunit

tests-on-php-74:
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
os:
- "ubuntu-latest"
- "windows-latest"
php:
- "7.4"
dependencies:
- "locked"
- "highest"
- "lowest"
laravel:
- "8.x"
experimental:
- false

name: Laravel ${{ matrix.laravel }} on PHP${{ matrix.php }}-${{ matrix.os }} (${{ matrix.dependencies }})

steps:
- name: Checkout code
uses: actions/checkout@v1

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlite3, pdo_sqlite, bcmath, fileinfo
coverage: none

- name: Install Laravel Framework ${{ matrix.laravel }}
run: |
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
- name: Install dependencies
uses: "ramsey/composer-install@v1"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "--prefer-dist --no-cache"

- name: Execute tests
run: vendor/bin/phpunit

tests-on-php-73:
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
os:
- "ubuntu-latest"
- "windows-latest"
php:
- "7.3"
dependencies:
- "locked"
- "highest"
- "lowest"
laravel:
- "8.x"
experimental:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
},
"require": {
"php": "^7.3 || ^8.0",
"illuminate/database": "^8.25",
"illuminate/support": "^8.25"
"illuminate/database": "^8.25 || ^9.0",
"illuminate/support": "^8.25 || ^9.0"
},
"require-dev": {
"nunomaduro/larastan": "^0.7.10",
"orchestra/canvas": "^6.1",
"orchestra/testbench": "^6.16"
"orchestra/canvas": "^6.1 || ^7.0",
"orchestra/testbench": "^6.16 || ^7.0"
},
"config": {
"sort-packages": true
Expand Down
4 changes: 2 additions & 2 deletions src/Filters/FieldSearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public function __construct($column)
/**
* Apply generic field search queries.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
* @return \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
*/
public function apply($query, array $keywords, string $likeOperator, string $whereOperator)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Filters/JsonFieldSearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public function __construct($path)
/**
* Apply JSON field search queries.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
* @return \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
*/
public function apply($query, array $keywords, string $likeOperator, string $whereOperator)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Orderable.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ public function __construct(?string $column, string $direction = 'asc', array $c
/**
* Apply ordered to query.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
* @return \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
*/
public function apply($query)
{
Expand Down
16 changes: 8 additions & 8 deletions src/Searchable.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ public function searchKeyword(): Keyword
/**
* Apply search to query.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
* @return \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
*/
public function apply($query)
{
Expand Down Expand Up @@ -87,9 +87,9 @@ public function apply($query)
/**
* Build wildcard query filter for field using where or orWhere.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
* @return \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
*/
protected function queryOnColumn(
$query,
Expand All @@ -109,9 +109,9 @@ protected function queryOnColumn(
/**
* Build wildcard query filter for column using where or orWhere.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
* @return \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
*/
protected function queryOnColumnUsing(
$query,
Expand Down Expand Up @@ -145,9 +145,9 @@ protected function queryOnColumnUsing(
/**
* Build wildcard query filter for JSON column using where or orWhere.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
* @return \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
*/
protected function queryOnJsonColumnUsing(
$query,
Expand Down
8 changes: 4 additions & 4 deletions src/Taxonomy.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ public function __construct(?string $terms, array $rules = [], array $fields = [
/**
* Apply search to query.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*
* @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
* @return \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
*/
public function apply($query)
{
Expand All @@ -60,7 +60,7 @@ public function apply($query)
/**
* Match basic conditions.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*/
protected function matchBasicConditions($query): void
{
Expand All @@ -80,7 +80,7 @@ protected function matchBasicConditions($query): void
/**
* Match tagged conditions.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*/
protected function matchTaggedConditions($query): void
{
Expand Down
2 changes: 1 addition & 1 deletion src/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/**
* Get connection type from Query Builder.
*
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
* @param \Illuminate\Contracts\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
*/
function connection_type($query): string
{
Expand Down

0 comments on commit 401f213

Please sign in to comment.