Add shared code for testing class availability

Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Feb 22, 2016 · 9ae4bd5 · 9ae4bd5
1 parent 38482bf
commit 9ae4bd5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/libraries/PDF.php b/libraries/PDF.php
@@ -10,8 +10,6 @@
 use TCPDF;
 use TCPDF_FONTS;
 
-require_once TCPDF_INC;
-
 /**
  * PDF export base class providing basic configuration.
  *

diff --git a/libraries/Util.php b/libraries/Util.php
@@ -14,6 +14,7 @@
 use SqlParser\Token;
 use stdClass;
 use SqlParser\Utils\Error as ParserError;
+use Composer;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -4982,5 +4983,20 @@ public static function listPHPExtensions()
 
         return $result;
     }
+
+    /**
+     * Checks whether given class exists or can be auto loaded.
+     */
+    public static function checkClass($class)
+    {
+        if (class_exists($class)) {
+            return true;
+        }
+        $loader = new Composer\Autoload\ClassLoader();
+        if ($loader->loadClass($class)) {
+            return true;
+        }
+        return false;
+    }
 }
 
diff --git a/libraries/navigation/NodeFactory.php b/libraries/navigation/NodeFactory.php
@@ -8,7 +8,7 @@
 namespace PMA\libraries\navigation;
 
 use PMA\libraries\navigation\nodes\Node;
-use Composer;
+use PMA\libraries\Util;
 
 /**
  * Node factory - instantiates Node objects or objects derived from the Node class
@@ -55,18 +55,15 @@ private static function _checkClass($class)
     {
         $class = sprintf(self::$_namespace, $class);
 
-        if (!class_exists($class)) {
-            $loader = new Composer\Autoload\ClassLoader();
-            if (!$loader->loadClass($class)) {
-                $class = sprintf(self::$_namespace, 'Node');
-                trigger_error(
-                    sprintf(
-                        __('Could not load class "%1$s"'),
-                        $class
-                    ),
-                    E_USER_ERROR
-                );
-            }
+        if (! Util::checkClass($class)) {
+            $class = sprintf(self::$_namespace, 'Node');
+            trigger_error(
+                sprintf(
+                    __('Could not load class "%1$s"'),
+                    $class
+                ),
+                E_USER_ERROR
+            );
         }
 
         return $class;

diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
@@ -73,11 +73,6 @@
  * eg. /usr/share/php/gettext/gettext.inc.
  */
 define('GETTEXT_INC', './libraries/php-gettext/gettext.inc');
-/**
- * Path to tcpdf.php file. Useful when you want to use system tcpdf,
- * eg. /usr/share/php/tcpdf/tcpdf.php.
- */
-define('TCPDF_INC', './libraries/tcpdf/tcpdf.php');
 
 /**
  * Path to files with compiled locales (*.mo)