newicon / neon

neon/phoebe/services/adapters/appforms/PhoebeType.php

Braces +6 added lines, -4 removed lines

@@ -33,8 +33,9 @@ 
 		$class = parent::getClass($classType, $version, $classOverrideCriteria);
 		// update member definitions with the latest from the database and
 		// override again with the changes that were defined before
-		if ($class)
-			$class->definition = $this->updateDefinitionFromDds($class->definition);
+		if ($class) {
+					$class->definition = $this->updateDefinitionFromDds($class->definition);
+		}
 		return $class;
 	}
 
@@ -55,8 +56,9 @@ 
 	{
 		$object = parent::getObject($objectId);
 		// update the data from Daedalus if required
-		if ($object)
-			$object->updateFromDds();
+		if ($object) {
+					$object->updateFromDds();
+		}
 		return $object;
 	}
 

neon/phoebe/services/adapters/appforms/PhoebeTrait.php

Braces +18 added lines, -12 removed lines

@@ -54,8 +54,9 @@ 
 	 */
 	protected function replaceDefinitionFromDds($definition)
 	{
-		if (empty($definition))
-			return [];
+		if (empty($definition)) {
+					return [];
+		}
 
 		$classes = $this->getDdsClassDefinitions($definition);
 		foreach ($definition['renderables'] as &$renderable) {
@@ -100,8 +101,9 @@ 
 				$parentClassId = null;
 				if (isset($r['parentClassId'])) {
 					$parentClassId = $r['parentClassId'];
-					if (!in_array($r['parentClassId'], $renderableKeys))
-						$parentClassId = $this->findParentClassIdFromType($r['parentClassId'], $definition['renderables']);
+					if (!in_array($r['parentClassId'], $renderableKeys)) {
+											$parentClassId = $this->findParentClassIdFromType($r['parentClassId'], $definition['renderables']);
+					}
 				}
 				$r['relations'] = [
 					[
@@ -117,8 +119,9 @@ 
 	protected function findParentClassIdFromType($type, $renderables)
 	{
 		foreach ($renderables as $r) {
-			if ($this->isClass($r) && $r['class_type'] == $type)
-				return $r['id'];
+			if ($this->isClass($r) && $r['class_type'] == $type) {
+							return $r['id'];
+			}
 		}
 		// can't find it so return the original so as not to break anything
 		return $type;
@@ -169,8 +172,9 @@ 
 			}
 		}
 		$definitions = [];
-		foreach ($requiredClassTypes as $rct)
-			$definitions[$rct] = isset($requestedClasses[$rct]) ? $requestedClasses[$rct]->definition : null;
+		foreach ($requiredClassTypes as $rct) {
+					$definitions[$rct] = isset($requestedClasses[$rct]) ? $requestedClasses[$rct]->definition : null;
+		}
 		return $definitions;
 	}
 
@@ -182,8 +186,9 @@ 
 				$memberDefinition = $classes[$renderable['class_type']]['fields'][$renderable['member_ref']];
 				$differences = [];
 				foreach ($renderDefinition as $key=>$value) {
-					if (!isset($memberDefinition['definition'][$key]) || ($memberDefinition['definition'][$key] != $value))
-						$differences[$key] = $value;
+					if (!isset($memberDefinition['definition'][$key]) || ($memberDefinition['definition'][$key] != $value)) {
+											$differences[$key] = $value;
+					}
 				}
 				$renderable['changes']=$differences;
 			}
@@ -233,8 +238,9 @@ 
 
 	private function ddsPhoebe()
 	{
-		if (!$this->_ddsPhoebe)
-			$this->_ddsPhoebe = neon('phoebe')->getIPhoebeType('daedalus');
+		if (!$this->_ddsPhoebe) {
+					$this->_ddsPhoebe = neon('phoebe')->getIPhoebeType('daedalus');
+		}
 		return $this->_ddsPhoebe;
 	}
 	private $_ddsPhoebe = null;

neon/phoebe/services/adapters/common/PhoebeObjectBase.php

Braces +21 added lines, -14 removed lines

@@ -42,15 +42,17 @@ 
 		// NOTE - changes are only saved into $this->data and not
 		// to the phoebe object in general.
 
-		if (empty($changes) || $changes == $this->data)
-			return true;
+		if (empty($changes) || $changes == $this->data) {
+					return true;
+		}
 
 		// Get the associated class object
 		$classType = $this->getClassType();
 		$class = $this->getClassModel($classType);
 
-		if (!$class)
-			throw new \RuntimeException("Class of type '$classType' not found. Can't save objects of unknown types");
+		if (!$class) {
+					throw new \RuntimeException("Class of type '$classType' not found. Can't save objects of unknown types");
+		}
 
 		// save the history object
 		if ($class->object_history) {
@@ -58,15 +60,17 @@ 
 		}
 
 		// update the version if the class is not version locked
-		if (!$class->version_locked)
-			$this->version = $class->version;
+		if (!$class->version_locked) {
+					$this->version = $class->version;
+		}
 
 		// merge the changes and save the model
 		$this->data = $changes;
 		$this->updated = date('Y-m-d H:i:s');
 		$model = $this->getModel();
-		if (!$model->save())
-			return $model->errors;
+		if (!$model->save()) {
+					return $model->errors;
+		}
 		return true;
 	}
 
@@ -124,8 +128,9 @@ 
 	public function setOverride($overrideUuid, $force=false)
 	{
 		// don't override an override unless forced to do so
-		if (!$force && $this->override_uuid)
-			return false;
+		if (!$force && $this->override_uuid) {
+					return false;
+		}
 
 		// Get the associated class object and check the override applies to this class
 		if ($this->getClassOverrideModel($overrideUuid, $this->version)) {
@@ -158,8 +163,9 @@ 
 		$query = ObjectHistoryModel::find()
 			->where(['object_uuid' => $this->uuid]);
 
-		if ($paginator['start']==0)
-			$paginator['total'] = $query->count();
+		if ($paginator['start']==0) {
+					$paginator['total'] = $query->count();
+		}
 
 		// and get the results
 		return $query->offset($paginator['start'])
@@ -236,8 +242,9 @@ 
 		$hmodel->version = $this->version;
 		$hmodel->override_uuid = $this->override_uuid;
 		$hmodel->serialised_data = $this->serialised_data;
-		if (!$hmodel->save())
-			throw new \RuntimeException("Failed to save the history of the object. Model errors were ".print_r($hmodel->errors,true));
+		if (!$hmodel->save()) {
+					throw new \RuntimeException("Failed to save the history of the object. Model errors were ".print_r($hmodel->errors,true));
+		}
 	}
 
 }
\ No newline at end of file

neon/phoebe/services/adapters/common/models/PhoebeObject.php

Braces +17 added lines, -12 removed lines

@@ -70,10 +70,11 @@ 
 	public function beforeSave($insert)
 	{
 		// data can only be an array and are stored as JSON
-		if (is_array($this->data) && count($this->data))
-			$this->serialised_data = json_encode($this->data);
-		else
-			$this->serialised_data = null;
+		if (is_array($this->data) && count($this->data)) {
+					$this->serialised_data = json_encode($this->data);
+		} else {
+					$this->serialised_data = null;
+		}
 		return parent::beforeSave($insert);
 	}
 
@@ -83,8 +84,9 @@ 
 	public function afterFind()
 	{
 		// return data as decoded json or null
-		if (is_string($this->serialised_data))
-			$this->data = json_decode($this->serialised_data, true);
+		if (is_string($this->serialised_data)) {
+					$this->data = json_decode($this->serialised_data, true);
+		}
 		parent::afterFind();
 	}
 
@@ -101,14 +103,17 @@ 
 		}
 		$query = PhoebeObject::find()->select(['phoebe_object.uuid', 'phoebe_class.label'])
 			->leftJoin('phoebe_class', 'phoebe_class.phoebe_type=phoebe_object.phoebe_type AND phoebe_class.class_type=phoebe_object.class_type');
-		if (!empty($query))
-			$query->where(['like', 'phoebe_class.label', $query]);
-		if (count($filters))
-			$query->andWhere($filters);
+		if (!empty($query)) {
+					$query->where(['like', 'phoebe_class.label', $query]);
+		}
+		if (count($filters)) {
+					$query->andWhere($filters);
+		}
 		$objects = $query->orderBy('phoebe_class.label')->asArray()->all();
 		$results = [];
-		foreach ($objects as $object)
-			$results[$object['uuid']] = "$object[label]: $object[uuid]";
+		foreach ($objects as $object) {
+					$results[$object['uuid']] = "$object[label]: $object[uuid]";
+		}
 		return $results;
 	}
 }

neon/phoebe/services/adapters/common/models/PhoebeClassOverrides.php

Braces +6 added lines, -5 removed lines

@@ -99,9 +99,9 @@ 
 	{
 		// active_from must be set
 		// overrides can only be an array and are stored as JSON or already JSON
-		if (is_array($this->overrides) && count($this->overrides))
-			$this->serialised_overrides = json_encode($this->overrides);
-		else {
+		if (is_array($this->overrides) && count($this->overrides)) {
+					$this->serialised_overrides = json_encode($this->overrides);
+		} else {
 			$this->serialised_overrides = null;
 		}
 		return parent::beforeSave($insert);
@@ -113,8 +113,9 @@ 
 	public function afterFind()
 	{
 		// return overrides as decoded json or null
-		if (is_string($this->serialised_overrides))
-			$this->overrides = json_decode($this->serialised_overrides, true);
+		if (is_string($this->serialised_overrides)) {
+					$this->overrides = json_decode($this->serialised_overrides, true);
+		}
 		parent::afterFind();
 	}
 

neon/phoebe/services/adapters/common/models/PhoebeClass.php

Braces +15 added lines, -11 removed lines

@@ -84,9 +84,9 @@ 
 	public function beforeSave($insert)
 	{
 		// definition can only be an array and are stored as JSON or already JSON
-		if (is_array($this->definition) && count($this->definition))
-			$this->serialised_definition = json_encode($this->definition);
-		else {
+		if (is_array($this->definition) && count($this->definition)) {
+					$this->serialised_definition = json_encode($this->definition);
+		} else {
 			$this->serialised_definition = null;
 		}
 		return parent::beforeSave($insert);
@@ -98,8 +98,9 @@ 
 	public function afterFind()
 	{
 		// return definition as decoded json or null
-		if (is_string($this->serialised_definition))
-			$this->definition = json_decode($this->serialised_definition, true);
+		if (is_string($this->serialised_definition)) {
+					$this->definition = json_decode($this->serialised_definition, true);
+		}
 		parent::afterFind();
 	}
 
@@ -120,14 +121,17 @@ 
 	public static function listClassTypes($query, $filters)
 	{
 		$query = PhoebeClass::find()->select(['class_type', 'label']);
-		if (!empty($query))
-			$query->where(['like', 'label', $query]);
-		if (count($filters))
-			$query->where($filters);
+		if (!empty($query)) {
+					$query->where(['like', 'label', $query]);
+		}
+		if (count($filters)) {
+					$query->where($filters);
+		}
 		$classes = $query->orderBy('label')->asArray()->all();
 		$results = [];
-		foreach ($classes as $class)
-			$results[$class['class_type']] = $class['label'];
+		foreach ($classes as $class) {
+					$results[$class['class_type']] = $class['label'];
+		}
 		return $results;
 	}
 }

neon/phoebe/services/adapters/common/PhoebeClassBase.php

Braces +38 added lines, -26 removed lines

@@ -103,8 +103,9 @@ 
 				$model = new ClassModel();
 				$model->attributes = array_merge($oldAttrs, $changes);
 				$model->updated = date('Y-m-d H:i:s');
-				if (!$model->save())
-					throw new \RuntimeException('Save failed with the following errors '.print_r($model->errors,true));
+				if (!$model->save()) {
+									throw new \RuntimeException('Save failed with the following errors '.print_r($model->errors,true));
+				}
 				$this->setModel($model);
 				$hasChanges = true;
 			} else {
@@ -127,8 +128,9 @@ 
 			$model->attributes = $oldAttrs;
 			return $errors;
 		}
-		if ($hasChanges)
-			$this->createEditClassMigration($model->attributes, $oldAttrs, $newModel);
+		if ($hasChanges) {
+					$this->createEditClassMigration($model->attributes, $oldAttrs, $newModel);
+		}
 		return $hasChanges;
 	}
 
@@ -216,10 +218,11 @@ 
 	{
 		if ($overrideUuid) {
 			$override = $this->getOverride($overrideUuid);
-			if (isset($override['overrides']))
-				$this->applyClassOverrideByDefinition($override['overrides']);
-			else
-				$this->applyClassOverrideByDefinition([]);
+			if (isset($override['overrides'])) {
+							$this->applyClassOverrideByDefinition($override['overrides']);
+			} else {
+							$this->applyClassOverrideByDefinition([]);
+			}
 		}
 	}
 
@@ -250,8 +253,9 @@ 
 				'deleted' => 0
 			])->asArray()->all();
 		$list = [];
-		foreach ($overrides as $o)
-			$list[$o['uuid']] = $o['label'];
+		foreach ($overrides as $o) {
+					$list[$o['uuid']] = $o['label'];
+		}
 		return $list;
 	}
 
@@ -303,8 +307,9 @@ 
 		$override->created = date('Y-m-d H:i:s');
 		$override->deleted = 0;
 		$override->overrides = [];
-		if ($override->save())
-			return $uuid;
+		if ($override->save()) {
+					return $uuid;
+		}
 		return $override->errors;
 	}
 
@@ -320,18 +325,21 @@ 
 		);
 
 		// nothing to see here move along
-		if (count($changes)===0)
-			return true;
+		if (count($changes)===0) {
+					return true;
+		}
 		// ok now do the edit
 		$override = $this->getClassOverrideModel($uuid);
 		if ($override) {
 			foreach ($changes as $key=>$value) {
-				if ($key == 'active_from')
-					$value = $this->setDateToNowOnEmpty($value);
+				if ($key == 'active_from') {
+									$value = $this->setDateToNowOnEmpty($value);
+				}
 				$override->$key = $value;
 			}
-			if ($override->save())
-				return true;
+			if ($override->save()) {
+							return true;
+			}
 			return $override->errors;
 		}
 		return false;
@@ -367,8 +375,9 @@ 
 	public function destroyOverride($uuid)
 	{
 		$override = $this->getClassOverrideModel($uuid);
-		if ($override)
-			$override->delete();
+		if ($override) {
+					$override->delete();
+		}
 	}
 
 
@@ -383,8 +392,9 @@ 
 	public function getDefinition()
 	{
 		$definition = $this->getModel()->definition;
-		if ($this->_overrides)
-			$definition = array_replace_recursive($definition, $this->_overrides);
+		if ($this->_overrides) {
+					$definition = array_replace_recursive($definition, $this->_overrides);
+		}
 		return $definition;
 	}
 
@@ -399,8 +409,9 @@ 
 		$classType = $this->getClassType();
 
 		// don't do this unless we know definitely what we are
-		if (!$phoebeType || !$classType)
-			return;
+		if (!$phoebeType || !$classType) {
+					return;
+		}
 
 		// clear out any override objects
 		OverridesModel::deleteAll([
@@ -430,8 +441,9 @@ 
 	protected function createEditClassMigration($newAttrs, $oldAttrs, $newModel)
 	{
 		// check to make sure the changes are real and need to be saved as a migration
-		if (!($newModel || $this->hasChanges($newAttrs, $oldAttrs)))
-			return;
+		if (!($newModel || $this->hasChanges($newAttrs, $oldAttrs))) {
+					return;
+		}
 
 		$up = $this->getTableRowReplaceSql('phoebe_class', $newAttrs);
 		$down = '';

neon/phoebe/services/adapters/common/PhoebeTypeBase.php

Braces +48 added lines, -32 removed lines

@@ -36,8 +36,9 @@ 
 		$paginator = $this->createPaginator($paginator);
 		$orderBy = count($orderBy)>0 ? $orderBy : 'label ASC';
 		$filters = array_intersect_key($filters, array_flip(['class_type','label','description','module']));
-		if (isset($filters['class_type']))
-			$filters['class_type'] = $this->canonicaliseRef($filters['class_type']);
+		if (isset($filters['class_type'])) {
+					$filters['class_type'] = $this->canonicaliseRef($filters['class_type']);
+		}
 
 		/*
 		 * This slightly unusual query according to MySQL is an efficient way to find the highest version of
@@ -61,10 +62,12 @@ 
 			$query->andWhere(['p1.deleted'=>0]);
 		}
 		$query->select($select);
-		foreach ($filters as $key=>$value)
-			$query->andWhere(['like', "p1.$key", $value]);
-		if ($paginator['start']==0)
-			$paginator['total'] = $query->count();
+		foreach ($filters as $key=>$value) {
+					$query->andWhere(['like', "p1.$key", $value]);
+		}
+		if ($paginator['start']==0) {
+					$paginator['total'] = $query->count();
+		}
 
 		// and get the results
 		$results = $query->offset($paginator['start'])
@@ -74,8 +77,9 @@ 
 
 		// finally index them by the class_type as this is useful for changes in other classes
 		$return = [];
-		foreach ($results as $r)
-			$return[$r['class_type']] = $r;
+		foreach ($results as $r) {
+					$return[$r['class_type']] = $r;
+		}
 		return $return;
 	}
 
@@ -85,8 +89,9 @@ 
 	public function addClass(&$classType, $module='')
 	{
 		$classType = $this->canonicaliseRef($classType);
-		if (empty($classType))
-			throw new \RuntimeException("Invalid classType $classType");
+		if (empty($classType)) {
+					throw new \RuntimeException("Invalid classType $classType");
+		}
 
 		// create a model for the class
 		$model = $this->createPhoebeClassModel($classType, $module);
@@ -94,8 +99,9 @@ 
 		try {
 			if ($model->save()) {
 				$class = $this->createIPhoebeClass($model);
-			} else
-				throw new \Exception('Errors on save');
+			} else {
+							throw new \Exception('Errors on save');
+			}
 		} catch (\Exception $e) {
 			throw new \RuntimeException('Failed to create model. Exception was "'.$e->getMessage().'". Model errors were '.print_r($model->errors, true));
 		}
@@ -109,16 +115,18 @@ 
 	public function getClass($classType, $version=null, $classOverrideCriteria=[])
 	{
 		$classType = $this->canonicaliseRef($classType);
-		if (empty($classType))
-			return null;
+		if (empty($classType)) {
+					return null;
+		}
 
 		$model = $this->getClassModel($classType, $version);
 		if ($model) {
 			$class = $this->createIPhoebeClass($model);
 			if ($classOverrideCriteria !== false) {
 				$override = $class->findClassOverride($classOverrideCriteria);
-				if ($override)
-					$class->applyClassOverrideByDefinition($override['overrides']);
+				if ($override) {
+									$class->applyClassOverrideByDefinition($override['overrides']);
+				}
 			}
 			return $class;
 		}
@@ -132,8 +140,9 @@ 
 	{
 		$models = $this->getClassModels($classTypes);
 		$classes = array();
-		foreach ($models as $type => $model)
-			$classes[$type] = $model ? $this->createIPhoebeClass($model) : null;
+		foreach ($models as $type => $model) {
+					$classes[$type] = $model ? $this->createIPhoebeClass($model) : null;
+		}
 		return $classes;
 	}
 
@@ -176,8 +185,9 @@ 
 		]);
 		$select = ['uuid','phoebe_type','class_type','version','created','updated'];
 
-		if (in_array('data', $additionalFields))
-			$select[] = 'serialised_data';
+		if (in_array('data', $additionalFields)) {
+					$select[] = 'serialised_data';
+		}
 		if (in_array('deleted', $additionalFields)) {
 			$select[] = 'deleted';
 		} else {
@@ -185,10 +195,12 @@ 
 		}
 		$query->select($select);
 
-		foreach ($filters as $key=>$value)
-			$query->andWhere(['=', $key, $value]);
-		if ($paginator['start']==0)
-			$paginator['total'] = $query->count();
+		foreach ($filters as $key=>$value) {
+					$query->andWhere(['=', $key, $value]);
+		}
+		if ($paginator['start']==0) {
+					$paginator['total'] = $query->count();
+		}
 		// and get the results
 		return $query->offset($paginator['start'])
 			->limit($paginator['length'])
@@ -215,13 +227,15 @@ 
 				// work out what class override needs to be applied
 				if ($classOverrideCriteria !== false) {
 					$override = $phoebeObject->findClassOverride($classOverrideCriteria, ['uuid']);
-					if ($override)
-						$model->override_uuid = $override['uuid'];
+					if ($override) {
+											$model->override_uuid = $override['uuid'];
+					}
 					$model->save();
 				}
 				return $phoebeObject;
-			} else
-				throw new \Exception('Errors on save');
+			} else {
+							throw new \Exception('Errors on save');
+			}
 		} catch (\Exception $e) {
 			throw new \RuntimeException('Failed to create model. Exception was "'.$e->getMessage().'". Model errors were '.print_r($model->errors, true));
 		}
@@ -252,13 +266,15 @@ 
 	protected function getClassFromType($classType)
 	{
 		$classType = $this->canonicaliseRef($classType);
-		if (empty($classType))
-			throw new \RuntimeException("Invalid classType '$classType'");
+		if (empty($classType)) {
+					throw new \RuntimeException("Invalid classType '$classType'");
+		}
 
 		// check a class of this classType exists
 		$class = $this->getClassModel($classType);
-		if (!$class)
-			throw new \RuntimeException("No class of type '$classType' available");
+		if (!$class) {
+					throw new \RuntimeException("No class of type '$classType' available");
+		}
 		return $class;
 	}
 

neon/phoebe/services/adapters/common/PhoebeBase.php

Braces +52 added lines, -36 removed lines

@@ -83,8 +83,9 @@ 
 	public function __get($name)
 	{
 		$attrs = $this->getModelAttributes();
-		if (array_key_exists($name, $attrs))
-			return $attrs[$name];
+		if (array_key_exists($name, $attrs)) {
+					return $attrs[$name];
+		}
 		return parent::__get($name);
 	}
 
@@ -92,10 +93,11 @@ 
 	{
 		$model = $this->getModel();
 		$attrs = $model->attributes();
-		if (in_array($name, $attrs))
-			$model->$name = $value;
-		else
-			parent::__set($name, $value);
+		if (in_array($name, $attrs)) {
+					$model->$name = $value;
+		} else {
+					parent::__set($name, $value);
+		}
 	}
 
 	/**
@@ -106,8 +108,9 @@ 
 	 */
 	protected function getPhoebeType()
 	{
-		if (empty($this->phoebeType))
-			throw new \RuntimeException('The phoebeType needs to be set during construction');
+		if (empty($this->phoebeType)) {
+					throw new \RuntimeException('The phoebeType needs to be set during construction');
+		}
 		return $this->phoebeType;
 	}
 
@@ -119,8 +122,9 @@ 
 	 */
 	protected function getClassType()
 	{
-		if (empty($this->classType))
-			throw new \RuntimeException('The classType needs to be set during construction');
+		if (empty($this->classType)) {
+					throw new \RuntimeException('The classType needs to be set during construction');
+		}
 		return $this->classType;
 	}
 
@@ -132,8 +136,9 @@ 
 	 */
 	protected function getClassVersion()
 	{
-		if (empty($this->classVersion))
-			throw new \RuntimeException('The classVersion needs to be set during construction');
+		if (empty($this->classVersion)) {
+					throw new \RuntimeException('The classVersion needs to be set during construction');
+		}
 		return $this->classVersion;
 	}
 
@@ -172,8 +177,9 @@ 
 	 */
 	protected function getModel()
 	{
-		if (!$this->_model)
-			throw new \RuntimeException('The model has not yet been set');
+		if (!$this->_model) {
+					throw new \RuntimeException('The model has not yet been set');
+		}
 		return $this->_model;
 	}
 
@@ -183,8 +189,9 @@ 
 	 */
 	protected function getModelAttributes()
 	{
-		if ($this->_model)
-			return $this->_model->attributes;
+		if ($this->_model) {
+					return $this->_model->attributes;
+		}
 		return [];
 	}
 
@@ -197,8 +204,9 @@ 
 	{
 		$model = $this->getModel();
 		$model->deleted = 1;
-		if ($model->save())
-			return true;
+		if ($model->save()) {
+					return true;
+		}
 		return $model->errors;
 	}
 
@@ -211,8 +219,9 @@ 
 	{
 		$model = $this->getModel();
 		$model->deleted = 0;
-		if ($model->save())
-			return true;
+		if ($model->save()) {
+					return true;
+		}
 		return $model->errors;
 	}
 
@@ -228,10 +237,11 @@ 
 			'phoebe_type'=>$this->getPhoebeType(),
 			'class_type'=>$classType
 		]);
-		if ($version)
-			$query->andWhere(['version'=>$version]);
-		else
-			$query->limit(1)->orderBy('version DESC');
+		if ($version) {
+					$query->andWhere(['version'=>$version]);
+		} else {
+					$query->limit(1)->orderBy('version DESC');
+		}
 
 		return $query->one();
 	}
@@ -268,8 +278,9 @@ 
 			->andWhere('b.version IS NULL')
 			->all();
 		$classes = [];
-		foreach ($models as $model)
-			$classes[$model->class_type] = $model;
+		foreach ($models as $model) {
+					$classes[$model->class_type] = $model;
+		}
 		return $classes;
 	}
 
@@ -291,16 +302,18 @@ 
 	 */
 	protected function getTableRowReplaceSql($table, $row)
 	{
-		if (!is_array($row))
-			$row = $row->toArray();
+		if (!is_array($row)) {
+					$row = $row->toArray();
+		}
 		$fields = [];
 		$values = [];
 		foreach ($row as $f=>$v) {
 			$fields[]=$f;
 			$values[] = $this->pdoQuote($v);
 		}
-		if (count($fields))
-			return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(",",$values)).");";
+		if (count($fields)) {
+					return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(",",$values)).");";
+		}
 		return null;
 	}
 
@@ -336,8 +349,9 @@ 
 		];
 		// convert a request for overrides to serialised_overrides
 		if ($fields) {
-			if (in_array('overrides', $fields))
-				$fields[] ='serialised_overrides';
+			if (in_array('overrides', $fields)) {
+							$fields[] ='serialised_overrides';
+			}
 			$selectFields = array_intersect($selectFields, $fields);
 		}
 		$selector = !empty($filters['selector']) ? $filters['selector'] : '';
@@ -366,10 +380,12 @@ 
 	 */
 	private function pdoQuote($value)
 	{
-		if (is_array($value))
-			$value = json_encode($value);
-		if (is_null($value))
-			return 'null';
+		if (is_array($value)) {
+					$value = json_encode($value);
+		}
+		if (is_null($value)) {
+					return 'null';
+		}
 		return neon()->db->pdo->quote($value);
 	}