Merge pull request #4 from YokySantiago/INT-592_Make_the_wrapper_PSR-4_compliant

vic-onfleet · web-flow · commit 1cf72091be88 · 2022-04-28T17:40:56.000+03:00
[INT-592] Make the wrapper PSR-4 compliant
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
 		}
 	],
 	"scripts": {
-		"test": "./vendor/bin/phpunit"
+		"test": "./vendor/bin/phpunit tests"
 	},
 	"require": {
 		"php": ">=7.4",
diff --git a/src/Onfleet.php b/src/Onfleet.php
@@ -2,7 +2,7 @@
 
 namespace Onfleet;
 
-use Onfleet\Resources as Resources;
+use Onfleet\resources as Resources;
 use Onfleet\errors\ValidationError;
 use stdClass;
 
@@ -33,7 +33,7 @@ class Onfleet
 	 */
 	public function __construct(
 		$apiKey,
-		$userTimeout,
+		$userTimeout = self::DEFAULT_TIMEOUT,
 		$baseURL = null,
 		$defaultPath = self::DEFAULT_PATH,
 		$defaultApiVersion = self::DEFAULT_API_VERSION
@@ -47,7 +47,7 @@ public function __construct(
 			throw new ValidationError('Onfleet API key not found, please obtain an API key from your organization admin');
 		}
 
-		if ($userTimeout > 70000) {
+		if ($userTimeout > self::DEFAULT_TIMEOUT) {
 			throw new ValidationError('User-defined timeout has to be shorter than 70000ms');
 		} else {
 			$this->_apiKey = $apiKey;
diff --git a/src/resources/Administrators.php b/src/resources/Administrators.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 class Administrators extends Resources
 {
diff --git a/src/resources/Containers.php b/src/resources/Containers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 class Containers extends Resources
 {
diff --git a/src/resources/Destinations.php b/src/resources/Destinations.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 class Destinations extends Resources
 {
diff --git a/src/resources/Hubs.php b/src/resources/Hubs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 class Hubs extends Resources
 {
diff --git a/src/resources/Organizations.php b/src/resources/Organizations.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 class Organizations extends Resources
 {
diff --git a/src/resources/Recipients.php b/src/resources/Recipients.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 class Recipients extends Resources
 {
diff --git a/src/resources/Resources.php b/src/resources/Resources.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 use Onfleet\Methods;
 
diff --git a/src/resources/Tasks.php b/src/resources/Tasks.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 class Tasks extends Resources
 {
diff --git a/src/resources/Teams.php b/src/resources/Teams.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 class Teams extends Resources
 {
diff --git a/src/resources/Webhooks.php b/src/resources/Webhooks.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 class Webhooks extends Resources
 {
diff --git a/src/resources/Workers.php b/src/resources/Workers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Onfleet\Resources;
+namespace Onfleet\resources;
 
 class Workers extends Resources
 {
diff --git a/tests/OnfleetTest.php b/tests/OnfleetTest.php
@@ -8,16 +8,14 @@
 
 class OnfleetTest extends TestCase
 {
-
-	const TIMEOUT_DEFAULT = 70000;
 	/**
 	 * @dataProvider data
 	 */
 	public function testAuth($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('authenticate')->willReturn(true);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		self::assertTrue($onfleet->verifyKey());
 	}
@@ -29,7 +27,7 @@ public function testAdministrators($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["list"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->administrators->get();
 		self::assertIsArray($response);
@@ -47,7 +45,7 @@ public function testTasks($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["get"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->tasks->get('SxD9Ran6pOfnUDgfTecTsgXd');
 		self::assertIsArray($response);
@@ -62,7 +60,7 @@ public function testTaskByShortId($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["get"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->tasks->get('44a56188', 'shortId');
 		self::assertIsArray($response);
@@ -77,7 +75,7 @@ public function testCreateRecipient($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["createRecipient"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->recipients->create([
 			"name" => "Boris Foster",
@@ -99,7 +97,7 @@ public function testRecipientByPhoneNumber($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["getRecipients"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->recipients->get('+18881787788', 'phone');
 		self::assertIsArray($response);
@@ -114,7 +112,7 @@ public function testRecipientByPhoneName($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["getRecipients"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->recipients->get('Onfleet Rocks', 'name');
 		self::assertIsArray($response);
@@ -128,7 +126,7 @@ public function testCreateTeams($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["createTeams"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->teams->create([
 			"name" => 'Onfleet Team',
@@ -152,7 +150,7 @@ public function testWorkerEta($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["getWorkerEta"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->teams->getWorkerEta('SxD9Ran6pOfnUDgfTecTsgXd', [
 			"dropoffLocation" => '101.627378,3.1403995',
@@ -170,7 +168,7 @@ public function testForceComplete($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["forceComplete"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->tasks->forceComplete('6Fe3qqFZ0DDwsM86zBlHJtlJ', [
 			"completionDetails" => [
@@ -189,7 +187,7 @@ public function testUpdateWorker($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["updateWorkers"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->workers->update('Mdfs*NDZ1*lMU0abFXAT82lM', [
 			"name" => 'Stephen Curry',
@@ -207,7 +205,7 @@ public function testGetWorker($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["getWorker"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->workers->get();
 		self::assertIsArray($response);
@@ -225,7 +223,7 @@ public function testListWorkers($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["listWorkers"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->workers->get();
 		self::assertIsArray($response);
@@ -239,7 +237,7 @@ public function testDeleteTask($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["delete"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->tasks->deleteOne('AqzN6ZAq*qlSDJ0FzmZIMZz~');
 		self::assertIsNumeric($response);
@@ -253,7 +251,7 @@ public function testListWebhooks($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["listWebhooks"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->webhooks->get();
 		self::assertIsArray($response);
@@ -267,7 +265,7 @@ public function testCreateWebhook($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["createWebhook"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->webhooks->create([
 			"url" => "https://11ec4a02.ngrok.com/onfleet/taskStart", "trigger" => 0
@@ -286,7 +284,7 @@ public function testDeleteWebhook($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["delete"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->webhooks->deleteOne("9zqMxI79mRcHpXE111nILiPn");
 		self::assertIsNumeric($response);
@@ -300,7 +298,7 @@ public function testGetContainer($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["getContainer"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->webhooks->get("2Fwp6wS5wLNjDn36r1LJPscA", "workers");
 		self::assertIsArray($response);
@@ -315,7 +313,7 @@ public function testListHubs($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["listHubs"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->hubs->get();
 		self::assertIsArray($response);
@@ -329,7 +327,7 @@ public function testCreateHubs($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["createHub"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->hubs->create(
 			[
@@ -361,7 +359,7 @@ public function testUpdateHubs($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["updateHub"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->hubs->create(
 			[
@@ -380,7 +378,7 @@ public function testOrganization($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["organization"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->organization->get();
 		self::assertIsArray($response);
@@ -397,7 +395,7 @@ public function testOrganizationDelegatee($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["organizationDelegatee"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->organization->get("cBrUjKvQQgdRp~s1qvQNLpK*");
 		self::assertIsArray($response);
@@ -416,7 +414,7 @@ public function testGetDestination($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["getDestination"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->destinations->get("0i~RR0SUIculbRFsIse6MENg");
 		self::assertIsArray($response);
@@ -431,7 +429,7 @@ public function testCreateDestination($data)
 	{
 		$curlClient = $this->createMock(CurlClient::class);
 		$curlClient->method('execute')->willReturn(["code" => 200, "success" => true, "data" => $data["createDestination"]]);
-		$onfleet = new Onfleet($data["apiKey"], self::TIMEOUT_DEFAULT, null);
+		$onfleet = new Onfleet($data["apiKey"]);
 		$onfleet->api->client = $curlClient;
 		$response = $onfleet->destinations->create([
 			"address" => [

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`}`
`24`	`24`	`],`
`25`	`25`	`"scripts": {`
`26`		`- "test": "./vendor/bin/phpunit"`
	`26`	`+ "test": "./vendor/bin/phpunit tests"`
`27`	`27`	`},`
`28`	`28`	`"require": {`
`29`	`29`	`"php": ">=7.4",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Onfleet\Resources;`
	`3`	`+namespace Onfleet\resources;`
`4`	`4`
`5`	`5`	`class Administrators extends Resources`
`6`	`6`	`{`