Stinger-Soft / EntitySearchBundle

Tests/AbstractORMTestCase.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 		);
 		$config = null === $config ? $this->getMockAnnotatedConfig() : $config;
 		$em = EntityManager::create($conn, $config, $evm ?: $this->getEventManager());
-		$schema = array_map(function ($class) use ($em) {
+		$schema = array_map(function($class) use ($em) {
 			return $em->getClassMetadata($class);
 		}, (array)$this->getUsedEntityFixtures());
 		$schemaTool = new SchemaTool($em);
@@ -69,13 +69,13 @@ 
 		$refl = new \ReflectionClass($configurationClass);
 		$methods = $refl->getMethods();
 		$mockMethods = array();
-		foreach($methods as $method) {
-			if($method->name !== 'addFilter' && $method->name !== 'getFilterClassName') {
+		foreach ($methods as $method) {
+			if ($method->name !== 'addFilter' && $method->name !== 'getFilterClassName') {
 				$mockMethods[] = $method->name;
 			}
 		}
 		$config = $this->getMockBuilder($configurationClass)->setMethods($mockMethods)->getMock();
-		$config->expects($this->once())->method('getProxyDir')->will($this->returnValue(__DIR__ . '/../../temp'));
+		$config->expects($this->once())->method('getProxyDir')->will($this->returnValue(__DIR__.'/../../temp'));
 		$config->expects($this->once())->method('getProxyNamespace')->will($this->returnValue('Proxy'));
 		$config->expects($this->any())->method('getDefaultQueryHints')->will($this->returnValue(array()));
 		$config->expects($this->once())->method('getAutoGenerateProxyClasses')->will($this->returnValue(true));

Services/Mapping/EntityToDocumentMapper.php

Spacing +20 added lines, -20 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;
@@ -122,13 +122,13 @@ 
 	 * @param object $object        	
 	 * @return boolean
 	 */
-	protected function fillDocument(Document &$document, $object) {
-		if($object instanceof SearchableEntity) {
+	protected function fillDocument(Document&$document, $object) {
+		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

@@ -32,7 +32,7 @@
 		$configuration = new Configuration();
 		$config = $this->processConfiguration($configuration, $configs);
 		
-		$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/SearchController.php

Spacing +8 added lines, -8 removed lines

@@ -55,7 +55,7 @@ 
 	private $searchService;
 
 	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');
 		}
@@ -70,8 +70,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());
@@ -87,7 +87,7 @@ 
 		
 		$page = $request->query->get('page', 1);
 		$results = array();
-		if($result instanceof PaginatableResultSet) {
+		if ($result instanceof PaginatableResultSet) {
 			$results = $result->paginate($page, self::RESULTS_PER_PAGE);
 		} else {
 			$results = $result->getResults(($page - 1) * self::RESULTS_PER_PAGE, self::RESULTS_PER_PAGE);
@@ -136,7 +136,7 @@ 
 	 * @return string[string][]
 	 */
 	protected function getSearchFacets(SessionInterface $session) {
-		$facets = $session()->get(self::SESSION_PREFIX . '_facets', false);
+		$facets = $session()->get(self::SESSION_PREFIX.'_facets', false);
 		return $facets ? json_decode($facets, true) : $this->getDefaultFacets();
 	}
 
@@ -147,7 +147,7 @@ 
 	 * @param string[string][] $facets
 	 */
 	protected function setSearchFacets(SessionInterface $session, $facets) {
-		$session->set(self::SESSION_PREFIX . '_facets', json_encode($facets));
+		$session->set(self::SESSION_PREFIX.'_facets', json_encode($facets));
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 * @return mixed
 	 */
 	protected function getSearchTerm(SessionInterface $session) {
-		return $session->get(self::SESSION_PREFIX . '_term', false);
+		return $session->get(self::SESSION_PREFIX.'_term', false);
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 * @param string $term        	
 	 */
 	protected function setSearchTerm(SessionInterface $session, $term) {
-		$session->set(self::SESSION_PREFIX . '_term', $term);
+		$session->set(self::SESSION_PREFIX.'_term', $term);
 	}
 
 	/**

Form/QueryType.php

Spacing +18 added lines, -18 removed lines

@@ -53,25 +53,25 @@ 
 		$maxChoiceGroupCount = $options['max_choice_group_count'];
 		$data = array();
 		
-		if($usedFacets && !$result) {
+		if ($usedFacets && !$result) {
 			$data = array();
-			foreach($usedFacets as $facetType) {
+			foreach ($usedFacets as $facetType) {
 				$preferredChoices = isset($preferredFilterChoices[$facetType]) ? $preferredFilterChoices[$facetType] : array();
 				$i = 0;
-				$builder->add('facet_' . $facetType, FacetType::class, array(
-					'label' => 'stinger_soft_entity_search.forms.query.' . $facetType . '.label',
+				$builder->add('facet_'.$facetType, FacetType::class, 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]));
 					} 
 				));
 				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());
 			});
 		}
@@ -109,17 +109,17 @@ 
 		$maxChoiceGroupCount = $options['max_choice_group_count'];
 		$selectedFacets = $data->getFacets();
 		
-		foreach($facets->getFacets() as $facetType => $facetValues) {
+		foreach ($facets->getFacets() as $facetType => $facetValues) {
 			$preferredChoices = isset($preferredFilterChoices[$facetType]) ? $preferredFilterChoices[$facetType] : array();
 			
 			$i = 0;
-			$builder->add('facet_' . $facetType, FacetType::class, array(
-				'label' => 'stinger_soft_entity_search.forms.query.' . $facetType . '.label',
+			$builder->add('facet_'.$facetType, FacetType::class, 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(), $options['facet_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]));
 				} 
 			));
@@ -134,13 +134,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;
 		}
@@ -148,8 +148,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);

Form/FacetType.php

Spacing +4 added lines, -4 removed lines

@@ -31,12 +31,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);
@@ -62,7 +62,7 @@ 
 	public function configureOptions(OptionsResolver $resolver) {
 		$resolver->setDefault('translation_domain', 'StingerSoftEntitySearchBundle');
 		$resolver->setDefault('by_reference', true);
-		if(Kernel::VERSION_ID < 30000) {
+		if (Kernel::VERSION_ID < 30000) {
 			$resolver->setDefault('choices_as_values', true);
 		}
 	}

Tests/Fixtures/ORM/Car.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	 *
 	 * @see \StingerSoft\EntitySearchBundle\Model\SearchableEntity::indexEntity()
 	 */
-	public function indexEntity(Document &$document) {
+	public function indexEntity(Document&$document) {
 		$document->addField(Document::FIELD_TITLE, $this->getTitle());
 		return self::$index;
 	}

Command/SyncCommand.php

Spacing +15 added lines, -15 removed lines

@@ -67,15 +67,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
 			 */
@@ -91,12 +91,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());
@@ -117,14 +117,14 @@ 
 		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;
 		}
 		
 		// Get all entities
 		$entities = $repository->findAll();
-		if(count($entities) == 0) {
+		if (count($entities) == 0) {
 			$output->writeln('<comment>No entities found for indexing</comment>');
 			return;
 		}
@@ -132,20 +132,20 @@ 
 		$entitiesIndexed = 0;
 		
 		// Index each entity seperate
-		foreach($entities as $entity) {
-			if($this->getEntityToDocumentMapper()->isIndexable($entity)) {
+		foreach ($entities as $entity) {
+			if ($this->getEntityToDocumentMapper()->isIndexable($entity)) {
 				$document = $this->getEntityToDocumentMapper()->createDocument($entityManager, $entity);
-				if($document === false) continue;
+				if ($document === false) continue;
 				$this->getSearchService($entityManager)->saveDocument($document);
 				$entitiesIndexed++;
-				if($entitiesIndexed % 50 == 0) {
+				if ($entitiesIndexed % 50 == 0) {
 					$entityManager->flush();
 				}
 			}
 			
 		}
 		$entityManager->flush();
-		$output->writeln('<comment>Indexed ' . $entitiesIndexed . ' entities</comment>');
+		$output->writeln('<comment>Indexed '.$entitiesIndexed.' entities</comment>');
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 	 * @return EntityToDocumentMapperInterface
 	 */
 	protected function getEntityToDocumentMapper() {
-		if(!$this->entityToDocumentMapper) {
+		if (!$this->entityToDocumentMapper) {
 			$this->entityToDocumentMapper = $this->getContainer()->get(EntityToDocumentMapperInterface::SERVICE_ID);
 		}
 		return $this->entityToDocumentMapper;
@@ -164,7 +164,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);

Model/DocumentAdapter.php

Spacing +3 added lines, -3 removed lines

@@ -81,11 +81,11 @@ 
 	 * @see \StingerSoft\EntitySearchBundle\Model\Document::addMultiValueField()
 	 */
 	public function addMultiValueField($field, $value) {
-		if(!array_key_exists($field, $this->fields)) {
+		if (!array_key_exists($field, $this->fields)) {
 			$this->fields[$field] = array(
 				$value 
 			);
-		} else if(!in_array($value, $this->fields[$field])) {
+		} else if (!in_array($value, $this->fields[$field])) {
 			$this->fields[$field][] = $value;
 		}
 	}
@@ -98,7 +98,7 @@ 
 	 */
 	public function setEntityClass($clazz) {
 		$this->entityClass = $clazz;
-		if(!$this->entityType) {
+		if (!$this->entityType) {
 			$this->entityType = $clazz;
 		}
 	}