Compile: Strip types

diff --git a/README.md b/README.md
index 80058a3289f5ccbfb2ca1b5b757aa779c9fd8bed..23b607491fd9dfdc252310c747920affea574371 100644 (file)
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@
 ## Features
 - **Supports:** MySQL, MariaDB, PostgreSQL, CockroachDB, SQLite, MS SQL, Oracle
 - **Plugins for:** Elasticsearch, SimpleDB, MongoDB, Firebird, ClickHouse, IMAP
-- **Requirements:** PHP 5.3+
+- **Requirements:** PHP 5.3+ (compiled file), PHP 7.4+ (source codes)
 
 ## Screenshot
-![Screenshot](https://www.adminer.org/static/screenshots/table.png)
+![Table structure](https://www.adminer.org/static/screenshots/table.png)
 
 ## Installation
 If downloaded from Git then run: `git submodule update --init`

diff --git a/compile.php b/compile.php
index ac69bcbfb224573ff3407f6c1867b5995d5ffb86..c089d8776e66cf06ed7c464b4b499e2bcbc8e87d 100755 (executable)
--- a/compile.php
+++ b/compile.php
@@ -353,6 +353,9 @@ if ($_SESSION["lang"]) {
 $file = str_replace('echo script_src("static/editing.js");' . "\n", "", $file); // merged into functions.js
 $file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|" \. JUSH \. ")\.js"\);~', '', $file); // merged into jush.js
 $file = preg_replace('~echo .*/jush(-dark)?.css\'>.*~', '', $file); // merged into default.css or dark.css
+if (function_exists('stripTypes')) {
+       $file = stripTypes($file);
+}
 $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
 $replace = 'preg_replace("~\\\\\\\\?.*~", "", ME) . "?file=\1&version=' . $VERSION . '"';
 $file = preg_replace('~\.\./adminer/static/(default\.css)~', '<?php echo h(' . $replace . '); ?>', $file);

diff --git a/phpstan.neon b/phpstan.neon
index fee0205b70276bd076ca677823f20f4f73f19dc5..2b931b35801856fbeb67978f4c9fabdc28a73048 100644 (file)
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -52,9 +52,8 @@ parameters:
        scanFiles:
                - compile.php # compile_file()
        excludePaths:
-               - adminer/adminer-plugins/
+               - adminer/adminer-plugins*
                - adminer/lang/
-               - adminer/adminer-plugins.php
                - adminer/designs.php
                - adminer/elastic.php
                - adminer/sqlite.php