Skip to content

Commit 69f92a2

Browse files
Merge branch '5.4' into 6.2
* 5.4: [Runtime][ErrorHandler] Don't mess with ini_set('assert.warning')
2 parents e847ba4 + b267192 commit 69f92a2

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Debug.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public static function enable(): ErrorHandler
3131

3232
@ini_set('zend.assertions', 1);
3333
ini_set('assert.active', 1);
34-
ini_set('assert.warning', 0);
3534
ini_set('assert.exception', 1);
3635

3736
DebugClassLoader::enable();

Tests/ErrorHandlerTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,7 @@ public function testAssertQuietEval()
619619
$this->markTestSkipped('zend.assertions is forcibly disabled');
620620
}
621621

622+
set_error_handler(function () {});
622623
$ini = [
623624
ini_set('zend.assertions', 1),
624625
ini_set('assert.active', 1),
@@ -627,6 +628,7 @@ public function testAssertQuietEval()
627628
ini_set('assert.callback', null),
628629
ini_set('assert.exception', 0),
629630
];
631+
restore_error_handler();
630632

631633
$logger = new BufferingLogger();
632634
$handler = new ErrorHandler($logger);

0 commit comments

Comments
 (0)