SimpleCommandMap: extract command string parsing code into its own unit

src/command/SimpleCommandMap.php

@@ -64,6 +64,7 @@ use pocketmine\command\defaults\TransferServerCommand;
 use pocketmine\command\defaults\VanillaCommand;
 use pocketmine\command\defaults\VersionCommand;
 use pocketmine\command\defaults\WhitelistCommand;
+use pocketmine\command\utils\CommandStringHelper;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\Server;
@@ -72,9 +73,7 @@ use function array_shift;
 use function count;
 use function explode;
 use function implode;
-use function preg_match_all;
 use function strcasecmp;
-use function stripslashes;
 use function strpos;
 use function strtolower;
 use function trim;
@@ -197,16 +196,7 @@ class SimpleCommandMap implements CommandMap{
 	}
 
 	public function dispatch(CommandSender $sender, string $commandLine) : bool{
-		$args = [];
+		$args = CommandStringHelper::parseQuoteAware($commandLine);
-		preg_match_all('/"((?:\\\\.|[^\\\\"])*)"|(\S+)/u', $commandLine, $matches);
-		foreach($matches[0] as $k => $_){
-			for($i = 1; $i <= 2; ++$i){
-				if($matches[$i][$k] !== ""){
-					$args[$k] = $i === 1 ? stripslashes($matches[$i][$k]) : $matches[$i][$k];
-					break;
-				}
-			}
-		}
 
 		$sentCommandLabel = array_shift($args);
 		if($sentCommandLabel !== null && ($target = $this->getCommand($sentCommandLabel)) !== null){

src/command/utils/CommandStringHelper.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\command\utils;
+
+use function preg_match_all;
+use function stripslashes;
+
+final class CommandStringHelper{
+
+	private function __construct(){
+		//NOOP
+	}
+
+	/**
+	 * Parses a command string into its component parts. Parts of the string which are inside unescaped quotes are
+	 * considered as one argument.
+	 *
+	 * Examples:
+	 * - `give "steve jobs" apple` -> ['give', 'steve jobs', 'apple']
+	 * - `say "This is a \"string containing quotes\""` -> ['say', 'This is a "string containing quotes"']
+	 *
+	 * @return string[]
+	 * @phpstan-return list<string>
+	 */
+	public static function parseQuoteAware(string $commandLine) : array{
+		$args = [];
+		preg_match_all('/"((?:\\\\.|[^\\\\"])*)"|(\S+)/u', $commandLine, $matches);
+		foreach($matches[0] as $k => $_){
+			for($i = 1; $i <= 2; ++$i){
+				if($matches[$i][$k] !== ""){
+					$args[(int) $k] = $i === 1 ? stripslashes($matches[$i][$k]) : $matches[$i][$k];
+					break;
+				}
+			}
+		}
+
+		return $args;
+	}
+}