Merge branch 'v6.0-beta' into lti-lib-v6

composer.json

@@ -45,7 +45,7 @@
     "scripts": {
         "test": "phpunit",
         "lint": [
-            "pint -v --test",
+            "pint --test",
             "phpstan analyse"
         ],
         "lint-fix": "pint -v"

src/Interfaces/ILtiRegistration.php

@@ -13,19 +13,19 @@ public function getClientId();
 
     public function setClientId(string $clientId): ILtiRegistration;
 
-    public function getKeySetUrl();
+    public function getKeySetUrl(): ?string;
 
     public function setKeySetUrl(string $keySetUrl): ILtiRegistration;
 
-    public function getAuthTokenUrl();
+    public function getAuthTokenUrl(): ?string;
 
-    public function setAuthTokenUrl(string $authTokenUrl): ILtiRegistration;
+    public function setAuthTokenUrl(?string $authTokenUrl): ILtiRegistration;
 
-    public function getAuthLoginUrl();
+    public function getAuthLoginUrl(): ?string;
 
     public function setAuthLoginUrl(string $authLoginUrl): ILtiRegistration;
 
-    public function getAuthServer();
+    public function getAuthServer(): ?string;
 
     public function setAuthServer(string $authServer): ILtiRegistration;
 

src/Interfaces/ILtiServiceConnector.php

@@ -2,16 +2,18 @@
 
 namespace Packback\Lti1p3\Interfaces;
 
-use GuzzleHttp\Psr7\Response;
+use Psr\Http\Message\ResponseInterface;
 
 /** @internal */
 interface ILtiServiceConnector
 {
-    public function getAccessToken(ILtiRegistration $registration, array $scopes);
+    public function getAccessToken(ILtiRegistration $registration, array $scopes): string;
 
-    public function makeRequest(IServiceRequest $request);
+    public function makeRequest(IServiceRequest $request): ResponseInterface;
 
-    public function getResponseBody(Response $request): ?array;
+    public function getResponseBody(ResponseInterface $response): ?array;
+
+    public function getResponseHeaders(ResponseInterface $response): ?array;
 
     public function makeServiceRequest(
         ILtiRegistration $registration,

src/Interfaces/IServiceRequest.php

@@ -17,6 +17,8 @@ public function setAccessToken(string $accessToken): IServiceRequest;
 
     public function setBody(string $body): IServiceRequest;
 
+    public function setPayload(array $payload): IServiceRequest;
+
     public function setAccept(string $accept): IServiceRequest;
 
     public function setContentType(string $contentType): IServiceRequest;

src/LtiDeployment.php

@@ -11,7 +11,7 @@ public function __construct(
     ) {
     }
 
-    public static function new($deployment_id): LtiDeployment
+    public static function new($deployment_id): self
     {
         return new LtiDeployment($deployment_id);
     }

src/LtiLineitem.php

@@ -30,6 +30,14 @@ public function __construct(?array $lineitem = null)
         $this->grades_released = $lineitem['gradesReleased'] ?? null;
     }
 
+    /**
+     * Static function to allow for method chaining without having to assign to a variable first.
+     */
+    public static function new(?array $lineItem = null): self
+    {
+        return new LtiLineitem($lineItem);
+    }
+
     public function getArray(): array
     {
         return [
@@ -45,14 +53,6 @@ public function getArray(): array
         ];
     }
 
-    /**
-     * Static function to allow for method chaining without having to assign to a variable first.
-     */
-    public static function new(?array $lineItem = null): self
-    {
-        return new LtiLineitem($lineItem);
-    }
-
     public function getId()
     {
         return $this->id;

src/LtiRegistration.php

@@ -56,48 +56,48 @@ public function setClientId(string $clientId): self
         return $this;
     }
 
-    public function getKeySetUrl()
+    public function getKeySetUrl(): ?string
     {
         return $this->keySetUrl;
     }
 
-    public function setKeySetUrl(string $keySetUrl): self
+    public function setKeySetUrl(?string $keySetUrl): self
     {
         $this->keySetUrl = $keySetUrl;
 
         return $this;
     }
 
-    public function getAuthTokenUrl()
+    public function getAuthTokenUrl(): ?string
     {
         return $this->authTokenUrl;
     }
 
-    public function setAuthTokenUrl(string $authTokenUrl): self
+    public function setAuthTokenUrl(?string $authTokenUrl): self
     {
         $this->authTokenUrl = $authTokenUrl;
 
         return $this;
     }
 
-    public function getAuthLoginUrl()
+    public function getAuthLoginUrl(): ?string
     {
         return $this->authLoginUrl;
     }
 
-    public function setAuthLoginUrl(string $authLoginUrl): self
+    public function setAuthLoginUrl(?string $authLoginUrl): self
     {
         $this->authLoginUrl = $authLoginUrl;
 
         return $this;
     }
 
-    public function getAuthServer()
+    public function getAuthServer(): ?string
     {
         return $this->authServer ?? $this->authTokenUrl;
     }
 
-    public function setAuthServer(string $authServer): self
+    public function setAuthServer(?string $authServer): self
     {
         $this->authServer = $authServer;
 

src/LtiServiceConnector.php

@@ -36,6 +36,7 @@ public function getAccessToken(ILtiRegistration $registration, array $scopes): s
         $accessTokenKey = $this->getAccessTokenCacheKey($registration, $scopes);
         // Get access token from cache if it exists
         $accessToken = $this->cache->getAccessToken($accessTokenKey);
+
         if (isset($accessToken)) {
             return $accessToken;
         }
@@ -164,7 +165,12 @@ public function getAll(
         while ($nextUrl) {
             $response = $this->makeServiceRequest($registration, $scopes, $request);
 
-            $page_results = $key === null ? ($response['body'] ?? []) : ($response['body'][$key] ?? []);
+            if (isset($key)) {
+                $page_results = $response['body'][$key] ?? [];
+            } else {
+                $page_results = $response['body'] ?? [];
+            }
+
             $results = array_merge($results, $page_results);
 
             $nextUrl = $this->getNextUrl($response['headers']);