Merge pull request #97 from syntaxerrors/issue-96-replace-nukacode

nicekiwi · web-flow · commit c7652d558003 · 2019-10-10T10:58:48.000+13:00
Issue-96: Replace NukaCode Database with native Laravel collections
diff --git a/composer.json b/composer.json
@@ -12,8 +12,7 @@
   "require": {
     "php": "^7.2.0",
     "laravel/framework": ">=5.8.0",
-    "guzzlehttp/guzzle": "^6.0",
-    "nukacode/database": "^1.0"
+    "guzzlehttp/guzzle": "^6.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^8.0",
diff --git a/composer.lock b/composer.lock
diff --git a/examples/app/appDetails.txt b/examples/app/appDetails.txt
@@ -22,7 +22,7 @@ Array
                 )
 
             [legal] => None
-            [developers] => NukaCode\Database\Collection Object
+            [developers] => Illuminate\Support\Collection Object
                 (
                     [items:protected] => Array
                         (
@@ -31,7 +31,7 @@ Array
 
                 )
 
-            [publishers] => NukaCode\Database\Collection Object
+            [publishers] => Illuminate\Support\Collection Object
                 (
                     [items:protected] => Array
                         (
@@ -61,7 +61,7 @@ Array
                     [url] => http://www.metacritic.com/game/pc/portal-2?ftag=MCD-06-10aaa1f
                 )
 
-            [categories] => NukaCode\Database\Collection Object
+            [categories] => Illuminate\Support\Collection Object
                 (
                     [items:protected] => Array
                         (
@@ -135,7 +135,7 @@ Array
 
                 )
 
-            [genres] => NukaCode\Database\Collection Object
+            [genres] => Illuminate\Support\Collection Object
                 (
                     [items:protected] => Array
                         (
@@ -239,7 +239,7 @@ Array
 
                 )
 
-            [dlc] => NukaCode\Database\Collection Object
+            [dlc] => Illuminate\Support\Collection Object
                 (
                     [items:protected] => Array
                         (
diff --git a/src/Syntax/SteamApi/Containers/App.php b/src/Syntax/SteamApi/Containers/App.php
@@ -2,7 +2,7 @@
 
 namespace Syntax\SteamApi\Containers;
 
-use NukaCode\Database\Collection;
+use Illuminate\Support\Collection;
 
 class App extends BaseContainer
 {
diff --git a/src/Syntax/SteamApi/Containers/BaseContainer.php b/src/Syntax/SteamApi/Containers/BaseContainer.php
@@ -2,7 +2,7 @@
 
 namespace Syntax\SteamApi\Containers;
 
-use NukaCode\Database\Collection;
+use Illuminate\Support\Collection;
 
 abstract class BaseContainer
 {
diff --git a/src/Syntax/SteamApi/Containers/Group.php b/src/Syntax/SteamApi/Containers/Group.php
@@ -3,7 +3,7 @@
 namespace Syntax\SteamApi\Containers;
 
 use Syntax\SteamApi\Client;
-use NukaCode\Database\Collection;
+use Illuminate\Support\Collection;
 use Syntax\SteamApi\Containers\Group\Details;
 use Syntax\SteamApi\Containers\Group\MemberDetails;
 
diff --git a/src/Syntax/SteamApi/Steam/App.php b/src/Syntax/SteamApi/Steam/App.php
@@ -3,7 +3,7 @@
 namespace Syntax\SteamApi\Steam;
 
 use Syntax\SteamApi\Client;
-use NukaCode\Database\Collection;
+use Illuminate\Support\Collection;
 use Syntax\SteamApi\Containers\App as AppContainer;
 
 class App extends Client
diff --git a/src/Syntax/SteamApi/Steam/Item.php b/src/Syntax/SteamApi/Steam/Item.php
@@ -3,7 +3,7 @@
 namespace Syntax\SteamApi\Steam;
 
 use Syntax\SteamApi\Client;
-use NukaCode\Database\Collection;
+use Illuminate\Support\Collection;
 use Syntax\SteamApi\Containers\Item as ItemContainer;
 use Syntax\SteamApi\Exceptions\ApiCallFailedException;
 use Syntax\SteamApi\Inventory;
diff --git a/src/Syntax/SteamApi/Steam/Package.php b/src/Syntax/SteamApi/Steam/Package.php
@@ -3,7 +3,7 @@
 namespace Syntax\SteamApi\Steam;
 
 use Syntax\SteamApi\Client;
-use NukaCode\Database\Collection;
+use Illuminate\Support\Collection;
 use Syntax\SteamApi\Containers\Package as PackageContainer;
 
 class Package extends Client
diff --git a/src/Syntax/SteamApi/Steam/Player.php b/src/Syntax/SteamApi/Steam/Player.php
@@ -3,7 +3,7 @@
 namespace Syntax\SteamApi\Steam;
 
 use Syntax\SteamApi\Client;
-use NukaCode\Database\Collection;
+use Illuminate\Support\Collection;
 use Syntax\SteamApi\Containers\Game;
 use Syntax\SteamApi\Containers\Player\Level;
 
diff --git a/tests/AppTest.php b/tests/AppTest.php
@@ -33,9 +33,9 @@ public function it_gets_a_list_of_all_apps()
     private function checkClasses($detail)
     {
         $this->assertInstanceOf('Syntax\SteamApi\Containers\App', $detail);
-        $this->assertInstanceOf('NukaCode\Database\Collection', $detail->developers);
-        $this->assertInstanceOf('NukaCode\Database\Collection', $detail->publishers);
-        $this->assertInstanceOf('NukaCode\Database\Collection', $detail->categories);
-        $this->assertInstanceOf('NukaCode\Database\Collection', $detail->genres);
+        $this->assertInstanceOf('Illuminate\Support\Collection', $detail->developers);
+        $this->assertInstanceOf('Illuminate\Support\Collection', $detail->publishers);
+        $this->assertInstanceOf('Illuminate\Support\Collection', $detail->categories);
+        $this->assertInstanceOf('Illuminate\Support\Collection', $detail->genres);
     }
 }
diff --git a/tests/GroupTest.php b/tests/GroupTest.php
@@ -29,7 +29,7 @@ protected function checkClasses($group)
         $this->assertInstanceOf('Syntax\SteamApi\Containers\Group', $group);
         $this->assertInstanceOf('Syntax\SteamApi\Containers\Group\Details', $group->groupDetails);
         $this->assertInstanceOf('Syntax\SteamApi\Containers\Group\MemberDetails', $group->memberDetails);
-        $this->assertInstanceOf('NukaCode\Database\Collection', $group->members);
+        $this->assertInstanceOf('Illuminate\Support\Collection', $group->members);
     }
 
 }
diff --git a/tests/PlayerTest.php b/tests/PlayerTest.php
@@ -57,7 +57,7 @@ public function it_gets_the_owned_games_by_user_id()
     {
         $games = $this->steamClient->player($this->id64)->GetOwnedGames();
 
-        $this->assertInstanceOf('NukaCode\Database\Collection', $games);
+        $this->assertInstanceOf('Illuminate\Support\Collection', $games);
         $this->assertInstanceOf('Syntax\SteamApi\Containers\Game', $games->first());
 
         $attributes = [
@@ -72,7 +72,7 @@ public function it_gets_the_owned_games_by_user_id_without_app_details()
     {
         $games = $this->steamClient->player($this->id64)->GetOwnedGames(false);
 
-        $this->assertInstanceOf('NukaCode\Database\Collection', $games);
+        $this->assertInstanceOf('Illuminate\Support\Collection', $games);
         $this->assertInstanceOf('Syntax\SteamApi\Containers\Game', $games->first());
 
         $attributes = [
@@ -91,7 +91,7 @@ public function it_filters_the_owned_games_by_user_id()
     {
         $games = $this->steamClient->player($this->id64)->GetOwnedGames(true, false, $this->appId);
 
-        $this->assertInstanceOf('NukaCode\Database\Collection', $games);
+        $this->assertInstanceOf('Illuminate\Support\Collection', $games);
         $this->assertInstanceOf('Syntax\SteamApi\Containers\Game', $games->first());
         $this->assertEquals(1, $games->count());
 
@@ -107,7 +107,7 @@ public function it_gets_recently_played_games_by_user_id()
     {
         $games = $this->steamClient->player($this->id64)->GetRecentlyPlayedGames();
 
-        $this->assertInstanceOf('NukaCode\Database\Collection', $games);
+        $this->assertInstanceOf('Illuminate\Support\Collection', $games);
         $this->assertInstanceOf('Syntax\SteamApi\Containers\Game', $games->first());
 
         $attributes = [
@@ -122,7 +122,7 @@ public function it_gets_a_single_recently_played_game_by_user_id()
     {
         $games = $this->steamClient->player($this->id64)->GetRecentlyPlayedGames(1);
 
-        $this->assertInstanceOf('NukaCode\Database\Collection', $games);
+        $this->assertInstanceOf('Illuminate\Support\Collection', $games);
         $this->assertInstanceOf('Syntax\SteamApi\Containers\Game', $games->first());
         $this->assertEquals(1, $games->count());
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ Array`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`[legal] => None`
`25`		`- [developers] => NukaCode\Database\Collection Object`
	`25`	`+ [developers] => Illuminate\Support\Collection Object`
`26`	`26`	`(`
`27`	`27`	`[items:protected] => Array`
`28`	`28`	`(`
`@@ -31,7 +31,7 @@ Array`
`31`	`31`
`32`	`32`	`)`
`33`	`33`
`34`		`- [publishers] => NukaCode\Database\Collection Object`
	`34`	`+ [publishers] => Illuminate\Support\Collection Object`
`35`	`35`	`(`
`36`	`36`	`[items:protected] => Array`
`37`	`37`	`(`
`@@ -61,7 +61,7 @@ Array`
`61`	`61`	`[url] => http://www.metacritic.com/game/pc/portal-2?ftag=MCD-06-10aaa1f`
`62`	`62`	`)`
`63`	`63`
`64`		`- [categories] => NukaCode\Database\Collection Object`
	`64`	`+ [categories] => Illuminate\Support\Collection Object`
`65`	`65`	`(`
`66`	`66`	`[items:protected] => Array`
`67`	`67`	`(`
`@@ -135,7 +135,7 @@ Array`
`135`	`135`
`136`	`136`	`)`
`137`	`137`
`138`		`- [genres] => NukaCode\Database\Collection Object`
	`138`	`+ [genres] => Illuminate\Support\Collection Object`
`139`	`139`	`(`
`140`	`140`	`[items:protected] => Array`
`141`	`141`	`(`
`@@ -239,7 +239,7 @@ Array`
`239`	`239`
`240`	`240`	`)`
`241`	`241`
`242`		`- [dlc] => NukaCode\Database\Collection Object`
	`242`	`+ [dlc] => Illuminate\Support\Collection Object`
`243`	`243`	`(`
`244`	`244`	`[items:protected] => Array`
`245`	`245`	`(`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Syntax\SteamApi\Containers;`
`4`	`4`
`5`		`-use NukaCode\Database\Collection;`
	`5`	`+use Illuminate\Support\Collection;`
`6`	`6`
`7`	`7`	`class App extends BaseContainer`
`8`	`8`	`{`