Merge pull request #1 from carandclassic/laravel-12

bram-pkg · web-flow · commit 8f23b6c2bba9 · 2025-05-14T08:46:35.000+01:00
Laravel 12
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -8,26 +8,26 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.1, 8.2, 8.3 ]
-        laravel: [ 10.* , 11.*]
+        php: [ 8.3, 8.4 ]
+        laravel: [ 11.*, 12.* ]
         dependency-version: [ prefer-stable ]
-        exclude:
-          - laravel: 11.*
-            php: 8.1
+        # exclude:
+        #   - laravel: 11.*
+        #     php: 8.1
         include:
-          - laravel: 10.*
-            testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
+          - laravel: 12.*
+            testbench: 10.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache/files
           key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
@@ -44,10 +44,3 @@ jobs:
 
       - name: Execute tests
         run: vendor/bin/phpunit --coverage-clover=coverage.xml
-
-      - if: github.event_name == 'push'
-        name: Run Codacy Coverage Reporter
-        uses: codacy/codacy-coverage-reporter-action@master
-        with:
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          coverage-reports: coverage.xml
diff --git a/README.md b/README.md
@@ -53,8 +53,8 @@ A convenient way to set up and use localized routes in a Laravel app.
 
 ## ✅ Requirements
 
-- PHP >= 8.1
-- Laravel >= 10
+- PHP >= 8.3
+- Laravel >= 11
 - Composer ^2.3 (for [codezero/composer-preload-files](https://github.com/codezero-be/composer-preload-files))
 
 ## ⬆ Upgrade
@@ -756,7 +756,7 @@ composer test
 
 ## 🔒 Security
 
-If you discover any security related issues, please [e-mail me](mailto:ivan@codezero.be) instead of using the issue tracker.
+If you discover any security-related issues, please [e-mail us](mailto:security@carandclassic.com) instead of using the issue tracker.
 
 ## 📑 Changelog
 
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,6 +1,11 @@
 # Upgrade Guide
 
-## Upgrading To 4.0 From 3.x
+## Upgrading to 5.0 from 4.x
+
+- The minimum PHP version required is now 8.3
+- The minimum Laravel version required is now 11
+
+## Upgrading to 4.0 From 3.x
 
 ### ➡ Minimum Requirements Updated
 
@@ -20,7 +25,7 @@ This is now handled in `bootstrap/app.php`.
 
 If you use Laravel 11, register the middleware in `bootstrap/app.php` as described in the README.
 
-## Upgrading To 3.0 From 2.x
+## Upgrading to 3.0 From 2.x
 
 This upgrade contains a number of small but breaking changes, as well as a huge internal makeover.
 I listed the most important ones below.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,7 @@
 {
-    "name": "codezero/laravel-localized-routes",
+    "name": "carandclassic/laravel-localized-routes",
     "description": "A convenient way to set up, manage and use localized routes in a Laravel app.",
+    "type": "library",
     "keywords": [
         "php",
         "laravel",
@@ -20,20 +21,17 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.3",
+        "carandclassic/laravel-uri-translator": "^3.0",
         "codezero/browser-locale": "^3.0",
         "codezero/composer-preload-files": "^1.0",
-        "codezero/laravel-uri-translator": "^2.0",
         "codezero/php-url-builder": "^1.0",
-        "illuminate/support": "^10.0|^11.0"
+        "illuminate/support": "^11.0|^12.0.1"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.3",
-        "orchestra/testbench": "^8.0|^9.0",
-        "phpunit/phpunit": "^10.5"
-    },
-    "scripts": {
-        "test": "phpunit"
+        "orchestra/testbench": "^8.0|^9.0|^10.0",
+        "phpunit/phpunit": "^10.5|^11.0"
     },
     "autoload": {
         "psr-4": {
@@ -45,6 +43,25 @@
             "CodeZero\\LocalizedRoutes\\Tests\\": "tests"
         }
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "repositories": [
+        {
+            "type": "github",
+            "url": "https://github.com/carandclassic/laravel-uri-translator"
+        }
+    ],
+    "config": {
+        "preferred-install": "dist",
+        "sort-packages": true,
+        "optimize-autoloader": true,
+        "allow-plugins": {
+            "codezero/composer-preload-files": true
+        }
+    },
+    "scripts": {
+        "test": "phpunit"
+    },
     "extra": {
         "laravel": {
             "providers": [
@@ -57,15 +74,5 @@
         "preload-files": [
             "src/helpers.php"
         ]
-    },
-    "config": {
-        "preferred-install": "dist",
-        "sort-packages": true,
-        "optimize-autoloader": true,
-        "allow-plugins": {
-            "codezero/composer-preload-files": true
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         backupGlobals="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-         cacheDirectory=".phpunit.cache"
-         backupStaticProperties="false">
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    backupGlobals="false"
+    bootstrap="vendor/autoload.php"
+    cacheDirectory=".phpunit.cache"
+    colors="true"
+>
     <testsuites>
         <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
+            <directory>tests/Unit</directory>
         </testsuite>
         <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
+            <directory>tests/Feature</directory>
         </testsuite>
     </testsuites>
     <php>
@@ -24,7 +23,7 @@
     </php>
     <source>
         <include>
-            <directory suffix=".php">./src</directory>
+            <directory>src</directory>
         </include>
     </source>
 </phpunit>
diff --git a/tests/Feature/Macros/Route/LocalizedMacroTest.php b/tests/Feature/Macros/Route/LocalizedMacroTest.php
@@ -96,7 +96,7 @@ public function it_registers_routes_in_the_correct_order_without_prefix_for_a_co
 
         $this->assertEquals(
             ['nl', 'nl/{slug}', '/', '{slug}'],
-            $this->getRoutes()->pluck('uri')->toArray()
+            $this->getRoutes()->where('uri', '!=', 'storage/{path}')->pluck('uri')->toArray()
         );
     }
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -5,6 +5,9 @@
 use CodeZero\BrowserLocale\BrowserLocale;
 use CodeZero\LocalizedRoutes\LocalizedRoutesServiceProvider;
 use CodeZero\UriTranslator\UriTranslatorServiceProvider;
+use Illuminate\Config\Repository;
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
@@ -17,27 +20,25 @@
 use Orchestra\Testbench\TestCase as BaseTestCase;
 use PHPUnit\Framework\Assert;
 
-abstract class TestCase extends  BaseTestCase
+abstract class TestCase extends BaseTestCase
 {
-    protected $sessionKey;
-    protected $cookieName;
+    protected string $sessionKey;
+    protected string $cookieName;
 
     /**
-     * Setup the test environment.
+     * Set up the test environment.
      *
      * @return void
      */
     protected function setUp(): void
     {
         parent::setUp();
 
-        Config::set('app.key', Str::random(32));
-
         // Remove any default browser locales
         $this->setBrowserLocales(null);
 
-        $this->sessionKey = Config::get('localized-routes.session_key');
-        $this->cookieName = Config::get('localized-routes.cookie_name');
+        $this->sessionKey = Config::string('localized-routes.session_key');
+        $this->cookieName = Config::string('localized-routes.cookie_name');
 
         TestResponse::macro('assertResponseHasNoView', function () {
             if (isset($this->original) && $this->original instanceof View) {
@@ -48,6 +49,22 @@ protected function setUp(): void
         });
     }
 
+    /**
+     * Define the environment setup for the application.
+     *
+     * @param Application $app
+     *
+     * @return void
+     */
+    protected function defineEnvironment($app): void
+    {
+        $config = $app->make(Repository::class);
+        $config->set([
+            'app.key' => Str::random(32),
+            'filesystems.disks.local.serve' => false,
+        ]);
+    }
+
     /**
      * Skip test if laravel version is lower than the given version.
      *

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function it_registers_routes_in_the_correct_order_without_prefix_for_a_co`
`96`	`96`
`97`	`97`	`$this->assertEquals(`
`98`	`98`	`['nl', 'nl/{slug}', '/', '{slug}'],`
`99`		`- $this->getRoutes()->pluck('uri')->toArray()`
	`99`	`+ $this->getRoutes()->where('uri', '!=', 'storage/{path}')->pluck('uri')->toArray()`
`100`	`100`	`);`
`101`	`101`	`}`
`102`	`102`