Merge branch 'hotfix/1.3.1'

Author: lindyhopchris

.travis.yml

@@ -4,42 +4,43 @@ sudo: false
 
 matrix:
   include:
-    - php: 7.1
+    - php: "7.1"
       env:
         - LARAVEL_VERSION=5.5.*
         - PHPUNIT_VERSION=^6.5
-    - php: 7.1
+    - php: "7.1"
       env:
         - LARAVEL_VERSION=5.6.*
         - PHPUNIT_VERSION=^7.0
-    - php: 7.1
+    - php: "7.1"
       env:
         - LARAVEL_VERSION=5.7.*
         - PHPUNIT_VERSION=^7.0
-    - php: 7.2
+    - php: "7.2"
       env:
         - LARAVEL_VERSION=5.5.*
         - PHPUNIT_VERSION=^6.5
-    - php: 7.2
+    - php: "7.2"
       env:
         - LARAVEL_VERSION=5.8.*
         - PHPUNIT_VERSION=^7.0
-    - php: 7.2
-      env:
-        - LARAVEL_VERSION=5.9.*
-        - PHPUNIT_VERSION=^7.0
-    - php: 7.3
+    - php: "7.3"
       env:
         - LARAVEL_VERSION=5.5.*
         - PHPUNIT_VERSION=^6.5
-    - php: 7.3
+    - php: "7.3"
       env:
         - LARAVEL_VERSION=5.8.*
         - PHPUNIT_VERSION=^7.0
-    - php: 7.3
+    - php: "7.3"
+      env:
+        - LARAVEL_VERSION=^6.0
+        - PHPUNIT_VERSION=^8.0
+  allow_failures:
+    - php: "7.3"
       env:
-        - LARAVEL_VERSION=5.9.*
-        - PHPUNIT_VERSION=^7.5
+        - LARAVEL_VERSION=^6.0
+        - PHPUNIT_VERSION=^8.0
 
 install:
   - composer require "laravel/framework:${LARAVEL_VERSION}" --no-update -n

CHANGELOG.md

@@ -2,9 +2,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.3.0] - 2019-07-24
+## [1.3.1] - 2019-08-19
+
+### Fixed
+- Updated Travis config for Laravel `5.9` being renamed `6.0`.
+- [#400](https://github.com/cloudcreativity/laravel-json-api/pull/400)
+Fix overridden variable in error translator.
 
-Package now supports Laravel 5.9.
+## [1.3.0] - 2019-07-24
 
 ### Added
 - [#352](https://github.com/cloudcreativity/laravel-json-api/issues/352)

README.md

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

composer.json

@@ -25,13 +25,13 @@
         "php": "^7.1",
         "ext-json": "*",
         "cloudcreativity/utils-object": "^1.0",
-        "illuminate/console": "5.5.*|5.6.*|5.7.*|5.8.*|5.9.*",
-        "illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*|5.9.*",
-        "illuminate/database": "5.5.*|5.6.*|5.7.*|5.8.*|5.9.*",
-        "illuminate/filesystem": "5.5.*|5.6.*|5.7.*|5.8.*|5.9.*",
-        "illuminate/http": "5.5.*|5.6.*|5.7.*|5.8.*|5.9.*",
-        "illuminate/pagination": "5.5.*|5.6.*|5.7.*|5.8.*|5.9.*",
-        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|5.9.*",
+        "illuminate/console": "^5.5|^6.0",
+        "illuminate/contracts": "^5.5|^6.0",
+        "illuminate/database": "^5.5|^6.0",
+        "illuminate/filesystem": "^5.5|^6.0",
+        "illuminate/http": "^5.5|^6.0",
+        "illuminate/pagination": "^5.5|^6.0",
+        "illuminate/support": "^5.5|^6.0",
         "neomerx/json-api": "^1.0.3",
         "ramsey/uuid": "^3.0",
         "symfony/psr-http-message-bridge": "^1.0",
@@ -43,8 +43,8 @@
         "composer/semver": "^1.5",
         "guzzlehttp/guzzle": "^6.3",
         "mockery/mockery": "^1.1",
-        "orchestra/testbench": "3.5.*|3.6.*|3.7.*|3.8.*|3.9.*",
-        "phpunit/phpunit": "^6.0|^7.0"
+        "orchestra/testbench": "^3.5|^4.0",
+        "phpunit/phpunit": "^6.0|^7.0|^8.0"
     },
     "suggest": {
         "cloudcreativity/json-api-testing": "Required to use the test helpers."

src/Validation/ErrorTranslator.php

@@ -416,10 +416,9 @@ public function failedValidator(ValidatorContract $validator, \Closure $closure
             $failures = $this->createValidationFailures($failed[$key] ?? []);
 
             foreach ($messages as $detail) {
-                $failed = $failures->shift() ?: [];
-
                 if ($closure) {
-                    $errors->add($this->call($closure, $key, $detail, $failed));
+                    $currentFailure = $failures->shift() ?: [];
+                    $errors->add($this->call($closure, $key, $detail, $currentFailure));
                     continue;
                 }