cs

ruleset.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<ruleset name="Spameri\ElasticQuery">
+<ruleset name="Spameri\Elastic">
 
 	<config name="installed_paths" value="../../slevomat/coding-standard,../../escapestudios/symfony2-coding-standard"/>
 
@@ -83,6 +83,10 @@
 	<!-- TypeHints -->
 	<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
 		<exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.IncorrectWhitespaceBetweenOpenTagAndDeclare"/>
+		<properties>
+			<property name="declareOnFirstLine" type="bool" value="true"/>
+			<property name="spacesCountAroundEqualsSign" type="int" value="1"/>
+		</properties>
 	</rule>
 	<rule ref="SlevomatCodingStandard.TypeHints.DisallowArrayTypeHintSyntax"/>
 	<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing" />
@@ -103,7 +107,7 @@
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
 		<properties>
 			<property name="rootNamespaces" type="array">
-				<element key="src" value="Spameri\ElasticQuery"/>
+				<element key="src" value="Spameri\Elastic"/>
 				<element key="tests/SpameriTests" value="SpameriTests"/>
 			</property>
 		</properties>

src/Commands/AddAlias.php

@@ -5,14 +5,17 @@
 class AddAlias extends \Symfony\Component\Console\Command\Command
 {
 
+	/**
+	 * @var string
+	 */
 	protected static $defaultName = 'spameri:elastic:add-alias';
 
 
 	public function __construct(
 		private readonly \Spameri\Elastic\Model\Indices\AddAlias $addAlias,
 	)
 	{
-		parent::__construct(NULL);
+		parent::__construct(null);
 	}
 
 

src/Commands/CreateIndex.php

@@ -4,7 +4,9 @@
 
 class CreateIndex extends \Symfony\Component\Console\Command\Command
 {
-
+	/**
+	 * @var string
+	 */
 	protected static $defaultName = 'spameri:elastic:create-index';
 
 
@@ -13,7 +15,7 @@ public function __construct(
 		private readonly \Spameri\Elastic\Model\DeleteIndex $deleteIndex,
 	)
 	{
-		parent::__construct(NULL);
+		parent::__construct(null);
 	}
 
 
@@ -26,7 +28,7 @@ protected function configure(): void
 			)
 			->addArgument('indexName', \Symfony\Component\Console\Input\InputArgument::REQUIRED)
 			->addOption(
-				'force', 'f', NULL,
+				'force', 'f', null,
 				'Warning this deletes your data! Forces now used index to be deleted before new index is created.',
 			)
 		;

src/Commands/DeleteIndex.php

@@ -5,14 +5,17 @@
 class DeleteIndex extends \Symfony\Component\Console\Command\Command
 {
 
+	/**
+	 * @var string
+	 */
 	protected static $defaultName = 'spameri:elastic:delete-index';
 
 
 	public function __construct(
 		private readonly \Spameri\Elastic\Model\Indices\Delete $delete,
 	)
 	{
-		parent::__construct(NULL);
+		parent::__construct(null);
 	}
 
 

src/Commands/DumpIndex.php

@@ -5,14 +5,17 @@
 class DumpIndex extends \Symfony\Component\Console\Command\Command
 {
 
+	/**
+	 * @var string
+	 */
 	protected static $defaultName = 'spameri:elastic:dump-index';
 
 
 	public function __construct(
 		private readonly \Spameri\Elastic\Model\DumpIndex $migrate,
 	)
 	{
-		parent::__construct(NULL);
+		parent::__construct(null);
 	}
 
 

src/Commands/InitializeIndexes.php

@@ -5,6 +5,9 @@
 class InitializeIndexes extends \Symfony\Component\Console\Command\Command
 {
 
+	/**
+	 * @var string
+	 */
 	protected static $defaultName = 'spameri:elastic:initialize-index';
 
 
@@ -14,7 +17,7 @@ public function __construct(
 		private readonly \Spameri\Elastic\Model\InitializeIndex $initializeIndex,
 	)
 	{
-		parent::__construct(NULL);
+		parent::__construct(null);
 	}
 
 
@@ -27,7 +30,7 @@ protected function configure(): void
 			)
 			->addArgument('entityName', \Symfony\Component\Console\Input\InputArgument::IS_ARRAY)
 			->addOption(
-				'force', 'f', NULL,
+				'force', 'f', null,
 				'Warning this deletes your data! Forces now used index to be deleted before new index is created.',
 			)
 		;
@@ -52,7 +55,7 @@ protected function execute(
 			$settings = $indexConfig->provide();
 
 			foreach ($entityNames as $entityName) {
-				if (\strpos($settings->indexName(), $entityName) === FALSE) {
+				if (\strpos($settings->indexName(), $entityName) === false) {
 					continue 2;
 				}
 			}

src/Commands/LoadDump.php

@@ -5,14 +5,17 @@
 class LoadDump extends \Symfony\Component\Console\Command\Command
 {
 
+	/**
+	 * @var string
+	 */
 	protected static $defaultName = 'spameri:elastic:load-dump';
 
 
 	public function __construct(
 		private readonly \Spameri\Elastic\Model\RestoreIndex $migrate,
 	)
 	{
-		parent::__construct(NULL);
+		parent::__construct(null);
 	}
 
 

src/Commands/RemoveAlias.php

@@ -5,14 +5,17 @@
 class RemoveAlias extends \Symfony\Component\Console\Command\Command
 {
 
+	/**
+	 * @var string
+	 */
 	protected static $defaultName = 'spameri:elastic:remove-alias';
 
 
 	public function __construct(
 		private readonly \Spameri\Elastic\Model\Indices\RemoveAlias $removeAlias,
 	)
 	{
-		parent::__construct(NULL);
+		parent::__construct(null);
 	}
 
 

src/Commands/TypeToNewIndex.php

@@ -5,14 +5,17 @@
 class TypeToNewIndex extends \Symfony\Component\Console\Command\Command
 {
 
+	/**
+	 * @var string
+	 */
 	protected static $defaultName = 'spameri:elastic:move-type';
 
 
 	public function __construct(
 		private readonly \Spameri\Elastic\Model\TypeToNewIndex\Migrate $migrate,
 	)
 	{
-		parent::__construct(NULL);
+		parent::__construct(null);
 	}
 
 
@@ -28,11 +31,11 @@ protected function configure(): void
 			->addArgument('typeFrom', \Symfony\Component\Console\Input\InputArgument::REQUIRED)
 			->addArgument('indexTo', \Symfony\Component\Console\Input\InputArgument::REQUIRED)
 			->addArgument('aliasTo', \Symfony\Component\Console\Input\InputArgument::REQUIRED)
-			->addArgument('typeTo', \Symfony\Component\Console\Input\InputArgument::OPTIONAL, 'Use only on old ElasticSearch', NULL)
+			->addArgument('typeTo', \Symfony\Component\Console\Input\InputArgument::OPTIONAL, 'Use only on old ElasticSearch', null)
 			->addOption(
 				'allowClose', 'c', \Symfony\Component\Console\Input\InputOption::VALUE_OPTIONAL,
 				'Allows command to close index for data transfer. After data is transferred index is opened and resumes normal operations. When open it needs to check changed files after move and sync remaining.',
-				TRUE,
+				true,
 			)
 		;
 	}

src/Model/Insert/PrepareEntityArray.php

@@ -7,6 +7,9 @@ class PrepareEntityArray
 
 	public const ENTITY_CLASS = 'entityClass';
 
+	/**
+	 * @var array<string, bool>
+	 */
 	private array $insertedEntities;
 
 
@@ -22,15 +25,15 @@ public function __construct(
 	 */
 	public function prepare(
 		\Spameri\Elastic\Entity\ElasticEntityInterface $entity,
-		bool $hasSti = FALSE,
+		bool $hasSti = false,
 	): array
 	{
 		$this->insertedEntities = [];
 		$this->insertedEntities[$entity->id()->value()] = true;
 
 		$entityVariables = $entity->entityVariables();
 		if ($hasSti === true) {
-			$entityVariables[self::ENTITY_CLASS] = \get_class($entity);
+			$entityVariables[self::ENTITY_CLASS] = $entity::class;
 		}
 
 		return $this->iterateVariables($entityVariables);
@@ -59,7 +62,7 @@ public function iterateVariables(
 
 			} elseif ($property instanceof \Spameri\Elastic\Entity\ElasticEntityInterface) {
 				throw new \Spameri\Elastic\Exception\DocumentInsertFailed(
-					'Entity ' . \get_class($property) . ' must be extend AbstractElasticEntity.'
+					'Entity ' . $property::class . ' must be extend AbstractElasticEntity.',
 				);
 
 			} elseif ($property instanceof \Spameri\Elastic\Entity\EntityInterface) {
@@ -72,7 +75,7 @@ public function iterateVariables(
 				$preparedArray[$key] = [];
 				foreach ($property as $item) {
 					$iterateVariables = $this->iterateVariables($item->entityVariables());
-					$iterateVariables[self::ENTITY_CLASS] = \get_class($item);
+					$iterateVariables[self::ENTITY_CLASS] = $item::class;
 					$preparedArray[$key][] = $iterateVariables;
 				}
 
@@ -119,7 +122,7 @@ public function iterateVariables(
 				|| \is_int($property)
 				|| \is_bool($property)
 				|| \is_float($property)
-				|| $property === NULL
+				|| $property === null
 			) {
 				$preparedArray[$key] = $property;
 
@@ -140,7 +143,7 @@ public function iterateVariables(
 			} else {
 				if (\is_object($property)) {
 					throw new \Spameri\Elastic\Exception\EntityIsNotValid(
-						'Property ' . $key . ' in ' . \get_class($property) . ' is not supported.',
+						'Property ' . $key . ' in ' . $property::class . ' is not supported.',
 					);
 				}
 

tests/SpameriTests/Elastic/Data/Model/VideoFactory.php

@@ -5,14 +5,10 @@
 class VideoFactory implements \Spameri\Elastic\Factory\EntityFactoryInterface
 {
 
-	private \SpameriTests\Elastic\Data\Model\PersonService $personService;
-
-
 	public function __construct(
-		\SpameriTests\Elastic\Data\Model\PersonService $personService,
+		private \SpameriTests\Elastic\Data\Model\PersonService $personService,
 	)
 	{
-		$this->personService = $personService;
 	}