Merge branch 'release/3.1.0' into main

lindyhopchris · lindyhopchris · commit 6dfbbf48354b · 2023-07-20T18:24:31.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 vendor/
 composer.lock
 .phpunit.result.cache
+.phpunit.cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 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/).
 
+## [3.1.0] - 2023-07-20
+
+### Added
+
+- [core#12](https://github.com/laravel-json-api/core/pull/12) Add `ulid()` method to the `ID` field class.
+
 ## [3.0.0] - 2023-02-14
 
 ### Changed
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "laravel-json-api/core": "^3.0",
+        "laravel-json-api/core": "^3.2",
         "laravel-json-api/eloquent": "^3.0",
         "laravel-json-api/encoder-neomerx": "^3.0",
         "laravel-json-api/exceptions": "^2.0",
@@ -34,9 +34,9 @@
         "laravel/framework": "^10.0"
     },
     "require-dev": {
-        "laravel-json-api/testing": "^2.0",
+        "laravel-json-api/testing": "^2.1",
         "orchestra/testbench": "^8.0",
-        "phpunit/phpunit": "^9.5.28"
+        "phpunit/phpunit": "^10.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         convertDeprecationsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
->
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false"
+         beStrictAboutTestsThatDoNotTestAnything="true" bootstrap="vendor/autoload.php" colors="true"
+         processIsolation="false" stopOnError="false" stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false">
+    <coverage/>
     <testsuites>
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/lib/Unit/</directory>
@@ -38,4 +23,9 @@
         <ini name="error_reporting" value="E_ALL"/>
         <env name="DB_CONNECTION" value="testing"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/tests/dummy/tests/Api/V1/Posts/UpdateTest.php b/tests/dummy/tests/Api/V1/Posts/UpdateTest.php
@@ -90,7 +90,7 @@ public function test(): void
     /**
      * @return array
      */
-    public function fieldProvider(): array
+    public static function fieldProvider(): array
     {
         return [
             ['content'],
diff --git a/tests/dummy/tests/Api/V1/TestCase.php b/tests/dummy/tests/Api/V1/TestCase.php
@@ -46,7 +46,7 @@ protected function setUp(): void
     /**
      * @return array
      */
-    public function notAcceptableMediaTypeProvider(): array
+    public static function notAcceptableMediaTypeProvider(): array
     {
         return [
             'application/json' => ['application/json'],
diff --git a/tests/lib/Acceptance/Relationships/ToManyLinksTest.php b/tests/lib/Acceptance/Relationships/ToManyLinksTest.php
@@ -68,7 +68,7 @@ protected function setUp(): void
     /**
      * @return array[]
      */
-    public function scenarioProvider(): array
+    public static function scenarioProvider(): array
     {
         return [
             'hidden' => [
diff --git a/tests/lib/Acceptance/Relationships/ToOneLinksTest.php b/tests/lib/Acceptance/Relationships/ToOneLinksTest.php
@@ -61,7 +61,7 @@ protected function setUp(): void
     /**
      * @return array[]
      */
-    public function scenarioProvider(): array
+    public static function scenarioProvider(): array
     {
         return [
             'hidden' => [
diff --git a/tests/lib/Integration/Routing/ActionsTest.php b/tests/lib/Integration/Routing/ActionsTest.php
@@ -30,7 +30,7 @@ class ActionsTest extends TestCase
     /**
      * @return array
      */
-    public function methodProvider(): array
+    public static function methodProvider(): array
     {
         return [
             'GET' => ['GET'],
diff --git a/tests/lib/Integration/Routing/HasManyTest.php b/tests/lib/Integration/Routing/HasManyTest.php
@@ -29,7 +29,7 @@ class HasManyTest extends TestCase
     /**
      * @return array
      */
-    public function genericProvider(): array
+    public static function genericProvider(): array
     {
         return [
             'showRelated' => [
@@ -181,7 +181,7 @@ public function testUri(string $method, string $uri): void
     /**
      * @return array[]
      */
-    public function onlyProvider(): array
+    public static function onlyProvider(): array
     {
         return [
             ['related', [
@@ -259,7 +259,7 @@ public function testOnly($only, array $matches): void
     /**
      * @return array
      */
-    public function exceptProvider()
+    public static function exceptProvider(): array
     {
         return [
             ['related', [
@@ -365,7 +365,7 @@ public function testReadOnly(): void
     /**
      * @return array
      */
-    public function ownActionProvider(): array
+    public static function ownActionProvider(): array
     {
         return [
             'showRelated' => [
diff --git a/tests/lib/Integration/Routing/HasOneTest.php b/tests/lib/Integration/Routing/HasOneTest.php
@@ -29,7 +29,7 @@ class HasOneTest extends TestCase
     /**
      * @return array
      */
-    public function genericProvider(): array
+    public static function genericProvider(): array
     {
         return [
             'showRelated' => [
@@ -173,7 +173,7 @@ public function testUri(string $method, string $uri, string $action, string $nam
     /**
      * @return array[]
      */
-    public function onlyProvider(): array
+    public static function onlyProvider(): array
     {
         return [
             ['related', [
@@ -228,7 +228,7 @@ public function testOnly($only, array $matches): void
     /**
      * @return array
      */
-    public function exceptProvider()
+    public static function exceptProvider(): array
     {
         return [
             ['related', [
@@ -308,7 +308,7 @@ public function testReadOnly(): void
     /**
      * @return array
      */
-    public function ownActionProvider(): array
+    public static function ownActionProvider(): array
     {
         return [
             'showRelated' => [
diff --git a/tests/lib/Integration/Routing/ResourceTest.php b/tests/lib/Integration/Routing/ResourceTest.php
@@ -30,7 +30,7 @@ class ResourceTest extends TestCase
     /**
      * @return array
      */
-    public function routeProvider(): array
+    public static function routeProvider(): array
     {
         return [
             'index' => ['GET', '/api/v1/posts', 'index', false],
@@ -330,7 +330,7 @@ public function testResourceParameter(string $method, string $uri, string $actio
     /**
      * @return array
      */
-    public function onlyProvider(): array
+    public static function onlyProvider(): array
     {
         return [
             ['index', [
@@ -390,7 +390,7 @@ public function testOnly($only, array $matches): void
     /**
      * @return array
      */
-    public function exceptProvider(): array
+    public static function exceptProvider(): array
     {
         return [
             ['store', [
@@ -474,7 +474,7 @@ public function testReadOnly(): void
     /**
      * @return array
      */
-    public function resourceMethodProvider(): array
+    public static function resourceMethodProvider(): array
     {
         return [
             'GET' => ['GET'],

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function test(): void`
`90`	`90`	`/**`
`91`	`91`	`* @return array`
`92`	`92`	`*/`
`93`		`- public function fieldProvider(): array`
	`93`	`+ public static function fieldProvider(): array`
`94`	`94`	`{`
`95`	`95`	`return [`
`96`	`96`	`['content'],`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ protected function setUp(): void`
`46`	`46`	`/**`
`47`	`47`	`* @return array`
`48`	`48`	`*/`
`49`		`- public function notAcceptableMediaTypeProvider(): array`
	`49`	`+ public static function notAcceptableMediaTypeProvider(): array`
`50`	`50`	`{`
`51`	`51`	`return [`
`52`	`52`	`'application/json' => ['application/json'],`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ protected function setUp(): void`
`68`	`68`	`/**`
`69`	`69`	`* @return array[]`
`70`	`70`	`*/`
`71`		`- public function scenarioProvider(): array`
	`71`	`+ public static function scenarioProvider(): array`
`72`	`72`	`{`
`73`	`73`	`return [`
`74`	`74`	`'hidden' => [`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ protected function setUp(): void`
`61`	`61`	`/**`
`62`	`62`	`* @return array[]`
`63`	`63`	`*/`
`64`		`- public function scenarioProvider(): array`
	`64`	`+ public static function scenarioProvider(): array`
`65`	`65`	`{`
`66`	`66`	`return [`
`67`	`67`	`'hidden' => [`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class ActionsTest extends TestCase`
`30`	`30`	`/**`
`31`	`31`	`* @return array`
`32`	`32`	`*/`
`33`		`- public function methodProvider(): array`
	`33`	`+ public static function methodProvider(): array`
`34`	`34`	`{`
`35`	`35`	`return [`
`36`	`36`	`'GET' => ['GET'],`