Fix static analytics errors.

Author: janbarasek

src/Core/Analytics.php

@@ -35,9 +35,7 @@ public function save(string $query, int $results): void
 			Lock::stopTransaction($cacheKey);
 		} catch (\Throwable $e) {
 			Lock::stopTransaction($cacheKey);
-			if ($logger !== null) {
-				$logger->critical($e->getMessage(), ['exception' => $e]);
-			}
+			$logger?->critical($e->getMessage(), ['exception' => $e]);
 			return;
 		}
 
@@ -163,15 +161,19 @@ private function getSearchQuery(string $query, int $results): SearchQuery
 	 */
 	private function selectSearchQuery(string $query): SearchQuery
 	{
-		return (new EntityRepository(
+		$repository = new EntityRepository(
 			$this->entityManager,
 			$this->entityManager->getClassMetadata(SearchQuery::class),
-		))
+		);
+		$return = $repository
 			->createQueryBuilder('searchQuery')
 			->where('searchQuery.query = :query')
 			->setParameter('query', $query)
 			->setMaxResults(1)
 			->getQuery()
 			->getSingleResult();
+		assert($return instanceof SearchQuery);
+
+		return $return;
 	}
 }

src/Core/Core.php

@@ -98,13 +98,13 @@ public function processCandidateSearch(string $query, string $entity, array $col
 							$propertyRef->setAccessible(true);
 							$columnDatabaseValue = $propertyRef->getValue($candidateResult);
 						} catch (\ReflectionException $e) {
-							throw new \RuntimeException('Can not read property "' . $column . '" from "' . $candidateResultClass . '": ' . $e->getMessage(), (int) $e->getCode(), $e);
+							throw new \RuntimeException(sprintf('Can not read property "%s" from "%s": %s', $column, $candidateResultClass, $e->getMessage()), $e->getCode(), $e);
 						}
 					} elseif (isset($methodRef)) { // Call native method when contain only optional parameters
 						try {
 							$columnDatabaseValue = $methodRef->invoke($candidateResult);
 						} catch (\ReflectionException $e) {
-							throw new \LogicException($e->getMessage(), (int) $e->getCode(), $e);
+							throw new \LogicException($e->getMessage(), $e->getCode(), $e);
 						}
 					} else {
 						throw new \LogicException('Method "' . $getter . '" can not be called on "' . $candidateResultClass . '".');
@@ -113,7 +113,7 @@ public function processCandidateSearch(string $query, string $entity, array $col
 						$rawColumnValue = $this->hydrateColumnValue($columnDatabaseValue);
 					} catch (\InvalidArgumentException $e) {
 						throw new \InvalidArgumentException(
-							'Column "' . ($getterColumn ?? $column) . '" of entity "' . $entity . '" '
+							sprintf('Column "%s" of entity "%s" ', $getterColumn, $entity)
 							. 'can not be converted to string because the value is not scalar type.' . "\n"
 							. 'Advance info: ' . $e->getMessage(),
 						);
@@ -202,7 +202,6 @@ private function getColumnGetters(array $columns): array
 
 	private function getValueByRelation(string $column, ?object $candidateEntity = null): string
 	{
-		$getterValue = null;
 		$return = null;
 		$columnsIterator = 0;
 		$columns = explode('.', $column);

src/Core/SelectorBuilder.php

@@ -134,7 +134,7 @@ public function addColumn(string $column, ?string $entity = null, ?string $forma
 		}
 		if (isset($this->map[$entity][$column]) === false) {
 			assert(isset($this->map[$entity]));
-			$this->map[$entity][$column] = $format;
+			$this->map[$entity][$column] = $format ?? '';
 		}
 
 		return $this;

src/Entity/SearchQuery.php

@@ -20,7 +20,7 @@ class SearchQuery
 	#[ORM\Column(type: 'uuid', unique: true)]
 	#[ORM\GeneratedValue(strategy: 'CUSTOM')]
 	#[ORM\CustomIdGenerator(class: AnalyticsUuidGenerator::class)]
-	private string $id;
+	protected string $id;
 
 	#[ORM\Column(type: 'string', unique: true)]
 	private string $query;
@@ -44,7 +44,7 @@ class SearchQuery
 	public function __construct(string $query, int $results, int $score = 0)
 	{
 		$this->query = trim($query);
-		$this->results = $results < 0 ? 0 : $results;
+		$this->results = max($results, 0);
 		$this->setScore($score);
 		$this->insertedDate = new \DateTimeImmutable('now');
 	}