From 810e4a136fd2c6e5f290a17c11d68041d687f3d2 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 12 Nov 2019 12:16:57 +0100
Subject: [PATCH] [ErrorHandler] add missing return types

---
 .../Component/ErrorHandler/ErrorHandler.php   |  4 +-
 .../Exception/FlattenException.php            | 42 ++++++++++++-------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
index 6df9cdec22..7e2bf11ef2 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -45,8 +45,10 @@ use Symfony\Component\ErrorHandler\Exception\SilencedErrorContext;
  *
  * @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
index 61af8a7e1d..0c09cc989b 100644
--- a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
+++ b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
@@ -83,7 +83,7 @@ class FlattenException extends LegacyFlattenException
         return $e;
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         $exceptions = [];
         foreach (array_merge([$this], $this->getAllPrevious()) as $exception) {
@@ -97,7 +97,7 @@ class FlattenException extends LegacyFlattenException
         return $exceptions;
     }
 
-    public function getStatusCode()
+    public function getStatusCode(): int
     {
         return $this->statusCode;
     }
@@ -112,7 +112,7 @@ class FlattenException extends LegacyFlattenException
         return $this;
     }
 
-    public function getHeaders()
+    public function getHeaders(): array
     {
         return $this->headers;
     }
@@ -127,7 +127,7 @@ class FlattenException extends LegacyFlattenException
         return $this;
     }
 
-    public function getClass()
+    public function getClass(): string
     {
         return $this->class;
     }
@@ -142,7 +142,7 @@ class FlattenException extends LegacyFlattenException
         return $this;
     }
 
-    public function getFile()
+    public function getFile(): string
     {
         return $this->file;
     }
@@ -157,7 +157,7 @@ class FlattenException extends LegacyFlattenException
         return $this;
     }
 
-    public function getLine()
+    public function getLine(): int
     {
         return $this->line;
     }
@@ -172,7 +172,7 @@ class FlattenException extends LegacyFlattenException
         return $this;
     }
 
-    public function getStatusText()
+    public function getStatusText(): string
     {
         return $this->statusText;
     }
@@ -184,7 +184,7 @@ class FlattenException extends LegacyFlattenException
         return $this;
     }
 
-    public function getMessage()
+    public function getMessage(): string
     {
         return $this->message;
     }
@@ -205,7 +205,7 @@ class FlattenException extends LegacyFlattenException
         return $this;
     }
 
-    public function getCode()
+    public function getCode(): int
     {
         return $this->code;
     }
@@ -220,6 +220,9 @@ class FlattenException extends LegacyFlattenException
         return $this;
     }
 
+    /**
+     * @return self|null
+     */
     public function getPrevious()
     {
         return $this->previous;
@@ -235,7 +238,10 @@ class FlattenException extends LegacyFlattenException
         return $this;
     }
 
-    public function getAllPrevious()
+    /**
+     * @return self[]
+     */
+    public function getAllPrevious(): array
     {
         $exceptions = [];
         $e = $this;
@@ -246,7 +252,7 @@ class FlattenException extends LegacyFlattenException
         return $exceptions;
     }
 
-    public function getTrace()
+    public function getTrace(): array
     {
         return $this->trace;
     }
@@ -261,7 +267,10 @@ class FlattenException extends LegacyFlattenException
         $this->setTraceFromThrowable($exception);
     }
 
-    public function setTraceFromThrowable(\Throwable $throwable)
+    /**
+     * @return $this
+     */
+    public function setTraceFromThrowable(\Throwable $throwable): self
     {
         $this->traceAsString = $throwable->getTraceAsString();
 
@@ -351,19 +360,22 @@ class FlattenException extends LegacyFlattenException
         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;