[ErrorHandler] Add types to constructors and private/final/internal methods.

derrabus · derrabus · commit 4f6264162527 · 2019-09-25T11:28:39.000+02:00
diff --git a/src/Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php
@@ -118,7 +118,7 @@ public function testClassAlias()
     /**
      * @dataProvider provideDeprecatedSuper
      */
-    public function testDeprecatedSuper($class, $super, $type)
+    public function testDeprecatedSuper(string $class, string $super, string $type)
     {
         set_error_handler(function () { return false; });
         $e = error_reporting(0);
@@ -140,7 +140,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
         $this->assertSame($xError, $lastError);
     }
 
-    public function provideDeprecatedSuper()
+    public function provideDeprecatedSuper(): array
     {
         return [
             ['DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'],
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
@@ -572,7 +572,7 @@ public function testSendPhpResponse()
     /**
      * @dataProvider errorHandlerWhenLoggingProvider
      */
-    public function testErrorHandlerWhenLogging($previousHandlerWasDefined, $loggerSetsAnotherHandler, $nextHandlerIsDefined)
+    public function testErrorHandlerWhenLogging(bool $previousHandlerWasDefined, bool $loggerSetsAnotherHandler, bool $nextHandlerIsDefined)
     {
         try {
             if ($previousHandlerWasDefined) {
@@ -612,7 +612,7 @@ public function testErrorHandlerWhenLogging($previousHandlerWasDefined, $loggerS
         }
     }
 
-    public function errorHandlerWhenLoggingProvider()
+    public function errorHandlerWhenLoggingProvider(): iterable
     {
         foreach ([false, true] as $previousHandlerWasDefined) {
             foreach ([false, true] as $loggerSetsAnotherHandler) {
diff --git a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -41,7 +41,7 @@ public static function setUpBeforeClass(): void
     /**
      * @dataProvider provideClassNotFoundData
      */
-    public function testHandleClassNotFound($error, $translatedMessage, $autoloader = null)
+    public function testHandleClassNotFound(array $error, string $translatedMessage, callable $autoloader = null)
     {
         if ($autoloader) {
             // Unregister all autoloaders to ensure the custom provided
@@ -67,7 +67,7 @@ public function testHandleClassNotFound($error, $translatedMessage, $autoloader
         $this->assertSame($error['line'], $exception->getLine());
     }
 
-    public function provideClassNotFoundData()
+    public function provideClassNotFoundData(): array
     {
         $autoloader = new ComposerClassLoader();
         $autoloader->add('Symfony\Component\ErrorHandler\Exception\\', realpath(__DIR__.'/../../Exception'));
diff --git a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
@@ -20,7 +20,7 @@ class UndefinedFunctionFatalErrorHandlerTest extends TestCase
     /**
      * @dataProvider provideUndefinedFunctionData
      */
-    public function testUndefinedFunction($error, $translatedMessage)
+    public function testUndefinedFunction(array $error, string $translatedMessage)
     {
         $handler = new UndefinedFunctionFatalErrorHandler();
         $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
@@ -33,7 +33,7 @@ public function testUndefinedFunction($error, $translatedMessage)
         $this->assertSame($error['line'], $exception->getLine());
     }
 
-    public function provideUndefinedFunctionData()
+    public function provideUndefinedFunctionData(): array
     {
         return [
             [
diff --git a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -20,7 +20,7 @@ class UndefinedMethodFatalErrorHandlerTest extends TestCase
     /**
      * @dataProvider provideUndefinedMethodData
      */
-    public function testUndefinedMethod($error, $translatedMessage)
+    public function testUndefinedMethod(array $error, string $translatedMessage)
     {
         $handler = new UndefinedMethodFatalErrorHandler();
         $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
@@ -32,7 +32,7 @@ public function testUndefinedMethod($error, $translatedMessage)
         $this->assertSame($error['line'], $exception->getLine());
     }
 
-    public function provideUndefinedMethodData()
+    public function provideUndefinedMethodData(): array
     {
         return [
             [

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public function testClassAlias()`
`118`	`118`	`/**`
`119`	`119`	`* @dataProvider provideDeprecatedSuper`
`120`	`120`	`*/`
`121`		`- public function testDeprecatedSuper($class, $super, $type)`
	`121`	`+ public function testDeprecatedSuper(string $class, string $super, string $type)`
`122`	`122`	`{`
`123`	`123`	`set_error_handler(function () { return false; });`
`124`	`124`	`$e = error_reporting(0);`
`@@ -140,7 +140,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);`
`140`	`140`	`$this->assertSame($xError, $lastError);`
`141`	`141`	`}`
`142`	`142`
`143`		`- public function provideDeprecatedSuper()`
	`143`	`+ public function provideDeprecatedSuper(): array`
`144`	`144`	`{`
`145`	`145`	`return [`
`146`	`146`	`['DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'],`
Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ public function testSendPhpResponse()`
`572`	`572`	`/**`
`573`	`573`	`* @dataProvider errorHandlerWhenLoggingProvider`
`574`	`574`	`*/`
`575`		`- public function testErrorHandlerWhenLogging($previousHandlerWasDefined, $loggerSetsAnotherHandler, $nextHandlerIsDefined)`
	`575`	`+ public function testErrorHandlerWhenLogging(bool $previousHandlerWasDefined, bool $loggerSetsAnotherHandler, bool $nextHandlerIsDefined)`
`576`	`576`	`{`
`577`	`577`	`try {`
`578`	`578`	`if ($previousHandlerWasDefined) {`
`@@ -612,7 +612,7 @@ public function testErrorHandlerWhenLogging($previousHandlerWasDefined, $loggerS`
`612`	`612`	`}`
`613`	`613`	`}`
`614`	`614`
`615`		`- public function errorHandlerWhenLoggingProvider()`
	`615`	`+ public function errorHandlerWhenLoggingProvider(): iterable`
`616`	`616`	`{`
`617`	`617`	`foreach ([false, true] as $previousHandlerWasDefined) {`
`618`	`618`	`foreach ([false, true] as $loggerSetsAnotherHandler) {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static function setUpBeforeClass(): void`
`41`	`41`	`/**`
`42`	`42`	`* @dataProvider provideClassNotFoundData`
`43`	`43`	`*/`
`44`		`- public function testHandleClassNotFound($error, $translatedMessage, $autoloader = null)`
	`44`	`+ public function testHandleClassNotFound(array $error, string $translatedMessage, callable $autoloader = null)`
`45`	`45`	`{`
`46`	`46`	`if ($autoloader) {`
`47`	`47`	`// Unregister all autoloaders to ensure the custom provided`
`@@ -67,7 +67,7 @@ public function testHandleClassNotFound($error, $translatedMessage, $autoloader`
`67`	`67`	`$this->assertSame($error['line'], $exception->getLine());`
`68`	`68`	`}`
`69`	`69`
`70`		`- public function provideClassNotFoundData()`
	`70`	`+ public function provideClassNotFoundData(): array`
`71`	`71`	`{`
`72`	`72`	`$autoloader = new ComposerClassLoader();`
`73`	`73`	`$autoloader->add('Symfony\Component\ErrorHandler\Exception\\', realpath(__DIR__.'/../../Exception'));`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class UndefinedFunctionFatalErrorHandlerTest extends TestCase`
`20`	`20`	`/**`
`21`	`21`	`* @dataProvider provideUndefinedFunctionData`
`22`	`22`	`*/`
`23`		`- public function testUndefinedFunction($error, $translatedMessage)`
	`23`	`+ public function testUndefinedFunction(array $error, string $translatedMessage)`
`24`	`24`	`{`
`25`	`25`	`$handler = new UndefinedFunctionFatalErrorHandler();`
`26`	`26`	`$exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));`
`@@ -33,7 +33,7 @@ public function testUndefinedFunction($error, $translatedMessage)`
`33`	`33`	`$this->assertSame($error['line'], $exception->getLine());`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function provideUndefinedFunctionData()`
	`36`	`+ public function provideUndefinedFunctionData(): array`
`37`	`37`	`{`
`38`	`38`	`return [`
`39`	`39`	`[`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class UndefinedMethodFatalErrorHandlerTest extends TestCase`
`20`	`20`	`/**`
`21`	`21`	`* @dataProvider provideUndefinedMethodData`
`22`	`22`	`*/`
`23`		`- public function testUndefinedMethod($error, $translatedMessage)`
	`23`	`+ public function testUndefinedMethod(array $error, string $translatedMessage)`
`24`	`24`	`{`
`25`	`25`	`$handler = new UndefinedMethodFatalErrorHandler();`
`26`	`26`	`$exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));`
`@@ -32,7 +32,7 @@ public function testUndefinedMethod($error, $translatedMessage)`
`32`	`32`	`$this->assertSame($error['line'], $exception->getLine());`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function provideUndefinedMethodData()`
	`35`	`+ public function provideUndefinedMethodData(): array`
`36`	`36`	`{`
`37`	`37`	`return [`
`38`	`38`	`[`