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

Replace is_a() and is_subclass_of() with instanceof

Browse source
This commit is contained in:
Kijin Sung 2016-02-11 09:57:08 +09:00
parent bc06367edf
commit 80f2dd7a8a
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -619,7 +619,7 @@ class DB
$output = include($cache_file); $output = include($cache_file);
if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) if($output instanceof Object && !$output->toBool())
{ {
return $output; return $output;
} }
@ -652,7 +652,7 @@ class DB
{ {
$output = $this->getError(); $output = $this->getError();
} }
else if(!is_a($output, 'Object') && !is_subclass_of($output, 'Object')) elseif(!($output instanceof Object))
{ {
$output = new Object(); $output = new Object();
} }

2
modules/autoinstall/autoinstall.lib.php
View file

@ -164,7 +164,7 @@ class ModuleInstaller
} }
$output = $oModule->moduleUninstall(); $output = $oModule->moduleUninstall();
if(is_subclass_of($output, 'Object') && !$output->toBool()) if($output instanceof Object && !$output->toBool())
{ {
return $output; return $output;
} }

2
modules/editor/editor.controller.php
View file

@ -60,7 +60,7 @@ class editorController extends editor
if(method_exists($oComponent, $method)) $output = $oComponent->{$method}(); if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
else return new Object(-1,sprintf('%s method is not exists', $method)); else return new Object(-1,sprintf('%s method is not exists', $method));
if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output; if($output instanceof Object && !$output->toBool()) return $output;
$this->setError($oComponent->getError()); $this->setError($oComponent->getError());
$this->setMessage($oComponent->getMessage()); $this->setMessage($oComponent->getMessage());