Merge pull request #36 from Laravel-Lang/1.x

Added Laravel 10 compatibility

.github/workflows/tests.yml

@@ -18,7 +18,7 @@ jobs:
             fail-fast: true
             matrix:
                 php: [ "8.2", "8.3" ]
-                laravel: [ "11.0" ]
+                laravel: [ "10.0", "11.0" ]
 
         name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 

composer.json

@@ -39,17 +39,17 @@
         "php": "^8.1",
         "composer/class-map-generator": "^1.3",
         "dragon-code/support": "^6.13",
-        "illuminate/database": "^11.4",
-        "illuminate/support": "^11.4",
+        "illuminate/database": "^10.0 || ^11.0",
+        "illuminate/support": "^10.0 || ^11.0",
         "laravel-lang/config": "^1.6",
-        "laravel-lang/locales": "^2.9.1",
+        "laravel-lang/locales": "^2.9.2",
         "laravel/prompts": "^0.1.24"
     },
     "require-dev": {
-        "orchestra/testbench": "^9.1",
+        "orchestra/testbench": "^8.0 || ^9.0",
         "pestphp/pest": "^2.34",
         "pestphp/pest-plugin-laravel": "^2.4",
-        "symfony/var-dumper": "^7.0"
+        "symfony/var-dumper": "^6.0 || ^7.0"
     },
     "minimum-stability": "stable",
     "prefer-stable": true,

src/Generators/ModelGenerator.php

@@ -21,7 +21,7 @@ class ModelGenerator extends Generator
 
     protected string $casts = '\'%s\' => TrimCast::class,';
 
-    protected int $castsPad = 12;
+    protected int $castsPad = 8;
 
     protected function finish(string $path): void
     {

stubs/model.stub

@@ -14,10 +14,7 @@ class {{model}}{{suffix}} extends Translation
 {{fillable}}
     ];
 
-    protected function casts(): array
-    {
-        return [
+    protected $casts = [
 {{casts}}
-        ];
-    }
+    ];
 }

testbench.yaml

@@ -1,9 +1,9 @@
 laravel: ./workbench
 providers:
-    - App\Providers\AppServiceProvider
     - LaravelLang\Config\ServiceProvider
     - LaravelLang\Locales\ServiceProvider
     - LaravelLang\Models\ServiceProvider
+    - App\Providers\AppServiceProvider
 workbench:
     welcome: false
     install: false

tests/Pest.php

@@ -10,6 +10,8 @@
 uses(Tests\TestCase::class, RefreshDatabase::class, WithWorkbench::class)
     ->compact()
     ->beforeEach(function () {
+        Directory::ensureDirectory(database_path());
+
         Directory::ensureDirectory(lang_path(FakeValue::LocaleMain));
         Directory::ensureDirectory(lang_path(FakeValue::LocaleFallback));
         Directory::ensureDirectory(lang_path(FakeValue::LocaleCustom));

tests/TestCase.php

@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use App\Foundation\Application;
 use Illuminate\Config\Repository;
 use Illuminate\Support\Facades\ParallelTesting;
 use LaravelLang\Config\Enums\Name;
@@ -10,6 +11,11 @@
 
 abstract class TestCase extends BaseTestCase
 {
+    protected function resolveApplication(): Application
+    {
+        return new Application($this->getBasePath());
+    }
+
     protected function defineEnvironment($app): void
     {
         tap($app['config'], function (Repository $config) {

tests/Unit/Console/ModelTest.php

@@ -53,7 +53,7 @@
         ->implode('');
 
     $castsMatches = collect(['title', 'description'])
-        ->map(fn (string $column) => sprintf('(\s{12}\'%s\'\s=>\sTrimCast::class,\r?\n?)', $column))
+        ->map(fn (string $column) => sprintf('(\s{8}\'%s\'\s=>\sTrimCast::class,\r?\n?)', $column))
         ->implode('');
 
     expect(file_get_contents($model))
@@ -62,7 +62,7 @@
         ->toMatch(sprintf('/protected\s\$fillable\s=\s\[\r?\n?%s\s+];/', $fillableMatches))
         ->toMatch(
             sprintf(
-                '/\s{4}protected\s+function\s+casts\(\):\sarray\r?\n?\s{4}\{\r?\n?\s{8}return\s\[\r?\n?%s\s{8}\];\r?\n?\s{4}\}/',
+                '/\s{4}protected\s+\$casts\s+=\s+\[\r?\n?%s\r?\n?\s{4}\]/',
                 $castsMatches
             )
         );

workbench/app/Models/TestModelTranslation.php

@@ -15,11 +15,8 @@ class TestModelTranslation extends Translation
         'description',
     ];
 
-    protected function casts(): array
-    {
-        return [
-            'title'       => TrimCast::class,
-            'description' => TrimCast::class,
-        ];
-    }
+    protected $casts = [
+        'title'       => TrimCast::class,
+        'description' => TrimCast::class,
+    ];
 }

workbench/bootstrap/cache/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore