newicon / neon

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

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getClassFormDefinition(array $fields=[])
+	public function getClassFormDefinition(array $fields = [])
 	{
 		// if there is no definition return an empty form
 		if (empty($this->definition))
@@ -133,19 +133,19 @@ 
 	protected function convertRenderablesToFields($key, $renderables) {
 		if (!isset($renderables[$key])) {
 			dd("Key $key doesn't exist in the form definition", $renderables);
-		throw new \RuntimeException("Key $key doesn't exist in the form definition");}
+		throw new \RuntimeException("Key $key doesn't exist in the form definition"); }
 		$rend = $renderables[$key];
-		$field=[];
+		$field = [];
 		if (!empty($rend['type'])) {
 			$field = [];
-			switch($rend['type']) {
+			switch ($rend['type']) {
 				case 'FormComponent':
 					if (isset($rend['items']))
 						$field['fields'] = $this->addItems($rend['items'], $renderables);
 				break;
 				case 'ClassComponent':
 					$classDefinition = isset($rend['definition']) ? $rend['definition'] : [];
-					if (count($rend['items'])>0) {
+					if (count($rend['items']) > 0) {
 						$field['fields'] = [];
 						$field['label'] = '';
 						if (isset($classDefinition['showLabel']) && $classDefinition['showLabel'])
@@ -217,7 +217,7 @@ 
 		$field['allowRemove'] = $allowChangeOfRepeats;
 
 		// now set the template header part
-		$field['template']['class'] =  "neon\\core\\form\\Form";
+		$field['template']['class'] = "neon\\core\\form\\Form";
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 	 * so we know what object it belongs to if set
 	 * @return array
 	 */
-	protected function createHiddenField($name, $value=null)
+	protected function createHiddenField($name, $value = null)
 	{
 		return [
 			'class' => "neon\\core\\form\\fields\\Hidden",
@@ -238,7 +238,7 @@ 
 	protected function createFieldName($field)
 	{
 		$uuid = isset($field['id']) ? $field['id'] : Hash::uuid64();
-		return str_replace(['-','_'],['a','Z'], $uuid);
+		return str_replace(['-', '_'], ['a', 'Z'], $uuid);
 	}
 
 }
\ No newline at end of file

Braces +29 added lines, -20 removed lines

@@ -26,8 +26,9 @@ 
 	public function getClassFormDefinition(array $fields=[])
 	{
 		// if there is no definition return an empty form
-		if (empty($this->definition))
-			return [];
+		if (empty($this->definition)) {
+					return [];
+		}
 
 		// TODO - NJ20180426 - see if we can get Phoebe to listen to $fields
 
@@ -55,8 +56,9 @@ 
 	 */
 	public function editClass($changes)
 	{
-		if (isset($changes['definition']))
-			$changes['definition'] = $this->prepareDefinition($changes['definition']);
+		if (isset($changes['definition'])) {
+					$changes['definition'] = $this->prepareDefinition($changes['definition']);
+		}
 		parent::editClass($changes);
 	}
 
@@ -84,8 +86,9 @@ 
 	{
 		$definition = $this->definition;
 		$applicationDataPhoebeUuids = [];
-		foreach ($ddsClassTypes as $ct)
-			$applicationDataPhoebeUuids[$ct] = null;
+		foreach ($ddsClassTypes as $ct) {
+					$applicationDataPhoebeUuids[$ct] = null;
+		}
 		foreach ($definition['renderables'] as $k=>$r) {
 			if ($r['type'] == 'ClassComponent' && in_array($r['class_type'], $ddsClassTypes)) {
 				$applicationDataPhoebeUuids[$r['class_type']] = $k;
@@ -125,8 +128,9 @@ 
 		$fields = $this->convertRenderablesToFields($definition['rootNode'], $definition['renderables']);
 		$form['fields'] = $fields['fields'];
 		// apply any overrides to the form
-		if ($this->_overrides)
-			$form = array_replace_recursive($form, $this->_overrides);
+		if ($this->_overrides) {
+					$form = array_replace_recursive($form, $this->_overrides);
+		}
 		return $form;
 	}
 
@@ -140,23 +144,27 @@ 
 			$field = [];
 			switch($rend['type']) {
 				case 'FormComponent':
-					if (isset($rend['items']))
-						$field['fields'] = $this->addItems($rend['items'], $renderables);
+					if (isset($rend['items'])) {
+											$field['fields'] = $this->addItems($rend['items'], $renderables);
+					}
 				break;
 				case 'ClassComponent':
 					$classDefinition = isset($rend['definition']) ? $rend['definition'] : [];
 					if (count($rend['items'])>0) {
 						$field['fields'] = [];
 						$field['label'] = '';
-						if (isset($classDefinition['showLabel']) && $classDefinition['showLabel'])
-							$field['label'] = isset($classDefinition['label']) ? $classDefinition['label'] : $rend['label'];
+						if (isset($classDefinition['showLabel']) && $classDefinition['showLabel']) {
+													$field['label'] = isset($classDefinition['label']) ? $classDefinition['label'] : $rend['label'];
+						}
 						$field['description'] = '';
-						if (isset($classDefinition['showDescription']) && $classDefinition['showDescription'])
-							$field['description'] = isset($classDefinition['description']) ? $classDefinition['description'] : $rend['description'];
+						if (isset($classDefinition['showDescription']) && $classDefinition['showDescription']) {
+													$field['description'] = isset($classDefinition['description']) ? $classDefinition['description'] : $rend['description'];
+						}
 						if ($this->isRepeater($rend)) {
 							$this->addRepeaterHeader($field, $rend['definition'], $key);
-							if (isset($classDefinition['showLabel']) && $classDefinition['showLabel'])
-								$field['template']['label'] = isset($classDefinition['label']) ? $classDefinition['label'] : $rend['label'];
+							if (isset($classDefinition['showLabel']) && $classDefinition['showLabel']) {
+															$field['template']['label'] = isset($classDefinition['label']) ? $classDefinition['label'] : $rend['label'];
+							}
 							$field['template']['fields'] = $this->addItems($rend['items'], $renderables);
 							$field['template']['fields'][] = $this->createHiddenField('_renderable', $key);
 							$field['template']['fields'][] = $this->createHiddenField('_classType', $rend['class_type']);
@@ -191,10 +199,11 @@ 
 		$order = 1;
 		foreach ($items as $rKey) {
 			$subField = $this->convertRenderablesToFields($rKey, $renderables, 1);
-			if (isset($subField[$rKey]))
-				$field[$rKey] = $subField[$rKey];
-			else
-				$field[$rKey] = $subField;
+			if (isset($subField[$rKey])) {
+							$field[$rKey] = $subField[$rKey];
+			} else {
+							$field[$rKey] = $subField;
+			}
 			$field[$rKey]['order'] = $order++;
 		}
 		return $field;

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

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 {
 	use PhoebeTrait;
 
-	public function __construct($config=[])
+	public function __construct($config = [])
 	{
 		$path = '\neon\phoebe\services\adapters\appforms';
 		$config['phoebeType'] = 'applicationForm';
@@ -28,7 +28,7 @@ 
 		parent::__construct($config);
 	}
 
-	public function getClass($classType, $version=null, $classOverrideCriteria=[])
+	public function getClass($classType, $version = null, $classOverrideCriteria = [])
 	{
 		$class = parent::getClass($classType, $version, $classOverrideCriteria);
 		// update member definitions with the latest from the database and

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

Spacing +6 added lines, -6 removed lines

@@ -28,7 +28,7 @@ 
 	 * values can be changed if they were changed in the Daedalus definition
 	 * @param type $definition
 	 */
-	protected function updateDefinitionFromDds($definition, $includeAll=false)
+	protected function updateDefinitionFromDds($definition, $includeAll = false)
 	{
 		if (!empty($definition['renderables'])) {
 			$classes = $this->getDdsClassDefinitions($definition);
@@ -162,7 +162,7 @@ 
 				}
 			}
 		}
-		if (count($newClassTypes)>0) {
+		if (count($newClassTypes) > 0) {
 			$newClasses = $this->ddsPhoebe()->getClasses($newClassTypes);
 			foreach ($newClasses as $newClass) {
 				$requestedClasses[$newClass->class_type] = $newClass;
@@ -185,7 +185,7 @@ 
 					if (!isset($memberDefinition['definition'][$key]) || ($memberDefinition['definition'][$key] != $value))
 						$differences[$key] = $value;
 				}
-				$renderable['changes']=$differences;
+				$renderable['changes'] = $differences;
 			}
 		}
 	}
@@ -198,10 +198,10 @@ 
 	protected function sanitiseDefinition(&$definition)
 	{
 		/** Remove Orphaned Renderables **/
-		$items = [ $definition['rootNode'] ];
+		$items = [$definition['rootNode']];
 		foreach ($definition['renderables'] as $renderable) {
 			if (isset($renderable['items'])) {
-				$items = array_merge($items,$renderable['items']);
+				$items = array_merge($items, $renderable['items']);
 			}
 		}
 		// remove renderables not linked via rootNode
@@ -228,7 +228,7 @@ 
 			$uuid64s[] = Hash::uuid2uuid64($key);
 		}
 		$serialised = str_replace($keys, $uuid64s, $serialised);
-		$definition = json_decode($serialised,true);
+		$definition = json_decode($serialised, true);
 	}
 
 	private function ddsPhoebe()

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

Spacing +4 added lines, -4 removed lines

@@ -121,7 +121,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function setOverride($overrideUuid, $force=false)
+	public function setOverride($overrideUuid, $force = false)
 	{
 		// don't override an override unless forced to do so
 		if (!$force && $this->override_uuid)
@@ -150,7 +150,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listHistory(&$paginator=[])
+	public function listHistory(&$paginator = [])
 	{
 		// check the inputs
 		$paginator = $this->createPaginator($paginator);
@@ -158,7 +158,7 @@ 
 		$query = ObjectHistoryModel::find()
 			->where(['object_uuid' => $this->uuid]);
 
-		if ($paginator['start']==0)
+		if ($paginator['start'] == 0)
 			$paginator['total'] = $query->count();
 
 		// and get the results
@@ -237,7 +237,7 @@ 
 		$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));
+			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

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

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 	/**
 	 * @inheritdoc
 	 */
-	public function toArray(array $fields=[], array $expand=[], $recursive=true)
+	public function toArray(array $fields = [], array $expand = [], $recursive = true)
 	{
 		$data = parent::toArray($fields, $expand, $recursive);
 		unset($data['serialised_overrides']);

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

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
 		parent::afterFind();
 	}
 
-	public function toArray(array $fields=[], array $expand=[], $recursive=true)
+	public function toArray(array $fields = [], array $expand = [], $recursive = true)
 	{
 		$data = parent::toArray($fields, $expand, $recursive);
 		unset($data['serialised_definition']);

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

Spacing +10 added lines, -10 removed lines

@@ -60,7 +60,7 @@ 
 			]
 		];
 		foreach ($additionalColumns as $column) {
-			switch($column) {
+			switch ($column) {
 				case 'data':
 					$definition['serialised_data'] = [
 						'class' => 'neon\core\grid\column\DefinitionColumn',
@@ -96,7 +96,7 @@ 
 		// if we are locking objects to versions then an increase in version needs to
 		// result in a new row in the phoebeClass relation regardless of changes
 		$hasChanges = false;
-		$newModel=false;
+		$newModel = false;
 		try {
 			if ($model->version_locked && isset($changes['version']) && $changes['version'] != $model->version) {
 				$newModel = true;
@@ -104,7 +104,7 @@ 
 				$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));
+					throw new \RuntimeException('Save failed with the following errors '.print_r($model->errors, true));
 				$this->setModel($model);
 				$hasChanges = true;
 			} else {
@@ -118,7 +118,7 @@ 
 				if ($hasChanges) {
 					$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));
+						throw new \RuntimeException('Save failed with the following errors: '.print_r($model->errors, true));
 					}
 				}
 			}
@@ -139,7 +139,7 @@ 
 	{
 		$model = $this->getModel();
 		$oldAttrs = $model->attributes;
-		if (($result=$this->modelDelete()) === true) {
+		if (($result = $this->modelDelete()) === true) {
 			$newAttrs = $model->attributes;
 			$this->createEditClassMigration($newAttrs, $oldAttrs, false);
 		}
@@ -153,7 +153,7 @@ 
 	{
 		$model = $this->getModel();
 		$oldAttrs = $model->attributes;
-		if (($result=$this->modelUndelete()) === true) {
+		if (($result = $this->modelUndelete()) === true) {
 			$newAttrs = $model->attributes;
 			$this->createEditClassMigration($newAttrs, $oldAttrs, false);
 		}
@@ -199,7 +199,7 @@ 
 	 * Set any overrides onto the class
 	 * @var array
 	 */
-	protected $_overrides=null;
+	protected $_overrides = null;
 
 	/**
 	 * @inheritdoc
@@ -258,7 +258,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function findOverride($filters=[])
+	public function findOverride($filters = [])
 	{
 		return $this->findClassOverride($filters);
 	}
@@ -286,7 +286,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addOverride($label, $selector='', $activeFrom=null, $activeTo=null, $isActive=true)
+	public function addOverride($label, $selector = '', $activeFrom = null, $activeTo = null, $isActive = true)
 	{
 		$uuid = Hash::uuid64();
 		$model = $this->getModel();
@@ -320,7 +320,7 @@ 
 		);
 
 		// nothing to see here move along
-		if (count($changes)===0)
+		if (count($changes) === 0)
 			return true;
 		// ok now do the edit
 		$override = $this->getClassOverrideModel($uuid);

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

Spacing +13 added lines, -13 removed lines

@@ -30,12 +30,12 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listClasses(&$paginator=[], $filters=[], $orderBy=[], $includeDeleted=false)
+	public function listClasses(&$paginator = [], $filters = [], $orderBy = [], $includeDeleted = false)
 	{
 		// check the inputs
 		$paginator = $this->createPaginator($paginator);
-		$orderBy = count($orderBy)>0 ? $orderBy : 'label ASC';
-		$filters = array_intersect_key($filters, array_flip(['class_type','label','description','module']));
+		$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']);
 
@@ -63,7 +63,7 @@ 
 		$query->select($select);
 		foreach ($filters as $key=>$value)
 			$query->andWhere(['like', "p1.$key", $value]);
-		if ($paginator['start']==0)
+		if ($paginator['start'] == 0)
 			$paginator['total'] = $query->count();
 
 		// and get the results
@@ -82,7 +82,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addClass(&$classType, $module='')
+	public function addClass(&$classType, $module = '')
 	{
 		$classType = $this->canonicaliseRef($classType);
 		if (empty($classType))
@@ -106,7 +106,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getClass($classType, $version=null, $classOverrideCriteria=[])
+	public function getClass($classType, $version = null, $classOverrideCriteria = [])
 	{
 		$classType = $this->canonicaliseRef($classType);
 		if (empty($classType))
@@ -161,20 +161,20 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listObjects($classType, &$paginator=[], $filters=[], $orderBy=[], $additionalFields=[])
+	public function listObjects($classType, &$paginator = [], $filters = [], $orderBy = [], $additionalFields = [])
 	{
 
 		// check the inputs
 		$classType = $this->canonicaliseRef($classType);
 		$paginator = $this->createPaginator($paginator);
-		$orderBy = count($orderBy)>0 ? $orderBy : 'created DESC';
-		$filters = array_intersect_key($filters, array_flip(['version','created','updated']));
+		$orderBy = count($orderBy) > 0 ? $orderBy : 'created DESC';
+		$filters = array_intersect_key($filters, array_flip(['version', 'created', 'updated']));
 
 		$query = ObjectModel::find()->where([
 			'phoebe_type' => $this->getPhoebeType(),
 			'class_type' => $classType
 		]);
-		$select = ['uuid','phoebe_type','class_type','version','created','updated'];
+		$select = ['uuid', 'phoebe_type', 'class_type', 'version', 'created', 'updated'];
 
 		if (in_array('data', $additionalFields))
 			$select[] = 'serialised_data';
@@ -187,7 +187,7 @@ 
 
 		foreach ($filters as $key=>$value)
 			$query->andWhere(['=', $key, $value]);
-		if ($paginator['start']==0)
+		if ($paginator['start'] == 0)
 			$paginator['total'] = $query->count();
 		// and get the results
 		return $query->offset($paginator['start'])
@@ -200,7 +200,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addObject($classType, $classOverrideCriteria=[])
+	public function addObject($classType, $classOverrideCriteria = [])
 	{
 		$class = $this->getClassFromType($classType);
 
@@ -307,7 +307,7 @@ 
 	 *   created automatically or if false then it is left as null.
 	 * @return neon\phoebe\services\adapters\common\models\PhoebeObject
 	 */
-	protected function createPhoebeObjectModel($classType, $uuid=null)
+	protected function createPhoebeObjectModel($classType, $uuid = null)
 	{
 		// create a model for the class
 		$model = new ObjectModel();

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