Merge branch 'release/7.1.0'

Author: lindyhopchris

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
+        php: [8.2, 8.3, 8.4]
         laravel: [11]
 
     steps:

CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [7.1.0] - 2025-01-11
+
+### Changed
+
+- Removed PHP 8.4 deprecation notices.
+
+### Fixed
+
+- [#648](https://github.com/cloudcreativity/laravel-json-api/pull/648) Ensure self link is removed when it is returned
+  as `false`.
+
 ## [7.0.0] - 2024-03-14
 
 ### Changed
@@ -39,7 +50,7 @@ All notable changes to this project will be documented in this file. This projec
 
 - **BREAKING** Upgraded the `neomerx/json-api` dependency from `v1` to `v5` of our fork
   `laravel-json-api/neomerx-json-api`. Refer to the [Upgrade Guide](./docs/upgrade.md) for details of the required
-  changes.  
+  changes.
 
 ## [4.1.0] - 2023-01-21
 

composer.json

@@ -24,7 +24,7 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "laravel-json-api/neomerx-json-api": "^5.0.2",
+        "laravel-json-api/neomerx-json-api": "^5.0.3",
         "laravel/framework": "^11.0",
         "nyholm/psr7": "^1.8",
         "ramsey/uuid": "^4.0",

docs/basics/schemas.md

@@ -392,9 +392,9 @@ class Schema extends SchemaProvider
 {
     // ...
 
-    public function getResourceLinks($resource): ?array
+    public function getResourceLinks($resource): iterable
     {
-        return null;
+        return ['self' => false];
     }
 }
 ```

src/Api/Repository.php

@@ -72,7 +72,7 @@ public function exists($apiName)
      *      route parameters, if needed.
      * @return Api
      */
-    public function createApi(string $apiName, string $host = null, array $parameters = [])
+    public function createApi(string $apiName, ?string $host = null, array $parameters = [])
     {
         $config = $this->configFor($apiName);
         $config = $this->normalize($config, $host);

src/Broadcasting/BroadcastsData.php

@@ -51,7 +51,7 @@ protected function broadcastEncoder()
      * @param array|null $fieldsets
      * @return array
      */
-    protected function serializeData($data, $includePaths = null, array $fieldsets = null)
+    protected function serializeData($data, $includePaths = null, ?array $fieldsets = null)
     {
         $params = new QueryParameters($includePaths ? (array) $includePaths : null, $fieldsets);
 

src/Client/AbstractClient.php

@@ -72,7 +72,7 @@ abstract class AbstractClient implements ClientInterface
     abstract protected function request(
         $method,
         $uri,
-        array $payload = null,
+        ?array $payload = null,
         array $parameters = []
     );
 

src/Client/GuzzleClient.php

@@ -60,7 +60,7 @@ public function __construct(
     protected function request(
         $method,
         $uri,
-        array $payload = null,
+        ?array $payload = null,
         array $parameters = []
     ) {
         $request = new Request($method, $uri);

src/Codec/Encoding.php

@@ -54,7 +54,7 @@ class Encoding
     public static function create(
         $mediaType,
         int $options = 0,
-        string $urlPrefix = null,
+        ?string $urlPrefix = null,
         int $depth = 512
     ): self
     {
@@ -73,7 +73,7 @@ public static function create(
      * @param int $depth
      * @return Encoding
      */
-    public static function jsonApi(int $options = 0, string $urlPrefix = null, int $depth = 512): self
+    public static function jsonApi(int $options = 0, ?string $urlPrefix = null, int $depth = 512): self
     {
         return self::create(
             MediaTypeInterface::JSON_API_MEDIA_TYPE,
@@ -104,7 +104,7 @@ public static function custom($mediaType): self
      * @param string|null $urlPrefix
      * @return Encoding
      */
-    public static function fromArray($key, $value, string $urlPrefix = null): self
+    public static function fromArray($key, $value, ?string $urlPrefix = null): self
     {
         if (is_numeric($key)) {
             $key = $value;

src/Codec/EncodingList.php

@@ -47,7 +47,7 @@ class EncodingList implements IteratorAggregate, Countable
      * @param string|null $urlPrefix
      * @return EncodingList
      */
-    public static function fromArray(iterable $config, string $urlPrefix = null): self
+    public static function fromArray(iterable $config, ?string $urlPrefix = null): self
     {
         $values = Collection::make($config)
             ->map(fn($value, $key) => Encoding::fromArray($key, $value, $urlPrefix))