Add HttpClientFactory and update Graph client to use it

.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 = crlf
-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

composer.json

@@ -1,36 +1,38 @@
-{
-	"name": "microsoft/microsoft-graph-core",
-	"type": "library",
-	"description": "The Microsoft Graph SDK for PHP",
-	"homepage": "https://developer.microsoft.com/en-us/graph",
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Microsoft Graph Client Tooling",
-			"email": "graphtooling@service.microsoft.com",
-			"role": "Developer"
-		}
-	],
-	"require": {
-		"php": "^8.0 || ^7.3",
-		"guzzlehttp/guzzle": "^6.0 || ^7.0",
-		"ext-json": "*"
-	},
-	"require-dev": {
-		"phpunit/phpunit": "^8.0 || ^9.0",
-		"mikey179/vfsstream": "^1.2",
-		"vimeo/psalm": "^4.8",
-		"microsoft/microsoft-graph": "^1.34"
-	},
-	"autoload": {
-		"psr-4": {
-			"Microsoft\\Graph\\": "src/"
-		}
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"Microsoft\\Graph\\Test\\": "tests/Functional/",
-			"Microsoft\\Graph\\Http\\Test\\": "tests/Http/"
-		}
-	}
-}
+{
+	"name": "microsoft/microsoft-graph-core",
+	"type": "library",
+	"description": "The Microsoft Graph SDK for PHP",
+	"homepage": "https://developer.microsoft.com/en-us/graph",
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Microsoft Graph Client Tooling",
+			"email": "graphtooling@service.microsoft.com",
+			"role": "Developer"
+		}
+	],
+	"require": {
+		"php": "^8.0 || ^7.3",
+		"guzzlehttp/guzzle": "^7.0",
+		"php-http/httplug": "^2.2.0",
+		"php-http/guzzle7-adapter": "^1.0.0",
+		"ext-json": "*"
+	},
+	"require-dev": {
+		"phpunit/phpunit": "^8.0 || ^9.0",
+		"mikey179/vfsstream": "^1.2",
+		"vimeo/psalm": "^4.8",
+		"microsoft/microsoft-graph": "^1.34"
+	},
+	"autoload": {
+		"psr-4": {
+			"Microsoft\\Graph\\": "src/"
+		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"Microsoft\\Graph\\Test\\": "tests/Functional/",
+			"Microsoft\\Graph\\Http\\Test\\": "tests/Http/"
+		}
+	}
+}

src/Core/Enum.php

@@ -101,4 +101,4 @@ public function value()
     {
         return $this->_value;
     }
-}
+}

src/Core/NationalCloud.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright (c) Microsoft Corporation.  All Rights Reserved.
+ * Licensed under the MIT License.  See License in the project root
+ * for license information.
+ */
+
+namespace Microsoft\Graph\Core;
+
+use Microsoft\Graph\Http\GraphRequestUtil;
+
+/**
+ * Class NationalCloud
+ *
+ * Defines Graph hosts for the various national clouds
+ *
+ * @package Microsoft\Graph\Core
+ * @copyright 2021 Microsoft Corporation
+ * @license https://opensource.org/licenses/MIT MIT License
+ * @link https://developer.microsoft.com/graph
+ */
+final class NationalCloud
+{
+    const GLOBAL = "https://graph.microsoft.com";
+    const US_GOV = "https://graph.microsoft.us";
+    const US_DOD = "https://dod-graph.microsoft.us";
+    const GERMANY = "https://graph.microsoft.de";
+    const CHINA = "https://microsoftgraph.chinacloudapi.cn";
+
+    /**
+     * Unique hostnames from constant values [graph.microsoft.com, graph.microsoft.us, ...]
+     *
+     * @var array
+     */
+    private static $hosts = [];
+
+    /**
+     * Checks if url contains a valid National Cloud host
+     *
+     * @param string $url
+     * @return bool
+     */
+    public static function isValidNationalCloudHost(string $url): bool {
+        self::initHosts();
+        $validUrlParts = GraphRequestUtil::isValidBaseUrl($url);
+        return $validUrlParts && array_key_exists($validUrlParts["host"], self::$hosts);
+    }
+
+    /**
+     * Extracts hostnames from constant values to an array with unique keys for optimal lookup
+     */
+    private static function initHosts(): void {
+        if (!self::$hosts) {
+            $reflectedClass = new \ReflectionClass(__CLASS__);
+            $constants = $reflectedClass->getConstants();
+            foreach ($constants as $constName => $url) {
+                // Create associative array for O(1) key lookup
+                $hostname = parse_url($url)["host"];
+                self::$hosts[$hostname] = true;
+            }
+        }
+    }
+}

src/Exception/GraphClientException.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (c) Microsoft Corporation.  All Rights Reserved.
+ * Licensed under the MIT License.  See License in the project root
+ * for license information.
+ */
+
+namespace Microsoft\Graph\Exception;
+
+/**
+ * Class ClientInitialisationException
+ *
+ * @package Microsoft\Graph\Exception
+ * @copyright 2021 Microsoft Corporation
+ * @license https://opensource.org/licenses/MIT MIT License
+ * @link https://developer.microsoft.com/graph
+ */
+class GraphClientException extends GraphException
+{
+
+}

src/Exception/GraphException.php

@@ -1,9 +1,9 @@
-<?php 
+<?php
 /**
-* Copyright (c) Microsoft Corporation.  All Rights Reserved.  
-* Licensed under the MIT License.  See License in the project root 
+* Copyright (c) Microsoft Corporation.  All Rights Reserved.
+* Licensed under the MIT License.  See License in the project root
 * for license information.
-* 
+*
 * Exceptions File
 * PHP version 7
 *
@@ -46,6 +46,6 @@ public function __construct($message, $code = 0, $previous = null)
     */
     public function __toString()
     {
-        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+        return get_called_class() . ": [{$this->code}]: {$this->message}\n";
     }
-}
+}