Merge pull request #39 from TheDragonCode/4.x

Added Laravel 11 support
TheDragonCode · Mar 13, 2024 · 046a435 · 046a435
2 parents 5ce7781 + 1f2a791
commit 046a435
Show file tree

Hide file tree

Showing 47 changed files with 119 additions and 56 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -9,8 +9,8 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "8.0", "8.1", "8.2" ]
-                laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0" ]
+                php: [ "8.0", "8.1", "8.2", "8.3" ]
+                laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0", "11.0" ]
                 doctrine: [ "2.0", "3.0" ]
                 exclude:
                     -   laravel: "6.0"
@@ -22,6 +22,9 @@ jobs:
                     -   laravel: "6.0"
                         php: "8.2"
 
+                    -   laravel: "6.0"
+                        php: "8.3"
+
                     -   laravel: "7.0"
                         doctrine: "3.0"
 
@@ -31,18 +34,33 @@ jobs:
                     -   laravel: "7.0"
                         php: "8.2"
 
+                    -   laravel: "7.0"
+                        php: "8.3"
+
                     -   laravel: "8.0"
                         doctrine: "2.0"
 
                     -   laravel: "8.0"
                         php: "8.2"
 
+                    -   laravel: "8.0"
+                        php: "8.3"
+
                     -   laravel: "10.0"
                         doctrine: "2.0"
 
                     -   laravel: "10.0"
                         php: "8.0"
 
+                    -   laravel: "11.0"
+                        doctrine: "2.0"
+
+                    -   laravel: "11.0"
+                        php: "8.0"
+
+                    -   laravel: "11.0"
+                        php: "8.1"
+
         name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, Doctrine ${{ matrix.doctrine }}
 
         services:
@@ -67,7 +85,7 @@ jobs:
                 with:
                     php-version: ${{ matrix.php }}
                     extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis, pdo_mysql
-                    coverage: none
+                    coverage: xdebug
 
             -   name: Install dependencies
                 run: composer require --dev laravel/framework:^${{ matrix.laravel }} doctrine/dbal:^${{ matrix.doctrine }}

diff --git a/composer.json b/composer.json
@@ -45,18 +45,18 @@
         "dragon-code/simple-dto": "^2.3",
         "dragon-code/support": "^6.0",
         "fig/http-message-util": "^1.1",
-        "illuminate/console": ">=6.0 <11.0",
-        "illuminate/database": ">=6.0 <11.0",
-        "illuminate/support": ">=6.0 <11.0",
+        "illuminate/console": ">=6.0 <12.0",
+        "illuminate/database": ">=6.0 <12.0",
+        "illuminate/support": ">=6.0 <12.0",
         "lmc/http-constants": "^1.2",
-        "nesbot/carbon": "^1.20 || ^2.0",
-        "psr/http-message": "^1.0.1"
+        "nesbot/carbon": "^1.20 || ^2.0 || ^3.0",
+        "psr/http-message": "^1.0.1 || ^2.0"
     },
     "require-dev": {
         "ext-json": "*",
         "mockery/mockery": "^1.3.1",
-        "orchestra/testbench": ">=4.0 <9.0",
-        "phpunit/phpunit": "^9.6"
+        "orchestra/testbench": ">=4.0 <10.0",
+        "phpunit/phpunit": "^9.6 || ^10.0"
     },
     "conflict": {
         "andrey-helldar/last-modified": "*"

diff --git a/config/last_modified.php b/config/last_modified.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/phpunit.xml b/phpunit.xml
@@ -8,7 +8,7 @@
   ~
   ~ @author Andrey Helldar <helldar@ai-rus.com>
   ~
-  ~ @copyright 2021 Andrey Helldar
+  ~ @copyright 2024 Andrey Helldar
   ~
   ~ @license MIT
   ~
@@ -23,8 +23,8 @@
         bootstrap="vendor/autoload.php"
         colors="true"
         convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
+        convertNoticesToExceptions="false"
+        convertWarningsToExceptions="false"
         processIsolation="false"
         stopOnError="false"
         stopOnFailure="false"

diff --git a/src/Concerns/Cacheable.php b/src/Concerns/Cacheable.php
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ * This file is part of the "dragon-code/last-modified" 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 2024 Andrey Helldar
+ *
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/last-modified
+ */
+
 declare(strict_types=1);
 
 namespace DragonCode\LastModified\Concerns;

diff --git a/src/Concerns/Urlable.php b/src/Concerns/Urlable.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Constants/Field.php b/src/Constants/Field.php
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ * This file is part of the "dragon-code/last-modified" 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 2024 Andrey Helldar
+ *
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/last-modified
+ */
+
 namespace DragonCode\LastModified\Constants;
 
 class Field

diff --git a/src/Facades/Config.php b/src/Facades/Config.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Facades/Url.php b/src/Facades/Url.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Middlewares/CheckLastModified.php b/src/Middlewares/CheckLastModified.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Resources/Item.php b/src/Resources/Item.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Services/Checker.php b/src/Services/Checker.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Services/LastModified.php b/src/Services/LastModified.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Services/Processors/Processor.php b/src/Services/Processors/Processor.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Services/Processors/ToDelete.php b/src/Services/Processors/ToDelete.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Services/Processors/ToUpdate.php b/src/Services/Processors/ToUpdate.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Support/Config.php b/src/Support/Config.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/src/Support/Url.php b/src/Support/Url.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/tests/Concerns/Asserts.php b/tests/Concerns/Asserts.php
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ * This file is part of the "dragon-code/last-modified" 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 2024 Andrey Helldar
+ *
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/last-modified
+ */
+
 declare(strict_types=1);
 
 namespace Tests\Concerns;

diff --git a/tests/Concerns/Fakeable.php b/tests/Concerns/Fakeable.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/tests/Concerns/Requests.php b/tests/Concerns/Requests.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/tests/Concerns/Urlable.php b/tests/Concerns/Urlable.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/tests/WhenDisabled/Middlewares/CheckLastModifiedTest.php b/tests/WhenDisabled/Middlewares/CheckLastModifiedTest.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/tests/WhenDisabled/Resources/ItemTest.php b/tests/WhenDisabled/Resources/ItemTest.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *
@@ -54,7 +54,7 @@ public function testMake()
     public function testWrongUrl()
     {
         $this->expectException(NotValidUrlException::class);
-        $this->expectDeprecationMessage('The "foo" is not a valid URL.');
+        $this->expectExceptionMessage('The "foo" is not a valid URL.');
 
         Item::make(['url' => 'foo']);
     }

diff --git a/tests/WhenDisabled/Services/CheckerTest.php b/tests/WhenDisabled/Services/CheckerTest.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/tests/WhenDisabled/Services/LastModified/ToDeleteTest.php b/tests/WhenDisabled/Services/LastModified/ToDeleteTest.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/tests/WhenDisabled/Services/LastModified/ToUpdateTest.php b/tests/WhenDisabled/Services/LastModified/ToUpdateTest.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *

diff --git a/tests/WhenDisabled/Services/Processors/ToDeleteTest.php b/tests/WhenDisabled/Services/Processors/ToDeleteTest.php
@@ -8,7 +8,7 @@
  *
  * @author Andrey Helldar <helldar@ai-rus.com>
  *
- * @copyright 2021 Andrey Helldar
+ * @copyright 2024 Andrey Helldar
  *
  * @license MIT
  *