[ErrorHandler] add missing return types

nicolas-grekas · nicolas-grekas · commit 810e4a136fd2 · 2019-11-12T12:16:57.000+01:00
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -45,8 +45,10 @@
  *
  * @author Nicolas Grekas <p@tchwork.com>
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ *
+ * @final
  */
-final class ErrorHandler
+class ErrorHandler
 {
     private $levels = [
         E_DEPRECATED => 'Deprecated',
diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
@@ -83,7 +83,7 @@ public static function createFromThrowable(\Throwable $exception, int $statusCod
         return $e;
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         $exceptions = [];
         foreach (array_merge([$this], $this->getAllPrevious()) as $exception) {
@@ -97,7 +97,7 @@ public function toArray()
         return $exceptions;
     }
 
-    public function getStatusCode()
+    public function getStatusCode(): int
     {
         return $this->statusCode;
     }
@@ -112,7 +112,7 @@ public function setStatusCode($code): self
         return $this;
     }
 
-    public function getHeaders()
+    public function getHeaders(): array
     {
         return $this->headers;
     }
@@ -127,7 +127,7 @@ public function setHeaders(array $headers): self
         return $this;
     }
 
-    public function getClass()
+    public function getClass(): string
     {
         return $this->class;
     }
@@ -142,7 +142,7 @@ public function setClass($class): self
         return $this;
     }
 
-    public function getFile()
+    public function getFile(): string
     {
         return $this->file;
     }
@@ -157,7 +157,7 @@ public function setFile($file): self
         return $this;
     }
 
-    public function getLine()
+    public function getLine(): int
     {
         return $this->line;
     }
@@ -172,7 +172,7 @@ public function setLine($line): self
         return $this;
     }
 
-    public function getStatusText()
+    public function getStatusText(): string
     {
         return $this->statusText;
     }
@@ -184,7 +184,7 @@ public function setStatusText(string $statusText): self
         return $this;
     }
 
-    public function getMessage()
+    public function getMessage(): string
     {
         return $this->message;
     }
@@ -205,7 +205,7 @@ public function setMessage($message): self
         return $this;
     }
 
-    public function getCode()
+    public function getCode(): int
     {
         return $this->code;
     }
@@ -220,6 +220,9 @@ public function setCode($code): self
         return $this;
     }
 
+    /**
+     * @return self|null
+     */
     public function getPrevious()
     {
         return $this->previous;
@@ -235,7 +238,10 @@ final public function setPrevious(LegacyFlattenException $previous): self
         return $this;
     }
 
-    public function getAllPrevious()
+    /**
+     * @return self[]
+     */
+    public function getAllPrevious(): array
     {
         $exceptions = [];
         $e = $this;
@@ -246,7 +252,7 @@ public function getAllPrevious()
         return $exceptions;
     }
 
-    public function getTrace()
+    public function getTrace(): array
     {
         return $this->trace;
     }
@@ -261,7 +267,10 @@ public function setTraceFromException(\Exception $exception)
         $this->setTraceFromThrowable($exception);
     }
 
-    public function setTraceFromThrowable(\Throwable $throwable)
+    /**
+     * @return $this
+     */
+    public function setTraceFromThrowable(\Throwable $throwable): self
     {
         $this->traceAsString = $throwable->getTraceAsString();
 
@@ -351,19 +360,22 @@ private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value): str
         return $array['__PHP_Incomplete_Class_Name'];
     }
 
-    public function getTraceAsString()
+    public function getTraceAsString(): ?string
     {
         return $this->traceAsString;
     }
 
-    public function setAsString(?string $asString)
+    /**
+     * @return $this
+     */
+    public function setAsString(?string $asString): self
     {
         $this->asString = $asString;
 
         return $this;
     }
 
-    public function getAsString()
+    public function getAsString(): string
     {
         if (null !== $this->asString) {
             return $this->asString;

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,10 @@`
`45`	`45`	`*`
`46`	`46`	`* @author Nicolas Grekas <[email protected]>`
`47`	`47`	`* @author Grégoire Pineau <[email protected]>`
	`48`	`+ *`
	`49`	`+ * @final`
`48`	`50`	`*/`
`49`		`-final class ErrorHandler`
	`51`	`+class ErrorHandler`
`50`	`52`	`{`
`51`	`53`	`private $levels = [`
`52`	`54`	`E_DEPRECATED => 'Deprecated',`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public static function createFromThrowable(\Throwable $exception, int $statusCod`
`83`	`83`	`return $e;`
`84`	`84`	`}`
`85`	`85`
`86`		`- public function toArray()`
	`86`	`+ public function toArray(): array`
`87`	`87`	`{`
`88`	`88`	`$exceptions = [];`
`89`	`89`	`foreach (array_merge([$this], $this->getAllPrevious()) as $exception) {`
`@@ -97,7 +97,7 @@ public function toArray()`
`97`	`97`	`return $exceptions;`
`98`	`98`	`}`
`99`	`99`
`100`		`- public function getStatusCode()`
	`100`	`+ public function getStatusCode(): int`
`101`	`101`	`{`
`102`	`102`	`return $this->statusCode;`
`103`	`103`	`}`
`@@ -112,7 +112,7 @@ public function setStatusCode($code): self`
`112`	`112`	`return $this;`
`113`	`113`	`}`
`114`	`114`
`115`		`- public function getHeaders()`
	`115`	`+ public function getHeaders(): array`
`116`	`116`	`{`
`117`	`117`	`return $this->headers;`
`118`	`118`	`}`
`@@ -127,7 +127,7 @@ public function setHeaders(array $headers): self`
`127`	`127`	`return $this;`
`128`	`128`	`}`
`129`	`129`
`130`		`- public function getClass()`
	`130`	`+ public function getClass(): string`
`131`	`131`	`{`
`132`	`132`	`return $this->class;`
`133`	`133`	`}`
`@@ -142,7 +142,7 @@ public function setClass($class): self`
`142`	`142`	`return $this;`
`143`	`143`	`}`
`144`	`144`
`145`		`- public function getFile()`
	`145`	`+ public function getFile(): string`
`146`	`146`	`{`
`147`	`147`	`return $this->file;`
`148`	`148`	`}`
`@@ -157,7 +157,7 @@ public function setFile($file): self`
`157`	`157`	`return $this;`
`158`	`158`	`}`
`159`	`159`
`160`		`- public function getLine()`
	`160`	`+ public function getLine(): int`
`161`	`161`	`{`
`162`	`162`	`return $this->line;`
`163`	`163`	`}`
`@@ -172,7 +172,7 @@ public function setLine($line): self`
`172`	`172`	`return $this;`
`173`	`173`	`}`
`174`	`174`
`175`		`- public function getStatusText()`
	`175`	`+ public function getStatusText(): string`
`176`	`176`	`{`
`177`	`177`	`return $this->statusText;`
`178`	`178`	`}`
`@@ -184,7 +184,7 @@ public function setStatusText(string $statusText): self`
`184`	`184`	`return $this;`
`185`	`185`	`}`
`186`	`186`
`187`		`- public function getMessage()`
	`187`	`+ public function getMessage(): string`
`188`	`188`	`{`
`189`	`189`	`return $this->message;`
`190`	`190`	`}`
`@@ -205,7 +205,7 @@ public function setMessage($message): self`
`205`	`205`	`return $this;`
`206`	`206`	`}`
`207`	`207`
`208`		`- public function getCode()`
	`208`	`+ public function getCode(): int`
`209`	`209`	`{`
`210`	`210`	`return $this->code;`
`211`	`211`	`}`
`@@ -220,6 +220,9 @@ public function setCode($code): self`
`220`	`220`	`return $this;`
`221`	`221`	`}`
`222`	`222`
	`223`	`+ /**`
	`224`	`+ * @return self\|null`
	`225`	`+ */`
`223`	`226`	`public function getPrevious()`
`224`	`227`	`{`
`225`	`228`	`return $this->previous;`
`@@ -235,7 +238,10 @@ final public function setPrevious(LegacyFlattenException $previous): self`
`235`	`238`	`return $this;`
`236`	`239`	`}`
`237`	`240`
`238`		`- public function getAllPrevious()`
	`241`	`+ /**`
	`242`	`+ * @return self[]`
	`243`	`+ */`
	`244`	`+ public function getAllPrevious(): array`
`239`	`245`	`{`
`240`	`246`	`$exceptions = [];`
`241`	`247`	`$e = $this;`
`@@ -246,7 +252,7 @@ public function getAllPrevious()`
`246`	`252`	`return $exceptions;`
`247`	`253`	`}`
`248`	`254`
`249`		`- public function getTrace()`
	`255`	`+ public function getTrace(): array`
`250`	`256`	`{`
`251`	`257`	`return $this->trace;`
`252`	`258`	`}`
`@@ -261,7 +267,10 @@ public function setTraceFromException(\Exception $exception)`
`261`	`267`	`$this->setTraceFromThrowable($exception);`
`262`	`268`	`}`
`263`	`269`
`264`		`- public function setTraceFromThrowable(\Throwable $throwable)`
	`270`	`+ /**`
	`271`	`+ * @return $this`
	`272`	`+ */`
	`273`	`+ public function setTraceFromThrowable(\Throwable $throwable): self`
`265`	`274`	`{`
`266`	`275`	`$this->traceAsString = $throwable->getTraceAsString();`
`267`	`276`
`@@ -351,19 +360,22 @@ private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value): str`
`351`	`360`	`return $array['__PHP_Incomplete_Class_Name'];`
`352`	`361`	`}`
`353`	`362`
`354`		`- public function getTraceAsString()`
	`363`	`+ public function getTraceAsString(): ?string`
`355`	`364`	`{`
`356`	`365`	`return $this->traceAsString;`
`357`	`366`	`}`
`358`	`367`
`359`		`- public function setAsString(?string $asString)`
	`368`	`+ /**`
	`369`	`+ * @return $this`
	`370`	`+ */`
	`371`	`+ public function setAsString(?string $asString): self`
`360`	`372`	`{`
`361`	`373`	`$this->asString = $asString;`
`362`	`374`
`363`	`375`	`return $this;`
`364`	`376`	`}`
`365`	`377`
`366`		`- public function getAsString()`
	`378`	`+ public function getAsString(): string`
`367`	`379`	`{`
`368`	`380`	`if (null !== $this->asString) {`
`369`	`381`	`return $this->asString;`