wip

spatie · Feb 27, 2019 · 5ea6ef9 · 5ea6ef9
1 parent d8c7312
commit 5ea6ef9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All notable changes to `laravel-translation-loader` will be documented in this file
 
+## 2.2.4 - 2019-02-27
+
 ## 2.2.3 - 2019-02-01
 
 - use Arr:: and Str:: functions

diff --git a/composer.json b/composer.json
@@ -23,11 +23,11 @@
     ],
     "require": {
         "php": "^7.1",
-        "illuminate/translation": "~5.7.0"
+        "illuminate/translation": "~5.7.0|~5.8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.4",
-        "orchestra/testbench":  "~3.7.0"
+        "phpunit/phpunit": "^7.4|^8.0",
+        "orchestra/testbench":  "~3.7.0|~3.8.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/DummyManagerTest.php b/tests/DummyManagerTest.php
@@ -6,7 +6,7 @@
 
 class DummyManagerTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -12,7 +12,7 @@ abstract class TestCase extends Orchestra
     /** @var \Spatie\TranslationLoader\LanguageLine */
     protected $languageLine;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/TransTest.php b/tests/TransTest.php
@@ -13,7 +13,7 @@ class TransTest extends TestCase
         ],
     ];
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }
@@ -54,7 +54,7 @@ public function it_will_return_array_if_the_given_translation_is_nested()
             $this->createLanguageLine('nested', $key, ['en' => $text]);
         }
 
-        $this->assertEquals($this->nested['bool'], trans('nested.bool'), '$canonicalize = true', $delta = 0.0, $maxDepth = 10, $canonicalize = true);
+        $this->assertEqualsCanonicalizing($this->nested['bool'], trans('nested.bool'), '$canonicalize = true', $delta = 0.0, $maxDepth = 10, $canonicalize = true);
     }
 
     /** @test */

diff --git a/tests/TranslationLoaders/DbTest.php b/tests/TranslationLoaders/DbTest.php
@@ -13,7 +13,7 @@ class DbTest extends TestCase
     /** @var \Spatie\TranslationLoader\LanguageLine */
     protected $languageLine;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

diff --git a/tests/TranslationManagerTest.php b/tests/TranslationManagerTest.php
@@ -6,7 +6,7 @@
 
 class TranslationManagerTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }