From cf9e75614b97b4f05355913933488a4114274ba4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 9 Sep 2020 07:19:58 +0200 Subject: [PATCH] Remove some leftover for HHVM support --- src/Symfony/Component/Debug/ErrorHandler.php | 4 ++-- .../Tests/Session/Storage/NativeSessionStorageTest.php | 4 ---- .../Component/VarDumper/Tests/Caster/ReflectionCasterTest.php | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php index b1db015e01..6d562c5f56 100644 --- a/src/Symfony/Component/Debug/ErrorHandler.php +++ b/src/Symfony/Component/Debug/ErrorHandler.php @@ -489,7 +489,7 @@ class ErrorHandler if ($this->isRecursive) { $log = 0; } else { - if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) { + if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404)) { $currentErrorHandler = set_error_handler('var_dump'); restore_error_handler(); } @@ -501,7 +501,7 @@ class ErrorHandler } finally { $this->isRecursive = false; - if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) { + if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404)) { set_error_handler($currentErrorHandler); } } diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php index 4cb0b2dab3..a48da9df97 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php @@ -194,10 +194,6 @@ class NativeSessionStorageTest extends TestCase public function testSessionOptions() { - if (\defined('HHVM_VERSION')) { - $this->markTestSkipped('HHVM is not handled in this test case.'); - } - $options = [ 'url_rewriter.tags' => 'a=href', 'cache_expire' => '200', diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php index 293afd94eb..a4183e21af 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php @@ -84,9 +84,6 @@ EOTXT public function testFromCallableClosureCaster() { - if (\defined('HHVM_VERSION_ID')) { - $this->markTestSkipped('Not for HHVM.'); - } $var = [ (new \ReflectionMethod($this, __FUNCTION__))->getClosure($this), (new \ReflectionMethod(__CLASS__, 'stub'))->getClosure(),