Merge branch '6.1' into 6.2

chalasr · chalasr · commit e2b1e2493706 · 2022-06-08T00:11:42.000+02:00
* 6.1:
  fix merge
diff --git a/Authenticator/Passport/Passport.php b/Authenticator/Passport/Passport.php
@@ -68,7 +68,7 @@ public function getUser(): UserInterface
      *
      * @return $this
      */
-    public function addBadge(BadgeInterface $badge): PassportInterface
+    public function addBadge(BadgeInterface $badge): static
     {
         $this->badges[\get_class($badge)] = $badge;
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function getUser(): UserInterface`
`68`	`68`	`*`
`69`	`69`	`* @return $this`
`70`	`70`	`*/`
`71`		`- public function addBadge(BadgeInterface $badge): PassportInterface`
	`71`	`+ public function addBadge(BadgeInterface $badge): static`
`72`	`72`	`{`
`73`	`73`	`$this->badges[\get_class($badge)] = $badge;`
`74`	`74`