Fixing possible FileLinkFormatter in register and removing reduntant docblocks

Matthew Smeets · Matthew Smeets · commit d1aea83b12c2 · 2019-06-27T16:27:59.000+02:00
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -128,9 +128,6 @@ public static function disable()
         }
     }
 
-    /**
-     * @return string|null
-     */
     public function findFile(string $class = null)
     {
         return $this->isFinder ? $this->classLoader[0]->findFile($class) ?: null : null;
@@ -139,8 +136,6 @@ public function findFile(string $class = null)
     /**
      * Loads the given class or interface.
      *
-     * @param string $class The name of the class
-     *
      * @throws \RuntimeException
      */
     public function loadClass(string $class)
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -60,11 +60,11 @@ public function __construct(bool $debug = true, string $charset = null, $fileLin
      *
      * @param bool        $debug          Enable/disable debug mode, where the stack trace is displayed
      * @param string|null $charset        The charset used by exception messages
-     * @param string|null $fileLinkFormat The IDE link template
+     * @param string|FileLinkFormatter|null $fileLinkFormat The IDE link template
      *
      * @return static
      */
-    public static function register(bool $debug = true, string $charset = null, string $fileLinkFormat = null)
+    public static function register(bool $debug = true, string $charset = null, $fileLinkFormat = null)
     {
         $handler = new static($debug, $charset, $fileLinkFormat);
 

Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,6 @@ public static function disable()`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`131`		`- /**`
`132`		`- * @return string\|null`
`133`		`- */`
`134`	`131`	`public function findFile(string $class = null)`
`135`	`132`	`{`
`136`	`133`	`return $this->isFinder ? $this->classLoader[0]->findFile($class) ?: null : null;`
`@@ -139,8 +136,6 @@ public function findFile(string $class = null)`
`139`	`136`	`/**`
`140`	`137`	`* Loads the given class or interface.`
`141`	`138`	`*`
`142`		`- * @param string $class The name of the class`
`143`		`- *`
`144`	`139`	`* @throws \RuntimeException`
`145`	`140`	`*/`
`146`	`141`	`public function loadClass(string $class)`
Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ public function __construct(bool $debug = true, string $charset = null, $fileLin`
`60`	`60`	`*`
`61`	`61`	`* @param bool $debug Enable/disable debug mode, where the stack trace is displayed`
`62`	`62`	`* @param string\|null $charset The charset used by exception messages`
`63`		`- * @param string\|null $fileLinkFormat The IDE link template`
	`63`	`+ * @param string\|FileLinkFormatter\|null $fileLinkFormat The IDE link template`
`64`	`64`	`*`
`65`	`65`	`* @return static`
`66`	`66`	`*/`
`67`		`- public static function register(bool $debug = true, string $charset = null, string $fileLinkFormat = null)`
	`67`	`+ public static function register(bool $debug = true, string $charset = null, $fileLinkFormat = null)`
`68`	`68`	`{`
`69`	`69`	`$handler = new static($debug, $charset, $fileLinkFormat);`
`70`	`70`