From 39dcc51bae4e5c4b723871932b3331f9c236616d Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Tue, 14 Dec 2021 14:47:03 -0500
Subject: [PATCH] Revert addition of the Mustache PHP 8.1 workaround and update
 dependency

---
 composer.json                           |  2 +-
 php/WP_CLI/Compat/MustacheTokenizer.php | 34 -------------------------
 php/utils.php                           |  2 --
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 php/WP_CLI/Compat/MustacheTokenizer.php

diff --git a/composer.json b/composer.json
index 0df77afb4b..c07c68cfd2 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": "^5.6 || ^7.0 || ^8.0",
         "ext-curl": "*",
-        "mustache/mustache": "^2.13",
+        "mustache/mustache": "^2.14",
         "rmccue/requests": "^1.8",
         "symfony/finder": ">2.7",
         "wp-cli/mustangostang-spyc": "^0.6.3",
diff --git a/php/WP_CLI/Compat/MustacheTokenizer.php b/php/WP_CLI/Compat/MustacheTokenizer.php
deleted file mode 100644
index 747ae39d74..0000000000
--- a/php/WP_CLI/Compat/MustacheTokenizer.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace WP_CLI\Compat;
-
-use Mustache_Exception_InvalidArgumentException;
-use Mustache_Exception_SyntaxException;
-use Mustache_Tokenizer;
-
-/**
- * Work-around extension for Mustache Tokenizer.
- */
-class MustacheTokenizer extends Mustache_Tokenizer {
-
-	/**
-	 * Scan and tokenize template source.
-	 *
-	 * @param string $text       Mustache template source to tokenize.
-	 * @param string $delimiters Optional. Pass initial opening and closing delimiters (default: null).
-	 *
-	 * @return array Set of Mustache tokens
-	 * @throws Mustache_Exception_InvalidArgumentException When $delimiters string is invalid.
-	 *
-	 * @throws Mustache_Exception_SyntaxException When mismatched section tags are encountered.
-	 */
-	public function scan( $text, $delimiters = null ) {
-		// Work-around while waiting for PHP 8.1 compat fix to be released.
-		// See https://github.com/bobthecow/mustache.php/pull/380
-		if ( ! is_string( $delimiters ) ) {
-			$delimiters = '';
-		}
-
-		return parent::scan( $text, $delimiters );
-	}
-}
diff --git a/php/utils.php b/php/utils.php
index 790bef7911..a976c57321 100644
--- a/php/utils.php
+++ b/php/utils.php
@@ -583,8 +583,6 @@ function mustache_render( $template_name, $data = [] ) {
 		]
 	);
 
-	$mustache->setTokenizer( new WP_CLI\Compat\MustacheTokenizer() );
-
 	return $mustache->render( $template, $data );
 }