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

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