Reformat + fix code style

Author: janbarasek

src/Engine.php

@@ -6,11 +6,11 @@
 
 
 use Mathematicator\Router\Router;
-use Mathematicator\SearchController\BaseController;
+use Mathematicator\SearchController\IController;
 use Nette\DI\Container;
 use Tracy\Debugger;
 
-class Engine
+final class Engine
 {
 
 	/**
@@ -36,41 +36,43 @@ public function __construct(Router $router, Container $container)
 	/**
 	 * @param string $query
 	 * @return EngineResult
+	 * @throws InvalidDataException
 	 */
 	public function compute(string $query): EngineResult
 	{
-		if (preg_match('/^(?<left>.+?)\s*vs\.?\s*(?<right>.+?)$/', $query, $versus)) {
-			$result = new EngineMultiResult($query, null);
-
-			$result->addResult($this->compute($versus['left']), 'left');
-			$result->addResult($this->compute($versus['right']), 'right');
-
-			return $result;
+		if (preg_match('/^(?<left>.+?)\s+vs\.?\s+(?<right>.+?)$/', $query, $versus)) {
+			return (new EngineMultiResult($query, null))
+				->addResult($this->compute($versus['left']), 'left')
+				->addResult($this->compute($versus['right']), 'right');
 		}
 
 		$callback = $this->router->routeQuery($query);
-		$callbackResult = $this->callCallback($query, $callback);
-
-		$result = new EngineSingleResult(
-			$query,
-			preg_replace('/^.+\\\\([^\\\\]+)$/', '$1', $callback),
-			$callbackResult === null ? null : $callbackResult->getInterpret(),
-			$callbackResult === null ? null : $callbackResult->getBoxes(),
-			$callbackResult === null ? [] : $callbackResult->getSources()
-		);
-		$result->setTime((int) round(Debugger::timer('search_request') * 1000));
-
-		return $result;
+		$matchedRoute = (string) preg_replace('/^.+\\\\([^\\\\]+)$/', '$1', $callback);
+
+		if ($result = $this->processCallback($query, $callback)) {
+			$return = new EngineSingleResult(
+				$query,
+				$matchedRoute,
+				$result->getInterpret(),
+				$result->getBoxes(),
+				$result->getSources()
+			);
+		} else {
+			$return = new EngineSingleResult($query, $matchedRoute);
+		}
+
+		return $return->setTime((int) round(Debugger::timer('search_request') * 1000));
 	}
 
 	/**
 	 * @param string $query
 	 * @param string $callback
-	 * @return BaseController|null
+	 * @return IController|null
+	 * @throws InvalidDataException
 	 */
-	private function callCallback(string $query, string $callback): ?BaseController
+	private function processCallback(string $query, string $callback): ?IController
 	{
-		/** @var BaseController|null $return */
+		/** @var IController|null $return */
 		$return = $this->serviceFactory->getByType($callback);
 
 		if ($return !== null) {
@@ -83,7 +85,7 @@ private function callCallback(string $query, string $callback): ?BaseController
 			}
 		}
 
-		return $return;
+		return $return ?? null;
 	}
 
 }

src/Entity/EngineMultiResult.php

@@ -38,8 +38,9 @@ public function getResult(string $name = null): EngineResult
 	/**
 	 * @param EngineResult $result
 	 * @param string|null $name
+	 * @return EngineMultiResult
 	 */
-	public function addResult(EngineResult $result, ?string $name = null): void
+	public function addResult(EngineResult $result, ?string $name = null): self
 	{
 		if ($name !== null) {
 			$this->results[$name] = $result;
@@ -48,6 +49,8 @@ public function addResult(EngineResult $result, ?string $name = null): void
 		}
 
 		$this->setTime($this->getTime() + $result->getTime());
+
+		return $this;
 	}
 
 }

src/Entity/EngineResult.php

@@ -72,10 +72,13 @@ public function getTime(): int
 
 	/**
 	 * @param int $time
+	 * @return EngineResult
 	 */
-	public function setTime(int $time): void
+	public function setTime(int $time): self
 	{
 		$this->time = $time;
+
+		return $this;
 	}
 
 }

src/Entity/EngineSingleResult.php

@@ -32,7 +32,7 @@ class EngineSingleResult extends EngineResult
 	 * @param Box[] $boxes
 	 * @param Source[] $sources
 	 */
-	public function __construct(string $query, string $matchedRoute, ?Box $interpret, array $boxes, array $sources = [])
+	public function __construct(string $query, string $matchedRoute, ?Box $interpret = null, array $boxes = [], array $sources = [])
 	{
 		parent::__construct($query, $matchedRoute);
 		$this->interpret = $interpret;

src/Entity/Source.php

@@ -19,7 +19,7 @@ class Source
 	private $title;
 
 	/**
-	 * @var \string[]
+	 * @var string[]
 	 */
 	private $authors = [];
 
@@ -86,7 +86,7 @@ public function setAuthor(string $author): void
 	}
 
 	/**
-	 * @param \string[] $authors
+	 * @param string[] $authors
 	 */
 	public function setAuthors(array $authors): void
 	{

src/Formatter/FixSpaces.php

@@ -11,7 +11,7 @@ class FixSpaces
 	/**
 	 * @var string[]
 	 */
-	private $rules = [
+	private static $rules = [
 		'(\s|;|^)(\w)\s' => '$1$2 ',
 		'(\d)\s(let|rok.*?|g|kg|m|mm|h|hod|hodi.+?|m|min|minu.+?|s|sekun.+?|sec|second|milio.+?|miliar.+?|kč|Kč|°)([^\w])' => '$1 $2$3',
 		'(\d)\s*(\%)' => '$1 $2',
@@ -22,27 +22,19 @@ class FixSpaces
 		'([§\*†©])\s' => '$1 ',
 	];
 
-	/**
-	 * @param array $rules
-	 */
-	public function __construct(array $rules = [])
-	{
-		$this->rules = $rules === [] ? $this->rules : array_merge($this->rules, $rules);
-	}
-
 	/**
 	 * @param string $content
 	 * @return mixed|string
 	 */
 	public function fix(string $content)
 	{
-		$content = preg_replace('/(\&nbsp\;|\s)+/', ' ', $content);
+		$content = (string) preg_replace('/(\&nbsp\;|\s)+/', ' ', $content);
 		$iterator = 0;
 
 		while (true) {
 			$origin = $content;
-			foreach ($this->rules as $pattern => $replacement) {
-				$content = preg_replace('/' . $pattern . '/', $replacement, $content);
+			foreach (self::$rules as $pattern => $replacement) {
+				$content = (string) preg_replace('/' . $pattern . '/', $replacement, $content);
 			}
 
 			$iterator++;

src/Helpers/Czech.php

@@ -49,5 +49,41 @@ public static function inflection(int $number, array $parameters): string
 		return $result;
 	}
 
+	/**
+	 * Return "6. září 2018"
+	 *
+	 * @param string|int|\DateTime $date
+	 * @param bool $singular (true => "5. květen 2018", false => "5. května 2018")
+	 * @return string
+	 */
+	public static function getDate($date = null, bool $singular = false): string
+	{
+		if ($date === null) {
+			$time = \time();
+		} elseif ($date instanceof \DateTime) {
+			$time = $date->getTimestamp();
+		} else {
+			$time = is_numeric($date) ? $date : @strtotime($date);
+		}
+
+		$months = [
+			'ledna', 'února', 'března', 'dubna', 'května',
+			'června', 'července', 'srpna', 'září', 'října',
+			'listopadu', 'prosince',
+		];
+
+		$singularMonths = [
+			'leden', 'únor', 'březen', 'duben', 'květen',
+			'červen', 'červenec', 'srpen', 'září', 'říjen',
+			'listopad', 'prosinec',
+		];
+
+		[$day, $month, $year] = explode('-', date('j-n-Y', (int) $time));
+
+		return $day . '. ' . ($singular === true
+				? $singularMonths[(int) $month - 1]
+				: $months[(int) $month - 1]
+			) . ' ' . $year;
+	}
 
 }