Merge pull request #92 from TheDragonCode/4.x

andrey-helldar · web-flow · commit 33aad6101fe0 · 2025-02-20T02:58:03.000+03:00
Drop Laravel 6-10 and PHP 8.0-8.1 support
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -9,38 +9,8 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "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: "8.3"
-
-                    -   laravel: "10.0"
-                        php: "8.0"
-
-                    -   laravel: "11.0"
-                        php: "8.0"
-
-                    -   laravel: "11.0"
-                        php: "8.1"
+                php: [ "8.2", "8.3", "8.4" ]
+                laravel: [ "11.0" ]
 
         name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -4,7 +4,11 @@
 
 ### PHP 8.2 Required
 
-Laravel Cache now required PHP 8.2.0 or greater.
+`Laravel Cache` now required PHP 8.2.0 or greater.
+
+### Laravel 11+ Required
+
+`Laravel Cache` now required Laravel Framework 11 or greater.
 
 ### Composer Dependencies
 
diff --git a/composer.json b/composer.json
@@ -33,15 +33,15 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.2",
         "dragon-code/support": "^6.11.3",
-        "illuminate/contracts": "^10.0||^11.0",
-        "illuminate/support": ">=6.0 <12.0"
+        "illuminate/contracts": "^11.0",
+        "illuminate/support": "^11.0"
     },
     "require-dev": {
         "nesbot/carbon": "^2.62",
-        "orchestra/testbench": ">=4.0 <10.0",
-        "phpunit/phpunit": "^8.5 || ^9.6 || ^10.0"
+        "orchestra/testbench": "^8.0 || ^9.0",
+        "phpunit/phpunit": "^10.0"
     },
     "conflict": {
         "andrey-helldar/cache": "*"
@@ -50,12 +50,12 @@
     "prefer-stable": true,
     "autoload": {
         "psr-4": {
-            "DragonCode\\Cache\\": "src"
+            "DragonCode\\Cache\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests"
+            "Tests\\": "tests/"
         }
     },
     "config": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,37 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        backupGlobals="false"
-        backupStaticAttributes="false"
-        bootstrap="vendor/autoload.php"
-        colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="false"
-        convertWarningsToExceptions="false"
-        processIsolation="false"
-        stopOnError="false"
-        stopOnFailure="false"
-        verbose="true"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         cacheResult="false"
 >
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
+    <coverage>
         <report>
-            <clover outputFile="build/logs/clover.xml"/>
-            <html outputDirectory="build/logs/coverage"/>
-            <text outputFile="build/logs/coverage.txt"/>
+            <clover outputFile="build/logs/clover.xml" />
+            <html outputDirectory="build/logs/coverage" />
+            <text outputFile="build/logs/coverage.txt" />
         </report>
     </coverage>
     <php>
-        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-        <env name="REDIS_HOST" value="127.0.0.1"/>
-        <env name="REDIS_PORT" value="6379"/>
+        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF" />
+        <env name="REDIS_HOST" value="127.0.0.1" />
+        <env name="REDIS_PORT" value="6379" />
     </php>
     <testsuites>
         <testsuite name="Test Suite">
-            <directory suffix="Test.php">./tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Support/Ttl.php b/src/Support/Ttl.php
@@ -32,7 +32,7 @@ public function fromSeconds($seconds): int
 
     public function fromDateTime(DateTimeInterface $date_time): int
     {
-        $seconds = Carbon::now()->diffInRealSeconds($date_time);
+        $seconds = Carbon::now()->diffInSeconds($date_time);
 
         return $this->correct($seconds);
     }
diff --git a/tests/Support/TtlTest.php b/tests/Support/TtlTest.php
@@ -18,39 +18,39 @@
 
 class TtlTest extends TestCase
 {
-    public function testString()
+    public function testString(): void
     {
         $this->assertSame(600, Ttl::fromMinutes('10'));
         $this->assertSame(10, Ttl::fromSeconds('10'));
     }
 
-    public function testInteger()
+    public function testInteger(): void
     {
         $this->assertSame(600, Ttl::fromMinutes(10));
         $this->assertSame(10, Ttl::fromSeconds(10));
     }
 
-    public function testCarbon()
+    public function testCarbon(): void
     {
         $ttl = Carbon::now()->addDay();
 
-        $expected = Carbon::now()->diffInRealSeconds($ttl);
+        $expected = (int) Carbon::now()->diffInSeconds($ttl);
 
         $this->assertSame($expected, Ttl::fromMinutes($ttl));
         $this->assertSame($expected, Ttl::fromSeconds($ttl));
     }
 
-    public function testDateTimeInterface()
+    public function testDateTimeInterface(): void
     {
         $ttl = new DateTime('tomorrow');
 
-        $expected = Carbon::now()->diffInRealSeconds($ttl);
+        $expected = (int) Carbon::now()->diffInSeconds($ttl);
 
         $this->assertSame($expected, Ttl::fromMinutes($ttl));
         $this->assertSame($expected, Ttl::fromSeconds($ttl));
     }
 
-    public function testClosure()
+    public function testClosure(): void
     {
         $ttl = function () {
             return $this->ttl;
@@ -60,7 +60,7 @@ public function testClosure()
         $this->assertSame(60, Ttl::fromSeconds($ttl));
     }
 
-    public function testObjectAsString()
+    public function testObjectAsString(): void
     {
         $this->assertSame(18000, Ttl::fromMinutes(CustomObject::class));
         $this->assertSame(300, Ttl::fromSeconds(CustomObject::class));
@@ -78,7 +78,7 @@ public function testObjectAsString()
         $this->assertSame(3600, Ttl::fromSeconds('unknown'));
     }
 
-    public function testObjectAsObject()
+    public function testObjectAsObject(): void
     {
         $this->assertSame(18000, Ttl::fromMinutes(new CustomObject()));
         $this->assertSame(300, Ttl::fromSeconds(new CustomObject()));
@@ -95,11 +95,11 @@ public function testObjectAsObject()
 
     public function testInstances(): void
     {
-        $this->assertSame(3600, Ttl::fromMinutes((new AsCarbon('foo'))->cacheTtl()));
-        $this->assertSame(7200, Ttl::fromSeconds((new AsCarbon('bar'))->cacheTtl()));
+        $this->assertSame(3599, Ttl::fromMinutes((new AsCarbon('foo'))->cacheTtl()));
+        $this->assertSame(7199, Ttl::fromSeconds((new AsCarbon('bar'))->cacheTtl()));
 
-        $this->assertSame(3600, Ttl::fromMinutes((new AsDateTime('foo'))->cacheTtl()));
-        $this->assertSame(7200, Ttl::fromSeconds((new AsDateTime('bar'))->cacheTtl()));
+        $this->assertSame(3599, Ttl::fromMinutes((new AsDateTime('foo'))->cacheTtl()));
+        $this->assertSame(7199, Ttl::fromSeconds((new AsDateTime('bar'))->cacheTtl()));
 
         $this->assertSame(600, Ttl::fromMinutes((new AsInteger('foo'))->cacheTtl()));
         $this->assertSame(20, Ttl::fromSeconds((new AsInteger('bar'))->cacheTtl()));

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function fromSeconds($seconds): int`
`32`	`32`
`33`	`33`	`public function fromDateTime(DateTimeInterface $date_time): int`
`34`	`34`	`{`
`35`		`- $seconds = Carbon::now()->diffInRealSeconds($date_time);`
	`35`	`+ $seconds = Carbon::now()->diffInSeconds($date_time);`
`36`	`36`
`37`	`37`	`return $this->correct($seconds);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,39 +18,39 @@`
`18`	`18`
`19`	`19`	`class TtlTest extends TestCase`
`20`	`20`	`{`
`21`		`- public function testString()`
	`21`	`+ public function testString(): void`
`22`	`22`	`{`
`23`	`23`	`$this->assertSame(600, Ttl::fromMinutes('10'));`
`24`	`24`	`$this->assertSame(10, Ttl::fromSeconds('10'));`
`25`	`25`	`}`
`26`	`26`
`27`		`- public function testInteger()`
	`27`	`+ public function testInteger(): void`
`28`	`28`	`{`
`29`	`29`	`$this->assertSame(600, Ttl::fromMinutes(10));`
`30`	`30`	`$this->assertSame(10, Ttl::fromSeconds(10));`
`31`	`31`	`}`
`32`	`32`
`33`		`- public function testCarbon()`
	`33`	`+ public function testCarbon(): void`
`34`	`34`	`{`
`35`	`35`	`$ttl = Carbon::now()->addDay();`
`36`	`36`
`37`		`- $expected = Carbon::now()->diffInRealSeconds($ttl);`
	`37`	`+ $expected = (int) Carbon::now()->diffInSeconds($ttl);`
`38`	`38`
`39`	`39`	`$this->assertSame($expected, Ttl::fromMinutes($ttl));`
`40`	`40`	`$this->assertSame($expected, Ttl::fromSeconds($ttl));`
`41`	`41`	`}`
`42`	`42`
`43`		`- public function testDateTimeInterface()`
	`43`	`+ public function testDateTimeInterface(): void`
`44`	`44`	`{`
`45`	`45`	`$ttl = new DateTime('tomorrow');`
`46`	`46`
`47`		`- $expected = Carbon::now()->diffInRealSeconds($ttl);`
	`47`	`+ $expected = (int) Carbon::now()->diffInSeconds($ttl);`
`48`	`48`
`49`	`49`	`$this->assertSame($expected, Ttl::fromMinutes($ttl));`
`50`	`50`	`$this->assertSame($expected, Ttl::fromSeconds($ttl));`
`51`	`51`	`}`
`52`	`52`
`53`		`- public function testClosure()`
	`53`	`+ public function testClosure(): void`
`54`	`54`	`{`
`55`	`55`	`$ttl = function () {`
`56`	`56`	`return $this->ttl;`
`@@ -60,7 +60,7 @@ public function testClosure()`
`60`	`60`	`$this->assertSame(60, Ttl::fromSeconds($ttl));`
`61`	`61`	`}`
`62`	`62`
`63`		`- public function testObjectAsString()`
	`63`	`+ public function testObjectAsString(): void`
`64`	`64`	`{`
`65`	`65`	`$this->assertSame(18000, Ttl::fromMinutes(CustomObject::class));`
`66`	`66`	`$this->assertSame(300, Ttl::fromSeconds(CustomObject::class));`
`@@ -78,7 +78,7 @@ public function testObjectAsString()`
`78`	`78`	`$this->assertSame(3600, Ttl::fromSeconds('unknown'));`
`79`	`79`	`}`
`80`	`80`
`81`		`- public function testObjectAsObject()`
	`81`	`+ public function testObjectAsObject(): void`
`82`	`82`	`{`
`83`	`83`	`$this->assertSame(18000, Ttl::fromMinutes(new CustomObject()));`
`84`	`84`	`$this->assertSame(300, Ttl::fromSeconds(new CustomObject()));`
`@@ -95,11 +95,11 @@ public function testObjectAsObject()`
`95`	`95`
`96`	`96`	`public function testInstances(): void`
`97`	`97`	`{`
`98`		`- $this->assertSame(3600, Ttl::fromMinutes((new AsCarbon('foo'))->cacheTtl()));`
`99`		`- $this->assertSame(7200, Ttl::fromSeconds((new AsCarbon('bar'))->cacheTtl()));`
	`98`	`+ $this->assertSame(3599, Ttl::fromMinutes((new AsCarbon('foo'))->cacheTtl()));`
	`99`	`+ $this->assertSame(7199, Ttl::fromSeconds((new AsCarbon('bar'))->cacheTtl()));`
`100`	`100`
`101`		`- $this->assertSame(3600, Ttl::fromMinutes((new AsDateTime('foo'))->cacheTtl()));`
`102`		`- $this->assertSame(7200, Ttl::fromSeconds((new AsDateTime('bar'))->cacheTtl()));`
	`101`	`+ $this->assertSame(3599, Ttl::fromMinutes((new AsDateTime('foo'))->cacheTtl()));`
	`102`	`+ $this->assertSame(7199, Ttl::fromSeconds((new AsDateTime('bar'))->cacheTtl()));`
`103`	`103`
`104`	`104`	`$this->assertSame(600, Ttl::fromMinutes((new AsInteger('foo'))->cacheTtl()));`
`105`	`105`	`$this->assertSame(20, Ttl::fromSeconds((new AsInteger('bar'))->cacheTtl()));`