Revert "Laravel 12.x Compatibility (#399)"

.github/workflows/phplint.yml

@@ -24,17 +24,17 @@ jobs:
           coverage: pcov
           extensions: intl, gd, zip, pdo, sqlite, pdo_sqlite, dom, curl, libxml, mbstring, fileinfo, exif, iconv
           ini-values: memory_limit=-1,disable_functions="",pcov.exclude="~(vendor|tests|node_modules)~",pcov.directory="./"
-          php-version: 7.4
+          php-version: 8.4
           tools: composer:v2
 
       - name: Composer Install
         run: |
             composer require --no-interaction --no-update
             composer install
 
-      - name: PHPLint
-        run: |
-            ./vendor/bin/phpcs
+      # - name: PHPLint
+      #   run: |
+      #       ./vendor/bin/phpcs
 
       - name: PHPStan
         run: |

.github/workflows/phptest.yml

@@ -1,16 +1,16 @@
 on:
   - push
 
-name: CI PHP test
+name: "CI PHP test"
 
 jobs:
   test:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        php: [7.4, 8.0, 8.1, 8.2, 8.3]
-        laravel: ['8.*', '11.*', '12.*']
+        php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
+        laravel: ['8.*', '11.*']
         include:
           - php: 8.0
             laravel: 9.*
@@ -26,7 +26,7 @@ jobs:
             laravel: 10.*
           - php: '8.2'
             laravel: 11.*
-          - php: '8.2'
+          - php: '8.4'
             laravel: 12.*
         exclude:
           - laravel: 11.*
@@ -35,12 +35,6 @@ jobs:
             php: 8.0
           - laravel: 11.*
             php: 8.1
-          - laravel: 12.*
-            php: 7.4
-          - laravel: 12.*
-            php: 8.0
-          - laravel: 12.*
-            php: 8.1
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 

composer.json

@@ -16,17 +16,17 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0|^8.1|^8.2|^8.3",
+        "php": "^7.4|^8.0|^8.1|^8.2|^8.3|^8.4",
         "illuminate/contracts": "^8.37|^9.0|^10.0|^11.0|^12.0",
-        "kitloong/laravel-app-logger": "^1.0",
+        "kitloong/laravel-app-logger": "^1.2",
         "spatie/laravel-package-tools": "^1.4.3",
         "ext-json": "*"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^2.12|dev-master",
         "brianium/paratest": "^6.2|^7.4",
         "friendsofphp/php-cs-fixer": "^3.5",
-        "larastan/larastan": "^1.0|^2.0",
+        "larastan/larastan": "^1.0|^2.0|^3.0",
         "nunomaduro/collision": "^5.3|^6.0|^8.0",
         "orchestra/testbench": "^6.15|^7.0|^8.0|^9.0|^10.0",
         "phpunit/phpunit": "^9.3|^10.5|^11.5.3",

src/Doc.php

@@ -7,6 +7,7 @@
 /**
  * @codeCoverageIgnore
  */
+/** @phpstan-ignore-next-line */
 class Doc implements Arrayable
 {
     /**

src/LaravelRequestDocsToOpenApi.php

@@ -145,6 +145,7 @@ protected function makeQueryParameterItem(string $attribute, string $rule): arra
      */
     protected function makePathParameterItem(string $attribute, array $rule): array
     {
+        /** @phpstan-ignore-next-line */
         if (is_array($rule)) {
             $rule = implode('|', $rule);
         }

src/RoutePath.php

@@ -102,6 +102,7 @@ private function getOptionalParameterNames(string $uri): array
     {
         preg_match_all('/\{(\w+?)\?\}/', $uri, $matches);
 
+        /** @phpstan-ignore-next-line */
         return $matches[1] ?? [];
     }
 

tests/Controllers/LaravelRequestDocsControllerTest.php

@@ -19,18 +19,20 @@ class LaravelRequestDocsControllerTest extends TestCase
 {
     public function testApiMain(): void
     {
-        $response = $this->get(route('request-docs.api'))
-            ->assertStatus(Response::HTTP_OK);
+        // skip these tests
+        $this->markTestSkipped('This test is skipped, issues for now with Laravel 12 on PHP 8.4');
+        // $response = $this->get(route('request-docs.api'))
+        //     ->assertStatus(Response::HTTP_OK);
 
-        $expected = (array) json_decode(
-            File::get(base_path('tests/mocks/lrd-response.json')),
-            true,
-        );
+        // $expected = (array) json_decode(
+        //     File::get(base_path('tests/mocks/lrd-response.json')),
+        //     true,
+        // );
 
-        /** {@see \Rakutentech\LaravelRequestDocs\Tests\TestCase::registerRoutes()} */
-        $this->assertCount(29, $response->json());
+        // /** {@see \Rakutentech\LaravelRequestDocs\Tests\TestCase::registerRoutes()} */
+        // $this->assertCount(29, $response->json());
 
-        $this->assertSame($expected, $response->json());
+        // $this->assertSame($expected, $response->json());
     }
 
     public function testApiCanHideMetadata(): void