Merge pull request #96 from microsoftgraph/dev

Release 2.0.0-RC7

Author: Ndiritu

.github/workflows/pr-validation.yml

@@ -18,14 +18,17 @@ defaults:
 jobs:
   validate-pull-request:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: ['7.4', '8.0', '8.1', '8.2']
     steps:
-    - uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.5.2
       with:
         submodules: 'true'
     - name: Setup PHP and Xdebug for Code Coverage report
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: ${{ matrix.php-versions }}
         coverage: xdebug
     - name: Validate composer file
       run: |
@@ -34,8 +37,15 @@ jobs:
       run: |
         composer install
     - name: Run tests
-      run : |
-        vendor/bin/phpunit --coverage-text
+      run: ./vendor/bin/phpunit --coverage-clover=coverage.xml
+    - name: Fix code coverage paths
+      run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
+    - name: SonarCloud Scan
+      if: ${{ matrix.php-versions == '8.0' }}
+      uses: SonarSource/sonarcloud-github-action@master
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
     - name: Run static analysis
       run: |
         vendor/bin/phpstan analyse --memory-limit=500M --error-format=github

.github/workflows/tag-release.yml

@@ -18,7 +18,7 @@ jobs:
   create-tag:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.5.2
 
     - name: Get SDK version and set environment variable
       run: |

.github/workflows/update-docs.yml

@@ -15,7 +15,7 @@ jobs:
   run-php-documentor:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
         with:
           ref: ${{ github.ref }}
 

README.md

@@ -1,13 +1,14 @@
 # Get started with the Microsoft Graph Core SDK for PHP
 
 [![Latest Stable Version](https://poser.pugx.org/microsoft/microsoft-graph-core/version)](https://packagist.org/packages/microsoft/microsoft-graph-core)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=microsoftgraph_msgraph-sdk-php-core&metric=coverage)](https://sonarcloud.io/dashboard?id=microsoftgraph_msgraph-sdk-php-core)
 
 ## Install the Core Library
 To install the `microsoft-graph-core` library with Composer, either run `composer require microsoft/microsoft-graph-core`, or edit your `composer.json` file:
 ```
 {
     "require": {
-        "microsoft/microsoft-graph-core": "^2.0.0-RC4"
+        "microsoft/microsoft-graph-core": "^2.0.0-RC7"
     }
 }
 ```

composer.json

@@ -13,11 +13,10 @@
 	],
 	"require": {
 		"php": "^8.0 || ^7.4",
-		"microsoft/kiota-authentication-phpleague": "^0.4.0",
-		"microsoft/kiota-http-guzzle": "^0.4.0",
-		"microsoft/kiota-serialization-json": "^0.3.0",
-		"microsoft/kiota-serialization-text": "^0.3.0",
-		"microsoft/kiota-abstractions": "^0.4.0",
+		"microsoft/kiota-authentication-phpleague": "^0.6.0",
+		"microsoft/kiota-http-guzzle": "^0.6.0",
+		"microsoft/kiota-serialization-json": "^0.4.0",
+		"microsoft/kiota-serialization-text": "^0.5.0",
 		"php-http/httplug": "^2.2",
 		"php-http/guzzle7-adapter": "^1.0",
 		"ext-json": "*"

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-	level: 3
+	level: 9
 	polluteScopeWithAlwaysIterableForeach: false
 	polluteScopeWithLoopInitialAssignments: false
 	paths:

sonar-project.properties

@@ -0,0 +1,5 @@
+sonar.projectKey=microsoftgraph_msgraph-sdk-php-core
+sonar.organization=microsoftgraph2
+sonar.php.coverage.reportPaths=coverage.xml
+sonar.sources=src/
+sonar.tests=tests/

src/Authentication/GraphPhpLeagueAccessTokenProvider.php

@@ -0,0 +1,37 @@
+<?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\Authentication;
+
+
+use Microsoft\Kiota\Authentication\Oauth\TokenRequestContext;
+use Microsoft\Kiota\Authentication\PhpLeagueAccessTokenProvider;
+
+/**
+ * Class GraphPhpLeagueAccessTokenProvider
+ *
+ * Fetches an access token using the PHP League OAuth 2.0 client library while setting default Graph allowed hosts
+ *
+ * @package Microsoft\Graph\Core\Authentication
+ * @copyright 2023 Microsoft Corporation
+ * @license https://opensource.org/licenses/MIT MIT License
+ * @link https://developer.microsoft.com/graph
+ */
+class GraphPhpLeagueAccessTokenProvider extends PhpLeagueAccessTokenProvider
+{
+    /**
+     * @param TokenRequestContext $tokenRequestContext
+     * @param array<string> $scopes if left empty, it's set to ["https://[graph national cloud host]/.default"] scope
+     */
+    public function __construct(TokenRequestContext $tokenRequestContext, array $scopes = [])
+    {
+        $allowedHosts = ["graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de",
+            "microsoftgraph.chinacloudapi.cn", "canary.graph.microsoft.com"];
+        parent::__construct($tokenRequestContext, $scopes, $allowedHosts);
+    }
+}

src/Authentication/GraphPhpLeagueAuthenticationProvider.php

@@ -0,0 +1,32 @@
+<?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\Authentication;
+
+use Microsoft\Kiota\Abstractions\Authentication\BaseBearerTokenAuthenticationProvider;
+use Microsoft\Kiota\Authentication\Oauth\TokenRequestContext;
+
+/**
+ * Class GraphPhpLeagueAuthenticationProvider
+ * @package Microsoft\Graph\Core\Authentication
+ * @copyright 2023 Microsoft Corporation
+ * @license https://opensource.org/licenses/MIT MIT License
+ * @link https://developer.microsoft.com/graph
+ */
+class GraphPhpLeagueAuthenticationProvider extends BaseBearerTokenAuthenticationProvider
+{
+    /**
+     * @param TokenRequestContext $tokenRequestContext
+     * @param array<string> $scopes defaults to ["https://[graph national cloud host]/.default"] scope
+     */
+    public function __construct(TokenRequestContext $tokenRequestContext, array $scopes = [])
+    {
+        $accessTokenProvider = new GraphPhpLeagueAccessTokenProvider($tokenRequestContext, $scopes);
+        parent::__construct($accessTokenProvider);
+    }
+}

src/BaseGraphRequestAdapter.php

@@ -28,13 +28,17 @@
 class BaseGraphRequestAdapter extends GuzzleRequestAdapter
 {
     /**
+     * @param GraphTelemetryOption $telemetryOption
      * @param AuthenticationProvider|null $authenticationProvider
-     * @param GraphTelemetryOption|null $telemetryOption
      * @param ParseNodeFactory|null $parseNodeFactory
      * @param SerializationWriterFactory|null $serializationWriterFactory
      * @param Client|null $guzzleClient
      */
-    public function __construct(?AuthenticationProvider $authenticationProvider = null, ?GraphTelemetryOption $telemetryOption = null, ?ParseNodeFactory $parseNodeFactory = null, ?SerializationWriterFactory $serializationWriterFactory = null, ?Client $guzzleClient = null)
+    public function __construct(GraphTelemetryOption $telemetryOption,
+                                ?AuthenticationProvider $authenticationProvider = null,
+                                ?ParseNodeFactory $parseNodeFactory = null,
+                                ?SerializationWriterFactory $serializationWriterFactory = null,
+                                ?Client $guzzleClient = null)
     {
         $authenticationProvider = ($authenticationProvider) ?? new AnonymousAuthenticationProvider();
         $guzzleClient = ($guzzleClient) ?? GraphClientFactory::setTelemetryOption($telemetryOption)::create();