Merge pull request #5587 from wp-cli/fix/use-mustache-fork-for-php-8.1-compat

schlessera · web-flow · commit d9617d4af461 · 2021-12-09T17:04:31.000-05:00
Use fork on schlessera for Mustache PHP 8.1 fix
diff --git a/composer.json b/composer.json
@@ -7,10 +7,16 @@
     ],
     "homepage": "https://wp-cli.org",
     "license": "MIT",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/schlessera/mustache.php"
+        }
+    ],
     "require": {
         "php": "^5.6 || ^7.0 || ^8.0",
         "ext-curl": "*",
-        "mustache/mustache": "~2.13",
+        "mustache/mustache": "dev-fix/trim-php-8.1 as 2.13.1",
         "rmccue/requests": "^1.8",
         "symfony/finder": ">2.7",
         "wp-cli/mustangostang-spyc": "^0.6.3",
diff --git a/features/command.feature b/features/command.feature
@@ -1125,15 +1125,13 @@ Feature: WP-CLI Commands
       sub-command
       """
 
-    # TODO: Throwing deprecations with PHP 8.1+ and WP < 5.9
-    When I try `wp test-command sub-command`
+    When I run `wp test-command sub-command`
     Then STDOUT should contain:
       """
       Success: test-command sub-command
       """
 
-    # TODO: Throwing deprecations with PHP 8.1+ and WP < 5.9
-    When I try `wp unknown-parent child-command`
+    When I run `wp unknown-parent child-command`
     Then STDOUT should contain:
       """
       Success: unknown-parent child-command
@@ -1174,15 +1172,13 @@ Feature: WP-CLI Commands
       sub-command
       """
 
-    # TODO: Throwing deprecations with PHP 8.1+ and WP < 5.9
-    When I try `wp test-command sub-command`
+    When I run `wp test-command sub-command`
     Then STDOUT should contain:
       """
       Success: test-command sub-command
       """
 
-    # TODO: Throwing deprecations with PHP 8.1+ and WP < 5.9
-    When I try `wp unknown-parent child-command`
+    When I run `wp unknown-parent child-command`
     Then STDOUT should contain:
       """
       Success: unknown-parent child-command
@@ -1225,15 +1221,13 @@ Feature: WP-CLI Commands
       sub-command
       """
 
-    # TODO: Throwing deprecations with PHP 8.1+ and WP < 5.9
-    When I try `wp test-command sub-command`
+    When I run `wp test-command sub-command`
     Then STDOUT should contain:
       """
       Success: test-command sub-command
       """
 
-    # TODO: Throwing deprecations with PHP 8.1+ and WP < 5.9
-    When I try `wp unknown-parent child-command`
+    When I run `wp unknown-parent child-command`
     Then STDOUT should contain:
       """
       Success: unknown-parent child-command
diff --git a/features/config.feature b/features/config.feature
@@ -34,7 +34,10 @@ Feature: Have a config file
 
     # TODO: Throwing deprecations with PHP 8.1+ and WP < 5.9
     When I try `wp` from 'wp-content'
-    Then STDOUT should not be empty
+    Then STDOUT should contain:
+      """
+      wp <command>
+      """
 
   Scenario: WP in a subdirectory
     Given a WP installation in 'foo'
