Laravel 10 support (#525)

* WIP: Laravel 10 support * WIP: Laravel 10 support * fix #497 * Use php8.1 for doceker and phpunit 10 * Update usage of phpunit 10 * Apply fixes from StyleCI * Add to gitignore .phpunit.cache --------- Co-authored-by: StyleCI Bot <[email protected]>
DarkaOnLine · Feb 15, 2023 · 8e61ce6 · 8e61ce6
1 parent 0b1c3f5
commit 8e61ce6
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ composer-extra-assets.lock
 .env
 /tests/storage/api-docs/*
 /tests/storage/logs/*
+.phpunit.cache
 .bowerrc
 bower.json
 package.json

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 #
 # Base install
 #
-FROM amd64/php:8.0-apache as base
+FROM amd64/php:8.1-apache as base
 
 LABEL vendor="L5 Swagger"
 

diff --git a/composer.json b/composer.json
@@ -20,16 +20,16 @@
   ],
   "require": {
     "php": "^7.2 || ^8.0",
-    "laravel/framework": "^9.0 || >=8.40.0 || ^7.0",
-    "zircote/swagger-php": "^3.2 || ^4.0",
+    "laravel/framework": "^10.0 || ^9.0 || >=8.40.0 || ^7.0",
+    "zircote/swagger-php": "^3.2.0 || ^4.0.0",
     "swagger-api/swagger-ui": "^3.0 || ^4.0",
     "symfony/yaml": "^5.0 || ^6.0",
     "ext-json": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5",
+    "phpunit/phpunit": "^10.0 || ^9.5",
     "mockery/mockery": "1.*",
-    "orchestra/testbench": "7.* || ^6.15 || 5.*",
+    "orchestra/testbench": "^8.0 || 7.* || ^6.15 || 5.*",
     "php-coveralls/php-coveralls": "^2.0"
   },
   "autoload": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         stopOnFailure="false"
+<phpunit
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+  bootstrap="vendor/autoload.php"
+  colors="true"
+  stopOnFailure="false"
+  cacheDirectory=".phpunit.cache"
 >
   <coverage>
     <include>

diff --git a/src/Generator.php b/src/Generator.php
@@ -202,10 +202,12 @@ protected function createOpenApiGenerator(): OpenApiGenerator
     {
         $generator = new OpenApiGenerator();
 
-        // OpenApi spec version.
-        $generator->setVersion(
-            $this->scanOptions['open_api_spec_version'] ?? self::OPEN_API_DEFAULT_SPEC_VERSION
-        );
+        // OpenApi spec version - only from zircote/swagger-php 4
+        if (method_exists($generator, 'setVersion')) {
+            $generator->setVersion(
+                $this->scanOptions['open_api_spec_version'] ?? self::OPEN_API_DEFAULT_SPEC_VERSION
+            );
+        }
 
         // Processors.
         $this->setProcessors($generator);

diff --git a/tests/ConfigFactoryTest.php b/tests/ConfigFactoryTest.php
@@ -57,7 +57,7 @@ public function canMergeConfigurationDeep(array $data, array $assert): void
         $this->assertArraySimilar($config, $assert);
     }
 
-    public function configDataProvider(): array
+    public static function configDataProvider(): array
     {
         return [
             [

diff --git a/tests/ConsoleTest.php b/tests/ConsoleTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Artisan;
 use L5Swagger\Exceptions\L5SwaggerException;
@@ -18,6 +19,7 @@ class ConsoleTest extends TestCase
      * @param  string  $artisanCommand
      *
      * @throws L5SwaggerException
+     * @throws FileNotFoundException
      */
     public function canGenerate(string $artisanCommand): void
     {
@@ -38,7 +40,7 @@ public function canGenerate(string $artisanCommand): void
     /**
      * @return iterable
      */
-    public function provideGenerateCommands(): iterable
+    public static function provideGenerateCommands(): iterable
     {
         yield 'default' => [
             'artisanCommand' => 'l5-swagger:generate',

diff --git a/tests/SecurityDefinitionsTest.php b/tests/SecurityDefinitionsTest.php
@@ -97,7 +97,7 @@ public function canGenerateApiJsonFileWithSecurityDefinition(
     /**
      * @return iterable
      */
-    public function provideConfigAndSchemes(): iterable
+    public static function provideConfigAndSchemes(): iterable
     {
         $securitySchemes = [
             'new_api_key_securitye' => [