Merge pull request #89 from wp-cli/use-behat-db-consts-in-prepare-tests-script

Author: schlessera

bin/install-package-tests

@@ -1,18 +1,58 @@
 #!/bin/sh
 
-set -ex
+# Database credentials can be provided via environment variables:
+# - WP_CLI_TEST_DBHOST is the host to use and can include a port, i.e "127.0.0.1:33060" (defaults to "localhost")
+# - WP_CLI_TEST_DBUSER is the user that has permission to administer databases and users (defaults to "root").
+# - WP_CLI_TEST_DBPASS is the password to use for the above user (defaults to an empty password).
+
+HOST=localhost
+PORT=""
+HOST_STRING=''
+if [ -n "$WP_CLI_TEST_DBHOST" ]; then
+	case ${WP_CLI_TEST_DBHOST##*[]]} in
+		(*:*) HOST=${WP_CLI_TEST_DBHOST%:*} PORT=${WP_CLI_TEST_DBHOST##*:};;
+		(*)   HOST=$WP_CLI_TEST_DBHOST;;
+	esac
+  HOST_STRING="-h$HOST"
+  if [ -n "$PORT" ]; then
+  	HOST_STRING="$HOST_STRING -P$PORT --protocol=tcp"
+	fi
+fi
+
+USER=root
+if [ -n "$WP_CLI_TEST_DBUSER" ]; then
+  USER="$WP_CLI_TEST_DBUSER"
+fi
 
 PASSWORD_STRING=""
-if [ -z "DB_PASSWORD" ]; then
-  PASSWORD_STRING="-p${DB_PASSWORD}"
-fi;
-
-# Prepare the database for running the tests
-install_db() {
-	mysql -e 'CREATE DATABASE IF NOT EXISTS wp_cli_test;' -uroot "$PASSWORD_STRING"
-	mysql -e 'CREATE USER "wp_cli_test"@"localhost" IDENTIFIED BY "password1"' -uroot "$PASSWORD_STRING"
-	mysql -e 'GRANT ALL PRIVILEGES ON wp_cli_test.* TO "wp_cli_test"@"localhost"' -uroot "$PASSWORD_STRING"
-	mysql -e 'GRANT ALL PRIVILEGES ON wp_cli_test_scaffold.* TO "wp_cli_test"@"localhost"' -uroot "$PASSWORD_STRING"
+if [ -n "$WP_CLI_TEST_DBPASS" ]; then
+  PASSWORD_STRING="-p$WP_CLI_TEST_DBPASS"
+fi
+
+# Prepare the database for running the tests with a MySQL version 8.0 or higher.
+install_db_8_0_plus() {
+	mysql -e "CREATE DATABASE IF NOT EXISTS wp_cli_test;" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "CREATE USER IF NOT EXISTS wp_cli_test@$HOST IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "GRANT ALL PRIVILEGES ON wp_cli_test.* TO wp_cli_test@$HOST" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "GRANT ALL PRIVILEGES ON wp_cli_test_scaffold.* TO wp_cli_test@$HOST" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
 }
 
-install_db
+# Prepare the database for running the tests with a MySQL version lower than 8.0.
+install_db_lower_than_8_0() {
+	mysql -e "CREATE DATABASE IF NOT EXISTS wp_cli_test;" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "GRANT ALL ON wp_cli_test.* TO wp_cli_test@$HOST IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "GRANT ALL ON wp_cli_test_scaffold.* TO wp_cli_test@$HOST IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+}
+
+set -ex
+
+VERSION_STRING=$(mysql -e "SELECT VERSION()" --skip-column-names $HOST_STRING -u"$USER" "$PASSWORD_STRING")
+VERSION=$(echo "$VERSION_STRING" | grep -o '^[^-]*')
+MAJOR=$(echo "$VERSION" | cut -d. -f1)
+MINOR=$(echo "$VERSION" | cut -d. -f2)
+
+if [ "$MAJOR" -ge 8 ]; then
+	install_db_8_0_plus
+else
+	install_db_lower_than_8_0
+fi

composer.json

@@ -13,7 +13,7 @@
         "behat/behat": "^2.5",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || ^0.5 || ^0.6.2 || ^0.7",
         "php-parallel-lint/php-console-highlighter": "^0.5",
-        "php-parallel-lint/php-parallel-lint": "^1.0",
+        "php-parallel-lint/php-parallel-lint": "^1",
         "phpcompatibility/php-compatibility": "^9",
         "phpunit/phpunit": ">=4.8 <7",
         "wp-cli/config-command": "^1 || ^2",
@@ -23,8 +23,7 @@
         "wp-coding-standards/wpcs": "^2.1"
     },
     "require-dev": {
-        "roave/security-advisories": "dev-master",
-        "wp-cli/regenerate-readme": "^2"
+        "roave/security-advisories": "dev-master"
     },
     "config": {
         "platform": {