- Remove dependency of custom http facade, factory, and pending reque…

…st class from laravel - Upgrade required laravel illuminate package to 8.83.12 or 9.12 on composer.json
ianriizky · May 11, 2022 · 10cc4f0 · 10cc4f0
1 parent b9c6d9e
commit 10cc4f0
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 88 deletions.
diff --git a/composer.json b/composer.json
@@ -22,12 +22,12 @@
     "require": {
         "php": "^7.3|^8.0",
         "guzzlehttp/guzzle": "^7.2",
-        "illuminate/contracts": "^8.75|^9.11",
-        "illuminate/http": "^8.75|^9.11",
-        "illuminate/support": "^8.75|^9.11"
+        "illuminate/contracts": "^8.83.12|^9.12",
+        "illuminate/http": "^8.83.12|^9.12",
+        "illuminate/support": "^8.83.12|^9.12"
     },
     "require-dev": {
-        "illuminate/testing": "^8.75|^9.11",
+        "illuminate/testing": "^8.83.12|^9.12",
         "orchestra/testbench": "^6.24|^7.3",
         "phpunit/phpunit": "^9.5.8"
     },

diff --git a/src/Http/Client/Factory.php b/src/Http/Client/Factory.php
diff --git a/src/Http/Client/PendingRequest.php b/src/Http/Client/PendingRequest.php
diff --git a/src/Services/Api/AccessRole.php b/src/Services/Api/AccessRole.php
@@ -5,7 +5,7 @@
 use Illuminate\Http\Client\Response;
 
 /**
- * @property \Ianriizky\TalentaApi\Http\Client\PendingRequest $request
+ * @property \Illuminate\Http\Client\PendingRequest $request
  *
  * @see https://documenter.getpostman.com/view/12246328/TWDZHvj1#f5dfd1f3-4cf6-4e55-85b1-c15a84f85518
  */

diff --git a/src/Services/Api/Company.php b/src/Services/Api/Company.php
@@ -5,7 +5,7 @@
 use Illuminate\Http\Client\Response;
 
 /**
- * @property \Ianriizky\TalentaApi\Http\Client\PendingRequest $request
+ * @property \Illuminate\Http\Client\PendingRequest $request
  *
  * @see https://documenter.getpostman.com/view/12246328/TWDZHvj1#3fd7ec86-54ac-44d4-aa79-585b8833c216
  */

diff --git a/src/Services/Api/CostCenter.php b/src/Services/Api/CostCenter.php
@@ -5,7 +5,7 @@
 use Illuminate\Http\Client\Response;
 
 /**
- * @property \Ianriizky\TalentaApi\Http\Client\PendingRequest $request
+ * @property \Illuminate\Http\Client\PendingRequest $request
  *
  * @see https://documenter.getpostman.com/view/12246328/TWDZHvj1#ab263267-7251-41a7-aa23-53fc61d58370
  */

diff --git a/src/Services/Api/Employee.php b/src/Services/Api/Employee.php
@@ -5,7 +5,7 @@
 use Illuminate\Http\Client\Response;
 
 /**
- * @property \Ianriizky\TalentaApi\Http\Client\PendingRequest $request
+ * @property \Illuminate\Http\Client\PendingRequest $request
  *
  * @see https://documenter.getpostman.com/view/12246328/TWDZHvj1#f70ad8ab-3921-49d1-bdb0-a3195c5bdc02
  */

diff --git a/src/Services/Api/Fingerprint.php b/src/Services/Api/Fingerprint.php
@@ -5,7 +5,7 @@
 use Illuminate\Http\Client\Response;
 
 /**
- * @property \Ianriizky\TalentaApi\Http\Client\PendingRequest $request
+ * @property \Illuminate\Http\Client\PendingRequest $request
  *
  * @see https://documenter.getpostman.com/view/12246328/TWDZHvj1#630f960f-aeee-43d6-876d-765f41ab6a52
  */

diff --git a/src/Services/Api/Report.php b/src/Services/Api/Report.php
@@ -5,7 +5,7 @@
 use Illuminate\Http\Client\Response;
 
 /**
- * @property \Ianriizky\TalentaApi\Http\Client\PendingRequest $request
+ * @property \Illuminate\Http\Client\PendingRequest $request
  *
  * @see https://documenter.getpostman.com/view/12246328/TWDZHvj1#41daef38-af9a-481c-b61f-78fe62092ffd
  */

diff --git a/src/Services/Concerns/HandleAuthentication.php b/src/Services/Concerns/HandleAuthentication.php
@@ -3,7 +3,7 @@
 namespace Ianriizky\TalentaApi\Services\Concerns;
 
 use Closure;
-use Ianriizky\TalentaApi\Http\Client\PendingRequest;
+use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\Request;
 use Illuminate\Http\Client\RequestException;
 use Illuminate\Http\Response as HttpResponse;
@@ -13,7 +13,7 @@
 use Throwable;
 
 /**
- * @property \Ianriizky\TalentaApi\Http\Client\PendingRequest $request
+ * @property \Illuminate\Http\Client\PendingRequest $request
  * @property array $config
  */
 trait HandleAuthentication

diff --git a/src/Services/Concerns/HandleHTTPClient.php b/src/Services/Concerns/HandleHTTPClient.php
@@ -2,8 +2,8 @@
 
 namespace Ianriizky\TalentaApi\Services\Concerns;
 
-use Ianriizky\TalentaApi\Http\Client\PendingRequest;
-use Ianriizky\TalentaApi\Support\Facades\Http;
+use Illuminate\Http\Client\PendingRequest;
+use Illuminate\Support\Facades\Http;
 
 trait HandleHTTPClient
 {
@@ -29,7 +29,7 @@ trait HandleHTTPClient
      * @param  string  $baseUrl
      * @param  string|bool|null  $sslVerify
      * @param  array  $options
-     * @return \Ianriizky\TalentaApi\Http\Client\PendingRequest
+     * @return \Illuminate\Http\Client\PendingRequest
      */
     protected function createRequestInstance(string $baseUrl, $sslVerify = null, array $options = []): PendingRequest
     {
@@ -48,7 +48,7 @@ protected function createRequestInstance(string $baseUrl, $sslVerify = null, arr
     /**
      * Create a fresh Laravel HTTP client request instance using the previous $baseUrl and $options property.
      *
-     * @return \Ianriizky\TalentaApi\Http\Client\PendingRequest
+     * @return \Illuminate\Http\Client\PendingRequest
      */
     protected function createFreshRequestInstance(): PendingRequest
     {

diff --git a/src/Services/TalentaApi.php b/src/Services/TalentaApi.php
@@ -84,7 +84,7 @@ class TalentaApi
     ];
 
     /**
-     * @var \Ianriizky\TalentaApi\Http\Client\PendingRequest
+     * @var \Illuminate\Http\Client\PendingRequest
      */
     protected $request;
 

diff --git a/src/Support/Facades/Http.php b/src/Support/Facades/Http.php
diff --git a/tests/ApiTestCase.php b/tests/ApiTestCase.php
@@ -2,20 +2,20 @@
 
 namespace Ianriizky\TalentaApi\Tests;
 
-use Ianriizky\TalentaApi\Support\Facades\Http;
 use Ianriizky\TalentaApi\Support\Facades\TalentaApi;
 use Illuminate\Http\Client\Request;
 use Illuminate\Http\Client\Response;
 use Illuminate\Http\Response as HttpResponse;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Str;
 use Illuminate\Testing\Assert;
 use Mockery as m;
 
 class ApiTestCase extends TestCase
 {
     /**
-     * @var \Ianriizky\TalentaApi\Http\Client\Factory
+     * @var \Illuminate\Http\Client\Factory
      */
     protected $factory;
 
@@ -29,15 +29,15 @@ protected function setUp(): void
         $this->factory = Http::getFacadeRoot();
 
         $this->factory->macro('responseFromJsonPath', function (string $jsonPath, $status = HttpResponse::HTTP_OK, $headers = []) {
-            /** @var \Ianriizky\TalentaApi\Http\Client\Factory $factory */
+            /** @var \Illuminate\Http\Client\Factory $factory */
             $factory = $this;
             $body = json_decode(ApiTestCase::getJsonFromResponsesPath($jsonPath), true);
 
             return $factory->response($body, $status, $headers);
         });
 
         $this->factory->macro('fakeUsingJsonPath', function (string $jsonPath, $status = 200, $headers = []) {
-            /** @var \Ianriizky\TalentaApi\Http\Client\Factory $factory */
+            /** @var \Illuminate\Http\Client\Factory $factory */
             $factory = $this;
 
             $factory->fake(function (Request $request) use ($factory, $jsonPath, $status, $headers) {