Stinger-Soft / EntitySearchBundle

Form/FacetType.php

Unused Use Statements -2 removed lines

@@ -11,11 +11,9 @@
  */
 namespace StingerSoft\EntitySearchBundle\Form;
 
-use StingerSoft\EntitySearchBundle\Model\Query;
 use StingerSoft\EntitySearchBundle\Model\Result\FacetSet;
 use StingerSoft\EntitySearchBundle\Model\ResultSet;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\ChoiceList\LazyChoiceList;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;

Spacing +10 added lines, -10 removed lines

@@ -36,12 +36,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())));
 		});
@@ -69,13 +69,13 @@ 
 	 * @param FacetSet $facets        	
 	 */
 	protected function createFacets(FormBuilderInterface $builder, FacetSet $facets) {
-		foreach($facets->getFacets() as $facetType => $facetValues) {
-			$builder->add('facet_' . $facetType, ChoiceType::class, array(
-				'label' => 'stinger_soft_entity_search.forms.query.' . $facetType . '.label',
+		foreach ($facets->getFacets() as $facetType => $facetValues) {
+			$builder->add('facet_'.$facetType, ChoiceType::class, array(
+				'label' => 'stinger_soft_entity_search.forms.query.'.$facetType.'.label',
 				'multiple' => true,
 				'expanded' => true,
 				'choices_as_values' => true,
-				'property_path' => 'facets[' . $facetType . ']',
+				'property_path' => 'facets['.$facetType.']',
 				'choices' => $this->generateFacetChoices($facetType, $facetValues) 
 			));
 		}
@@ -89,10 +89,10 @@ 
 	protected function generateFacetChoices($facetType, array $facets) {
 		$choices = array();
 		
-		foreach($facets as $facet => $count) {
-			if($count == 0)
+		foreach ($facets as $facet => $count) {
+			if ($count == 0)
 				break;
-			$choices[$facet . ' (' . $count . ')'] = $facet;
+			$choices[$facet.' ('.$count.')'] = $facet;
 		}
 		return $choices;
 	}

Tests/Form/QueryTypeTest.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	}
 	
 	
-	public function testWithNotExistingFacets(){
+	public function testWithNotExistingFacets() {
 		
 		$query = new Query('Hemelinger', array(), array(
 			Document::FIELD_TYPE

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

Form/FacetChoiceLoader.php

Spacing +4 added lines, -4 removed lines

@@ -39,9 +39,9 @@ 
 	public function loadValuesForChoices(array $choices, $value = null) {
 		// 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;
@@ -85,9 +85,9 @@ 
 	public function loadChoicesForValues(array $values, $value = null) {
 		// 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/QueryType.php

Spacing +11 added lines, -11 removed lines

@@ -36,10 +36,10 @@ 
 		));
 
 		$usedFacets = $options['used_facets'];
-		if($usedFacets){
-			foreach($usedFacets as $facetType) {
-				$builder->add('facet_' . $facetType, FacetType::class, array(
-					'label' => 'stinger_soft_entity_search.forms.query.' . $facetType . '.label',
+		if ($usedFacets) {
+			foreach ($usedFacets as $facetType) {
+				$builder->add('facet_'.$facetType, FacetType::class, array(
+					'label' => 'stinger_soft_entity_search.forms.query.'.$facetType.'.label',
 					'multiple' => true,
 					'expanded' => true,
 				));
@@ -75,13 +75,13 @@ 
 	 * @param FacetSet $facets        	
 	 */
 	protected function createFacets(FormBuilderInterface $builder, FacetSet $facets) {
-		foreach($facets->getFacets() as $facetType => $facetValues) {
-			$builder->add('facet_' . $facetType, ChoiceType::class, array(
-				'label' => 'stinger_soft_entity_search.forms.query.' . $facetType . '.label',
+		foreach ($facets->getFacets() as $facetType => $facetValues) {
+			$builder->add('facet_'.$facetType, ChoiceType::class, array(
+				'label' => 'stinger_soft_entity_search.forms.query.'.$facetType.'.label',
 				'multiple' => true,
 				'expanded' => true,
 				'choices_as_values' => true,
-				'property_path' => 'facets[' . $facetType . ']',
+				'property_path' => 'facets['.$facetType.']',
 				'choices' => $this->generateFacetChoices($facetType, $facetValues) 
 			));
 		}
@@ -95,10 +95,10 @@ 
 	protected function generateFacetChoices($facetType, array $facets) {
 		$choices = array();
 		
-		foreach($facets as $facet => $count) {
-			if($count == 0)
+		foreach ($facets as $facet => $count) {
+			if ($count == 0)
 				break;
-			$choices[$facet . ' (' . $count . ')'] = $facet;
+			$choices[$facet.' ('.$count.')'] = $facet;
 		}
 		return $choices;
 	}