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

Commit e2b3f74

Browse files
Merge branch '2.8' into 3.1
* 2.8: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [Form] Fix transformer tests after the ICU update [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" bumped Symfony version to 2.8.11 updated VERSION for 2.8.10 updated CHANGELOG for 2.8.10 [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 34f6ac1 + 8c29235 commit e2b3f74

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
@@ -348,10 +348,12 @@ private function reRegister($prev)
348348
/**
349349
* Handles errors by filtering then logging them according to the configured bit fields.
350350
*
351-
* @param int $type One of the E_* constants
351+
* @param int $type One of the E_* constants
352+
* @param string $message
352353
* @param string $file
353354
* @param int $line
354355
* @param array $context
356+
* @param array $backtrace
355357
*
356358
* @return bool Returns false when no handling happens so that the PHP engine can handle the error itself
357359
*

0 commit comments

Comments
 (0)