Remove Illuminate dependencies, update zend-diactoros

composer.json

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

src/Schema/Attribute.php

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

src/Schema/HasOne.php

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

src/Schema/Relationship.php

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