Add PHP 8.4 compatibility

MercanoGlobal · MercanoGlobal · commit d85ef2b98c5d · 2026-02-10T18:11:44.000+02:00
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ Prerequisites
 
 * A web server: Apache, LiteSpeed, Nginx, Lighttpd, Cherokee.
 * A database: MySQL / MariaDB, Postgres. OR a writable folder on your filesystem for SQLite.
-* PHP version 7.0 - 8.3.
+* PHP version 7.1 - 8.4.
 * PHP-GD for the creation of QR-codes and Captcha.
 
 
@@ -80,6 +80,11 @@ In the doc/ folder, you will find:
 Changelog
 ---------
 
+### Version 1.1.2:
+
+* Added PHP 8.4 compatibility
+* Fixed broken QR images on PHP 8+
+
 ### Version 1.1.1:
 
 * Fixed some Docker related issues
diff --git a/docker/snip.php b/docker/snip.php
@@ -23,7 +23,7 @@
 | The project version.
 |
 */
-$config['proj_version'] = '1.1.1';
+$config['proj_version'] = '1.1.2';
 
 
 /**
@@ -333,7 +333,7 @@
 $config['disable_api'] = false;
 $config['disable_keep_forever'] = false;
 $config['blocked_words'] = '';
-$config['disallow_search_engines'] = true;
+$config['disallow_search_engines'] = false;
 $config['disable_replies'] = false;
 $config['enable_adminlink'] = false;
 
diff --git a/htdocs/application/config/snip.php.dist b/htdocs/application/config/snip.php.dist
@@ -23,7 +23,7 @@ $config['proj_url'] = 'https://github.com/MercanoGlobal/SNIP';
 | The project version.
 |
 */
-$config['proj_version'] = '1.1.1';
+$config['proj_version'] = '1.1.2';
 
 
 /**
diff --git a/htdocs/application/libraries/phpqrcode/qrvect.php b/htdocs/application/libraries/phpqrcode/qrvect.php
@@ -27,7 +27,7 @@
     class QRvect {
     
         //----------------------------------------------------------------------
-        public static function eps($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false) 
+        public static function eps($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = FALSE, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false) 
         {
             $vect = self::vectEPS($frame, $pixelPerPoint, $outerFrame, $back_color, $fore_color, $cmyk);
             
@@ -137,7 +137,7 @@ private static function vectEPS($frame, $pixelPerPoint = 4, $outerFrame = 4, $ba
         }
         
         //----------------------------------------------------------------------
-        public static function svg($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE, $back_color, $fore_color) 
+        public static function svg($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = FALSE, $back_color = 0xFFFFFF, $fore_color = 0x000000) 
         {
             $vect = self::vectSVG($frame, $pixelPerPoint, $outerFrame, $back_color, $fore_color);
             
diff --git a/htdocs/index.php b/htdocs/index.php
@@ -73,13 +73,13 @@
 	case 'testing':
 	case 'production':
 		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
+		if (version_compare(PHP_VERSION, '8.4', '>='))
 		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 		}
 		else
 		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
+			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 		}
 	break;
 
diff --git a/htdocs/system/core/Exceptions.php b/htdocs/system/core/Exceptions.php
@@ -73,7 +73,7 @@ class CI_Exceptions {
 		E_USER_ERROR		=>	'User Error',
 		E_USER_WARNING		=>	'User Warning',
 		E_USER_NOTICE		=>	'User Notice',
-		E_STRICT		=>	'Runtime Notice'
+		2048				=>	'Runtime Notice' // If we are using older PHP versions, E_STRICT errors will be labeled correctly, otherwise they will be ignored.
 	);
 
 	/**
diff --git a/htdocs/system/core/Lang.php b/htdocs/system/core/Lang.php
@@ -190,7 +190,7 @@ public function load($langfile, $idiom = '', $return = FALSE, $add_suffix = TRUE
 	 */
 	public function line($line, $log_errors = TRUE)
 	{
-		$value = isset($this->language[$line]) ? $this->language[$line] : FALSE;
+		$value = ($line !== NULL && isset($this->language[$line])) ? $this->language[$line] : FALSE;
 
 		// Because killer robots like unicorns!
 		if ($value === FALSE && $log_errors === TRUE)
diff --git a/htdocs/system/core/Output.php b/htdocs/system/core/Output.php
@@ -456,7 +456,7 @@ public function _display($output = '')
 
 		$elapsed = $BM->elapsed_time('total_execution_time_start', 'total_execution_time_end');
 
-		if ($this->parse_exec_vars === TRUE)
+		if ($this->parse_exec_vars === TRUE && !empty($output))
 		{
 			$memory	= round(memory_get_usage() / 1024 / 1024, 2).'MB';
 			$output = $output ? str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsed, $memory), $output) : '';
diff --git a/htdocs/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php b/htdocs/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php
@@ -99,7 +99,7 @@ public function __construct(&$db)
 
 		if (version_compare($this->db->version(), '9.0', '>'))
 		{
-			$this->create_table_if = 'CREATE TABLE IF NOT EXISTS';
+			$this->_create_table_if = 'CREATE TABLE IF NOT EXISTS';
 		}
 	}
 
diff --git a/htdocs/system/libraries/Encryption.php b/htdocs/system/libraries/Encryption.php
@@ -369,7 +369,7 @@ public function create_key($length)
 	 * @param	array	$params	Input parameters
 	 * @return	string
 	 */
-	public function encrypt($data, array $params = NULL)
+	public function encrypt($data, ?array $params = NULL)
 	{
 		if (($params = $this->_get_params($params)) === FALSE)
 		{
@@ -504,7 +504,7 @@ protected function _openssl_encrypt($data, $params)
 	 * @param	array	$params	Input parameters
 	 * @return	string
 	 */
-	public function decrypt($data, array $params = NULL)
+	public function decrypt($data, ?array $params = NULL)
 	{
 		if (($params = $this->_get_params($params)) === FALSE)
 		{
diff --git a/htdocs/system/libraries/Session/Session.php b/htdocs/system/libraries/Session/Session.php
@@ -389,59 +389,20 @@ protected function _configure(&$params)
 	 */
 	protected function _configure_sid_length()
 	{
-		if (PHP_VERSION_ID < 70100)
-		{
-			$hash_function = ini_get('session.hash_function');
-			if (ctype_digit($hash_function))
-			{
-				if ($hash_function !== '1')
-				{
-					ini_set('session.hash_function', 1);
-				}
+		$bits_per_character = (int) ini_get('session.sid_bits_per_character');
+		$sid_length         = (int) ini_get('session.sid_length');
 
-				$bits = 160;
-			}
-			elseif ( ! in_array($hash_function, hash_algos(), TRUE))
-			{
-				ini_set('session.hash_function', 1);
-				$bits = 160;
-			}
-			elseif (($bits = strlen(hash($hash_function, 'dummy', false)) * 4) < 160)
-			{
-				ini_set('session.hash_function', 1);
-				$bits = 160;
+		// Enforce defaults only where runtime mutation is allowed
+		if (PHP_VERSION_ID < 80400) {
+			if ($bits_per_character !== 4) {
+				ini_set('session.sid_bits_per_character', '4');
 			}
-
-			$bits_per_character = (int) ini_get('session.hash_bits_per_character');
-			$sid_length         = (int) ceil($bits / $bits_per_character);
-		}
-		else
-		{
-			$bits_per_character = (int) ini_get('session.sid_bits_per_character');
-			$sid_length         = (int) ini_get('session.sid_length');
-			if (($bits = $sid_length * $bits_per_character) < 160)
-			{
-				// Add as many more characters as necessary to reach at least 160 bits
-				$sid_length += (int) ceil((160 % $bits) / $bits_per_character);
-				ini_set('session.sid_length', $sid_length);
+			if ($sid_length !== 32) {
+				ini_set('session.sid_length', '32');
 			}
 		}
 
-		// Yes, 4,5,6 are the only known possible values as of 2016-10-27
-		switch ($bits_per_character)
-		{
-			case 4:
-				$this->_sid_regexp = '[0-9a-f]';
-				break;
-			case 5:
-				$this->_sid_regexp = '[0-9a-v]';
-				break;
-			case 6:
-				$this->_sid_regexp = '[0-9a-zA-Z,-]';
-				break;
-		}
-
-		$this->_sid_regexp .= '{'.$sid_length.'}';
+		$this->_sid_regexp = '[0-9a-f]{32}';
 	}
 
 	// ------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ $config['proj_url'] = 'https://github.com/MercanoGlobal/SNIP';`
`23`	`23`	`\| The project version.`
`24`	`24`	`\|`
`25`	`25`	`*/`
`26`		`-$config['proj_version'] = '1.1.1';`
	`26`	`+$config['proj_version'] = '1.1.2';`
`27`	`27`
`28`	`28`
`29`	`29`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`class QRvect {`
`28`	`28`
`29`	`29`	`//----------------------------------------------------------------------`
`30`		`- public static function eps($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false)`
	`30`	`+ public static function eps($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = FALSE, $back_color = 0xFFFFFF, $fore_color = 0x000000, $cmyk = false)`
`31`	`31`	`{`
`32`	`32`	`$vect = self::vectEPS($frame, $pixelPerPoint, $outerFrame, $back_color, $fore_color, $cmyk);`
`33`	`33`
`@@ -137,7 +137,7 @@ private static function vectEPS($frame, $pixelPerPoint = 4, $outerFrame = 4, $ba`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`//----------------------------------------------------------------------`
`140`		`- public static function svg($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE, $back_color, $fore_color)`
	`140`	`+ public static function svg($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = FALSE, $back_color = 0xFFFFFF, $fore_color = 0x000000)`
`141`	`141`	`{`
`142`	`142`	`$vect = self::vectSVG($frame, $pixelPerPoint, $outerFrame, $back_color, $fore_color);`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,13 @@`
`73`	`73`	`case 'testing':`
`74`	`74`	`case 'production':`
`75`	`75`	`ini_set('display_errors', 0);`
`76`		`- if (version_compare(PHP_VERSION, '5.3', '>='))`
	`76`	`+ if (version_compare(PHP_VERSION, '8.4', '>='))`
`77`	`77`	`{`
`78`		`- error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);`
	`78`	`+ error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_USER_NOTICE & ~E_USER_DEPRECATED);`
`79`	`79`	`}`
`80`	`80`	`else`
`81`	`81`	`{`
`82`		`- error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);`
	`82`	`+ error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);`
`83`	`83`	`}`
`84`	`84`	`break;`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public function load($langfile, $idiom = '', $return = FALSE, $add_suffix = TRUE`
`190`	`190`	`*/`
`191`	`191`	`public function line($line, $log_errors = TRUE)`
`192`	`192`	`{`
`193`		`- $value = isset($this->language[$line]) ? $this->language[$line] : FALSE;`
	`193`	`+ $value = ($line !== NULL && isset($this->language[$line])) ? $this->language[$line] : FALSE;`
`194`	`194`
`195`	`195`	`// Because killer robots like unicorns!`
`196`	`196`	`if ($value === FALSE && $log_errors === TRUE)`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ public function _display($output = '')`
`456`	`456`
`457`	`457`	`$elapsed = $BM->elapsed_time('total_execution_time_start', 'total_execution_time_end');`
`458`	`458`
`459`		`- if ($this->parse_exec_vars === TRUE)`
	`459`	`+ if ($this->parse_exec_vars === TRUE && !empty($output))`
`460`	`460`	`{`
`461`	`461`	`$memory = round(memory_get_usage() / 1024 / 1024, 2).'MB';`
`462`	`462`	`$output = $output ? str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsed, $memory), $output) : '';`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function __construct(&$db)`
`99`	`99`
`100`	`100`	`if (version_compare($this->db->version(), '9.0', '>'))`
`101`	`101`	`{`
`102`		`- $this->create_table_if = 'CREATE TABLE IF NOT EXISTS';`
	`102`	`+ $this->_create_table_if = 'CREATE TABLE IF NOT EXISTS';`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ public function create_key($length)`
`369`	`369`	`* @param array $params Input parameters`
`370`	`370`	`* @return string`
`371`	`371`	`*/`
`372`		`- public function encrypt($data, array $params = NULL)`
	`372`	`+ public function encrypt($data, ?array $params = NULL)`
`373`	`373`	`{`
`374`	`374`	`if (($params = $this->_get_params($params)) === FALSE)`
`375`	`375`	`{`
`@@ -504,7 +504,7 @@ protected function _openssl_encrypt($data, $params)`
`504`	`504`	`* @param array $params Input parameters`
`505`	`505`	`* @return string`
`506`	`506`	`*/`
`507`		`- public function decrypt($data, array $params = NULL)`
	`507`	`+ public function decrypt($data, ?array $params = NULL)`
`508`	`508`	`{`
`509`	`509`	`if (($params = $this->_get_params($params)) === FALSE)`
`510`	`510`	`{`