Merge branch 'release/1.0.0' into main

lindyhopchris · lindyhopchris · commit b5cf6e05d41b · 2021-07-31T19:45:34.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@
 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] - 2021-07-31
+
+### Fixed
+
+- Ensure the `DataResponse` class passes on its created flag if its data member is already a `JsonApiResource`.
+- Only add the `Location` header to a response if the resource has a `self` URL. Previously the header would be set with
+  a `null` value.
+
 ## [1.0.0-beta.5] - 2021-07-10
 
 ### Added
diff --git a/src/Core/Responses/DataResponse.php b/src/Core/Responses/DataResponse.php
@@ -137,7 +137,9 @@ private function prepareDataResponse($request)
         }
 
         if ($this->value instanceof JsonApiResource) {
-            return $this->value->prepareResponse($request);
+            return $this->value
+                ->prepareResponse($request)
+                ->withCreated($this->created);
         }
 
         $resources = $this->server()->resources();
diff --git a/src/Core/Responses/Internal/ResourceResponse.php b/src/Core/Responses/Internal/ResourceResponse.php
@@ -131,8 +131,8 @@ protected function headers(): array
             ->merge($this->headers ?: [])
             ->all();
 
-        if ($this->resourceWasCreated()) {
-            $headers['Location'] = $this->resource->selfUrl();
+        if ($this->resourceWasCreated() && $selfUrl = $this->resource->selfUrl()) {
+            $headers['Location'] = $selfUrl;
         }
 
         return $headers;

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,9 @@ private function prepareDataResponse($request)`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`if ($this->value instanceof JsonApiResource) {`
`140`		`- return $this->value->prepareResponse($request);`
	`140`	`+ return $this->value`
	`141`	`+ ->prepareResponse($request)`
	`142`	`+ ->withCreated($this->created);`
`141`	`143`	`}`
`142`	`144`
`143`	`145`	`$resources = $this->server()->resources();`
Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,8 @@ protected function headers(): array`
`131`	`131`	`->merge($this->headers ?: [])`
`132`	`132`	`->all();`
`133`	`133`
`134`		`- if ($this->resourceWasCreated()) {`
`135`		`- $headers['Location'] = $this->resource->selfUrl();`
	`134`	`+ if ($this->resourceWasCreated() && $selfUrl = $this->resource->selfUrl()) {`
	`135`	`+ $headers['Location'] = $selfUrl;`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`return $headers;`