Merge branch 'master' into patch-1

Author: schlessera

.travis.yml

@@ -1,8 +1,11 @@
-sudo: false
-dist: trusty
+os: linux
+dist: xenial
 
 language: php
-php: 7.3
+php: 7.4
+
+services:
+  - mysql
 
 notifications:
   email:
@@ -22,6 +25,9 @@ env:
     - PATH="$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
     - WP_CLI_BIN_DIR="$TRAVIS_BUILD_DIR/vendor/bin"
 
+services:
+  - mysql
+
 before_install:
   - |
     # Remove Xdebug for a huge performance increase:
@@ -51,7 +57,7 @@ jobs:
         - composer phpcs
       env: BUILD=sniff
     - stage: test
-      php: 7.4snapshot
+      php: 7.4
       env: WP_VERSION=latest
     - stage: test
       php: 7.3
@@ -71,14 +77,11 @@ jobs:
     - stage: test
       php: 5.6
       env: WP_VERSION=3.7.11
+      dist: trusty
     - stage: test
       php: 5.6
       env: WP_VERSION=trunk
     - stage: test
-      php: 5.4
       dist: precise
+      php: 5.4
       env: WP_VERSION=5.1
-  allow_failures:
-    - stage: test
-      php: 7.4snapshot
-      env: WP_VERSION=latest

composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": "^5.4 || ^7.0",
-        "wp-cli/wp-cli": "^2"
+        "wp-cli/wp-cli": "dev-master"
     },
     "require-dev": {
         "wp-cli/extension-command": "^1.2 || ^2",

features/install-wp-tests.feature

@@ -17,6 +17,14 @@ Feature: Scaffold install-wp-tests.sh tests
   @require-php-5.6
   Scenario: Install latest version of WordPress
     Given a WP install
+    And a affirmative-response file:
+    """
+    Y
+    """
+    And a negative-response file:
+    """
+    No
+    """
     And I run `wp plugin path`
     And save STDOUT as {PLUGIN_DIR}
     And I run `wp scaffold plugin hello-world`
@@ -76,6 +84,28 @@ Feature: Scaffold install-wp-tests.sh tests
     When I run `WP_TESTS_DIR=/tmp/behat-wordpress-tests-lib phpunit -c {PLUGIN_DIR}/hello-world/phpunit.xml.dist`
     Then the return code should be 0
 
+    When I try `WP_TESTS_DIR=/tmp/behat-wordpress-tests-lib WP_CORE_DIR=/tmp/behat-wordpress /usr/bin/env bash {PLUGIN_DIR}/hello-world/bin/install-wp-tests.sh wp_cli_test_scaffold wp_cli_test password1 localhost latest < affirmative-response`
+    Then the return code should be 0
+    And STDERR should contain:
+      """
+      Reinstalling
+      """
+    And STDOUT should contain:
+      """
+      Recreated the database (wp_cli_test_scaffold)
+      """
+
+    When I try `WP_TESTS_DIR=/tmp/behat-wordpress-tests-lib WP_CORE_DIR=/tmp/behat-wordpress /usr/bin/env bash {PLUGIN_DIR}/hello-world/bin/install-wp-tests.sh wp_cli_test_scaffold wp_cli_test password1 localhost latest < negative-response`
+    Then the return code should be 0
+    And STDERR should contain:
+      """
+      Reinstalling
+      """
+    And STDOUT should contain:
+      """
+      Leaving the existing database (wp_cli_test_scaffold) in place
+      """
+
   @require-php-5.6
   Scenario: Install WordPress from trunk
     Given a WP install

features/scaffold.feature

@@ -48,6 +48,7 @@ Feature: WordPress code scaffolding
       """
     And the return code should be 1
 
+  @require-wp-4.6
   Scenario: Scaffold a child theme and network enable it
     Given a WP multisite install
 
@@ -309,6 +310,7 @@ Feature: WordPress code scaffolding
       Plugin 'hello-world' activated.
       """
 
+  @require-wp-4.6
   Scenario: Scaffold a plugin and network activate it
     Given a WP multisite install
     When I run `wp scaffold plugin hello-world --activate-network`
@@ -333,6 +335,7 @@ Feature: WordPress code scaffolding
       """
     And the return code should be 1
 
+  @require-php-5.6 @require-wp-4.6
   Scenario: Scaffold starter code for a theme
     Given a WP install
     Given I run `wp theme path`
@@ -347,6 +350,7 @@ Feature: WordPress code scaffolding
     And the {THEME_DIR}/starter-theme/style.css file should exist
     And the {THEME_DIR}/starter-theme/.editorconfig file should exist
 
+  @require-php-5.6 @require-wp-4.6
   Scenario: Scaffold starter code for a theme with sass
     Given a WP install
     Given I run `wp theme path`
@@ -360,6 +364,7 @@ Feature: WordPress code scaffolding
       """
     And the {THEME_DIR}/starter-theme/sass directory should exist
 
+  @require-php-5.6 @require-wp-4.6
   Scenario: Scaffold starter code for a WooCommerce theme
     Given a WP install
     Given I run `wp theme path`
@@ -374,6 +379,7 @@ Feature: WordPress code scaffolding
     And the {THEME_DIR}/starter-theme/woocommerce.css file should exist
     And the {THEME_DIR}/starter-theme/inc/woocommerce.php file should exist
 
+  @require-php-5.6 @require-wp-4.6
   Scenario: Scaffold starter code for a theme and activate it
     Given a WP install
     # Allow for warnings to be generated due to https://github.com/wp-cli/scaffold-command/issues/181
@@ -490,6 +496,7 @@ Feature: WordPress code scaffolding
             env: WP_VERSION=latest
       """
 
+  @require-php-5.6 @require-wp-4.6
   Scenario: Scaffold starter code for a theme and network enable it
     Given a WP multisite install
     # Allow for warnings to be generated due to https://github.com/wp-cli/scaffold-command/issues/181
@@ -499,6 +506,7 @@ Feature: WordPress code scaffolding
       Success: Network enabled the 'Starter-theme' theme.
       """
 
+  @require-php-5.6 @require-wp-4.6
   Scenario: Scaffold starter code for a theme, but can't unzip theme files
     Given a WP install
     And a misconfigured WP_CONTENT_DIR constant directory

templates/install-wp-tests.sh

@@ -107,15 +107,16 @@ install_test_suite() {
 	if [ ! -d $WP_TESTS_DIR ]; then
 		# set up testing suite
 		mkdir -p $WP_TESTS_DIR
-		svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
-		svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
+		svn co --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
+		svn co --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
 	fi
 
 	if [ ! -f wp-tests-config.php ]; then
 		download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php
 		# remove all forward slashes in the end
 		WP_CORE_DIR=$(echo $WP_CORE_DIR | sed "s:/\+$::")
 		sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR/':" "$WP_TESTS_DIR"/wp-tests-config.php
+		sed $ioption "s:__DIR__ . '/src/':'$WP_CORE_DIR/':" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php
@@ -124,6 +125,23 @@ install_test_suite() {
 
 }
 
+recreate_db() {
+	shopt -s nocasematch
+	if [[ $1 =~ ^(y|yes)$ ]]
+	then
+		mysqladmin drop $DB_NAME -f --user="$DB_USER" --password="$DB_PASS"$EXTRA
+		create_db
+		echo "Recreated the database ($DB_NAME)."
+	else
+		echo "Leaving the existing database ($DB_NAME) in place."
+	fi
+	shopt -u nocasematch
+}
+
+create_db() {
+	mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
+}
+
 install_db() {
 
 	if [ ${SKIP_DB_CREATE} = "true" ]; then
@@ -147,7 +165,14 @@ install_db() {
 	fi
 
 	# create database
-	mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
+	if [ $(mysql --user="$DB_USER" --password="$DB_PASS" --execute='show databases;' | grep ^$DB_NAME$) ]
+	then
+		echo "Reinstalling will delete the existing test database ($DB_NAME)"
+		read -p 'Are you sure you want to proceed? [y/N]: ' DELETE_EXISTING_DB
+		recreate_db $DELETE_EXISTING_DB
+	else
+		create_db
+	fi
 }
 
 install_wp