Merge pull request #6 from tectonic/feature/laravel-8

Feature laravel 8

.gitignore

@@ -1,4 +1,4 @@
 .idea*
 vendor/*
 composer.lock
-composer.lock
+.phpunit.result.cache

composer.json

@@ -8,15 +8,15 @@
 		}
 	],
 	"require": {
-		"php": ">=7.0.0",
-		"illuminate/support": "5.*",
-		"illuminate/database": "5.*",
-		"tectonic/localisation": "^2.0.3"
+		"php": "^7.4|^8.0",
+		"illuminate/support": "^8.0",
+		"illuminate/database": "^8.0",
+		"tectonic/localisation": "^3.0"
 	},
 	"require-dev": {
-		"mockery/mockery": "dev-master@dev",
-		"orchestra/testbench": "3.*",
-		"phpunit/phpunit": "~5.7"
+		"mockery/mockery": "^1.4",
+		"orchestra/testbench": "*",
+		"phpunit/phpunit": "^9.0"
 	},
 	"autoload": {
 		"psr-4": {
@@ -28,5 +28,8 @@
 			"Tests\\": "tests/"
 		}
 	},
-	"minimum-stability": "stable"
+	"config": {
+		"preferred-install": "dist",
+		"sort-packages": true
+	}
 }

phpunit.xml

@@ -8,11 +8,14 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="all">
             <directory suffix="Test.php">./tests/</directory>
         </testsuite>
     </testsuites>
+    <php>
+        <env name="DB_CONNECTION" value="testing"/>
+        <env name="APP_KEY" value="base64:2fl+Ktvkfl+Fuz4Qp/A75G2RTiWVA/ZoKZvp6fiiM10="/>
+    </php>
 </phpunit>

src/Database/TranslationService.php

@@ -158,7 +158,7 @@ public function findForUpdate(Translatable $model, $language, $field)
             'field' => $field
         ]);
 
-        if (count($translations)) {
+        if (isset($translations[0])) {
             return $translations[0];
         }
 

src/ServiceProvider.php

@@ -3,10 +3,10 @@
 
 use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
 use Tectonic\LaravelLocalisation\Database\EloquentTranslationRepository;
+use Tectonic\LaravelLocalisation\Translator\Engine;
 use Tectonic\LaravelLocalisation\Translator\Transformers\CollectionTransformer;
 use Tectonic\LaravelLocalisation\Translator\Transformers\ModelTransformer;
 use Tectonic\LaravelLocalisation\Translator\Transformers\PaginationTransformer;
-use Tectonic\Localisation\Translator\Engine;
 use Tectonic\Localisation\Contracts\TranslationRepository;
 
 class ServiceProvider extends LaravelServiceProvider

src/Translator/Engine.php

@@ -0,0 +1,18 @@
+<?php
+namespace Tectonic\LaravelLocalisation\Translator;
+
+class Engine extends \Tectonic\Localisation\Translator\Engine
+{
+
+    /**
+     * Alias for translate
+     *
+     * @param $object
+     * @param  null  $language
+     * @return mixed|object
+     */
+    public function get($object, $language = null)
+    {
+        return parent::translate($object, $language);
+    }
+}

src/Translator/Transformers/CollectionTransformer.php

@@ -22,10 +22,11 @@ public function isAppropriateFor($object)
     /**
      * Once a transformer for an object has been found, it then must do whatever work is necessary on that object.
      *
-     * @param Collection $collection
+     * @param  Collection  $collection
+     * @param  null  $language
      * @return mixed
      */
-    public function transform($collection)
+    public function transform($collection, $language = null)
     {
         return $this->translate($collection, false);
     }
@@ -34,10 +35,12 @@ public function transform($collection)
      * Same as transform but should only translate objects one-level deep. With collections, we always
      * have to pass off to the model transformer anyway, so just simply re-call the transform method.
      *
-     * @param object $collection
+     * @param  object  $collection
+     * @param  null  $language
+     * @param  null  $fields
      * @return mixed
      */
-    public function shallow($collection)
+    public function shallow($collection, $language = null, $fields = null)
     {
         return $this->translate($collection, true);
     }

src/Translator/Transformers/ModelTransformer.php

@@ -24,21 +24,24 @@ public function isAppropriateFor($object)
     /**
      * Once a transformer for an object has been found, it then must do whatever work is necessary on that object.
      *
-     * @param Model $model
+     * @param  Model  $model
+     * @param  null  $language
      * @return mixed
      */
-    public function transform($model)
+    public function transform($model, $language = null)
     {
         return $this->translate($model, false);
     }
 
     /**
      * Same as transform but should only translate objects one-level deep.
      *
-     * @param object $model
+     * @param  Model  $model
+     * @param  null  $language
+     * @param  null  $fields
      * @return mixed
      */
-    public function shallow($model)
+    public function shallow($model, $language = null, $fields = null)
     {
         return $this->translate($model, true);
     }

src/Translator/Transformers/PaginationTransformer.php

@@ -24,10 +24,11 @@ public function isAppropriateFor($object)
     /**
      * Once a transformer for an object has been found, it then must do whatever work is necessary on that object.
      *
-     * @param object $paginator
+     * @param  object  $paginator
+     * @param  null  $language
      * @return mixed
      */
-    public function transform($paginator)
+    public function transform($paginator, $language = null)
     {
         $transformer = App::make(CollectionTransformer::class);
 
@@ -40,12 +41,14 @@ public function transform($paginator)
     /**
      * Same as transform but should only translate objects one-level deep.
      *
-     * @param object $paginator
+     * @param  object  $paginator
+     * @param  null  $language
+     * @param  array  $fields
      * @return mixed
      */
-    public function shallow($paginator)
+    public function shallow($paginator, $language = null, $fields = [])
     {
-        return $this->transform($paginator);
+        return $this->transform($paginator, $language);
     }
 
     /**

tests/AcceptanceTestCase.php

@@ -9,7 +9,7 @@ class AcceptanceTestCase extends TestCase
 {
     use Testable;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Database/TranslationServiceTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace tests\Database;
+namespace Tests\Database;
 
 use Mockery as m;
 use Tectonic\LaravelLocalisation\Database\TranslationService;
@@ -42,11 +42,9 @@ public function testTranslationCreation()
         $this->assertEquals($translation, $service->create($model, 'en', 'name', 'colours'));
     }
 
-    /**
-     * @expectedException Tectonic\LaravelLocalisation\Database\TranslationNotFound
-     */
     public function testTranslationUpdateWithNullTranslation()
     {
+        $this->expectException(\Tectonic\LaravelLocalisation\Database\TranslationNotFound::class);
         $repository = m::mock(TranslationRepository::class);
         $repository->shouldReceive('getByCriteria')->once()->andReturn(null);
         $service = new TranslationService($repository);

tests/Stubs/Model.php

@@ -1,5 +1,5 @@
 <?php
-namespace tests\Stubs;
+namespace Tests\Stubs;
 
 use Tectonic\Localisation\Contracts\Translatable;
 use Tectonic\Localisation\Translator\Translations;
@@ -19,4 +19,8 @@ public function getTranslatableFields()
     {
         return ['name'];
     }
+
+    public function touch()
+    {
+    }
 }

tests/TestCase.php

@@ -1,16 +1,21 @@
 <?php
 namespace Tests;
 
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\TestCase as IlluminatedTestCase;
 use Mockery as m;
+use Orchestra\Testbench\Concerns\CreatesApplication;
 
-class TestCase extends \PHPUnit_Framework_TestCase
+class TestCase extends IlluminatedTestCase
 {
+    use RefreshDatabase;
     use Testable;
+    use CreatesApplication;
 
-	public function setUp()
+	public function setUp(): void
     {
+        parent::setUp();
         m::close();
-
         $this->init();
     }
 }