Merge remote-tracking branch 'remotes/origin/master' into ft-rule-value-formatter

Author: Gummibeer

.circleci/config.yml

@@ -75,6 +75,30 @@ jobs:
           MYSQL_ALLOW_EMPTY_PASSWORD: true
     <<: *defaults
 
+  build-php73-laravel6:
+    docker:
+      - image: 'circleci/php:7.2'
+        environment:
+          LARAVEL_VERSION: '^6.0'
+      - image: 'circleci/mysql:5.7'
+        command: 'mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --innodb-large-prefix=true --innodb-file-format=Barracuda'
+        environment:
+          MYSQL_USER: 'root'
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+    <<: *defaults
+
+  build-php72-laravel6:
+    docker:
+      - image: 'circleci/php:7.2'
+        environment:
+          LARAVEL_VERSION: '^6.0'
+      - image: 'circleci/mysql:5.7'
+        command: 'mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --innodb-large-prefix=true --innodb-file-format=Barracuda'
+        environment:
+          MYSQL_USER: 'root'
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+    <<: *defaults
+
   build-php73-laravel58:
     docker:
       - image: 'circleci/php:7.3'
@@ -187,7 +211,8 @@ workflows:
   version: 2
   build_all:
     jobs:
-      - build-php73-laravel58
+      - build-php73-laravel6
+      - build-php72-laravel6
       - build-php72-laravel58
       - build-php72-laravel57
       - build-php72-laravel56

composer.json

@@ -1,7 +1,12 @@
 {
     "name": "astrotomic/laravel-translatable",
     "description": "A Laravel package for multilingual models",
-    "keywords": ["laravel", "translation", "language", "database"],
+    "keywords": [
+        "laravel",
+        "translation",
+        "language",
+        "database"
+    ],
     "license": "MIT",
     "authors": [
         {
@@ -17,17 +22,25 @@
             "role": "Developer"
         }
     ],
-    "support": {
-        "issues": "https://github.com/Astrotomic/laravel-translatable/issues"
-    },
     "require": {
         "php": ">=7.1.3",
-        "illuminate/contracts": "5.6.*|5.7.*|5.8.*",
-        "illuminate/database": "5.6.*|5.7.*|5.8.*",
-        "illuminate/support": "5.6.*|5.7.*|5.8.*"
+        "illuminate/contracts": "5.6.* || 5.7.* || 5.8.* || ^6.0",
+        "illuminate/database": "5.6.* || 5.7.* || 5.8.* || ^6.0",
+        "illuminate/support": "5.6.* || 5.7.* || 5.8.* || ^6.0"
     },
     "require-dev": {
-        "orchestra/testbench": "3.6.*|3.7.*|3.8.*"
+        "orchestra/testbench": "3.6.* || 3.7.* || 3.8.* || ^4.0",
+        "orchestra/testbench-core": "3.6.* || 3.7.* || 3.8.* || ^4.0"
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Astrotomic\\Translatable\\TranslatableServiceProvider"
+            ]
+        }
     },
     "autoload": {
         "psr-4": {
@@ -39,17 +52,12 @@
             "tests"
         ]
     },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "Astrotomic\\Translatable\\TranslatableServiceProvider"
-            ]
-        }
-    },
-    "config": {
-        "sort-packages": true
-    },
     "scripts": {
         "csfix": "php-cs-fixer fix --using-cache=no"
+    },
+    "support": {
+        "issues": "https://github.com/Astrotomic/laravel-translatable/issues",
+        "source": "https://github.com/Astrotomic/laravel-translatable",
+        "docs": "https://docs.astrotomic.info/laravel-translatable"
     }
 }

docs/README.md

@@ -59,6 +59,7 @@ echo $post->translate('fr')->title; // Mon premier post
 
 | Package | Laravel | PHP |
 | :--- | :--- | :--- |
+| **v11.4** | `5.6.* / 5.7.* / 5.8.* / 6.*` | `>=7.1.3` |
 | **v11.3** | `5.6.* / 5.7.* / 5.8.*` | `>=7.1.3` |
 | **v11.2** | `5.6.* / 5.7.* / 5.8.*` | `>=7.1.3` |
 | **v11.1** | `5.6.* / 5.7.* / 5.8.*` | `>=7.1.3` |

docs/changelog.md

@@ -2,6 +2,11 @@
 
 ## v11
 
+### v11.4.0
+
+* optimize translation by locale getter - [\#42](https://github.com/Astrotomic/laravel-translatable/pull/42)
+* add Laravel 6 support - [\#52](https://github.com/Astrotomic/laravel-translatable/pull/52)
+
 ### v11.3.0
 
 * Add `\Astrotomic\Translatable\Validation\RuleFactory` - [\#34](https://github.com/Astrotomic/laravel-translatable/pull/34)

docs/issues.md

@@ -1,6 +1,6 @@
 # Issues
 
-Find yourself stuck using the package? Found a bug? Do you have general questions or suggestions for improving the package? Feel free to [create an issue on GitHub](https://github.com/spatie/enum/issues), we’ll try to address it as soon as possible.
+Find yourself stuck using the package? Found a bug? Do you have general questions or suggestions for improving the package? Feel free to [create an issue on GitHub](https://github.com/Astrotomic/laravel-translatable/issues), we’ll try to address it as soon as possible.
 
 If you’ve found a bug regarding security please mail [[email protected]](mailto:[email protected]) instead of using the issue tracker.
 

docs/usage/forms.md

@@ -20,5 +20,3 @@ To achieve this structure in your form - to prevent manipulating the form data j
 <input type="text" name="de[title]" />
 ```
 
-
-

tests/LocalesTest.php

@@ -2,7 +2,7 @@
 
 use Astrotomic\Translatable\Locales;
 
-class LocalesTest extends TestsBase
+final class LocalesTest extends TestsBase
 {
     public function test_singleton()
     {

tests/ScopesTest.php

@@ -3,7 +3,7 @@
 use Astrotomic\Translatable\Test\Model\Country;
 use Astrotomic\Translatable\Test\Model\Vegetable;
 
-class ScopesTest extends TestsBase
+final class ScopesTest extends TestsBase
 {
     public function test_translated_in_scope_returns_only_translated_records_for_this_locale()
     {

tests/TestCoreModelExtension.php

@@ -11,7 +11,7 @@
 use Astrotomic\Translatable\Test\Model\CityTranslation;
 use Astrotomic\Translatable\Test\Model\CountryTranslation;
 
-class TestCoreModelExtension extends TestsBase
+final class TestCoreModelExtension extends TestsBase
 {
     // Saving
 

tests/TestsBase.php

@@ -4,7 +4,7 @@
 use Illuminate\Contracts\Console\Kernel;
 use Astrotomic\Translatable\TranslatableServiceProvider;
 
-class TestsBase extends TestCase
+abstract class TestsBase extends TestCase
 {
     protected $queriesCount;
     protected static $db2Setup = false;