Stinger-Soft / EntitySearchBundle

Services/Mapping/EntityToDocumentMapper.php

Spacing +18 added lines, -18 removed lines

@@ -46,18 +46,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;
 			}
 			
@@ -72,10 +72,10 @@ 
 	 * @return boolean
 	 */
 	public function isIndexable($object) {
-		if($object instanceof SearchableEntity) {
+		if ($object instanceof SearchableEntity) {
 			return true;
 		}
-		if(count($this->getMapping($object)) > 0) {
+		if (count($this->getMapping($object)) > 0) {
 			return true;
 		}
 		return false;
@@ -89,11 +89,11 @@ 
 	 * @return boolean|Document Returns false if no document could be created
 	 */
 	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;
@@ -106,13 +106,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($object);
 		$accessor = PropertyAccess::createPropertyAccessor();
-		foreach($mapping as $fieldName => $propertyPath) {
+		foreach ($mapping as $fieldName => $propertyPath) {
 			$document->addField($fieldName, $accessor->getValue($object, $propertyPath));
 		}
 		return true;
@@ -126,15 +126,15 @@ 
 	 */
 	protected function getMapping($object) {
 		$clazz = get_class($object);
-		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);
 			}
 		}

Braces +6 added lines, -4 removed lines

@@ -89,12 +89,14 @@
 	 * @return boolean|Document Returns false if no document could be created
 	 */
 	public function createDocument(ObjectManager $manager, $object) {
-		if(!$this->isIndexable($object))
-			return false;
+		if(!$this->isIndexable($object)) {
+					return false;
+		}
 		$document = $this->getSearchService($manager)->createEmptyDocumentFromEntity($object);
 		$index = $this->fillDocument($document, $object);
-		if($index == false)
-			return false;
+		if($index == false) {
+					return false;
+		}
 		
 		return $document;
 	}

Command/SyncCommand.php

Spacing +10 added lines, -10 removed lines

@@ -65,15 +65,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') {
 			// $indexHandler = $this->getIndexHandler();
 			// $entities = $indexHandler->getSearchableEntities();
 			// foreach($entities as $bundle => $searchableEntities) {
@@ -98,14 +98,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;
 		}
@@ -113,14 +113,14 @@ 
 		$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);
 				$this->getSearchService($entityManager)->saveDocument($document);
 				$entitiesIndexed++;
 			}
 		}
-		$output->writeln('<comment>Indexed ' . $entitiesIndexed . ' entities</comment>');
+		$output->writeln('<comment>Indexed '.$entitiesIndexed.' entities</comment>');
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 * @return EntityToDocumentMapperInterface
 	 */
 	protected function getEntityToDocumentMapper() {
-		if(!$this->entityToDocumentMapper) {
+		if (!$this->entityToDocumentMapper) {
 			$this->entityToDocumentMapper = $this->getContainer()->get(EntityToDocumentMapperInterface::SERVICE_ID);
 		}
 		return $this->entityToDocumentMapper;
@@ -139,7 +139,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);

Services/Mapping/DocumentToEntityMapperInterface.php

Doc Comments -1 removed lines

@@ -25,7 +25,6 @@
 	 * Tries to create a document from the given object
 	 *
 	 * @param ObjectManager $manager        	
-	 * @param object $object        	
 	 * @return boolean|Document Returns false if no document could be created
 	 */
 	public function getEntity(ObjectManager $manager, Document $document);

Form/QueryType.php

Braces +3 added lines, -2 removed lines

@@ -66,8 +66,9 @@
 		$choices = array();
 		
 		foreach($facets as $facet => $count) {
-			if($count == 0)
-				break;
+			if($count == 0) {
+							break;
+			}
 			$choices[$facet] = $facet . ' (' . $count . ')';
 		}
 		return $choices;

Spacing +11 added lines, -11 removed lines

@@ -37,16 +37,16 @@ 
 		
 		$usedFacets = $options['used_facets'];
 		$result = $options['result'];
-		if($usedFacets && !$result) {
-			foreach($usedFacets as $facetType) {
-				$builder->add('facet_' . $facetType, FacetType::class, array(
-					'label' => 'stinger_soft_entity_search.forms.query.' . $facetType . '.label',
+		if ($usedFacets && !$result) {
+			foreach ($usedFacets as $facetType) {
+				$builder->add('facet_'.$facetType, FacetType::class, array(
+					'label' => 'stinger_soft_entity_search.forms.query.'.$facetType.'.label',
 					'multiple' => true,
 					'expanded' => true 
 				));
 			}
 		}
-		if($result){
+		if ($result) {
 			$this->createFacets($builder, $result->getFacets());
 		}
 		
@@ -79,9 +79,9 @@ 
 	 * @param FacetSet $facets        	
 	 */
 	protected function createFacets(FormBuilderInterface $builder, FacetSet $facets) {
-		foreach($facets->getFacets() as $facetType => $facetValues) {
-			$builder->add('facet_' . $facetType, FacetType::class, array(
-				'label' => 'stinger_soft_entity_search.forms.query.' . $facetType . '.label',
+		foreach ($facets->getFacets() as $facetType => $facetValues) {
+			$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) 
@@ -97,10 +97,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;
 	}

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

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

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

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

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