Add Laravel 6 support

README.md

@@ -236,8 +236,8 @@ If you created your own routes make sure you have the ``auth:api`` middlware on
 ##### Laravel framework
 * https://laravel.com/docs/
 
-##### Dimsav / laravel-translatable
-* https://github.com/dimsav/laravel-translatable
+##### Astrotomic / laravel-translatable
+* https://github.com/Astrotomic/laravel-translatable
 
 ## Change log
 

composer.json

@@ -38,9 +38,9 @@
     }
   ],
   "require": {
-    "php": ">=7.1.3",
-    "dimsav/laravel-translatable": "^8.0|^9.0",
-    "laravel/framework": "5.5.*|5.6.*|5.7.*|5.8.*"
+    "php": "^7.2",
+    "astrotomic/laravel-translatable": "^11.6",
+    "laravel/framework": "5.5.*|5.6.*|5.7.*|5.8.*|6.*"
   },
   "require-dev": {
     "filp/whoops": "~2.0",

config/laravel_api.php

@@ -15,7 +15,7 @@
 
         'policy' => app_path('Policies/'),
 
-        'auth_test' => base_path('tests/Authentication/'),
+        'auth_test' => base_path('tests/Feature/Authentication/'),
 
         'templates' => 'vendor/swisnl/json-api-server/resources/templates/',
 

resources/templates/model.stub

@@ -3,7 +3,7 @@
 namespace $NAMESPACE_MODEL$;
 
 use Illuminate\Database\Eloquent\Model;
-use Dimsav\Translatable\Translatable;
+use Astrotomic\Translatable\Translatable;
 
 class $MODEL_NAME$ extends Model
 {

sample/Sample.php

@@ -2,7 +2,7 @@
 
 namespace App;
 
-use Dimsav\Translatable\Translatable;
+use Astrotomic\Translatable\Translatable;
 use Illuminate\Database\Eloquent\Model;
 
 class Sample extends Model

sample/Tests/SampleAuthenticationTest.php

@@ -4,17 +4,17 @@
 
 use App\Sample;
 use App\SamplePermissions;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
 class SampleAuthenticationTest extends TestCase
 {
-    use DatabaseTransactions;
+    use RefreshDatabase;
 
     protected $user;
     protected $baseUrl;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->user = factory(User::class)->create();

src/Http/Resources/BaseApiResource.php

@@ -6,6 +6,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\Resource;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 use Swis\JsonApi\Server\Traits\HandlesRelationships;
 
 class BaseApiResource extends Resource
@@ -236,7 +237,7 @@ protected function getIncludedRelationships(Request $request)
     protected function getResourceType()
     {
         $resourceClass = class_basename($this->resource);
-        $resourcePlural = str_plural($resourceClass);
+        $resourcePlural = Str::plural($resourceClass);
 
         // Converts camelcase to dash
         $lowerCaseResourceType = strtolower(preg_replace('/([a-zA-Z])(?=[A-Z])/', '$1-', $resourcePlural));

src/Http/Resources/IdentifierResource.php

@@ -2,6 +2,7 @@
 
 namespace Swis\JsonApi\Server\Http\Resources;
 
+use Illuminate\Support\Str;
 use Illuminate\Http\Resources\Json\Resource;
 
 class IdentifierResource extends Resource
@@ -24,7 +25,7 @@ public function toArray($request)
     protected function getResourceType()
     {
         $resourceClass = class_basename($this->resource);
-        $resourcePlural = str_plural($resourceClass);
+        $resourcePlural = Str::plural($resourceClass);
         // Converts camelcase to dash
         $lowerCaseResourceType = strtolower(preg_replace('/([a-zA-Z])(?=[A-Z])/', '$1-', $resourcePlural));
 

src/Providers/LaravelApiServiceProvider.php

@@ -2,7 +2,7 @@
 
 namespace Swis\JsonApi\Server\Providers;
 
-use Dimsav\Translatable\TranslatableServiceProvider;
+use Astrotomic\Translatable\TranslatableServiceProvider;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Route;

src/Services/CustomFileGenerator.php

@@ -2,6 +2,8 @@
 
 namespace Swis\JsonApi\Server\Services;
 
+use Illuminate\Support\Str;
+
 class CustomFileGenerator
 {
     private $modelName;
@@ -11,11 +13,11 @@ protected function setStubVars()
     {
         $this->stubVariables = [
             '$MODEL_NAME$' => $this->modelName,
-            '$CAMEL_CASE_MODEL_NAME$' => camel_case($this->modelName),
-            '$SNAKE_CASED_MODEL_NAME$' => strtolower(snake_case($this->modelName)),
-            '$PLURAL_SNAKE_CASED_MODEL_NAME$' => strtolower(str_plural(snake_case($this->modelName))),
-            '$PLURAL_UPPER_CASED_MODEL_NAME$' => strtoupper(str_plural($this->modelName)),
-            '$PLURAL_LOWER_CASED_MODEL_NAME$' => strtolower(str_plural($this->modelName)),
+            '$CAMEL_CASE_MODEL_NAME$' => Str::camel($this->modelName),
+            '$SNAKE_CASED_MODEL_NAME$' => strtolower(Str::snake($this->modelName)),
+            '$PLURAL_SNAKE_CASED_MODEL_NAME$' => strtolower(Str::plural(Str::snake($this->modelName))),
+            '$PLURAL_UPPER_CASED_MODEL_NAME$' => strtoupper(Str::plural($this->modelName)),
+            '$PLURAL_LOWER_CASED_MODEL_NAME$' => strtolower(Str::plural($this->modelName)),
             '$UPPER_CASED_MODEL_NAME$' => strtoupper($this->modelName),
             '$NAMESPACE_MODEL$' => config('laravel_api.namespace.model'),
             '$NAME_SPACE_REPOSITORY$' => config('laravel_api.namespace.repository'),

src/Traits/HandlesRelationships.php

@@ -2,6 +2,7 @@
 
 namespace Swis\JsonApi\Server\Traits;
 
+use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -90,7 +91,7 @@ protected function handleIncludes($item, $includes)
                 }
             } else {
                 $included = BaseApiResource::make($item->$include);
-                $object = str_before($nestedInclude, '.');
+                $object = Str::before($nestedInclude, '.');
                 if (isset($included->$object)) {
                     $relationshipResources[] = $this->handleIncludes($included, [$nestedInclude]);
                 }
@@ -157,9 +158,9 @@ protected function removeDuplicates($items)
     protected function getNestedRelation($include): array
     {
         $nestedInclude = null;
-        if (str_contains($include, '.')) {
-            $nestedInclude = str_after($include, '.');
-            $include = str_before($include, '.');
+        if (Str::contains($include, '.')) {
+            $nestedInclude = Str::after($include, '.');
+            $include = Str::before($include, '.');
         }
 
         return [$nestedInclude, $include];