Merge pull request #404 from Astrotomic/pr-395

Pr 395
Astrotomic · Apr 17, 2024 · 990e2c1 · 990e2c1
2 parents 00433e7 + e2e364a
commit 990e2c1
Show file tree

Hide file tree

Showing 17 changed files with 232 additions and 177 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,6 +5,6 @@
 /.gitattributes            export-ignore
 /.gitignore                export-ignore
 /.gitbook.yaml             export-ignore
-/.php_cs                   export-ignore
 /.styleci.yml              export-ignore
 /.phpunit.xml.dist         export-ignore
+/pint.json                 export-ignore
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -13,13 +13,32 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
-        laravel: ['10.*', '11.*']
+        php: [8.0, 8.1, 8.2, 8.3]
+        laravel: [8.*, 9.*, 10.*, 11.*]
         dependency-version: [prefer-stable]
         os: [ubuntu-latest]
+        include:
+          - laravel: '8.*'
+            phpunit: '9.*'
+          - laravel: '9.*'
+            phpunit: '9.*'
+          - laravel: '10.*'
+            phpunit: '10.*'
+          - laravel: '11.*'
+            phpunit: '10.*'
         exclude:
-          - laravel: 11.*
-            php: 8.1
+          - php: '8.0'
+            laravel: '10.*'
+          - php: '8.0'
+            laravel: '11.*'
+          - php: '8.2'
+            laravel: '8.*'
+          - php: '8.3'
+            laravel: '8.*'
+          - php: '8.3'
+            laravel: '9.*'
+          - php: '8.1'
+            laravel: '11.*'
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
@@ -38,6 +57,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
+          composer require "phpunit/phpunit:${{ matrix.phpunit }}" --dev --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 /vendor/
 /composer.lock
 /coverage/
-/.phpunit.result.cache
+/.phpunit.cache
 /build/
 /coverage.clover
diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ If you discover any security related issues, please check [SECURITY](https://git
 
 | Package             | Laravel                       | PHP       |
 | :------------------ | :---------------------------- | :-------- |
-| **v11.13 - v11.13** | `10.* / 11.*`                 | `^8.1`    |
+| **v11.13 - v11.13** | `8.* / 9.* / 10.*` / `11.*`   | `^8.0`    |
 | **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
@@ -30,17 +30,17 @@
         "docs": "https://docs.astrotomic.info/laravel-translatable"
     },
     "require": {
-        "php": "^8.1",
-        "illuminate/contracts": "^10.0 || ^11.0",
-        "illuminate/database": "^10.0 || ^11.0",
-        "illuminate/support": "^10.0 || ^11.0"
+        "php": "^8.0",
+        "illuminate/contracts": "^8.0 || ^9.0 || ^10.0 || ^11.0",
+        "illuminate/database": "^8.0 || ^9.0 || ^10.0 || ^11.0",
+        "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0"
     },
     "require-dev": {
         "laravel/legacy-factories": "^1.0.4",
-        "laravel/pint": "^1.15",
+        "laravel/pint": "^1.0",
         "mockery/mockery": "^1.3.3",
-        "orchestra/testbench": "^8.0 || ^9.0",
-        "phpunit/phpunit": "^10.5"
+        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^10.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

diff --git a/docs/README.md b/docs/README.md
@@ -2,7 +2,7 @@
 
 [![Latest Version](http://img.shields.io/packagist/v/astrotomic/laravel-translatable.svg?label=Release&style=for-the-badge)](https://packagist.org/packages/astrotomic/laravel-translatable) [![MIT License](https://img.shields.io/github/license/Astrotomic/laravel-translatable.svg?label=License&color=blue&style=for-the-badge)](https://github.com/Astrotomic/laravel-translatable/blob/master/LICENSE) [![Offset Earth](https://img.shields.io/badge/Treeware-%F0%9F%8C%B3-green?style=for-the-badge)](https://plant.treeware.earth/Astrotomic/laravel-translatable)
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/Astrotomic/laravel-translatable/run-tests?style=flat-square&logoColor=white&logo=github&label=Tests)](https://github.com/Astrotomic/laravel-translatable/actions?query=workflow%3Arun-tests) [![StyleCI](https://styleci.io/repos/192333549/shield)](https://styleci.io/repos/192333549) [![Codecov Coverage](https://img.shields.io/codecov/c/github/Astrotomic/laravel-translatable?logo=codecov&logoColor=white&label=Codecov&style=flat-square)](https://codecov.io/gh/Astrotomic/laravel-translatable) [![Total Downloads](https://img.shields.io/packagist/dt/astrotomic/laravel-translatable.svg?label=Downloads&style=flat-square)](https://packagist.org/packages/astrotomic/laravel-translatable)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/Astrotomic/laravel-translatable/phpunit?style=flat-square&logoColor=white&logo=github&label=PHPunit)](https://github.com/Astrotomic/laravel-translatable/actions?query=workflow%3Aphpunit) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/Astrotomic/laravel-translatable/pint?style=flat-square&logoColor=white&logo=github&label=Pint)](https://github.com/Astrotomic/laravel-translatable/actions?query=workflow%3Apint) [![Codecov Coverage](https://img.shields.io/codecov/c/github/Astrotomic/laravel-translatable?logo=codecov&logoColor=white&label=Codecov&style=flat-square)](https://codecov.io/gh/Astrotomic/laravel-translatable) [![Total Downloads](https://img.shields.io/packagist/dt/astrotomic/laravel-translatable.svg?label=Downloads&style=flat-square)](https://packagist.org/packages/astrotomic/laravel-translatable)
 
 ![Laravel Translatable](.gitbook/assets/socialcard.png)
 
@@ -75,6 +75,7 @@ echo $post->translate('fr')->title; // Mon premier post
 
 | Package             | Laravel                       | PHP       |
 | :------------------ | :---------------------------- | :-------- |
+| **v11.13 - v11.13** | `8.* / 9.* / 10.*` / `11.*`   | `^8.0`    |
 | **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/pint.json b/pint.json
@@ -0,0 +1,29 @@
+{
+    "rules": {
+        "ordered_class_elements": {
+            "order": [
+                "use_trait",
+                "constant_public",
+                "constant_protected",
+                "constant_private",
+                "property_public",
+                "property_protected",
+                "property_private",
+                "construct",
+                "method_public_static",
+                "method_public",
+                "method_protected_static",
+                "method_protected",
+                "method_private_static",
+                "method_private",
+                "destruct",
+                "magic"
+            ]
+        },
+        "yoda_style": {
+            "equal": false,
+            "identical": false,
+            "less_and_greater": null
+        }
+    }
+}
diff --git a/src/Translatable/Traits/Relationship.php b/src/Translatable/Traits/Relationship.php
@@ -73,15 +73,15 @@ public function translation(): HasOne
             });
     }
 
+    public function translations(): HasMany
+    {
+        return $this->hasMany($this->getTranslationModelName(), $this->getTranslationRelationKey());
+    }
+
     protected function localeOrFallback()
     {
         return $this->useFallback() && ! $this->translations()->where($this->getLocaleKey(), $this->locale())->exists()
             ? $this->getFallbackLocale()
             : $this->locale();
     }
-
-    public function translations(): HasMany
-    {
-        return $this->hasMany($this->getTranslationModelName(), $this->getTranslationRelationKey());
-    }
 }
diff --git a/tests/Eloquent/Person.php b/tests/Eloquent/Person.php
@@ -8,8 +8,6 @@
 
 class Person extends Eloquent implements TranslatableContract
 {
-    protected $table = 'people';
-
     use Translatable;
 
     /**
@@ -42,6 +40,8 @@ class Person extends Eloquent implements TranslatableContract
      */
     public $localeKey;
 
+    protected $table = 'people';
+
     /**
      * Mutate name attribute into upper-case.
      *

diff --git a/tests/Eloquent/Vegetable.php b/tests/Eloquent/Vegetable.php
@@ -10,15 +10,15 @@ class Vegetable extends Eloquent implements TranslatableContract
 {
     use Translatable;
 
-    protected $primaryKey = 'identity';
-
     public $translationForeignKey = 'vegetable_identity';
 
     public $translatedAttributes = ['name'];
 
-    protected $fillable = ['quantity'];
-
     public $localeKey;
 
     public $translationModel;
+
+    protected $primaryKey = 'identity';
+
+    protected $fillable = ['quantity'];
 }
diff --git a/tests/EloquentOverrideTest.php b/tests/EloquentOverrideTest.php
@@ -2,11 +2,12 @@
 
 namespace Tests;
 
+use PHPUnit\Framework\Attributes\Test;
 use Tests\Eloquent\Vegetable;
 
 final class EloquentOverrideTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function to_array_returns_translated_attributes(): void
     {
         $vegetable = factory(Vegetable::class)->make(['name:en' => 'Peas']);
@@ -15,15 +16,15 @@ public function to_array_returns_translated_attributes(): void
         self::assertEquals('Peas', $vegetable->toArray()['name']);
     }
 
-    /** @test */
+    #[Test]
     public function to_array_wont_break_if_no_translations_exist(): void
     {
         $vegetable = factory(Vegetable::class)->make();
 
         self::assertIsArray($vegetable->toArray());
     }
 
-    /** @test */
+    #[Test]
     public function translated_attributes_can_be_accessed_as_properties(): void
     {
         $vegetable = factory(Vegetable::class)->make(['name:en' => 'Peas']);
@@ -32,7 +33,7 @@ public function translated_attributes_can_be_accessed_as_properties(): void
         self::assertEquals('Peas', $vegetable->name);
     }
 
-    /** @test */
+    #[Test]
     public function it_can_hide_translated_attributes(): void
     {
         $vegetable = factory(Vegetable::class)->make(['name:en' => 'Peas']);
@@ -44,15 +45,15 @@ public function it_can_hide_translated_attributes(): void
         self::assertFalse(isset($vegetable->toArray()['name']));
     }
 
-    /** @test */
+    #[Test]
     public function it_finds_custom_primary_keys(): void
     {
         $vegetable = new Vegetable();
 
         self::assertEquals('vegetable_identity', $vegetable->getTranslationRelationKey());
     }
 
-    /** @test */
+    #[Test]
     public function setAttribute_returns_parent_setAttribute(): void
     {
         $vegetable = new Vegetable();