Making GuardTokenInterface extend TokenInterface

weaverryan · weaverryan · commit 7f04fbb0785a · 2015-09-26T14:10:49.000-04:00
This makes some of our type-hints more honest: i.e. where we look for a GuardTokenInterface,
but really also expect it to implement TokenInterface.
diff --git a/src/Symfony/Component/Security/Guard/Token/GuardTokenInterface.php b/src/Symfony/Component/Security/Guard/Token/GuardTokenInterface.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Security\Guard\Token;
 
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+
 /**
  * A marker interface that both guard tokens implement.
  *
@@ -20,6 +22,6 @@
  *
  * @author Ryan Weaver <ryan@knpuniversity.com>
  */
-interface GuardTokenInterface
+interface GuardTokenInterface extends TokenInterface
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Security\Guard\Token;`
`13`	`13`
	`14`	`+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* A marker interface that both guard tokens implement.`
`16`	`18`	`*`
`@@ -20,6 +22,6 @@`
`20`	`22`	`*`
`21`	`23`	`* @author Ryan Weaver <ryan@knpuniversity.com>`
`22`	`24`	`*/`
`23`		`-interface GuardTokenInterface`
	`25`	`+interface GuardTokenInterface extends TokenInterface`
`24`	`26`	`{`
`25`	`27`	`}`