newicon / neon

neon/daedalus/services/ddsManager/DdsDataDefinitionManager.php

Spacing +18 added lines, -18 removed lines

@@ -53,7 +53,7 @@ 
 	 * @param bool $includeDeleted
 	 * @return \yii\db\ActiveQuery
 	 */
-	public function countClasses($module=null, $includeDeleted=false)
+	public function countClasses($module = null, $includeDeleted = false)
 	{
 		$query = $this->_getClassesQuery($module, $includeDeleted);
 		return $query->count();
@@ -62,7 +62,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listClasses($module, &$total, $includeDeleted=false, $start=0, $length=100, $orderBy='label')
+	public function listClasses($module, &$total, $includeDeleted = false, $start = 0, $length = 100, $orderBy = 'label')
 	{
 		$query = $this->_getClassesQuery($module, $includeDeleted);
 		if ($start == 0)
@@ -122,7 +122,7 @@ 
 		$c->class_type = $classType;
 		$c->module = (empty($module) ? null : $module);
 		if (!$c->save())
-			throw new \RuntimeException("Couldn't save the class: ".print_r($c->errors,true));
+			throw new \RuntimeException("Couldn't save the class: ".print_r($c->errors, true));
 		$upSql = $this->getClassTypeMigrationSql($classType);
 		$downSql = "DELETE FROM `dds_class` WHERE `class_type`='$classType';";
 		$this->storeMigration($upSql, $downSql);
@@ -133,7 +133,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getClass($classType, $includeMembers=false)
+	public function getClass($classType, $includeMembers = false)
 	{
 		if ($this->findClass($classType, $class)) {
 			$data = $class->toArray();
@@ -150,7 +150,7 @@ 
 	public function editClass($classType, $changes)
 	{
 		$allowed = array_intersect_key($changes, array_flip(['label', 'description', 'module', 'change_log']));
-		if (count($allowed)==0)
+		if (count($allowed) == 0)
 			return;
 		$this->clearClassCache($classType);
 		$downSql = $this->getClassTypeMigrationSql($classType);
@@ -234,7 +234,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listMembers($classType, $includeDeleted=false, $keyBy='member_ref')
+	public function listMembers($classType, $includeDeleted = false, $keyBy = 'member_ref')
 	{
 		return $this->listMembersForClass($classType, $includeDeleted, $keyBy);
 	}
@@ -242,7 +242,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addMember($classType, &$memberRef, $dataTypeRef, $label, $description, $additional=null)
+	public function addMember($classType, &$memberRef, $dataTypeRef, $label, $description, $additional = null)
 	{
 		$classType = $this->canonicaliseRef($classType);
 		$memberRef = $this->canonicaliseRef($memberRef);
@@ -251,7 +251,7 @@ 
 			// extract out any additional information
 			$choices = ((!empty($additional['choices']) && is_array($additional['choices'])) ? $additional['choices'] : []);
 			$linkClass = (!empty($additional['link_class']) ? $additional['link_class'] : null);
-			if (DdsMember::findOne(['class_type' => $classType, 'member_ref' => $memberRef])!==null)
+			if (DdsMember::findOne(['class_type' => $classType, 'member_ref' => $memberRef]) !== null)
 				throw new \InvalidArgumentException("The member $memberRef already exists");
 			if (in_array($dataTypeRef, ['link_uni', 'link_multi']) && !$linkClass) {
 				throw new \InvalidArgumentException("Link_uni, link_multi data types require a link_class to be passed for member '$classType::$memberRef'. You passed in ".print_r($additional, true));
@@ -275,7 +275,7 @@ 
 			$mId = $this->storeMigration($upMember, $downMember);
 
 			// and create the member column
-			if (($error=$this->addClassMemberColumn($classType, $member->member_ref)) !== true) {
+			if (($error = $this->addClassMemberColumn($classType, $member->member_ref)) !== true) {
 				$member->delete();
 				$this->removeMigration($mId);
 				throw new \RuntimeException("Couldn't create the member column. Error=".$error);
@@ -288,7 +288,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getMember($classType, $memberRef, $fields=[])
+	public function getMember($classType, $memberRef, $fields = [])
 	{
 		// !! keep member as an object so it runs all conversion code
 		$query = DdsMember::find();
@@ -310,7 +310,7 @@ 
 	{
 		// check that only allowed updates are made
 		$allowed = array_intersect_key($changes, array_flip(['label', 'description', 'definition', 'choices', 'link_class']));
-		if (count($allowed)==0)
+		if (count($allowed) == 0)
 			return;
 
 		// find the member and remove any illegitamate updates
@@ -332,7 +332,7 @@ 
 			$downSql = $this->getTableRowReplaceSql('dds_member', $member);
 			$member->attributes = $updates;
 			if (!$member->save())
-				throw new \RuntimeException("Couldn't update the member: ".print_r ($member->errors, true));
+				throw new \RuntimeException("Couldn't update the member: ".print_r($member->errors, true));
 			$upSql = $this->getTableRowReplaceSql('dds_member', $member);
 			$this->storeMigration($upSql, $downSql);
 			$this->clearClassMemberCache($classType);
@@ -365,7 +365,7 @@ 
 	public function deleteMember($classType, $memberRef)
 	{
 		// delete a member if it isn't already deleted
-		if ($this->findMember($classType, $memberRef, $member) && $member->deleted==0) {
+		if ($this->findMember($classType, $memberRef, $member) && $member->deleted == 0) {
 			$upSql = "UPDATE `dds_member` SET `deleted`=1 WHERE `class_type`='$classType' AND `member_ref`='$memberRef';";
 			$downSql = "UPDATE `dds_member` SET `deleted`=0 WHERE `class_type`='$classType' AND `member_ref`='$memberRef';";
 			neon()->db->createCommand($upSql)->execute();
@@ -380,7 +380,7 @@ 
 	public function undeleteMember($classType, $memberRef)
 	{
 		// undelete a member if it is already deleted
-		if ($this->findMember($classType, $memberRef, $member) && $member->deleted==1) {
+		if ($this->findMember($classType, $memberRef, $member) && $member->deleted == 1) {
 			// create migrations
 			$upSql = "UPDATE `dds_member` SET `deleted`=0 WHERE `class_type`='$classType' AND `member_ref`='$memberRef';";
 			$downSql = "UPDATE `dds_member` SET `deleted`=1 WHERE `class_type`='$classType' AND `member_ref`='$memberRef';";
@@ -427,7 +427,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listDataTypes($includeDeleted=false)
+	public function listDataTypes($includeDeleted = false)
 	{
 		$query = DdsDataType::find();
 		$select = ['data_type_ref', 'label', 'description', 'definition', 'storage_ref'];
@@ -488,7 +488,7 @@ 
 				$downSql = $this->getTableRowReplaceSql('dds_data_type', $dataType);
 				$dataType->attributes = $updates;
 				if (!$dataType->save())
-					throw new \RuntimeException("Couldn't save the datatype: ".print_r($dataType->errors(),true));
+					throw new \RuntimeException("Couldn't save the datatype: ".print_r($dataType->errors(), true));
 				$upSql = $this->getTableRowReplaceSql('dds_data_type', $dataType);
 				$this->storeMigration($upSql, $downSql);
 			}
@@ -606,7 +606,7 @@ 
 					if (count($diff))
 						$diffs[$k] = $v;
 				} else {
-					if ((string)$v !== (string)$b[$k])
+					if ((string) $v !== (string) $b[$k])
 						$diffs[$k] = $v;
 				}
 			} else {
@@ -623,7 +623,7 @@ 
 	 */
 	private static $_classCache = [];
 
-	private function _getClassesQuery($module=null, $includeDeleted=false)
+	private function _getClassesQuery($module = null, $includeDeleted = false)
 	{
 		$query = DdsClass::find();
 		$select = ['class_type', 'label', 'description', 'module', 'count_total', 'count_deleted', 'change_log'];

Braces +84 added lines, -56 removed lines

@@ -39,8 +39,9 @@ 
 	 */
 	public function isMemberRefUnique($classType, $candidate)
 	{
-		if ($this->isClassTypeUnique($classType))
-			throw new \InvalidArgumentException("Class type ".$this->canonicaliseRef($classType)." unknown");
+		if ($this->isClassTypeUnique($classType)) {
+					throw new \InvalidArgumentException("Class type ".$this->canonicaliseRef($classType)." unknown");
+		}
 		$mr = $this->canonicaliseRef($candidate);
 		$member = DdsMember::find()->where(['class_type'=>$classType, 'member_ref'=>$mr])->one();
 		return ($member == null);
@@ -65,15 +66,17 @@ 
 	public function listClasses($module, &$total, $includeDeleted=false, $start=0, $length=100, $orderBy='label')
 	{
 		$query = $this->_getClassesQuery($module, $includeDeleted);
-		if ($start == 0)
-			$total = (int) $query->count();
+		if ($start == 0) {
+					$total = (int) $query->count();
+		}
 		$results = $query->asArray()
 			->offset($start)
 			->limit($length)
 			->orderBy($orderBy)
 			->all();
-		foreach ($results as &$r)
-			$r['count_current'] = $r['count_total'] - $r['count_deleted'];
+		foreach ($results as &$r) {
+					$r['count_current'] = $r['count_total'] - $r['count_deleted'];
+		}
 		return $results;
 	}
 
@@ -95,8 +98,9 @@ 
 			->asArray()
 			->all();
 		$map = [];
-		foreach ($mappable as $m)
-			$map[$m['class_type']] = $m['label'];
+		foreach ($mappable as $m) {
+					$map[$m['class_type']] = $m['label'];
+		}
 		return $map;
 	}
 
@@ -116,13 +120,15 @@ 
 	public function addClass(&$classType, $module)
 	{
 		$classType = $this->canonicaliseRef($classType);
-		if (DdsClass::findOne(['class_type'=>$classType]) !== null)
-			throw new \InvalidArgumentException("The class $classType already exists");
+		if (DdsClass::findOne(['class_type'=>$classType]) !== null) {
+					throw new \InvalidArgumentException("The class $classType already exists");
+		}
 		$c = new DdsClass();
 		$c->class_type = $classType;
 		$c->module = (empty($module) ? null : $module);
-		if (!$c->save())
-			throw new \RuntimeException("Couldn't save the class: ".print_r($c->errors,true));
+		if (!$c->save()) {
+					throw new \RuntimeException("Couldn't save the class: ".print_r($c->errors,true));
+		}
 		$upSql = $this->getClassTypeMigrationSql($classType);
 		$downSql = "DELETE FROM `dds_class` WHERE `class_type`='$classType';";
 		$this->storeMigration($upSql, $downSql);
@@ -137,8 +143,9 @@ 
 	{
 		if ($this->findClass($classType, $class)) {
 			$data = $class->toArray();
-			if ($includeMembers)
-				$data['members'] = $this->listMembers($class['class_type']);
+			if ($includeMembers) {
+							$data['members'] = $this->listMembers($class['class_type']);
+			}
 			return $data;
 		}
 		return null;
@@ -150,8 +157,9 @@ 
 	public function editClass($classType, $changes)
 	{
 		$allowed = array_intersect_key($changes, array_flip(['label', 'description', 'module', 'change_log']));
-		if (count($allowed)==0)
-			return;
+		if (count($allowed)==0) {
+					return;
+		}
 		$this->clearClassCache($classType);
 		$downSql = $this->getClassTypeMigrationSql($classType);
 		if ($this->findClass($classType, $class)) {
@@ -159,8 +167,9 @@ 
 			$updates = array_diff_assoc($allowed, $class->attributes);
 			if (count($updates)) {
 				$class->attributes = $updates;
-				if (!$class->save())
-					throw new \RuntimeException("Dds: Couldn't update the class '$classType': ".print_r($class->errors));
+				if (!$class->save()) {
+									throw new \RuntimeException("Dds: Couldn't update the class '$classType': ".print_r($class->errors));
+				}
 				$upSql = $this->getClassTypeMigrationSql($classType);
 				$this->storeMigration($upSql, $downSql);
 			}
@@ -203,8 +212,9 @@ 
 	public function destroyClass($classType)
 	{
 		if ($this->findClass($classType, $class)) {
-			if ($this->hasObjects($classType))
-				throw new \RunTimeException("You need to delete all objects before you can destroy a class");
+			if ($this->hasObjects($classType)) {
+							throw new \RunTimeException("You need to delete all objects before you can destroy a class");
+			}
 
 			// now delete the rows
 			$members = DdsMember::find()->where(['class_type'=>$class->class_type])->asArray()->all();
@@ -216,12 +226,14 @@ 
 					$errors[] = $e->getMessage();
 				}
 			}
-			if (count($errors))
-				throw new \RuntimeException("Couldn't destroy all of the members: ".print_r($errors, true));
+			if (count($errors)) {
+							throw new \RuntimeException("Couldn't destroy all of the members: ".print_r($errors, true));
+			}
 			// now delete the class
 			// can also return 0 - which is valid - false means there has been an error
-			if ($class->delete() === false)
-				throw new \RuntimeException("Couldn't destroy the class: ".print_r($class->errors, true));
+			if ($class->delete() === false) {
+							throw new \RuntimeException("Couldn't destroy the class: ".print_r($class->errors, true));
+			}
 			// and clear away the table
 			$this->dropClassTable($class->class_type);
 			$this->clearClassCache($classType);
@@ -251,8 +263,9 @@ 
 			// extract out any additional information
 			$choices = ((!empty($additional['choices']) && is_array($additional['choices'])) ? $additional['choices'] : []);
 			$linkClass = (!empty($additional['link_class']) ? $additional['link_class'] : null);
-			if (DdsMember::findOne(['class_type' => $classType, 'member_ref' => $memberRef])!==null)
-				throw new \InvalidArgumentException("The member $memberRef already exists");
+			if (DdsMember::findOne(['class_type' => $classType, 'member_ref' => $memberRef])!==null) {
+							throw new \InvalidArgumentException("The member $memberRef already exists");
+			}
 			if (in_array($dataTypeRef, ['link_uni', 'link_multi']) && !$linkClass) {
 				throw new \InvalidArgumentException("Link_uni, link_multi data types require a link_class to be passed for member '$classType::$memberRef'. You passed in ".print_r($additional, true));
 			}
@@ -265,8 +278,9 @@ 
 			$member->choices = ($this->memberAllowedChoices($dataTypeRef) ? $choices : null);
 			$member->link_class = ($this->memberAllowedLinks($dataTypeRef) ? $linkClass : null);
 			$member->created = $this->now();
-			if (!$member->save())
-				throw new \RuntimeException("Couldn't save the member: ".print_r($member->errors, true));
+			if (!$member->save()) {
+							throw new \RuntimeException("Couldn't save the member: ".print_r($member->errors, true));
+			}
 
 			// create the migrations
 			$savedMember = $this->getMember($classType, $memberRef);
@@ -310,12 +324,14 @@ 
 	{
 		// check that only allowed updates are made
 		$allowed = array_intersect_key($changes, array_flip(['label', 'description', 'definition', 'choices', 'link_class']));
-		if (count($allowed)==0)
-			return;
+		if (count($allowed)==0) {
+					return;
+		}
 
 		// find the member and remove any illegitamate updates
-		if (!$this->findMember($classType, $memberRef, $member))
-			throw new \InvalidArgumentException("No member found");
+		if (!$this->findMember($classType, $memberRef, $member)) {
+					throw new \InvalidArgumentException("No member found");
+		}
 		if (isset($allowed['choices'])) {
 			$allowed['choices'] = empty($allowed['choices']) ? [] : $allowed['choices'];
 			if (!(is_array($allowed['choices']) && $this->memberAllowedChoices($member->data_type_ref))) {
@@ -323,16 +339,18 @@ 
 			}
 		}
 
-		if (isset($allowed['link_class']) && !$this->memberAllowedLinks($member->data_type_ref))
-			unset($allowed['link_class']);
+		if (isset($allowed['link_class']) && !$this->memberAllowedLinks($member->data_type_ref)) {
+					unset($allowed['link_class']);
+		}
 
 		// finally check to see if there are any actual updates and if so save the provided updates
 		$updates = $this->getMemberUpdateDifferences($allowed, $member->attributes);
 		if (count($updates)) {
 			$downSql = $this->getTableRowReplaceSql('dds_member', $member);
 			$member->attributes = $updates;
-			if (!$member->save())
-				throw new \RuntimeException("Couldn't update the member: ".print_r ($member->errors, true));
+			if (!$member->save()) {
+							throw new \RuntimeException("Couldn't update the member: ".print_r ($member->errors, true));
+			}
 			$upSql = $this->getTableRowReplaceSql('dds_member', $member);
 			$this->storeMigration($upSql, $downSql);
 			$this->clearClassMemberCache($classType);
@@ -344,13 +362,15 @@ 
 	 */
 	public function setMemberAsMapField($classType, $memberRef)
 	{
-		if (!$this->findMember($classType, $memberRef, $member))
-			throw new \InvalidArgumentException("No member found");
+		if (!$this->findMember($classType, $memberRef, $member)) {
+					throw new \InvalidArgumentException("No member found");
+		}
 
 		// find out which member had the map field set for migrations
 		$oldMember = DdsMember::findOne(['class_type'=>$classType, 'map_field'=>1]);
-		if ($oldMember && $oldMember->member_ref == $memberRef)
-			return;
+		if ($oldMember && $oldMember->member_ref == $memberRef) {
+					return;
+		}
 		$upSql = "UPDATE `dds_member` SET `map_field`=(IF (`member_ref`='$memberRef', 1, 0)) WHERE `class_type`='$classType';";
 		$downSql = ($oldMember ? "UPDATE `dds_member` SET `map_field`=(IF (`member_ref`='{$oldMember->member_ref}', 1, 0)) WHERE `class_type`='$classType';" : null);
 		neon()->db->createCommand($upSql)->execute();
@@ -445,16 +465,18 @@ 
 	public function addDataType(&$dataTypeRef, $label, $description, $definition, $storageRef)
 	{
 		$dataTypeRef = $this->canonicaliseRef($dataTypeRef);
-		if ($this->findDataType($dataTypeRef))
-			throw new \InvalidArgumentException("The dataType $dataTypeRef already exists");
+		if ($this->findDataType($dataTypeRef)) {
+					throw new \InvalidArgumentException("The dataType $dataTypeRef already exists");
+		}
 		$dt = new DdsDataType();
 		$dt->data_type_ref = $dataTypeRef;
 		$dt->label = $label;
 		$dt->description = $description;
 		$dt->definition = $definition;
 		$dt->storage_ref = $storageRef;
-		if (!$dt->save())
-			throw new \RuntimeException("Couldn't create the datatype $dataTypeRef: ".print_r($dt->errors, true));
+		if (!$dt->save()) {
+					throw new \RuntimeException("Couldn't create the datatype $dataTypeRef: ".print_r($dt->errors, true));
+		}
 
 		// store the migration
 		$this->findDataType($dataTypeRef, $dt);
@@ -479,16 +501,18 @@ 
 	public function editDataType($dataTypeRef, $changes)
 	{
 		$allowed = array_intersect_key($changes, array_flip(['label', 'description', 'definition']));
-		if (count($allowed) == 0)
-			return;
+		if (count($allowed) == 0) {
+					return;
+		}
 		if ($this->findDataType($dataTypeRef, $dataType)) {
 			// make the updates if there is anything to change
 			$updates = array_diff($allowed, $dataType->attributes);
 			if (count($updates)) {
 				$downSql = $this->getTableRowReplaceSql('dds_data_type', $dataType);
 				$dataType->attributes = $updates;
-				if (!$dataType->save())
-					throw new \RuntimeException("Couldn't save the datatype: ".print_r($dataType->errors(),true));
+				if (!$dataType->save()) {
+									throw new \RuntimeException("Couldn't save the datatype: ".print_r($dataType->errors(),true));
+				}
 				$upSql = $this->getTableRowReplaceSql('dds_data_type', $dataType);
 				$this->storeMigration($upSql, $downSql);
 			}
@@ -552,8 +576,9 @@ 
 	private function getClassTypeMigrationSql($classType)
 	{
 		$ddsClass = DdsClass::findOne(['class_type'=>$classType]);
-		if ($ddsClass == null)
-			return null;
+		if ($ddsClass == null) {
+					return null;
+		}
 		return $this->getTableRowReplaceSql('dds_class', $ddsClass);
 	}
 
@@ -603,11 +628,13 @@ 
 				if (is_array($v)) {
 					$diff = $this->getMemberUpdateDifferences($v, $b[$k]);
 					// we want all of the array if there were any differences
-					if (count($diff))
-						$diffs[$k] = $v;
+					if (count($diff)) {
+											$diffs[$k] = $v;
+					}
 				} else {
-					if ((string)$v !== (string)$b[$k])
-						$diffs[$k] = $v;
+					if ((string)$v !== (string)$b[$k]) {
+											$diffs[$k] = $v;
+					}
 				}
 			} else {
 				$diffs[$k] = $v;
@@ -633,8 +660,9 @@ 
 			$query->andWhere(['deleted' => 0]);
 		}
 		$query->select($select);
-		if ($module != null)
-			$query->andWhere(['or', ['module' => $module], ['module' => NULL]]);
+		if ($module != null) {
+					$query->andWhere(['or', ['module' => $module], ['module' => NULL]]);
+		}
 		return $query;
 	}
 

neon/daedalus/services/ddsHelpers/DdsQueryHelpers.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 	/**
 	 * @inheritdoc
 	 */
-	public function addObjectDeletionChecksOnJoin(\yii\db\Query $query, $tables, $join='innerJoin')
+	public function addObjectDeletionChecksOnJoin(\yii\db\Query $query, $tables, $join = 'innerJoin')
 	{
 		foreach ($tables as $table) {
 			if ($join == 'innerJoin') {

neon/daedalus/plugins/smarty/function.getDdsObject.php

Braces +3 added lines, -2 removed lines

@@ -13,8 +13,9 @@
  */
 function smarty_function_getDdsObject($params, $template)
 {
-	if (!isset($params['uuid']))
-		throw new InvalidArgumentException("DdsObjectToJson - you need to pass in the 'uuid'");
+	if (!isset($params['uuid'])) {
+			throw new InvalidArgumentException("DdsObjectToJson - you need to pass in the 'uuid'");
+	}
 	$assign = !empty($params['assign']) ? $params['assign'] : 'ddsObject';
 	$asJson = isset($params['asJson']) ? $params['asJson'] : false;
 	$dds = neon('dds')->IDdsObjectManagement;

neon/daedalus/controllers/IndexController.php

Spacing +1 added lines, -1 removed lines

@@ -244,7 +244,7 @@
 			if ($count)
 				$classes = array_merge($classes, $nextSet);
 			$start += $count;
-		} while ($count>0);
+		} while ($count > 0);
 		$classesByType = array_column($classes, null, 'class_type');
 
 		// get the full definition of these

Braces +21 added lines, -14 removed lines

@@ -103,8 +103,9 @@ 
 		$form = $this->getPhoebeForm($type);
 		$object = $this->ddo()->getObject($id);
 		$form->loadFromDb($object);
-		if (neon()->request->getIsAjax())
-			return $form->ajaxValidation();
+		if (neon()->request->getIsAjax()) {
+					return $form->ajaxValidation();
+		}
 
 		if ($form->processRequest()) {
 			$this->ddo()->editObject($id, $form->getData());
@@ -128,8 +129,9 @@ 
 	public function actionDeleteObject($type, $id, $redirect = true)
 	{
 		$this->ddo()->deleteObject($id);
-		if ($redirect)
-			$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		if ($redirect) {
+					$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		}
 	}
 
 	/**
@@ -141,8 +143,9 @@ 
 	public function actionUndeleteObject($type, $id, $redirect = true)
 	{
 		$this->ddo()->undeleteObject($id);
-		if ($redirect)
-			$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		if ($redirect) {
+					$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		}
 	}
 
 	/**
@@ -154,8 +157,9 @@ 
 	public function actionDestroyObject($type, $id, $redirect = true)
 	{
 		$this->ddo()->destroyObject($id);
-		if ($redirect)
-			$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		if ($redirect) {
+					$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		}
 	}
 
 
@@ -170,8 +174,9 @@ 
 		while ($rows > 0) {
 			$count = min($rows, 100);
 			$data = [];
-			for ($i = 0; $i < $count; $i++)
-				$data[] = $form->fake();
+			for ($i = 0; $i < $count; $i++) {
+							$data[] = $form->fake();
+			}
 			$this->ddo()->addObjects($type, $data);
 			$rows -= $count;
 		}
@@ -281,8 +286,9 @@ 
 		do {
 			$nextSet = $ddc->listClasses(null, $total, false, $start, $length);
 			$count = count($nextSet);
-			if ($count)
-				$classes = array_merge($classes, $nextSet);
+			if ($count) {
+							$classes = array_merge($classes, $nextSet);
+			}
 			$start += $count;
 		} while ($count>0);
 		$classesByType = array_column($classes, null, 'class_type');
@@ -295,8 +301,9 @@ 
 			foreach ($class['members'] as &$member) {
 				$member['data_type'] = $dataTypeByRef[$member['data_type_ref']];
 				$member['links_to_table'] = null;
-				if ($member['link_class'] && isset($classesByType[$member['link_class']]))
-					$member['links_to_table'] = $classesByType[$member['link_class']]['label'];
+				if ($member['link_class'] && isset($classesByType[$member['link_class']])) {
+									$member['links_to_table'] = $classesByType[$member['link_class']]['label'];
+				}
 			}
 			$definitions[$c['class_type']] = $class;
 		}

neon/daedalus/controllers/common/DaedalusController.php

Braces +9 added lines, -6 removed lines

@@ -82,8 +82,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;
 	}
 
@@ -92,8 +93,9 @@ 
 	 */
 	protected function ddc()
 	{
-		if ($this->_ddc == null)
-			$this->_ddc = neon('dds')->IDdsClassManagement;
+		if ($this->_ddc == null) {
+					$this->_ddc = neon('dds')->IDdsClassManagement;
+		}
 		return $this->_ddc;
 	}
 
@@ -102,8 +104,9 @@ 
 	 */
 	protected function ddt()
 	{
-		if ($this->_ddt == null)
-			$this->_ddt = neon('dds')->IDdsDataTypeManagement;
+		if ($this->_ddt == null) {
+					$this->_ddt = neon('dds')->IDdsDataTypeManagement;
+		}
 		return $this->_ddt;
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	 * @param array $options additional options for the form
 	 * @return \neon\core\form\Form
 	 */
-	protected function getPhoebeForm($type, $options=[])
+	protected function getPhoebeForm($type, $options = [])
 	{
 		return neon()->phoebe->getForm('daedalus', $type, $options);
 	}

neon/daedalus/controllers/api/ClassController.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 		} catch (\Exception $e) {
 			// error occured lets see if it's because the class does not exist
 			if (neon()->getDds()->IDdsClassManagement->getClass($class) === null) {
-				throw new HttpException(404, 'No class exists with name ' . $class);
+				throw new HttpException(404, 'No class exists with name '.$class);
 			}
 			throw new HttpException(500, $e->getMessage());
 		}

neon/daedalus/controllers/api/MapController.php

Spacing +6 added lines, -6 removed lines

@@ -47,15 +47,15 @@ 
 	 * @return array uuid => map field
 	 * @throws
 	 */
-	public function actionObjects($class, $filter='', $length=100, $member='', $value='', $start=0)
+	public function actionObjects($class, $filter = '', $length = 100, $member = '', $value = '', $start = 0)
 	{
 		$mapFilter = [];
 		if (!$class)
 			throw new HttpException(404, "No class name provided");
 		if ($member && $value)
-			$mapFilter[$member]=$value;
+			$mapFilter[$member] = $value;
 		if ($filter && is_string($filter))
-			$mapFilter['_map_field_']=$filter;
+			$mapFilter['_map_field_'] = $filter;
 		return neon()->getDds()->IDdsObjectManagement->getObjectMap($class, $mapFilter, [], $start, $length);
 	}
 
@@ -64,17 +64,17 @@ 
 		return neon('user')->getDataMapTypes();
 	}
 
-	public function actionUsers($filter='')
+	public function actionUsers($filter = '')
 	{
 		return neon('user')->getDataMap('users', $filter);
 	}
 
-	public function actionPages($filter='')
+	public function actionPages($filter = '')
 	{
 		return neon('cms')->getDataMap('pages', $filter);
 	}
 
-	public function actionPhoebe($type='', $filter='')
+	public function actionPhoebe($type = '', $filter = '')
 	{
 		$filters = [];
 		if (!$filter) {

Braces +10 added lines, -8 removed lines

@@ -50,12 +50,15 @@ 
 	public function actionObjects($class, $filter='', $length=100, $member='', $value='', $start=0)
 	{
 		$mapFilter = [];
-		if (!$class)
-			throw new HttpException(404, "No class name provided");
-		if ($member && $value)
-			$mapFilter[$member]=$value;
-		if ($filter && is_string($filter))
-			$mapFilter['_map_field_']=$filter;
+		if (!$class) {
+					throw new HttpException(404, "No class name provided");
+		}
+		if ($member && $value) {
+					$mapFilter[$member]=$value;
+		}
+		if ($filter && is_string($filter)) {
+					$mapFilter['_map_field_']=$filter;
+		}
 		return neon()->getDds()->IDdsObjectManagement->getObjectMap($class, $mapFilter, [], $start, $length);
 	}
 
@@ -83,8 +86,7 @@ 
 					['like', 'label', $filter],
 					['like', 'class_type', $filter]
 				];
-			}
-			else if ($type === 'phoebe_object') {
+			} else if ($type === 'phoebe_object') {
 				$filters = ['like', 'uuid', $filter];
 			}
 		}

neon/daedalus/controllers/ChangeLogController.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 		]);
 	}
 
-	public function actionList($type, $uuid=null)
+	public function actionList($type, $uuid = null)
 	{
 		// sort out where we're going back to
 		$goBackTo = url(['index/list', 'type'=>$type]);
@@ -47,7 +47,7 @@ 
 			$goBackTo = url(['index/list', 'type'=>$type, 'uuid' => $uuid]);
 
 		// check the class has a change log
-		$class = ['class_type' => $type, 'label'=>ucwords(str_replace('_',' ',$type))];
+		$class = ['class_type' => $type, 'label'=>ucwords(str_replace('_', ' ', $type))];
 		$hasChangeLog = $this->cl->hasChangeLog($type);
 		if (!$hasChangeLog) {
 			return $this->render('list.tpl', [
@@ -102,7 +102,7 @@ 
 			case 'COMMENT':
 				if (!$uuid)
 					$render['title'] = "Comment added on ".date("d-m-Y \\a\\t H:i:s", strtotime($logEntry['when']));
-				if (is_array($logEntry['associated_objects']) && count($logEntry['associated_objects'])>0)
+				if (is_array($logEntry['associated_objects']) && count($logEntry['associated_objects']) > 0)
 					$render['associated_objects'] = implode(', ', $logEntry['associated_objects']);
 			case 'DESTROY':
 			case 'DELETE':

Braces +17 added lines, -12 removed lines

@@ -43,8 +43,9 @@ 
 	{
 		// sort out where we're going back to
 		$goBackTo = url(['index/list', 'type'=>$type]);
-		if ($uuid)
-			$goBackTo = url(['index/list', 'type'=>$type, 'uuid' => $uuid]);
+		if ($uuid) {
+					$goBackTo = url(['index/list', 'type'=>$type, 'uuid' => $uuid]);
+		}
 
 		// check the class has a change log
 		$class = ['class_type' => $type, 'label'=>ucwords(str_replace('_',' ',$type))];
@@ -77,16 +78,18 @@ 
 	public function actionViewObject($uuid, $logUuid)
 	{
 		$logEntry = $this->cl->getLogEntry($logUuid);
-		if (!$logEntry)
-			return 'Log not found';
+		if (!$logEntry) {
+					return 'Log not found';
+		}
 		$type = $logEntry['class_type'];
 
 		$class = $this->getClassAsArray($type);
 		$goBackTo = url(['change-log/list', 'type'=>$type, 'uuid' => $uuid]);
-		if ($uuid)
-			$headerTitle = "$class[label] [Object '$uuid'] Change Log";
-		else
-			$headerTitle = "$class[label] Change Log";
+		if ($uuid) {
+					$headerTitle = "$class[label] [Object '$uuid'] Change Log";
+		} else {
+					$headerTitle = "$class[label] Change Log";
+		}
 
 		$title = "Status of $uuid on ".date("d-m-Y \\a\\t H:i:s", strtotime($logEntry['when']));
 		$render = [
@@ -100,10 +103,12 @@ 
 		];
 		switch ($logEntry['change_key']) {
 			case 'COMMENT':
-				if (!$uuid)
-					$render['title'] = "Comment added on ".date("d-m-Y \\a\\t H:i:s", strtotime($logEntry['when']));
-				if (is_array($logEntry['associated_objects']) && count($logEntry['associated_objects'])>0)
-					$render['associated_objects'] = implode(', ', $logEntry['associated_objects']);
+				if (!$uuid) {
+									$render['title'] = "Comment added on ".date("d-m-Y \\a\\t H:i:s", strtotime($logEntry['when']));
+				}
+				if (is_array($logEntry['associated_objects']) && count($logEntry['associated_objects'])>0) {
+									$render['associated_objects'] = implode(', ', $logEntry['associated_objects']);
+				}
 			case 'DESTROY':
 			case 'DELETE':
 				$renderFile = 'viewLogEntry.tpl';

neon/daedalus/migrations/m20200119_192834_dds_update_change_log.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 	public function safeDown()
 	{
-		$this->execute("ALTER TABLE dds_change_log MODIFY `object_uuid` char(22) CHARACTER SET latin1 COLLATE latin1_general_cs NOT NULL COMMENT 'The object that was changed'");		$this->execute("ALTER TABLE dds_change_log DROP COLUMN `before`;");
+		$this->execute("ALTER TABLE dds_change_log MODIFY `object_uuid` char(22) CHARACTER SET latin1 COLLATE latin1_general_cs NOT NULL COMMENT 'The object that was changed'"); $this->execute("ALTER TABLE dds_change_log DROP COLUMN `before`;");
 		$this->execute("ALTER TABLE dds_change_log DROP COLUMN `after`;");
 		$this->execute("ALTER TABLE dds_change_log ADD `changes` longblob COMMENT 'What the changes were' AFTER `when`;");
 	}