Merge branch 'release/1.0.0-beta.2' into main

Author: lindyhopchris

CHANGELOG.md

@@ -3,6 +3,27 @@
 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/).
 
+## [1.0.0-beta.2] - 2021-04-20
+
+### Added
+
+- [#65](https://github.com/laravel-json-api/laravel/issues/65) **BREAKING** The `fill()` method on Eloquent fields has
+  been updated to receive all the validated data as its third argument. This change was made to allow fields to work out
+  the value to fill into the model based on other JSON:API field values. If you have written any custom fields, you will
+  need to update the `fill()` method on your field class.
+- **BREAKING** Eloquent attributes now support serializing and filling column values on related objects. This is
+  primarily intended for use with the Eloquent `belongsTo`, `hasOne`, `hasOneThrough` and `morphOne` relationships that
+  have a `withDefault()` method. As part of this change, the `mustExist()` method was added to the `Fillable` interface.
+  If you have written any custom fields, you will need to add this method to your field class - it should return `true`
+  if the attribute needs to be filled *after* the primary model has been persisted.
+- [#58](https://github.com/laravel-json-api/laravel/issues/58) Schema model classes can now be a parent class or an
+  interface.
+
+### Fixed
+
+- [#69](https://github.com/laravel-json-api/laravel/issues/69) Fixed the parsing of empty `include`, `sort` and
+  `withCount` query parameters.
+
 ## [1.0.0-beta.1] - 2021-03-30
 
 ### Added

composer.json

@@ -25,16 +25,16 @@
     "require": {
         "php": "^7.4|^8.0",
         "ext-json": "*",
-        "laravel-json-api/core": "^1.0.0-beta.1",
-        "laravel-json-api/eloquent": "^1.0.0-beta.1",
+        "laravel-json-api/core": "^1.0.0-beta.2",
+        "laravel-json-api/eloquent": "^1.0.0-beta.2",
         "laravel-json-api/encoder-neomerx": "^1.0.0-beta.1",
-        "laravel-json-api/exceptions": "^1.0.0-beta.1",
+        "laravel-json-api/exceptions": "^1.0.0-beta.2",
         "laravel-json-api/spec": "^1.0.0-beta.1",
         "laravel-json-api/validation": "^1.0.0-beta.1",
         "laravel/framework": "^8.0"
     },
     "require-dev": {
-        "laravel-json-api/hashids": "^1.0.0-beta.1",
+        "laravel-json-api/hashids": "^1.0.0-beta.2",
         "laravel-json-api/testing": "^1.0.0-beta.1",
         "orchestra/testbench": "^6.9",
         "phpunit/phpunit": "^9.5"

src/Http/Requests/ResourceQuery.php

@@ -95,7 +95,7 @@ public static function guessQueryOneUsing(callable $resolver): void
      */
     public static function queryOne(string $resourceType): QueryParameters
     {
-        $resolver = self::$queryManyResolver ?: new RequestResolver(RequestResolver::QUERY);
+        $resolver = self::$queryOneResolver ?: new RequestResolver(RequestResolver::QUERY);
 
         return $resolver($resourceType);
     }