Merge branch 'main' into 129-format-core-update

Author: swissspidy

.github/workflows/testing.yml

@@ -1,6 +1,7 @@
 name: Testing
 
 on:
+  workflow_dispatch:
   pull_request:
   push:
     branches:

README.md

@@ -381,15 +381,10 @@ update isn't actually running.
     No files found that need cleaning up
     Success: WordPress updated successfully.
 
-    # Update WordPress to latest version of 3.8 release
-    $ wp core update --version=3.8 ../latest.zip
-    Updating to version 3.8 ()...
+    # Update WordPress using zip file.
+    $ wp core update ../latest.zip
+    Starting update...
     Unpacking the update...
-    Cleaning up files...
-    File removed: wp-admin/js/tags-box.js
-    ...
-    File removed: wp-admin/js/updates.min.
-    377 files cleaned up
     Success: WordPress updated successfully.
 
     # Update WordPress to 3.1 forcefully

composer.json

@@ -13,22 +13,24 @@
     ],
     "require": {
         "composer/semver": "^1.4 || ^2 || ^3",
-        "wp-cli/wp-cli": "^2.5.1"
+        "wp-cli/wp-cli": "^2.12"
     },
     "require-dev": {
         "wp-cli/checksum-command": "^1 || ^2",
         "wp-cli/db-command": "^1.3 || ^2",
         "wp-cli/entity-command": "^1.3 || ^2",
         "wp-cli/extension-command": "^1.2 || ^2",
-        "wp-cli/wp-cli-tests": "^4"
+        "wp-cli/wp-cli-tests": "^5"
     },
     "config": {
         "process-timeout": 7200,
         "sort-packages": true,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "johnpbloch/wordpress-core-installer": true
-        }
+            "johnpbloch/wordpress-core-installer": true,
+            "phpstan/extension-installer": true
+        },
+        "lock": false
     },
     "extra": {
         "branch-alias": {
@@ -63,12 +65,14 @@
         "behat-rerun": "rerun-behat-tests",
         "lint": "run-linter-tests",
         "phpcs": "run-phpcs-tests",
+        "phpstan": "run-phpstan-tests",
         "phpcbf": "run-phpcbf-cleanup",
         "phpunit": "run-php-unit-tests",
         "prepare-tests": "install-package-tests",
         "test": [
             "@lint",
             "@phpcs",
+            "@phstan",
             "@phpunit",
             "@behat"
         ]

features/core-check-update.feature

@@ -9,36 +9,64 @@ Feature: Check for more recent versions
     When I run `wp core download --version=5.8 --force`
     Then STDOUT should not be empty
 
-    When I run `wp core check-update`
-    Then STDOUT should be a table containing rows:
-      | version                 | update_type | package_url                                                                             |
-      | {WP_VERSION-latest}     | major       | https://downloads.wordpress.org/release/wordpress-{WP_VERSION-latest}.zip               |
-      | {WP_VERSION-5.8-latest} | minor       | https://downloads.wordpress.org/release/wordpress-{WP_VERSION-5.8-latest}-partial-0.zip |
+    When I run `wp core check-update --format=csv`
+    Then STDOUT should match #{WP_VERSION-latest},major,https://downloads.(w|wordpress).org/release/wordpress-{WP_VERSION-latest}.zip#
+    And STDOUT should match #{WP_VERSION-5.8-latest},minor,https://downloads.(w|wordpress).org/release/wordpress-{WP_VERSION-5.8-latest}-partial-0.zip#
 
     When I run `wp core check-update --format=count`
     Then STDOUT should be:
       """
       2
       """
 
-    When I run `wp core check-update --major`
-    Then STDOUT should be a table containing rows:
-      | version             | update_type | package_url                                                               |
-      | {WP_VERSION-latest} | major       | https://downloads.wordpress.org/release/wordpress-{WP_VERSION-latest}.zip |
+    When I run `wp core check-update --major --format=csv`
+    Then STDOUT should match #{WP_VERSION-latest},major,https://downloads.(w|wordpress).org/release/wordpress-{WP_VERSION-latest}.zip#
 
     When I run `wp core check-update --major --format=count`
     Then STDOUT should be:
       """
       1
       """
 
-    When I run `wp core check-update --minor`
-    Then STDOUT should be a table containing rows:
-      | version                 | update_type | package_url                                                                             |
-      | {WP_VERSION-5.8-latest} | minor       | https://downloads.wordpress.org/release/wordpress-{WP_VERSION-5.8-latest}-partial-0.zip |
+    When I run `wp core check-update --minor --format=csv`
+    Then STDOUT should match #{WP_VERSION-5.8-latest},minor,https://downloads.(w|wordpress).org/release/wordpress-{WP_VERSION-5.8-latest}-partial-0.zip#
 
     When I run `wp core check-update --minor --format=count`
     Then STDOUT should be:
       """
       1
       """
+
+  Scenario: Check output of check update in different formats (no updates available)
+    Given a WP install
+    And a setup.php file:
+      """
+      <?php
+      global $wp_version;
+
+      $obj = new stdClass;
+      $obj->updates = [];
+      $obj->last_checked = strtotime( '1 January 2099' );
+      $obj->version_checked = $wp_version;
+      $obj->translations = [];
+      set_site_transient( 'update_core', $obj );
+      """
+    And I run `wp eval-file setup.php`
+
+    When I run `wp core check-update`
+    Then STDOUT should be:
+      """
+      Success: WordPress is at the latest version.
+      """
+
+    When I run `wp core check-update --format=json`
+    Then STDOUT should be:
+      """
+      []
+      """
+
+    When I run `wp core check-update --format=yaml`
+    Then STDOUT should be:
+      """
+      ---
+      """

features/core-download.feature

@@ -39,9 +39,9 @@ Feature: Download WordPress
     When I run `wp core download --force`
     Then the wp-settings.php file should exist
     And STDOUT should contain:
-    """
-    Using cached file '{SUITE_CACHE_DIR}/core/wordpress-{VERSION}-en_US.tar.gz'...
-    """
+      """
+      Using cached file '{SUITE_CACHE_DIR}/core/wordpress-{VERSION}-en_US.tar.gz'...
+      """
 
   Scenario: Localized install
     Given an empty directory
@@ -54,7 +54,7 @@ Feature: Download WordPress
   Scenario: Catch download of non-existent WP version
     Given an empty directory
 
-    When I try `wp core download --version=4.1.0 --force`
+    When I try `wp core download --version=1.0.3 --force`
     Then STDERR should contain:
       """
       Error: Release not found.
@@ -115,17 +115,18 @@ Feature: Download WordPress
 
   Scenario: Make sure files are cleaned up
     Given an empty directory
+
     When I run `wp core download --version=4.4`
     Then the wp-includes/rest-api.php file should exist
-    Then the wp-includes/class-wp-comment.php file should exist
+    And the wp-includes/class-wp-comment.php file should exist
     And STDERR should not contain:
       """
       Warning: Failed to find WordPress version. Please cleanup files manually.
       """
 
     When I run `wp core download --version=4.3.2 --force`
     Then the wp-includes/rest-api.php file should not exist
-    Then the wp-includes/class-wp-comment.php file should not exist
+    And the wp-includes/class-wp-comment.php file should not exist
     And STDOUT should not contain:
       """
       File removed: wp-content
@@ -238,9 +239,9 @@ Feature: Download WordPress
     When I try `wp core download --version=nightly --locale=de_DE`
     Then the return code should be 1
     And STDERR should contain:
-    """
-    Error: Nightly builds are only available for the en_US locale.
-    """
+      """
+      Error: Nightly builds are only available for the en_US locale.
+      """
 
   Scenario: Installing a release candidate or beta version
     Given an empty directory
@@ -249,7 +250,7 @@ Feature: Download WordPress
     # Test with incorrect case.
     When I try `wp core download --version=4.6-rc2`
     Then the return code should be 1
-    Then STDERR should contain:
+    And STDERR should contain:
       """
       Error: Release not found.
       """
@@ -281,62 +282,62 @@ Feature: Download WordPress
   Scenario: Fail if path can't be created
     Given an empty directory
     And a non-directory-path file:
-    """
-    """
+      """
+      """
 
     When I try `wp core download --path=non-directory-path`
     Then STDERR should contain:
-    """
-    Failed to create directory
-    """
+      """
+      Failed to create directory
+      """
     And STDERR should contain:
-    """
-    /non-directory-path/
-    """
+      """
+      /non-directory-path/
+      """
     And the return code should be 1
 
     When I try `WP_CLI_STRICT_ARGS_MODE=1 wp core download --path=non-directory-path`
     Then STDERR should contain:
-    """
-    Failed to create directory
-    """
+      """
+      Failed to create directory
+      """
     And STDERR should contain:
-    """
-    non-directory-path/
-    """
+      """
+      non-directory-path/
+      """
     And the return code should be 1
 
     When I try `WP_CLI_STRICT_ARGS_MODE=1 wp core download --path=non-directory-path\\`
     Then STDERR should contain:
-    """
-    Failed to create directory
-    """
+      """
+      Failed to create directory
+      """
     And STDERR should contain:
-    """
-    non-directory-path/
-    """
+      """
+      non-directory-path/
+      """
     And the return code should be 1
 
     When I try `wp core download --path=/root-level-directory`
     Then STDERR should contain:
-    """
-    Insufficient permission to create directory
-    """
+      """
+      Insufficient permission to create directory
+      """
     And STDERR should contain:
-    """
-    /root-level-directory/
-    """
+      """
+      /root-level-directory/
+      """
     And the return code should be 1
 
     When I try `WP_CLI_STRICT_ARGS_MODE=1 wp core download --path=/root-level-directory`
     Then STDERR should contain:
-    """
-    Insufficient permission to create directory
-    """
+      """
+      Insufficient permission to create directory
+      """
     And STDERR should contain:
-    """
-    /root-level-directory/
-    """
+      """
+      /root-level-directory/
+      """
     And the return code should be 1
 
   Scenario: Core download without the full wp-content/plugins dir
@@ -366,9 +367,9 @@ Feature: Download WordPress
     And the wp-includes directory should exist
     And the wp-content/themes directory should exist
     And the wp-content/themes directory should be:
-       """
-       index.php
-       """
+      """
+      index.php
+      """
     And the wp-includes/js/tinymce/themes directory should exist
 
   Scenario: Core download without the full wp-content/plugins dir should work non US locale
@@ -382,9 +383,9 @@ Feature: Download WordPress
     And the wp-includes directory should exist
     And the wp-content/plugins directory should exist
     And the wp-content/plugins directory should be:
-       """
-       index.php
-       """
+      """
+      index.php
+      """
     And the wp-includes/js/tinymce/plugins directory should exist
 
   Scenario: Core download without the full wp-content/themes dir should work non US locale
@@ -398,9 +399,9 @@ Feature: Download WordPress
     And the wp-includes directory should exist
     And the wp-content/themes directory should exist
     And the wp-content/themes directory should be:
-       """
-       index.php
-       """
+      """
+      index.php
+      """
     And the wp-includes/js/tinymce/themes directory should exist
 
   Scenario: Core download without the full wp-content/plugins dir should work if a version is set
@@ -414,14 +415,14 @@ Feature: Download WordPress
     And the wp-includes directory should exist
     And the wp-content/plugins directory should exist
     And the wp-content/plugins directory should be:
-       """
-       index.php
-       """
+      """
+      index.php
+      """
     And the wp-content/themes directory should exist
     And the wp-content/themes directory should be:
-       """
-       index.php
-       """
+      """
+      index.php
+      """
     And the wp-includes/js/tinymce/themes directory should exist
     And the wp-includes/js/tinymce/plugins directory should exist
 
@@ -473,3 +474,13 @@ Feature: Download WordPress
       Error: Cannot use both --skip-content and --no-extract at the same time.
       """
     And the return code should be 1
+
+  Scenario: Allow installing major version with trailing zero
+    Given an empty directory
+
+    When I run `wp core download --version=6.7.0`
+    Then STDOUT should contain:
+      """
+      Success:
+      """
+