Merge branch 'master' into feature/optimizedImageParams

Author: onli

docs/NEWS

@@ -1,6 +1,8 @@
 Version 2.6-alpha1 ()
 ------------------------------------------------------------------------
 
+   * PHP 8.4 fix: Remove deprecated constant E_STRICT
+
    * PHP 8 compatibility fixes for bundled XML/RPC.php
 
    * Upgrade bundled jQuery to jQuery 3

include/compat.inc.php

@@ -95,8 +95,6 @@ function debug_ErrorLevelType($type)
             return 'E_USER_WARNING';
         case E_USER_NOTICE: // 1024 //
             return 'E_USER_NOTICE';
-        case E_STRICT: // 2048 //
-            return 'E_STRICT';
         case E_RECOVERABLE_ERROR: // 4096 //
             return 'E_RECOVERABLE_ERROR';
         case E_DEPRECATED: // 8192 //
@@ -125,6 +123,8 @@ function errorToExceptionHandler($errNo, $errStr, $errFile = '', $errLine = NULL
         // By default, we will continue our process flow, unless:
         $exit = false;
 
+        @ini_set('zend.exception_string_param_max_len', 200);
+
         switch ($errNo) {
             case E_ERROR:
             case E_USER_ERROR:
@@ -139,7 +139,6 @@ function errorToExceptionHandler($errNo, $errStr, $errFile = '', $errLine = NULL
 
             case E_USER_NOTICE:
             case E_NOTICE:
-            case @E_STRICT:
             case @E_DEPRECATED:
             case @E_USER_DEPRECATED:
                 $type = 'Notice';

include/serendipity_smarty_class.inc.php

@@ -189,8 +189,8 @@ private function setParams()
         }
 
         // set smarty error reporting. General error_reporting is set in serendipity/serendipity_config.inc.php
-        $this->error_reporting = E_ALL & ~(E_NOTICE|E_STRICT);
-        // Avoid a multitude of warnings when using Smarty on a newer PHP version, liek when we jumped
+        $this->error_reporting = E_ALL & ~(E_NOTICE);
+        // Avoid a multitude of warnings when using Smarty on a newer PHP version, like when we jumped
         // to PHP 8:
         $this->muteUndefinedOrNullWarnings();
     }

serendipity_config.inc.php

@@ -64,10 +64,10 @@
 
 // Set error reporting
 if ($serendipity['production']) {
-    error_reporting(E_ALL & ~(E_WARNING|E_NOTICE|E_STRICT|E_DEPRECATED));
+    error_reporting(E_ALL & ~(E_WARNING|E_NOTICE|E_DEPRECATED));
     @ini_set('display_errors', 'off');
 } else {
-    error_reporting(E_ALL & ~(E_NOTICE|E_STRICT|E_DEPRECATED));
+    error_reporting(E_ALL & ~(E_NOTICE|E_DEPRECATED));
 }
 
 if ($serendipity['production'] !== true) {
@@ -303,21 +303,14 @@
 include($local_config);
 
 if ($serendipity['production'] === 'debug') {
-    error_reporting(E_ALL ^ E_NOTICE); // is 32759 with 5.4+
+    error_reporting(E_ALL ^ E_NOTICE); 
 }
 if ($serendipity['production'] === false) {
-    error_reporting(E_ALL & ~(E_NOTICE|E_STRICT)); // is 30711 with 5.4+
+    error_reporting(E_ALL & ~(E_NOTICE));
 }
 
 $errLevel = error_reporting();
 
-/* [DEBUG] Helper to display current error levels, meant for developers.
-echo $errLevel."<br>\n";
-for ($i = 0; $i < 15;  $i++ ) {
-    print debug_ErrorLevelType($errLevel & pow(2, $i)) . "<br>\n";
-}
-*/
-
 // [internal callback function]: errorToExceptionHandler()
 if (is_callable($serendipity['errorhandler'], false, $callable_name)) {
     // set serendipity global error to exception handler