Skip to content
This repository was archived by the owner on Dec 9, 2023. It is now read-only.

Commit 8c29235

Browse files
Merge branch '2.7' into 2.8
* 2.7: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" [BrowserKit] Fix cookie expiration on 32 bit systems bumped Symfony version to 2.7.18 updated VERSION for 2.7.17 update CONTRIBUTORS for 2.7.17 updated CHANGELOG for 2.7.17 Update misleading comment about RFC4627
2 parents 316b203 + 659f346 commit 8c29235

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

ErrorHandler.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,12 @@ private function reRegister($prev)
375375
/**
376376
* Handles errors by filtering then logging them according to the configured bit fields.
377377
*
378-
* @param int $type One of the E_* constants
378+
* @param int $type One of the E_* constants
379+
* @param string $message
379380
* @param string $file
380381
* @param int $line
381382
* @param array $context
383+
* @param array $backtrace
382384
*
383385
* @return bool Returns false when no handling happens so that the PHP engine can handle the error itself
384386
*

0 commit comments

Comments
 (0)