gordonbanderson / silverstripe-elastica

tests/mock/Translatable.php

Braces +45 added lines, -15 removed lines

@@ -377,7 +377,9 @@ 
 	 */
 	protected function filtersOnLocale($query) {
 		foreach($query->getWhere() as $condition) {
-			if(preg_match('/("|\'|`)Locale("|\'|`)/', $condition)) return true;
+			if(preg_match('/("|\'|`)Locale("|\'|`)/', $condition)) {
+				return true;
+			}
 		}
 	}
 
@@ -429,7 +431,9 @@ 
 	 // FIXME - NO TEST COVERAGE BUT REQUIRED
 	function augmentDatabase() {
 		$baseDataClass = ClassInfo::baseDataClass($this->owner->class);
-		if($this->owner->class != $baseDataClass) return;
+		if($this->owner->class != $baseDataClass) {
+			return;
+		}
 
 		$fields = array(
 			'OriginalID' => 'Int',
@@ -456,7 +460,9 @@ 
 	 */
 	public function requireDefaultRecords() {
 		// @todo This relies on the Locale attribute being on the base data class, and not any subclasses
-		if($this->owner->class != ClassInfo::baseDataClass($this->owner->class)) return false;
+		if($this->owner->class != ClassInfo::baseDataClass($this->owner->class)) {
+			return false;
+		}
 
 		// Permissions: If a group doesn't have any specific TRANSLATE_<locale> edit rights,
 		// but has CMS_ACCESS_CMSMain (general CMS access), then assign TRANSLATE_ALL permissions as a default.
@@ -468,14 +474,20 @@ 
 			'CMS_ACCESS_LeftAndMain',
 			'ADMIN'
 		));
-		if($groups) foreach($groups as $group) {
+		if($groups) {
+			foreach($groups as $group) {
 			$codes = $group->Permissions()->column('Code');
+		}
 			$hasTranslationCode = false;
 			foreach($codes as $code) {
-				if(preg_match('/^TRANSLATE_/', $code)) $hasTranslationCode = true;
+				if(preg_match('/^TRANSLATE_/', $code)) {
+					$hasTranslationCode = true;
+				}
 			}
 			// Only add the code if no more restrictive code exists
-			if(!$hasTranslationCode) Permission::grant($group->ID, 'TRANSLATE_ALL');
+			if(!$hasTranslationCode) {
+				Permission::grant($group->ID, 'TRANSLATE_ALL');
+			}
 		}
 
 		// If the Translatable extension was added after the first records were already
@@ -485,7 +497,9 @@ 
 			'SELECT "ID" FROM "%s" WHERE "Locale" IS NULL OR "Locale" = \'\'',
 			ClassInfo::baseDataClass($this->owner->class)
 		))->column();
-		if(!$idsWithoutLocale) return;
+		if(!$idsWithoutLocale) {
+			return;
+		}
 
 
 
@@ -502,7 +516,9 @@ 
 	 * @param boolean $overwrite
 	 */
 	public function addTranslationGroup($originalID, $overwrite = false) {
-		if(!$this->owner->exists()) return false;
+		if(!$this->owner->exists()) {
+			return false;
+		}
 
 		$baseDataClass = ClassInfo::baseDataClass($this->owner->class);
 		$existingGroupID = $this->getTranslationGroup($originalID);
@@ -539,7 +555,9 @@ 
 	 * @return int Numeric ID of the translationgroup in the <classname>_translationgroup table
 	 */
 	public function getTranslationGroup() {
-		if(!$this->owner->exists()) return false;
+		if(!$this->owner->exists()) {
+			return false;
+		}
 
 		$baseDataClass = ClassInfo::baseDataClass($this->owner->class);
 		return DB::query(
@@ -646,8 +664,10 @@ 
 				$this->owner->ClassName = $changedFields['ClassName']['before'];
 				$translations = $this->owner->getTranslations();
 				$this->owner->ClassName = $changedFields['ClassName']['after'];
-				if($translations) foreach($translations as $translation) {
+				if($translations) {
+					foreach($translations as $translation) {
 					$translation->setClassName($this->owner->ClassName);
+				}
 					$translation = $translation->newClassInstance($translation->ClassName);
 					$translation->populateDefaults();
 					$translation->forceChange();
@@ -745,7 +765,9 @@ 
 	 * @return DataObjectSet
 	 */
 	function getTranslations($locale = null, $stage = null) {
-		if(!$this->owner->exists()) return new ArrayList();
+		if(!$this->owner->exists()) {
+			return new ArrayList();
+		}
 
 		// HACK need to disable language filtering in augmentSQL(),
 		// as we purposely want to get different language
@@ -770,14 +792,18 @@ 
 		$currentStage = Versioned::current_stage();
 		$joinOnClause = sprintf('"%s_translationgroups"."OriginalID" = "%s"."ID"', $baseDataClass, $baseDataClass);
 		if($this->owner->hasExtension("Versioned")) {
-			if($stage) Versioned::reading_stage($stage);
+			if($stage) {
+				Versioned::reading_stage($stage);
+			}
 			$translations = Versioned::get_by_stage(
 				$baseDataClass,
 				Versioned::current_stage(),
 				$filter,
 				null
 			)->leftJoin("{$baseDataClass}_translationgroups", $joinOnClause);
-			if($stage) Versioned::reading_stage($currentStage);
+			if($stage) {
+				Versioned::reading_stage($currentStage);
+			}
 		} else {
 			$class = $this->owner->class;
 			$translations = $baseDataClass::get()
@@ -861,7 +887,9 @@ 
 		self::set_current_locale($originalLocale);
 
 		if($original) {
-			if($translation = $original->getTranslation($locale)) return trim($translation->RelativeLink(true), '/');
+			if($translation = $original->getTranslation($locale)) {
+				return trim($translation->RelativeLink(true), '/');
+			}
 		}
 	}
 
@@ -916,7 +944,9 @@ 
 		$existingPage = SiteTree::get()
 			// disable get_one cache, as this otherwise may pick up results from when locale_filter was on
 			->where("\"URLSegment\" = '{$this->owner->URLSegment}' $IDFilter $parentFilter")->First();
-		if($reEnableFilter) self::enable_locale_filter();
+		if($reEnableFilter) {
+			self::enable_locale_filter();
+		}
 
 		// By returning TRUE or FALSE, we overrule the base SiteTree->validateURLSegment() logic
 		return !$existingPage;

src/SilverStripe/Elastica/QueryGenerator.php

Braces +1 added lines, -1 removed lines

@@ -511,7 +511,7 @@
 				}
 			}
 			$cache->save(json_encode($result),$key);
-		}  else {
+		} else {
 			// true is necessary here to decode the array hash back to an array and not a struct
 			self::$cacheHitCtr++;
 			$result = json_decode($result,true);

src/SilverStripe/Elastica/Searchable.php

Braces +10 added lines, -5 removed lines

@@ -514,8 +514,7 @@ 
 				// this goes to elastica service
 				$this->service->remove($this->owner);
 			}
-		}
-		catch (\Elastica\Exception\NotFoundException $e) {
+		} catch (\Elastica\Exception\NotFoundException $e) {
 			trigger_error("Deleted document " . $this->owner->ClassName . " (" . $this->owner->ID .
 				") not found in search index.", E_USER_NOTICE);
 		}
@@ -533,7 +532,9 @@ 
 		$fields = \Config::inst()->get(get_class($this->owner), 'searchable_fields');
 
 		// fallback to default method
-		if(!$fields) user_error('The field $searchable_fields must be set for the class ' . $this->owner->ClassName);
+		if(!$fields) {
+			user_error('The field $searchable_fields must be set for the class ' . $this->owner->ClassName);
+		}
 
 		// get the values of these fields
 		$elasticaMapping = $this->fieldsToElasticaConfig($fields);
@@ -554,7 +555,9 @@ 
 
 						$relClass = $has_lists[$methodName];
 						$fields = \Config::inst()->get($relClass, 'searchable_fields');
-						if(!$fields) user_error('The field $searchable_fields must be set for the class ' . $relClass);
+						if(!$fields) {
+							user_error('The field $searchable_fields must be set for the class ' . $relClass);
+						}
 						$rewrite = $this->fieldsToElasticaConfig($fields);
 
 						// mark as a method, the resultant fields are correct
@@ -562,7 +565,9 @@ 
 					} else if(isset($has_ones[$methodName])) {
 						$relClass = $has_ones[$methodName];
 						$fields = \Config::inst()->get($relClass, 'searchable_fields');
-						if(!$fields) user_error('The field $searchable_fields must be set for the class ' . $relClass);
+						if(!$fields) {
+							user_error('The field $searchable_fields must be set for the class ' . $relClass);
+						}
 						$rewrite = $this->fieldsToElasticaConfig($fields);
 
 						// mark as a method, the resultant fields are correct