Wrap long lines

diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index d2bd2481e7cee20fc8f6b454d0454009edb839ee..9444b295e493174ed0c3b0b27281ddc80f1f62a6 100644 (file)
--- a/adminer/file.inc.php
+++ b/adminer/file.inc.php
@@ -14,7 +14,16 @@ if ($_GET["file"] == "favicon.ico") {
        echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
 } elseif ($_GET["file"] == "jush.js") {
        header("Content-Type: text/javascript; charset=utf-8");
-       echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-js.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
+       echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;
+../externals/jush/modules/jush-textarea.js;
+../externals/jush/modules/jush-txt.js;
+../externals/jush/modules/jush-js.js;
+../externals/jush/modules/jush-sql.js;
+../externals/jush/modules/jush-pgsql.js;
+../externals/jush/modules/jush-sqlite.js;
+../externals/jush/modules/jush-mssql.js;
+../externals/jush/modules/jush-oracle.js;
+../externals/jush/modules/jush-simpledb.js', 'minify_js'));
 } else {
        header("Content-Type: image/gif");
        switch ($_GET["file"]) {

diff --git a/adminer/plugin.php b/adminer/plugin.php
index 345a6f29ed89cbb5be3172b3ebe6974517123030..d95a2f0a9888226c91ba2f24886d16b41c903b3d 100644 (file)
--- a/adminer/plugin.php
+++ b/adminer/plugin.php
@@ -20,9 +20,7 @@ function adminer_object() {
                new AdminerDumpXml,
                new AdminerDumpAlter,
                //~ new AdminerSqlLog("past-" . rtrim(`git describe --tags --abbrev=0`) . ".sql"),
-               //~ new AdminerEditCalendar(script_src("../externals/jquery-ui/jquery-1.4.4.js") . script_src("../externals/jquery-ui/ui/jquery.ui.core.js") . script_src("../externals/jquery-ui/ui/jquery.ui.widget.js") . script_src("../externals/jquery-ui/ui/jquery.ui.datepicker.js") . script_src("../externals/jquery-ui/ui/jquery.ui.mouse.js") . script_src("../externals/jquery-ui/ui/jquery.ui.slider.js") . script_src("../externals/jquery-timepicker/jquery-ui-timepicker-addon.js") . "<link rel='stylesheet' href='../externals/jquery-ui/themes/base/jquery.ui.all.css'>\n<style>\n.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }\n.ui-timepicker-div dl { text-align: left; }\n.ui-timepicker-div dl dt { height: 25px; }\n.ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }\n.ui-timepicker-div td { font-size: 90%; }\n</style>\n", "../externals/jquery-ui/ui/i18n/jquery.ui.datepicker-%s.js"),
                //~ new AdminerTinymce("../externals/tinymce/jscripts/tiny_mce/tiny_mce_dev.js"),
-               //~ new AdminerWymeditor(array("../externals/wymeditor/src/jquery/jquery.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.explorer.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.mozilla.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.opera.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.safari.js")),
                new AdminerFileUpload(""),
                new AdminerJsonColumn,
                new AdminerSlugify,

diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index 3a5d5c3b0f6119a4c3113935bb8081597fe5e7dd..680ed288c31813a98837058fb3f6d0c8a8ab433e 100644 (file)
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -84,7 +84,10 @@ foreach ($schema as $name => $table) {
                        $left1 = $left - $table_pos[$name][1];
                        $i = 0;
                        foreach ($columns as $target) {
-                               echo "\n<div class='references' title='" . h($target_name) . "' id='refd$left-" . ($i++) . "' style='left: $left1" . "em; top: " . $table["fields"][$target]["pos"] . "em; height: 1.25em; background: url(../adminer/static/arrow.gif) no-repeat right center;'><div style='height: .5em; border-bottom: 1px solid Gray; width: " . (-$left1) . "em;'></div></div>";
+                               echo "\n<div class='references' title='" . h($target_name) . "' id='refd$left-" . ($i++) . "' style='left: $left1" . "em; top: " . $table["fields"][$target]["pos"] . "em; height: 1.25em; background: url(../adminer/static/arrow.gif) no-repeat right center;'>"
+                                       . "<div style='height: .5em; border-bottom: 1px solid Gray; width: " . (-$left1) . "em;'></div>"
+                                       . "</div>"
+                               ;
                        }
                }
        }

diff --git a/compile.php b/compile.php
index 25286f9f83dc02a5340b038eadb0623e16aa4746..1267369abe47828972bce03b354c4f60b2225cc6 100755 (executable)
--- a/compile.php
+++ b/compile.php
@@ -346,7 +346,7 @@ function compile_file($match) {
        $file = "";
        list(, $filenames, $callback) = $match;
        if ($filenames != "") {
-               foreach (explode(";", $filenames) as $filename) {
+               foreach (preg_split('~;\s*~', $filenames) as $filename) {
                        $file .= file_get_contents(__DIR__ . "/$project/$filename");
                }
        }
@@ -448,7 +448,7 @@ if ($driver) {
                }
                $file = str_replace(" . script(\"qs('#username').form['auth[driver]'].onchange();\")", "", $file);
        }
-       $file = preg_replace('(;../externals/jush/modules/jush-(?!textarea\.|txt\.|js\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
+       $file = preg_replace('(;\s*../externals/jush/modules/jush-(?!textarea\.|txt\.|js\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
        $file = preg_replace_callback('~doc_link\(array\((.*)\)\)~sU', function ($match) use ($driver) {
                list(, $links) = $match;
                $links = preg_replace("~'(?!(" . ($driver == "mysql" ? "sql|mariadb" : $driver) . ")')[^']*' => [^,]*,?~", '', $links);

diff --git a/phpcs.xml b/phpcs.xml
index f51cce2aec16d6c7980d12392bb3c2a93a6fd81c..699d47c2e5c393f9cbb32c6f5b183829566bdfba 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -10,7 +10,6 @@
        <exclude-pattern>/(adminer|editor)[^/]*.php</exclude-pattern>
 
        <rule ref="PSR12">
-               <exclude name="Generic.Files.LineLength"/>
                <exclude name="Generic.Whitespace.DisallowTabIndent"/><!-- Replaced by: Generic.Whitespace.DisallowSpaceIndent -->
                <exclude name="PSR1.Files.SideEffects.FoundWithSymbols"/>
                <exclude name="PSR12.Operators.OperatorSpacing.NoSpaceBefore"/>
@@ -45,6 +44,13 @@
                <exclude-pattern>adminer/plugins/drivers/</exclude-pattern>
        </rule>
 
+       <rule ref="Generic.Files.LineLength">
+               <properties>
+                       <property name="lineLimit" value="310"/>
+               </properties>
+               <exclude-pattern>adminer/lang/</exclude-pattern>
+       </rule>
+
        <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace">
                <exclude-pattern>plugins/[^/]+\.php</exclude-pattern>
                <exclude-pattern>editor/(example|sqlite)\.php</exclude-pattern>

diff --git a/plugins/foreign-system.php b/plugins/foreign-system.php
index 27ba976bcf597352abc959f085b306e1fa960ca5..939a53e725501c9f30e6b4d96f16f2270d39ef87 100644 (file)
--- a/plugins/foreign-system.php
+++ b/plugins/foreign-system.php
@@ -40,15 +40,36 @@ class AdminerForeignSystem {
                                "SCHEMATA" => array(array("source" => array("DEFAULT_CHARACTER_SET_NAME")) + $character_sets, array("source" => array("DEFAULT_COLLATION_NAME")) + $collations),
                                "EVENTS" => array_merge(array(array("source" => array("EVENT_CATALOG", "EVENT_SCHEMA")) + $schemata), $routine_charsets),
                                "FILES" => array($schemata, $tables),
-                               "KEY_COLUMN_USAGE" => array(array("source" => array("CONSTRAINT_CATALOG", "CONSTRAINT_SCHEMA")) + $schemata, $schemata, $tables, $columns, array("source" => array("TABLE_CATALOG", "REFERENCED_TABLE_SCHEMA")) + $schemata, array("source" => array("TABLE_CATALOG", "REFERENCED_TABLE_SCHEMA", "REFERENCED_TABLE_NAME")) + $tables, array("source" => array("TABLE_CATALOG", "REFERENCED_TABLE_SCHEMA", "REFERENCED_TABLE_NAME", "REFERENCED_COLUMN_NAME")) + $columns),
+                               "KEY_COLUMN_USAGE" => array(
+                                       array("source" => array("CONSTRAINT_CATALOG", "CONSTRAINT_SCHEMA")) + $schemata,
+                                       $schemata,
+                                       $tables,
+                                       $columns,
+                                       array("source" => array("TABLE_CATALOG", "REFERENCED_TABLE_SCHEMA")) + $schemata,
+                                       array("source" => array("TABLE_CATALOG", "REFERENCED_TABLE_SCHEMA", "REFERENCED_TABLE_NAME")) + $tables,
+                                       array("source" => array("TABLE_CATALOG", "REFERENCED_TABLE_SCHEMA", "REFERENCED_TABLE_NAME", "REFERENCED_COLUMN_NAME")) + $columns,
+                               ),
                                "PARTITIONS" => array($schemata, $tables),
-                               "REFERENTIAL_CONSTRAINTS" => array(array("source" => array("CONSTRAINT_CATALOG", "CONSTRAINT_SCHEMA")) + $schemata, array("source" => array("UNIQUE_CONSTRAINT_CATALOG", "UNIQUE_CONSTRAINT_SCHEMA")) + $schemata, array("source" => array("CONSTRAINT_CATALOG", "CONSTRAINT_SCHEMA", "TABLE_NAME")) + $tables, array("source" => array("CONSTRAINT_CATALOG", "CONSTRAINT_SCHEMA", "REFERENCED_TABLE_NAME")) + $tables),
+                               "REFERENTIAL_CONSTRAINTS" => array(
+                                       array("source" => array("CONSTRAINT_CATALOG", "CONSTRAINT_SCHEMA")) + $schemata,
+                                       array("source" => array("UNIQUE_CONSTRAINT_CATALOG", "UNIQUE_CONSTRAINT_SCHEMA")) + $schemata,
+                                       array("source" => array("CONSTRAINT_CATALOG", "CONSTRAINT_SCHEMA", "TABLE_NAME")) + $tables,
+                                       array("source" => array("CONSTRAINT_CATALOG", "CONSTRAINT_SCHEMA", "REFERENCED_TABLE_NAME")) + $tables,
+                               ),
                                "ROUTINES" => array_merge(array(array("source" => array("ROUTINE_CATALOG", "ROUTINE_SCHEMA")) + $schemata), $routine_charsets),
                                "SCHEMA_PRIVILEGES" => array($schemata),
                                "STATISTICS" => array($schemata, $tables, $columns, array("source" => array("TABLE_CATALOG", "INDEX_SCHEMA")) + $schemata),
-                               "TABLE_CONSTRAINTS" => array(array("source" => array("CONSTRAINT_CATALOG", "CONSTRAINT_SCHEMA")) + $schemata, array("source" => array("CONSTRAINT_CATALOG", "TABLE_SCHEMA")) + $schemata, array("source" => array("CONSTRAINT_CATALOG", "TABLE_SCHEMA", "TABLE_NAME")) + $tables),
+                               "TABLE_CONSTRAINTS" => array(
+                                       array("source" => array("CONSTRAINT_CATALOG", "CONSTRAINT_SCHEMA")) + $schemata,
+                                       array("source" => array("CONSTRAINT_CATALOG", "TABLE_SCHEMA")) + $schemata,
+                                       array("source" => array("CONSTRAINT_CATALOG", "TABLE_SCHEMA", "TABLE_NAME")) + $tables,
+                               ),
                                "TABLE_PRIVILEGES" => array($schemata, $tables),
-                               "TRIGGERS" => array_merge(array(array("source" => array("TRIGGER_CATALOG", "TRIGGER_SCHEMA")) + $schemata, array("source" => array("EVENT_OBJECT_CATALOG", "EVENT_OBJECT_SCHEMA")) + $schemata, array("source" => array("EVENT_OBJECT_CATALOG", "EVENT_OBJECT_SCHEMA", "EVENT_OBJECT_TABLE")) + $tables), $routine_charsets),
+                               "TRIGGERS" => array_merge(array(
+                                       array("source" => array("TRIGGER_CATALOG", "TRIGGER_SCHEMA")) + $schemata,
+                                       array("source" => array("EVENT_OBJECT_CATALOG", "EVENT_OBJECT_SCHEMA")) + $schemata,
+                                       array("source" => array("EVENT_OBJECT_CATALOG", "EVENT_OBJECT_SCHEMA", "EVENT_OBJECT_TABLE")) + $tables,
+                               ), $routine_charsets),
                                "VIEWS" => array($schemata),
                        );
                        return $return[$table];