Ensure PHP 5.3 compatibility

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index ede508a27b3db977923652327f9e00f48405707d..70c3fc694cd33e74672bd7f5c7cd71419fcdba8c 100644 (file)
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -83,17 +83,18 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
                $partitioning = "";
                if (support("partitioning")) {
                        if (isset($partition_by[$row["partition_by"]])) {
-                               $params = array_filter($row, function ($key) {
-                                       return preg_match('~^partition~', $key);
-                               }, ARRAY_FILTER_USE_KEY);
-
+                               $params = array();
+                               foreach ($row as $key => $val) {
+                                       if (preg_match('~^partition~', $key)) {
+                                               $params[$key] = $val;
+                                       }
+                               }
                                foreach ($params["partition_names"] as $key => $name) {
                                        if ($name == "") {
                                                unset($params["partition_names"][$key]);
                                                unset($params["partition_values"][$key]);
                                        }
                                }
-
                                if ($params != get_partitions_info($TABLE)) {
                                        $partitions = array();
                                        if ($params["partition_by"] == 'RANGE' || $params["partition_by"] == 'LIST') {
@@ -102,7 +103,6 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
                                                        $partitions[] = "\n  PARTITION " . idf_escape($name) . " VALUES " . ($params["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
                                                }
                                        }
-
                                        // $params["partition"] can be expression, not only column
                                        $partitioning .= "\nPARTITION BY $params[partition_by]($params[partition])";
                                        if ($partitions) {

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 7df77016d55f4d92cd58b9309f2a8e45b3c8bd6d..e6c3ca10993a19f6967a74aaf5f2e376cbeea3de 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -43,7 +43,10 @@ if (isset($_GET["pgsql"])) {
                        }
 
                        function quote($string) {
-                               return pg_escape_literal($this->link, $string);
+                               return (function_exists('pg_escape_literal')
+                                       ? pg_escape_literal($this->link, $string) // available since PHP 5.4.4
+                                       : "'" . pg_escape_string($this->link, $string) . "'"
+                               );
                        }
 
                        function value($val, $field) {

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 151dbeed9e59c3579436e5892cce98caf9d3a775..804a85c4fa8870f7042166d7303eeb8f3e9db8fb 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -78,7 +78,7 @@ if (isset($_GET["sqlite"])) {
                                );
                        }
 
-                       function __desctruct() {
+                       function __destruct() {
                                return $this->result->finalize();
                        }
                }

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index ca5a780987447817c235e09866bcfd35d0a805ad..a08acf96d33e6c247b72bcfb390ecb9c2ec401a7 100644 (file)
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -62,7 +62,6 @@ if (function_exists("get_magic_quotes_runtime") && get_magic_quotes_runtime()) {
        set_magic_quotes_runtime(false);
 }
 @set_time_limit(0); // @ - can be disabled
-@ini_set("zend.ze1_compatibility_mode", false); // @ - deprecated
 @ini_set("precision", 15); // @ - can be disabled, 15 - internal PHP precision
 
 include "../adminer/include/lang.inc.php";

diff --git a/phpcs.xml b/phpcs.xml
index 56c71c353c7bc87018959336d2337dbb502830dc..d6b72fa8e1627ddf75f0a9200fd42a801185534b 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -108,4 +108,11 @@
        <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
        <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
        <rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing"/>
+
+       <!--
+       This is slow and has false positives but it's useful occasionally.
+       https://github.com/PHPCompatibility/PHPCompatibility
+       <rule ref="PHPCompatibility"/>
+       <config name="testVersion" value="5.3-"/>
+       -->
 </ruleset>

diff --git a/plugins/drivers/simpledb.php b/plugins/drivers/simpledb.php
index 0ac5f3fd64352d7929fe8813387ac16bd8562f34..488a10d2f1a962fca96a431d08cbce7d50e2175a 100644 (file)
--- a/plugins/drivers/simpledb.php
+++ b/plugins/drivers/simpledb.php
@@ -422,7 +422,7 @@ if (isset($_GET["simpledb"])) {
                        'max_redirects' => 0,
                ))));
                if (!$file) {
-                       $this->error = lang('Invalid credentials.');
+                       $connection->error = lang('Invalid credentials.');
                        return false;
                }
                libxml_use_internal_errors(true);