Fix deprecated model namespaces + code style

Author: janbarasek

config.neon

@@ -2,7 +2,8 @@ services:
 	- Mathematicator\Engine\Engine
 	- Mathematicator\Engine\QueryNormalizer
 	- Mathematicator\Engine\Translator
-	- Model\Math\NumberRewriter
+	- Mathematicator\NumberRewriter
+	- Mathematicator\NaturalTextFormatter
 
 orm.annotations:
 	paths:

src/Entity/EngineMultiResult.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mathematicator\Engine;
 
 
@@ -27,7 +29,7 @@ public function getResults(): array
 	public function getResult(string $name = null): EngineResult
 	{
 		if (!isset($this->results[$name])) {
-			throw new NoResultsException('Result "' . $name . '" does not exists.');
+			throw new NoResultsException('Result "' . $name . '" does not exist.');
 		}
 
 		return $this->results[$name];

src/Entity/EngineSingleResult.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mathematicator\Engine;
 
 
@@ -21,7 +23,7 @@ class EngineSingleResult extends EngineResult
 	/**
 	 * @var Source[]
 	 */
-	private $sources = [];
+	private $sources;
 
 	/**
 	 * @param string $query

src/Exception/DivisionByZero.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mathematicator\Engine;
 
 
@@ -12,15 +14,13 @@ class DivisionByZero extends MathErrorException
 	private $fraction;
 
 	/**
-	 * DivisionByZero constructor.
-	 *
 	 * @param string $message
 	 * @param int $code
-	 * @param null $previous
-	 * @param string[] $fraction
-	 * @throws \Exception
+	 * @param \Exception|null $previous
+	 * @param array $fraction
+	 * @throws MathematicatorException
 	 */
-	public function __construct($message, $code = 0, $previous = null, array $fraction)
+	public function __construct(string $message, int $code = 0, \Exception $previous = null, array $fraction = [])
 	{
 		parent::__construct($message, $code, $previous);
 

src/Formatter/FixSpaces.php

@@ -1,6 +1,9 @@
 <?php
 
-namespace Model\Math;
+declare(strict_types=1);
+
+namespace Mathematicator;
+
 
 class FixSpaces
 {

src/Formatter/NaturalTextFormatter.php

@@ -1,19 +1,30 @@
 <?php
 
-namespace Model\Math;
+declare(strict_types=1);
+
+namespace Mathematicator;
+
 
 use Mathematicator\Engine\QueryNormalizer;
+use Mathematicator\Search\TextRenderer;
 use Mathematicator\Tokenizer\Tokenizer;
 use Nette\Utils\Strings;
-use Texy\Texy;
 
 class NaturalTextFormatter
 {
 
 	/**
-	 * @var Texy
+	 * @var string[]
 	 */
-	private $texy;
+	private static $allowedFunctions = [
+		'sin',
+		'cos',
+		'tan',
+		'cotan',
+		'tg',
+		'log\d*',
+		'sqrt',
+	];
 
 	/**
 	 * @var QueryNormalizer
@@ -26,21 +37,11 @@ class NaturalTextFormatter
 	private $tokenizer;
 
 	/**
-	 * @var string[]
+	 * @param QueryNormalizer $queryNormalizer
+	 * @param Tokenizer $tokenizer
 	 */
-	private $allowedFunctions = [
-		'sin',
-		'cos',
-		'tan',
-		'cotan',
-		'tg',
-		'log\d*',
-		'sqrt',
-	];
-
-	public function __construct(Texy $texy, QueryNormalizer $queryNormalizer, Tokenizer $tokenizer)
+	public function __construct(QueryNormalizer $queryNormalizer, Tokenizer $tokenizer)
 	{
-		$this->texy = $texy;
 		$this->queryNormalizer = $queryNormalizer;
 		$this->tokenizer = $tokenizer;
 	}
@@ -63,7 +64,7 @@ public function formatNaturalText(string $text): string
 
 					$return .= '<div class="latex"><p>\(' . $latex . '\)</p><code>' . $line . '</code></div>';
 				} else {
-					$return .= $this->texy->process($line) . "\n\n";
+					$return .= TextRenderer::process($line) . "\n\n";
 				}
 			}
 		}
@@ -79,10 +80,10 @@ private function containsWords(string $text): bool
 	{
 		$words = 0;
 
-		$text = preg_replace('/\s+/', ' ', Strings::toAscii(Strings::lower($text)));
+		$text = (string) preg_replace('/\s+/', ' ', Strings::toAscii(Strings::lower($text)));
 
 		while (true) {
-			$newText = preg_replace('/([a-z0-9]{2,})\s+([a-z0-9]{1,})(\s+|[:.!?,]|$)/', '$1$2', $text);
+			$newText = (string) preg_replace('/([a-z0-9]{2,})\s+([a-z0-9]{1,})(\s+|[:.!?,]|$)/', '$1$2', $text);
 			if ($newText === $text) {
 				break;
 			}
@@ -110,7 +111,7 @@ private function containsWords(string $text): bool
 	 */
 	private function wordInAllowedFunctions(string $word): bool
 	{
-		foreach ($this->allowedFunctions as $allowedFunction) {
+		foreach (self::$allowedFunctions as $allowedFunction) {
 			if (preg_match('/^' . $allowedFunction . '$/', $word)) {
 				return true;
 			}

src/NumberRewriter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Model\Math;
+namespace Mathematicator;
 
 
 use Mathematicator\Engine\MathematicatorException;

src/QueryNormalizer.php

@@ -5,7 +5,7 @@
 namespace Mathematicator\Engine;
 
 
-use Model\Math\NumberRewriter;
+use Mathematicator\NumberRewriter;
 use Nette\Utils\Strings;
 
 class QueryNormalizer

src/Translator.php

@@ -10,6 +10,11 @@
 class Translator implements ITranslator
 {
 
+	/**
+	 * @param mixed $message
+	 * @param mixed[] $parameters
+	 * @return string
+	 */
 	public function translate($message, ...$parameters): string
 	{
 		return (string) $message;

tests/QueryNormalizerTest.php

@@ -6,7 +6,7 @@
 
 
 use Mathematicator\Engine\QueryNormalizer;
-use Model\Math\NumberRewriter;
+use Mathematicator\NumberRewriter;
 use Tester\Assert;
 use Tester\TestCase;