Remove Illuminate dependencies, update zend-diactoros

This commit is contained in:
Toby Zerner 2018-12-14 17:13:10 +10:30
parent b9431c8e5e
commit ee22b47a17
4 changed files with 12 additions and 10 deletions

View File

@ -2,13 +2,12 @@
"name": "tobscure/json-api-server", "name": "tobscure/json-api-server",
"require": { "require": {
"php": "^7.2", "php": "^7.2",
"illuminate/database": "5.7.*", "doctrine/inflector": "^1.3",
"illuminate/events": "5.7.*",
"illuminate/validation": "5.7.*",
"zendframework/zend-diactoros": "^1.8",
"json-api-php/json-api": "^2.0", "json-api-php/json-api": "^2.0",
"psr/http-message": "^1.0",
"psr/http-server-handler": "^1.0", "psr/http-server-handler": "^1.0",
"psr/http-message": "^1.0" "spatie/macroable": "^1.0",
"zendframework/zend-diactoros": "^2.0"
}, },
"license": "MIT", "license": "MIT",
"authors": [ "authors": [
@ -29,5 +28,8 @@
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^7.4" "phpunit/phpunit": "^7.4"
},
"config": {
"sort-packages": true
} }
} }

View File

@ -3,7 +3,7 @@
namespace Tobscure\JsonApiServer\Schema; namespace Tobscure\JsonApiServer\Schema;
use Closure; use Closure;
use Illuminate\Support\Traits\Macroable; use Spatie\Macroable\Macroable;
class Attribute extends Field class Attribute extends Field
{ {
@ -16,8 +16,6 @@ class Attribute extends Field
public function __construct(string $name) public function __construct(string $name)
{ {
parent::__construct($name); parent::__construct($name);
$this->property = snake_case($name);
} }
public function sortable(Closure $callback = null) public function sortable(Closure $callback = null)

View File

@ -2,12 +2,14 @@
namespace Tobscure\JsonApiServer\Schema; namespace Tobscure\JsonApiServer\Schema;
use Doctrine\Common\Inflector\Inflector;
class HasOne extends Relationship class HasOne extends Relationship
{ {
public function __construct(string $name) public function __construct(string $name)
{ {
parent::__construct($name); parent::__construct($name);
$this->resource = str_plural($name); $this->resource = Inflector::pluralize($name);
} }
} }

View File

@ -3,7 +3,7 @@
namespace Tobscure\JsonApiServer\Schema; namespace Tobscure\JsonApiServer\Schema;
use Closure; use Closure;
use Illuminate\Support\Traits\Macroable; use Spatie\Macroable\Macroable;
abstract class Relationship extends Field abstract class Relationship extends Field
{ {