Merge pull request #23 from makeabledk/feat/php8

Add GH Action + bump dependencies

Author: rasmuscnielsen

.github/workflows/test.yml

@@ -0,0 +1,39 @@
+name: Run tests
+
+on:
+    push:
+    pull_request:
+    schedule:
+        - cron: '0 0 * * *'
+
+jobs:
+    test:
+        runs-on: ubuntu-latest
+
+        strategy:
+            fail-fast: false
+            matrix:
+                php: [8.0, 8.1]
+                laravel: [8.*, 9.*]
+                dependency-version: [prefer-lowest, prefer-stable]
+
+        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+
+        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, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+                  coverage: none
+
+            - name: Install dependencies
+              run: |
+                  composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
+                  composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+
+            - name: Execute tests
+              run: vendor/bin/phpunit

.travis.yml

@@ -7,11 +7,12 @@
         }
     },
     "require": {
-        "php": ">=7.3.0|8.*",
-        "illuminate/support": "^6.0|^7.0|^8.0"
+        "php": "^8.0",
+        "illuminate/support": "^8.80|^9.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.8|^4.0|^6.0"
+        "orchestra/testbench": "^6.0",
+        "phpunit/phpunit": "^9.0"
     },
     "autoload-dev": {
         "psr-4": {

composer.json

@@ -1,30 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
-        >
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" />
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" verbose="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory suffix="Test.php">./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

phpunit.xml

@@ -3,7 +3,7 @@
 # Laravel Query Kit
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/makeabledk/laravel-querykit.svg?style=flat-square)](https://packagist.org/packages/makeabledk/laravel-querykit)
-[![Build Status](https://img.shields.io/travis/makeabledk/laravel-query-kit/master.svg?style=flat-square)](https://travis-ci.org/makeabledk/laravel-query-kit)
+[![Build Status](https://img.shields.io/github/workflow/status/makeabledk/laravel-query-kit/Run%20tests?label=Tests)](https://github.com/makeabledk/laravel-query-kit/actions)
 [![StyleCI](https://styleci.io/repos/95551114/shield?branch=master)](https://styleci.io/repos/95551114)
 
 This package provides a handy way to query eloquent-scopes on model instances in Laravel.

readme.md

@@ -32,7 +32,7 @@ class Builder
     /**
      * Builder constructor.
      *
-     * @param Model $model
+     * @param  Model  $model
      */
     public function __construct(Model $model)
     {
@@ -47,7 +47,6 @@ public function __construct(Model $model)
      *
      * @param $method
      * @param $parameters
-     *
      * @return Builder
      */
     public function __call($method, $parameters)
@@ -77,8 +76,7 @@ public function __call($method, $parameters)
     /**
      * @param $model
      * @param $name
-     * @param array ...$args
-     *
+     * @param  array  ...$args
      * @return Builder
      */
     public static function make($model, $name, ...$args)
@@ -100,8 +98,7 @@ public static function registerConstraint($class)
 
     /**
      * @param $name
-     * @param array ...$args
-     *
+     * @param  array  ...$args
      * @return mixed
      */
     public function callScopeFunction($name, ...$args)

src/Builder/Builder.php

@@ -21,8 +21,8 @@ public function __construct()
     }
 
     /**
-     * @param QueryConstraint $constraint
-     * @param bool $or
+     * @param  QueryConstraint  $constraint
+     * @param  bool  $or
      * @return Stack
      */
     public function apply(QueryConstraint $constraint, $or = false)
@@ -61,7 +61,7 @@ protected function push($constraint)
     }
 
     /**
-     * @param Stack $stack
+     * @param  Stack  $stack
      * @param $model
      * @return bool
      */
@@ -73,7 +73,7 @@ public function check($model)
     }
 
     /**
-     * @param Collection $track
+     * @param  Collection  $track
      * @param $model
      * @return bool
      */

src/Builder/Stack.php

@@ -25,7 +25,7 @@ class Where implements QueryConstraint
     /**
      * Where constructor.
      *
-     * @param array ...$args
+     * @param  array  ...$args
      */
     public function __construct(...$args)
     {
@@ -34,7 +34,6 @@ public function __construct(...$args)
 
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)
@@ -85,8 +84,7 @@ protected function isSubQuery()
     /**
      * @param $property
      * @param $operator
-     * @param null $value
-     *
+     * @param  null  $value
      * @return array
      */
     protected function normalize($property, $operator = null, $value = null)

src/Builder/Where.php

@@ -33,7 +33,6 @@ public function __construct($property, $range)
 
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)

src/Builder/WhereBetween.php

@@ -25,9 +25,9 @@ class WhereColumn implements QueryConstraint
     /**
      * WhereColumn constructor.
      *
-     * @param mixed $property
-     * @param mixed $operator
-     * @param mixed $propertyToCompare
+     * @param  mixed  $property
+     * @param  mixed  $operator
+     * @param  mixed  $propertyToCompare
      */
     public function __construct($property, $operator, $propertyToCompare)
     {
@@ -38,7 +38,6 @@ public function __construct($property, $operator, $propertyToCompare)
 
     /**
      * @param $model
-     *
      * @return bool
      */
     public function check($model)