Merge pull request #73 from TheDragonCode/3.x

Added Laravel 11 support
TheDragonCode · Mar 13, 2024 · c0c0555 · c0c0555
2 parents a0349ee + 4495ad7
commit c0c0555
Show file tree

Hide file tree

Showing 25 changed files with 102 additions and 127 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -9,27 +9,36 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "7.3", "7.4", "8.0", "8.1", "8.2" ]
-                laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0" ]
+                php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" ]
+                laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0", "11.0" ]
                 exclude:
                     -   laravel: "6.0"
                         php: "8.1"
 
                     -   laravel: "6.0"
                         php: "8.2"
 
+                    -   laravel: "6.0"
+                        php: "8.3"
+
                     -   laravel: "7.0"
                         php: "8.1"
 
                     -   laravel: "7.0"
                         php: "8.2"
 
+                    -   laravel: "7.0"
+                        php: "8.3"
+
                     -   laravel: "9.0"
                         php: "7.3"
 
                     -   laravel: "9.0"
                         php: "7.4"
 
+                    -   laravel: "9.0"
+                        php: "8.3"
+
                     -   laravel: "10.0"
                         php: "7.3"
 
@@ -39,6 +48,18 @@ jobs:
                     -   laravel: "10.0"
                         php: "8.0"
 
+                    -   laravel: "11.0"
+                        php: "7.3"
+
+                    -   laravel: "11.0"
+                        php: "7.4"
+
+                    -   laravel: "11.0"
+                        php: "8.0"
+
+                    -   laravel: "11.0"
+                        php: "8.1"
+
         name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 
         steps:
@@ -50,7 +71,7 @@ jobs:
                 with:
                     php-version: ${{ matrix.php }}
                     extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
+                    coverage: xdebug
 
             -   name: Install dependencies
                 run: composer require --dev laravel/framework:^${{ matrix.laravel }}

diff --git a/composer.json b/composer.json
@@ -48,16 +48,16 @@
         "dragon-code/laravel-routes-core": "^4.1 || ^5.0",
         "dragon-code/laravel-support": "^3.3",
         "dragon-code/support": "^5.6 || ^6.1",
-        "illuminate/contracts": ">=6.0 <11.0",
-        "illuminate/http": ">=6.0 <11.0",
-        "illuminate/routing": ">=6.0 <11.0",
-        "illuminate/support": ">=6.0 <11.0",
-        "illuminate/view": ">=6.0 <11.0"
+        "illuminate/contracts": ">=6.0 <12.0",
+        "illuminate/http": ">=6.0 <12.0",
+        "illuminate/routing": ">=6.0 <12.0",
+        "illuminate/support": ">=6.0 <12.0",
+        "illuminate/view": ">=6.0 <12.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": ">=4.0 <9.0",
-        "phpunit/phpunit": "^8.0 || ^9.6"
+        "orchestra/testbench": ">=4.0 <10.0",
+        "phpunit/phpunit": "^8.0 || ^9.6 || ^10.0"
     },
     "conflict": {
         "garygreen/pretty-routes": "*"

diff --git a/config/pretty-routes.php b/config/pretty-routes.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/phpunit.php b/phpunit.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--~
   ~ This file is part of the "dragon-code/pretty-routes" project.
   ~
   ~ For the full copyright and license information, please view the LICENSE
   ~ file that was distributed with this source code.
   ~
-  ~ @author Andrey Helldar <helldar@ai-rus.com>
-  ~
-  ~ @copyright 2021 Andrey Helldar
-  ~
+  ~ @author Andrey Helldar <helldar@dragon-code.pro>
+  ~ @copyright 2024 Andrey Helldar
   ~ @license MIT
   ~
   ~ @see https://github.com/TheDragonCode/pretty-routes
@@ -21,8 +19,8 @@
         bootstrap="phpunit.php"
         colors="true"
         convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
+        convertNoticesToExceptions="false"
+        convertWarningsToExceptions="false"
         processIsolation="false"
         stopOnError="false"
         stopOnFailure="false"

diff --git a/resources/lang/en/info.php b/resources/lang/en/info.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/resources/lang/es/info.php b/resources/lang/es/info.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/resources/lang/fr/info.php b/resources/lang/fr/info.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/resources/lang/ru/info.php b/resources/lang/ru/info.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/resources/lang/tr/info.php b/resources/lang/tr/info.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/routes/laravel.php b/routes/laravel.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/routes/lumen.php b/routes/lumen.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/src/Facades/Cache.php b/src/Facades/Cache.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/src/Facades/Trans.php b/src/Facades/Trans.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/src/Http/PrettyRoutesController.php b/src/Http/PrettyRoutesController.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/src/Support/Cache.php b/src/Support/Cache.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes

diff --git a/src/Support/Config.php b/src/Support/Config.php
@@ -1,14 +1,12 @@
 <?php
-/*
+/**
  * This file is part of the "dragon-code/pretty-routes" project.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author Andrey Helldar <helldar@ai-rus.com>
- *
- * @copyright 2021 Andrey Helldar
- *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
  * @license MIT
  *
  * @see https://github.com/TheDragonCode/pretty-routes