Laravel 6 support (#154)

* Laravel 6 support

* This version of PHPUnit is supported on PHP 7.2 and PHP 7.3.

* setUp void

* composer update dependencies

* fix : void setUp

* fix : void tearDown

* change composer to laravel 6

* Arr::get fix helper

* add new line .gitignore

.gitignore

@@ -4,3 +4,4 @@ composer.phar
 composer.lock
 .DS_Store
 tests/temp/database.sqlite
+.idea

.travis.yml

@@ -1,12 +1,12 @@
-language: php
-
-php:
-  - 7.0
-  - 7.1
-
-before_script:
-  - travis_retry composer self-update
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
-
-script:
-  - phpunit
+language: php
+
+php:
+  - 7.2
+  - 7.3
+
+before_script:
+  - travis_retry composer self-update
+  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
+
+script:
+  - phpunit

composer.json

@@ -1,43 +1,43 @@
-{
-    "name": "waavi/translation",
-    "description": "A Translation package for Laravel 5 with database and cache support",
-    "keywords": [
-        "waavi",
-        "laravel-translator",
-        "laravel",
-        "translator",
-        "translation",
-        "localization"
-    ],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Waavi",
-            "email": "info@waavi.com",
-            "homepage": "http://waavi.com"
-        }
-    ],
-    "require": {
-        "laravel/framework": "~5.5",
-        "doctrine/dbal": "^2.5"
-    },
-    "require-dev": {
-        "phpunit/phpunit" : "~6.0",
-        "orchestra/testbench": "~3.5",
-        "mockery/mockery": "^0.9.9"
-    },
-    "autoload": {
-        "psr-4": {
-            "Waavi\\Translation\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Waavi\\Translation\\Test\\": "tests"
-        }
-    },
-    "minimum-stability": "dev",
-    "scripts": {
-        "test": "vendor/bin/phpunit"
-    }
-}
+{
+    "name": "waavi/translation",
+    "description": "A Translation package for Laravel 5 with database and cache support",
+    "keywords": [
+        "waavi",
+        "laravel-translator",
+        "laravel",
+        "translator",
+        "translation",
+        "localization"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Waavi",
+            "email": "info@waavi.com",
+            "homepage": "http://waavi.com"
+        }
+    ],
+    "require": {
+        "laravel/framework": "~6.0",
+        "doctrine/dbal": "^2.5"
+    },
+    "require-dev": {
+        "phpunit/phpunit" : "~8.3",
+        "orchestra/testbench": "~4.0",
+        "mockery/mockery": "^1.2.3"
+    },
+    "autoload": {
+        "psr-4": {
+            "Waavi\\Translation\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Waavi\\Translation\\Test\\": "tests"
+        }
+    },
+    "minimum-stability": "dev",
+    "scripts": {
+        "test": "vendor/bin/phpunit"
+    }
+}

readme.md

@@ -40,7 +40,7 @@ WAAVI is a web development studio based in Madrid, Spain. You can learn more abo
  5.4.x    | 2.2.x
  5.5.x    | 2.3.x and higher
  5.6.x    | 2.3.x and higher
-
+ 6.x      | 2.4.x and higher
 ## Features overview
 
  - Allow dynamic changes to the site's text and translations.

src/Loaders/DatabaseLoader.php

@@ -1,5 +1,6 @@
 <?php namespace Waavi\Translation\Loaders;
 
+use Illuminate\Support\Arr;
 use Waavi\Translation\Repositories\TranslationRepository;
 
 class DatabaseLoader extends Loader
@@ -41,7 +42,7 @@ public function loadSource($locale, $group, $namespace = '*')
         $dotArray = $this->translationRepository->loadSource($locale, $namespace, $group);
         $undot    = [];
         foreach ($dotArray as $item => $text) {
-            array_set($undot, $item, $text);
+            Arr::set($undot, $item, $text);
         }
         return $undot;
     }

src/Repositories/LanguageRepository.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Config\Repository as Config;
 use Illuminate\Foundation\Application;
+use Illuminate\Support\Arr;
 use Illuminate\Validation\Factory as Validator;
 use Waavi\Translation\Models\Language;
 
@@ -177,7 +178,7 @@ public function percentTranslated($locale)
      */
     public function validate(array $attributes)
     {
-        $id    = array_get($attributes, 'id', 'NULL');
+        $id    = Arr::get($attributes, 'id', 'NULL');
         $table = $this->model->getTable();
         $rules = [
             'locale' => "required|unique:{$table},locale,{$id}",

src/Repositories/TranslationRepository.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Foundation\Application;
+use Illuminate\Support\Arr;
 use Illuminate\Support\NamespacedItemResolver;
 use Waavi\Translation\Models\Translation;
 
@@ -165,7 +166,7 @@ public function deleteByCode($code)
     public function loadArray(array $lines, $locale, $group, $namespace = '*')
     {
         // Transform the lines into a flat dot array:
-        $lines = array_dot($lines);
+        $lines = Arr::dot($lines);
         foreach ($lines as $item => $text) {
             if (is_string($text)) {
                 // Check if the entry exists in the database:
@@ -409,9 +410,9 @@ public function flagAsReviewed($id)
     public function validate(array $attributes)
     {
         $table     = $this->model->getTable();
-        $locale    = array_get($attributes, 'locale', '');
-        $namespace = array_get($attributes, 'namespace', '');
-        $group     = array_get($attributes, 'group', '');
+        $locale    = Arr::get($attributes, 'locale', '');
+        $namespace = Arr::get($attributes, 'namespace', '');
+        $group     = Arr::get($attributes, 'group', '');
         $rules     = [
             'locale'    => 'required',
             'namespace' => 'required',

src/Traits/Translatable.php

@@ -1,5 +1,6 @@
 <?php namespace Waavi\Translation\Traits;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Str;
 
@@ -84,7 +85,7 @@ public function attributesToArray()
      */
     public function translationCodeFor($attribute)
     {
-        return array_get($this->attributes, "{$attribute}_translation", false);
+        return Arr::get($this->attributes, "{$attribute}_translation", false);
     }
 
     /**
@@ -107,7 +108,7 @@ public function rawValueRequested($attribute)
      */
     public function getRawAttribute($attribute)
     {
-        return array_get($this->attributes, $attribute, '');
+        return Arr::get($this->attributes, $attribute, '');
     }
 
     /**

src/UriLocalizer.php

@@ -1,6 +1,7 @@
 <?php namespace Waavi\Translation;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 use Waavi\Translation\Repositories\LanguageRepository;
 
 class UriLocalizer
@@ -94,10 +95,10 @@ protected function parseUrl($url, $segment = 0)
     {
         $parsedUrl             = parse_url($url);
         $parsedUrl['segments'] = array_values(array_filter(explode('/', $parsedUrl['path']), 'strlen'));
-        $localeCandidate       = array_get($parsedUrl['segments'], $segment, false);
+        $localeCandidate       = Arr::get($parsedUrl['segments'], $segment, false);
         $parsedUrl['locale']   = in_array($localeCandidate, $this->availableLocales) ? $localeCandidate : null;
-        $parsedUrl['query']    = array_get($parsedUrl, 'query', false);
-        $parsedUrl['fragment'] = array_get($parsedUrl, 'fragment', false);
+        $parsedUrl['query']    = Arr::get($parsedUrl, 'query', false);
+        $parsedUrl['fragment'] = Arr::get($parsedUrl, 'fragment', false);
         unset($parsedUrl['path']);
         return $parsedUrl;
     }

tests/Cache/RepositoryFactoryTest.php

@@ -9,7 +9,7 @@
 
 class RepositoryFactoryTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         // During the parent's setup, both a 'es' 'Spanish' and 'en' 'English' languages are inserted into the database.
         parent::setUp();

tests/Cache/SimpleRepositoryTest.php

@@ -6,7 +6,7 @@
 
 class SimpleRepositoryTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         // During the parent's setup, both a 'es' 'Spanish' and 'en' 'English' languages are inserted into the database.
         parent::setUp();

tests/Cache/TaggedRepositoryTest.php

@@ -6,7 +6,7 @@
 
 class TaggedRepositoryTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         // During the parent's setup, both a 'es' 'Spanish' and 'en' 'English' languages are inserted into the database.
         parent::setUp();

tests/Cache/TranslationCacheTest.php

@@ -4,7 +4,7 @@
 
 class TranslationCacheTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         // During the parent's setup, both a 'es' 'Spanish' and 'en' 'English' languages are inserted into the database.
         parent::setUp();

tests/Commands/FlushTest.php

@@ -5,13 +5,13 @@
 
 class FlushTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->cacheRepository = \App::make('translation.cache.repository');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         Mockery::close();

tests/Commands/LoadTest.php

@@ -7,7 +7,7 @@
 
 class LoadTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->languageRepository    = \App::make(LanguageRepository::class);

tests/Loaders/CacheLoaderTest.php

@@ -8,15 +8,15 @@
 
 class CacheLoaderTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->cache       = Mockery::mock(Cache::class);
         $this->fallback    = Mockery::mock(Loader::class);
         $this->cacheLoader = new CacheLoader('en', $this->cache, $this->fallback, 60, 'translation');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
         parent::tearDown();

tests/Loaders/DatabaseLoaderTest.php

@@ -7,14 +7,14 @@
 
 class DatabaseLoaderTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->translationRepository = \App::make(TranslationRepository::class);
         $this->loader                = new DatabaseLoader('es', $this->translationRepository);
     }
 
-    public function tearDown()
+    public function tearDown():void
     {
         Mockery::close();
         parent::tearDown();

tests/Loaders/FileLoaderTest.php

@@ -7,14 +7,14 @@
 
 class FileLoaderTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->laravelLoader = Mockery::mock(LaravelFileLoader::class);
         $this->fileLoader    = new FileLoader('en', $this->laravelLoader);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
         parent::tearDown();

tests/Loaders/LoadTest.php

@@ -7,15 +7,15 @@
 
 class LoadTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->laravelLoader = Mockery::mock(LaravelFileLoader::class);
         // We will use the file loader:
         $this->fileLoader = new FileLoader('en', $this->laravelLoader);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
         parent::tearDown();

tests/Loaders/MixedLoaderTest.php

@@ -8,15 +8,15 @@
 
 class MixedLoaderTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->fileLoader  = Mockery::mock(FileLoader::class);
         $this->dbLoader    = Mockery::mock(DatabaseLoader::class);
         $this->mixedLoader = new MixedLoader('en', $this->fileLoader, $this->dbLoader);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
         parent::tearDown();

tests/Repositories/LanguageRepositoryTest.php

@@ -6,7 +6,7 @@
 
 class LanguageRepositoryTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         // During the parent's setup, both a 'es' 'Spanish' and 'en' 'English' languages are inserted into the database.
         parent::setUp();