QueryNormalizer: Code optimalization and prepare for testing

Author: janbarasek

src/NumberRewriter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Model\Math;
 
 
@@ -113,24 +115,23 @@ class NumberRewriter
 	// --------------------------------------------------- To number ---------------------------------------------------
 
 	/**
-	 * @param string $word
+	 * @param string $haystack
 	 * @return string
 	 */
-	public function toNumber(string $word): string
+	public function toNumber(string $haystack): string
 	{
-		$word = trim(preg_replace('/\s+/', ' ', $word));
+		$haystack = trim(preg_replace('/\s+/', ' ', $haystack));
 
 		foreach ($this->regex as $key => $value) {
-			$word = preg_replace('/' . $key . '/', $value, $word);
+			$haystack = (string) preg_replace('/' . $key . '/', $value, $haystack);
 		}
 
-		foreach ($this->basic as $w => $n) {
-			if ($w === $word) {
-				return $n;
-			}
+		$return = '';
+		foreach (explode(' ', $haystack) as $word) {
+			$return .= $this->processWord($word) . ' ';
 		}
 
-		return $word;
+		return trim($return);
 	}
 
 	// ---------------------------------------------------- To word ----------------------------------------------------
@@ -152,8 +153,8 @@ public function toWord(string $number): string
 		}
 
 		foreach ($this->basic as $w => $n) {
-			if ((string) $n === $number) {
-				return $w;
+			if ($n === $number) {
+				return (string) $w;
 			}
 		}
 
@@ -269,4 +270,19 @@ private function smartInflect(int $number, string $for1, string $for234, string
 		return $forOther;
 	}
 
+	/**
+	 * @param string $word
+	 * @return string
+	 */
+	private function processWord(string $word): string
+	{
+		foreach ($this->basic as $basicWord => $basicRewrite) {
+			if ($basicWord === $word) {
+				return (string) $basicRewrite;
+			}
+		}
+
+		return $word;
+	}
+
 }

src/QueryNormalizer.php

@@ -17,11 +17,11 @@ class QueryNormalizer
 	private static $regexMap = [
 		'\s*(\#|\/\/).*$' => '',
 		'(\d)([,;])\s+(\d)' => '$1$2$3',
-//		'(\d|[a-z])\s+(\d|[a-z])' => '$1$2',
 		'(\d)\s+(\d)' => '$1$2',
 		'(\d)(\*{2,}|\˘)(\d)' => '$1^$3',
 		'(\d)\s*(\:|÷)\s*(\d)' => '$1/$3',
 		'(^|[^\d\,])(\d+)\,(\d+)($|[^\d\,])' => '$1$2.$3$4',
+		'(\d)\s+([a-z])' => '$1$2',
 		'\+\-' => '-',
 		'(\d+)\s*plus\s*(\d+)' => '$1+$2',
 		'(\d+)\s*(krát|krat)\s*(\d+)' => '$1*$3',
@@ -56,6 +56,8 @@ public function __construct(NumberRewriter $numberRewriter)
 	}
 
 	/**
+	 * Magic convertor of user input to normalized machine-readable form.
+	 *
 	 * @param string $query
 	 * @return string
 	 */
@@ -95,7 +97,7 @@ private function taskFixBrackets(string $query): string
 			$return = str_repeat('(', $rightCount - $leftCount) . $query;
 		}
 
-		$redundantBrackets = function (string $return): string {
+		$redundantBrackets = static function (string $return): string {
 			$returnInner = $return;
 			while (true) {
 				if (preg_match('/^\((?<content>.+)\)$/', $returnInner, $bracketParser)) {