Merge branch 'release/1.0.0'

Author: lindyhopchris

.travis.yml

@@ -28,6 +28,10 @@ matrix:
     env:
     - LARAVEL_VERSION=5.7.*
     - PHPUNIT_VERSION=^7.0
+  - php: 7.2
+    env:
+      - LARAVEL_VERSION=5.8.*
+      - PHPUNIT_VERSION=^7.0
   - php: 7.3
     env:
     - LARAVEL_VERSION=5.5.*
@@ -40,6 +44,10 @@ matrix:
     env:
     - LARAVEL_VERSION=5.7.*
     - PHPUNIT_VERSION=^7.0
+  - php: 7.3
+    env:
+      - LARAVEL_VERSION=5.8.*
+      - PHPUNIT_VERSION=^7.5
 
 install:
 - composer require "laravel/framework:${LARAVEL_VERSION}" --no-update -n

CHANGELOG.md

@@ -2,6 +2,18 @@
 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] - 2019-02-28
+
+### Added
+- Package now supports Laravel 5.8.
+
+### Fixed
+- [#302](https://github.com/cloudcreativity/laravel-json-api/issues/302)
+Reject resource objects sent in relationships, as the spec defines that only resource identifiers
+are expected. This is based on the object having either an `attributes` or a `relationships` member.
+- [#295](https://github.com/cloudcreativity/laravel-json-api/issues/295)
+Use `null` for empty `from`/`to` fields in cursor page meta.
+
 ## [1.0.0-rc.2] - 2019-02-05
 
 ### Added

README.md

@@ -60,9 +60,10 @@ A demo application is available at [here](https://github.com/cloudcreativity/dem
 
 | Laravel | This Package | EOL? |
 | --- | --- | --- |
-| 5.7.* | `1.0.0-rc.2` | - |
-| 5.6.* | `1.0.0-rc.2` | - |
-| 5.5.* | `1.0.0-rc.2` | - |
+| 5.8.* | `^1.0` | - |
+| 5.7.* | `^1.0` | - |
+| 5.6.* | `^1.0` | - |
+| 5.5.* | `^1.0` | - |
 | 5.4.* | `1.0.0-beta.3` | EOL |
 
 Make sure you consult the [Upgrade Guide](http://laravel-json-api.readthedocs.io/en/latest/upgrade/) 

composer.json

@@ -25,24 +25,24 @@
         "php": "^7.1",
         "ext-json": "*",
         "cloudcreativity/utils-object": "^1.0",
-        "illuminate/console": "5.5.*|5.6.*|5.7.*",
-        "illuminate/contracts": "5.5.*|5.6.*|5.7.*",
-        "illuminate/database": "5.5.*|5.6.*|5.7.*",
-        "illuminate/filesystem": "5.5.*|5.6.*|5.7.*",
-        "illuminate/http": "5.5.*|5.6.*|5.7.*",
-        "illuminate/pagination": "5.5.*|5.6.*|5.7.*",
-        "illuminate/support": "5.5.*|5.6.*|5.7.*",
+        "illuminate/console": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/database": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/filesystem": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/http": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/pagination": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*",
         "neomerx/json-api": "^1.0.3",
         "ramsey/uuid": "^3.0",
         "symfony/psr-http-message-bridge": "^1.0",
         "zendframework/zend-diactoros": "^1.3"
     },
     "require-dev": {
         "ext-sqlite3": "*",
-        "cloudcreativity/json-api-testing": "1.0.0-rc.1",
+        "cloudcreativity/json-api-testing": "^1.0.0",
         "guzzlehttp/guzzle": "^6.3",
         "mockery/mockery": "^1.1",
-        "orchestra/testbench": "3.5.*|3.6.*|3.7.*",
+        "orchestra/testbench": "3.5.*|3.6.*|3.7.*|3.8.*",
         "phpunit/phpunit": "^6.0|^7.0"
     },
     "suggest": {

docs/installation.md

@@ -3,8 +3,8 @@
 Install using [Composer](http://getcomposer.org):
 
 ``` bash
-$ composer require cloudcreativity/laravel-json-api:1.0.0-rc.2
-$ composer require --dev cloudcreativity/json-api-testing:1.0.0-rc.1
+$ composer require cloudcreativity/laravel-json-api
+$ composer require --dev cloudcreativity/json-api-testing
 ```
 
 This package's service provider and facade will be automatically added using package discovery. You will

docs/upgrade.md

@@ -1,6 +1,6 @@
 # Upgrade Guide
 
-## 1.0.0-rc.1 to 1.0.0-rc.2
+## 1.0.0-rc.* to ^1.0
 
 No changes are required to upgrade.
 

resources/lang/en/errors.php

@@ -46,6 +46,12 @@
         'code' => '',
     ],
 
+    'member_identifier_expected' => [
+        'title' => 'Non-Compliant JSON API Document',
+        'detail' => 'The member :member must be a resource identifier.',
+        'code' => '',
+    ],
+
     'member_string_expected' => [
         'title' => 'Non-Compliant JSON API Document',
         'detail' => "The member :member must be a string.",

src/Codec/Decoding.php

@@ -20,7 +20,6 @@
 use CloudCreativity\LaravelJsonApi\Contracts\Decoder\DecoderInterface;
 use CloudCreativity\LaravelJsonApi\Decoder\JsonApiDecoder;
 use CloudCreativity\LaravelJsonApi\Exceptions\RuntimeException;
-use Illuminate\Support\Collection;
 use Neomerx\JsonApi\Contracts\Http\Headers\MediaTypeInterface;
 use Neomerx\JsonApi\Http\Headers\MediaType;
 

src/Pagination/CursorPaginator.php

@@ -123,6 +123,26 @@ public function getPerPage()
         return $this->cursor->getLimit();
     }
 
+    /**
+     * @return string|null
+     */
+    public function getFrom(): ?string
+    {
+        $first = $this->firstItem();
+
+        return $first ? (string) $first : null;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getTo(): ?string
+    {
+        $last = $this->lastItem();
+
+        return $last ? (string) $last : null;
+    }
+
     /**
      * @inheritDoc
      */
@@ -139,4 +159,20 @@ public function count()
         return $this->items->count();
     }
 
+    /**
+     * @return bool
+     */
+    public function isEmpty(): bool
+    {
+        return $this->items->isEmpty();
+    }
+
+    /**
+     * @return bool
+     */
+    public function isNotEmpty(): bool
+    {
+        return !$this->isEmpty();
+    }
+
 }

src/Pagination/CursorStrategy.php

@@ -263,7 +263,7 @@ protected function createFirstLink(CursorPaginator $paginator, array $parameters
     /**
      * @param CursorPaginator $paginator
      * @param array $parameters
-     * @return LinkInterface
+     * @return LinkInterface|null
      */
     protected function createNextLink(CursorPaginator $paginator, array $parameters = [])
     {
@@ -280,10 +280,14 @@ protected function createNextLink(CursorPaginator $paginator, array $parameters
     /**
      * @param CursorPaginator $paginator
      * @param array $parameters
-     * @return LinkInterface
+     * @return LinkInterface|null
      */
     protected function createPrevLink(CursorPaginator $paginator, array $parameters = [])
     {
+        if ($paginator->isEmpty()) {
+            return null;
+        }
+
         return $this->createLink([
             $this->before => $paginator->firstItem(),
             $this->limit => $paginator->getPerPage(),
@@ -325,8 +329,8 @@ protected function createMeta(CursorPaginator $paginator)
     {
         $meta = [
             'per-page' => $paginator->getPerPage(),
-            'from' => (string) $paginator->firstItem(),
-            'to' => (string) $paginator->lastItem(),
+            'from' => $paginator->getFrom(),
+            'to' => $paginator->getTo(),
             'has-more' => $paginator->hasMore(),
         ];