newicon / neon

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

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

Spacing +10 added lines, -10 removed lines

@@ -65,7 +65,7 @@ 
 	 */
 	public function toArray()
 	{
-		$model =  $this->getModel();
+		$model = $this->getModel();
 		return $model ? $model->toArray() : [];
 	}
 
@@ -143,12 +143,12 @@ 
 	 *   'start', 'length', and 'total'
 	 * @return array
 	 */
-	protected function createPaginator($paginator=[])
+	protected function createPaginator($paginator = [])
 	{
 		return [
-			'start'=> (isset($paginator['start']) ? max(0, (int)$paginator['start']) : 0),
-			'length'=> (isset($paginator['length']) ? max(1,min(self::CLASS_LIST_LIMIT,(int)$paginator['length'])) : self::CLASS_LIST_LIMIT),
-			'total'=> (isset($paginator['total']) ? (int)$paginator['total'] : null)
+			'start'=> (isset($paginator['start']) ? max(0, (int) $paginator['start']) : 0),
+			'length'=> (isset($paginator['length']) ? max(1, min(self::CLASS_LIST_LIMIT, (int) $paginator['length'])) : self::CLASS_LIST_LIMIT),
+			'total'=> (isset($paginator['total']) ? (int) $paginator['total'] : null)
 		];
 	}
 
@@ -222,7 +222,7 @@ 
 	 * @param string $version
 	 * @return \neon\phoebe\services\adapters\common\models\PhoebeClass
 	 */
-	protected function getClassModel($classType, $version=null)
+	protected function getClassModel($classType, $version = null)
 	{
 		$query = ClassModel::find()->where([
 			'phoebe_type'=>$this->getPhoebeType(),
@@ -296,11 +296,11 @@ 
 		$fields = [];
 		$values = [];
 		foreach ($row as $f=>$v) {
-			$fields[]=$f;
+			$fields[] = $f;
 			$values[] = $this->pdoQuote($v);
 		}
 		if (count($fields))
-			return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(",",$values)).");";
+			return "REPLACE INTO `$table` (`".(implode('`,`', $fields)).'`) VALUES ('.(implode(",", $values)).");";
 		return null;
 	}
 
@@ -329,7 +329,7 @@ 
 	 * @param array $fields  use these to select a subset of fields returned.
 	 * @return array  the override
 	 */
-	protected function findClassOverride($filters, $fields=[])
+	protected function findClassOverride($filters, $fields = [])
 	{
 		$selectFields = [
 			'uuid', 'label', 'selector', 'is_active', 'active_from', 'active_to', 'serialised_overrides'
@@ -337,7 +337,7 @@ 
 		// convert a request for overrides to serialised_overrides
 		if ($fields) {
 			if (in_array('overrides', $fields))
-				$fields[] ='serialised_overrides';
+				$fields[] = 'serialised_overrides';
 			$selectFields = array_intersect($selectFields, $fields);
 		}
 		$selector = !empty($filters['selector']) ? $filters['selector'] : '';

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

neon/phoebe/services/adapters/daedalus/PhoebeObject.php

Braces +6 added lines, -4 removed lines

@@ -36,8 +36,9 @@ 
 	public function setDataSources($sources)
 	{
 		foreach ($sources as $key=>$value) {
-			if (empty($value))
-				unset($sources[$key]);
+			if (empty($value)) {
+							unset($sources[$key]);
+			}
 		}
 		$this->dataSources = $sources;
 	}
@@ -114,8 +115,9 @@ 
 	 */
 	protected function ddo()
 	{
-		if ($this->_ddo == null)
-			$this->_ddo = neon('dds')->IDdsObjectManagement;
+		if ($this->_ddo == null) {
+					$this->_ddo = neon('dds')->IDdsObjectManagement;
+		}
 		return $this->_ddo;
 	}
 

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

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
 	public function editClass($changes)
 	{
 		if (!is_array($changes))
-			throw new \RuntimeException('You should pass an array into editClass. You passed in '.print_r($changes,true));
+			throw new \RuntimeException('You should pass an array into editClass. You passed in '.print_r($changes, true));
 
 		// make the appropriate changes to dds. Any unknown fields are ignored
 		$this->dds()->editClass($this->classType, $changes);
@@ -72,7 +72,7 @@ 
 
 		foreach ($fields as $k => $f) {
 			// map some form to Phoebe differences
-			$f['link_class'] = (!empty($f['linkClass']) ? $f['linkClass'] : null);  // named differently
+			$f['link_class'] = (!empty($f['linkClass']) ? $f['linkClass'] : null); // named differently
 			// extract the definition for saving in phoebe
 			$definition = $f['definition'];
 
@@ -121,7 +121,7 @@ 
 
 		// and save to phoebe - remove unallowed phoebe values for Daedalus tables
 		$changes = array_diff_key($changes, array_flip(['version', 'volatile', 'object_history', 'version_locked']));
-		if (count($changes)==0)
+		if (count($changes) == 0)
 			return;
 		$hasChanges = parent::editClass($changes);
 		return $hasChanges;
@@ -161,7 +161,7 @@ 
 	/** --------------------------------------- **/
 	/** -------- Class Override Methods ------- **/
 
-	public function addOverride($label, $selector='', $activeFrom=null, $activeTo=null, $isActive=true)
+	public function addOverride($label, $selector = '', $activeFrom = null, $activeTo = null, $isActive = true)
 	{
 		throw new \RuntimeException("Overrides are not available for Daedalus tables");
 	}
@@ -193,7 +193,7 @@ 
 	 *   reordering the form in the process
 	 * @return array
 	 */
-	protected function getDefinitionAsForm($excludeDeletedFields=true, array $restrictToFields=[])
+	protected function getDefinitionAsForm($excludeDeletedFields = true, array $restrictToFields = [])
 	{
 		$fields = [];
 		$definition = $this->definition;

Braces +29 added lines, -20 removed lines

@@ -54,8 +54,9 @@ 
 	 */
 	public function editClass($changes)
 	{
-		if (!is_array($changes))
-			throw new \RuntimeException('You should pass an array into editClass. You passed in '.print_r($changes,true));
+		if (!is_array($changes)) {
+					throw new \RuntimeException('You should pass an array into editClass. You passed in '.print_r($changes,true));
+		}
 
 		// make the appropriate changes to dds. Any unknown fields are ignored
 		$this->dds()->editClass($this->classType, $changes);
@@ -108,10 +109,11 @@ 
 			if ($f['mapField'] == 1 && $currentData['map_field'] == 0) {
 				$this->dds()->setMemberAsMapField($this->classType, $memberRef);
 			}
-			if ($definition['deleted'] == 1 && $currentData['deleted'] == 0)
-				$this->dds()->deleteMember($this->classType, $memberRef);
-			else if ($definition['deleted'] == 0 && $currentData['deleted'] == 1)
-				$this->dds()->undeleteMember($this->classType, $memberRef);
+			if ($definition['deleted'] == 1 && $currentData['deleted'] == 0) {
+							$this->dds()->deleteMember($this->classType, $memberRef);
+			} else if ($definition['deleted'] == 0 && $currentData['deleted'] == 1) {
+							$this->dds()->undeleteMember($this->classType, $memberRef);
+			}
 			if ($definition['deleted'] == -1) {
 				// remove definition from phoebe
 				unset($changes['definition']['fields'][$k]);
@@ -121,8 +123,9 @@ 
 
 		// and save to phoebe - remove unallowed phoebe values for Daedalus tables
 		$changes = array_diff_key($changes, array_flip(['version', 'volatile', 'object_history', 'version_locked']));
-		if (count($changes)==0)
-			return;
+		if (count($changes)==0) {
+					return;
+		}
 		$hasChanges = parent::editClass($changes);
 		return $hasChanges;
 	}
@@ -132,8 +135,9 @@ 
 	 */
 	public function deleteClass()
 	{
-		if (($result = parent::deleteClass()))
-			$this->dds()->deleteClass($this->classType);
+		if (($result = parent::deleteClass())) {
+					$this->dds()->deleteClass($this->classType);
+		}
 		return $result;
 	}
 
@@ -142,8 +146,9 @@ 
 	 */
 	public function undeleteClass()
 	{
-		if (($result = parent::undeleteClass()))
-			$this->dds()->undeleteClass($this->classType);
+		if (($result = parent::undeleteClass())) {
+					$this->dds()->undeleteClass($this->classType);
+		}
 		return $result;
 	}
 
@@ -152,8 +157,9 @@ 
 	 */
 	public function destroyClass()
 	{
-		if (($result = parent::destroyClass()))
-			$this->dds()->destroyClass($this->classType);
+		if (($result = parent::destroyClass())) {
+					$this->dds()->destroyClass($this->classType);
+		}
 		return $result;
 	}
 
@@ -199,8 +205,9 @@ 
 		$definition = $this->definition;
 		$order = 0;
 		$restrictFields = count($restrictToFields) > 0;
-		if ($restrictFields)
-			$restrictFieldPostion = array_flip($restrictToFields);
+		if ($restrictFields) {
+					$restrictFieldPostion = array_flip($restrictToFields);
+		}
 		if (isset($definition['fields'])) {
 			$fields = $definition['fields'];
 			foreach ($fields as $key=>$field) {
@@ -215,8 +222,9 @@ 
 				if (isset($field['definition'])) {
 					$fields[$key] = $field['definition'];
 					$fields[$key]['mapField'] = $field['mapField'];
-					if (isset($field['deleted']))
-						$fields[$key]['deleted'] = $field['deleted'];
+					if (isset($field['deleted'])) {
+											$fields[$key]['deleted'] = $field['deleted'];
+					}
 					// TODO - 20180522 NJ
 					// THIS WILL GO WRONG WITH DELETED FIELDS WHERE FINAL SUBMIT BUTTON MAY BE IN WRONG PLACE
 					$fields[$key]['order'] = ($restrictFields ? ($restrictFieldPostion[$key]) : $order++);
@@ -232,8 +240,9 @@ 
 	protected $_dds = null;
 	protected function dds()
 	{
-		if ($this->_dds == null)
-			$this->_dds = neon('dds')->iDdsClassManagement;
+		if ($this->_dds == null) {
+					$this->_dds = neon('dds')->iDdsClassManagement;
+		}
 		return $this->_dds;
 	}
 

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

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
 	 * Set this up as a daedalus type
 	 * @param array $config
 	 */
-	public function __construct($config=[])
+	public function __construct($config = [])
 	{
 		$path = '\neon\phoebe\services\adapters\daedalus';
 		$config['phoebeType'] = 'daedalus';
@@ -94,7 +94,7 @@ 
 
 	/** ------------ Class Methods ----------- **/
 
-	public function listClasses(&$paginator=[], $filters=[], $orderBy=[], $includeDeleted=false)
+	public function listClasses(&$paginator = [], $filters = [], $orderBy = [], $includeDeleted = false)
 	{
 		$classes = parent::listClasses($paginator, $filters, $orderBy, $includeDeleted);
 		$this->mergeDaedalusFields($classes);
@@ -104,7 +104,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addClass(&$classType, $module='')
+	public function addClass(&$classType, $module = '')
 	{
 		$classType = $this->canonicaliseRef($classType);
 		$class = parent::addClass($classType, $module);
@@ -127,7 +127,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listObjects($classType, &$paginator=[], $filters=[], $orderBy=[], $additionalFields=[])
+	public function listObjects($classType, &$paginator = [], $filters = [], $orderBy = [], $additionalFields = [])
 	{
 		$filters = null;
 		// get our data directly from daedalus - objects are not stored in phoebe
@@ -149,7 +149,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addObject($classType, $overrideCriteria=[])
+	public function addObject($classType, $overrideCriteria = [])
 	{
 		// Daedalus doesn't manage overrides currently
 
@@ -209,7 +209,7 @@ 
 				$classes[$ct]['count_current'] = 0;
 				$classTypes[] = $ct;
 			}
-			$query = "SELECT * FROM dds_class WHERE `class_type` IN ('".implode("','",$classTypes)."')";
+			$query = "SELECT * FROM dds_class WHERE `class_type` IN ('".implode("','", $classTypes)."')";
 			$counts = neon()->db->createCommand($query)->queryAll();
 			foreach ($counts as $c) {
 				$classes[$c['class_type']] = array_merge($classes[$c['class_type']], $c);

Braces +15 added lines, -10 removed lines

@@ -65,8 +65,9 @@ 
 		$class = $this->canonicaliseRef($class);
 
 		// descriptions of a class are stored as hints in the form
-		if (isset($definition['description']))
-			$definition['hint'] = $definition['description'];
+		if (isset($definition['description'])) {
+					$definition['hint'] = $definition['description'];
+		}
 
 		// pass the definition to a form object and then get back the full definition
 		$definition['name'] = $class;
@@ -78,8 +79,9 @@ 
 
 		// save the class information
 		$phoebeClass = $this->getClass($class);
-		if (!$phoebeClass)
-			$phoebeClass = $this->addClass($class, $module);
+		if (!$phoebeClass) {
+					$phoebeClass = $this->addClass($class, $module);
+		}
 		$phoebeClass->editClass($classDefinition);
 
 		// close the migration
@@ -159,8 +161,9 @@ 
 		$ddsObject = $this->ddo()->getObject($objectId);
 
 		$object = $objectId ? $this->createFauxIPhoebeObject($classType, $objectId, $ddsObject) : null;
-		if ($object)
-			$object->changeLogUuid = $changeLogUuid;
+		if ($object) {
+					$object->changeLogUuid = $changeLogUuid;
+		}
 		return $object;
 	}
 
@@ -221,16 +224,18 @@ 
 	protected $_dds = null;
 	protected function dds()
 	{
-		if ($this->_dds == null)
-			$this->_dds = neon('dds')->IDdsClassManagement;
+		if ($this->_dds == null) {
+					$this->_dds = neon('dds')->IDdsClassManagement;
+		}
 		return $this->_dds;
 	}
 
 	protected $_ddo = null;
 	protected function ddo()
 	{
-		if ($this->_ddo == null)
-			$this->_ddo = neon('dds')->IDdsObjectManagement;
+		if ($this->_ddo == null) {
+					$this->_ddo = neon('dds')->IDdsObjectManagement;
+		}
 		return $this->_ddo;
 	}
 

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

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 	/**
 	 * @inheritdoc
 	 */
-	public function getClassFormDefinition(array $fields=[])
+	public function getClassFormDefinition(array $fields = [])
 	{
 		return [];
 	}

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

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  */
 class PhoebeType extends PhoebeTypeBase
 {
-	public function __construct($config=[])
+	public function __construct($config = [])
 	{
 		$path = '\neon\phoebe\services\adapters\basic';
 		$config['phoebeType'] = 'basic';