Use PHP 5

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 55d31df8a961b85d97bf06d38e481a0acf26b9b0..11c3314f41f9a9b975984d52615bbe0e0437e173 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -202,7 +202,7 @@ if (!defined("DRIVER")) {
                        /** Free result set
                        */
                        function __destruct() {
-                               mysql_free_result($this->_result); //! not called in PHP 4 which is a problem with mysql.trace_mode
+                               mysql_free_result($this->_result);
                        }
                }
 

diff --git a/compile.php b/compile.php
index cf64a20c4dedd794015e9315ab13338700190a6d..3d6b683b0a41ac78af4a305f3613d302429c3ccf 100755 (executable)
--- a/compile.php
+++ b/compile.php
@@ -394,5 +394,5 @@ $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);
 $file = php_shrink($file);
 
 $filename = $project . (preg_match('~-dev$~', $VERSION) ? "" : "-$VERSION") . ($driver ? "-$driver" : "") . ($_SESSION["lang"] ? "-$_SESSION[lang]" : "") . ".php";
-fwrite(fopen($filename, "w"), $file); // file_put_contents() since PHP 5
+file_put_contents($filename, $file);
 echo "$filename created (" . strlen($file) . " B).\n";

diff --git a/editor/include/editing.inc.php b/editor/include/editing.inc.php
index 6286704782a28d83a618db8c40fa3e0995875f24..32d3f4ef59f1fa62b77f7b0228c829d4836b3a09 100644 (file)
--- a/editor/include/editing.inc.php
+++ b/editor/include/editing.inc.php
@@ -4,7 +4,7 @@
 * @return string
 */
 function email_header($header) {
-       // iconv_mime_encode requires PHP 5, imap_8bit requires IMAP extension
+       // iconv_mime_encode requires iconv, imap_8bit requires IMAP extension
        return "=?UTF-8?B?" . base64_encode($header) . "?="; //! split long lines
 }
 

diff --git a/lang.php b/lang.php
index c289e546569ae98473081e6f632e7c19a822a282..28ce433d7053497e5fbe1a6aeee81fe2db1a9b26 100755 (executable)
--- a/lang.php
+++ b/lang.php
@@ -56,7 +56,7 @@ foreach (glob(dirname(__FILE__) . "/adminer/lang/" . ($_SESSION["lang"] ? $_SESS
        }
        $s = "<?php\n\$translations = array(\n$s);\n";
        if ($s != $file) {
-               fwrite(fopen($filename, "w"), $s); // file_put_contents() since PHP 5
+               file_put_contents($filename, $s);
                echo "$filename updated.\n";
        }
 }

diff --git a/plugins/plugin.php b/plugins/plugin.php
index 8762330d5742095815dfa09c8f473e82578936ff..0137b6b36e5c397066d214229bef3a9d4f0476ae 100644 (file)
--- a/plugins/plugin.php
+++ b/plugins/plugin.php
@@ -24,26 +24,17 @@ class AdminerPlugin extends Adminer {
                if ($plugins === null) {
                        $plugins = array();
                        foreach (get_declared_classes() as $class) {
-                               if (preg_match('~^Adminer.~i', $class) && strcasecmp($this->_findRootClass($class), 'Adminer')) { // can use interface since PHP 5
+                               if (preg_match('~^Adminer.~i', $class) && strcasecmp($this->_findRootClass($class), 'Adminer')) { //! can use interface
                                        $plugins[$class] = new $class;
                                }
                        }
                }
                $this->plugins = $plugins;
-               // it is possible to use ReflectionObject in PHP 5 to find out which plugins defines which methods at once
+               //! it is possible to use ReflectionObject to find out which plugins defines which methods at once
        }
        
        function _callParent($function, $args) {
-               switch (count($args)) { // call_user_func_array(array('parent', $function), $args) works since PHP 5
-                       case 0: return parent::$function();
-                       case 1: return parent::$function($args[0]);
-                       case 2: return parent::$function($args[0], $args[1]);
-                       case 3: return parent::$function($args[0], $args[1], $args[2]);
-                       case 4: return parent::$function($args[0], $args[1], $args[2], $args[3]);
-                       case 5: return parent::$function($args[0], $args[1], $args[2], $args[3], $args[4]);
-                       case 6: return parent::$function($args[0], $args[1], $args[2], $args[3], $args[4], $args[5]);
-                       default: trigger_error('Too many parameters.', E_USER_WARNING);
-               }
+               return call_user_func_array(array('parent', $function), $args);
        }
        
        function _applyPlugin($function, $args) {