Merge pull request #1049 from rebing/mfn-drop-l8

Author: mfn

.github/workflows/integration_tests.yml

@@ -34,14 +34,10 @@ jobs:
       fail-fast: false
       matrix:
         php: ${{ fromJson(needs.supported-versions-matrix.outputs.version) }}
-        laravel: [^8.0, ^9.0, ^10.0]
+        laravel: [^9.0, ^10.0]
         exclude:
-          - php: 7.4
-            laravel: ^9.0
           - php: 8.0
             laravel: ^10.0
-          - php: 7.4
-            laravel: ^10.0
     name: P=${{ matrix.php }} L=${{ matrix.laravel }}
     runs-on: ubuntu-latest
     env:
@@ -58,8 +54,6 @@ jobs:
       # Due to version incompatibility with older Laravels we test, we remove it
       - run: composer remove --dev nunomaduro/larastan --no-update
       - run: composer remove --dev friendsofphp/php-cs-fixer --no-update
-      - run: composer remove --dev laravel/legacy-factories --no-update
-        if: (matrix.laravel == '^6.0' || matrix.laravel == '^7.0')
       - run: composer require illuminate/contracts:${{ matrix.laravel }} --no-update
 
       - name: Get composer cache directory

.github/workflows/tests.yml

@@ -34,14 +34,10 @@ jobs:
       fail-fast: false
       matrix:
         php: ${{ fromJson(needs.supported-versions-matrix.outputs.version) }}
-        laravel: [^8.0, ^9.0, ^10.0]
+        laravel: [^9.0, ^10.0]
         exclude:
-          - php: 7.4
-            laravel: ^9.0
           - php: 8.0
             laravel: ^10.0
-          - php: 7.4
-            laravel: ^10.0
     name: P=${{ matrix.php }} L=${{ matrix.laravel }}
     runs-on: ubuntu-latest
     env:
@@ -59,8 +55,6 @@ jobs:
       # Due to version incompatibility with older Laravels we test, we remove it
       - run: composer remove --dev nunomaduro/larastan --no-update
       - run: composer remove --dev friendsofphp/php-cs-fixer --no-update
-      - run: composer remove --dev laravel/legacy-factories --no-update
-        if: (matrix.laravel == '^6.0' || matrix.laravel == '^7.0')
       - run: composer require illuminate/contracts:${{ matrix.laravel }} --no-update
 
       - name: Get composer cache directory

CHANGELOG.md

@@ -46,6 +46,7 @@ CHANGELOG
   name have to match.
 - Remove integrated GraphiQL support in favour of https://github.com/mll-lab/laravel-graphiql [\#986 / mfn](https://github.com/rebing/graphql-laravel/pull/986)
 - Laravel 6 is no longer supported [\#967 / mfn](https://github.com/rebing/graphql-laravel/pull/967)
+- Laravel 8 is no longer supported [\#1049 / mfn](https://github.com/rebing/graphql-laravel/pull/1049)
 
 ## Changed
 - The type resolver is now able to resolve the top level types 'Query',

README.md

@@ -6,7 +6,7 @@
 [![Downloads](https://img.shields.io/packagist/dt/rebing/graphql-laravel.svg?style=flat-square)](https://packagist.org/packages/rebing/graphql-laravel)
 [![Get on Slack](https://img.shields.io/badge/slack-join-orange.svg)](https://join.slack.com/t/rebing-graphql/shared_invite/enQtNTE5NjQzNDI5MzQ4LTdhNjk0ZGY1N2U1YjE4MGVlYmM2YTc2YjQ0MmIwODY5MWMwZWIwYmY1MWY4NTZjY2Q5MzdmM2Q3NTEyNDYzZjc)
 
-Use Facebook's GraphQL with PHP 7.4+ on Laravel 8.0+. It is based on the [PHP port of GraphQL reference implementation](https://github.com/webonyx/graphql-php). You can find more information about GraphQL in the [GraphQL Introduction](https://reactjs.org/blog/2015/05/01/graphql-introduction.html) on the [React](https://reactjs.org/) blog or you can read the [GraphQL specifications](https://spec.graphql.org/).
+Use Facebook's GraphQL with PHP 8.0+ on Laravel 9.0+. It is based on the [PHP port of GraphQL reference implementation](https://github.com/webonyx/graphql-php). You can find more information about GraphQL in the [GraphQL Introduction](https://reactjs.org/blog/2015/05/01/graphql-introduction.html) on the [React](https://reactjs.org/) blog or you can read the [GraphQL specifications](https://spec.graphql.org/).
 
 * Allows creating **queries** and **mutations** as request endpoints
 * Supports multiple schemas
@@ -33,7 +33,7 @@ It offers following features and improvements over the original package by
 
 ### Dependencies:
 
-* [Laravel 6.0+](https://github.com/laravel/laravel)
+* [Laravel 9.0+](https://github.com/laravel/laravel)
 * [GraphQL PHP](https://github.com/webonyx/graphql-php)
 
 

composer.json

@@ -34,12 +34,12 @@
     "license": "MIT",
     "type": "library",
     "require": {
-        "php": ">= 7.4",
+        "php": "^8.0",
         "ext-json": "*",
-        "illuminate/contracts": "^8.0|^9.0|^10.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/contracts": "^9.0|^10.0",
+        "illuminate/support": "^9.0|^10.0",
         "laragraph/utils": "^2",
-        "thecodingmachine/safe": "^1.1|^2.4",
+        "thecodingmachine/safe": "^2.4",
         "webonyx/graphql-php": "^15"
     },
     "require-dev": {
@@ -50,8 +50,8 @@
         "mockery/mockery": "^1.2",
         "phpstan/phpstan": "1.10.18",
         "nunomaduro/larastan": "2.6.2",
-        "orchestra/testbench": "^6.0|^7.0|^8.0",
-        "phpunit/phpunit": "~8.0|^9",
+        "orchestra/testbench": "^7.0|^8.0",
+        "phpunit/phpunit": "^9",
         "thecodingmachine/phpstan-safe-rule": "^1"
     },
     "autoload": {
@@ -69,7 +69,7 @@
         "phpstan-baseline": "phpstan analyse --memory-limit=512M --generate-baseline",
         "lint": "php-cs-fixer fix --diff --dry-run",
         "fix-style": "php-cs-fixer fix",
-        "tests": "phpunit --colors=always --verbose"
+        "tests": "phpunit"
     },
     "extra": {
         "branch-alias": {

tests/Database/EmptyQueryTest.php

@@ -134,7 +134,7 @@ static function (array $result): array {
     /**
      * @return array<mixed>
      */
-    public function dataForEmptyQuery(): array
+    public static function dataForEmptyQuery(): array
     {
         return [
             // completely empty request

tests/TestCase.php

@@ -10,7 +10,6 @@
 use Illuminate\Console\Command;
 use Illuminate\Http\JsonResponse;
 use Orchestra\Testbench\TestCase as BaseTestCase;
-use PHPUnit\Framework\Constraint\RegularExpression;
 use PHPUnit\Framework\ExpectationFailedException;
 use Rebing\GraphQL\GraphQLServiceProvider;
 use Rebing\GraphQL\Support\Facades\GraphQL;
@@ -243,14 +242,6 @@ private function formatSafeTrace(array $trace): string
         );
     }
 
-    /**
-     * @todo Remove this method once we're PHPUnit 9+ only.
-     */
-    public static function assertMatchesRegularExpression(string $pattern, string $string, string $message = ''): void
-    {
-        self::assertThat($string, new RegularExpression($pattern), $message);
-    }
-
     /**
      * @note Maybe can be removed in PHPUnit 10+ if https://github.com/sebastianbergmann/phpunit/pull/5231 gets merged and replaced with `assertObjectHasProperty`. For now uses suggested workaround from https://github.com/sebastianbergmann/phpunit/issues/4601#issuecomment-1418923160
      *

tests/Unit/Console/EnumMakeCommandTest.php

@@ -31,7 +31,7 @@ public function testCommand(
         );
     }
 
-    public function dataForMakeCommand(): array
+    public static function dataForMakeCommand(): array
     {
         return [
             'Example' => [

tests/Unit/Console/ExecutionMiddlewareMakeCommandTest.php

@@ -29,7 +29,7 @@ public function testCommand(
         );
     }
 
-    public function dataForMakeCommand(): array
+    public static function dataForMakeCommand(): array
     {
         return [
             'Example' => [

tests/Unit/Console/InputMakeCommandTest.php

@@ -31,7 +31,7 @@ public function testCommand(
         );
     }
 
-    public function dataForMakeCommand(): array
+    public static function dataForMakeCommand(): array
     {
         return [
             'Example' => [