mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 11:20:25 +02:00
Code Issues Releases Wiki Activity

Issue #5443 - PHP 8.4 deprecation error removal.

Browse Source
This commit is contained in:
camer0n
2025-04-29 10:03:49 -07:00
parent 85a65281b2
commit e7fec78550
2 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
e107_handlers/e107_class.php
View File

@@ -6164,67 +6164,79 @@ class e107
*/ */
public function __get($name) public function __get($name)
{ {
switch ($name)
// Use a static cache to store instances
static $instances = [];
if(isset($instances[$name]))
{
return $instances[$name];
}
switch($name)
{ {
case 'tp': case 'tp':
$ret = self::getParser(); $ret = self::getParser();
break; break;
case 'sql': case 'sql':
$ret = self::getDb(); $ret = self::getDb();
break; break;
case 'ecache': case 'ecache':
$ret = self::getCache(); $ret = self::getCache();
break; break;
case 'arrayStorage': case 'arrayStorage':
$ret = self::getArrayStorage(); $ret = self::getArrayStorage();
break; break;
case 'e_event': case 'e_event':
$ret = self::getEvent(); $ret = self::getEvent();
break; break;
case 'ns': case 'ns':
$ret = self::getRender(); $ret = self::getRender();
break; break;
case 'url': case 'url':
$ret = self::getUrl(); $ret = self::getUrl();
break; break;
case 'admin_log': case 'admin_log':
$ret = self::getLog(); $ret = self::getLog();
break; break;
case 'override': case 'override':
$ret = self::getSingleton('override', e_HANDLER.'override_class.php'); $ret = self::getSingleton('override', e_HANDLER . 'override_class.php');
break; break;
case 'notify': case 'notify':
$ret = self::getNotify(); $ret = self::getNotify();
break; break;
case 'e_online': case 'e_online':
$ret = self::getOnline(); $ret = self::getOnline();
break; break;
case 'eIPHandler': case 'eIPHandler':
$ret = self::getIPHandler(); $ret = self::getIPHandler();
break; break;
case 'user_class': case 'user_class':
$ret = self::getUserClass(); $ret = self::getUserClass();
break; break;
default: default:
trigger_error('$e107->$'.$name.' not defined', E_USER_WARNING); trigger_error('$e107->$' . $name . ' not defined', E_USER_WARNING);
return null; return null;
break; break;
} }
$this->$name = $ret; // Store the result in the static cache
$instances[$name] = $ret;
return $ret; return $ret;
} }

14
e107_tests/tests/unit/ArrayDataTest.php
View File

@@ -17,7 +17,7 @@
catch(Exception $e) catch(Exception $e)
{ {
$this->assertTrue(false, $e->getMessage()); $this::fail($e->getMessage());
} }
} }
@@ -39,13 +39,13 @@
'most_enabled' => true 'most_enabled' => true
); );
$result = $this->ad->ReadArray($string); $result = e107::unserialize($string);
$this->assertSame($expected, $result); $this::assertSame($expected, $result);
// legacy Prefs test. // legacy Prefs test.
$string = 'a:4:{s:19:"most_members_online";i:10;s:18:"most_guests_online";i:20;s:21:"most_online_datestamp";i:1534279911;s:12:"most_enabled";b:1;}'; $string = 'a:4:{s:19:"most_members_online";i:10;s:18:"most_guests_online";i:20;s:21:"most_online_datestamp";i:1534279911;s:12:"most_enabled";b:1;}';
$actual = $this->ad->ReadArray($string); $actual = e107::unserialize($string);
$this->assertSame($expected, $actual); $this::assertSame($expected, $actual);
} }
@@ -54,12 +54,12 @@
{ {
// Test with addslashes enabled. // Test with addslashes enabled.
$input = array('one'=>'two', 'three'=>true); $input = array('one'=>'two', 'three'=>true);
$result = $this->ad->WriteArray($input); $result = e107::serialize($input,true);
$expected = 'array ( $expected = 'array (
\\\'one\\\' => \\\'two\\\', \\\'one\\\' => \\\'two\\\',
\\\'three\\\' => true, \\\'three\\\' => true,
)'; )';
$this->assertSame($expected, $result); $this::assertSame($expected, $result);
// Test with addslashes disabled. // Test with addslashes disabled.