Merge pull request #49 from microsoftgraph/dev

Merge new changes to main

Author: SilasKenneth

.github/workflows/pr-validation.yml

@@ -19,7 +19,7 @@ jobs:
   validate-pull-request:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - name: Setup PHP and Xdebug for Code Coverage report
       uses: shivammathur/setup-php@v2
       with:
@@ -37,7 +37,7 @@ jobs:
   run-static-analysis:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - name: Validate composer file
       run: |
         composer validate

.github/workflows/tag-release.yml

@@ -18,7 +18,7 @@ jobs:
   create-tag:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
 
     - 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@v2.3.4
+      - uses: actions/checkout@v2.4.0
         with:
           ref: ${{ github.ref }}
 

README.md

@@ -7,7 +7,7 @@ To install the `microsoft-graph-core` library with Composer, either run `compose
 ```
 {
     "require": {
-        "microsoft/microsoft-graph-core": "^2.0.0-RC1"
+        "microsoft/microsoft-graph-core": "^2.0.0-RC2"
     }
 }
 ```

composer.json

@@ -22,7 +22,7 @@
 	"require-dev": {
 		"phpunit/phpunit": "^9.0",
 		"mikey179/vfsstream": "^1.2",
-		"phpstan/phpstan": "^0.12.90"
+		"phpstan/phpstan": "^0.12.90 || ^1.0.0"
 	},
 	"autoload": {
 		"psr-4": {

docs/packages/default.html

@@ -84,18 +84,9 @@ <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Fil
     </ul>
 
     <article class="phpdocumentor-element -package">
-        <h2 class="phpdocumentor-content__title">API Documentation</h2>
-
-        <h3 id="packages">
-    Packages
-    <a href="#packages" class="headerlink"><i class="fas fa-link"></i></a>
-</h3>
-
-<dl class="phpdocumentor-table-of-contents">
-            <dt class="phpdocumentor-table-of-contents__entry -package"><a href="packages/Microsoft.html"><abbr title="\Microsoft">Microsoft</abbr></a></dt>
-            <dt class="phpdocumentor-table-of-contents__entry -package"><a href="packages/Default.html"><abbr title="\Default">Default</abbr></a></dt>
-    </dl>
+        <h2 class="phpdocumentor-content__title">Default</h2>
 
+        
 
 
 
@@ -117,7 +108,7 @@ <h2 class="phpdocumentor-search-results__title">Search results</h2>
 </section>
             </div>
         </div>
-        <a href="packages/default.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
+        <a href="packages/Default.html#top" class="phpdocumentor-back-to-top"><i class="fas fa-chevron-circle-up"></i></a>
 
     </main>
 

src/Core/GraphConstants.php

@@ -25,7 +25,7 @@ final class GraphConstants
     const REST_ENDPOINT = "https://graph.microsoft.com/";
 
     // Define HTTP request constants
-    const SDK_VERSION = "2.0.0-RC1";
+    const SDK_VERSION = "2.0.0-RC2";
 
     // Define error constants
     const MAX_PAGE_SIZE = 999;

src/Core/Models/Byte.php

@@ -0,0 +1,45 @@
+<?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\Models;
+
+use InvalidArgumentException;
+use JsonSerializable;
+
+/**
+ * This class is a wrapper around unsigned int values upto 255.
+ */
+class Byte implements JsonSerializable
+{
+    /**
+     * The byte value
+     * @var int $value
+     */
+    private $value = 0;
+
+    /**
+     * @param int $value The byte value
+     */
+    public function __construct(int $value) {
+        if($value < 0 || $value > 255) {
+            throw new InvalidArgumentException("Byte should be a value between 0-255 inclusive {$value} given");
+        }
+        $this->value = $value;
+    }
+
+    /**
+     * @return int
+     */
+    public function jsonSerialize(): int {
+        return $this->value;
+    }
+
+    public function __toString(): string
+    {
+       return (string)$this->value;
+    }
+}

src/Core/Models/Date.php

@@ -0,0 +1,64 @@
+<?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\Models;
+
+use DateTime;
+use Exception;
+
+class Date implements \JsonSerializable {
+    /**
+     * @var string $value
+     */
+    private $value;
+
+    /**
+     * @param string $dateString The date value in string format YYYY-MM-DD.
+     * Y - Year
+     * M - Month
+     * D - Day
+     * @throws Exception
+     */
+    public function __construct(string $dateString) {
+        $this->value = (new DateTime($dateString))->format('Y-m-d');
+    }
+
+    /**
+     * Creates a date object from a DateTime object
+     * @param DateTime $dateTime
+     * @return Date
+     * @throws Exception
+     */
+    public static function createFromDateTime(DateTime $dateTime): Date {
+        return new self($dateTime->format('Y-m-d'));
+    }
+
+    /**
+     * Creates a new Date object from $year,$month and $day
+     * @param int $year
+     * @param int $month
+     * @param int $day
+     * @return Date
+     * @throws Exception
+     */
+    public static function createFrom(int $year, int $month, int $day): Date {
+        $date = new DateTime('1970-12-12T00:00:00Z');
+        $date->setDate($year, $month, $day);
+        return self::createFromDateTime($date);
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString() {
+        return $this->value;
+    }
+
+    public function jsonSerialize(): string {
+        return $this->__toString();
+    }
+}

src/Core/Models/TimeOfDay.php

@@ -0,0 +1,76 @@
+<?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\Models;
+
+use DateTime;
+use Exception;
+use JsonSerializable;
+
+/**
+ * This object represents time in hours minutes and seconds
+ */
+class TimeOfDay implements JsonSerializable
+{
+
+    /**
+     * The final string representation of the TimeOfDay
+     * @var string $value
+     */
+    private $value;
+
+    /**
+     * @param string $timeString The time value in string format HH:MM:SS
+     * H - Hour
+     * M - Minutes
+     * S - Seconds
+     * @throws Exception
+     */
+    public function __construct(string $timeString) {
+        $this->value = (new DateTime($timeString))->format('H:i:s');
+    }
+
+    /**
+     * Creates a TimeOfDay object from a DateTime object
+     * @param DateTime $dateTime
+     * @return TimeOfDay
+     * @throws Exception
+     */
+    public static function createFromDateTime(DateTime $dateTime): TimeOfDay {
+        return new self($dateTime->format('H:i:s'));
+    }
+
+    /**
+     * Creates a new TimeOfDay object from $hour,$minute and $seconds
+     * @param int $hour
+     * @param int $minutes
+     * @param int $seconds
+     * @return TimeOfDay
+     * @throws Exception
+     */
+    public static function createFrom(int $hour, int $minutes, int $seconds = 0): TimeOfDay {
+        $date = new DateTime('1970-12-12T00:00:00Z');
+        $date->setTime($hour, $minutes, $seconds);
+        return self::createFromDateTime($date);
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString() {
+        return $this->value;
+    }
+
+
+    /**
+     * Serialize for json serialization
+     * @return string
+     */
+    public function jsonSerialize(): string {
+        return $this->__toString();
+    }
+}

tests/Core/Models/ByteTest.php

@@ -0,0 +1,46 @@
+<?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\Test\Core\Models;
+
+use InvalidArgumentException;
+use Microsoft\Graph\Core\Models\Byte;
+use Microsoft\Graph\Test\TestData\Model\Entity;
+use PHPUnit\Framework\TestCase;
+
+class ByteTest extends TestCase {
+
+    /**
+     * @var Entity|null
+     */
+    private $byteObject;
+
+    protected function setUp(): void {
+        $this->byteObject = new Entity(['size' => new Byte(200)]);
+    }
+
+    public function testCanCreateCorrectObject(): void{
+        $this->assertInstanceOf(Byte::class, $this->byteObject->getProperties()['size']);
+    }
+
+    public function testWillThrowExceptionOnInvalidValue(): void {
+        $this->expectException(InvalidArgumentException::class);
+        new Byte(-12929);
+    }
+
+    /**
+     * @throws \JsonException
+     */
+    public function testSerialization(): void {
+        $serialized = json_decode(json_encode($this->byteObject, JSON_THROW_ON_ERROR), true,512, JSON_THROW_ON_ERROR);
+        $this->assertEquals(200, $serialized['size']);
+    }
+    protected function tearDown(): void {
+        parent::tearDown();
+        $this->byteObject = null;
+    }
+}

tests/Core/Models/DateTest.php

@@ -0,0 +1,54 @@
+<?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\Test\Core\Models;
+
+use DateTime;
+use Exception;
+use JsonException;
+use Microsoft\Graph\Core\Models\Date;
+use Microsoft\Graph\Core\Models\TimeOfDay;
+use Microsoft\Graph\Test\TestData\Model\Event;
+use PHPUnit\Framework\TestCase;
+
+class DateTest extends TestCase {
+    private $event;
+
+    protected function setUp(): void {
+        $this->event = new Event(['startTime' => new TimeOfDay('12:30:24'),
+            'eventDate' => new Date('2021-11-17 12:30:24.000000'),
+            'timestamp' => new DateTime('2021-11-17T12:29:24+00:00') ]);
+    }
+
+    /**
+     * @throws JsonException
+     */
+    public function testCanSeeCorrectlyHandleDate(): void {
+        $encoded = json_decode(json_encode($this->event, JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR);
+        $this->assertEquals('2021-11-17', $encoded['eventDate']);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testCanCreateFromDateTimeObject(): void {
+        $eventCopy = $this->event;
+        $eventCopy->setEventDate(Date::createFromDateTime(new DateTime('2021-11-18 12:30:24.000000')));
+        $decoded = json_decode(json_encode($eventCopy, JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR);
+        $this->assertEquals('2021-11-18', $decoded['eventDate']);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testCanCreateFromYearMonthDay(): void {
+        $eventCopy = $this->event;
+        $this->event->setEventDate(Date::createFrom(2020, 12, 31));
+        $decoded = json_decode(json_encode($eventCopy, JSON_THROW_ON_ERROR), true, 512, JSON_THROW_ON_ERROR);
+        $this->assertEquals('2020-12-31', $decoded['eventDate']);
+    }
+}