Rename Utils to ExceptionWrapper

microsoftgraph · Apr 12, 2021 · 897ae61 · 897ae61
1 parent 36401c9
commit 897ae61
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/Core/Utils.php → src/Core/ExceptionWrapper.php b/src/Core/Utils.php → src/Core/ExceptionWrapper.php
@@ -4,7 +4,7 @@
 * Licensed under the MIT License.  See License in the project root
 * for license information.
 *
-* Utils File
+* ExceptionWrapper File
 * PHP version 7
 *
 * @category  Library
@@ -21,14 +21,14 @@
 use Microsoft\Graph\Exception\GraphException;
 
 /**
- * Class Utils
+ * Class ExceptionWrapper
  *
  * @category Library
  * @package  Microsoft.Graph
  * @license  https://opensource.org/licenses/MIT MIT License
  * @link     https://graph.microsoft.io/
  */
-class Utils
+class ExceptionWrapper
 {
     /**
      * Wrap Guzzle BadResponseException which returns truncated exception messages for 4xx and 5xx responses.

diff --git a/src/Http/GraphRequest.php b/src/Http/GraphRequest.php
@@ -20,7 +20,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\BadResponseException;
 use Microsoft\Graph\Core\GraphConstants;
-use Microsoft\Graph\Core\Utils;
+use Microsoft\Graph\Core\ExceptionWrapper;
 use Microsoft\Graph\Exception\GraphException;
 
 /**
@@ -314,7 +314,7 @@ public function execute($client = null)
                 ]
             );
         } catch(BadResponseException $e) {
-            throw Utils::wrapGuzzleBadResponseException($e);
+            throw ExceptionWrapper::wrapGuzzleBadResponseException($e);
         }
 
         // Check to see if returnType is a stream, if so return it immediately
@@ -386,7 +386,7 @@ function ($result) {
             // On fail, log the error and return null
             function ($reason) {
                 if ($reason instanceof BadResponseException) {
-                    $reason = Utils::wrapGuzzleBadResponseException($reason);
+                    $reason = ExceptionWrapper::wrapGuzzleBadResponseException($reason);
                 }
                 trigger_error("Async call failed: " . $reason->getMessage());
                 return null;
@@ -432,7 +432,7 @@ public function download($path, $client = null)
         } catch(GraphException $e) {
             throw new GraphException(GraphConstants::INVALID_FILE);
         } catch(BadResponseException $e) {
-            throw Utils::wrapGuzzleBadResponseException($e);
+            throw ExceptionWrapper::wrapGuzzleBadResponseException($e);
         }
 
         return null;

diff --git a/tests/Core/UtilsTest.php → tests/Core/ExceptionWrapperTest.php b/tests/Core/UtilsTest.php → tests/Core/ExceptionWrapperTest.php
@@ -3,31 +3,31 @@
 use GuzzleHttp\Exception\BadResponseException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
-use Microsoft\Graph\Core\Utils;
+use Microsoft\Graph\Core\ExceptionWrapper;
 use Microsoft\Graph\Exception\GraphException;
 use PHPUnit\Framework\TestCase;
 
-class UtilsTest extends TestCase
+class ExceptionWrapperTest extends TestCase
 {
     public function testWrapBadResponseExceptionReturnsGraphException()
     {
         $responseBody = json_encode(array('body' => 'content'));
         $ex = new BadResponseException("Error: API returned 400", new Request("GET", "/endpoint"), new Response(400, [], $responseBody));
-        $graphException = Utils::wrapGuzzleBadResponseException($ex);
+        $graphException = ExceptionWrapper::wrapGuzzleBadResponseException($ex);
         $this->assertInstanceOf(GraphException::class, $graphException);
     }
 
     public function testWrapBadResponseExceptionHasResponseBody()
     {
         $responseBody = json_encode(array('body' => 'content'));
         $ex = new BadResponseException("Error: API returned 400", new Request("GET", "/endpoint"), new Response(400, [], $responseBody));
-        $graphException = Utils::wrapGuzzleBadResponseException($ex);
+        $graphException = ExceptionWrapper::wrapGuzzleBadResponseException($ex);
         $this->assertStringContainsString($responseBody, $graphException->getMessage());
     }
 
     public function testWrapBadResponseExceptionWithInvalidInput()
     {
         $this->expectException(TypeError::class);
-        Utils::wrapGuzzleBadResponseException(null);
+        ExceptionWrapper::wrapGuzzleBadResponseException(null);
     }
 }