Merge pull request #128 from Astrotomic/laravel-7

Laravel 7

Author: Gummibeer

.gitattributes

@@ -1,11 +1,11 @@
 /.github export-ignore
-/.php_cs export-ignore
-/.gitbook.yaml export-ignore
-/.styleci.yml export-ignore
-/.gitattributes export-ignore
-/.scrutinizer.yml export-ignore
 /docs export-ignore
 /.codeclimate.yml export-ignore
+/.gitattributes export-ignore
+/.gitbook.yaml export-ignore
+/.php_cs export-ignore
+/.scrutinizer.yml export-ignore
+/.styleci.yml export-ignore
 
 # phpunit.xml.dist and tests are not excluded so tests can be run
 # this is usefull if this package ends up one day in Debian

.github/workflows/run-tests.yml

@@ -13,10 +13,12 @@ jobs:
       fail-fast: true
       matrix:
         php: [7.4, 7.3, 7.2]
-        laravel: [6.*, 5.8.*]
+        laravel: [7.*, 6.*, 5.8.*]
         dependency-version: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest, windows-latest, macos-latest]
         include:
+          - laravel: 7.*
+            testbench: 5.*
           - laravel: 6.*
             testbench: 4.*
           - laravel: 5.8.*
@@ -53,16 +55,8 @@ jobs:
           composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
 
-      - name: Configure matchers
-        uses: mheap/phpunit-matcher-action@master
-
       - name: Execute tests
-        run: vendor/bin/phpunit --teamcity --coverage-text --coverage-clover=coverage.clover
-
-      - name: Upload ScrutinizerCI coverage
-        run: |
-          php -r "copy('https://scrutinizer-ci.com/ocular.phar', 'ocular.phar');"
-          php ocular.phar code-coverage:upload --repository="g/Astrotomic/laravel-translatable" --revision="${{ github.sha }}" --format=php-clover coverage.clover
+        run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
       - name: Upload Codecov coverage
         uses: codecov/codecov-action@v1

.scrutinizer.yml

@@ -15,11 +15,6 @@ build:
         override:
           - php-scrutinizer-run
 
-tools:
-  external_code_coverage:
-    timeout: 900
-    runs: 1
-
 filter:
   paths:
     - src/

README.md

@@ -98,7 +98,7 @@ Please see [SECURITY](SECURITY.md) for details.
 
 | Package | Laravel | PHP |
 | :--- | :--- | :--- |
-| **v11.6 - v11.7** | `5.8.* / 6.*` | `>=7.2` |
+| **v11.6 - v11.8** | `5.8.* / 6.* / 7.*` | `>=7.2` |
 | **v11.4 - v11.5** | `5.6.* / 5.7.* / 5.8.* / 6.*` | `>=7.1.3` |
 | **v11.0 - v11.3** | `5.6.* / 5.7.* / 5.8.*` | `>=7.1.3` |
 

composer.json

@@ -25,13 +25,13 @@
     ],
     "require": {
         "php": ">=7.2",
-        "illuminate/contracts": "5.8.* || ^6.0",
-        "illuminate/database": "5.8.* || ^6.0",
-        "illuminate/support": "5.8.* || ^6.0"
+        "illuminate/contracts": "5.8.* || ^6.0 || ^7.0",
+        "illuminate/database": "5.8.* || ^6.0 || ^7.0",
+        "illuminate/support": "5.8.* || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "orchestra/testbench": "3.8.* || ^4.0",
-        "phpunit/phpunit": "^8.0"
+        "orchestra/testbench": "3.8.* || ^4.0 || ^5.0",
+        "phpunit/phpunit": "^8.0 || ^9.0"
     },
     "config": {
         "sort-packages": true
@@ -53,6 +53,8 @@
             "Astrotomic\\Translatable\\Tests\\": "tests/"
         }
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "scripts": {
         "csfix": "php-cs-fixer fix --using-cache=no",
         "test": "vendor/bin/phpunit",

docs/README.md

@@ -1,6 +1,15 @@
 # Introduction
 
-[![Total Downloads](https://img.shields.io/packagist/dt/astrotomic/laravel-translatable.svg?style=flat-square)](https://packagist.org/packages/astrotomic/laravel-translatable) [![TravisCI](https://img.shields.io/travis/Astrotomic/laravel-translatable/master?label=TravisCI&style=flat-square&cacheSeconds=600)](https://travis-ci.org/Astrotomic/laravel-translatable/branches)  [![StyleCI](https://styleci.io/repos/192333549/shield)](https://styleci.io/repos/192333549) [![ScrutinizerCI](https://img.shields.io/scrutinizer/quality/g/Astrotomic/laravel-translatable/master.svg?label=ScrutinizerCI&style=flat-square)](https://scrutinizer-ci.com/g/Astrotomic/laravel-translatable/) [![Code Climate](https://img.shields.io/codeclimate/maintainability/Astrotomic/laravel-translatable.svg?label=CodeClimate&style=flat-square)](https://codeclimate.com/github/Astrotomic/laravel-translatable) [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/Astrotomic/laravel-translatable/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/Astrotomic/laravel-translatable/) [![Latest Version](http://img.shields.io/packagist/v/astrotomic/laravel-translatable.svg?style=flat-square)](https://packagist.org/packages/astrotomic/laravel-translatable) ![MIT License](https://img.shields.io/github/license/Astrotomic/laravel-translatable.svg?color=blue&style=flat-square) [![Open Collective](https://img.shields.io/opencollective/all/astrotomic?label=Open%20Collective&style=flat-square&cacheSeconds=600)](https://opencollective.com/astrotomic)
+[![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://offset.earth/treeware)
+
+[![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)
+[![ScrutinizerCI](https://img.shields.io/scrutinizer/quality/g/Astrotomic/laravel-translatable/master.svg?label=Scrutinizer&logoColor=white&logo=scrutinizer-ci&style=flat-square)](https://scrutinizer-ci.com/g/Astrotomic/laravel-translatable/)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/Astrotomic/laravel-translatable.svg?label=CodeClimate&logoColor=white&logo=code-climate&style=flat-square)](https://codeclimate.com/github/Astrotomic/laravel-translatable)
+[![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/laravel-translatable-2-1.png)
 
@@ -72,7 +81,18 @@ echo $post->translate('fr')->title; // Mon premier post
 
 | Package | Laravel | PHP |
 | :--- | :--- | :--- |
-| **v11.6 - v11.7** | `5.8.* / 6.*` | `>=7.2` |
+| **v11.6 - v11.8** | `5.8.* / 6.* / 7.*` | `>=7.2` |
 | **v11.4 - v11.5** | `5.6.* / 5.7.* / 5.8.* / 6.*` | `>=7.1.3` |
 | **v11.0 - v11.3** | `5.6.* / 5.7.* / 5.8.*` | `>=7.1.3` |
 
+## Treeware
+
+You're free to use this package, but if it makes it to your production environment I would highly appreciate you buying the world a tree.
+
+It’s now common knowledge that one of the best tools to tackle the climate crisis and keep our temperatures from rising above 1.5C is to [plant trees](https://www.bbc.co.uk/news/science-environment-48870920). If you contribute to my forest you’ll be creating employment for local families and restoring wildlife habitats.
+
+You can buy trees at https://offset.earth/treeware
+
+Read more about Treeware at https://treeware.earth
+
+[![We offset our carbon footprint via Offset Earth](https://toolkit.offset.earth/carbonpositiveworkforce/badge/5e186e68516eb60018c5172b?black=true&landscape=true)](https://offset.earth/treeware)

docs/changelog.md

@@ -2,6 +2,10 @@
 
 ## v11
 
+### v11.8.0
+
+* Add Laravel 7 support - [\#128](https://github.com/Astrotomic/laravel-translatable/pull/128)
+
 ### v11.7.1
 
 * Add `.gitattributes` to exclude files from archive - [\#126](https://github.com/Astrotomic/laravel-translatable/pull/126)

phpunit.xml.dist

@@ -24,7 +24,7 @@
     </filter>
     <php>
         <env name="APP_ENV" value="testing"/>
-        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_CONNECTION" value="testing"/>
         <env name="DB_DATABASE" value=":memory:"/>
     </php>
 </phpunit>

tests/ScopesTest.php

@@ -4,12 +4,9 @@
 
 use Astrotomic\Translatable\Tests\Eloquent\Country;
 use Astrotomic\Translatable\Tests\Eloquent\Vegetable;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 
 final class ScopesTest extends TestCase
 {
-    use RefreshDatabase;
-
     /** @test */
     public function translated_in_scope_returns_only_translated_records_for_this_locale(): void
     {

tests/TestCase.php

@@ -3,20 +3,22 @@
 namespace Astrotomic\Translatable\Tests;
 
 use Astrotomic\Translatable\TranslatableServiceProvider;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Schema;
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
 
 abstract class TestCase extends OrchestraTestCase
 {
+    use RefreshDatabase;
+
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->loadMigrationsFrom([
-            '--database' => 'testing',
-            '--path' => realpath('tests/migrations'),
-        ]);
+        $this->createTables();
 
-        $this->withFactories(realpath('tests/factories'));
+        $this->withFactories(realpath(__DIR__.'/factories'));
     }
 
     protected function getEnvironmentSetUp($app)
@@ -30,4 +32,55 @@ protected function getPackageProviders($app)
             TranslatableServiceProvider::class,
         ];
     }
+
+    protected function createTables(): void
+    {
+        Schema::create('countries', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('code');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+
+        Schema::create('country_translations', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('country_id')->unsigned();
+            $table->string('name');
+            $table->string('locale')->index();
+
+            $table->unique(['country_id', 'locale']);
+            $table->foreign('country_id')->references('id')->on('countries')->onDelete('cascade');
+        });
+
+        Schema::create('vegetables', function (Blueprint $table) {
+            $table->increments('identity');
+            $table->integer('quantity')->default(0);
+            $table->timestamps();
+        });
+
+        Schema::create('vegetable_translations', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('vegetable_identity')->unsigned();
+            $table->string('name')->nullable();
+            $table->string('locale')->index();
+
+            $table->unique(['vegetable_identity', 'locale']);
+            $table->foreign('vegetable_identity')->references('identity')->on('vegetables');
+        });
+
+        Schema::create('people', function (Blueprint $table) {
+            $table->increments('id');
+            $table->timestamps();
+        });
+
+        Schema::create('person_translations', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('person_id')->unsigned();
+            $table->string('name');
+            $table->string('locale')->index();
+
+            $table->unique(['person_id', 'locale']);
+            $table->foreign('person_id')->references('id')->on('persons')->onDelete('cascade');
+        });
+    }
 }