Merge branch 'release/0.6.0'

Author: lindyhopchris

.editorconfig

@@ -7,7 +7,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{php,stub}]
+[*.{php,stub,json}]
 indent_size = 4
 
 [*.md]

CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
+## [0.6.0] - 2017-02-20
+
+### Added
+- Added support for Laravel 5.4. However, consuming applications will need to use the Browserkit testing package
+to continue to use the JSON API testing suite.
+
+### Removed
+- Dropped support for PHP 5.5
+
 ## [0.5.4] - 2016-12-21
 
 ### Fixed

UPGRADE.md

@@ -2,6 +2,29 @@
 
 This file provides notes on how to upgrade between versions.
 
+## v0.5 to v0.6
+
+### Config
+
+Add the following to your `json-api-errors.php` config file:
+
+```php
+  /**
+   * When the resource type of a related resource is not recognised.
+   */
+  V::RELATIONSHIP_UNKNOWN_TYPE => [
+      Error::TITLE => 'Invalid Relationship',
+      Error::DETAIL => "Resource type '{actual}' is not recognised.",
+      Error::STATUS => 400,
+  ],
+```
+
+### Other
+
+This upgrade includes updating `cloudcreativity/json-api` from v0.6 to v0.7. This will not affect the vast majority
+of applications. However, if you have implemented your own Store or Validator Error Factory, you will need to refer
+to the upgrade notes in that package.
+
 ## v0.5.0|v0.5.1 to v0.5.2
 
 Version `0.5.2` adds generator commands to your application. We've updated the configuration so you will need to

composer.json

@@ -22,17 +22,17 @@
         }
     ],
     "require": {
-        "php": ">=5.5.0",
-        "laravel/framework": "5.1.*|5.2.*|5.3.*",
-        "neomerx/json-api": "^0.8.9",
-        "cloudcreativity/json-api": "^0.6.0",
-        "symfony/psr-http-message-bridge": "^0.2.0|^1.0",
+        "php": "^5.6|^7.0",
+        "laravel/framework": "5.1.*|5.2.*|5.3.*|5.4.*",
+        "cloudcreativity/json-api": "^0.7",
+        "symfony/psr-http-message-bridge": "^1.0",
         "zendframework/zend-diactoros": "^1.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.7"
+        "phpunit/phpunit": "^5.7"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "CloudCreativity\\LaravelJsonApi\\": "src/"
@@ -44,8 +44,8 @@
         }
     },
     "extra": {
-      "branch-alias": {
-        "dev-develop": "0.6.x-dev"
-      }
+        "branch-alias": {
+            "dev-develop": "0.6.x-dev"
+        }
     }
 }

config/json-api-errors.php

@@ -122,6 +122,15 @@
         Error::STATUS => 422,
     ],
 
+    /**
+     * When the resource type of a related resource is not recognised.
+     */
+    V::RELATIONSHIP_UNKNOWN_TYPE => [
+        Error::TITLE => 'Invalid Relationship',
+        Error::DETAIL => "Resource type '{actual}' is not recognised.",
+        Error::STATUS => 400,
+    ],
+
     /**
      * When a related resource is not of the correct type for the relationship.
      */

src/Schema/CreatesEloquentIdentities.php

@@ -60,7 +60,14 @@ protected function createBelongsToIdentity(Model $model, $relationshipKey)
         }
 
         $related = $relation->getRelated()->replicate();
-        $related->{$relation->getOtherKey()} = $id;
+
+        /** Laravel 5.4 */
+        if (method_exists($relation, 'getOwnerKey')) {
+            $related->{$relation->getOwnerKey()} = $id;
+        } /** Laravel 5.1|5.2|5.3 */
+        else {
+            $related->{$relation->getOtherKey()} = $id;
+        }
 
         return $related;
     }

src/ServiceProvider.php

@@ -158,8 +158,15 @@ protected function bootPublishing()
      */
     protected function bootMiddleware(Router $router)
     {
-        $router->middleware('json-api', BootJsonApi::class);
-        $router->middleware('json-api.request', HandleRequest::class);
+        /** Laravel 5.4 */
+        if (method_exists($router, 'aliasMiddleware')) {
+            $router->aliasMiddleware('json-api', BootJsonApi::class);
+            $router->aliasMiddleware('json-api.request', HandleRequest::class);
+        } /** Laravel 5.1|5.2|5.3 */
+        else {
+            $router->middleware('json-api', BootJsonApi::class);
+            $router->middleware('json-api.request', HandleRequest::class);
+        }
     }
 
     /**
@@ -282,29 +289,32 @@ protected function bindErrorRepository()
     {
         $this->app->singleton(ReplacerInterface::class, Replacer::class);
 
-        $this->app->singleton(['json-api.errors' => ErrorRepositoryInterface::class], function () {
+        $this->app->singleton(ErrorRepositoryInterface::class, function () {
             /** @var ReplacerInterface $replacer */
             $replacer = $this->app->make(ReplacerInterface::class);
             $repository = new ErrorRepository($replacer);
             $repository->configure($this->getErrorConfig());
             return $repository;
         });
+        $this->app->alias(ErrorRepositoryInterface::class, 'json-api.errors');
     }
 
     /**
      * Bind the exception parser into the service container.
      */
     protected function bindExceptionParser()
     {
-        $this->app->singleton(['json-api.exceptions' => ExceptionParserInterface::class], ExceptionParser::class);
+        $this->app->singleton(ExceptionParserInterface::class, ExceptionParser::class);
+        $this->app->alias(ExceptionParserInterface::class, 'json-api.exceptions');
     }
 
     /**
      * Bind the store into the service container.
      */
     protected function bindStore()
     {
-        $this->app->singleton(['json-api.store' => StoreInterface::class], Store::class);
+        $this->app->singleton(StoreInterface::class, Store::class);
+        $this->app->alias(StoreInterface::class, 'json-api.store');
     }
 
     /**
@@ -341,7 +351,8 @@ protected function bindStoreAdapters()
      */
     protected function bindLinkFactory()
     {
-        $this->app->singleton(['json-api.links' => LinkFactoryInterface::class], LinkFactory::class);
+        $this->app->singleton(LinkFactoryInterface::class, LinkFactory::class);
+        $this->app->alias(LinkFactoryInterface::class, 'json-api.links');
     }
 
     /**