diff --git a/CHANGELOG.md b/CHANGELOG.md index 621e86d4..758ef7e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,16 +9,16 @@ - Shorten all but numeric and date types in select - Fix escaping spaces in cookie value (bug #1208) - Don't quote comma in TSV export (bug #1238) -- MariaDB: don't display checks with the same name from another table (bug #1135) +- MariaDB: Don't display checks with the same name from another table (bug #1135) - PostgreSQL: Offer foreign keys in create table - PostgreSQL: Add missing parentheses to CHECK export - PostgreSQL: Allow creating NOT DEFERRABLE foreign keys - PostgreSQL: Remove duplicate DEFERRABLE in foreign key export -- PostgreSQL: Add schema to sequence and and view export +- PostgreSQL: Add schema to sequence and view export - PostgreSQL: Fix definition of complex generated columns - PostgreSQL: Mark unique partial indexes as unique (bug #1172) -- PostgreSQL: fix namespace in inheritance links (bug #1221) -- non-PostgreSQL: display NOT NULL checks (bug #1237) +- PostgreSQL: Fix namespace in inheritance links (bug #1221) +- non-PostgreSQL: Display NOT NULL checks (bug #1237) - ClickHouse: Fix offset (bug #1188) - ClickHouse: Fix list of tables (bug #1176) - Plugins: Methods showVariables() and showStatus() (bug #1157) diff --git a/adminer/include/plugins.inc.php b/adminer/include/plugins.inc.php index e4d4175d..f4d4683e 100644 --- a/adminer/include/plugins.inc.php +++ b/adminer/include/plugins.inc.php @@ -17,7 +17,7 @@ class Plugins { $basename = "adminer-plugins"; if (is_dir($basename)) { foreach (glob("$basename/*.php") as $filename) { - $include = $this->includeOnce($filename); + $this->includeOnce($filename); } } $help = " href='https://www.adminer.org/plugins/#use'" . target_blank(); @@ -59,8 +59,10 @@ class Plugins { } } - // separate function to not overwrite local variables - function includeOnce($filename) { + /** Separate function to not overwrite local variables + * @return array|true + */ + function includeOnce(string $filename) { return include_once "./$filename"; } diff --git a/phpstan.neon b/phpstan.neon index 86385335..3fde8ffa 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -10,7 +10,6 @@ parameters: # not real problems - identifier: include.fileNotFound # includes in include/ relative from index.php - - identifier: includeOnce.fileNotFound # ./adminer-plugins.php - "~^Function (set_magic_quotes_runtime|mysql_)~" # PHP < 7 functions - "~an unknown class OCI-?Lob~" # this looks like PHPStan bug - "~^Variable \\$error might not be defined~" # declared in bootstrap.inc.php