Laravel 11 support

henzeb · Mar 11, 2024 · f164d93 · f164d93
1 parent 0a956e3
commit f164d93
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 56 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['8.0','8.1','8.2']
+        php: ['8.1','8.2','8.3']
         stability: [prefer-lowest, prefer-stable]
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 .php_cs
 .php_cs.cache
 .phpunit.result.cache
+.phpunit.cache
 build
 composer.lock
 coverage

diff --git a/composer.json b/composer.json
@@ -20,13 +20,13 @@
         }
     ],
     "require": {
-        "php": "^8.0"
+        "php": "^8.1"
     },
     "require-dev": {
         "mockery/mockery": "^1.5",
-        "orchestra/testbench": "^7.0|^8.0",
+        "orchestra/testbench": "^8.0|^9.0",
         "phpstan/phpstan": "^1.4",
-        "phpunit/phpunit": "^9.5.27"
+        "phpunit/phpunit": "^9.5.27|^10"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,28 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true"
->
-    <testsuites>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
-    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
-    <php>
-        <server name="APP_ENV" value="testing"/>
-        <server name="BCRYPT_ROUNDS" value="4"/>
-        <server name="CACHE_DRIVER" value="array"/>
-        <!-- <server name="DB_CONNECTION" value="sqlite"/> -->
-        <!-- <server name="DB_DATABASE" value=":memory:"/> -->
-        <server name="MAIL_MAILER" value="array"/>
-        <server name="QUEUE_CONNECTION" value="sync"/>
-        <server name="SESSION_DRIVER" value="array"/>
-        <server name="TELESCOPE_ENABLED" value="false"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <server name="APP_ENV" value="testing"/>
+    <server name="BCRYPT_ROUNDS" value="4"/>
+    <server name="CACHE_DRIVER" value="array"/>
+    <!-- <server name="DB_CONNECTION" value="sqlite"/> -->
+    <!-- <server name="DB_DATABASE" value=":memory:"/> -->
+    <server name="MAIL_MAILER" value="array"/>
+    <server name="QUEUE_CONNECTION" value="sync"/>
+    <server name="SESSION_DRIVER" value="array"/>
+    <server name="TELESCOPE_ENABLED" value="false"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Helpers/DataProviders.php b/tests/Helpers/DataProviders.php
@@ -7,15 +7,15 @@
 
 trait DataProviders
 {
-    public function providesOperators(): array
+    public static function providesOperators(): array
     {
         return [
             'and' => ['and'],
             'or' => ['or'],
         ];
     }
 
-    public function providesFilterTestcases(): array
+    public static function providesFilterTestcases(): array
     {
         return [
             'is' => ['method' => 'is', 'parameters' => ['key' => 'animal', 'value' => 'cat'], null],
@@ -72,10 +72,10 @@ public function providesFilterTestcases(): array
         ];
     }
 
-    public function providesFilterWithQueryTestcases(): array
+    public static function providesFilterWithQueryTestcases(): array
     {
         return array_merge_recursive(
-            $this->providesFilterTestcases(),
+            static::providesFilterTestcases(),
             [
                 'is' => ['query' => '`animal` = ?'],
                 'is-null' => ['query' => '`animal` is null'],

diff --git a/tests/Helpers/Errors.php b/tests/Helpers/Errors.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Henzeb\Query\Tests\Helpers;
+
+use Error;
+
+trait Errors
+{
+    public function expectError(): void
+    {
+        $this->expectException(Error::class);
+    }
+}
diff --git a/tests/Unit/Filters/QueryTest.php b/tests/Unit/Filters/QueryTest.php
@@ -5,13 +5,14 @@
 use Henzeb\Query\Builders\Contracts\QueryBuilder;
 use Henzeb\Query\Filters\Query;
 use Henzeb\Query\Tests\Helpers\DataProviders;
+use Henzeb\Query\Tests\Helpers\Errors;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 use Mockery\Mock;
 
 class QueryTest extends MockeryTestCase
 {
-    use DataProviders;
+    use DataProviders, Errors;
 
     public function getMock(bool $withGetFilters = true): Query|Mock
     {
@@ -36,6 +37,7 @@ public function getMock(bool $withGetFilters = true): Query|Mock
     /**
      * @param string $method
      * @param array $parameters
+     * @param string|null $expectedMethod
      * @return void
      *
      * @dataProvider providesFilterTestcases

diff --git a/tests/Unit/Illuminate/Builders/BuilderTest.php b/tests/Unit/Illuminate/Builders/BuilderTest.php
@@ -3,6 +3,7 @@
 namespace Henzeb\Query\Tests\Unit\Illuminate\Builders;
 
 use Henzeb\Query\Filters\Query;
+use Henzeb\Query\Tests\Helpers\Errors;
 use Orchestra\Testbench\TestCase;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Eloquent\Model;
@@ -16,11 +17,12 @@
 
 class BuilderTest extends TestCase
 {
-    use DataProviders;
+    use DataProviders, Errors;
 
     /**
      * @param string $method
      * @param array $parameters
+     * @param string|null $expectedMethod
      * @param string|array $query
      * @param bool $noParameters
      * @return void
@@ -29,7 +31,7 @@ class BuilderTest extends TestCase
      */
     public function testShouldBuild(string $method, array $parameters, ?string $expectedMethod, string|array $query, bool $noParameters = false): void
     {
-        $laravelBuilder = DB::query()->from('animals');
+        $laravelBuilder = DB::connection('mysql')->query()->from('animals');
 
         $builder = new Builder($laravelBuilder);
 
@@ -61,7 +63,7 @@ public function testShouldBuild(string $method, array $parameters, ?string $expe
      */
     public function testShouldBuildWithOr(string $method, array $parameters, ?string $expectedMethod, array|string $query, bool $noParameters = false): void
     {
-        $illuminateBuilder = DB::query()->from('animals')->whereRaw('true');
+        $illuminateBuilder = DB::connection('mysql')->query()->from('animals')->whereRaw('true');
 
         $builder = new Builder($illuminateBuilder);
 
@@ -95,7 +97,7 @@ public function testShouldBuildWithOr(string $method, array $parameters, ?string
      */
     public function testShouldBuildWithNest(string $method, array $parameters, ?string $expectedMethod, array|string $query, bool $noParameters = false): void
     {
-        $illuminateBuilder = DB::query()->from('animals')->whereRaw('true');
+        $illuminateBuilder = DB::connection('mysql')->query()->from('animals')->whereRaw('true');
         $builder = new Builder($illuminateBuilder);
 
         $method = $expectedMethod ?? $method;
@@ -127,7 +129,7 @@ public function testShouldBuildWithNest(string $method, array $parameters, ?stri
      */
     public function testShouldBuildWithGroupOr(string $method, array $parameters, ?string $expectedMethod, array|string $query, bool $noParameters = false): void
     {
-        $laravelBuilder = DB::query()->from('animals');
+        $laravelBuilder = DB::connection('mysql')->query()->from('animals');
         $builder = new Builder($laravelBuilder);
 
         $method = $expectedMethod ?? $method;
@@ -157,7 +159,7 @@ public function testAcceptsEloquentBuilderInstance()
             protected $table = 'my_table';
         };
 
-        $query = $model->where('alive', true);
+        $query = $model->setConnection('mysql')->where('alive', true);
 
         $builder = new Builder($query);
         $builder->is('animal', 'cat');
@@ -171,7 +173,7 @@ public function testAcceptsEloquentBuilderInstance()
     public function testShouldNotAllowNonIlluminateFilters()
     {
 
-        $laravelBuilder = DB::query()->from('animals');
+        $laravelBuilder = DB::connection('mysql')->query()->from('animals');
 
         $myFilter = new class implements Filter {
 
@@ -185,7 +187,7 @@ public function testShouldNotAllowNonIlluminateFilters()
     public function testShouldNotAllowNonIlluminateFiltersWhenOr()
     {
 
-        $laravelBuilder = DB::query()->from('animals');
+        $laravelBuilder = DB::connection('mysql')->query()->from('animals');
 
         $myFilter = new class implements Filter {
 
@@ -198,7 +200,7 @@ public function testShouldNotAllowNonIlluminateFiltersWhenOr()
 
     public function testShouldBuildFilter()
     {
-        $laravelBuilder = DB::query()->from('animals')->where('animal', 'dog');;
+        $laravelBuilder = DB::connection('mysql')->query()->from('animals')->where('animal', 'dog');;
 
         $myFilter = new class implements IlluminateFilter {
             public function build(EloquentBuilder|IlluminateBuilder $builder): void
@@ -218,6 +220,7 @@ public function build(EloquentBuilder|IlluminateBuilder $builder): void
 
     public function testShouldBuildOrFilter()
     {
+        DB::setDefaultConnection('mysql');
         $laravelBuilder = DB::query()->from('animals')->where('animal', 'dog');
 
         $myFilter = new class implements IlluminateFilter {

diff --git a/tests/Unit/Illuminate/Mixins/Concerns/Mocks.php b/tests/Unit/Illuminate/Mixins/Concerns/Mocks.php
@@ -5,8 +5,11 @@
 use Mockery;
 use Mockery\MockInterface;
 use Illuminate\Foundation\Http\FormRequest;
+use Symfony\Component\HttpFoundation\FileBag;
+use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\InputBag;
 use Henzeb\Query\Illuminate\Providers\QueryFilterServiceProvider;
+use Symfony\Component\HttpFoundation\ServerBag;
 
 trait Mocks
 {
@@ -24,9 +27,9 @@ public function getFormRequest(): FormRequest|MockInterface
         $partial->query = new InputBag();
         $partial->request = new InputBag();
 
-        $partial->server = new InputBag();
-        $partial->files = new InputBag();
-        $partial->headers = new InputBag();
+        $partial->server = new ServerBag();
+        $partial->files = new FileBag();
+        $partial->headers = new HeaderBag();
 
         return $partial;
     }

diff --git a/tests/Unit/Illuminate/Mixins/FormRequestMxin/FormRequestMixinTest.php b/tests/Unit/Illuminate/Mixins/FormRequestMxin/FormRequestMixinTest.php
@@ -28,7 +28,7 @@ private function filters(Query $query): void
         );
     }
 
-    public function providesTestCasesForFilter(): array
+    public static function providesTestCasesForFilter(): array
     {
         return [
             'basic' => [['filter' => ['animal' => 'dog']], 'animal', 'dog'],
@@ -41,7 +41,7 @@ public function providesTestCasesForFilter(): array
     }
 
 
-    public function providesTestCasesForFilterArray(): array
+    public static function providesTestCasesForFilterArray(): array
     {
         return [
             'basic' => [['filter' => ['animal' => 'dog']], 'animal', 'dog'],
@@ -57,7 +57,7 @@ public function providesTestCasesForFilterArray(): array
         ];
     }
 
-    public function providesTestCasesForHasFilter(): array
+    public static function providesTestCasesForHasFilter(): array
     {
         return [
             'basic' => [['filter' => ['animal' => 'dog']], 'animal', true],

diff --git a/tests/Unit/Illuminate/Mixins/FormRequestMxin/PaginationTest.php b/tests/Unit/Illuminate/Mixins/FormRequestMxin/PaginationTest.php
@@ -15,7 +15,7 @@ class PaginationTest extends TestCase
     use Mocks;
 
 
-    public function providesPaginationInputBags()
+    public static function providesPaginationInputBags(): array
     {
         return [
             'different-default-limit' => [
@@ -141,7 +141,7 @@ public function testShouldAllowFormRequestOverrideManuallyAddedLimit()
         );
     }
 
-    public function providesValidationFailures(): array
+    public static function providesValidationFailures(): array
     {
         return [
             'size-as-string' => [
@@ -228,7 +228,7 @@ public function testShouldIgnoreGetInstanceWithPagination()
         Config::set('filter.pagination.auto', true);
     }
 
-    public function providesEnablePaginationTestcases()
+    public static function providesEnablePaginationTestcases(): array
     {
         return [
             'config-disabled-fq-enabled' => [false, true,(new Query())->limit(12)],

diff --git a/tests/Unit/Illuminate/Mixins/FormRequestMxin/SortingTest.php b/tests/Unit/Illuminate/Mixins/FormRequestMxin/SortingTest.php
@@ -13,7 +13,7 @@ class SortingTest extends TestCase
 {
     use Mocks;
 
-    public function providesSortingSituations(): array
+    public static function providesSortingSituations(): array
     {
         return [
             'asc' => ['input' => ['sort' => 'animal'], 'expected' => (new Query())->limit(50)->asc('animal')],
@@ -67,7 +67,7 @@ public function testShouldGetInstanceWithSorting(array $input, Query $expected,
         );
     }
 
-    public function provideSortingValidationFailures(): array
+    public static function provideSortingValidationFailures(): array
     {
         return [
             'boolean' => [true],
@@ -103,7 +103,7 @@ public function testShouldFailWithIncorrectValues(mixed $input, string $member =
         $formRequest->getFilter();
     }
 
-    public function providesEnablePaginationTestcases()
+    public static function providesEnablePaginationTestcases(): array
     {
         return [
             'config-disabled-fq-enabled' =>