newicon / neon

neon/core/grid/DdsDataProvider.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 		// depending on how this grid was set up, this call may or may not have been made.
 		// The results are cached so call it here to be safe.
 		$totalCount = $this->getTotalCount();
-		$limit =  [
+		$limit = [
 			'start' => $pagination->getOffset(),
 			'length' => $pagination->getLimit(),
 			'total' => ($totalCount > 0 ? $totalCount : true)
@@ -121,7 +121,7 @@ 
 	 * Store a total count to save multiple recalculations
 	 * @var type
 	 */
-	private $_totalCountCache=[];
+	private $_totalCountCache = [];
 
 	/**
 	 * @inheritDoc

Braces +6 added lines, -4 removed lines

@@ -45,8 +45,9 @@ 
 	public function __clone()
 	{
 		parent::__clone();
-		if ($this->_queryBuilder)
-			$this->_queryBuilder = clone $this->_queryBuilder;
+		if ($this->_queryBuilder) {
+					$this->_queryBuilder = clone $this->_queryBuilder;
+		}
 	}
 
 	/**
@@ -67,8 +68,9 @@ 
 	{
 		// prepare pagination
 		$pagination = $this->getPagination();
-		if ($pagination === false)
-			return [];
+		if ($pagination === false) {
+					return [];
+		}
 		// depending on how this grid was set up, this call may or may not have been made.
 		// The results are cached so call it here to be safe.
 		$totalCount = $this->getTotalCount();

neon/daedalus/interfaces/IDdsClassManagement.php

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
 	 *     'count_current', 'count_deleted', ['deleted']] - deleted is set if you've
 	 *   set $includeDeleted to true
 	 */
-	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');
 
 	/**
 	 * Return the number of defined classes
@@ -57,7 +57,7 @@ 
 	 * @param boolean $includeDeleted default false
 	 * @return integer
 	 */
-	public function countClasses($module=null, $includeDeleted=false);
+	public function countClasses($module = null, $includeDeleted = false);
 
 	/**
 	 * create a new class
@@ -96,7 +96,7 @@ 
 	 *   class_type, label, description, module, deleted, count_total,
 	 *   count_deleted, members
 	 */
-	public function getClass($classType, $includeMembers=false);
+	public function getClass($classType, $includeMembers = false);
 
 	/**
 	 * Edit a class
@@ -156,7 +156,7 @@ 
 	 *   where deleted is given if $includeDeleted is true and keyBy is @see $keyBy
 	 *   Empty array is returned if there are no results
 	 */
-	public function listMembers($classType, $includeDeleted=false, $keyBy='member_ref');
+	public function listMembers($classType, $includeDeleted = false, $keyBy = 'member_ref');
 
 	/**
 	 * Create a new member for a class
@@ -182,7 +182,7 @@ 
 	 * @throw InvalidArgumentException  if the member already exists or the class doesn't
 	 * @throw RunTimeException  if the member could not be added
 	 */
-	public function addMember($classType, &$memberRef, $dataTypeRef, $label, $description, $additional=null);
+	public function addMember($classType, &$memberRef, $dataTypeRef, $label, $description, $additional = null);
 
 	/**
 	 * Get the details of a member
@@ -194,7 +194,7 @@ 
 	 *   id, class_type, member_ref, data_type_ref, label, description,
 	 *   choices, link_class, deleted]
 	 */
-	public function getMember($classType, $memberRef, $fields=[]);
+	public function getMember($classType, $memberRef, $fields = []);
 
 	/**
 	 * Edit a member's details

neon/daedalus/services/ddsManager/DdsDataDefinitionManager.php

Spacing +18 added lines, -18 removed lines

@@ -51,7 +51,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function countClasses($module=null, $includeDeleted=false)
+	public function countClasses($module = null, $includeDeleted = false)
 	{
 		$query = $this->_getClassesQuery($module, $includeDeleted);
 		return $query->count();
@@ -60,7 +60,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)
@@ -120,7 +120,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);
@@ -131,7 +131,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getClass($classType, $includeMembers=false)
+	public function getClass($classType, $includeMembers = false)
 	{
 		if ($this->findClass($classType, $class)) {
 			$data = $class->toArray();
@@ -148,7 +148,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);
@@ -232,7 +232,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);
 	}
@@ -240,7 +240,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);
@@ -249,7 +249,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));
@@ -273,7 +273,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);
@@ -286,7 +286,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();
@@ -308,7 +308,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
@@ -330,7 +330,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);
@@ -363,7 +363,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();
@@ -378,7 +378,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';";
@@ -425,7 +425,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listDataTypes($includeDeleted=false)
+	public function listDataTypes($includeDeleted = false)
 	{
 		$query = DdsDataType::find();
 		$select = ['data_type_ref', 'label', 'description', 'definition', 'storage_ref'];
@@ -486,7 +486,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);
 			}
@@ -604,7 +604,7 @@ 
 					if (count($diff))
 						$diffs[$k] = $v;
 				} else {
-					if ((string)$v !== (string)$b[$k])
+					if ((string) $v !== (string) $b[$k])
 						$diffs[$k] = $v;
 				}
 			} else {
@@ -621,7 +621,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'];

neon/daedalus/services/ddsManager/DdsObjectManager.php

Spacing +22 added lines, -22 removed lines

@@ -277,7 +277,7 @@ 
 			$query->andWhere('[[o]].[[_deleted]] = 0');
 		if ($inFull) {
 			$tableName = $this->getTableFromClassType($classType);
-			$query->innerJoin('{{' . $tableName . '}} t', '[[o]].[[_uuid]]=[[t]].[[_uuid]]');
+			$query->innerJoin('{{'.$tableName.'}} t', '[[o]].[[_uuid]]=[[t]].[[_uuid]]');
 		}
 
 		if (is_array($order)) {
@@ -320,7 +320,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;
@@ -345,7 +345,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);
@@ -433,7 +433,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;
 		}
@@ -491,7 +491,7 @@ 
 			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
@@ -530,7 +530,7 @@ 
 			$table = $this->getTableFromClassType($classType);
 			$memberStorage = $this->getMemberStorage($classType);
 			if (count($memberStorage) == 0) {
-				throw new \InvalidArgumentException('Unknown or empty class type ' . $classType);
+				throw new \InvalidArgumentException('Unknown or empty class type '.$classType);
 			}
 
 			// see if we are recording changes into the change log
@@ -573,14 +573,14 @@ 
 				$objectValues[$placeHolder] = $id;
 				$count++;
 			}
-			$uuidClause = '(' . implode(',', $uuidClause) . ')';
+			$uuidClause = '('.implode(',', $uuidClause).')';
 
 			// update the latest changed
 			$db = neon()->db;
-			$query = "UPDATE `dds_object` SET `_updated`=NOW() WHERE `_uuid` IN $uuidClause LIMIT " . count($uuids);
+			$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();
 
 			//
@@ -611,7 +611,7 @@ 
 			$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));
+				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);
@@ -699,7 +699,7 @@ 
 			$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));
+				throw new \RuntimeException("Couldn't undelete the object: ".print_r($object->errors, true));
 
 			// and update the class object deleted count
 			$class = null;
@@ -821,7 +821,7 @@ 
 	{
 		$row = DdsClass::find()->where(['class_type'=>$classType])->one()->toArray();
 		if ($row) {
-			return ['total'=>$row['count_total'], 'active'=>($row['count_total']-$row['count_deleted']), 'deleted'=>$row['count_deleted']];
+			return ['total'=>$row['count_total'], 'active'=>($row['count_total'] - $row['count_deleted']), 'deleted'=>$row['count_deleted']];
 		}
 		return null;
 	}
@@ -940,7 +940,7 @@ 
 		static $counter = 0;
 		$counter++;
 		// a randomly generated resultKey prevents db query chaching.
-		$resultKey = $resultKey ? $resultKey : $request['requestKey'] . '_' . $counter;
+		$resultKey = $resultKey ? $resultKey : $request['requestKey'].'_'.$counter;
 		$request['resultKey'] = $resultKey;
 		if (!array_key_exists($request['requestKey'], self::$_requestResultsCache))
 			$this->convertRequestToSql($request);
@@ -1026,7 +1026,7 @@ 
 				}
 				$request['totalSql'] .= ", '$request[requestKey]' as `{$this->requestKeyField}`, '$request[resultKey]_total' as `{$this->resultKeyField}` FROM `dds_class` WHERE `class_type` = '$classType'";
 			} else {
-				$request['totalSql'] =  "SELECT COUNT(*) as `total`, '$request[requestKey]' as `{$this->requestKeyField}`, '$request[resultKey]_total' as `{$this->resultKeyField}` FROM $table t $join $where";
+				$request['totalSql'] = "SELECT COUNT(*) as `total`, '$request[requestKey]' as `{$this->requestKeyField}`, '$request[resultKey]_total' as `{$this->resultKeyField}` FROM $table t $join $where";
 			}
 		}
 	}
@@ -1148,7 +1148,7 @@ 
 					$clauseSql[] = $filter['filterSql'];
 					unset($filter['sql']);
 				}
-				$filters['sql'] = '(' . implode(') OR (', $clauseSql) . ')';
+				$filters['sql'] = '('.implode(') OR (', $clauseSql).')';
 			}
 			return;
 		}
@@ -1160,7 +1160,7 @@ 
 		$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]);
+			$filters['itemSql'] = $filters['sql'] = "$filter ".$this->prepareForPDO($filters[1], $filters[2]);
 		else {
 			$filters['itemSql'] = $filters['sql'] = "$filter $filters[1]";
 		}
@@ -1174,7 +1174,7 @@ 
 				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;
@@ -1185,7 +1185,7 @@ 
 				$operator = 'IN';
 			if ($operator == '!=')
 				$operator = 'NOT IN';
-			return "$operator (" . implode(',', $pdoValues) . ')';
+			return "$operator (".implode(',', $pdoValues).')';
 		} else {
 			$count = count($this->boundValues);
 			$variable = ":var{$count}end";
@@ -1219,11 +1219,11 @@ 
 			}
 			// allow negative ordering in mysql for nulls last
 			if (strpos($o, '-') === 0)
-				$clause[] = '-' . substr($o, 1) . " $d";
+				$clause[] = '-'.substr($o, 1)." $d";
 			else
 				$clause[] = "$o $d";
 		}
-		return 'ORDER BY ' . implode(', ', $clause);
+		return 'ORDER BY '.implode(', ', $clause);
 	}
 
 	/**
@@ -1264,7 +1264,7 @@ 
 					// remove any empty toLinks that might have snuck through
 					$toLinks = array_filter($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));
 					$toLinks = array_unique($toLinks);
 
 					//
@@ -1389,7 +1389,7 @@ 
 			$objectValues[$placeHolder] = $id;
 			$count++;
 		}
-		$uuidClause = '(' . implode(',', $uuidClause) . ')';
+		$uuidClause = '('.implode(',', $uuidClause).')';
 		$query = "SELECT [[_uuid]] FROM [[dds_object]] WHERE [[_class_type]]='$classType' AND [[_uuid]] IN $uuidClause";
 		$checkedUuidResults = $db->createCommand($query)->bindValues($objectValues)->queryAll();
 		return array_column($checkedUuidResults, '_uuid');

Braces +206 added lines, -142 removed lines

@@ -108,8 +108,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'];
 				}
 			}
@@ -170,8 +171,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();
@@ -254,16 +256,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)
@@ -273,8 +277,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]]');
@@ -289,8 +294,9 @@ 
 					$orderBits[] = "[[t]].$k $d";
 				}
 			}
-			if ($orderBits)
-				$orderClause = implode(', ', $orderBits);
+			if ($orderBits) {
+							$orderClause = implode(', ', $orderBits);
+			}
 			$query->orderBy($orderClause);
 		}
 
@@ -307,8 +313,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
@@ -319,8 +326,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;
@@ -344,10 +352,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();
@@ -355,8 +364,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 ($hasChangeLog)
-					$newValues = $row;
+				if ($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 ($hasChangeLog)
-					$this->createChangeLogEntry($class, 'ADD', $uuid, [], $newValues);
+				if ($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();
@@ -446,20 +458,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 {
@@ -488,8 +503,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();
@@ -498,8 +514,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();
 			return ['error' => $e->getMessage()];
@@ -521,12 +538,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) {
@@ -537,8 +556,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;
 			}
 
@@ -560,8 +580,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 = [];
@@ -589,8 +610,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) {
 			$this->clearCaches();
@@ -610,8 +632,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);
@@ -619,8 +642,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 ----
 			 * don't delete the links so any that haven't been deleted between
@@ -643,8 +667,9 @@ 
 	public function deleteObjects(array $uuids)
 	{
 		$objects = $this->getObjectRowsFromIds($uuids);
-		if (count($objects) == 0)
-			return;
+		if (count($objects) == 0) {
+					return;
+		}
 
 		$foundUuids = [];
 		$foundClasses = [];
@@ -661,8 +686,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)) {
@@ -670,8 +696,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();
 			}
 		}
@@ -852,8 +887,9 @@ 
 	 */
 	private function getObjectMapManager()
 	{
-		if (!$this->_objectMapManager)
-			$this->_objectMapManager = new DdsObjectMapManager;
+		if (!$this->_objectMapManager) {
+					$this->_objectMapManager = new DdsObjectMapManager;
+		}
 		return $this->_objectMapManager;
 	}
 
@@ -868,14 +904,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);
+			}
 		}
 	}
 
@@ -942,8 +980,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;
@@ -1052,8 +1091,9 @@ 
 		$join = ['INNER JOIN dds_object `o` on `t`.`_uuid` = `o`.`_uuid`'];
 		// now see what else needs to be added
 		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);
 	}
@@ -1070,11 +1110,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]";
 	}
 
@@ -1092,8 +1134,9 @@ 
 		// filter down until we hit the actual filters
 		if (is_array($filters[0])) {
 			foreach ($filters as $k => &$filter) {
-				if ($k === 'logic')
-					continue;
+				if ($k === 'logic') {
+									continue;
+				}
 				$this->createFilterClause($filter, $links, $filterKeys);
 			}
 
@@ -1105,25 +1148,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));
@@ -1135,8 +1181,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);
 				}
@@ -1159,9 +1206,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]";
 		}
 	}
@@ -1170,21 +1217,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);
@@ -1208,8 +1259,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
@@ -1218,10 +1270,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);
 	}
@@ -1233,8 +1286,9 @@ 
 	 */
 	private function extractLimitClause($limit)
 	{
-		if (count($limit) == 0)
-			return '';
+		if (count($limit) == 0) {
+					return '';
+		}
 		return "LIMIT $limit[start], $limit[length]";
 	}
 
@@ -1245,8 +1299,9 @@ 
 	 */
 	private function setMembersLinks($objectsLinks, $chunkSize)
 	{
-		if (count($objectsLinks) === 0)
-			return 0;
+		if (count($objectsLinks) === 0) {
+					return 0;
+		}
 		$totalCount = 0;
 		$db = neon()->db;
 		$ddsLink = DdsLink::tableName();
@@ -1256,15 +1311,18 @@ 
 			$deleteLinkClauses = [];
 			foreach ($chunkData as $fromUuid => $toMemberLinks) {
 				// check you've been supplied with rinky dinky data
-				if (!$this->isUUID($fromUuid))
-					throw new \InvalidArgumentException("The fromUuid should be a UUID64. You passed in $fromUuid");
+				if (!$this->isUUID($fromUuid)) {
+									throw new \InvalidArgumentException("The fromUuid should be a UUID64. You passed in $fromUuid");
+				}
 				foreach ($toMemberLinks as $member => $toLinks) {
-					if (!is_array($toLinks))
-						$toLinks = [$toLinks];
+					if (!is_array($toLinks)) {
+											$toLinks = [$toLinks];
+					}
 					// remove any empty toLinks that might have snuck through
 					$toLinks = array_filter($toLinks);
-					if (!$this->areUUIDs($toLinks))
-						throw new \InvalidArgumentException("The toMemberLinks should be UUID64s. You passed in " . print_r($toLinks, true));
+					if (!$this->areUUIDs($toLinks)) {
+											throw new \InvalidArgumentException("The toMemberLinks should be UUID64s. You passed in " . print_r($toLinks, true));
+					}
 					$toLinks = array_unique($toLinks);
 
 					//
@@ -1279,8 +1337,9 @@ 
 
 					// prepare the new links ready for bulk insert
 					$count += count($toLinks);
-					foreach ($toLinks as $toLink)
-						$batchInsert[] = ['from_id' => $fromUuid, 'from_member' => $member, 'to_id' => $toLink];
+					foreach ($toLinks as $toLink) {
+											$batchInsert[] = ['from_id' => $fromUuid, 'from_member' => $member, 'to_id' => $toLink];
+					}
 				}
 			}
 			if (count($deleteLinkClauses)) {
@@ -1289,10 +1348,12 @@ 
 			}
 
 			$insertedCount = 0;
-			if (count($batchInsert))
-				$insertedCount = $db->createCommand()->batchInsert($ddsLink, ['from_id', 'from_member', 'to_id'], $batchInsert)->execute();
-			if (YII_DEBUG && $insertedCount !== $count)
-				throw new \Exception("The link insertion failed - $count items should have been inserted vs $insertedCount actual");
+			if (count($batchInsert)) {
+							$insertedCount = $db->createCommand()->batchInsert($ddsLink, ['from_id', 'from_member', 'to_id'], $batchInsert)->execute();
+			}
+			if (YII_DEBUG && $insertedCount !== $count) {
+							throw new \Exception("The link insertion failed - $count items should have been inserted vs $insertedCount actual");
+			}
 			$totalCount += $count;
 		}
 		return $totalCount;
@@ -1333,8 +1394,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));
@@ -1346,8 +1408,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];
@@ -1364,8 +1427,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/firefly/services/ImageManager.php

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
 			// add callback functionality to retain maximal original image size
 			$options = ['top-left', 'top', 'top-right', 'left', 'center', 'right', 'bottom-left', 'bottom', 'bottom-right'];
 			$option = in_array($params['fit'], $options) ? $params['fit'] : 'center';
-			$image->fit($width, $height, function ($constraint) {
+			$image->fit($width, $height, function($constraint) {
 				$constraint->aspectRatio();
 				$constraint->upsize();
 			}, $option);
@@ -93,7 +93,7 @@ 
 		} elseif ($width || $height) {
 			$width = $width * $pd;
 			$height = $height * $pd;
-			$image->resize($width, $height, function ($constraint) {
+			$image->resize($width, $height, function($constraint) {
 				$constraint->aspectRatio();
 				$constraint->upsize();
 			});
@@ -153,7 +153,7 @@ 
 	{
 		$filter = Arr::get($params, 'filter', false);
 		if ($filter) {
-			$filters = explode(',',$filter);
+			$filters = explode(',', $filter);
 			if (in_array('greyscale', $filters, true)) {
 				$image->greyscale();
 			}
@@ -188,7 +188,7 @@ 
 				$x = Arr::get($crop, 'x', null);
 				$y = Arr::get($crop, 'y', null);
 			}
-			if ($w == 0 && $h == 0 && $x == 0 && $y ==0) {
+			if ($w == 0 && $h == 0 && $x == 0 && $y == 0) {
 				return $image;
 			}
 			$image->crop($w, $h, $x, $y);

neon/settings/forms/AppSettings.php

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 			foreach ($appSettings as $key => $value) {
 				// if the fields value is valid then save it
 				if ($appForm->getField($key)->validate()) {
-				    $saved = $this->getSettingsManager()->set($appKey, $key, $value);
+					$saved = $this->getSettingsManager()->set($appKey, $key, $value);
 				}
 			}   
 		}

neon/cms/components/Editor.php

Spacing +14 added lines, -14 removed lines

@@ -40,7 +40,7 @@ 
 
 	public static function render($vdom)
 	{
-		foreach($vdom as $element) {
+		foreach ($vdom as $element) {
 			$element[1]($element[2], $element['children']);
 		}
 	}
@@ -67,18 +67,18 @@ 
 			// dd($domArray);
 			// Editor::vdom($domArray);
 
-			$ele=dom_import_simplexml($x);
+			$ele = dom_import_simplexml($x);
 			$dom = new DOMDocument('1.0', 'utf-8');
-			$element=$dom->importNode($ele,true);
+			$element = $dom->importNode($ele, true);
 			$element->normalize();
 
 			$dom = simplexml_import_dom($x);
-			foreach($dom as $d) dp($d);
+			foreach ($dom as $d) dp($d);
 			exit;
 
 
 			$vdom = [];
-			foreach($x as $n) {
+			foreach ($x as $n) {
 				Editor::node($vdom, $n);
 			}
 
@@ -100,7 +100,7 @@ 
 		$props = '{"components":null, "contentKey": "'.$id.'"}';
 		if ($content !== null) {
 			// read the json data serialised inside the <!-- ni:editor {json data} --> tag
-			$pattern  = '/<!--\s+(?P<closer>\/)?ni:editor\s+(?P<attrs>{(?:(?:[^}]+|}+(?=})|(?!}\s+\/?-->).)*+)?}\s+)?(?P<void>\/)?-->/s';
+			$pattern = '/<!--\s+(?P<closer>\/)?ni:editor\s+(?P<attrs>{(?:(?:[^}]+|}+(?=})|(?!}\s+\/?-->).)*+)?}\s+)?(?P<void>\/)?-->/s';
 			preg_match($pattern, $content, $matches);
 			if ($matches) {
 				$props = $matches['attrs'];
@@ -147,18 +147,18 @@ 
 	 * [children] => Array
 	 * [props] => Array
 	 */
-	public static function renderAsSmarty($node, &$depth=0)
+	public static function renderAsSmarty($node, &$depth = 0)
 	{
 		$depth++;
 		$cmp = $node['cmp'];
 		$uuid = $node['uuid'];
 		$children = $node['children'];
 		$props = $node['props'];
-		$out = '{'."$cmp " . static::formatProps($props) . " uuid=\"$uuid\" }\n";
-		foreach($children as $child) {
-			$out .= str_repeat('    ', $depth) . static::renderAsSmarty($child, $depth);
+		$out = '{'."$cmp ".static::formatProps($props)." uuid=\"$uuid\" }\n";
+		foreach ($children as $child) {
+			$out .= str_repeat('    ', $depth).static::renderAsSmarty($child, $depth);
 		}
-		$out .= str_repeat('    ', $depth-1) . '{/'.$cmp."}\n";
+		$out .= str_repeat('    ', $depth - 1).'{/'.$cmp."}\n";
 		$depth--;
 		return $out;
 	}
@@ -167,9 +167,9 @@ 
 	{
 		unset($props['children']);
 		$formatParams = '';
-		foreach($props as $key => $value) {
+		foreach ($props as $key => $value) {
 			if (is_array($value)) $value = var_export($value, true);
-			$formatParams .= $key.'="'. $value .'" ';
+			$formatParams .= $key.'="'.$value.'" ';
 		}
 		return $formatParams;
 	}
@@ -183,7 +183,7 @@ 
 	 */
 	public static function createFromTree($cmpIndex, $root) {
 		$out = $root;
-		foreach($root['children'] as $key => $childId) {
+		foreach ($root['children'] as $key => $childId) {
 			if (!empty($out['children'])) {
 				$out['children'][$key] = static::createFromTree($cmpIndex, $cmpIndex[$childId]);
 			}

Braces +9 added lines, -3 removed lines

@@ -55,7 +55,9 @@ 
 	 */
 	public static function editor($params, $content, \Smarty_Internal_Template $template, &$repeat)
 	{
-		if ($repeat) return;
+		if ($repeat) {
+			return;
+		}
 		$id = Arr::get($params, 'id', neon()->cms->getPage()->getId());
 		$dbContent = neon()->getCms()->getICmsStaticData()->getStaticContent($id, null);
 		if (!$dbContent) {
@@ -73,7 +75,9 @@ 
 			$element->normalize();
 
 			$dom = simplexml_import_dom($x);
-			foreach($dom as $d) dp($d);
+			foreach($dom as $d) {
+				dp($d);
+			}
 			exit;
 
 
@@ -168,7 +172,9 @@ 
 		unset($props['children']);
 		$formatParams = '';
 		foreach($props as $key => $value) {
-			if (is_array($value)) $value = var_export($value, true);
+			if (is_array($value)) {
+				$value = var_export($value, true);
+			}
 			$formatParams .= $key.'="'. $value .'" ';
 		}
 		return $formatParams;

neon/core/view/SmartySharedPlugins.php

Spacing +3 added lines, -6 removed lines

@@ -561,8 +561,8 @@ 
 
 		$html = [];
 		$params['loading'] = Arr::get($params, 'loading', 'lazy');
-		$params[Arr::get($params, 'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(array_merge(['src' => $id], $params)));
-		$params[Arr::get($params, 'src-name', 'src')] = $this->firefly_image(array_merge(['id' => $id, 'w' => (int)$srcWidth], $params));
+		$params[Arr::get($params,  'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(array_merge(['src' => $id], $params)));
+		$params[Arr::get($params,  'src-name', 'src')] = $this->firefly_image(array_merge(['id' => $id, 'w' => (int)$srcWidth], $params));
 
 		// alt
 		$params['alt'] = Arr::get($params, 'alt', $this->image_alt(['src' => $id]));
@@ -917,7 +917,4 @@ 
 		if (!empty($params['assign'])) {
 			$smarty->assign($params['assign'], $output);
 		} else {
-			return $output;
-		}
-	}
-}
+			return $output
\ No newline at end of file

neon/core/helpers/Html.php

Indentation +1 added lines, -4 removed lines

@@ -333,7 +333,4 @@
 			return $html;
 		}
 		profile_end('Html::Highlight');
-		return $html;
-	}
-
-}
+		return $html
\ No newline at end of file

Switch Indentation +1 added lines, -4 removed lines

@@ -333,7 +333,4 @@
 			return $html;
 		}
 		profile_end('Html::Highlight');
-		return $html;
-	}
-
-}
+		return $html
\ No newline at end of file

Spacing +2 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 	public static function displayAsTags($tagsArray, $class = 'label label-info')
 	{
 		$out = '';
-		foreach($tagsArray as $tag) {
+		foreach ($tagsArray as $tag) {
 			$out .= "<span class=\"$class\">$tag</span>";
 		}
 		return $out;
@@ -333,7 +333,4 @@ 
 			return $html;
 		}
 		profile_end('Html::Highlight');
-		return $html;
-	}
-
-}
+		return $html
\ No newline at end of file

Braces +1 added lines, -4 removed lines

@@ -333,7 +333,4 @@
 			return $html;
 		}
 		profile_end('Html::Highlight');
-		return $html;
-	}
-
-}
+		return $html
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -4 removed lines

@@ -333,7 +333,4 @@
 			return $html;
 		}
 		profile_end('Html::Highlight');
-		return $html;
-	}
-
-}
+		return $html
\ No newline at end of file