Improve Composer-based developer workflow and fix PHPCS/PHPStan issues

.github/workflows/ci.yml

@@ -10,10 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: php-actions/composer@v6
-      - uses: php-actions/phpcs@v1
-        with:
-          path: .
-          standard: phpcs.xml
-      - uses: php-actions/phpstan@v3
+      - run: composer phpcs
+      - run: composer phpstan

README.md

@@ -22,5 +22,13 @@ If downloaded from Git then run: `git submodule update --init`
 - `lang.php` - Update translations
 - `tests/*.html` - Katalon Recorder test suites
 
+## Composer Scripts
+Install the development tools first with `composer install`.
+
+- `composer initialize` - Update Git submodules
+- `composer phpcs` - Run the coding standard check using [phpcs.xml](/phpcs.xml)
+- `composer phpcbf` - Automatically fix coding standard issues where possible using [phpcs.xml](/phpcs.xml)
+- `composer phpstan` - Run PHPStan using `phpstan.neon`
+
 ## Plugins
 There are several plugins distributed with Adminer, as well as many user-contributed plugins listed on the [Adminer Plugins page](https://www.adminer.org/plugins/).

adminer/call.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $PROCEDURE = ($_GET["name"] ?: $_GET["call"]);

adminer/check.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $TABLE = $_GET["check"];

adminer/create.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $TABLE = $_GET["create"];
@@ -44,7 +45,7 @@
 
 		foreach ($row["fields"] as $key => $field) {
 			$foreign_key = $foreign_keys[$field["type"]];
-			$type_field = ($foreign_key !== null ? $referencable_primary[$foreign_key] : $field); //! can collide with user defined type
+			$type_field = (isset($referencable_primary[$foreign_key]) ? $referencable_primary[$foreign_key] : $field); //! can collide with user defined type
 			if ($field["field"] != "") {
 				if (!$field["generated"]) {
 					$field["default"] = null;

adminer/database.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $row = $_POST;

adminer/db.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $tables_views = array_merge((array) $_POST["tables"], (array) $_POST["views"]);

adminer/designs.php

@@ -1,4 +1,5 @@
 <?php
+
 function adminer_object() {
 	include_once "../plugins/designs.php";
 	$designs = array();

adminer/download.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $TABLE = $_GET["download"];

adminer/drivers/mssql.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
 * @author Jakub Cernohuby
 * @author Vladimir Stastka

adminer/drivers/mysql.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 SqlDriver::$drivers = array("server" => "MySQL / MariaDB") + SqlDriver::$drivers;
@@ -30,7 +31,7 @@ function attach(string $server, string $username, string $password): string {
 					null,
 					(is_numeric($port) ? intval($port) : ini_get("mysqli.default_port")),
 					(is_numeric($port) ? null : $port),
-					($ssl ? ($ssl['verify'] !== false ? 2048 : 64) : 0) // 2048 - MYSQLI_CLIENT_SSL, 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16)
+					($ssl ? (isset($ssl['verify']) && $ssl['verify'] === false ? 64 : 2048) : 0) // 2048 - MYSQLI_CLIENT_SSL, 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16)
 				);
 				$this->options(MYSQLI_OPT_LOCAL_INFILE, 0);
 				return ($return ? '' : $this->error);

adminer/drivers/oracle.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 add_driver("oracle", "Oracle (beta)");

adminer/drivers/pgsql.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 add_driver("pgsql", "PostgreSQL");
@@ -89,7 +90,8 @@ function query(string $query, bool $unbuffered = false) {
 
 			function warnings() {
 				if (PHP_VERSION_ID >= 70100) {
-					$return = implode("\n", pg_last_notice($this->link, 2)); // 2 - PGSQL_NOTICE_ALL
+					$notice = pg_last_notice($this->link, 2); // 2 - PGSQL_NOTICE_ALL
+					$return = implode("\n", (array) $notice);
 					pg_last_notice($this->link, 3); // 3 - PGSQL_NOTICE_CLEAR
 				} else {
 					$return = pg_last_notice($this->link);

adminer/drivers/sqlite.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 add_driver("sqlite", "SQLite");

adminer/dump.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $TABLE = $_GET["dump"];

adminer/edit.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $TABLE = $_GET["edit"];

adminer/elastic.php

@@ -1,4 +1,5 @@
 <?php
+
 // To create Adminer just for Elasticsearch, run `../compile.php elastic`.
 
 function adminer_object() {

adminer/event.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $EVENT = $_GET["event"];

adminer/file.inc.php

@@ -1,7 +1,8 @@
 <?php
+
 namespace Adminer;
 
-if (substr(VERSION, -4) != '-dev') {
+if (defined('Adminer\VERSION') && substr(VERSION, -4) != '-dev') {
 	if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
 		header("HTTP/1.1 304 Not Modified");
 		exit;

adminer/foreign.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $TABLE = $_GET["foreign"];

adminer/include/auth.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $permanent = array();

adminer/include/bootstrap.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 include "../adminer/include/version.inc.php";
@@ -91,7 +92,7 @@
 	'Adminer\ME',
 	preg_replace('~\?.*~', '', relative_uri()) . '?'
 		. (sid() ? SID . '&' : '')
-		. (SERVER !== null ? DRIVER . "=" . urlencode(SERVER) . '&' : '')
+		. DRIVER . "=" . urlencode(SERVER) . '&'
 		. ($_GET["ext"] ? "ext=" . urlencode($_GET["ext"]) . '&' : '')
 		. (isset($_GET["username"]) ? "username=" . urlencode($_GET["username"]) . '&' : '')
 		. (DB != "" ? 'db=' . urlencode(DB) . '&' . (isset($_GET["ns"]) ? "ns=" . urlencode($_GET["ns"]) . "&" : "") : '')

adminer/include/connect.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 if (isset($_GET["status"])) {

adminer/include/coverage.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 // coverage is used in tests and removed in compilation

adminer/include/db.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 // this could be interface when "Db extends \mysqli" can have compatible type declarations (PHP 7)

adminer/include/design.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 /** Print HTML header

adminer/include/driver.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 /** Add or overwrite a driver */

adminer/include/editing.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 // This file is not used in Adminer Editor.

adminer/include/errors.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 error_reporting(24575); // all but E_DEPRECATED (overriding mysqli methods without types is deprecated)

adminer/include/functions.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 // This file is used both in Adminer and Adminer Editor.

adminer/include/html.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 /** Return <script> element */
@@ -172,7 +173,7 @@ function hidden_fields(array $process, array $ignore = array(), string $prefix =
 /** Print hidden fields for GET forms */
 function hidden_fields_get(): void {
 	echo (sid() ? input_hidden(session_name(), session_id()) : '');
-	echo (SERVER !== null ? input_hidden(DRIVER, SERVER) : "");
+	echo input_hidden(DRIVER, SERVER);
 	echo input_hidden("username", $_GET["username"]);
 }
 

adminer/include/lang.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 /** Translate string

adminer/include/pdo.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 // PDO can be used in several database drivers

adminer/include/plugin.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 // the overridable methods don't use return type declarations so that plugins can be compatible with PHP 5

adminer/include/plugins.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 class Plugins {

adminer/include/tmpfile.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 class TmpFile {

adminer/include/version.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 const VERSION = "5.4.3-dev";

adminer/include/xxtea.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 /** PHP implementation of XXTEA encryption algorithm

adminer/index.php

@@ -1,11 +1,13 @@
 <?php
+
 /** Adminer - Compact database management
 * @link https://www.adminer.org/
 * @author Jakub Vrana, https://www.vrana.cz/
 * @copyright 2007 Jakub Vrana
 * @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
+
 // this is matched by compile.php
 
 namespace Adminer;

adminer/indexes.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 $TABLE = $_GET["indexes"];

adminer/lang/ar.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 Lang::$translations = array(

adminer/lang/bg.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 Lang::$translations = array(

adminer/lang/bn.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 Lang::$translations = array(

adminer/lang/bs.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 Lang::$translations = array(

adminer/lang/ca.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 Lang::$translations = array(

adminer/lang/cs.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 Lang::$translations = array(

adminer/lang/da.inc.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Adminer;
 
 Lang::$translations = array(