fix namespace

Astrotomic · Apr 17, 2024 · 0916bce · 0916bce
1 parent 454fe45
commit 0916bce
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 40 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2']
+        php: ['8.1', '8.2', '8.3']
         laravel: ['10.*', '11.*']
         dependency-version: [prefer-stable]
         os: [ubuntu-latest]
@@ -27,16 +27,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Cache dependencies
-        uses: actions/cache@v4
-        with:
-          path: ~/.composer/cache/files
-          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-          restore-keys: |
-            dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-
-            dependencies-laravel-${{ matrix.laravel }}-php-
-            dependencies-laravel-
-
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

diff --git a/README.md b/README.md
@@ -97,7 +97,8 @@ If you discover any security related issues, please check [SECURITY](https://git
 ## Versions
 
 | Package             | Laravel                       | PHP       |
-| :------------------ | :---------------------------- | :-------- |
+|:--------------------|:------------------------------|:----------|
+| **v11.13 - v11.13** | `10.* / 11.*`                 | `^8.1`    |
 | **v11.12 - v11.12** | `8.* / 9.* / 10.*`            | `^8.0`    |
 | **v11.10 - v11.11** | `8.* / 9.*`                   | `^8.0`    |
 | **v11.6 - v11.9**   | `5.8.* / 6.* / 7.* / 8.*`     | `>=7.2`   |

diff --git a/composer.json b/composer.json
@@ -51,7 +51,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Astrotomic\\Translatable\\Tests\\": "tests/"
+            "Tests\\": "tests/"
         }
     },
     "config": {

diff --git a/tests/Eloquent/Country.php b/tests/Eloquent/Country.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests\Eloquent;
+namespace Tests\Eloquent;
 
 use Astrotomic\Translatable\Contracts\Translatable as TranslatableContract;
 use Astrotomic\Translatable\Translatable;

diff --git a/tests/Eloquent/CountryStrict.php b/tests/Eloquent/CountryStrict.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests\Eloquent;
+namespace Tests\Eloquent;
 
 use Astrotomic\Translatable\Contracts\Translatable as TranslatableContract;
 use Astrotomic\Translatable\Translatable;
@@ -19,7 +19,7 @@ class CountryStrict extends Eloquent implements TranslatableContract
 
     /**
      * Here we set a custom model for translation.
-     * The convention would be Astrotomic\Translatable\Tests\Models\CountryStrictTranslation.
+     * The convention would be Tests\Models\CountryStrictTranslation.
      *
      * @var string Class containing the translation
      */

diff --git a/tests/Eloquent/CountryTranslation.php b/tests/Eloquent/CountryTranslation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests\Eloquent;
+namespace Tests\Eloquent;
 
 use Illuminate\Database\Eloquent\Model as Eloquent;
 

diff --git a/tests/Eloquent/Person.php b/tests/Eloquent/Person.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests\Eloquent;
+namespace Tests\Eloquent;
 
 use Astrotomic\Translatable\Contracts\Translatable as TranslatableContract;
 use Astrotomic\Translatable\Translatable;

diff --git a/tests/Eloquent/PersonTranslation.php b/tests/Eloquent/PersonTranslation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests\Eloquent;
+namespace Tests\Eloquent;
 
 use Illuminate\Database\Eloquent\Model as Eloquent;
 

diff --git a/tests/Eloquent/StrictTranslation.php b/tests/Eloquent/StrictTranslation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests\Eloquent;
+namespace Tests\Eloquent;
 
 use Illuminate\Database\Eloquent\Model as Eloquent;
 

diff --git a/tests/Eloquent/Vegetable.php b/tests/Eloquent/Vegetable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests\Eloquent;
+namespace Tests\Eloquent;
 
 use Astrotomic\Translatable\Contracts\Translatable as TranslatableContract;
 use Astrotomic\Translatable\Translatable;

diff --git a/tests/Eloquent/VegetableTranslation.php b/tests/Eloquent/VegetableTranslation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests\Eloquent;
+namespace Tests\Eloquent;
 
 use Illuminate\Database\Eloquent\Model as Eloquent;
 

diff --git a/tests/EloquentOverrideTest.php b/tests/EloquentOverrideTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests;
+namespace Tests;
 
-use Astrotomic\Translatable\Tests\Eloquent\Vegetable;
+use Tests\Eloquent\Vegetable;
 
 final class EloquentOverrideTest extends TestCase
 {

diff --git a/tests/LocalesTest.php b/tests/LocalesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests;
+namespace Tests;
 
 use Astrotomic\Translatable\Exception\LocalesNotDefinedException;
 use Astrotomic\Translatable\Locales;

diff --git a/tests/ScopesTest.php b/tests/ScopesTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests;
+namespace Tests;
 
-use Astrotomic\Translatable\Tests\Eloquent\Country;
-use Astrotomic\Translatable\Tests\Eloquent\Vegetable;
+use Tests\Eloquent\Country;
+use Tests\Eloquent\Vegetable;
 
 final class ScopesTest extends TestCase
 {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests;
+namespace Tests;
 
 use Astrotomic\Translatable\TranslatableServiceProvider;
 use Illuminate\Database\Schema\Blueprint;

diff --git a/tests/TranslatableTest.php b/tests/TranslatableTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests;
+namespace Tests;
 
 use Astrotomic\Translatable\Locales;
-use Astrotomic\Translatable\Tests\Eloquent\Country;
-use Astrotomic\Translatable\Tests\Eloquent\CountryStrict;
-use Astrotomic\Translatable\Tests\Eloquent\CountryTranslation;
-use Astrotomic\Translatable\Tests\Eloquent\Person;
-use Astrotomic\Translatable\Tests\Eloquent\Vegetable;
-use Astrotomic\Translatable\Tests\Eloquent\VegetableTranslation;
+use Tests\Eloquent\Country;
+use Tests\Eloquent\CountryStrict;
+use Tests\Eloquent\CountryTranslation;
+use Tests\Eloquent\Person;
+use Tests\Eloquent\Vegetable;
+use Tests\Eloquent\VegetableTranslation;
 use Illuminate\Database\Eloquent\MassAssignmentException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\App;
@@ -42,7 +42,7 @@ public function it_finds_the_translation_class_with_suffix_set(): void
         $this->app->make('config')->set('translatable.translation_suffix', 'Trans');
 
         self::assertEquals(
-            'Astrotomic\Translatable\Tests\Eloquent\VegetableTrans',
+            'Tests\Eloquent\VegetableTrans',
             (new Vegetable())->getTranslationModelName()
         );
     }

diff --git a/tests/ValidationTest.php b/tests/ValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Astrotomic\Translatable\Tests;
+namespace Tests;
 
 use Astrotomic\Translatable\Locales;
 use Astrotomic\Translatable\Validation\RuleFactory;

diff --git a/tests/factories/CountryFactory.php b/tests/factories/CountryFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-use Astrotomic\Translatable\Tests\Eloquent\Country;
+use Tests\Eloquent\Country;
 use Faker\Generator as Faker;
 use Illuminate\Database\Eloquent\Factory as ModelFactory;
 

diff --git a/tests/factories/VegetableFactory.php b/tests/factories/VegetableFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-use Astrotomic\Translatable\Tests\Eloquent\Vegetable;
+use Tests\Eloquent\Vegetable;
 use Faker\Generator as Faker;
 use Illuminate\Database\Eloquent\Factory as ModelFactory;