Stinger-Soft / EntitySearchBundle

Tests/Controller/SearchControllerTest.php

Doc Comments +3 added lines

@@ -77,6 +77,9 @@
 
 	}
 
+	/**
+	 * @param \StingerSoft\EntitySearchBundle\Services\DummySearchService $searchService
+	 */
 	protected function getSearchController(?SearchService $searchService = null): SearchController {
 		$searchService = $searchService ?? $this->getDummySearchService();
 

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 			return \in_array($id, ['twig', 'form.factory'], true);
 		});
 		$container->method('get')->willReturnCallback(function($id) use ($that) {
-			if($id === 'form.factory') {
+			if ($id === 'form.factory') {
 				$resolvedFormTypeFactory = new ResolvedFormTypeFactory();
 				$formTypeFactory = Forms::createFormFactoryBuilder()
 					->addType(new FacetType())
@@ -107,7 +107,7 @@ 
 					->getFormFactory();
 				return $formTypeFactory;
 			}
-			if($id === 'twig') {
+			if ($id === 'twig') {
 				return $that;
 			}
 		});

Controller/SearchControllerTrait.php

Spacing +14 added lines, -14 removed lines

@@ -32,7 +32,7 @@ 
 	private $facetFormatter;
 
 	public function searchAction(Request $request, DocumentToEntityMapperInterface $mapper) {
-		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');
 		}
@@ -48,8 +48,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());
@@ -67,9 +67,9 @@ 
 
 			$page = (int)$request->query->get('page', 1);
 			$results = null;
-			if($result instanceof PaginatableResultSet) {
+			if ($result instanceof PaginatableResultSet) {
 				$results = $result->paginate($page, $this->getResultsPerPage());
-			} elseif($results !== null) {
+			} elseif ($results !== null) {
 				$results = $result->getResults(($page - 1) * $this->getResultsPerPage(), $this->getResultsPerPage());
 			}
 
@@ -80,7 +80,7 @@ 
 				'mapper'    => $mapper,
 				'facetForm' => $facetForm->createView()
 			));
-		} catch(\Exception $exception) {
+		} catch (\Exception $exception) {
 			$response = $this->render($this->getErrorTemplate(), array(
 				'error' => $exception->getMessage(),
 				'term'  => $query->getSearchTerm()
@@ -124,7 +124,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;
@@ -191,15 +191,15 @@ 
 	}
 
 	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) {
 				$facetService = $this->searchService->getFacet($facetServiceId);
 				$this->availableFacets[$facetService->getField()] = $facetService->getFormOptions();
-				if($facetService->getFacetFormatter()) {
+				if ($facetService->getFacetFormatter()) {
 					$this->facetFormatter[$facetService->getField()] = $facetService->getFacetFormatter();
 				}
 			}
@@ -213,7 +213,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();
 	}
 
@@ -224,7 +224,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));
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 * @return mixed
 	 */
 	protected function getSearchTerm(SessionInterface $session) {
-		return $session->get($this->getSessionPrefix() . '_term', false);
+		return $session->get($this->getSessionPrefix().'_term', false);
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 * @param string $term
 	 */
 	protected function setSearchTerm(SessionInterface $session, $term) {
-		$session->set($this->getSessionPrefix() . '_term', $term);
+		$session->set($this->getSessionPrefix().'_term', $term);
 	}
 
 }
\ No newline at end of file

Tests/Model/Result/FacetSetAdapterTest.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 
 class FacetSetAdapterTest extends \PHPUnit\Framework\TestCase {
 
-	public function testAddFacetValue(){
+	public function testAddFacetValue() {
 		$facets = new FacetSetAdapter(array());
 		$this->assertCount(0, $facets);
 		$facets->addFacetValue(Document::FIELD_AUTHOR, 'Oliver Kotte');
@@ -26,13 +26,13 @@ 
 		$this->assertCount(1, $facets);
 		$this->assertCount(2, $facets->getFacet(Document::FIELD_AUTHOR));
 		
-		foreach($facets as $facetKey => $facetValues){
+		foreach ($facets as $facetKey => $facetValues) {
 			$this->assertEquals(Document::FIELD_AUTHOR, $facetKey);
 			$this->assertCount(2, $facetValues);
 		}
 	}
 	
-	public function testGetFacet(){
+	public function testGetFacet() {
 		$facets = new FacetSetAdapter(array());
 		$this->assertCount(0, $facets);
 		$this->assertNull($facets->getFacet('NotExisting'));

DependencyInjection/StingerSoftEntitySearchExtension.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,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::class);

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);

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\HttpKernel\Kernel;
 
 class FacetType extends AbstractType {
 

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);