Merge pull request #3031 from stof/fix_static_analysis

stof · web-flow · commit 5e9f2af4d365 · 2022-01-14T14:03:19.000+01:00
Fix the code to avoid static analysis false positives in projects
diff --git a/Event/GetResponseNullableUserEvent.php b/Event/GetResponseNullableUserEvent.php
@@ -29,4 +29,12 @@ public function __construct(UserInterface $user = null, Request $request)
         $this->user = $user;
         $this->request = $request;
     }
+
+    /**
+     * @return UserInterface|null
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
 }
diff --git a/Model/UserInterface.php b/Model/UserInterface.php
@@ -276,8 +276,6 @@ public function isEnabled();
     /**
      * @author Thibault Duplessis <thibault.duplessis@gmail.com>
      * @author Johannes M. Schmitt <schmittjoh@gmail.com>
-     *
-     * @deprecated since Symfony 4.1. Remove in Nov 2023 (End of support for security fixes SF 4.4)
      */
     interface UserInterface extends FosUserInterface, \Symfony\Component\Security\Core\User\AdvancedUserInterface
     {

Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,12 @@ public function __construct(UserInterface $user = null, Request $request)`
`29`	`29`	`$this->user = $user;`
`30`	`30`	`$this->request = $request;`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ /**`
	`34`	`+ * @return UserInterface\|null`
	`35`	`+ */`
	`36`	`+ public function getUser()`
	`37`	`+ {`
	`38`	`+ return $this->user;`
	`39`	`+ }`
`32`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -276,8 +276,6 @@ public function isEnabled();`
`276`	`276`	`/**`
`277`	`277`	`* @author Thibault Duplessis <[email protected]>`
`278`	`278`	`* @author Johannes M. Schmitt <[email protected]>`
`279`		`- *`
`280`		`- * @deprecated since Symfony 4.1. Remove in Nov 2023 (End of support for security fixes SF 4.4)`
`281`	`279`	`*/`
`282`	`280`	`interface UserInterface extends FosUserInterface, \Symfony\Component\Security\Core\User\AdvancedUserInterface`
`283`	`281`	`{`