Pretty substantial re-write / re-structure

.gitignore

@@ -1,7 +1,11 @@
-### Composer ###
+# Composer
 composer.phar
 /vendor/
+
+# PHPStorm
 /.idea/
+
+# Unit Tests
 /Tests/cache/
 
 

.travis.yml

@@ -7,8 +7,6 @@ cache:
     - $HOME/.composer/cache
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - hhvm
 

Tests/ClientTest.php

@@ -3,97 +3,128 @@
 namespace TruckersMP\Tests\API;
 
 use Carbon\Carbon;
-use TruckersMP\API\APIClient;
-use TruckersMP\Types\Ban;
-use TruckersMP\Types\Bans;
-use TruckersMP\Types\Player;
-
-class ClientTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+use TruckersMP\Client;
+use TruckersMP\Models\BanModel;
+use TruckersMP\Models\BansModel;
+use TruckersMP\Models\GameTimeModel;
+use TruckersMP\Models\PlayerModel;
+use TruckersMP\Models\RulesModel;
+
+class ClientTest extends TestCase
 {
-    private $testAccount = 585204;
+    const TEST_ACCOUNT = 585204;
 
-    private $client;
+    /**
+     * @var Client
+     */
+    protected $client;
 
     /**
      * ClientTest constructor.
-     *
      */
     public function __construct()
     {
         parent::__construct();
 
-        $this->client = new APIClient();
+        $this->client = new Client();
     }
 
     /**
      * @throws \Exception
      * @throws \Http\Client\Exception
      */
-    public function testPlayer()
+    public function testPlayer(): void
     {
-        $player = $this->client->player($this->testAccount);
+        $player = $this->client->player(self::TEST_ACCOUNT);
 
-        $this->assertEquals($player->name, 'tuxytestaccount');
-        $this->assertEquals($player->groupID, 1);
-        $this->assertEquals($player->groupName, 'Player');
+        $this->assertEquals($player->getName(), 'tuxytestaccount');
+        $this->assertEquals($player->getGroupID(), 1);
+        $this->assertEquals($player->getGroupName(), 'Player');
 
-        $this->assertInstanceOf(Player::class, $player);
+        $this->assertInstanceOf(PlayerModel::class, $player);
     }
 
     /**
      * @throws \Exception
      * @throws \Http\Client\Exception
      */
-    public function testPlayerBans()
+    public function testPlayerBans(): void
     {
-        $bans = $this->client->bans($this->testAccount);
+        $bans = $this->client->bans(self::TEST_ACCOUNT);
 
-        $this->assertEquals($bans[0]->expires, '2016-06-19 13:00:00');
-        $this->assertEquals($bans[0]->created, '2016-06-19 10:08:26');
-        $this->assertEquals($bans[0]->reason, 'Test ban');
+        if (count($bans->getBans()) > 0) {
+            $this->assertTrue(is_string($bans->getBans()[0]->getCreated()));
+            $this->assertTrue(is_string($bans->getBans()[0]->getExpires()));
+            $this->assertTrue(is_string($bans->getBans()[0]->getReason()));
 
-        $this->assertInstanceOf(Bans::class, $bans);
-        $this->assertInstanceOf(Ban::class, $bans[0]);
+            $this->assertInstanceOf(BanModel::class, $bans[0]);
+        } else {
+            $this->assertEquals($bans->getBans(), []);
+        }
+
+        $this->assertInstanceOf(BansModel::class, $bans);
     }
 
     /**
      * @throws \Exception
      * @throws \Http\Client\Exception
      */
-    public function testServers()
+    public function testServers(): void
     {
         $servers = $this->client->servers();
 
-        $this->assertEquals($servers[0]->name, 'Europe 1');
+        $this->assertEquals($servers->getServers()[0]->getName(), 'Europe 1 [Simulation]');
     }
 
     /**
      * @throws \Exception
      * @throws \Http\Client\Exception
      */
-    public function testVersion()
+    public function testVersion(): void
     {
         $version = $this->client->version();
 
-        $this->assertNotEmpty($version->version->human);
-        $this->assertNotEmpty($version->version->stage);
-        $this->assertNotEmpty($version->version->nummeric);
+        $this->assertNotEmpty($version->getVersion()->human);
+        $this->assertNotEmpty($version->getVersion()->stage);
+        $this->assertNotEmpty($version->getVersion()->nummeric);
 
-        $this->assertNotEmpty($version->checksum->atsmp->dll);
-        $this->assertNotEmpty($version->checksum->atsmp->adb);
-        $this->assertNotEmpty($version->checksum->ets2mp->dll);
-        $this->assertNotEmpty($version->checksum->ets2mp->adb);
+        $this->assertNotEmpty($version->getChecksum()->atsmp->dll);
+        $this->assertNotEmpty($version->getChecksum()->atsmp->adb);
+        $this->assertNotEmpty($version->getChecksum()->ets2mp->dll);
+        $this->assertNotEmpty($version->getChecksum()->ets2mp->adb);
 
-        $this->assertInstanceOf(Carbon::class, $version->released);
+        $this->assertInstanceOf(Carbon::class, $version->getReleased());
 
-        $this->assertNotEmpty($version->support->ets2);
-        $this->assertNotEmpty($version->support->ats);
+        $this->assertNotEmpty($version->getSupport()->ets2);
+        $this->assertNotEmpty($version->getSupport()->ats);
     }
 
-    public function testGameTime()
+    /**
+     * @throws \Http\Client\Exception
+     */
+    public function testGameTime(): void
     {
         $time = $this->client->gameTime();
 
         $this->assertNotEmpty($time);
+
+        $this->assertInstanceOf(Carbon::class, $time->getTime());
+
+        $this->assertInstanceOf(GameTimeModel::class, $time);
+    }
+
+    /**
+     * @throws \Http\Client\Exception
+     * @throws \TruckersMP\Exceptions\APIErrorException
+     */
+    public function testRules(): void
+    {
+        $rules = $this->client->rules();
+
+        $this->assertTrue(is_string($rules->getRules()));
+        $this->assertTrue(is_int($rules->getRevision()));
+
+        $this->assertInstanceOf(RulesModel::class, $rules);
     }
 }

composer.json

@@ -21,16 +21,23 @@
       "email": "me@cjmaxik.ru",
       "homepage": "https://cjmaxik.ru",
       "role": "IGA/Dev"
+    },
+    {
+      "name": "Alex Blackham (B3none)",
+      "email": "ablackham2000@gmail.com",
+      "homepage": "https://github.com/b3none",
+      "role": "Dev"
     }
   ],
   "require": {
-    "php": ">=5.6.0",
+    "php": ">=7.1.0",
     "nesbot/carbon": "^1.21",
     "php-http/message": "^1.2",
-    "guzzlehttp/psr7": "^1.3"
+    "guzzlehttp/psr7": "^1.3",
+    "ext-json": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.3",
+    "phpunit/phpunit": "^7.0",
     "squizlabs/php_codesniffer": "^2.6",
     "php-http/guzzle6-adapter": "^1.0"
   },