newicon / neon

neon/daedalus/services/ddsManager/DdsObjectManager.php

Spacing +20 added lines, -20 removed lines

@@ -276,7 +276,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)) {
@@ -319,7 +319,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;
@@ -344,7 +344,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);
@@ -432,7 +432,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;
 		}
@@ -490,7 +490,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
@@ -529,7 +529,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
@@ -572,14 +572,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();
 
 			//
@@ -610,7 +610,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);
@@ -698,7 +698,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;
@@ -915,7 +915,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);
@@ -1091,7 +1091,7 @@ 
 					$clauseSql[] = $filter['filterSql'];
 					unset($filter['sql']);
 				}
-				$filters['sql'] = '(' . implode(') OR (', $clauseSql) . ')';
+				$filters['sql'] = '('.implode(') OR (', $clauseSql).')';
 			}
 			return;
 		}
@@ -1103,7 +1103,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]";
 		}
@@ -1117,7 +1117,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;
@@ -1128,7 +1128,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";
@@ -1162,11 +1162,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);
 	}
 
 	/**
@@ -1205,7 +1205,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));
 					$toLinks = array_unique($toLinks);
 
 					//
@@ -1330,7 +1330,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

@@ -107,8 +107,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'];
 				}
 			}
@@ -169,8 +170,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();
@@ -399,8 +409,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();
@@ -410,8 +421,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();
@@ -445,20 +457,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 {
@@ -487,8 +502,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();
@@ -497,8 +513,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()];
@@ -520,12 +537,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) {
@@ -536,8 +555,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;
 			}
 
@@ -559,8 +579,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 = [];
@@ -588,8 +609,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();
@@ -609,8 +631,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);
@@ -618,8 +641,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
@@ -642,8 +666,9 @@ 
 	public function deleteObjects(array $uuids)
 	{
 		$objects = $this->getObjectRowsFromIds($uuids);
-		if (count($objects) == 0)
-			return;
+		if (count($objects) == 0) {
+					return;
+		}
 
 		$foundUuids = [];
 		$foundClasses = [];
@@ -660,8 +685,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)) {
@@ -669,8 +695,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);
+					}
 				}
 			}
 		}
@@ -697,8 +724,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;
@@ -707,8 +735,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();
 		}
@@ -723,8 +752,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']);
@@ -740,8 +770,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();
 			}
 
@@ -749,8 +780,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();
 		}
@@ -762,16 +794,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'];
 		}
 
@@ -798,8 +832,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();
 			}
 		}
@@ -827,8 +862,9 @@ 
 	 */
 	private function getObjectMapManager()
 	{
-		if (!$this->_objectMapManager)
-			$this->_objectMapManager = new DdsObjectMapManager;
+		if (!$this->_objectMapManager) {
+					$this->_objectMapManager = new DdsObjectMapManager;
+		}
 		return $this->_objectMapManager;
 	}
 
@@ -843,14 +879,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]";
 	}
 
@@ -1035,8 +1077,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);
 			}
 
@@ -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]";
 	}
 
@@ -1188,8 +1242,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();
@@ -1199,13 +1254,16 @@ 
 			$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 (!$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));
+					}
 					$toLinks = array_unique($toLinks);
 
 					//
@@ -1220,8 +1278,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)) {
@@ -1230,10 +1289,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;
@@ -1274,8 +1335,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));
@@ -1287,8 +1349,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];
@@ -1305,8 +1368,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/interfaces/IDdsObjectManagement.php

Spacing +9 added lines, -9 removed lines

@@ -231,7 +231,7 @@ 
 	 * @return array  a single result set as ['start', 'length', 'total', 'rows']
 	 *   @see commitRequests for more details
 	 */
-	public function runSingleObjectRequest($classType, array $filters=[], array $order=[], array $limit=[], $includeDeleted=false);
+	public function runSingleObjectRequest($classType, array $filters = [], array $order = [], array $limit = [], $includeDeleted = false);
 
 	/**
 	 * Add an object request to the list of pending requests. Database queries can
@@ -262,7 +262,7 @@ 
 	 *   or the resultKey has already been used. These indicate bugs in the
 	 *   calling code so better not to catch it but deal with the bugs
 	 */
-	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);
 
 	/**
 	 * Return the set of object requests currently queued
@@ -333,7 +333,7 @@ 
 	 *   [ _uuid, _class_type, _deleted, [{$data}]]
 	 *   where 'data' is set if $inFull is true
 	 */
-	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);
 
 	/**
 	 * Create a new object
@@ -347,7 +347,7 @@ 
 	 * @return string   the uuid for the object
 	 * @throws exception  if anything went wrong with creating the object
 	 */
-	public function addObject($classType, array $data, &$changeLogId=null);
+	public function addObject($classType, array $data, &$changeLogId = null);
 
 	/**
 	 * Add multiple objects in bulk
@@ -363,7 +363,7 @@ 
 	 *   for one batch (rows of the number defined by chunkSize). MAX_ALLOWED_PACKET refers to the total size
 	 *   of the raw SQL text sent to MySQL server.
 	 */
-	public function addObjects($classType, array $data, $chunkSize=1000);
+	public function addObjects($classType, array $data, $chunkSize = 1000);
 
 	/**
 	 * Get an object's details
@@ -390,7 +390,7 @@ 
 	 * @return bool|array  returns true on successful save and
 	 *   an array of errors if it couldn't save the object
 	 */
-	public function editObject($uuid, array $changes, &$changeLogId=null);
+	public function editObject($uuid, array $changes, &$changeLogId = null);
 
 	/**
 	 * Edit a series of objects with the *same* changes
@@ -422,7 +422,7 @@ 
 	 * @param string $changeLogId  if the class has a change log, this will be set
 	 *   to the change log entry uuid
 	 */
-	public function deleteObject($uuid, &$changeLogId=null);
+	public function deleteObject($uuid, &$changeLogId = null);
 
 	/**
 	 * Soft delete a set of objects.
@@ -438,7 +438,7 @@ 
 	 * @param string $changeLogId  if the class has a change log, this will be set
 	 *   to the change log entry uuid
 	 */
-	public function undeleteObject($uuid, &$changeLogId=null);
+	public function undeleteObject($uuid, &$changeLogId = null);
 
 	/**
 	 * Destroy an object - this removes the data from the database can
@@ -448,7 +448,7 @@ 
 	 * @param string $changeLogId  if the class has a change log, this will be set
 	 *   to the change log entry uuid
 	 */
-	public function destroyObject($uuid, &$changeLogId=null);
+	public function destroyObject($uuid, &$changeLogId = null);
 
 	/**
 	 * Destroy a set of objects. This cannot be undone