Revert "Fix compatibility with PHP 8.1"

This reverts commit 1d1e927d56302e6d21cb51203eee7ad43b89b38d.
This commit is contained in:
slawkens 2023-02-02 15:39:20 +01:00
parent 1fb1fb3ae9
commit 77460b0832
7 changed files with 21 additions and 21 deletions

View File

@ -11,7 +11,7 @@
defined('MYAAC') or die('Direct access not allowed!'); defined('MYAAC') or die('Direct access not allowed!');
$configForumTablePrefix = config('forum_table_prefix'); $configForumTablePrefix = config('forum_table_prefix');
if(null !== $configForumTablePrefix && !empty(trim($configForumTablePrefix))) { if(!empty(trim($configForumTablePrefix))) {
if(!in_array($configForumTablePrefix, array('myaac_', 'z_'))) { if(!in_array($configForumTablePrefix, array('myaac_', 'z_'))) {
throw new RuntimeException('Invalid value for forum_table_prefix in config.php. Can be only: "myaac_" or "z_".'); throw new RuntimeException('Invalid value for forum_table_prefix in config.php. Can be only: "myaac_" or "z_".');
} }
@ -322,4 +322,4 @@ class Forum
return $hasAccess; return $hasAccess;
} }
} }
?> ?>

View File

@ -31,7 +31,7 @@
* @property-read int $access Access level. * @property-read int $access Access level.
* @tutorial POT/Accounts.pkg * @tutorial POT/Accounts.pkg
*/ */
class OTS_Account extends OTS_Row_DAO implements Countable class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
{ {
/** /**
* Account data. * Account data.
@ -1105,7 +1105,7 @@ class OTS_Account extends OTS_Row_DAO implements Countable
* @throws PDOException On PDO operation error. * @throws PDOException On PDO operation error.
* @return int Count of players. * @return int Count of players.
*/ */
public function count(): int public function count()
{ {
return $this->getPlayersList()->count(); return $this->getPlayersList()->count();
} }

View File

@ -36,7 +36,7 @@
* @property-write int $offset Sets OFFSET clause. * @property-write int $offset Sets OFFSET clause.
* @property-write OTS_SQLFilter $filter Sets filter for list SQL query. * @property-write OTS_SQLFilter $filter Sets filter for list SQL query.
*/ */
abstract class OTS_Base_List implements IOTS_DAO, Countable abstract class OTS_Base_List implements IOTS_DAO, Iterator, Countable
{ {
/** /**
* Database connection. * Database connection.
@ -203,7 +203,7 @@ abstract class OTS_Base_List implements IOTS_DAO, Countable
* *
* @throws PDOException On PDO operation error. * @throws PDOException On PDO operation error.
*/ */
public function rewind(): void public function rewind()
{ {
$this->rows = $this->db->query( $this->getSQL() )->fetchAll(); $this->rows = $this->db->query( $this->getSQL() )->fetchAll();
} }
@ -211,7 +211,7 @@ abstract class OTS_Base_List implements IOTS_DAO, Countable
/** /**
* Moves to next row. * Moves to next row.
*/ */
public function next(): void public function next()
{ {
next($this->rows); next($this->rows);
} }
@ -231,7 +231,7 @@ abstract class OTS_Base_List implements IOTS_DAO, Countable
* *
* @return bool Does next row exist. * @return bool Does next row exist.
*/ */
public function valid(): bool public function valid()
{ {
return key($this->rows) !== null; return key($this->rows) !== null;
} }
@ -243,7 +243,7 @@ abstract class OTS_Base_List implements IOTS_DAO, Countable
* @return int Number of rows. * @return int Number of rows.
* @throws PDOException On PDO operation error. * @throws PDOException On PDO operation error.
*/ */
public function count(): int public function count()
{ {
return $this->db->query( $this->getSQL(true) )->fetchColumn(); return $this->db->query( $this->getSQL(true) )->fetchColumn();
} }

View File

@ -26,7 +26,7 @@
* @property-read int $id Row ID. * @property-read int $id Row ID.
* @property-read OTS_Players_List $playersList List of members of this group. * @property-read OTS_Players_List $playersList List of members of this group.
*/ */
class OTS_Group extends OTS_Row_DAO implements Countable class OTS_Group extends OTS_Row_DAO implements IteratorAggregate, Countable
{ {
/** /**
* Group data. * Group data.
@ -552,7 +552,7 @@ class OTS_Group extends OTS_Row_DAO implements Countable
* @throws PDOException On PDO operation error. * @throws PDOException On PDO operation error.
* @return int Count of players. * @return int Count of players.
*/ */
public function count(): int public function count()
{ {
return $this->getPlayersList()->count(); return $this->getPlayersList()->count();
} }

View File

@ -14,7 +14,7 @@
* @package POT * @package POT
* @version 0.1.3 * @version 0.1.3
*/ */
class OTS_Groups_List implements Countable class OTS_Groups_List implements IteratorAggregate, Countable
{ {
/** /**
* Groups. * Groups.
@ -41,7 +41,7 @@ class OTS_Groups_List implements Countable
$info['access'] = $group['name']; $info['access'] = $group['name'];
$this->groups[$group['id']] = new OTS_Group($info); $this->groups[$group['id']] = new OTS_Group($info);
} }
return; return;
} }
@ -50,7 +50,7 @@ class OTS_Groups_List implements Countable
global $config; global $config;
$file = $config['data_path'] . 'XML/groups.xml'; $file = $config['data_path'] . 'XML/groups.xml';
} }
if(!@file_exists($file)) { if(!@file_exists($file)) {
error('Error: Cannot load groups.xml. More info in system/logs/error.log file.'); error('Error: Cannot load groups.xml. More info in system/logs/error.log file.');
log_append('error.log', '[OTS_Groups_List.php] Fatal error: Cannot load groups.xml (' . $file . '). It doesnt exist.'); log_append('error.log', '[OTS_Groups_List.php] Fatal error: Cannot load groups.xml (' . $file . '). It doesnt exist.');
@ -99,7 +99,7 @@ class OTS_Groups_List implements Countable
log_append('error.log', '[OTS_Groups_List.php] Fatal error: Cannot load groups.xml (' . $file . '). Error: ' . print_r(error_get_last(), true)); log_append('error.log', '[OTS_Groups_List.php] Fatal error: Cannot load groups.xml (' . $file . '). Error: ' . print_r(error_get_last(), true));
return; return;
} }
// loads groups // loads groups
foreach($groups->getElementsByTagName('group') as $group) foreach($groups->getElementsByTagName('group') as $group)
{ {
@ -157,7 +157,7 @@ class OTS_Groups_List implements Countable
if($id > $group_id) if($id > $group_id)
$group_id = $id; $group_id = $id;
} }
return $group_id; return $group_id;
} }
@ -210,7 +210,7 @@ class OTS_Groups_List implements Countable
* @since 0.1.5 * @since 0.1.5
* @return int Amount of all groups. * @return int Amount of all groups.
*/ */
public function count(): int public function count()
{ {
return count($this->groups); return count($this->groups);
} }

View File

@ -30,7 +30,7 @@
* @property-write IOTS_GuildAction $requestsDriver Membership requests handler. * @property-write IOTS_GuildAction $requestsDriver Membership requests handler.
* @tutorial POT/Guilds.pkg * @tutorial POT/Guilds.pkg
*/ */
class OTS_Guild extends OTS_Row_DAO implements Countable class OTS_Guild extends OTS_Row_DAO implements IteratorAggregate, Countable
{ {
/** /**
* Guild data. * Guild data.
@ -723,7 +723,7 @@ class OTS_Guild extends OTS_Row_DAO implements Countable
* @throws PDOException On PDO operation error. * @throws PDOException On PDO operation error.
* @return int Count of ranks. * @return int Count of ranks.
*/ */
public function count(): int public function count()
{ {
return $this->getGuildRanksList()->count(); return $this->getGuildRanksList()->count();
} }

View File

@ -25,7 +25,7 @@
* @property-read int $id Row ID. * @property-read int $id Row ID.
* @property-read OTS_Players_List $playersList List of members with this rank. * @property-read OTS_Players_List $playersList List of members with this rank.
*/ */
class OTS_GuildRank extends OTS_Row_DAO implements Countable class OTS_GuildRank extends OTS_Row_DAO implements IteratorAggregate, Countable
{ {
/** /**
* Rank data. * Rank data.
@ -410,7 +410,7 @@ class OTS_GuildRank extends OTS_Row_DAO implements Countable
* @throws PDOException On PDO operation error. * @throws PDOException On PDO operation error.
* @return int Count of players. * @return int Count of players.
*/ */
public function count(): int public function count()
{ {
return $this->getPlayersList()->count(); return $this->getPlayersList()->count();
} }