Stinger-Soft / EntitySearchBundle

Services/Mapping/DocumentToEntityMapper.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,10 @@
 	public function getEntity(Document $document) {
 		$clazz = $document->getEntityClass();
 		
-		if($clazz == null) {
+		if ($clazz == null) {
 			return null;
 		}
-		if(!$document->getEntityId()) {
+		if (!$document->getEntityId()) {
 			return null;
 		}
 		return $this->managerRegistry->getManagerForClass($clazz)->getRepository($clazz)->find($document->getEntityId());

Tests/application.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 // application.php
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 use StingerSoft\EntitySearchBundle\Command\ClearIndexCommand;
 use StingerSoft\EntitySearchBundle\Command\SyncCommand;

Tests/Command/SyncCommandTest.php

Spacing +2 added lines, -2 removed lines

@@ -43,8 +43,8 @@
 			'get' 
 		))->disableOriginalConstructor()->getMock();
 		
-		$container->method('get')->willReturnCallback(function ($serviceId) use ($that) {
-			switch($serviceId) {
+		$container->method('get')->willReturnCallback(function($serviceId) use ($that) {
+			switch ($serviceId) {
 				case 'kernel':
 					return $that;
 				case 'doctrine.orm.entity_manager':

Model/Query.php

Spacing +5 added lines, -5 removed lines

@@ -90,10 +90,10 @@ 
 	 * @return \Pec\Bundle\MtuDvpBundle\Entity\TestRiskValue
 	 */
 	public function __get($name) {
-		if(strrpos($name, 'facet_', -strlen($name)) !== false) {
+		if (strrpos($name, 'facet_', -strlen($name)) !== false) {
 			$facetname = substr($name, 6);
 			
-			if(isset($this->facets[$facetname])) {
+			if (isset($this->facets[$facetname])) {
 				return $this->facets[$facetname];
 			}
 			return array();
@@ -108,10 +108,10 @@ 
 	 *        	The value of the property
 	 */
 	public function __set($name, $value) {
-		if(strrpos($name, 'facet_', -strlen($name)) !== false) {
+		if (strrpos($name, 'facet_', -strlen($name)) !== false) {
 			$facetname = substr($name, 6);
 			
-			if(!isset($this->facets[$facetname])) {
+			if (!isset($this->facets[$facetname])) {
 				$this->facets[$facetname] = array();
 			}
 			$this->facets[$facetname] = $value;
@@ -125,7 +125,7 @@ 
 	 * @return boolean
 	 */
 	public function __isset($name) {
-		if(strrpos($name, 'facet_', -strlen($name)) !== false) {
+		if (strrpos($name, 'facet_', -strlen($name)) !== false) {
 			return true;
 		}
 		

Services/Mapping/EntityToDocumentMapper.php

Spacing +19 added lines, -19 removed lines

@@ -47,18 +47,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;
 			}
 			
@@ -73,10 +73,10 @@ 
 	 * @see \StingerSoft\EntitySearchBundle\Services\Mapping\EntityToDocumentMapperInterface::isIndexable()
 	 */
 	public function isIndexable($object) {
-		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;
@@ -90,10 +90,10 @@ 
 	 */
 	public function isClassIndexable($clazz) {
 		$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;
@@ -105,11 +105,11 @@ 
 	 * @see \StingerSoft\EntitySearchBundle\Services\Mapping\EntityToDocumentMapperInterface::createDocument()
 	 */
 	public function createDocument(ObjectManager $manager, $object) {
-		if(!$this->isIndexable($object))
+		if (!$this->isIndexable($object))
 			return false;
 		$document = $this->getSearchService($manager)->createEmptyDocumentFromEntity($object);
 		$index = $this->fillDocument($document, $object);
-		if($index == false)
+		if ($index == false)
 			return false;
 		
 		return $document;
@@ -123,12 +123,12 @@ 
 	 * @return boolean
 	 */
 	protected function fillDocument(Document &$document, $object) {
-		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;
@@ -141,15 +141,15 @@ 
 	 * @return \StingerSoft\EntitySearchBundle\Services\string[string]
 	 */
 	protected function getMapping($clazz) {
-		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);
 			}
 		}

DependencyInjection/StingerSoftEntitySearchExtension.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
 		$container->setParameter('stinger_soft.entity_search.available_facets', $config['facets']);
 
-		$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+		$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 		$loader->load('services.yml');
 		
 		$entityToDocumentMapperDefinition = $container->getDefinition(EntityToDocumentMapperInterface::SERVICE_ID);

Controller/SearchControllerTrait.php

Spacing +12 added lines, -12 removed lines

@@ -37,7 +37,7 @@ 
 
 
 	public function searchAction(Request $request) {
-		if($request->query->get('term', false) !== false) {
+		if ($request->query->get('term', false) !== false) {
 			$this->setSearchTerm($request->getSession(), $request->query->get('term'));
 			return $this->redirectToRoute('stinger_soft_entity_search_search');
 		}
@@ -53,8 +53,8 @@ 
 		));
 
 		$facetForm->handleRequest($request);
-		if($facetForm->isSubmitted()) {
-			if($facetForm->get('clear')->isClicked()) {
+		if ($facetForm->isSubmitted()) {
+			if ($facetForm->get('clear')->isClicked()) {
 				$query->setFacets($this->getDefaultFacets());
 			}
 			$this->setSearchTerm($request->getSession(), $query->getSearchTerm());
@@ -70,7 +70,7 @@ 
 
 		$page = $request->query->get('page', 1);
 		$results = array();
-		if($result instanceof PaginatableResultSet) {
+		if ($result instanceof PaginatableResultSet) {
 			$results = $result->paginate($page, $this->getResultsPerPage());
 		} else {
 			$results = $result->getResults(($page - 1) * $this->getResultsPerPage(), $this->getResultsPerPage());
@@ -88,7 +88,7 @@ 
 	protected function getConfiguredUsedFacets(array $queryUsedFacets) {
 		$availableFacets = $this->getAvailableFacets();
 		$usedFacets = array();
-		foreach($queryUsedFacets as $queryUsedFacet) {
+		foreach ($queryUsedFacets as $queryUsedFacet) {
 			$usedFacets[$queryUsedFacet] = $availableFacets[$queryUsedFacet];
 		}
 		return $usedFacets;
@@ -152,16 +152,16 @@ 
 
 
 	protected function initFacets() {
-		if(!$this->availableFacets) {
+		if (!$this->availableFacets) {
 			$this->availableFacets = array();
 			$this->facetFormatter = array();
 
 			$facetServices = $this->getParameter('stinger_soft.entity_search.available_facets');
-			foreach($facetServices as $facetServiceId) {
+			foreach ($facetServices as $facetServiceId) {
 				/** @var FacetServiceInterface $facetService */
 				$facetService = $this->get($facetServiceId);
 				$this->availableFacets[$facetService->getField()] = $facetService->getFormOptions();
-				if($facetService->getFacetFormatter()) {
+				if ($facetService->getFacetFormatter()) {
 					$this->facetFormatter[$facetService->getField()] = $facetService->getFacetFormatter();
 				}
 			}
@@ -175,7 +175,7 @@ 
 	 * @return string[string][]
 	 */
 	protected function getSearchFacets(SessionInterface $session) {
-		$facets = $session->get($this->getSessionPrefix() . '_facets', false);
+		$facets = $session->get($this->getSessionPrefix().'_facets', false);
 		return $facets ? json_decode($facets, true) : $this->getDefaultFacets();
 	}
 
@@ -186,7 +186,7 @@ 
 	 * @param string[string][] $facets
 	 */
 	protected function setSearchFacets(SessionInterface $session, $facets) {
-		$session->set($this->getSessionPrefix() . '_facets', json_encode($facets));
+		$session->set($this->getSessionPrefix().'_facets', json_encode($facets));
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 	 * @return mixed
 	 */
 	protected function getSearchTerm(SessionInterface $session) {
-		return $session->get($this->getSessionPrefix() . '_term', false);
+		return $session->get($this->getSessionPrefix().'_term', false);
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 * @param string $term
 	 */
 	protected function setSearchTerm(SessionInterface $session, $term) {
-		$session->set($this->getSessionPrefix() . '_term', $term);
+		$session->set($this->getSessionPrefix().'_term', $term);
 	}
 
 	/**

Command/SyncCommand.php

Spacing +17 added lines, -17 removed lines

@@ -69,15 +69,15 @@ 
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		// Detect upload path
-		if(!self::$defaultUploadPath) {
+		if (!self::$defaultUploadPath) {
 			$root = $this->getContainer()->get('kernel')->getRootDir();
-			self::$defaultUploadPath = $root . '/../web/uploads';
+			self::$defaultUploadPath = $root.'/../web/uploads';
 		}
 
 		// Get the entity argument
 		$entity = $input->getArgument('entity');
 
-		if($entity == 'all') {
+		if ($entity == 'all') {
 			/**
 			 * @var EntityManager $entityManager
 			 */
@@ -93,12 +93,12 @@ 
 			/**
 			 * @var ClassMetadata $m
 			 */
-			foreach($meta as $m) {
+			foreach ($meta as $m) {
 
-				if($m->getReflectionClass()->isAbstract() || $m->getReflectionClass()->isInterface()) {
+				if ($m->getReflectionClass()->isAbstract() || $m->getReflectionClass()->isInterface()) {
 					continue;
 				}
-				if(!$mapper->isClassIndexable($m->getReflectionClass()->getName())) {
+				if (!$mapper->isClassIndexable($m->getReflectionClass()->getName())) {
 					continue;
 				}
 				$this->indexEntity($input, $output, $m->getReflectionClass()->getName());
@@ -119,7 +119,7 @@ 
 		try {
 			// Get repository for the given entity type
 			$repository = $entityManager->getRepository($entity);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$output->writeln(sprintf('<error>No repository found for "%s", check your input</error>', $entity));
 			return;
 		}
@@ -132,7 +132,7 @@ 
 		$useBatch = !($entityManager->getConnection()->getDatabasePlatform() instanceof SQLServerPlatform);
 
 		$iterableResult = $useBatch ? $queryBuilder->getQuery()->iterate() : $queryBuilder->getQuery()->getResult();
-		if($entityCount == 0) {
+		if ($entityCount == 0) {
 			$output->writeln('<comment>No entities found for indexing</comment>');
 			return;
 		}
@@ -140,18 +140,18 @@ 
 		$entitiesIndexed = 0;
 
 		// Index each entity separate
-		foreach($iterableResult as $row) {
+		foreach ($iterableResult as $row) {
 			$entity = $useBatch ? $row[0] : $row;
-			if($this->getEntityToDocumentMapper()->isIndexable($entity)) {
+			if ($this->getEntityToDocumentMapper()->isIndexable($entity)) {
 				$document = $this->getEntityToDocumentMapper()->createDocument($entityManager, $entity);
-				if($document === false) continue;
+				if ($document === false) continue;
 				try {
 					$this->getSearchService($entityManager)->saveDocument($document);
 					$entitiesIndexed++;
-				} catch(\Exception $e) {
-					$output->writeln('<error>Failed to index entity with ID ' . $document->getEntityId() . '</error>');
+				} catch (\Exception $e) {
+					$output->writeln('<error>Failed to index entity with ID '.$document->getEntityId().'</error>');
 				}
-				if($entitiesIndexed % 50 == 0) {
+				if ($entitiesIndexed % 50 == 0) {
 					$entityManager->flush();
 				}
 			}
@@ -159,7 +159,7 @@ 
 		}
 		$entityManager->flush();
 		$entityManager->clear();
-		$output->writeln('<comment>Indexed ' . $entitiesIndexed . ' entities</comment>');
+		$output->writeln('<comment>Indexed '.$entitiesIndexed.' entities</comment>');
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 * @return EntityToDocumentMapperInterface
 	 */
 	protected function getEntityToDocumentMapper() {
-		if(!$this->entityToDocumentMapper) {
+		if (!$this->entityToDocumentMapper) {
 			$this->entityToDocumentMapper = $this->getContainer()->get(EntityToDocumentMapperInterface::SERVICE_ID);
 		}
 		return $this->entityToDocumentMapper;
@@ -178,7 +178,7 @@ 
 	 * @return SearchService
 	 */
 	protected function getSearchService(ObjectManager $manager) {
-		if(!$this->searchService) {
+		if (!$this->searchService) {
 			$this->searchService = $this->getContainer()->get(SearchService::SERVICE_ID);
 		}
 		$this->searchService->setObjectManager($manager);

Form/QueryType.php

Spacing +18 added lines, -18 removed lines

@@ -53,26 +53,26 @@ 
 		$maxChoiceGroupCount = $options['max_choice_group_count'];
 		$data = array();
 		
-		if($usedFacets && !$result) {
+		if ($usedFacets && !$result) {
 			$data = array();
-			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,
 					'allow_extra_fields' => true,
-					'preferred_choices' => function ($val) use ($preferredChoices, $data, $facetType, $maxChoiceGroupCount, &$i) {
-						return $i++ < $maxChoiceGroupCount || $maxChoiceGroupCount == 0 || in_array($val, $preferredChoices) || (isset($data['facet_' . $facetType]) && in_array($val, $data['facet_' . $facetType]));
+					'preferred_choices' => function($val) use ($preferredChoices, $data, $facetType, $maxChoiceGroupCount, &$i) {
+						return $i++ < $maxChoiceGroupCount || $maxChoiceGroupCount == 0 || in_array($val, $preferredChoices) || (isset($data['facet_'.$facetType]) && in_array($val, $data['facet_'.$facetType]));
 					} 
 				), $facetTypeOptions));
 				unset($i);
 			}
 		}
-		if($result) {
-			$builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($options, $result) {
+		if ($result) {
+			$builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($options, $result) {
 				$this->createFacets($event->getForm(), $result->getFacets(), $options, $event->getData());
 			});
 		}
@@ -111,19 +111,19 @@ 
 		$selectedFacets = $data->getFacets();
 		$usedFacets = $options['used_facets'];
 		
-		foreach($facets->getFacets() as $facetType => $facetValues) {
+		foreach ($facets->getFacets() as $facetType => $facetValues) {
 			$preferredChoices = isset($preferredFilterChoices[$facetType]) ? $preferredFilterChoices[$facetType] : array();
 			
 			$i = 0;
 			$facetTypeOptions = isset($usedFacets[$facetType]) ? $usedFacets[$facetType] : [];
 			$formatter = isset($options['facet_formatter'][$facetType]) ? $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,
 				'allow_extra_fields' => true,
 				'choices' => $this->generateFacetChoices($facetType, $facetValues, isset($selectedFacets[$facetType]) ? $selectedFacets[$facetType] : array(), $formatter),
-				'preferred_choices' => function ($val) use ($preferredChoices, $selectedFacets, $facetType, $maxChoiceGroupCount, &$i) {
+				'preferred_choices' => function($val) use ($preferredChoices, $selectedFacets, $facetType, $maxChoiceGroupCount, &$i) {
 					return $i++ < $maxChoiceGroupCount || $maxChoiceGroupCount == 0 || in_array($val, $preferredChoices) || (isset($selectedFacets[$facetType]) && in_array($val, $selectedFacets[$facetType]));
 				} 
 			), $facetTypeOptions));
@@ -138,13 +138,13 @@ 
 	 */
 	protected function generateFacetChoices($facetType, array $facets, array $selectedFacets = array(), $formatter) {
 		$choices = array();
-		foreach($facets as $facet => $count) {
-			if($count == 0 && !in_array($facet, $selectedFacets))
+		foreach ($facets as $facet => $count) {
+			if ($count == 0 && !in_array($facet, $selectedFacets))
 				continue;
 			$choices[$this->formatFacet($formatter, $facetType, $facet, $count)] = $facet;
 		}
-		foreach($selectedFacets as $facet) {
-			if(isset($facets[$facet])) continue;
+		foreach ($selectedFacets as $facet) {
+			if (isset($facets[$facet])) continue;
 			$count = 0;
 			$choices[$this->formatFacet($formatter, $facetType, $facet, $count)] = $facet;
 		}
@@ -152,8 +152,8 @@ 
 	}
 	
 	protected function formatFacet($formatter, $facetType, $facet, $count) {
-		$default = $facet . ' (' . $count . ')';
-		if(!$formatter) {
+		$default = $facet.' ('.$count.')';
+		if (!$formatter) {
 			return $default;
 		}
 		return call_user_func($formatter, $facetType, $facet, $count, $default);