diff --git a/system/codeigniter/core/Exceptions.php b/system/codeigniter/core/Exceptions.php index 869739a..0ffeafb 100755 --- a/system/codeigniter/core/Exceptions.php +++ b/system/codeigniter/core/Exceptions.php @@ -54,10 +54,11 @@ class CI_Exceptions { E_CORE_WARNING => 'Core Warning', E_COMPILE_ERROR => 'Compile Error', E_COMPILE_WARNING => 'Compile Warning', - E_USER_ERROR => 'User Error', - E_USER_WARNING => 'User Warning', - E_USER_NOTICE => 'User Notice', - E_STRICT => 'Runtime Notice' + E_USER_ERROR => 'User Error', + E_USER_WARNING => 'User Warning', + E_USER_NOTICE => 'User Notice', + 2048 => 'Runtime Notice' + ); diff --git a/system/pancake/core/Pancake_Exceptions.php b/system/pancake/core/Pancake_Exceptions.php index d1451dd..92e2d9a 100755 --- a/system/pancake/core/Pancake_Exceptions.php +++ b/system/pancake/core/Pancake_Exceptions.php @@ -42,7 +42,7 @@ class Pancake_Exceptions extends CI_Exceptions { E_PARSE => 'Parse Error', E_WARNING => 'Warning', E_USER_WARNING => 'User Warning', - E_STRICT => 'Strict', + 2048 => 'Strict', E_NOTICE => 'Notice', E_RECOVERABLE_ERROR => 'Recoverable Error', E_DEPRECATED => 'Deprecation Notice', @@ -66,7 +66,7 @@ class Pancake_Exceptions extends CI_Exceptions { E_USER_ERROR => 'User Error', E_USER_WARNING => 'User Warning', E_USER_NOTICE => 'User Notice', - E_STRICT => 'Runtime Notice', + 2048 => 'Runtime Notice', E_DEPRECATED => 'Deprecation Notice', ); @@ -79,7 +79,7 @@ class Pancake_Exceptions extends CI_Exceptions { public static $non_reportable_levels = array( E_NOTICE, E_USER_NOTICE, - E_STRICT, + 2048, E_DEPRECATED, ); @@ -802,7 +802,7 @@ END; * * @return string */ - public static function trace(array $trace = null) { + public static function trace(?array $trace = null) { if ($trace === null) { // Start a new trace $trace = debug_backtrace(); diff --git a/system/pancake/pancake_index.php b/system/pancake/pancake_index.php index 793345f..324fa80 100755 --- a/system/pancake/pancake_index.php +++ b/system/pancake/pancake_index.php @@ -194,7 +194,8 @@ try { # @ is used here to prevent errors with some of the stricter hosts who disable ini_set. @ini_set('display_errors', true); - error_reporting(-1); + // Hide deprecation notices from legacy/vendor code on modern PHP. + error_reporting(E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED); $system_path = FCPATH . "system/codeigniter"; $application_folder = FCPATH . "system/pancake";