Merge branch 'release/3.0.1'

lindyhopchris · lindyhopchris · commit 11a8efdced15 · 2020-10-14T10:08:20.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,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/).
 
+## [3.0.1] - 2020-10-14
+
+### Fixed
+- [#560](https://github.com/cloudcreativity/laravel-json-api/pull/560)
+Fixed type-hinting in abstract adapter stub.
+
 ## [3.0.0] - 2020-09-09
 
 ### Added
diff --git a/docs/features/media-types.md b/docs/features/media-types.md
@@ -461,13 +461,13 @@ To use a re-usable content negotiator on specific resource types, use the `conte
 when registering the resource. For example, if we wanted to use the `json` content negotiator only
 for the `posts` and `comments` resources, but not the `tags` resource:
 
- ```php
- JsonApi::register('default')->routes(function ($api, $router) {
-     $api->resource('posts')->contentNegotiator('json');
-     $api->resource('comments')->contentNegotiator('json');
-     $api->resource('tags'); // uses the default content negotiator
- });
- ```
+```php
+JsonApi::register('default')->routes(function ($api, $router) {
+    $api->resource('posts')->contentNegotiator('json');
+    $api->resource('comments')->contentNegotiator('json');
+    $api->resource('tags'); // uses the default content negotiator
+});
+```
 
 If you have generated a resource-specific content negotiator, it will be automatically detected so there
 is no need to configure it.
diff --git a/stubs/abstract/adapter.stub b/stubs/abstract/adapter.stub
@@ -53,7 +53,7 @@ class DummyClass extends AbstractResourceAdapter
     /**
      * @inheritDoc
      */
-    public function exists($resourceId)
+    public function exists(string $resourceId): bool
     {
         // TODO: Implement exists() method.
     }
@@ -69,7 +69,7 @@ class DummyClass extends AbstractResourceAdapter
     /**
      * @inheritDoc
      */
-    public function findMany(array $resourceIds)
+    public function findMany(iterable $resourceIds): iterable
     {
         // TODO: Implement findMany() method.
     }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class DummyClass extends AbstractResourceAdapter`
`53`	`53`	`/**`
`54`	`54`	`* @inheritDoc`
`55`	`55`	`*/`
`56`		`- public function exists($resourceId)`
	`56`	`+ public function exists(string $resourceId): bool`
`57`	`57`	`{`
`58`	`58`	`// TODO: Implement exists() method.`
`59`	`59`	`}`
`@@ -69,7 +69,7 @@ class DummyClass extends AbstractResourceAdapter`
`69`	`69`	`/**`
`70`	`70`	`* @inheritDoc`
`71`	`71`	`*/`
`72`		`- public function findMany(array $resourceIds)`
	`72`	`+ public function findMany(iterable $resourceIds): iterable`
`73`	`73`	`{`
`74`	`74`	`// TODO: Implement findMany() method.`
`75`	`75`	`}`