Stinger-Soft / EntitySearchBundle

StingerSoftEntitySearchBundle.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
  */
 class StingerSoftEntitySearchBundle extends Bundle {
 
+	/**
+	 * @param string $env
+	 */
 	public static function getRequiredBundles($env) {
 		$bundles = array();
 		$bundles['StingerSoftEntitySearchBundle'] = '\StingerSoft\EntitySearchBundle\StingerSoftEntitySearchBundle';

Model/Result/FacetSetAdapter.php

Spacing +3 added lines, -3 removed lines

@@ -30,10 +30,10 @@ 
 	}
 
 	public function addFacetValue($key, $value, $increaseCounterBy = 1) {
-		if(!isset($this->facets[$key])){
+		if (!isset($this->facets[$key])) {
 			$this->facets[$key] = array();
 		}
-		if(!isset($this->facets[$key][$value])){
+		if (!isset($this->facets[$key][$value])) {
 			$this->facets[$key][$value] = 0;
 		}
 		$this->facets[$key][$value] = $this->facets[$key][$value] + $increaseCounterBy;
@@ -46,7 +46,7 @@ 
 	 * @see \StingerSoft\EntitySearchBundle\Model\Result\FacetSet::getFacet()
 	 */
 	public function getFacet($key) {
-		if(isset($this->facets[$key])) {
+		if (isset($this->facets[$key])) {
 			return $this->facets[$key];
 		} else {
 			return;

Services/DummySearchService.php

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
 		$id = $document->getEntityClass();
 		$id .= '#';
 		$entityId = $document->getEntityId();
-		if(is_scalar($entityId)) {
+		if (is_scalar($entityId)) {
 			$id .= $entityId;
 		} else {
 			$id .= md5(serialize($entityId));
@@ -75,15 +75,15 @@ 
 	 */
 	public function autocomplete($search, $maxResults = 10) {
 		$words = array();
-		foreach($this->index as $doc) {
-			foreach($doc->getFields() as $content) {
-				if(is_string($content)) {
+		foreach ($this->index as $doc) {
+			foreach ($doc->getFields() as $content) {
+				if (is_string($content)) {
 					$words = array_merge($words, explode(' ', $content));
 				}
 			}
 		}
 		
-		return array_filter($words, function ($word) use ($search) {
+		return array_filter($words, function($word) use ($search) {
 			return stripos($word, $search) === 0;
 		});
 	}
@@ -101,10 +101,10 @@ 
 		$facets = new FacetSetAdapter();
 		
 		$hits = array();
-		foreach($this->index as $key => $doc) {
-			foreach($doc->getFields() as $content) {
-				if(is_string($content) && stripos($content, $term) !== false) {
-					if(!isset($hits[$key])) {
+		foreach ($this->index as $key => $doc) {
+			foreach ($doc->getFields() as $content) {
+				if (is_string($content) && stripos($content, $term) !== false) {
+					if (!isset($hits[$key])) {
 						$hits[$key] = 0;
 					}
 					$hits[$key] = $hits[$key] + 1;
@@ -113,7 +113,7 @@ 
 		}
 		arsort($hits);
 		$results = array();
-		foreach(array_keys($hits) as $docId) {
+		foreach (array_keys($hits) as $docId) {
 			$doc = $this->index[$docId];
 			$facets->addFacetValue(FacetSet::FACET_ENTITY_TYPE, $doc->getEntityClass());
 			$facets->addFacetValue(FacetSet::FACET_AUTHOR, $doc->getFieldValue(Document::FIELD_AUTHOR));

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;

Tests/Form/QueryTypeTest.php

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 		$view = $form->createView();
 		$children = $view->children;
 		
-		foreach(array_keys($formData) as $key) {
+		foreach (array_keys($formData) as $key) {
 			$this->assertArrayHasKey($key, $children);
 		}
 		

Doc Comments +3 added lines

@@ -140,6 +140,9 @@
 // 		$this->assertCount(2, $typeForm->vars['choices']);
 	}
 	
+	/**
+	 * @return ValidatorInterface
+	 */
 	protected function mockValidator() {
 		$validator = $this->getMockBuilder(ValidatorInterface::class)->setMethods(array('validate', 'getErrors'))->getMockForAbstractClass();
 		$validator->method('validate')->willReturn(array());

Model/Query.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 	 *
 	 * @param string $name
 	 *        	Name of the property to set
-	 * @param mixed $value
+	 * @param string[] $value
 	 *        	The value of the property
 	 */
 	public function __set($name, $value) {

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

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

Services/DoctrineListener.php

Spacing +6 added lines, -6 removed lines

@@ -73,12 +73,12 @@ 
 	 * @param LifecycleEventArgs $args        	
 	 */
 	public function postPersist(LifecycleEventArgs $args) {
-		if(!$this->enableIndexing) return;
+		if (!$this->enableIndexing) return;
 		$this->updateEntity($args->getObject(), $args->getObjectManager());
 	}
 
 	public function postFlush(PostFlushEventArgs $eventArgs) {
-		if($this->needsFlush) {
+		if ($this->needsFlush) {
 			$this->needsFlush = false;
 			$eventArgs->getEntityManager()->flush();
 		}
@@ -90,7 +90,7 @@ 
 	 * @param LifecycleEventArgs $args        	
 	 */
 	public function preRemove(LifecycleEventArgs $args) {
-		if(!$this->enableIndexing) return;
+		if (!$this->enableIndexing) return;
 		$this->removeEntity($args->getObject(), $args->getObjectManager());
 	}
 
@@ -100,7 +100,7 @@ 
 	 * @param LifecycleEventArgs $args        	
 	 */
 	public function postUpdate(LifecycleEventArgs $args) {
-		if(!$this->enableIndexing) return;
+		if (!$this->enableIndexing) return;
 		$this->updateEntity($args->getObject(), $args->getObjectManager());
 	}
 
@@ -127,7 +127,7 @@ 
 	 */
 	protected function updateEntity($entity, ObjectManager $manager) {
 		$document = $this->getEntityToDocumentMapper()->createDocument($manager, $entity);
-		if($document !== false) {
+		if ($document !== false) {
 			$this->getSearchService($manager)->saveDocument($document);
 		}
 	}
@@ -138,7 +138,7 @@ 
 	 */
 	protected function removeEntity($entity, ObjectManager $manager) {
 		$document = $this->getEntityToDocumentMapper()->createDocument($manager, $entity);
-		if($document !== false) {
+		if ($document !== false) {
 			$this->getSearchService($manager)->removeDocument($document);
 		}
 	}

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