Merge branch 'release/2.1.1'

laravel-json-api · Apr 1, 2022 · 6290b39 · 6290b39
2 parents 53fc76b + 17710e7
commit 6290b39
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 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/).
 
+## [2.1.1] - 2022-04-01
+
+### Fixed
+
+- [#178](https://github.com/laravel-json-api/laravel/issues/178) Allow a resource id that is `"0"`.
+
 ## [2.1.0] - 2022-02-20
 
 ### Added

diff --git a/README.md b/README.md
@@ -92,7 +92,7 @@ See our website, [laraveljsonapi.io](https://laraveljsonapi.io)
 ### Tutorial
 
 New to JSON:API and/or Laravel JSON:API? Then
-the [Laravel JSON:API tutorial](https://laraveljsonapi.io/docs/1.0/tutorial/)
+the [Laravel JSON:API tutorial](https://laraveljsonapi.io/docs/2.0/tutorial/)
 is a great way to learn!
 
 Follow the tutorial to build a blog application with a JSON:API compliant API.

diff --git a/composer.json b/composer.json
@@ -25,11 +25,11 @@
     "require": {
         "php": "^7.4|^8.0",
         "ext-json": "*",
-        "laravel-json-api/core": "^2.1",
+        "laravel-json-api/core": "^2.2",
         "laravel-json-api/eloquent": "^2.1",
         "laravel-json-api/encoder-neomerx": "^2.0",
         "laravel-json-api/exceptions": "^1.1",
-        "laravel-json-api/spec": "^1.1",
+        "laravel-json-api/spec": "^1.1.1",
         "laravel-json-api/validation": "^2.0",
         "laravel/framework": "^8.76|^9.0"
     },

diff --git a/src/Routing/Route.php b/src/Routing/Route.php
@@ -27,6 +27,7 @@
 use LaravelJsonApi\Contracts\Schema\Relation;
 use LaravelJsonApi\Contracts\Schema\Schema;
 use LaravelJsonApi\Contracts\Server\Server;
+use LaravelJsonApi\Core\Document\ResourceIdentifier;
 use LogicException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -99,11 +100,13 @@ public function modelOrResourceId()
             throw new LogicException('No JSON API resource id name set on route.');
         }
 
-        if ($modelOrResourceId = $this->route->parameter($name)) {
-            return $modelOrResourceId;
+        $modelOrResourceId = $this->route->parameter($name);
+
+        if (!is_object($modelOrResourceId) && ResourceIdentifier::idIsEmpty($modelOrResourceId)) {
+            throw new LogicException('No JSON API resource id set on route.');
         }
 
-        throw new LogicException('No JSON API resource id set on route.');
+        return $modelOrResourceId;
     }
 
     /**