Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ and this project follows the
which is based on the major version of Backdrop CMS with a semantic version
system for each contributed module, theme and layout.

## [Unreleased] - 2025-08-30
## [Unreleased] - 2026-01-30

### Added
- An option for the `db-import` command to allow import from newer MariaDB
Expand All @@ -23,6 +23,7 @@ layout templates or Backdrop itself.
- Unhandled errors and warnings if commands run outside Backdrop root and/or
before installing Backdrop.
- Error if importing config to database config storage.
- Deprecations within error handling for PHP 8.4.

### Changed
- Bee will now notify the user of additional modules that will be enabled or disabled
Expand Down
4 changes: 2 additions & 2 deletions bee.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
* The file that the error came from.
* @param int $line
* The line number the error came from.
* @param array $context
* @param array|null $context
* An array of all variables from where the error was triggered.
*
* @see https://www.php.net/manual/en/function.set-error-handler.php
* @see _backdrop_error_handler()
*/
function bee_error_handler($error_level, $message, $filename, $line, array $context = NULL) {
function bee_error_handler($error_level, $message, $filename, $line, ?array $context = NULL) {
require_once __DIR__ . '/includes/errors.inc';
_bee_error_handler_real($error_level, $message, $filename, $line, $context);
}
Expand Down
5 changes: 2 additions & 3 deletions includes/errors.inc
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ define('BEE_WATCHDOG_DEPRECATED', 8);
* The file that the error came from.
* @param int $line
* The line number the error came from.
* @param array $context
* @param array|null $context
* An array of all variables from where the error was triggered.
*
* @see https://www.php.net/manual/en/function.set-error-handler.php
* @see _backdrop_error_handler_real()
*/
function _bee_error_handler_real($error_level, $message, $filename, $line, array $context = NULL) {
function _bee_error_handler_real($error_level, $message, $filename, $line, ?array $context = NULL) {

if ($error_level & error_reporting()) {
$types = _bee_error_levels();
Expand Down Expand Up @@ -208,7 +208,6 @@ function _bee_error_levels() {
E_USER_ERROR => array('User error', BEE_WATCHDOG_ERROR),
E_USER_WARNING => array('User warning', BEE_WATCHDOG_WARNING),
E_USER_NOTICE => array('User notice', BEE_WATCHDOG_NOTICE),
E_STRICT => array('Strict warning', BEE_WATCHDOG_DEBUG),
E_RECOVERABLE_ERROR => array('Recoverable fatal error', BEE_WATCHDOG_ERROR),
E_DEPRECATED => array('Deprecated function', BEE_WATCHDOG_DEBUG),
E_USER_DEPRECATED => array('User deprecated function', BEE_WATCHDOG_DEBUG),
Expand Down
Loading