Stinger-Soft / EntitySearchBundle

DependencyInjection/Compiler/FacetCompilerPass.php

Spacing +3 added lines, -3 removed lines

@@ -16,13 +16,13 @@ 
 	 * @param ContainerBuilder $container
 	 */
 	public function process(ContainerBuilder $container) {
-		if(!$container->hasAlias(SearchService::class)) {
+		if (!$container->hasAlias(SearchService::class)) {
 			return;
 		}
 
 		$serviceId = (string)$container->getAlias(SearchService::class);
 
-		if(!$container->hasDefinition($serviceId)) {
+		if (!$container->hasDefinition($serviceId)) {
 			return;
 		}
 
@@ -30,7 +30,7 @@ 
 
 		$servicesMap = array();
 		// Builds an array with fully-qualified type class names as keys and service IDs as values
-		foreach($container->findTaggedServiceIds(FacetServiceInterface::TAG_NAME, true) as $serviceId => $tag) {
+		foreach ($container->findTaggedServiceIds(FacetServiceInterface::TAG_NAME, true) as $serviceId => $tag) {
 			// Add form type service to the service locator
 			$serviceDefinition = $container->getDefinition($serviceId);
 			$servicesMap[$serviceDefinition->getClass()] = new Reference($serviceId);

DependencyInjection/Configuration.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	 */
 	public function getConfigTreeBuilder() {
 		$treeBuilder = new TreeBuilder('stinger_soft_entity_search');
-		if(Kernel::VERSION_ID < 40200) {
+		if (Kernel::VERSION_ID < 40200) {
 			$root = $treeBuilder->root('stinger_soft_entity_search');
 		} else {
 			$root = $treeBuilder->getRootNode();

Form/FacetChoiceLoader.php

Spacing +4 added lines, -4 removed lines

@@ -41,9 +41,9 @@ 
 	public function loadValuesForChoices(array $choices, $value = null): array {
 		// is called on form creat with $choices containing the preset of the bound entity
 		$values = array();
-		foreach($choices as $key => $choice) {
+		foreach ($choices as $key => $choice) {
 			// we use a DataTransformer, thus only plain values arrive as choices which can be used directly as value
-			if(is_callable($value)) {
+			if (is_callable($value)) {
 				$values[$key] = (string)call_user_func($value, $choice, $key);
 			} else {
 				$values[$key] = $choice;
@@ -87,9 +87,9 @@ 
 	public function loadChoicesForValues(array $values, $value = null): array {
 		// is called on form submit after loadValuesForChoices of form create and loadChoiceList of form view create
 		$choices = array();
-		foreach($values as $key => $val) {
+		foreach ($values as $key => $val) {
 			// we use a DataTransformer, thus only plain values arrive as choices which can be used directly as value
-			if(is_callable($value)) {
+			if (is_callable($value)) {
 				$choices[$key] = (string)call_user_func($value, $val, $key);
 			} else {
 				$choices[$key] = $val;

Form/FacetType.php

Spacing +3 added lines, -3 removed lines

@@ -32,12 +32,12 @@
 		$builder->resetModelTransformers();
 		$builder->resetViewTransformers();
 		
-		if($options['multiple']) {
-			$builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+		if ($options['multiple']) {
+			$builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
 				$event->stopPropagation();
 			}, 1);
 		}
-		$builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) {
+		$builder->addEventListener(FormEvents::SUBMIT, function(FormEvent $event) {
 			$data = $event->getForm()->getExtraData();
 			//$event->setData(array_unique(array_merge($data, $event->getData())));
 			$event->setData($data);

Form/QueryType.php

Spacing +15 added lines, -15 removed lines

@@ -55,25 +55,25 @@ 
 		$preferredFilterChoices = $options['preferred_filter_choices'];
 		$maxChoiceGroupCount = (int)$options['max_choice_group_count'];
 
-		if($usedFacets && !$result) {
+		if ($usedFacets && !$result) {
 			$data = [];
-			foreach($usedFacets as $facetType => $facetTypeOptions) {
+			foreach ($usedFacets as $facetType => $facetTypeOptions) {
 				$facetTypeOptions = is_array($facetTypeOptions) ? $facetTypeOptions : [];
 				$preferredChoices = $preferredFilterChoices[$facetType] ?? [];
 				$i = 0;
-				$builder->add('facet_' . $facetType, FacetType::class, array_merge(array(
-					'label'             => 'stinger_soft_entity_search.forms.query.' . $facetType . '.label',
+				$builder->add('facet_'.$facetType, FacetType::class, array_merge(array(
+					'label'             => 'stinger_soft_entity_search.forms.query.'.$facetType.'.label',
 					'multiple'          => true,
 					'expanded'          => true,
 					'preferred_choices' => function($val) use ($preferredChoices, $data, $facetType, $maxChoiceGroupCount, &$i) {
-						$facetKey = 'facet_' . $facetType;
+						$facetKey = 'facet_'.$facetType;
 						return $i++ < $maxChoiceGroupCount || $maxChoiceGroupCount === 0 || \in_array($val, $preferredChoices) || (isset($data[$facetKey]) && \in_array($val, $data[$facetKey]));
 					}
 				), $facetTypeOptions));
 				unset($i);
 			}
 		}
-		if($result) {
+		if ($result) {
 			$builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($options, $result) {
 				$this->createFacets($event->getForm(), $result->getFacets(), $options, $event->getData());
 			});
@@ -137,14 +137,14 @@ 
 		$selectedFacets = $data->getFacets();
 		$usedFacets = $options['used_facets'];
 
-		foreach($facets->getFacets() as $facetType => $facetValues) {
+		foreach ($facets->getFacets() as $facetType => $facetValues) {
 			$preferredChoices = $preferredFilterChoices[$facetType] ?? [];
 
 			$i = 0;
 			$facetTypeOptions = $usedFacets[$facetType] ?? [];
 			$formatter = $options['facet_formatter'][$facetType] ?? null;
-			$builder->add('facet_' . $facetType, FacetType::class, array_merge(array(
-				'label'             => 'stinger_soft_entity_search.forms.query.' . $facetType . '.label',
+			$builder->add('facet_'.$facetType, FacetType::class, array_merge(array(
+				'label'             => 'stinger_soft_entity_search.forms.query.'.$facetType.'.label',
 				'multiple'          => true,
 				'expanded'          => true,
 				'choices'           => $this->generateFacetChoices($facetType, $facetValues, $selectedFacets[$facetType] ?? [], $formatter),
@@ -166,16 +166,16 @@ 
 	 */
 	protected function generateFacetChoices($facetType, array $facets, array $selectedFacets = [], callable $formatter = null): array {
 		$choices = [];
-		foreach($facets as $facet => $data) {
+		foreach ($facets as $facet => $data) {
 			$value = $data['value'];
 			$count = $data['count'];
-			if($count === 0 && !\in_array($facet, $selectedFacets)) {
+			if ($count === 0 && !\in_array($facet, $selectedFacets)) {
 				continue;
 			}
 			$choices[$this->formatFacet($formatter, $facetType, $facet, $value, $count)] = $facet;
 		}
-		foreach($selectedFacets as $facet) {
-			if(isset($facets[$facet])) {
+		foreach ($selectedFacets as $facet) {
+			if (isset($facets[$facet])) {
 				continue;
 			}
 			$value = $facets[$facet]['value'];
@@ -194,8 +194,8 @@ 
 	 * @return string
 	 */
 	protected function formatFacet($formatter, $facetType, $facet, $value, $count):string {
-		$default = $facet . ' (' . $count . ')';
-		if(!$formatter) {
+		$default = $facet.' ('.$count.')';
+		if (!$formatter) {
 			return $default;
 		}
 		return $formatter($facetType, $value, $count, $default);

Services/Mapping/DocumentToEntityMapper.php

Spacing +3 added lines, -3 removed lines

@@ -35,14 +35,14 @@
 	public function getEntity(Document $document) : ?object {
 		$clazz = $document->getEntityClass();
 		
-		if($clazz === null) {
+		if ($clazz === null) {
 			return null;
 		}
-		if(!$document->getEntityId()) {
+		if (!$document->getEntityId()) {
 			return null;
 		}
 		$manager = $this->managerRegistry->getManagerForClass($clazz);
-		if($manager === null) {
+		if ($manager === null) {
 			return null;
 		}
 		return $manager->getRepository($clazz)->find($document->getEntityId());

Services/Mapping/EntityToDocumentMapper.php

Spacing +19 added lines, -19 removed lines

@@ -48,18 +48,18 @@ 
 	 */
 	public function __construct(SearchService $searchService, array $mapping = array()) {
 		$this->searchService = $searchService;
-		foreach($mapping as $key => $config) {
-			if(!isset($config['mappings'])) {
-				throw new \InvalidArgumentException($key . ' has no mapping defined!');
+		foreach ($mapping as $key => $config) {
+			if (!isset($config['mappings'])) {
+				throw new \InvalidArgumentException($key.' has no mapping defined!');
 			}
-			if(!isset($config['persistence'])) {
-				throw new \InvalidArgumentException($key . ' has no persistence defined!');
+			if (!isset($config['persistence'])) {
+				throw new \InvalidArgumentException($key.' has no persistence defined!');
 			}
-			if(!isset($config['persistence']['model'])) {
-				throw new \InvalidArgumentException($key . ' has no model defined!');
+			if (!isset($config['persistence']['model'])) {
+				throw new \InvalidArgumentException($key.' has no model defined!');
 			}
 			$map = array();
-			foreach($config['mappings'] as $fieldKey => $fieldConfig) {
+			foreach ($config['mappings'] as $fieldKey => $fieldConfig) {
 				$map[$fieldKey] = isset($fieldConfig['propertyPath']) && $fieldConfig['propertyPath'] ? $fieldConfig['propertyPath'] : $fieldKey;
 			}
 			
@@ -74,10 +74,10 @@ 
 	 * @see \StingerSoft\EntitySearchBundle\Services\Mapping\EntityToDocumentMapperInterface::isIndexable()
 	 */
 	public function isIndexable(object $object) : bool {
-		if($object instanceof SearchableEntity) {
+		if ($object instanceof SearchableEntity) {
 			return true;
 		}
-		if(count($this->getMapping(get_class($object))) > 0) {
+		if (count($this->getMapping(get_class($object))) > 0) {
 			return true;
 		}
 		return false;
@@ -92,10 +92,10 @@ 
 	 */
 	public function isClassIndexable(string $clazz) : bool {
 		$reflectionClass = new \ReflectionClass($clazz);
-		if(array_key_exists(SearchableEntity::class, $reflectionClass->getInterfaces())) {
+		if (array_key_exists(SearchableEntity::class, $reflectionClass->getInterfaces())) {
 			return true;
 		}
-		if(count($this->getMapping($clazz)) > 0) {
+		if (count($this->getMapping($clazz)) > 0) {
 			return true;
 		}
 		return false;
@@ -107,11 +107,11 @@ 
 	 * @see \StingerSoft\EntitySearchBundle\Services\Mapping\EntityToDocumentMapperInterface::createDocument()
 	 */
 	public function createDocument(ObjectManager $manager, object $object) : ?Document {
-		if(!$this->isIndexable($object))
+		if (!$this->isIndexable($object))
 			return null;
 		$document = $this->searchService->createEmptyDocumentFromEntity($object);
 		$index = $this->fillDocument($document, $object);
-		if($index === false)
+		if ($index === false)
 			return null;
 		
 		return $document;
@@ -125,12 +125,12 @@ 
 	 * @return boolean
 	 */
 	protected function fillDocument(Document $document, object $object) : bool {
-		if($object instanceof SearchableEntity) {
+		if ($object instanceof SearchableEntity) {
 			return $object->indexEntity($document);
 		}
 		$mapping = $this->getMapping(\get_class($object));
 		$accessor = PropertyAccess::createPropertyAccessor();
-		foreach($mapping as $fieldName => $propertyPath) {
+		foreach ($mapping as $fieldName => $propertyPath) {
 			$document->addField($fieldName, $accessor->getValue($object, $propertyPath));
 		}
 		return true;
@@ -143,15 +143,15 @@ 
 	 * @throws \ReflectionException
 	 */
 	protected function getMapping(string $clazz) : array {
-		if(isset($this->cachedMapping[$clazz])) {
+		if (isset($this->cachedMapping[$clazz])) {
 			return $this->cachedMapping[$clazz];
 		}
 		$ref = new \ReflectionClass($clazz);
 		
 		$mapping = array();
 		
-		foreach($this->mapping as $className => $config) {
-			if($clazz === $className || $ref->isSubclassOf($className)) {
+		foreach ($this->mapping as $className => $config) {
+			if ($clazz === $className || $ref->isSubclassOf($className)) {
 				$mapping = \array_merge($mapping, $config);
 			}
 		}

Braces +6 added lines, -4 removed lines

@@ -107,12 +107,14 @@
 	 * @see \StingerSoft\EntitySearchBundle\Services\Mapping\EntityToDocumentMapperInterface::createDocument()
 	 */
 	public function createDocument(ObjectManager $manager, object $object) : ?Document {
-		if(!$this->isIndexable($object))
-			return null;
+		if(!$this->isIndexable($object)) {
+					return null;
+		}
 		$document = $this->searchService->createEmptyDocumentFromEntity($object);
 		$index = $this->fillDocument($document, $object);
-		if($index === false)
-			return null;
+		if($index === false) {
+					return null;
+		}
 		
 		return $document;
 	}

Services/DoctrineListener.php

Spacing +8 added lines, -8 removed lines

@@ -95,7 +95,7 @@ 
 	 * @param LifecycleEventArgs $args
 	 */
 	public function postPersist(LifecycleEventArgs $args): void {
-		if(!$this->enableIndexing) {
+		if (!$this->enableIndexing) {
 			return;
 		}
 		$this->updateEntity($args->getObject(), $args->getObjectManager());
@@ -107,7 +107,7 @@ 
 	 * @throws \Doctrine\ORM\OptimisticLockException
 	 */
 	public function postFlush(PostFlushEventArgs $eventArgs): void {
-		if($this->needsFlush) {
+		if ($this->needsFlush) {
 			$this->needsFlush = false;
 			$eventArgs->getEntityManager()->flush();
 		}
@@ -119,7 +119,7 @@ 
 	 * @param LifecycleEventArgs $args
 	 */
 	public function preRemove(LifecycleEventArgs $args): void {
-		if(!$this->enableIndexing) {
+		if (!$this->enableIndexing) {
 			return;
 		}
 		$this->removeEntity($args->getObject(), $args->getObjectManager());
@@ -131,7 +131,7 @@ 
 	 * @param LifecycleEventArgs $args
 	 */
 	public function postUpdate(LifecycleEventArgs $args): void {
-		if(!$this->enableIndexing) return;
+		if (!$this->enableIndexing) return;
 		$this->updateEntity($args->getObject(), $args->getObjectManager());
 	}
 
@@ -156,11 +156,11 @@ 
 	 * @param object $entity
 	 */
 	protected function updateEntity(object $entity, ObjectManager $manager): void {
-		if($entity instanceof SearchableAlias) {
+		if ($entity instanceof SearchableAlias) {
 			$entity = $entity->getEntityToIndex();
 		}
 		$document = $this->getEntityToDocumentMapper()->createDocument($manager, $entity);
-		if($document !== null) {
+		if ($document !== null) {
 			$this->getSearchService()->saveDocument($document);
 			$this->needsFlush = true;
 		}
@@ -171,11 +171,11 @@ 
 	 * @param object $entity
 	 */
 	protected function removeEntity(object $entity, ObjectManager $manager): void {
-		if($entity instanceof SearchableAlias) {
+		if ($entity instanceof SearchableAlias) {
 			$entity = $entity->getEntityToIndex();
 		}
 		$document = $this->getEntityToDocumentMapper()->createDocument($manager, $entity);
-		if($document !== null) {
+		if ($document !== null) {
 			$this->getSearchService()->removeDocument($document);
 			$this->needsFlush = true;
 		}

Braces +3 added lines, -1 removed lines

@@ -131,7 +131,9 @@
 	 * @param LifecycleEventArgs $args
 	 */
 	public function postUpdate(LifecycleEventArgs $args): void {
-		if(!$this->enableIndexing) return;
+		if(!$this->enableIndexing) {
+			return;
+		}
 		$this->updateEntity($args->getObject(), $args->getObjectManager());
 	}
 

Services/DummySearchService.php

Spacing +9 added lines, -9 removed lines

@@ -66,9 +66,9 @@ 
 	 */
 	public function autocomplete(string $search, int $maxResults = 10): array {
 		$words = array();
-		foreach($this->index as $doc) {
-			foreach($doc->getFields() as $content) {
-				if(is_string($content)) {
+		foreach ($this->index as $doc) {
+			foreach ($doc->getFields() as $content) {
+				if (is_string($content)) {
 					$words = array_merge($words, explode(' ', $content));
 				}
 			}
@@ -92,10 +92,10 @@ 
 		$facets = new FacetSetAdapter();
 
 		$hits = array();
-		foreach($this->index as $key => $doc) {
-			foreach($doc->getFields() as $content) {
-				if(is_string($content) && stripos($content, $term) !== false) {
-					if(!isset($hits[$key])) {
+		foreach ($this->index as $key => $doc) {
+			foreach ($doc->getFields() as $content) {
+				if (is_string($content) && stripos($content, $term) !== false) {
+					if (!isset($hits[$key])) {
 						$hits[$key] = 0;
 					}
 					$hits[$key] = $hits[$key] + 1;
@@ -104,7 +104,7 @@ 
 		}
 		arsort($hits);
 		$results = array();
-		foreach(array_keys($hits) as $docId) {
+		foreach (array_keys($hits) as $docId) {
 			$doc = $this->index[$docId];
 			$facets->addFacetValue(FacetSet::FACET_ENTITY_TYPE, $doc->getEntityClass());
 			$facets->addFacetValue(FacetSet::FACET_AUTHOR, (string)$doc->getFieldValue(Document::FIELD_AUTHOR));
@@ -131,7 +131,7 @@ 
 		$id = $document->getEntityClass();
 		$id .= '#';
 		$entityId = $document->getEntityId();
-		if(is_scalar($entityId)) {
+		if (is_scalar($entityId)) {
 			$id .= $entityId;
 		} else {
 			$id .= md5(serialize($entityId));