Skip to content
This repository was archived by the owner on Feb 27, 2024. It is now read-only.

Add Laravel 6 support #34

Closed
christophengelmayer wants to merge 4 commits into from
Closed

Add Laravel 6 support #34

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d952f8d
Add Laravel 6 support and up the minimum requirement for PHP to 7.2
christophengelmayer Dec 3, 2019
afea56b
Switch deprecated laravel-translatable package
christophengelmayer Dec 3, 2019
2e4a64d
Replace deprecated string helper functions
christophengelmayer Dec 3, 2019
14b67cb
Adapt tests to run on laravel 6
christophengelmayer Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replace deprecated string helper functions
  • Loading branch information
@christophengelmayer
christophengelmayer committed Dec 3, 2019
commit 2e4a64d5535015573404a0c11d86fa0fd4fcbfec
3 changes: 2 additions & 1 deletion src/Http/Resources/BaseApiResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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));
Expand Down
3 changes: 2 additions & 1 deletion src/Http/Resources/IdentifierResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Swis\JsonApi\Server\Http\Resources;

use Illuminate\Support\Str;
use Illuminate\Http\Resources\Json\Resource;

class IdentifierResource extends Resource
Expand All @@ -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));

Expand Down
12 changes: 7 additions & 5 deletions src/Services/CustomFileGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Swis\JsonApi\Server\Services;

use Illuminate\Support\Str;

class CustomFileGenerator
{
private $modelName;
Expand All @@ -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'),
Expand Down
9 changes: 5 additions & 4 deletions src/Traits/HandlesRelationships.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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]);
}
Expand Down Expand Up @@ -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];
Expand Down