Merge 'main' into 2.x

jrushlow · jrushlow · commit 76edcadeabde · 2024-04-17T04:42:10.000-04:00
* main: feature #310 [generator] [1.x] userId argument should be either a string or int
diff --git a/src/Generator/ResetPasswordTokenGenerator.php b/src/Generator/ResetPasswordTokenGenerator.php
@@ -33,8 +33,8 @@ public function __construct(
     /**
      * Get a cryptographically secure token with it's non-hashed components.
      *
-     * @param mixed  $userId   Unique user identifier
-     * @param string $verifier Only required for token comparison
+     * @param int|string $userId   Unique user identifier
+     * @param ?string    $verifier Only required for token comparison
      */
     public function createToken(\DateTimeInterface $expiresAt, $userId, ?string $verifier = null): ResetPasswordTokenComponents
     {

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ public function __construct(`
`33`	`33`	`/**`
`34`	`34`	`* Get a cryptographically secure token with it's non-hashed components.`
`35`	`35`	`*`
`36`		`- * @param mixed $userId Unique user identifier`
`37`		`- * @param string $verifier Only required for token comparison`
	`36`	`+ * @param int\|string $userId Unique user identifier`
	`37`	`+ * @param ?string $verifier Only required for token comparison`
`38`	`38`	`*/`
`39`	`39`	`public function createToken(\DateTimeInterface $expiresAt, $userId, ?string $verifier = null): ResetPasswordTokenComponents`
`40`	`40`	`{`