From 85e6fce86770b374a21e672b422a3a5cf7ae3655 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 25 Feb 2015 13:33:42 +0100 Subject: [PATCH] Rename Platform::zendClassExists() to Platform::classExists() --- library/Icinga/Application/Platform.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php index a2ef0a3ef..355311b97 100644 --- a/library/Icinga/Application/Platform.php +++ b/library/Icinga/Application/Platform.php @@ -182,19 +182,24 @@ class Platform } /** - * Return whether the given Zend framework class exists + * Return whether the given class exists * * @param string $name The name of the class to check * * @return bool */ - public static function zendClassExists($name) + public static function classExists($name) { if (@class_exists($name)) { return true; } - return (@include str_replace('_', '/', $name) . '.php') !== false; + if (strpos($name, '_') !== false) { + // Assume it's a Zend-Framework class + return (@include str_replace('_', '/', $name) . '.php') !== false; + } + + return false; } /** @@ -206,7 +211,7 @@ class Platform */ public static function hasMysqlSupport() { - return static::extensionLoaded('mysql') && static::zendClassExists('Zend_Db_Adapter_Pdo_Mysql'); + return static::extensionLoaded('mysql') && static::classExists('Zend_Db_Adapter_Pdo_Mysql'); } /** @@ -218,6 +223,6 @@ class Platform */ public static function hasPostgresqlSupport() { - return static::extensionLoaded('pgsql') && static::zendClassExists('Zend_Db_Adapter_Pdo_Pgsql'); + return static::extensionLoaded('pgsql') && static::classExists('Zend_Db_Adapter_Pdo_Pgsql'); } }