Merge branch 'main' into renovate/actions-checkout-7.x

Author: alies-dev

.github/workflows/run-tests.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.5, 8.4, 8.3 ]
+        php: [ 8.5, 8.4 ]
         dependency-version: ['--prefer-lowest', '--prefer-stable']
         laravel: [12.*, 11.*]
         include:

.gitignore

@@ -10,6 +10,8 @@ auth.json
 phpunit.xml
 .phpunit.result.cache
 .phpunit.cache/
+.php-cs-fixer.cache
+/.cache
 
 .DS_Store
 Thumbs.db

composer.json

@@ -11,7 +11,7 @@
         "world"
     ],
     "require": {
-        "php": "^8.3",
+        "php": "^8.4",
         "ext-json": "*",
         "laravel/nova": "^4.20 || ^5.0"
     },
@@ -57,9 +57,13 @@
         }
     },
     "scripts": {
-        "cs": "@cs:fix",
+        "cs": [
+            "@php-cs-fixer",
+            "@cs:fix"
+        ],
         "cs:check": "phpcs -p -s --colors --report-full --report-summary",
-        "cs:fix": "phpcbf -p --colors",
+        "cs:fix": "phpcbf -p --colors --cache=.cache/phpcs",
+        "php-cs-fixer": "php-cs-fixer fix --no-interaction",
         "psalm": "cpx psalm",
         "sa": "@psalm",
         "sa:bl": "cpx psalm --set-baseline=psalm-baseline.xml --long-progress --threads=1",

dist/js/card.js

@@ -1,3 +1,3 @@
 {
-    "/js/card.js": "/js/card.js?id=8ba18f952568b68584172c5bf5465b80"
+    "/js/card.js": "/js/card.js?id=d69b8490dc74afc75b774716af045b55"
 }

dist/mix-manifest.json

@@ -16,7 +16,8 @@
     "devDependencies": {
         "@vue/compiler-sfc": "3.5.38",
         "laravel-mix": "6.0.49",
-        "vue-loader": "16.8.3"
+        "vue-loader": "16.8.3",
+        "webpack": "5.101.3"
     },
     "dependencies": {
         "vue": "^3.0.0"

package.json

@@ -11,7 +11,7 @@ final class CardServiceProvider extends ServiceProvider
     /** Bootstrap any application services. */
     public function boot(): void
     {
-        $this->app->booted(function () {
+        $this->app->booted(function (): void {
             $this->routes();
         });
 

src/CardServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace InteractionDesignFoundation\WorldClockCard\Http\Controllers;
 
+use Carbon\CarbonInterface;
 use Illuminate\Http\Request;
-use Illuminate\Support\Carbon;
 
 final class WorldClockController
 {
@@ -48,9 +48,9 @@ private function prettifyTimezoneName(string $timezone, bool $hideContinents): s
         return $prettifiedTimezone;
     }
 
-    private function isNight(Carbon $dateTime, int $nightStart, int $nightEnd): bool
+    private function isNight(CarbonInterface $dateTime, int $nightStart, int $nightEnd): bool
     {
-        $currentHour = $dateTime->hour;
+        $currentHour = (int) $dateTime->format('G');
 
         return $currentHour >= $nightStart || $currentHour < $nightEnd;
     }

src/Http/Controllers/WorldClockController.php

@@ -29,7 +29,7 @@ public function __construct($component = null)
         ]);
     }
 
-    /** @inheritDoc */
+    #[\Override]
     public function component()
     {
         return 'worldclock-card';