v1.3.0

floor9design-ltd · Feb 20, 2023 · fcb66d4 · fcb66d4
1 parent c602984
commit fcb66d4
Show file tree

Hide file tree

Showing 36 changed files with 95 additions and 92 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,7 +7,7 @@
 # @author    Rick Morice <rick@floor9design.com>
 # @copyright Floor9design Ltd
 # @license   MIT
-# @version   1.0
+# @version   1.3.0
 # @link      https://github.com/floor9design-ltd/json-api-formatter
 # @link      https://floor9design.com
 # @since     File available since pre-release development cycle

diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@
 # @author    Rick Morice <rick@floor9design.com>
 # @copyright Floor9design Ltd
 # @license   MIT
-# @version   1.0
+# @version   1.3.0
 # @link      https://github.com/floor9design-ltd/json-api-formatter
 # @link      https://floor9design.com
 # @since     File available since pre-release development cycle
@@ -21,4 +21,4 @@ vendor
 # Testing
 docs/tests/*
 docs/phpdoc/*
-/.phpunit.result.cache
+/.phpunit.cache
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@
 # @author    Rick Morice <rick@floor9design.com>
 # @copyright Floor9design Ltd
 # @license   MIT
-# @version   1.0
+# @version   1.3.0
 # @link      https://github.com/floor9design-ltd/json-api-formatter
 # @link      https://floor9design.com
 # @since     File available since pre-release development cycle

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.0 - 1.3.0
+
+* Support for PhpUnit 10 
+* Ongoing tweaks/improvements to functionality
+* Fixing missing edge case requirements (advanced nested elements etc)
+* Fixing some edge case json-api validation problems
+
 ## 1.0.0
 
 * Initial release following 6 months production beta testing

diff --git a/phpstan.neon b/phpstan.neon
@@ -7,7 +7,7 @@
 # @author    Rick Morice <rick@floor9design.com>
 # @copyright Floor9design Ltd
 # @license   MIT
-# @version   1.0
+# @version   1.3.0
 # @link      https://github.com/floor9design-ltd/json-api-formatter
 # @link      https://floor9design.com
 # @since     File available since pre-release development cycle

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,29 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true"
->
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <report>
-            <clover outputFile="docs/tests/clover.xml"/>
-            <html outputDirectory="docs/tests/"/>
-        </report>
-    </coverage>
-    <testsuites>
-        <testsuite name="Unit">
-            <directory>./tests/Unit</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <server name="APP_ENV" value="testing"/>
-        <server name="BCRYPT_ROUNDS" value="4"/>
-        <server name="CACHE_DRIVER" value="array"/>
-        <server name="MAIL_DRIVER" value="array"/>
-        <server name="QUEUE_CONNECTION" value="sync"/>
-        <server name="SESSION_DRIVER" value="array"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <report>
+      <clover outputFile="docs/tests/clover.xml"/>
+      <html outputDirectory="docs/tests/"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory>./tests/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <server name="APP_ENV" value="testing"/>
+    <server name="BCRYPT_ROUNDS" value="4"/>
+    <server name="CACHE_DRIVER" value="array"/>
+    <server name="MAIL_DRIVER" value="array"/>
+    <server name="QUEUE_CONNECTION" value="sync"/>
+    <server name="SESSION_DRIVER" value="array"/>
+  </php>
 </phpunit>
diff --git a/src/Exceptions/JsonApiFormatterException.php b/src/Exceptions/JsonApiFormatterException.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -29,7 +29,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  * @see       https://jsonapi.org/format/

diff --git a/src/Models/DataResource.php b/src/Models/DataResource.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -30,7 +30,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/DataResourceMeta.php b/src/Models/DataResourceMeta.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -32,7 +32,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/Error.php b/src/Models/Error.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -32,7 +32,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/Included.php b/src/Models/Included.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -32,7 +32,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/JsonApiFormatter.php b/src/Models/JsonApiFormatter.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -33,7 +33,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/Link.php b/src/Models/Link.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -33,7 +33,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/Links.php b/src/Models/Links.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -35,7 +35,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/Meta.php b/src/Models/Meta.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -30,7 +30,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/Relationship.php b/src/Models/Relationship.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -32,7 +32,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/RelationshipData.php b/src/Models/RelationshipData.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -32,7 +32,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/RelationshipLinks.php b/src/Models/RelationshipLinks.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -35,7 +35,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/RelationshipMeta.php b/src/Models/RelationshipMeta.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -32,7 +32,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/Relationships.php b/src/Models/Relationships.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -34,7 +34,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/src/Models/Source.php b/src/Models/Source.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @since     File available since pre-release development cycle
  *
@@ -33,7 +33,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.1.1
+ * @version   1.3.0
  * @link      https://www.floor9design.com
  * @link      https://jsonapi.org/
  * @link      https://jsonapi-validator.herokuapp.com/

diff --git a/tests/Unit/DataResourceMetaTest.php b/tests/Unit/DataResourceMetaTest.php
@@ -11,7 +11,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.0
+ * @version   1.3.0
  * @link      https://github.com/floor9design-ltd/json-api-formatter
  * @link      https://floor9design.com
  * @since     File available since Release 1.0
@@ -33,7 +33,7 @@
  * @author    Rick Morice <rick@floor9design.com>
  * @copyright Floor9design Ltd
  * @license   MIT
- * @version   1.0
+ * @version   1.3.0
  * @link      https://github.com/floor9design-ltd/json-api-formatter
  * @link      https://floor9design.com
  * @since     File available since Release 1.0