Merge branch 'main' into dependabot/github_actions/stefanzweifel/git-…

…auto-commit-action-5

# Conflicts:
#	.github/workflows/update-changelog.yml

.github/workflows/dependabot-auto-merge.yml

@@ -13,7 +13,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/fix-php-code-style-issues.yml

@@ -16,7 +16,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Fix PHP code style issues
-        uses: aglipanci/laravel-pint-action@2.2.0
+        uses: aglipanci/laravel-pint-action@2.3.1
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5

.github/workflows/run-tests.yml

@@ -2,27 +2,31 @@ name: run-tests
 
 on:
   push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+    paths:
+      - '**.php'
+      - '.github/workflows/run-tests.yml'
+      - 'phpunit.xml.dist'
+      - 'composer.json'
+      - 'composer.lock'
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 5
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.2, 8.1]
-        laravel: [9.*, 10.*]
-        stability: [prefer-lowest, prefer-stable]
+        php: [8.3, 8.2]
+        laravel: [10.*, 11.*]
+        stability: [prefer-stable]
         include:
-          - laravel: 9.*
-            testbench: 7.*
-            carbon: ^2.63
           - laravel: 10.*
             testbench: 8.*
             carbon: ^2.63
+          - laravel: 11.*
+            testbench: 9.*
+            carbon: ^2.63
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -51,4 +55,4 @@ jobs:
         run: composer show -D
 
       - name: Execute tests
-        run: vendor/bin/pest
+        run: vendor/bin/pest --ci

.gitignore

@@ -9,3 +9,5 @@ phpstan.neon
 testbench.yaml
 vendor
 node_modules
+.phpunit.cache/test-results
+phpunit.xml.dist.bak

composer.json

@@ -18,47 +18,62 @@
     "require": {
         "php": "^8.1",
         "ext-intl": "*",
-        "illuminate/contracts": "^9.0|^10.0",
-        "illuminate/support": "^9.0|^10.0",
+        "illuminate/contracts": "^9.0|^10.0|^11.0",
+        "illuminate/support": "^9.0|^10.0|^11.0",
         "spatie/laravel-package-tools": "^1.14.0",
         "stevebauman/location": "^7.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^6.0",
-        "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^7.0",
-        "pestphp/pest": "^1.21",
-        "pestphp/pest-plugin-laravel": "^1.1",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "nunomaduro/collision": "^6.0|^7.0|^8.0",
+        "orchestra/testbench": "^9.0",
+        "pestphp/pest": "^1.0|^2.0",
+        "pestphp/pest-plugin-laravel": "^1.0|^2.0",
         "spatie/laravel-ray": "^1.26"
     },
     "autoload": {
         "psr-4": {
             "GrantHolle\\Timezone\\": "src"
         },
-        "files": ["src/helpers.php"]
+        "files": [
+            "src/helpers.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
-            "GrantHolle\\Timezone\\Tests\\": "tests"
+            "GrantHolle\\Timezone\\Tests\\": "tests",
+            "Workbench\\App\\": "workbench/app/",
+            "Workbench\\Database\\Factories\\": "workbench/database/factories/",
+            "Workbench\\Database\\Seeders\\": "workbench/database/seeders/"
         }
     },
     "scripts": {
-        "post-autoload-dump": "@php ./vendor/bin/testbench package:discover --ansi",
+        "post-autoload-dump": [
+            "@clear",
+            "@prepare",
+            "@php ./vendor/bin/testbench package:discover --ansi"
+        ],
         "analyse": "vendor/bin/phpstan analyse",
         "test": "vendor/bin/pest",
         "test-coverage": "vendor/bin/pest --coverage",
-        "format": "vendor/bin/pint"
+        "format": "vendor/bin/pint",
+        "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
+        "prepare": "@php vendor/bin/testbench package:discover --ansi",
+        "build": "@php vendor/bin/testbench workbench:build --ansi",
+        "serve": [
+            "Composer\\Config::disableProcessTimeout",
+            "@build",
+            "@php vendor/bin/testbench serve"
+        ],
+        "lint": [
+            "@php vendor/bin/pint",
+            "@php vendor/bin/phpstan analyse"
+        ]
     },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "pestphp/pest-plugin": true,
-            "phpstan/extension-installer": true
+            "pestphp/pest-plugin": true
         }
     },
     "extra": {

phpunit.xml.dist

@@ -1,39 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    executionOrder="random"
-    failOnWarning="true"
-    failOnRisky="true"
-    failOnEmptyTestSuite="true"
-    beStrictAboutOutputDuringTests="true"
-    verbose="true"
->
-    <testsuites>
-        <testsuite name="GrantHolle Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <report>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="build/coverage.txt"/>
-            <clover outputFile="build/logs/clover.xml"/>
-        </report>
-    </coverage>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="GrantHolle Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>

src/Timezone.php

@@ -42,7 +42,7 @@ public function timezones(?string $timezone = null): Collection|string
         return $zones->get($timezone);
     }
 
-    public function toLocal(null|Carbon|CarbonImmutable $date, string $format = null): string|CarbonImmutable
+    public function toLocal(null|Carbon|CarbonImmutable $date, ?string $format = null): string|CarbonImmutable
     {
         $date = $date ?? now();
 
@@ -56,7 +56,7 @@ public function toLocal(null|Carbon|CarbonImmutable $date, string $format = null
         return $converted->format($format);
     }
 
-    public function toLocalFormatted(null|Carbon|CarbonImmutable $date, string $format = null): string
+    public function toLocalFormatted(null|Carbon|CarbonImmutable $date, ?string $format = null): string
     {
         $date = $date ?? now();
 

src/helpers.php

@@ -20,14 +20,14 @@ function timezone(): string
      * Gets a list of all timezones
      * or the formatted name of the given timezone
      */
-    function timezones(string $timezone = null): Collection|string
+    function timezones(?string $timezone = null): Collection|string
     {
         return Timezone::timezones($timezone);
     }
 }
 
 if (!function_exists('to_local_timezone')) {
-    function to_local_timezone(null|Carbon\Carbon|CarbonImmutable $date, string $format = null): string
+    function to_local_timezone(null|Carbon\Carbon|CarbonImmutable $date, ?string $format = null): string
     {
         return Timezone::toLocalFormatted($date, $format);
     }

tests/Drivers/LocalTestDriver.php

@@ -9,7 +9,6 @@
 
 class LocalTestDriver extends Driver
 {
-
     protected function process(Request $request): Fluent|false
     {
         return new Fluent([

tests/LocalConversionTest.php

@@ -5,8 +5,6 @@
 use GrantHolle\Timezone\Facades\Timezone;
 use Illuminate\Support\Facades\Config;
 
-uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
-
 it('can detect user timezone', function (string $timezone) {
     expect(timezone())->toEqual($timezone);
 })->with([

tests/SetTimezoneTest.php

@@ -1,7 +1,5 @@
 <?php
 
-uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
-
 beforeEach(function () {
     test()->user = seedUser(['timezone' => null]);
 });

tests/TestCase.php

@@ -7,9 +7,11 @@
 use GrantHolle\Timezone\TimezoneServiceProvider;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Orchestra\Testbench\Attributes\WithMigration;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Stevebauman\Location\LocationServiceProvider;
 
+#[WithMigration]
 class TestCase extends Orchestra
 {
     public User $user;
@@ -32,8 +34,8 @@ protected function defineDatabaseMigrations(): void
 
     public function getEnvironmentSetUp($app): void
     {
-        config()->set('database.default', 'testing');
-        config()->set('location.driver', LocalTestDriver::class);
+        $app['config']->set('database.default', 'testing');
+        $app['config']->set('location.driver', LocalTestDriver::class);
     }
 
     public function defineRoutes($router)

workbench/app/Providers/WorkbenchServiceProvider.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Workbench\App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class WorkbenchServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     */
+    public function register(): void
+    {
+        //
+    }
+
+    /**
+     * Bootstrap services.
+     */
+    public function boot(): void
+    {
+        //
+    }
+}

workbench/bootstrap/app.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Foundation\Application;
+use Illuminate\Foundation\Configuration\Exceptions;
+use Illuminate\Foundation\Configuration\Middleware;
+
+use function Orchestra\Testbench\default_skeleton_path;
+
+return Application::configure(basePath: $APP_BASE_PATH ?? default_skeleton_path())
+    ->withRouting(
+        web: __DIR__.'/../routes/web.php',
+        commands: __DIR__.'/../routes/console.php',
+    )
+    ->withMiddleware(function (Middleware $middleware) {
+        //
+    })
+    ->withExceptions(function (Exceptions $exceptions) {
+        //
+    })->create();