switch to spatie/laravel-data DTOs

Astrotomic · Nov 9, 2022 · a449307 · a449307
1 parent 218711d
commit a449307
Show file tree

Hide file tree

Showing 36 changed files with 107 additions and 396 deletions.
diff --git a/composer.json b/composer.json
@@ -10,12 +10,6 @@
             "role": "Developer"
         }
     ],
-    "homepage": "https://github.com/Astrotomic/steam-sdk",
-    "support": {
-        "issues": "https://github.com/Astrotomic/steam-sdk/issues",
-        "source": "https://github.com/Astrotomic/steam-sdk",
-        "docs": "https://docs.ecologi.com/docs/public-api-docs"
-    },
     "funding": [
         {
             "type": "github",
@@ -32,6 +26,7 @@
         "illuminate/support": "^9.0",
         "sammyjo20/saloon": "^1.5.2",
         "sammyjo20/saloon-laravel": "^1.5.0",
+        "spatie/laravel-data": "^2.0",
         "xpaw/steamid": "^2.0"
     },
     "require-dev": {

diff --git a/src/Collections/AchievementPercentageCollection.php b/src/Collections/AchievementPercentageCollection.php
diff --git a/src/Collections/ApiInterfaceCollection.php b/src/Collections/ApiInterfaceCollection.php
diff --git a/src/Collections/ApiMethodCollection.php b/src/Collections/ApiMethodCollection.php
diff --git a/src/Collections/ApiParameterCollection.php b/src/Collections/ApiParameterCollection.php
diff --git a/src/Collections/AppCollection.php b/src/Collections/AppCollection.php
diff --git a/src/Collections/Collection.php b/src/Collections/Collection.php
diff --git a/src/Collections/FriendCollection.php b/src/Collections/FriendCollection.php
diff --git a/src/Collections/LocationCityCollection.php b/src/Collections/LocationCityCollection.php
diff --git a/src/Collections/LocationCountryCollection.php b/src/Collections/LocationCountryCollection.php
diff --git a/src/Collections/LocationStateCollection.php b/src/Collections/LocationStateCollection.php
diff --git a/src/Collections/NewsItemCollection.php b/src/Collections/NewsItemCollection.php
diff --git a/src/Collections/PlayerBanCollection.php b/src/Collections/PlayerBanCollection.php
diff --git a/src/Collections/PlayerSummaryCollection.php b/src/Collections/PlayerSummaryCollection.php
diff --git a/src/Data/AchievementPercentage.php b/src/Data/AchievementPercentage.php
@@ -2,7 +2,9 @@
 
 namespace Astrotomic\SteamSdk\Data;
 
-final class AchievementPercentage extends DataTransferObject
+use Spatie\LaravelData\Data;
+
+final class AchievementPercentage extends Data
 {
     public function __construct(
         public readonly string $name,

diff --git a/src/Data/ApiInterface.php b/src/Data/ApiInterface.php
@@ -2,13 +2,16 @@
 
 namespace Astrotomic\SteamSdk\Data;
 
-use Astrotomic\SteamSdk\Collections\ApiMethodCollection;
+use Spatie\LaravelData\Attributes\DataCollectionOf;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\DataCollection;
 
-final class ApiInterface extends DataTransferObject
+final class ApiInterface extends Data
 {
     public function __construct(
         public readonly string $name,
-        public readonly ApiMethodCollection $methods,
+        #[DataCollectionOf(ApiMethod::class)]
+        public readonly DataCollection $methods,
     ) {
     }
 }
diff --git a/src/Data/ApiMethod.php b/src/Data/ApiMethod.php
@@ -2,15 +2,18 @@
 
 namespace Astrotomic\SteamSdk\Data;
 
-use Astrotomic\SteamSdk\Collections\ApiParameterCollection;
+use Spatie\LaravelData\Attributes\DataCollectionOf;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\DataCollection;
 
-final class ApiMethod extends DataTransferObject
+final class ApiMethod extends Data
 {
     public function __construct(
         public readonly string $name,
         public readonly int $version,
         public readonly string $httpmethod,
-        public readonly ApiParameterCollection $parameters,
+        #[DataCollectionOf(ApiParameter::class)]
+        public readonly DataCollection $parameters,
     ) {
     }
 }
diff --git a/src/Data/ApiParameter.php b/src/Data/ApiParameter.php
@@ -2,7 +2,9 @@
 
 namespace Astrotomic\SteamSdk\Data;
 
-final class ApiParameter extends DataTransferObject
+use Spatie\LaravelData\Data;
+
+final class ApiParameter extends Data
 {
     public function __construct(
         public readonly string $name,

diff --git a/src/Data/App.php b/src/Data/App.php
@@ -2,7 +2,9 @@
 
 namespace Astrotomic\SteamSdk\Data;
 
-final class App extends DataTransferObject
+use Spatie\LaravelData\Data;
+
+final class App extends Data
 {
     public function __construct(
         public readonly int $appid,