[FrameworkBundle][Security] Replaced void return type with null for consistency

jakzal · fabpot · commit e4100ac2fa91 · 2013-09-13T14:06:44.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php b/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
@@ -26,6 +26,9 @@ class GlobalVariables
 {
     protected $container;
 
+    /**
+     * @param ContainerInterface $container The DI container
+     */
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
@@ -46,7 +49,7 @@ public function getSecurity()
     /**
      * Returns the current user.
      *
-     * @return mixed|void
+     * @return mixed
      *
      * @see TokenInterface::getUser()
      */
diff --git a/src/Symfony/Component/Security/Core/User/UserInterface.php b/src/Symfony/Component/Security/Core/User/UserInterface.php
@@ -80,8 +80,6 @@ public function getUsername();
      *
      * This is important if, at any given point, sensitive information like
      * the plain-text password is stored on this object.
-     *
-     * @return void
      */
     public function eraseCredentials();
 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ class GlobalVariables`
`26`	`26`	`{`
`27`	`27`	`protected $container;`
`28`	`28`
	`29`	`+ /**`
	`30`	`+ * @param ContainerInterface $container The DI container`
	`31`	`+ */`
`29`	`32`	`public function __construct(ContainerInterface $container)`
`30`	`33`	`{`
`31`	`34`	`$this->container = $container;`
`@@ -46,7 +49,7 @@ public function getSecurity()`
`46`	`49`	`/**`
`47`	`50`	`* Returns the current user.`
`48`	`51`	`*`
`49`		`- * @return mixed\|void`
	`52`	`+ * @return mixed`
`50`	`53`	`*`
`51`	`54`	`* @see TokenInterface::getUser()`
`52`	`55`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,6 @@ public function getUsername();`
`80`	`80`	`*`
`81`	`81`	`* This is important if, at any given point, sensitive information like`
`82`	`82`	`* the plain-text password is stored on this object.`
`83`		`- *`
`84`		`- * @return void`
`85`	`83`	`*/`
`86`	`84`	`public function eraseCredentials();`
`87`	`85`	`}`