newicon / neon

neon/daedalus/services/ddsManager/DdsObjectManager.php

Spacing +60 added lines, -60 removed lines

@@ -31,14 +31,14 @@ 
 	 * requests to the database within one call
 	 * @var array
 	 */
-	private static $_requestResultsCache=[];
-	private static $_linkResultsCache=[];
-	private static $_mapResultsCache=[];
+	private static $_requestResultsCache = [];
+	private static $_linkResultsCache = [];
+	private static $_mapResultsCache = [];
 
 	/**
 	 * @inheritdoc
 	 */
-	public function addObjectRequest($classType, array $filters=[], array $order=[], array $limit=[], $resultKey=null, $includeDeleted=false)
+	public function addObjectRequest($classType, array $filters = [], array $order = [], array $limit = [], $resultKey = null, $includeDeleted = false)
 	{
 		// protect ourselves against SQL injection by making sure all
 		// items are canonicalised as required (and use of PDO later)
@@ -105,7 +105,7 @@ 
 					$data[$k] = self::$_requestResultsCache[$r['requestKey']];
 				} else {
 					// set null result information about the request
-					$newData[$k] = ['start'=>$r['limit']['start'],'length'=>0,'total'=>$r['total'],'rows'=>[]];
+					$newData[$k] = ['start'=>$r['limit']['start'], 'length'=>0, 'total'=>$r['total'], 'rows'=>[]];
 					$sql[] = $r['sql'];
 					if ($r['totalSql'])
 						$sql[] = $r['totalSql'];
@@ -165,7 +165,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function runSingleObjectRequest($classType, array $filters=[], array $order=[], array $limit=[], $includeDeleted = false)
+	public function runSingleObjectRequest($classType, array $filters = [], array $order = [], array $limit = [], $includeDeleted = false)
 	{
 		if (empty($classType))
 			throw new \InvalidArgumentException('ClassType must be specified');
@@ -189,7 +189,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getObjectMap($classType, $filters=[], $fields=[], $start=0, $length=1000, $includeDeleted=false)
+	public function getObjectMap($classType, $filters = [], $fields = [], $start = 0, $length = 1000, $includeDeleted = false)
 	{
 		return $this->getObjectMapManager()->getObjectMap($classType, $filters, $fields, $start, $length, $includeDeleted);
 	}
@@ -197,7 +197,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function makeMapLookupRequest($objectUuids, $mapFields=[], $classType=null)
+	public function makeMapLookupRequest($objectUuids, $mapFields = [], $classType = null)
 	{
 		return $this->getObjectMapManager()->makeMapLookupRequest($objectUuids, $mapFields, $classType);
 	}
@@ -205,7 +205,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function makeMapChainLookupRequest($objectUuids, $chainMembers=[], $chainMapFields=[], $inReverse=false)
+	public function makeMapChainLookupRequest($objectUuids, $chainMembers = [], $chainMapFields = [], $inReverse = false)
 	{
 		return $this->getObjectMapManager()->makeMapChainLookupRequest($objectUuids, $chainMembers, $chainMapFields, $inReverse);
 	}
@@ -248,7 +248,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listObjects($classType, &$total=null, $includeDeleted=false, $inFull=true, $start=0, $length=100, $order=null)
+	public function listObjects($classType, &$total = null, $includeDeleted = false, $inFull = true, $start = 0, $length = 100, $order = null)
 	{
 		$classType = $this->canonicaliseRef($classType);
 		if (empty($order))
@@ -280,14 +280,14 @@ 
 		if (is_array($order)) {
 			$orderBits = [];
 			foreach ($order as $k=>$d) {
-				if ($k[1]=='o') {
+				if ($k[1] == 'o') {
 					$orderBits[] = "$k $d";
 				} else if ($inFull) {
 					$orderBits[] = "[[t]].$k $d";
 				}
 			}
 			if ($orderBits)
-				$orderClause = implode(', ',$orderBits);
+				$orderClause = implode(', ', $orderBits);
 			$query->orderBy($orderClause);
 		}
 
@@ -299,7 +299,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addObject($classType, array $data, &$changeLogUuid=null)
+	public function addObject($classType, array $data, &$changeLogUuid = null)
 	{
 		$class = null;
 		$classType = $this->canonicaliseRef($classType);
@@ -317,7 +317,7 @@ 
 		$object->_created = $now;
 		$object->_updated = $now;
 		if (!$object->save())
-			throw new \RuntimeException("Couldn't create object: ".print_r($object->errors,true));
+			throw new \RuntimeException("Couldn't create object: ".print_r($object->errors, true));
 
 		// increment the class's object count
 		$class->count_total += 1;
@@ -333,7 +333,7 @@ 
 			$values = [];
 			foreach (array_keys($memberStorage) as $memRef) {
 				// save all non-empty fields.
-				if (array_key_exists($memRef, $data) && $data[$memRef]!==null && $data[$memRef]!=='') {
+				if (array_key_exists($memRef, $data) && $data[$memRef] !== null && $data[$memRef] !== '') {
 					$fields[] = "`$memRef`";
 					$inserts[] = ":v$count";
 					$values[":v$count"] = $data[$memRef];
@@ -342,7 +342,7 @@ 
 			}
 
 			if (count($fields))
-				$query = "INSERT INTO `$table` (`_uuid`, ".implode(', ',$fields).") VALUES ('{$object->_uuid}', ".implode(', ', $inserts).")";
+				$query = "INSERT INTO `$table` (`_uuid`, ".implode(', ', $fields).") VALUES ('{$object->_uuid}', ".implode(', ', $inserts).")";
 			else
 				$query = "INSERT INTO `$table` (`_uuid`) VALUES ('{$object->_uuid}')";
 			$command = neon()->db->createCommand($query);
@@ -370,7 +370,7 @@ 
 	 *
 	 * @inheritdoc
 	 */
-	public function addObjects($classType, array $data, $chunkSize=1000)
+	public function addObjects($classType, array $data, $chunkSize = 1000)
 	{
 		$classType = $this->canonicaliseRef($classType);
 		$class = null;
@@ -388,7 +388,7 @@ 
 		$columns[] = '_uuid';
 		$nullRow['_uuid'] = null;
 
-		foreach(array_chunk($data, $chunkSize) as $chunkData) {
+		foreach (array_chunk($data, $chunkSize) as $chunkData) {
 			$rows = [];
 			$objectDbRows = [];
 			$objectsLinks = [];
@@ -411,7 +411,7 @@ 
 			neon()->db->createCommand()->batchInsert(DdsObject::tableName(), ['_uuid', '_class_type', '_created', '_updated'], $objectDbRows)->execute();
 			neon()->db->createCommand()->batchInsert($table, $columns, $rows)->execute();
 
-			foreach($objectsLinks as $uuid => $links) {
+			foreach ($objectsLinks as $uuid => $links) {
 				// if there are any links then add these to the link table
 				//
 				// TODO - make this a bulk insert across all data
@@ -435,7 +435,7 @@ 
 			$table = $this->getTableFromClassType($object->_class_type);
 			$query = "SELECT `o`.*, `t`.* FROM `dds_object` `o` LEFT JOIN  `$table` `t` ON `o`.`_uuid`=`t`.`_uuid` WHERE `o`.`_uuid`=:uuid LIMIT 1";
 			$rows = neon()->db->createCommand($query)->bindValue(':uuid', $uuid)->queryAll();
-			$row =  count($rows) > 0 ? $rows[0] : null;
+			$row = count($rows) > 0 ? $rows[0] : null;
 			$this->convertFromDBToPHP($row, $this->getMemberLinks($uuid));
 			return $row;
 		}
@@ -445,10 +445,10 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function editObject($uuid, array $changes, &$changeLogUuid=null)
+	public function editObject($uuid, array $changes, &$changeLogUuid = null)
 	{
 		// check there are some changes to make
-		if (count($changes)==0)
+		if (count($changes) == 0)
 			return false;
 
 		// check that the object exists and find its class type
@@ -493,10 +493,10 @@ 
 					}
 				}
 			}
-			if (count($updates)==0)
+			if (count($updates) == 0)
 				return false;
 
-			$query = "UPDATE `$table` SET ".implode(', ',$updates)." WHERE `_uuid`='$uuid' LIMIT 1";
+			$query = "UPDATE `$table` SET ".implode(', ', $updates)." WHERE `_uuid`='$uuid' LIMIT 1";
 			neon()->db->createCommand($query)->bindValues($values)->execute();
 
 			// add or remove any links from the linking table
@@ -521,15 +521,15 @@ 
 	 */
 	public function editObjects($classType, array $uuids, array $changes)
 	{
-		if (count($uuids)==0 || count($changes)==0)
+		if (count($uuids) == 0 || count($changes) == 0)
 			return false;
 		try {
 			$uuids = $this->checkUuidsAgainstClassType($uuids, $classType);
-			if (count($uuids)==0)
+			if (count($uuids) == 0)
 				return false;
 			$table = $this->getTableFromClassType($classType);
 			$memberStorage = $this->getMemberStorage($classType);
-			if (count($memberStorage)==0) {
+			if (count($memberStorage) == 0) {
 				throw new \InvalidArgumentException('Unknown or empty class type '.$classType);
 			}
 
@@ -560,7 +560,7 @@ 
 					}
 				}
 			}
-			if (count($updates)==0)
+			if (count($updates) == 0)
 				return false;
 
 			// sort out the uuid clause for both the update on the table and in the object table
@@ -580,7 +580,7 @@ 
 			$query = "UPDATE `dds_object` SET `_updated`=NOW() WHERE `_uuid` IN $uuidClause LIMIT ".count($uuids);
 			$db->createCommand($query)->bindValues($objectValues)->execute();
 			// make the changes
-			$query = "UPDATE `$table` SET ".implode(', ',$updates)." WHERE `_uuid` IN $uuidClause LIMIT ".count($uuids);
+			$query = "UPDATE `$table` SET ".implode(', ', $updates)." WHERE `_uuid` IN $uuidClause LIMIT ".count($uuids);
 			$db->createCommand($query)->bindValues($values)->execute();
 
 			//
@@ -604,11 +604,11 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function deleteObject($uuid, &$changeLogUuid=null)
+	public function deleteObject($uuid, &$changeLogUuid = null)
 	{
 		$object = null;
 		// find the object and delete if it hasn't already been
-		if ($this->getObjectFromId($uuid, $object) && $object->_deleted==0) {
+		if ($this->getObjectFromId($uuid, $object) && $object->_deleted == 0) {
 			$object->_deleted = 1;
 			$object->_updated = date('Y-m-d H:i:s');
 			if (!$object->save())
@@ -642,7 +642,7 @@ 
 	public function deleteObjects(array $uuids)
 	{
 		$objects = $this->getObjectRowsFromIds($uuids);
-		if (count($objects)==0)
+		if (count($objects) == 0)
 			return;
 
 		$foundUuids = [];
@@ -680,11 +680,11 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function undeleteObject($uuid, &$changeLogUuid=null)
+	public function undeleteObject($uuid, &$changeLogUuid = null)
 	{
 		$object = null;
 		// find the object and delete if it hasn't already been
-		if ($this->getObjectFromId($uuid, $object) && $object->_deleted==1) {
+		if ($this->getObjectFromId($uuid, $object) && $object->_deleted == 1) {
 			$object->_deleted = 0;
 			$object->_updated = date('Y-m-d H:i:s');
 			if (!$object->save())
@@ -693,7 +693,7 @@ 
 			// and update the class object deleted count
 			$class = null;
 			if ($this->findClass($object['_class_type'], $class)) {
-				$class->count_deleted = max(0, $class->count_deleted-1);
+				$class->count_deleted = max(0, $class->count_deleted - 1);
 				$class->save();
 
 				// see if we need to store the change log
@@ -707,7 +707,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function destroyObject($uuid, &$changeLogUuid=null)
+	public function destroyObject($uuid, &$changeLogUuid = null)
 	{
 		$object = null;
 		if ($this->getObjectFromId($uuid, $object)) {
@@ -729,9 +729,9 @@ 
 
 			// then if ok, decrement the class's object counts
 			if ($class) {
-				$class->count_total = max(0, $class->count_total-1);
+				$class->count_total = max(0, $class->count_total - 1);
 				if ($object['_deleted'] == 1)
-					$class->count_deleted = max(0, $class->count_deleted-1);
+					$class->count_deleted = max(0, $class->count_deleted - 1);
 				$class->save();
 			}
 
@@ -752,7 +752,7 @@ 
 	public function destroyObjects(array $uuids)
 	{
 		$objects = $this->getObjectRowsFromIds($uuids);
-		if (count($objects)==0)
+		if (count($objects) == 0)
 			return;
 
 		$objectUuids = [];
@@ -787,9 +787,9 @@ 
 
 			// decrement the class's object counts
 			if ($class) {
-				$class->count_total = max(0, $class->count_total-count($uuids));
+				$class->count_total = max(0, $class->count_total - count($uuids));
 				if (isset($objectsDeleted[$classType]))
-					$class->count_deleted = max(0, $class->count_deleted-count($objectsDeleted[$classType]));
+					$class->count_deleted = max(0, $class->count_deleted - count($objectsDeleted[$classType]));
 				$class->save();
 			}
 		}
@@ -827,7 +827,7 @@ 
 	 * @param [] &$dataSet  [n]=>$rows  rows of requested data
 	 * @param string $classTypeKey the key in the data that will give the class type
 	 */
-	private function convertResultsToPHP(&$dataSet, $links=null, $classTypeKey='_class_type')
+	private function convertResultsToPHP(&$dataSet, $links = null, $classTypeKey = '_class_type')
 	{
 		// if we haven't been provided any multilinks (even if empty array)
 		// then see if there are any multilinks to extract
@@ -850,7 +850,7 @@ 
 	 * @param DdsObject &$object  the returned object
 	 * @return boolean  whether or not object found
 	 */
-	private function getObjectFromId($uuid, &$object=null)
+	private function getObjectFromId($uuid, &$object = null)
 	{
 		$object = DdsObject::find()->noCache()->where(['_uuid' => $uuid])->one();
 		return ($object !== null);
@@ -899,13 +899,13 @@ 
 	 * @param string $resultKey  if provided use this else create one
 	 * @return string  return the resultKey
 	 */
-	private function createSqlAndStoreRequest(array $request, $resultKey=null)
+	private function createSqlAndStoreRequest(array $request, $resultKey = null)
 	{
 		// track number of calls to function to generate unique wthin one php request per call and per request result keys
-		static $counter = 0; $counter ++;
+		static $counter = 0; $counter++;
 		// a randomly generated resultKey prevents db query chaching.
 		$resultKey = $resultKey ? $resultKey : $request['requestKey'].'_'.$counter;
-		$request['resultKey' ] = $resultKey;
+		$request['resultKey'] = $resultKey;
 		if (!array_key_exists($request['requestKey'], self::$_requestResultsCache))
 			$this->convertRequestToSql($request);
 		// store the request
@@ -963,7 +963,7 @@ 
 	private function convertRequestToSql(&$request)
 	{
 		$table = $this->getTableFromClassType($request['classType']);
-		$links = array_keys($this->getClassMembers($request['classType'], ['link_multi','file_ref_multi']));
+		$links = array_keys($this->getClassMembers($request['classType'], ['link_multi', 'file_ref_multi']));
 		$where = $this->extractWhereClause($request['filters'], $request['deleted'], $links, $filterKeys);
 		$join  = $this->extractJoinClause($links, $filterKeys);
 		$order = $this->extractOrderClause($request['order']);
@@ -1002,7 +1002,7 @@ 
 	{
 		$filterKeys = [];
 		$notDeleted = '`o`.`_deleted`=0';
-		if (count($filters)==0)
+		if (count($filters) == 0)
 			return $includeDeleted ? '' : "WHERE $notDeleted";
 		$this->createFilterClause($filters, $links, $filterKeys);
 		if (!$includeDeleted)
@@ -1087,7 +1087,7 @@ 
 		// Start creating the sql. $filters[0,1] will have been canonicalised, $filters[2] is protected using PDO
 		// Not all queries have a [2] though so should be just the operator (e.g. IS NULL)
 		//
-		$filter = (in_array($filters[0], $links) ? "`link_{$filters[0]}`.`to_id`": $this->quoteField($filters[0]));
+		$filter = (in_array($filters[0], $links) ? "`link_{$filters[0]}`.`to_id`" : $this->quoteField($filters[0]));
 		$filterKeys[$filters[0]] = $filters[0];
 		if ($this->operatorTakesObject($filters[1]) && isset($filters[2]))
 			$filters['itemSql'] = $filters['sql'] = "$filter ".$this->prepareForPDO($filters[1], $filters[2]);
@@ -1100,11 +1100,11 @@ 
 	{
 		if (is_array($value)) {
 			$pdoValues = [];
-			if (!in_array($operator, ['=','!=','IN','NOT IN']))
+			if (!in_array($operator, ['=', '!=', 'IN', 'NOT IN']))
 				throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of values with an operator of $operator");
 			foreach ($value as $v) {
 				if (is_array($v))
-					throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of *array* of values as filters (silly billy). You passed ".print_r($value,true));
+					throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of *array* of values as filters (silly billy). You passed ".print_r($value, true));
 				$count = count($this->boundValues);
 				$variable = ":var{$count}end";
 				$this->boundValues[$variable] = $v;
@@ -1115,11 +1115,11 @@ 
 				$operator = 'IN';
 			if ($operator == '!=')
 				$operator = 'NOT IN';
-			return "$operator (".implode(',',$pdoValues).')';
+			return "$operator (".implode(',', $pdoValues).')';
 		} else {
 			$count = count($this->boundValues);
 			$variable = ":var{$count}end";
-			if (strpos(strtolower($operator), 'like')!==false) {
+			if (strpos(strtolower($operator), 'like') !== false) {
 				$this->boundValues[$variable] = "%$value%";
 				return "$operator $variable";
 			} else if (strpos(strtolower($operator), 'null') !== false) {
@@ -1138,7 +1138,7 @@ 
 	 */
 	private function extractOrderClause($order)
 	{
-		if (count($order)==0)
+		if (count($order) == 0)
 			return '';
 		$clause = [];
 		foreach ($order as $o => $d) {
@@ -1148,12 +1148,12 @@ 
 				break;
 			}
 			// allow negative ordering in mysql for nulls last
-			if (strpos($o, '-')===0)
+			if (strpos($o, '-') === 0)
 				$clause[] = '-'.substr($o, 1)." $d";
 			else
 				$clause[] = "$o $d";
 		}
-		return 'ORDER BY '.implode(', ',$clause);
+		return 'ORDER BY '.implode(', ', $clause);
 	}
 
 	/**
@@ -1163,7 +1163,7 @@ 
 	 */
 	private function extractLimitClause($limit)
 	{
-		if (count($limit)==0)
+		if (count($limit) == 0)
 			return '';
 		return "LIMIT $limit[start], $limit[length]";
 	}
@@ -1187,7 +1187,7 @@ 
 			if (!is_array($toLinks))
 				$toLinks = [$toLinks];
 			if (!$this->areUUIDs($toLinks))
-				throw new \InvalidArgumentException("The toMemberLinks should be UUID64s. You passed in ".print_r($toLinks,true));
+				throw new \InvalidArgumentException("The toMemberLinks should be UUID64s. You passed in ".print_r($toLinks, true));
 			array_unique($toLinks);
 
 			//
@@ -1207,7 +1207,7 @@ 
 				$batchInsert[] = ['from_id'=>$fromLink, 'from_member'=>$member, 'to_id'=>$toLink];
 			$memberCount = 0;
 			if (count($batchInsert))
-				$memberCount = neon()->db->createCommand()->batchInsert('{{%dds_link}}', ['from_id','from_member','to_id'], $batchInsert)->execute();
+				$memberCount = neon()->db->createCommand()->batchInsert('{{%dds_link}}', ['from_id', 'from_member', 'to_id'], $batchInsert)->execute();
 			if (YII_DEBUG && $memberCount !== $batchCount)
 				throw new Exception("The link insertion failed for member $member - $batchCount items should have been inserted vs $memberCount actual");
 			$count += $memberCount;
@@ -1264,7 +1264,7 @@ 
 	 * @param array $changes  what the changes are
 	 * @return string  the uuid of the log entry
 	 */
-	private function createChangeLogEntry($class, $changeKey, $objectUuid, $originalValues=[], $newValues=[])
+	private function createChangeLogEntry($class, $changeKey, $objectUuid, $originalValues = [], $newValues = [])
 	{
 		static $changeLog = null;
 		if (!$changeLog)

Braces +203 added lines, -140 removed lines

@@ -115,8 +115,9 @@ 
 					// set null result information about the request
 					$newData[$k] = ['start'=>$r['limit']['start'],'length'=>0,'total'=>$r['total'],'rows'=>[]];
 					$sql[] = $r['sql'];
-					if ($r['totalSql'])
-						$sql[] = $r['totalSql'];
+					if ($r['totalSql']) {
+											$sql[] = $r['totalSql'];
+					}
 					$resultKey2RequestKey[$r['resultKey']] = $r['requestKey'];
 				}
 			}
@@ -177,8 +178,9 @@ 
 	 */
 	public function runSingleObjectRequest($classType, array $filters=[], array $order=[], array $limit=[], $includeDeleted = false)
 	{
-		if (empty($classType))
-			throw new \InvalidArgumentException('ClassType must be specified');
+		if (empty($classType)) {
+					throw new \InvalidArgumentException('ClassType must be specified');
+		}
 
 		// make sure that any currently queued requests from elsewhere are saved off the queue
 		$currentRequests = $this->popRequests();
@@ -253,16 +255,18 @@ 
 	public function listObjects($classType, &$total=null, $includeDeleted=false, $inFull=true, $start=0, $length=100, $order=null)
 	{
 		$classType = $this->canonicaliseRef($classType);
-		if (empty($order))
-			$order = ['_created'=>'DESC'];
+		if (empty($order)) {
+					$order = ['_created'=>'DESC'];
+		}
 		$order = $this->canonicaliseOrder($order);
 
 		// get the total first
 		$class = null;
 		$this->findClass($classType, $class, true);
 		$total = $class->count_total;
-		if (!$includeDeleted)
-			$total -= $class->count_deleted;
+		if (!$includeDeleted) {
+					$total -= $class->count_deleted;
+		}
 
 		// now get the objects
 		$query = (new \neon\core\db\Query)
@@ -272,8 +276,9 @@ 
 			->offset($start)
 			->limit($length);
 
-		if (!$includeDeleted)
-			$query->andWhere('[[o]].[[_deleted]] = 0');
+		if (!$includeDeleted) {
+					$query->andWhere('[[o]].[[_deleted]] = 0');
+		}
 		if ($inFull) {
 			$tableName = $this->getTableFromClassType($classType);
 			$query->innerJoin('{{'.$tableName.'}} t', '[[o]].[[_uuid]]=[[t]].[[_uuid]]');
@@ -288,8 +293,9 @@ 
 					$orderBits[] = "[[t]].$k $d";
 				}
 			}
-			if ($orderBits)
-				$orderClause = implode(', ',$orderBits);
+			if ($orderBits) {
+							$orderClause = implode(', ',$orderBits);
+			}
 			$query->orderBy($orderClause);
 		}
 
@@ -306,8 +312,9 @@ 
 		$class = null;
 		$classType = $this->canonicaliseRef($classType);
 		$this->findClass($classType, $class, true);
-		if ($class->hasChangeLog())
-			$newValues = $data;
+		if ($class->hasChangeLog()) {
+					$newValues = $data;
+		}
 		$table = $this->getTableFromClassType($classType);
 
 		// create the new object
@@ -318,8 +325,9 @@ 
 		$object->_class_type = $classType;
 		$object->_created = $now;
 		$object->_updated = $now;
-		if (!$object->save())
-			throw new \RuntimeException("Couldn't create object: ".print_r($object->errors,true));
+		if (!$object->save()) {
+					throw new \RuntimeException("Couldn't create object: ".print_r($object->errors,true));
+		}
 
 		// increment the class's object count
 		$class->count_total += 1;
@@ -343,10 +351,11 @@ 
 				}
 			}
 
-			if (count($fields))
-				$query = "INSERT INTO `$table` (`_uuid`, ".implode(', ',$fields).") VALUES ('{$object->_uuid}', ".implode(', ', $inserts).")";
-			else
-				$query = "INSERT INTO `$table` (`_uuid`) VALUES ('{$object->_uuid}')";
+			if (count($fields)) {
+							$query = "INSERT INTO `$table` (`_uuid`, ".implode(', ',$fields).") VALUES ('{$object->_uuid}', ".implode(', ', $inserts).")";
+			} else {
+							$query = "INSERT INTO `$table` (`_uuid`) VALUES ('{$object->_uuid}')";
+			}
 			$command = neon()->db->createCommand($query);
 			$command->bindValues($values);
 			$command->execute();
@@ -354,8 +363,9 @@ 
 			// if there are any links then add these to the link table
 			$this->setMemberLinks($object->_uuid, $links);
 
-			if ($class->hasChangeLog())
-				$changeLogUuid = $this->createChangeLogEntry($class, 'ADD', $object->_uuid, [], $newValues);
+			if ($class->hasChangeLog()) {
+							$changeLogUuid = $this->createChangeLogEntry($class, 'ADD', $object->_uuid, [], $newValues);
+			}
 		} catch (\Exception $e) {
 			// execution failed so clean up the object
 			$object->delete();
@@ -400,8 +410,9 @@ 
 			$objectsLinks = [];
 			$now = date('Y-m-d H:i:s');
 			foreach ($chunkData as $row) {
-				if ($class->hasChangeLog())
-					$newValues = $row;
+				if ($class->hasChangeLog()) {
+									$newValues = $row;
+				}
 				// ddt table value - format row data and append the uuid
 				$this->convertFromPHPToDB($classType, $row, $links);
 				$uuid = (!empty($row['_uuid']) && $this->isUUID($row['_uuid'])) ? $row['_uuid'] : $this->generateUUID();
@@ -411,8 +422,9 @@ 
 				// object table row value
 				$objectDbRows[] = [$row['_uuid'], $classType, $now, $now];
 				$objectsLinks[$row['_uuid']] = $links;
-				if ($class->hasChangeLog())
-					$this->createChangeLogEntry($class, 'ADD', $uuid, [], $newValues);
+				if ($class->hasChangeLog()) {
+									$this->createChangeLogEntry($class, 'ADD', $uuid, [], $newValues);
+				}
 			}
 			neon()->db->createCommand()->batchInsert(DdsObject::tableName(), ['_uuid', '_class_type', '_created', '_updated'], $objectDbRows)->execute();
 			neon()->db->createCommand()->batchInsert($table, $columns, $rows)->execute();
@@ -454,20 +466,23 @@ 
 	public function editObject($uuid, array $changes, &$changeLogUuid=null)
 	{
 		// check there are some changes to make
-		if (count($changes)==0)
-			return false;
+		if (count($changes)==0) {
+					return false;
+		}
 
 		// check that the object exists and find its class type
-		if (!$this->getObjectFromId($uuid, $object))
-			throw new \InvalidArgumentException("Couldn't edit object with id $uuid as not found");
+		if (!$this->getObjectFromId($uuid, $object)) {
+					throw new \InvalidArgumentException("Couldn't edit object with id $uuid as not found");
+		}
 
 		// see if we need to store the change log
 		$class = null;
 		$this->findClass($object['_class_type'], $class);
 
 		$object->_updated = date('Y-m-d H:i:s');
-		if (!$object->save())
-			return $object->errors;
+		if (!$object->save()) {
+					return $object->errors;
+		}
 
 		// now update any member changes
 		try {
@@ -499,8 +514,9 @@ 
 					}
 				}
 			}
-			if (count($updates)==0)
-				return false;
+			if (count($updates)==0) {
+							return false;
+			}
 
 			$query = "UPDATE `$table` SET ".implode(', ',$updates)." WHERE `_uuid`='$uuid' LIMIT 1";
 			neon()->db->createCommand($query)->bindValues($values)->execute();
@@ -509,8 +525,9 @@ 
 			$this->setMemberLinks($object->_uuid, $links);
 
 			// finally note the changes in the change log
-			if ($class && $class->hasChangeLog())
-				$changeLogUuid = $this->createChangeLogEntry($class, 'EDIT', $uuid, $originalValues, $newValues);
+			if ($class && $class->hasChangeLog()) {
+							$changeLogUuid = $this->createChangeLogEntry($class, 'EDIT', $uuid, $originalValues, $newValues);
+			}
 
 		} catch (\yii\db\exception $e) {
 			$this->clearCaches();
@@ -532,12 +549,14 @@ 
 	 */
 	public function editObjects($classType, array $uuids, array $changes)
 	{
-		if (count($uuids)==0 || count($changes)==0)
-			return false;
+		if (count($uuids)==0 || count($changes)==0) {
+					return false;
+		}
 		try {
 			$uuids = $this->checkUuidsAgainstClassType($uuids, $classType);
-			if (count($uuids)==0)
-				return false;
+			if (count($uuids)==0) {
+							return false;
+			}
 			$table = $this->getTableFromClassType($classType);
 			$memberStorage = $this->getMemberStorage($classType);
 			if (count($memberStorage)==0) {
@@ -548,8 +567,9 @@ 
 			$class = null;
 			$this->findClass($classType, $class);
 			if ($class && $class->hasChangeLog()) {
-				foreach ($uuids as $uuid)
-					$beforeValues[$uuid] = array_intersect_key($this->getObject($uuid), $changes);
+				foreach ($uuids as $uuid) {
+									$beforeValues[$uuid] = array_intersect_key($this->getObject($uuid), $changes);
+				}
 				$newValues = $changes;
 			}
 
@@ -571,8 +591,9 @@ 
 					}
 				}
 			}
-			if (count($updates)==0)
-				return false;
+			if (count($updates)==0) {
+							return false;
+			}
 
 			// sort out the uuid clause for both the update on the table and in the object table
 			$uuidClause = [];
@@ -600,8 +621,9 @@ 
 
 			// and save entries into a change log
 			if ($class && $class->hasChangeLog()) {
-				foreach ($beforeValues as $uuid=>$before)
-					$this->createChangeLogEntry($class, 'EDIT', $uuid, $before, $newValues);
+				foreach ($beforeValues as $uuid=>$before) {
+									$this->createChangeLogEntry($class, 'EDIT', $uuid, $before, $newValues);
+				}
 			}
 
 		} catch (\yii\db\exception $e) {
@@ -622,8 +644,9 @@ 
 		if ($this->getObjectFromId($uuid, $object) && $object->_deleted==0) {
 			$object->_deleted = 1;
 			$object->_updated = date('Y-m-d H:i:s');
-			if (!$object->save())
-				throw new \RuntimeException("Couldn't delete the object: ".print_r($object->errors, true));
+			if (!$object->save()) {
+							throw new \RuntimeException("Couldn't delete the object: ".print_r($object->errors, true));
+			}
 			// and update the class object deleted count
 			$class = null;
 			$this->findClass($object['_class_type'], $class);
@@ -631,8 +654,9 @@ 
 			$class->save();
 
 			// see if we need to store the change log
-			if ($class && $class->hasChangeLog())
-				$changeLogUuid = $this->createChangeLogEntry($class, 'DELETE', $uuid);
+			if ($class && $class->hasChangeLog()) {
+							$changeLogUuid = $this->createChangeLogEntry($class, 'DELETE', $uuid);
+			}
 
 			// ---- KEEP ME ----
 			// on't delete the links so any that haven't been deleted between
@@ -653,8 +677,9 @@ 
 	public function deleteObjects(array $uuids)
 	{
 		$objects = $this->getObjectRowsFromIds($uuids);
-		if (count($objects)==0)
-			return;
+		if (count($objects)==0) {
+					return;
+		}
 
 		$foundUuids = [];
 		$foundClasses = [];
@@ -671,8 +696,9 @@ 
 				$deletedUuids[$classType][$obj['_uuid']] = $obj['_uuid'];
 			}
 		}
-		if (count($foundUuids))
-			DdsObject::updateAll(['_deleted'=>1, '_updated'=>date('Y-m-d H:i:s')], ['_uuid'=>$foundUuids]);
+		if (count($foundUuids)) {
+					DdsObject::updateAll(['_deleted'=>1, '_updated'=>date('Y-m-d H:i:s')], ['_uuid'=>$foundUuids]);
+		}
 		foreach ($foundClasses as $type=>$count) {
 			$class = null;
 			if ($this->findClass($type, $class)) {
@@ -680,8 +706,9 @@ 
 				$class->save();
 				// TODO 20200107 Make a bulk call for change log entries
 				if ($class->hasChangeLog()) {
-					foreach ($deletedUuids[$class->class_type] as $objUuid)
-						$this->createChangeLogEntry($class, 'DELETE', $objUuid);
+					foreach ($deletedUuids[$class->class_type] as $objUuid) {
+											$this->createChangeLogEntry($class, 'DELETE', $objUuid);
+					}
 				}
 			}
 		}
@@ -698,8 +725,9 @@ 
 		if ($this->getObjectFromId($uuid, $object) && $object->_deleted==1) {
 			$object->_deleted = 0;
 			$object->_updated = date('Y-m-d H:i:s');
-			if (!$object->save())
-				throw new \RuntimeException("Couldn't undelete the object: ".print_r($object->errors, true));
+			if (!$object->save()) {
+							throw new \RuntimeException("Couldn't undelete the object: ".print_r($object->errors, true));
+			}
 
 			// and update the class object deleted count
 			$class = null;
@@ -708,8 +736,9 @@ 
 				$class->save();
 
 				// see if we need to store the change log
-				if ($class->hasChangeLog())
-					$changeLogUuid = $this->createChangeLogEntry($class, 'UNDELETE', $uuid);
+				if ($class->hasChangeLog()) {
+									$changeLogUuid = $this->createChangeLogEntry($class, 'UNDELETE', $uuid);
+				}
 			}
 			$this->clearCaches();
 		}
@@ -724,8 +753,9 @@ 
 		if ($this->getObjectFromId($uuid, $object)) {
 			$class = null;
 			$this->findClass($object['_class_type'], $class);
-			if ($class && $class->hasChangeLog())
-				$originalValues = $this->getObject($uuid);
+			if ($class && $class->hasChangeLog()) {
+							$originalValues = $this->getObject($uuid);
+			}
 
 			// delete any object table data
 			$table = $this->getTableFromClassType($object['_class_type']);
@@ -741,8 +771,9 @@ 
 			// then if ok, decrement the class's object counts
 			if ($class) {
 				$class->count_total = max(0, $class->count_total-1);
-				if ($object['_deleted'] == 1)
-					$class->count_deleted = max(0, $class->count_deleted-1);
+				if ($object['_deleted'] == 1) {
+									$class->count_deleted = max(0, $class->count_deleted-1);
+				}
 				$class->save();
 			}
 
@@ -750,8 +781,9 @@ 
 			DdsLink::deleteAll(['or', ['from_id'=>$uuid], ['to_id'=>$uuid]]);
 
 			// and note this is in the change log
-			if ($class && $class->hasChangeLog())
-				$changeLogUuid = $this->createChangeLogEntry($class, 'DESTROY', $uuid, $originalValues);
+			if ($class && $class->hasChangeLog()) {
+							$changeLogUuid = $this->createChangeLogEntry($class, 'DESTROY', $uuid, $originalValues);
+			}
 
 			$this->clearCaches();
 		}
@@ -763,16 +795,18 @@ 
 	public function destroyObjects(array $uuids)
 	{
 		$objects = $this->getObjectRowsFromIds($uuids);
-		if (count($objects)==0)
-			return;
+		if (count($objects)==0) {
+					return;
+		}
 
 		$objectUuids = [];
 		$objectsDeleted = [];
 		$classUuids = [];
 		foreach ($objects as $obj) {
 			$objectUuids[$obj['_uuid']] = $obj['_uuid'];
-			if ($obj['_deleted'] == 1)
-				$objectsDeleted[$obj['_class_type']][$obj['_uuid']] = $obj['_uuid'];
+			if ($obj['_deleted'] == 1) {
+							$objectsDeleted[$obj['_class_type']][$obj['_uuid']] = $obj['_uuid'];
+			}
 			$classUuids[$obj['_class_type']][] = $obj['_uuid'];
 		}
 
@@ -799,8 +833,9 @@ 
 			// decrement the class's object counts
 			if ($class) {
 				$class->count_total = max(0, $class->count_total-count($uuids));
-				if (isset($objectsDeleted[$classType]))
-					$class->count_deleted = max(0, $class->count_deleted-count($objectsDeleted[$classType]));
+				if (isset($objectsDeleted[$classType])) {
+									$class->count_deleted = max(0, $class->count_deleted-count($objectsDeleted[$classType]));
+				}
 				$class->save();
 			}
 		}
@@ -828,8 +863,9 @@ 
 	 */
 	private function getObjectMapManager()
 	{
-		if (!$this->_objectMapManager)
-			$this->_objectMapManager = new DdsObjectMapManager;
+		if (!$this->_objectMapManager) {
+					$this->_objectMapManager = new DdsObjectMapManager;
+		}
 		return $this->_objectMapManager;
 	}
 
@@ -844,14 +880,16 @@ 
 		// then see if there are any multilinks to extract
 		if ($links === null) {
 			$objectIds = [];
-			foreach ($dataSet as $row)
-				$objectIds[] = $row['_uuid'];
+			foreach ($dataSet as $row) {
+							$objectIds[] = $row['_uuid'];
+			}
 			$links = $this->getMembersLinks($objectIds);
 		}
 		foreach ($dataSet as &$data) {
 			// convert full rows to database. Totals are left untouched
-			if (isset($data[$classTypeKey]))
-				$this->convertFromDBToPHP($data, $links[$data['_uuid']], $classTypeKey);
+			if (isset($data[$classTypeKey])) {
+							$this->convertFromDBToPHP($data, $links[$data['_uuid']], $classTypeKey);
+			}
 		}
 	}
 
@@ -917,8 +955,9 @@ 
 		// a randomly generated resultKey prevents db query chaching.
 		$resultKey = $resultKey ? $resultKey : $request['requestKey'].'_'.$counter;
 		$request['resultKey' ] = $resultKey;
-		if (!array_key_exists($request['requestKey'], self::$_requestResultsCache))
-			$this->convertRequestToSql($request);
+		if (!array_key_exists($request['requestKey'], self::$_requestResultsCache)) {
+					$this->convertRequestToSql($request);
+		}
 		// store the request
 		$this->objectRequests[$request['classType']][$resultKey] = $request;
 		return $resultKey;
@@ -995,8 +1034,9 @@ 
 	{
 		$join = ['INNER JOIN dds_object `o` on `t`.`_uuid` = `o`.`_uuid`'];
 		foreach ($links as $l) {
-			if (in_array($l, $filterKeys))
-				$join[] = "LEFT JOIN dds_link `link_$l` ON (`link_$l`.`from_id`=`o`.`_uuid` AND `link_$l`.`from_member`='$l')";
+			if (in_array($l, $filterKeys)) {
+							$join[] = "LEFT JOIN dds_link `link_$l` ON (`link_$l`.`from_id`=`o`.`_uuid` AND `link_$l`.`from_member`='$l')";
+			}
 		}
 		return implode(' ', $join);
 	}
@@ -1013,11 +1053,13 @@ 
 	{
 		$filterKeys = [];
 		$notDeleted = '`o`.`_deleted`=0';
-		if (count($filters)==0)
-			return $includeDeleted ? '' : "WHERE $notDeleted";
+		if (count($filters)==0) {
+					return $includeDeleted ? '' : "WHERE $notDeleted";
+		}
 		$this->createFilterClause($filters, $links, $filterKeys);
-		if (!$includeDeleted)
-			return "WHERE $notDeleted AND ($filters[sql])";
+		if (!$includeDeleted) {
+					return "WHERE $notDeleted AND ($filters[sql])";
+		}
 		return "WHERE $filters[sql]";
 	}
 
@@ -1036,8 +1078,9 @@ 
 		if (is_array($filters[0])) {
 
 			foreach ($filters as $k => &$filter) {
-				if ($k === 'logic')
-					continue;
+				if ($k === 'logic') {
+									continue;
+				}
 				$this->createFilterClause($filter, $links, $filterKeys);
 			}
 			//
@@ -1048,25 +1091,28 @@ 
 				// in which case we combine those with to get the filterSql
 				$filterSql = [];
 				foreach ($filters as $k => &$filter) {
-					if ($k === 'logic')
-						continue;
+					if ($k === 'logic') {
+											continue;
+					}
 					// use the logic keys if any for the items - these can be in position 3
 					// for most operators and position 2 for operators that don't take a key
 					if ($this->operatorTakesObject($filter[1])) {
-						if (isset($filter[3]))
-							$filterSql[$filter[3]] = $filter['itemSql'];
-						else
-							$filterSql[] = $filter['itemSql'];
+						if (isset($filter[3])) {
+													$filterSql[$filter[3]] = $filter['itemSql'];
+						} else {
+													$filterSql[] = $filter['itemSql'];
+						}
 					} else {
-						if (isset($filter[2]))
-							$filterSql[$filter[2]] = $filter['itemSql'];
-						else
-							$filterSql[] = $filter['itemSql'];
+						if (isset($filter[2])) {
+													$filterSql[$filter[2]] = $filter['itemSql'];
+						} else {
+													$filterSql[] = $filter['itemSql'];
+						}
 					}
 				}
-				if (empty($filters['logic']))
-					$filters['filterSql'] = $filters['sql'] = implode(' AND ', $filterSql);
-				else {
+				if (empty($filters['logic'])) {
+									$filters['filterSql'] = $filters['sql'] = implode(' AND ', $filterSql);
+				} else {
 					// make sure we test logic filters in order from longest key to shortest key
 					// otherwise we can end up with subkeys screwing things up
 					$orderedKeys = array_map('strlen', array_keys($filterSql));
@@ -1078,8 +1124,9 @@ 
 					// double conversion,
 					$keys = array_keys($filterSql);
 					$keys2hashed = array();
-					foreach ($keys as $k)
-						$keys2hashed[$k] = md5($k);
+					foreach ($keys as $k) {
+											$keys2hashed[$k] = md5($k);
+					}
 					$logicPass1 = str_replace($keys, $keys2hashed, $filters['logic']);
 					$filters['filterSql'] = $filters['sql'] = str_replace($keys2hashed, array_values($filterSql), $logicPass1);
 				}
@@ -1102,9 +1149,9 @@ 
 		//
 		$filter = (in_array($filters[0], $links) ? "`link_{$filters[0]}`.`to_id`": $this->quoteField($filters[0]));
 		$filterKeys[$filters[0]] = $filters[0];
-		if ($this->operatorTakesObject($filters[1]) && isset($filters[2]))
-			$filters['itemSql'] = $filters['sql'] = "$filter ".$this->prepareForPDO($filters[1], $filters[2]);
-		else {
+		if ($this->operatorTakesObject($filters[1]) && isset($filters[2])) {
+					$filters['itemSql'] = $filters['sql'] = "$filter ".$this->prepareForPDO($filters[1], $filters[2]);
+		} else {
 			$filters['itemSql'] = $filters['sql'] = "$filter $filters[1]";
 		}
 	}
@@ -1113,21 +1160,25 @@ 
 	{
 		if (is_array($value)) {
 			$pdoValues = [];
-			if (!in_array($operator, ['=','!=','IN','NOT IN']))
-				throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of values with an operator of $operator");
+			if (!in_array($operator, ['=','!=','IN','NOT IN'])) {
+							throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of values with an operator of $operator");
+			}
 			foreach ($value as $v) {
-				if (is_array($v))
-					throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of *array* of values as filters (silly billy). You passed ".print_r($value,true));
+				if (is_array($v)) {
+									throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of *array* of values as filters (silly billy). You passed ".print_r($value,true));
+				}
 				$count = count($this->boundValues);
 				$variable = ":var{$count}end";
 				$this->boundValues[$variable] = $v;
 				$pdoValues[] = $variable;
 			}
 			// converts equals to ins and outs
-			if ($operator == '=')
-				$operator = 'IN';
-			if ($operator == '!=')
-				$operator = 'NOT IN';
+			if ($operator == '=') {
+							$operator = 'IN';
+			}
+			if ($operator == '!=') {
+							$operator = 'NOT IN';
+			}
 			return "$operator (".implode(',',$pdoValues).')';
 		} else {
 			$count = count($this->boundValues);
@@ -1151,8 +1202,9 @@ 
 	 */
 	private function extractOrderClause($order)
 	{
-		if (count($order)==0)
-			return '';
+		if (count($order)==0) {
+					return '';
+		}
 		$clause = [];
 		foreach ($order as $o => $d) {
 			// if any of the order clauses are RAND then replace whole clause
@@ -1161,10 +1213,11 @@ 
 				break;
 			}
 			// allow negative ordering in mysql for nulls last
-			if (strpos($o, '-')===0)
-				$clause[] = '-'.substr($o, 1)." $d";
-			else
-				$clause[] = "$o $d";
+			if (strpos($o, '-')===0) {
+							$clause[] = '-'.substr($o, 1)." $d";
+			} else {
+							$clause[] = "$o $d";
+			}
 		}
 		return 'ORDER BY '.implode(', ',$clause);
 	}
@@ -1176,8 +1229,9 @@ 
 	 */
 	private function extractLimitClause($limit)
 	{
-		if (count($limit)==0)
-			return '';
+		if (count($limit)==0) {
+					return '';
+		}
 		return "LIMIT $limit[start], $limit[length]";
 	}
 
@@ -1193,14 +1247,17 @@ 
 	private function setMemberLinks($fromLink, array $toMemberLinks)
 	{
 		// check you've been supplied with rinky dinky data
-		if (!$this->isUUID($fromLink))
-			throw new \InvalidArgumentException("The fromLink should be a UUID64. You passed in $fromLink");
+		if (!$this->isUUID($fromLink)) {
+					throw new \InvalidArgumentException("The fromLink should be a UUID64. You passed in $fromLink");
+		}
 		$count = 0;
 		foreach ($toMemberLinks as $member => $toLinks) {
-			if (!is_array($toLinks))
-				$toLinks = [$toLinks];
-			if (!$this->areUUIDs($toLinks))
-				throw new \InvalidArgumentException("The toMemberLinks should be UUID64s. You passed in ".print_r($toLinks,true));
+			if (!is_array($toLinks)) {
+							$toLinks = [$toLinks];
+			}
+			if (!$this->areUUIDs($toLinks)) {
+							throw new \InvalidArgumentException("The toMemberLinks should be UUID64s. You passed in ".print_r($toLinks,true));
+			}
 			array_unique($toLinks);
 
 			//
@@ -1216,13 +1273,16 @@ 
 			// add the new links in
 			$batchInsert = [];
 			$batchCount = count($toLinks);
-			foreach ($toLinks as $toLink)
-				$batchInsert[] = ['from_id'=>$fromLink, 'from_member'=>$member, 'to_id'=>$toLink];
+			foreach ($toLinks as $toLink) {
+							$batchInsert[] = ['from_id'=>$fromLink, 'from_member'=>$member, 'to_id'=>$toLink];
+			}
 			$memberCount = 0;
-			if (count($batchInsert))
-				$memberCount = neon()->db->createCommand()->batchInsert('{{%dds_link}}', ['from_id','from_member','to_id'], $batchInsert)->execute();
-			if (YII_DEBUG && $memberCount !== $batchCount)
-				throw new Exception("The link insertion failed for member $member - $batchCount items should have been inserted vs $memberCount actual");
+			if (count($batchInsert)) {
+							$memberCount = neon()->db->createCommand()->batchInsert('{{%dds_link}}', ['from_id','from_member','to_id'], $batchInsert)->execute();
+			}
+			if (YII_DEBUG && $memberCount !== $batchCount) {
+							throw new Exception("The link insertion failed for member $member - $batchCount items should have been inserted vs $memberCount actual");
+			}
 			$count += $memberCount;
 		}
 		return $count;
@@ -1249,8 +1309,9 @@ 
 	 */
 	protected function getMembersLinks(array $objectIds)
 	{
-		if (empty($objectIds))
-			return [];
+		if (empty($objectIds)) {
+					return [];
+		}
 		$objectIds = array_unique($objectIds);
 		sort($objectIds, SORT_STRING);
 		$cacheKey = md5(serialize($objectIds));
@@ -1262,8 +1323,9 @@ 
 				->asArray()
 				->all();
 			$multilinks = array_fill_keys($objectIds, []);
-			foreach ($rows as $row)
-				$multilinks[$row['from_id']][$row['from_member']][] = $row['to_id'];
+			foreach ($rows as $row) {
+							$multilinks[$row['from_id']][$row['from_member']][] = $row['to_id'];
+			}
 			self::$_linkResultsCache[$cacheKey] = $multilinks;
 		}
 		return self::$_linkResultsCache[$cacheKey];
@@ -1280,8 +1342,9 @@ 
 	private function createChangeLogEntry($class, $changeKey, $objectUuid, $originalValues=[], $newValues=[])
 	{
 		static $changeLog = null;
-		if (!$changeLog)
-			$changeLog = neon('dds')->IDdsChangeLogManagement;
+		if (!$changeLog) {
+					$changeLog = neon('dds')->IDdsChangeLogManagement;
+		}
 		return $changeLog->addLogEntry($objectUuid, $class->toArray(), $changeKey, $originalValues, $newValues);
 	}
 

neon/daedalus/services/ddsManager/models/DdsClass.php

Braces +3 added lines, -2 removed lines

@@ -31,8 +31,9 @@
 	 */
 	public function hasChangeLog()
 	{
-		if (isset($this->attributes['change_log']))
-			return $this->attributes['change_log'];
+		if (isset($this->attributes['change_log'])) {
+					return $this->attributes['change_log'];
+		}
 		return false;
 	}
 

neon/daedalus/services/ddsManager/models/DdsMember.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 	{
 		// return choices as decoded json or null
 		if (!empty($this->choices))
-			$this->choices = json_decode($this->choices,true);
+			$this->choices = json_decode($this->choices, true);
 		parent::afterFind();
 	}
 

Braces +8 added lines, -6 removed lines

@@ -72,10 +72,11 @@ 
 	public function beforeSave($insert)
 	{
 		// choices can only be an array and are stored as JSON
-		if (is_array($this->choices))
-			$this->choices = json_encode($this->choices);
-		else
-			$this->choices = null;
+		if (is_array($this->choices)) {
+					$this->choices = json_encode($this->choices);
+		} else {
+					$this->choices = null;
+		}
 		return parent::beforeSave($insert);
 	}
 
@@ -85,8 +86,9 @@ 
 	public function afterFind()
 	{
 		// return choices as decoded json or null
-		if (!empty($this->choices))
-			$this->choices = json_decode($this->choices,true);
+		if (!empty($this->choices)) {
+					$this->choices = json_decode($this->choices,true);
+		}
 		parent::afterFind();
 	}
 

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