symfony
diff --git a/‎src/Symfony/Component/Debug/ErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/ErrorHandler.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Debug/ErrorHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/ErrorHandler.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
-2Lines changed: 0 additions & 2 deletions b/‎src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
-2Lines changed: 0 additions & 2 deletions
@@ -521,7 +521,7 @@ public function handleError($type, $message, $file, $line)
                 $errorAsException ? ['exception' => $errorAsException] : [],
             ];
         } else {
-            if (!\defined('HHVM_VERSION')) {
+            if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) {
                 $currentErrorHandler = set_error_handler('var_dump');
                 restore_error_handler();
             }
@@ -533,7 +533,7 @@ public function handleError($type, $message, $file, $line)
             } finally {
                 $this->isRecursive = false;
 
-                if (!\defined('HHVM_VERSION')) {
+                if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) {
                     set_error_handler($currentErrorHandler);
                 }
             }
 
@@ -327,8 +327,6 @@ public function testHandleDeprecation()
         $handler = new ErrorHandler();
         $handler->setDefaultLogger($logger);
         @$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, []);
-
-        restore_error_handler();
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ public function handleError($type, $message, $file, $line)`
`521`	`521`	`$errorAsException ? ['exception' => $errorAsException] : [],`
`522`	`522`	`];`
`523`	`523`	`} else {`
`524`		`- if (!\defined('HHVM_VERSION')) {`
	`524`	`+ if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) {`
`525`	`525`	`$currentErrorHandler = set_error_handler('var_dump');`
`526`	`526`	`restore_error_handler();`
`527`	`527`	`}`
`@@ -533,7 +533,7 @@ public function handleError($type, $message, $file, $line)`
`533`	`533`	`} finally {`
`534`	`534`	`$this->isRecursive = false;`
`535`	`535`
`536`		`- if (!\defined('HHVM_VERSION')) {`
	`536`	`+ if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) {`
`537`	`537`	`set_error_handler($currentErrorHandler);`
`538`	`538`	`}`
`539`	`539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -327,8 +327,6 @@ public function testHandleDeprecation()`
`327`	`327`	`$handler = new ErrorHandler();`
`328`	`328`	`$handler->setDefaultLogger($logger);`
`329`	`329`	`@$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, []);`
`330`		`-`
`331`		`- restore_error_handler();`
`332`	`330`	`}`
`333`	`331`
`334`	`332`	`/**`