microsoftgraph · Ndiritu · Sep 20, 2021 · Jul 12, 2021 · Jul 12, 2021 · Jul 26, 2021
diff --git a/.editorconfig b/.editorconfig
@@ -1,27 +1,27 @@
-# top-most EditorConfig file
-root = true
-
-# All PHP files MUST use the Unix LF (linefeed) line ending.
-# Code MUST use an indent of 4 spaces, and MUST NOT use tabs for indenting.
-# All PHP files MUST end with a single blank line.
-# There MUST NOT be trailing whitespace at the end of non-blank lines.
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-# PHP-Files, Composer.json, MD-Files
-[{*.php,composer.json,*.md}]
-indent_style = space
-indent_size = 4
-
-# HTML-Files LESS-Files SASS-Files CSS-Files JS-Files JSON-Files
-[{*.html,*.less,*.sass,*.css,*.js,*.json}]
-indent_style = tab
-indent_size = 4
-
-# Gitlab-CI, Travis-CI
-[*.yml]
-indent_style = space
-indent_size = 2
+# top-most EditorConfig file
+root = true
+
+# All PHP files MUST use the Unix LF (linefeed) line ending.
+# Code MUST use an indent of 4 spaces, and MUST NOT use tabs for indenting.
+# All PHP files MUST end with a single blank line.
+# There MUST NOT be trailing whitespace at the end of non-blank lines.
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# PHP-Files, Composer.json, MD-Files
+[{*.php,composer.json,*.md}]
+indent_style = space
+indent_size = 4
+
+# HTML-Files LESS-Files SASS-Files CSS-Files JS-Files JSON-Files
+[{*.html,*.less,*.sass,*.css,*.js,*.json}]
+indent_style = tab
+indent_size = 4
+
+# Gitlab-CI, Travis-CI
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
@@ -20,6 +20,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2.3.4
+    - name: Setup PHP and Xdebug for Code Coverage report
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '7.x'
+        coverage: xdebug
     - name: Validate composer file
       run: |
         composer validate
@@ -28,7 +33,7 @@ jobs:
         composer install
     - name: Run tests
       run : |
-        vendor/bin/phpunit --exclude-group functional
+        vendor/bin/phpunit --coverage-text
   run-static-analysis:
     runs-on: ubuntu-latest
     steps:
@@ -39,6 +44,6 @@ jobs:
     - name: Composer install
       run: |
         composer install
-    - name: Run static analysis 
+    - name: Run static analysis
       run: |
           vendor/bin/phpstan analyse --memory-limit=500M --error-format=github
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
 		"ext-json": "*"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^8.0 || ^9.0",
+		"phpunit/phpunit": "^9.0",
 		"mikey179/vfsstream": "^1.2",
 		"phpstan/phpstan": "^0.12.90"
 	},
@@ -31,8 +31,7 @@
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"Microsoft\\Graph\\Test\\": "tests/",
-			"Microsoft\\Graph\\Http\\Test\\": "tests/Http/"
+			"Microsoft\\Graph\\Test\\": "tests/"
 		}
 	}
-}
+}
diff --git a/phpunit.xml b/phpunit.xml
@@ -5,10 +5,13 @@
 			<directory>tests</directory>
 		</testsuite>
 	</testsuites>
-	<filter>
-		<whitelist addUncoveredFilesFromWhitelist="true">
+	<coverage includeUncoveredFiles="true"
+				pathCoverage="true">
+		<include>
 			<directory suffix=".php">src</directory>
-			<exclude><directory suffix=".php">src/Model</directory></exclude>
-		</whitelist>
-	</filter>
-</phpunit>
+		</include>
+		<report>
+			<html outputDirectory="coverage"/>
+		</report>
+	</coverage>
+</phpunit>
diff --git a/src/Core/NationalCloud.php b/src/Core/NationalCloud.php
@@ -39,13 +39,23 @@ final class NationalCloud
      * @return bool
      */
     public static function containsNationalCloudHost(string $url): bool {
-        self::initHosts();
         $validUrlParts = parse_url($url);
-        return $validUrlParts
-                && array_key_exists("scheme", $validUrlParts)
-                && $validUrlParts["scheme"] == "https"
-                && array_key_exists("host", $validUrlParts)
-                && array_key_exists(strtolower($validUrlParts["host"]), self::$hosts);
+        return self::containsNationalCloudHostFromUrlParts($validUrlParts);
+    }
+
+    /**
+     * Checks if $urlParts contain a valid National Cloud host
+     *
+     * @param array<string, string>|false $urlParts return value of parse_url()
+     * @return bool
+     */
+    public static function containsNationalCloudHostFromUrlParts($urlParts): bool {
+        self::initHosts();
+        return $urlParts
+            && array_key_exists("scheme", $urlParts)
+            && $urlParts["scheme"] == "https"
+            && array_key_exists("host", $urlParts)
+            && array_key_exists(strtolower($urlParts["host"]), self::$hosts);
     }
 
     /**

diff --git a/src/Exception/GraphClientException.php b/src/Exception/GraphClientException.php
@@ -8,8 +8,7 @@
 namespace Microsoft\Graph\Exception;
 
 /**
- * Class ClientInitialisationException
- *
+ * Class GraphClientException
  * @package Microsoft\Graph\Exception
  * @copyright 2021 Microsoft Corporation
  * @license https://opensource.org/licenses/MIT MIT License

diff --git a/src/Http/AbstractGraphClient.php b/src/Http/AbstractGraphClient.php
@@ -7,10 +7,8 @@
 
 namespace Microsoft\Graph\Http;
 
-use Microsoft\Graph\Core\GraphConstants;
 use Microsoft\Graph\Core\NationalCloud;
 use Microsoft\Graph\Exception\GraphClientException;
-use Microsoft\Graph\Exception\GraphException;
 
 /**
  * Class BaseClient
@@ -58,7 +56,7 @@ public function __construct(?string $nationalCloud = NationalCloud::GLOBAL,
                                 ?HttpClientInterface  $httpClient = null)
     {
         $this->nationalCloud = ($nationalCloud) ?: NationalCloud::GLOBAL;
-        $this->httpClient = ($httpClient) ?: HttpClientFactory::nationalCloud($nationalCloud)::createAdapter();
+        $this->httpClient = ($httpClient) ?: HttpClientFactory::nationalCloud($this->nationalCloud)::createAdapter();
     }
 
     /**
@@ -79,7 +77,7 @@ public function setAccessToken(string $accessToken): self
     /**
      * @return string
      */
-    public function getAccessToken(): string {
+    public function getAccessToken(): ?string {
         return $this->accessToken;
     }
 
@@ -107,7 +105,7 @@ public function getHttpClient(): HttpClientInterface
 	 *
 	 * @return GraphRequest The request object, which can be used to
 	 *                      make queries against Graph
-	 * @throws GraphException
+	 * @throws GraphClientException
 	 */
     public function createRequest(string $requestType, string $endpoint): GraphRequest
     {
@@ -127,9 +125,9 @@ public function createRequest(string $requestType, string $endpoint): GraphReque
 	 *
 	 * @return GraphCollectionRequest The request object, which can be
 	 *                                used to make queries against Graph
-	 * @throws GraphException
+	 * @throws GraphClientException
 	 */
-    public function createCollectionRequest(string $requestType, string $endpoint): GraphRequest
+    public function createCollectionRequest(string $requestType, string $endpoint): GraphCollectionRequest
     {
         return new GraphCollectionRequest(
             $requestType,

diff --git a/src/Http/GraphCollectionRequest.php b/src/Http/GraphCollectionRequest.php
@@ -8,9 +8,10 @@
 namespace Microsoft\Graph\Http;
 
 use GuzzleHttp\Psr7\Uri;
+use Microsoft\Graph\Core\GraphConstants;
 use Microsoft\Graph\Exception\GraphClientException;
 use Microsoft\Graph\Exception\GraphException;
-use Microsoft\Graph\Core\GraphConstants;
+use Psr\Http\Client\ClientExceptionInterface;
 
 /**
  * Class GraphCollectionRequest
@@ -48,7 +49,7 @@ class GraphCollectionRequest extends GraphRequest
     /**
      * The return type that the user specified
      *
-     * @var object
+     * @var string
      */
     protected $originalReturnType;
 
@@ -76,22 +77,25 @@ public function __construct(string $requestType, string $endpoint, AbstractGraph
 	 * Gets the number of entries in the collection
 	 *
 	 * @return int the number of entries
-     * @throws \Psr\Http\Client\ClientExceptionInterface
+     * @throws ClientExceptionInterface|GraphClientException
      */
     public function count()
     {
         $query = '$count=true';
         $requestUri = $this->getRequestUri();
         $this->setRequestUri(new Uri( $requestUri . GraphRequestUtil::getQueryParamConcatenator($requestUri) . $query));
-        $result = $this->execute()->getBody();
+        // Temporarily disable returnType in order to get GraphResponse object returned by execute()
+        $this->originalReturnType = $this->returnType;
+        $this->returnType = null;
+        $result = $this->execute();
 
-        if (array_key_exists("@odata.count", $result)) {
-            return $result['@odata.count'];
+        if (is_a($result, GraphResponse::class) &&  $result->getCount()) {
+            return $result->getCount();
         }
 
         /* The $count query parameter for the Graph API
            is available on several models but not all */
-        trigger_error('Count unavailable for this collection');
+        throw new GraphClientException('Count unavailable for this collection');
     }
 
     /**
@@ -117,7 +121,7 @@ public function setPageSize(int $pageSize): self
      * Gets the next page of results
      *
      * @return array of objects of class $returnType
-     * @throws \Psr\Http\Client\ClientExceptionInterface
+     * @throws ClientExceptionInterface
      */
     public function getPage()
     {
@@ -132,7 +136,7 @@ public function getPage()
      *
      * @return GraphCollectionRequest
      */
-    public function setPageCallInfo(): self
+    private function setPageCallInfo(): self
     {
         // Store these to add temporary query data to request
         $this->originalReturnType = $this->returnType;
@@ -167,7 +171,7 @@ public function setPageCallInfo(): self
     * @return mixed result of the call, formatted according
     *         to the returnType set by the user
     */
-    public function processPageCallReturn(GraphResponse $response)
+    private function processPageCallReturn(GraphResponse $response)
     {
         $this->nextLink = $response->getNextLink();
         $this->deltaLink = $response->getDeltaLink();
@@ -211,4 +215,12 @@ public function getDeltaLink(): ?string
     {
         return $this->deltaLink;
     }
+
+    /**
+     * Get page size
+     * @return int
+     */
+    public function getPageSize(): int {
+        return $this->pageSize;
+    }
 }