Merge pull request #30 from FreeElephants/dev-2025-02

developerstudservis · web-flow · commit c98539ed979c · 2025-02-06T14:08:30.000+03:00
composer conflict, remove test class
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Add conflict with origin neomerx/json-api (use fork laravel-json-api/neomerx-json-api for best php 8.* support)
+
 ## [0.0.15] - 2025-02-06
 
 ### Added
diff --git a/composer.json b/composer.json
@@ -43,6 +43,9 @@
         "laminas/laminas-httphandlerrunner": "*",
         "nyholm/psr7": "^1.2"
     },
+    "conflict": {
+        "neomerx/json-api": "*"
+    },
     "autoload": {
         "psr-4": {
             "FreeElephants\\": [
diff --git a/tests/FreeElephants/JsonApiToolkit/DTO/ResourceObjectTest.php b/tests/FreeElephants/JsonApiToolkit/DTO/ResourceObjectTest.php
@@ -31,8 +31,3 @@ public function testRelationshipTypes()
         $this->assertSame('one', $resourceObject->relationships->one->data->type);
     }
 }
-
-class Attributes extends AbstractAttributes
-{
-    public string $foo;
-}

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,3 @@ public function testRelationshipTypes()`
`31`	`31`	`$this->assertSame('one', $resourceObject->relationships->one->data->type);`
`32`	`32`	`}`
`33`	`33`	`}`
`34`		`-`
`35`		`-class Attributes extends AbstractAttributes`
`36`		`-{`
`37`		`- public string $foo;`
`38`		`-}`