Stinger-Soft / EntitySearchBundle

Form/QueryType.php

Doc Comments +4 added lines, -1 removed lines

@@ -100,7 +100,7 @@ 
 
 	/**
 	 *
-	 * @param FormBuilderInterface|Form $builder        	
+	 * @param FormInterface $builder        	
 	 * @param FacetSet $facets        	
 	 */
 	protected function createFacets($builder, FacetSet $facets, array $options, $data) {
@@ -143,6 +143,9 @@ 
 		return $choices;
 	}
 	
+	/**
+	 * @param string $facetType
+	 */
 	protected function formatFacet($formatter, $facetType, $facet, $count) {
 		$default = $facet . ' (' . $count . ')';
 		if(!$formatter) {

Spacing +17 added lines, -17 removed lines

@@ -53,24 +53,24 @@ 
 		$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,
-					'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());
 			});
 		}
@@ -107,16 +107,16 @@ 
 		$preferredFilterChoices = $options['preferred_filter_choices'];
 		$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,
 				'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]));
 				} 
 			));
@@ -131,12 +131,12 @@ 
 	 */
 	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) {
+		foreach ($selectedFacets as $facet) {
 			$count = 0;
 			$choices[$this->formatFacet($formatter, $facetType, $facet, $count)] = $facet;
 		}
@@ -144,8 +144,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);

Braces +3 added lines, -2 removed lines

@@ -132,8 +132,9 @@
 	protected function generateFacetChoices($facetType, array $facets, array $selectedFacets = array(), $formatter) {
 		$choices = array();
 		foreach($facets as $facet => $count) {
-			if($count == 0 && !in_array($facet, $selectedFacets))
-				continue;
+			if($count == 0 && !in_array($facet, $selectedFacets)) {
+							continue;
+			}
 			$choices[$this->formatFacet($formatter, $facetType, $facet, $count)] = $facet;
 		}
 		foreach($selectedFacets as $facet) {