[SDK-2752] Expand test coverage and finish migration to Pest framework

composer.json

@@ -43,17 +43,19 @@
     "psr/http-message-implementation": "^1.0"
   },
   "require-dev": {
-    "symfony/cache": "^4.4 || ^5.2",
     "ergebnis/phpstan-rules": "^0.15",
     "firebase/php-jwt": "^5.0",
+    "hyperf/event": "^2.2",
     "infection/infection": "^0.23",
     "mockery/mockery": "^1.4",
     "nunomaduro/phpinsights": "^2.0",
     "nyholm/psr7": "^1.4",
     "pestphp/pest": "^1.0",
+    "pestphp/pest-plugin-parallel": "^0.2.0",
     "php-http/mock-client": "^1.4",
     "phpstan/phpstan": "^0.12",
     "phpstan/phpstan-strict-rules": "^0.12",
+    "symfony/cache": "^4.4 || ^5.2",
     "thecodingmachine/phpstan-strict-rules": "^0.12",
     "vimeo/psalm": "^4.7"
   },

phpinsights.php

@@ -50,7 +50,7 @@
                 'src/Configuration/SdkConfiguration.php',
                 'src/Configuration/SdkState.php',
                 'src/Store/SessionStore.php',
-                'src/Store/InMemoryStorage.php',
+                'src/Store/MemoryStore.php',
                 'src/Store/Psr6Store.php',
             ],
         ],

src/API/Management/ManagementEndpoint.php

@@ -43,14 +43,14 @@ final public function getHttpClient(): HttpClient
      */
     final public function getLastRequest(): ?HttpRequest
     {
-        return $this->httpClient->getLastRequest();
+        return $this->getHttpClient()->getLastRequest();
     }
 
     /**
      * Return a ResponsePaginator instance configured for the last HttpRequest.
      */
     final public function getResponsePaginator(): HttpResponsePaginator
     {
-        return new HttpResponsePaginator($this->httpClient);
+        return new HttpResponsePaginator($this->getHttpClient());
     }
 }

src/API/Management/Tenants.php

@@ -26,7 +26,7 @@ final class Tenants extends ManagementEndpoint
      *
      * @link https://auth0.com/docs/api/management/v2#!/Tenants/tenant_settings_route
      */
-    public function get(
+    public function getSettings(
         ?RequestOptions $options = null
     ): ResponseInterface {
         return $this->getHttpClient()
@@ -48,15 +48,15 @@ public function get(
      *
      * @link https://auth0.com/docs/api/management/v2#!/Tenants/patch_settings
      */
-    public function update(
+    public function updateSettings(
         array $body,
         ?RequestOptions $options = null
     ): ResponseInterface {
-        [$body] = Toolkit::filter([$body])->string()->trim();
+        [$body] = Toolkit::filter([$body])->array()->trim();
 
         Toolkit::assert([
             [$body, \Auth0\SDK\Exception\ArgumentException::missing('body')],
-        ])->isString();
+        ])->isArray();
 
         return $this->getHttpClient()
             ->method('patch')

src/Auth0.php

@@ -151,6 +151,34 @@ public function signup(
         ], $params));
     }
 
+    /**
+     * If invitation parameters are present in the request, handle extraction and return a URL for redirection to Universal Login to accept. Returns null if no invitation parameters were found.
+     *
+     * @param string|null                 $redirectUrl Optional. URI to return to after logging out. Defaults to the SDK's configured redirectUri.
+     * @param array<int|string|null>|null $params Additional parameters to include with the request.
+     *
+     * @throws \Auth0\SDK\Exception\ConfigurationException When a Client ID is not configured.
+     * @throws \Auth0\SDK\Exception\ConfigurationException When `redirectUri` is not specified, and supplied SdkConfiguration does not have a default redirectUri configured.
+     *
+     * @link https://auth0.com/docs/universal-login/new-experience
+     * @link https://auth0.com/docs/api/authentication#login
+     */
+    public function handleInvitation(
+        ?string $redirectUrl = null,
+        ?array $params = null
+    ): ?string {
+        $invite = $this->getInvitationParameters();
+
+        if ($invite !== null) {
+            return $this->login($redirectUrl, Toolkit::merge([
+                'invitation' => (string) $invite->invitation,
+                'organization' => (string) $invite->organization,
+            ], $params));
+        }
+
+        return null;
+    }
+
     /**
      * Delete any persistent data and clear out all stored properties, and return the URI to Auth0 /logout endpoint for redirection.
      *
@@ -173,16 +201,19 @@ public function logout(
 
     /**
      * Delete any persistent data and clear out all stored properties.
+     *
+     * @oaram bool $transient When true, data in transient storage is also cleared.
      */
-    public function clear(): self
-    {
+    public function clear(
+        bool $transient = true
+    ): self {
         // Delete all data in the session storage medium.
         if ($this->configuration()->hasSessionStorage()) {
             $this->configuration->getSessionStorage()->purge();
         }
 
         // Delete all data in the transient storage medium.
-        if ($this->configuration()->hasTransientStorage()) {
+        if ($this->configuration()->hasTransientStorage() && $transient === true) {
             $this->configuration->getTransientStorage()->purge();
         }
 
@@ -273,6 +304,8 @@ public function exchange(
             return false;
         }
 
+        $this->clear(false);
+
         if ($state === null || ! $this->getTransientStore()->verify('state', $state)) {
             $this->clear();
             throw \Auth0\SDK\Exception\StateException::invalidState();
@@ -287,10 +320,6 @@ public function exchange(
             }
         }
 
-        if ($this->getState()->hasUser()) {
-            $this->clear();
-        }
-
         $response = $this->authentication()->codeExchange($code, $redirectUri, $codeVerifier);
 
         if (! HttpResponse::wasSuccessful($response)) {
@@ -622,18 +651,20 @@ public function setAccessTokenExpiration(
      * Get the specified parameter from POST or GET, depending on configured response mode.
      *
      * @param string $parameterName Name of the parameter to pull from the request.
+     * @param int $filter Defaults to FILTER_SANITIZE_STRING. The type of PHP filter_var() filter to apply.
      */
     public function getRequestParameter(
-        string $parameterName
+        string $parameterName,
+        int $filter = FILTER_SANITIZE_STRING
     ): ?string {
         $responseMode = $this->configuration()->getResponseMode();
 
         if ($responseMode === 'query' && isset($_GET[$parameterName])) {
-            return filter_var($_GET[$parameterName], FILTER_SANITIZE_STRING, FILTER_NULL_ON_FAILURE);
+            return filter_var($_GET[$parameterName], $filter, FILTER_NULL_ON_FAILURE);
         }
 
         if ($responseMode === 'form_post' && isset($_POST[$parameterName])) {
-            return filter_var($_POST[$parameterName], FILTER_SANITIZE_STRING, FILTER_NULL_ON_FAILURE);
+            return filter_var($_POST[$parameterName], $filter, FILTER_NULL_ON_FAILURE);
         }
 
         return null;
@@ -659,23 +690,6 @@ public function getInvitationParameters(): ?object
         return null;
     }
 
-    /**
-     * If invitation parameters are present in the request, handle extraction and automatically redirect to Universal Login.
-     */
-    public function handleInvitation(): self
-    {
-        $invite = $this->getInvitationParameters();
-
-        if ($invite !== null) {
-            $this->login(null, [
-                'invitation' => (string) $invite->invitation,
-                'organization' => (string) $invite->organization,
-            ]);
-        }
-
-        return $this;
-    }
-
     /**
      * Create a transient storage handler using the configured transientStorage medium.
      */

src/Configuration/SdkConfiguration.php

@@ -353,6 +353,8 @@ private function setupStateCookies(): void
      * Setup SDK factories.
      *
      * @throws NotFoundException When a PSR-18 or PSR-17 are not configured, and cannot be discovered.
+     *
+     * @codeCoverageIgnore
      */
     private function setupStateFactories(): void
     {
@@ -450,20 +452,6 @@ private function onStateChange(
             throw \Auth0\SDK\Exception\ConfigurationException::invalidAlgorithm();
         }
 
-        if ($propertyName === 'tokenMaxAge' || $propertyName === 'tokenLeeway') {
-            if (is_int($propertyValue)) {
-                // Value was passed as an int, perfect.
-                return $propertyValue;
-            }
-
-            if (is_numeric($propertyValue)) {
-                // Value was passed as a string, but it is numeric so cast to int.
-                return (int) $propertyValue;
-            }
-
-            throw \Auth0\SDK\Exception\ConfigurationException::validationFailed($propertyName);
-        }
-
         if (in_array($propertyName, ['organization', 'audience'], true)) {
             if (is_array($propertyValue) && count($propertyValue) !== 0) {
                 return $propertyValue;
@@ -475,19 +463,6 @@ private function onStateChange(
         return $propertyValue;
     }
 
-    /**
-     * Fires when a validation event fails to pass, such as a bad parameter type being used.
-     *
-     * @param string      $parameter The name of the parameter that failed validation.
-     *
-     * @throws ConfigurationException When invoked.
-     */
-    private function onValidationException(
-        string $parameter
-    ): void {
-        throw \Auth0\SDK\Exception\ConfigurationException::validationFailed($parameter);
-    }
-
     /**
      * Setup SDK validators based on strategy type.
      */

src/Mixins/ConfigurableMixin.php

@@ -69,23 +69,24 @@ public function __call(
                     $arguments[0] = [ $arguments[0] ];
                 }
 
-                [$arguments] = Toolkit::filter([$arguments])->array()->trim();
+                $arguments = array_filter(
+                    Toolkit::filter($arguments)->array()->trim(),
+                    static function ($val): bool {
+                        return $val !== null && count($val) !== 0;
+                    }
+                );
 
                 if (count($arguments) !== 0) {
                     if (is_array($this->configuredState[$propertyName]->value)) {
                         $this->changeState($propertyName, array_merge($this->configuredState[$propertyName]->value, $arguments[0]));
                         return $this;
                     }
 
-                    if ($this->configuredState[$propertyName]->value === null) {
-                        $this->changeState($propertyName, $arguments[0]);
-                        return $this;
-                    }
-
                     $this->changeState($propertyName, $arguments[0]);
+                    return $this;
                 }
 
-                return $this->configuredState[$propertyName]->value;
+                return $this;
             }
 
             throw \Auth0\SDK\Exception\ConfigurationException::getMissing($propertyName);
@@ -101,7 +102,7 @@ public function __call(
             throw \Auth0\SDK\Exception\ConfigurationException::getMissing($propertyName);
         }
 
-        return;
+        throw \Auth0\SDK\Exception\ArgumentException::unknownMethod($functionName);
     }
 
     /**
@@ -148,7 +149,7 @@ private function setState(
         // TODO: Replace get_class() w/ ::class when 7.x support is dropped.
 
         // phpcs:ignore
-        $constructor = new \ReflectionMethod(get_class($this) . '::__construct');
+        $constructor = new \ReflectionMethod(get_class($this), '__construct');
         $parameters = $constructor->getParameters();
         $arguments = $args[0];
         $usingArgumentsArray = false;
@@ -226,9 +227,6 @@ private function changeState(
         string $propertyName,
         $propertyValue
     ): void {
-        $propertyType = gettype($propertyValue);
-        $expectedType = $this->configuredState[$propertyName]->type;
-
         if ($this->configurationImmutable) {
             throw \Auth0\SDK\Exception\ConfigurationException::setImmutable();
         }
@@ -237,18 +235,29 @@ private function changeState(
             throw \Auth0\SDK\Exception\ConfigurationException::setMissing($propertyName);
         }
 
-        if ($propertyType !== $expectedType) {
-            if (! ($propertyType === 'boolean' && $expectedType === 'bool') &&
-                ! ($propertyType === 'integer' && $expectedType === 'int')) {
-                if ($propertyValue === null && ! $this->configuredState[$propertyName]->allowsNull) {
-                    throw \Auth0\SDK\Exception\ConfigurationException::setIncompatible($propertyName, $expectedType, $propertyType);
-                }
+        $propertyType = gettype($propertyValue);
 
-                if ($propertyValue !== null && $this->configuredState[$propertyName]->allowsNull) {
-                    if (! is_object($propertyValue) || ! ($propertyValue instanceof $expectedType)) {
-                        throw \Auth0\SDK\Exception\ConfigurationException::setIncompatibleNullable($propertyName, $expectedType, $propertyType);
-                    }
+        $normalizedPropertyTypes = [
+            'boolean' => 'bool',
+            'integer' => 'int',
+        ];
+
+        $propertyType = $normalizedPropertyTypes[$propertyType] ?? $propertyType;
+
+        $allowedTypes = [$this->configuredState[$propertyName]->type];
+        $expectedType = $this->configuredState[$propertyName]->type;
+
+        if ($this->configuredState[$propertyName]->allowsNull) {
+            $allowedTypes[] = 'NULL';
+        }
+
+        if (! in_array($propertyType, $allowedTypes, true)) {
+            if (! $propertyValue instanceof $expectedType) {
+                if ($this->configuredState[$propertyName]->allowsNull) {
+                    throw \Auth0\SDK\Exception\ConfigurationException::setIncompatibleNullable($propertyName, $expectedType, $propertyType);
                 }
+
+                throw \Auth0\SDK\Exception\ConfigurationException::setIncompatible($propertyName, $expectedType, $propertyType);
             }
         }