fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-02 00:32:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Clean up usage of is_countable()

Browse source
This commit is contained in:
Kijin Sung 2020-06-08 20:35:54 +09:00
parent 67a9aba082
commit 494e0ee028
8 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/context/Context.class.php
View file

@ -500,7 +500,7 @@ class Context
{
$config = Rhymix\Framework\Config::getAll();
}
if (!is_countable($config) || !count($config))
if (!is_array($config) || !count($config))
{
self::$_instance->db_info = self::$_instance->db_info ?: new stdClass;
return;

2
classes/db/DB.class.php
View file

@ -902,7 +902,7 @@ class DB
*/
public function _dbInfoExists()
{
return ($this->master_db && (is_countable($this->slave_db) && count($this->slave_db)));
return $this->master_db ? true : false;
}
/**

2
classes/db/queryparts/Query.class.php
View file

@ -149,8 +149,8 @@ class Query extends BaseObject
function setColumnList($columnList)
{
if (!is_array($this->columnList)) return;
$this->columnList = $columnList;
if (!is_countable($this->columnList)) return;
if(count($this->columnList) > 0)
{

4
classes/display/JSONDisplayHandler.php
View file

@ -60,10 +60,6 @@ class JSONDisplayHandler
*/
protected static function _isNumericArray($array)
{
if (!is_countable($array))
{
return false;
}
if (!is_array($array) || !count($array))
{
return false;