newicon / neon

neon/daedalus/interfaces/IDdsDataTypeManagement.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	 *   any deleted datatyes
 	 * @return an array data types
 	 */
-	public function listDataTypes($includeDeleted=false);
+	public function listDataTypes($includeDeleted = false);
 
 	/**
 	 * Create a datatype.

neon/daedalus/interfaces/IDdsQueryHelpers.php

Spacing +1 added lines, -1 removed lines

@@ -17,5 +17,5 @@
 	 *   does and has been deleted.
 	 * @return mixed
 	 */
-	public function addObjectDeletionChecksOnJoin(\yii\db\Query $query, $tables, $join='innerJoin');
+	public function addObjectDeletionChecksOnJoin(\yii\db\Query $query, $tables, $join = 'innerJoin');
 }
\ No newline at end of file

neon/daedalus/grid/ChangeLogGrid.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 		$this->addDateColumn('when')->setWidth("10em");
 
 		$this->addButtonColumn('View')
-			->addButton('view', ['/daedalus/change-log/view-object' , 'uuid' => '{{object_uuid}}', 'logUuid' => '{{log_uuid}}'], '', 'fa fa-eye', '', ['data-toggle' => 'tooltip', 'title'=>'View Object']);
+			->addButton('view', ['/daedalus/change-log/view-object', 'uuid' => '{{object_uuid}}', 'logUuid' => '{{log_uuid}}'], '', 'fa fa-eye', '', ['data-toggle' => 'tooltip', 'title'=>'View Object']);
 
 		$this->setPageSize(100);
 	}

Braces +14 added lines, -10 removed lines

@@ -23,19 +23,23 @@
 	{
 		$this->query = (new \yii\db\Query())
 			->from('{{dds_change_log}}');
-		if ($this->classType)
-			$this->query->where(['class_type'=>$this->classType]);
-		if ($this->objectUuid)
-			$this->query->andWhere(['object_uuid'=>$this->objectUuid]);
+		if ($this->classType) {
+					$this->query->where(['class_type'=>$this->classType]);
+		}
+		if ($this->objectUuid) {
+					$this->query->andWhere(['object_uuid'=>$this->objectUuid]);
+		}
 		$this->query->orderBy(['when'=>SORT_DESC, 'log_id'=>SORT_DESC]);
 
-		if (!$this->classType)
-			$this->title = 'Full Change Log';
-		else
-			$this->title = 'Change Log for class '.$this->classType;
+		if (!$this->classType) {
+					$this->title = 'Full Change Log';
+		} else {
+					$this->title = 'Change Log for class '.$this->classType;
+		}
 
-		if ($this->objectUuid)
-			$this->title .= " and object '$this->objectUuid'";
+		if ($this->objectUuid) {
+					$this->title .= " and object '$this->objectUuid'";
+		}
 
 		$this->addTextColumn('log_uuid')->setWidth("10em");
 		$this->addTextColumn('object_uuid')->setWidth("10em");

neon/daedalus/services/ddsChangeLog/DdsChangeLogManager.php

Spacing +21 added lines, -21 removed lines

@@ -46,7 +46,7 @@ 
 	public function hasChangeLog($classType)
 	{
 		if ($this->findClass($classType, $class)) {
-			return (boolean)$class->hasChangeLog();
+			return (boolean) $class->hasChangeLog();
 		}
 		return false;
 	}
@@ -56,9 +56,9 @@ 
 	 */
 	public function setChangeLog($classType, $to)
 	{
-		$to = (boolean)$to;
+		$to = (boolean) $to;
 		if ($this->findClass($classType, $class)) {
-			$hasChangeLog = (boolean)$class->hasChangeLog();
+			$hasChangeLog = (boolean) $class->hasChangeLog();
 			// only change if different to current
 			if ($hasChangeLog !== $to) {
 				neon('dds')->IDdsClassManagement->editClass($classType, ['change_log'=>$to]);
@@ -72,7 +72,7 @@ 
 					'log_uuid' => Hash::uuid64(),
 					'class_type' => $class['class_type'],
 					'change_key' => 'COMMENT',
-					'description' => sprintf($description, ($to?'ON':'OFF')),
+					'description' => sprintf($description, ($to ? 'ON' : 'OFF')),
 					'who' => $whoUid,
 					'when' => date('Y-m-d H:i:s'),
 				])->execute();
@@ -84,7 +84,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listChangeLog($fromDate=null, Iterator $iterator=null)
+	public function listChangeLog($fromDate = null, Iterator $iterator = null)
 	{
 		return $this->getChangeLog($fromDate, $iterator, null);
 	}
@@ -92,7 +92,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listObjectChangeLog($uuid, $fromDate=null, Iterator $iterator=null)
+	public function listObjectChangeLog($uuid, $fromDate = null, Iterator $iterator = null)
 	{
 		return $this->getChangeLog($fromDate, $iterator, $uuid);
 	}
@@ -100,7 +100,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listObjectHistory($uuid, $fromDate=null, Iterator $iterator=null)
+	public function listObjectHistory($uuid, $fromDate = null, Iterator $iterator = null)
 	{
 		$changeLog = $this->getChangeLog($fromDate, $iterator, $uuid);
 		return $this->convertChangeLogToHistory($uuid, $changeLog);
@@ -109,10 +109,10 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function clearChangeLog($toDate, $classList=[], $clearClassList=true)
+	public function clearChangeLog($toDate, $classList = [], $clearClassList = true)
 	{
 		$deleteConditions = '[[when]] <= :toDate';
-		$bindValues = [ ':toDate'=>$toDate ];
+		$bindValues = [':toDate'=>$toDate];
 		if (!empty($classList)) {
 			$clearClause = ($clearClassList ? '' : '!');
 			$deleteConditions .= " AND $clearClause([[class_type]]=:".implode(" OR [[class_type]]=:", $classList).")";
@@ -132,7 +132,7 @@ 
 	public function clearObjectChangeLog($uuid, $toDate)
 	{
 		$deleteConditions = '[[when]] <= :toDate AND [[object_uuid]] = :uuid';
-		$bindValues = [ ':toDate'=>$toDate, ':uuid' => $uuid ];
+		$bindValues = [':toDate'=>$toDate, ':uuid' => $uuid];
 		neon()->db->createCommand()
 			->delete('{{dds_change_log}}', $deleteConditions)
 			->bindValues($bindValues)
@@ -142,7 +142,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addLogEntry($objectUuid, $class, $changeKey, $before=[], $after=[])
+	public function addLogEntry($objectUuid, $class, $changeKey, $before = [], $after = [])
 	{
 		if (!in_array($changeKey, $this->changeLogEntryActions))
 			throw new \InvalidArgumentException('Invalid change key in addLogEntry. Allowed values are ['.implode(', ', $this->changeLogEntryActions));
@@ -249,7 +249,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addGeneralComment($module, $classType, $comment, $objectUuid=null, array $associateObjectUuids=[])
+	public function addGeneralComment($module, $classType, $comment, $objectUuid = null, array $associateObjectUuids = [])
 	{
 		// check we can make a comment
 		if (empty($comment))
@@ -348,7 +348,7 @@ 
 	 * @throws \RuntimeException  if the restore point could not be reached
 	 *   using a sensible number of change log points (<=1000).
 	 */
-	private function getChangeLog($fromDate, $iterator, $objectUuid, $logId=null)
+	private function getChangeLog($fromDate, $iterator, $objectUuid, $logId = null)
 	{
 		$fromDate = ($fromDate === null ? date('Y-m-d 00:00:00') : $fromDate);
 		$iterator = ($iterator === null ? new Iterator : $iterator);
@@ -398,9 +398,9 @@ 
 	 */
 	private function convertFromDb(&$entry)
 	{
-		$entry['before'] = json_decode($entry['before'],true);
-		$entry['after'] = json_decode($entry['after'],true);
-		$entry['associated_objects'] = json_decode($entry['associated_objects'],true);
+		$entry['before'] = json_decode($entry['before'], true);
+		$entry['after'] = json_decode($entry['after'], true);
+		$entry['associated_objects'] = json_decode($entry['associated_objects'], true);
 	}
 
 	/**
@@ -412,7 +412,7 @@ 
 	 * @param array &$currentObject  the value of the current object
 	 * @return array  a history log
 	 */
-	private function convertChangeLogToHistory($uuid, $log, &$currentObject=[])
+	private function convertChangeLogToHistory($uuid, $log, &$currentObject = [])
 	{
 		// get the current object and work backwards from there to get history
 		// first see if we can the object and if not check that the last action
@@ -549,7 +549,7 @@ 
 		}
 		$before = $beforeChangedFields;
 		$after = $afterChangedFields;
-		return count($after)>0;
+		return count($after) > 0;
 	}
 
 	/**
@@ -608,7 +608,7 @@ 
 	 */
 	private function isEquivalentBoolean($before, $after)
 	{
-		return (is_bool($before) && (bool)($after) == $before);
+		return (is_bool($before) && (bool) ($after) == $before);
 	}
 
 	/**
@@ -621,8 +621,8 @@ 
 	 */
 	private function isEquivalentNull($before, $after)
 	{
-		if ($before === null || $before === '' || (is_array($before) && count($before)==0))
-			return ($after === null || $after === '' || (is_array($after) && count($after)==0));
+		if ($before === null || $before === '' || (is_array($before) && count($before) == 0))
+			return ($after === null || $after === '' || (is_array($after) && count($after) == 0));
 		return false;
 	}
 

Braces +57 added lines, -38 removed lines

@@ -144,14 +144,16 @@ 
 	 */
 	public function addLogEntry($objectUuid, $class, $changeKey, $before=[], $after=[])
 	{
-		if (!in_array($changeKey, $this->changeLogEntryActions))
-			throw new \InvalidArgumentException('Invalid change key in addLogEntry. Allowed values are ['.implode(', ', $this->changeLogEntryActions));
+		if (!in_array($changeKey, $this->changeLogEntryActions)) {
+					throw new \InvalidArgumentException('Invalid change key in addLogEntry. Allowed values are ['.implode(', ', $this->changeLogEntryActions));
+		}
 
 		$class = $this->getClass($class);
 
 		// check the class does have a change log
-		if (!$class['change_log'])
-			return;
+		if (!$class['change_log']) {
+					return;
+		}
 
 		// get who this was
 		$whoUid = $name = null;
@@ -167,8 +169,9 @@ 
 			break;
 			case 'EDIT':
 				$changeCount = $this->calculateMinimumFieldsChangedDuringEdit($before, $after);
-				if ($changeCount == 0)
-					return;
+				if ($changeCount == 0) {
+									return;
+				}
 				$description = sprintf($baseDescription, 'edited an')
 					." The fields changed were ['".implode("', '", array_keys($after))."'].";
 			break;
@@ -213,8 +216,9 @@ 
 			$entry = neon()->db->createCommand("SELECT * FROM {{dds_change_log}} WHERE [[log_uuid]] = :logUuid")
 				->bindParam(":logUuid", $logUuid)
 				->queryOne();
-			if ($entry)
-				$this->convertFromDb($entry);
+			if ($entry) {
+							$this->convertFromDb($entry);
+			}
 			return $entry;
 		}
 		return null;
@@ -227,8 +231,9 @@ 
 	{
 		// check this has a change log
 		$class = $this->getClassFromObject($objectUuid);
-		if (empty($class) || !$class['change_log'])
-			return;
+		if (empty($class) || !$class['change_log']) {
+					return;
+		}
 
 		// find out who did this
 		$whoUid = $name = null;
@@ -252,8 +257,9 @@ 
 	public function addGeneralComment($module, $classType, $comment, $objectUuid=null, array $associateObjectUuids=[])
 	{
 		// check we can make a comment
-		if (empty($comment))
-			return;
+		if (empty($comment)) {
+					return;
+		}
 
 		// find out who did this
 		$whoUid = $name = null;
@@ -280,8 +286,9 @@ 
 	{
 		$initialObject = $restorePoint = null;
 		$this->calculateObjectAtRestorePoint($objectUuid, $logEntryUuid, $initialObject, $restorePoint);
-		if ($restorePoint)
-			return $restorePoint['object'];
+		if ($restorePoint) {
+					return $restorePoint['object'];
+		}
 		return [];
 	}
 
@@ -315,8 +322,9 @@ 
 			$dds->editObject($objectUuid, $restoreObject);
 		}
 		// and make a log entry
-		if (!empty($restorePoint))
-			$this->addLogEntry($objectUuid, $restorePoint['class_type'], 'RESTORE', $initialObject, $restorePoint);
+		if (!empty($restorePoint)) {
+					$this->addLogEntry($objectUuid, $restorePoint['class_type'], 'RESTORE', $initialObject, $restorePoint);
+		}
 	}
 
 
@@ -360,8 +368,9 @@ 
 			->orderBy(['log_id'=>SORT_DESC]);
 
 		// check for a particular object if required
-		if ($objectUuid)
-			$query->andWhere(['object_uuid'=>$objectUuid]);
+		if ($objectUuid) {
+					$query->andWhere(['object_uuid'=>$objectUuid]);
+		}
 
 		// start from a particular log id point
 		if ($logId) {
@@ -373,8 +382,9 @@ 
 		// and check sensible limits
 		$query->limit($iterator->length)
 			->offset($iterator->start);
-		if ($iterator->shouldReturnTotal())
-			$iterator->total = $query->count();
+		if ($iterator->shouldReturnTotal()) {
+					$iterator->total = $query->count();
+		}
 
 		$changeLog = $query->all();
 
@@ -421,8 +431,9 @@ 
 		$lastAction = $this->getLastActionFromLog($log);
 		if ($currentObject == null) {
 			$currentObject = [];
-			if (!($lastAction == 'DESTROY' || $lastAction == 'RESTORE'))
-				return [];
+			if (!($lastAction == 'DESTROY' || $lastAction == 'RESTORE')) {
+							return [];
+			}
 		}
 		$object = $currentObject;
 		$objectHistory = [];
@@ -456,8 +467,9 @@ 
 	private function getLastActionFromLog($log)
 	{
 		foreach ($log as $l) {
-			if (!in_array($l['change_key'], $this->changeLogEntryActions))
-				continue;
+			if (!in_array($l['change_key'], $this->changeLogEntryActions)) {
+							continue;
+			}
 			return $l['change_key'];
 		}
 		return null;
@@ -500,17 +512,20 @@ 
 		static $ddc = null;
 
 		// see if this is already an array in which case no need to look up
-		if (is_array($class))
-			return $class;
+		if (is_array($class)) {
+					return $class;
+		}
 
 		// otherwise check this is a string for a class type
-		if (!is_string($class))
-			throw new \InvalidArgumentException("Invalid type of class passed in. Should be either a string or an array. Type passed in was ".gettype($class));
+		if (!is_string($class)) {
+					throw new \InvalidArgumentException("Invalid type of class passed in. Should be either a string or an array. Type passed in was ".gettype($class));
+		}
 
 		// and get hold of the class
 		if (!isset($classes[$class])) {
-			if (empty($ddc))
-				$ddc = neon('dds')->IDdsClassManagement;
+			if (empty($ddc)) {
+							$ddc = neon('dds')->IDdsClassManagement;
+			}
 			$classes[$class] = $ddc->getClass($class);
 		}
 		return $classes[$class];
@@ -537,8 +552,9 @@ 
 			if (array_key_exists($k, $before)) {
 				$b = $before[$k];
 				// check for a few expected changes that aren't actual changes
-				if ($this->isEquivalentNull($b, $v) || $this->isEquivalentBoolean($b, $v) || $this->isEquivalentChoice($b, $v))
-					continue;
+				if ($this->isEquivalentNull($b, $v) || $this->isEquivalentBoolean($b, $v) || $this->isEquivalentChoice($b, $v)) {
+									continue;
+				}
 				if ($v !== $before[$k]) {
 					$beforeChangedFields[$k] = $b;
 					$afterChangedFields[$k] = $v;
@@ -566,10 +582,12 @@ 
 		$restorePoint = neon()->db->createCommand("SELECT * FROM dds_change_log WHERE log_uuid = :log_uuid")
 			->bindValue(':log_uuid', $logEntryUuid)
 			->queryOne();
-		if (!$restorePoint)
-			throw new \InvalidArgumentException("The requested log point ($logEntryUuid) doesn't exist.");
-		if ($objectUuid != $restorePoint['object_uuid'])
-			throw new \InvalidArgumentException("The requested object ($objectUuid) and the object at the log point ($logEntryUuid) don't match");
+		if (!$restorePoint) {
+					throw new \InvalidArgumentException("The requested log point ($logEntryUuid) doesn't exist.");
+		}
+		if ($objectUuid != $restorePoint['object_uuid']) {
+					throw new \InvalidArgumentException("The requested object ($objectUuid) and the object at the log point ($logEntryUuid) don't match");
+		}
 
 		$initialObject = null;
 		$changeLog = $this->getChangeLog($restorePoint['when'], null, $objectUuid, $restorePoint['log_id']);
@@ -621,8 +639,9 @@ 
 	 */
 	private function isEquivalentNull($before, $after)
 	{
-		if ($before === null || $before === '' || (is_array($before) && count($before)==0))
-			return ($after === null || $after === '' || (is_array($after) && count($after)==0));
+		if ($before === null || $before === '' || (is_array($before) && count($before)==0)) {
+					return ($after === null || $after === '' || (is_array($after) && count($after)==0));
+		}
 		return false;
 	}
 

neon/daedalus/services/ddsAppMigrator/DdsAppMigratorFactory.php

Braces +3 added lines, -2 removed lines

@@ -18,8 +18,9 @@
 	 */
 	public static function createMigrator($path)
 	{
-		if (self::$migrator == null)
-			self::$migrator = new DdsAppMigrator($path);
+		if (self::$migrator == null) {
+					self::$migrator = new DdsAppMigrator($path);
+		}
 		return self::$migrator;
 	}
 

neon/daedalus/services/ddsAppMigrator/DdsAppMigrator.php

Spacing +5 added lines, -5 removed lines

@@ -127,7 +127,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function closeMigrationFile($delete=false)
+	public function closeMigrationFile($delete = false)
 	{
 		if (!$this->_file)
 			return;
@@ -179,7 +179,7 @@ 
 		// create a migration file
 		$templateFile = __DIR__.'/templates/ddsMigration.php';
 		$input = file_get_contents($templateFile);
-		$output = str_replace('__MIGRATION__',$this->_classname,$input);
+		$output = str_replace('__MIGRATION__', $this->_classname, $input);
 		file_put_contents($this->_file, $output, LOCK_EX);
 		return $this->_filename;
 	}
@@ -195,7 +195,7 @@ 
 			return;
 		if (!$this->_file)
 			throw new \RuntimeException('Attempting to store migrations without first opening a migration file');
-		$migrations = is_array($migration) ? $migration : [ $migration ];
+		$migrations = is_array($migration) ? $migration : [$migration];
 		foreach ($migrations as $m)
 			$this->saveToFile($this->_classname."::addMigration('$direction', \"$m\");");
 	}
@@ -244,7 +244,7 @@ 
 	private function fixMigration($migration)
 	{
 		// get the number of backslashed backslashes correct for migration file
-		return str_replace('\\\\','\\\\\\\\',$migration);
+		return str_replace('\\\\', '\\\\\\\\', $migration);
 	}
 
 	/**
@@ -252,7 +252,7 @@ 
 	 */
 	private function prepareMigration($migration)
 	{
-		$migrations = is_array($migration) ? $migration : [ $migration ];
+		$migrations = is_array($migration) ? $migration : [$migration];
 		$prepared = [];
 		foreach ($migrations as $m)
 			$prepared[] = $this->fixMigration($m);

Braces +24 added lines, -16 removed lines

@@ -93,8 +93,9 @@ 
 			mkdir($this->_path, 0755, true);
 		}
 
-		if (!empty($this->_file))
-			throw new \RuntimeException('Migration Open: You cannot open a new migration without first closing the previous one');
+		if (!empty($this->_file)) {
+					throw new \RuntimeException('Migration Open: You cannot open a new migration without first closing the previous one');
+		}
 
 		// clear any migrations that may have been created just in case they were needed
 		$this->clearMigrations();
@@ -129,8 +130,9 @@ 
 	 */
 	public function closeMigrationFile($delete=false)
 	{
-		if (!$this->_file)
-			return;
+		if (!$this->_file) {
+					return;
+		}
 		if ($delete || !$this->_hasMigrations) {
 			$this->deleteMigration();
 			return;
@@ -149,8 +151,9 @@ 
 		// save the down migrations
 		$this->saveToFile(PHP_EOL.PHP_EOL."//".PHP_EOL."// Down Migrations".PHP_EOL."//");
 		$this->saveMigration('down', $foreignKeysOff);
-		foreach (array_reverse($this->_downMigrations) as $down)
-			$this->saveMigration('down', $down);
+		foreach (array_reverse($this->_downMigrations) as $down) {
+					$this->saveMigration('down', $down);
+		}
 		$this->saveMigration('down', $foreignKeysOn);
 
 		// save this migration in the current users migration table
@@ -191,13 +194,16 @@ 
 	 */
 	protected function saveMigration($direction, $migration)
 	{
-		if (empty($migration))
-			return;
-		if (!$this->_file)
-			throw new \RuntimeException('Attempting to store migrations without first opening a migration file');
+		if (empty($migration)) {
+					return;
+		}
+		if (!$this->_file) {
+					throw new \RuntimeException('Attempting to store migrations without first opening a migration file');
+		}
 		$migrations = is_array($migration) ? $migration : [ $migration ];
-		foreach ($migrations as $m)
-			$this->saveToFile($this->_classname."::addMigration('$direction', \"$m\");");
+		foreach ($migrations as $m) {
+					$this->saveToFile($this->_classname."::addMigration('$direction', \"$m\");");
+		}
 	}
 
 	protected function saveToFile($message)
@@ -210,8 +216,9 @@ 
 	 */
 	private function deleteMigration()
 	{
-		if ($this->_file && file_exists($this->_file))
-			unlink($this->_file);
+		if ($this->_file && file_exists($this->_file)) {
+					unlink($this->_file);
+		}
 	}
 
 	/**
@@ -254,8 +261,9 @@ 
 	{
 		$migrations = is_array($migration) ? $migration : [ $migration ];
 		$prepared = [];
-		foreach ($migrations as $m)
-			$prepared[] = $this->fixMigration($m);
+		foreach ($migrations as $m) {
+					$prepared[] = $this->fixMigration($m);
+		}
 		return $prepared;
 	}
 }
\ No newline at end of file

neon/daedalus/services/ddsAppMigrator/templates/ddsMigration.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 	public static function addMigration($direction, $migration)
 	{
-		switch($direction) {
+		switch ($direction) {
 			case 'up':
 				self::$upMigrations[] = $migration;
 			break;

neon/daedalus/services/ddsManager/DdsObjectMapManager.php

Spacing +27 added lines, -27 removed lines

@@ -22,7 +22,7 @@ 
 	 * requests to the database within one call
 	 * @var array
 	 */
-	private static $_mapResultsCache=[];
+	private static $_mapResultsCache = [];
 	/**
 	 * The set of map requests
 	 * An array with the requests and the maximum number in the chain
@@ -45,7 +45,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getObjectMap($classType, $filters=[], $fields=[], $start=0, $length=1000, $includeDeleted=false)
+	public function getObjectMap($classType, $filters = [], $fields = [], $start = 0, $length = 1000, $includeDeleted = false)
 	{
 		if (!$classType)
 			throw new \InvalidArgumentException("Invalid classType '$classType' in getObjectMap. Correct calling code");
@@ -53,7 +53,7 @@ 
 		$cacheKey = md5(serialize(func_get_args()));
 		if (empty(self::$_mapResultsCache[$cacheKey])) {
 			try {
-				$limit = ['start' => max(0, (integer)$start), 'length' => min(1000, (integer)$length)];
+				$limit = ['start' => max(0, (integer) $start), 'length' => min(1000, (integer) $length)];
 				$classType = $this->canonicaliseRef($classType);
 				$fieldsClause = '';
 				$linkJoins = [];
@@ -109,7 +109,7 @@ 
 				$filterClause = '';
 				$filterValues = [];
 				if ($filters) {
-					$ddsObjectFields = ['_uuid','_created','_deleted','_updated'];
+					$ddsObjectFields = ['_uuid', '_created', '_deleted', '_updated'];
 					// whitelist filter keys to prevent sql injection
 					$members = $this->getClassMembers($classType);
 					$filterSubClause = [];
@@ -131,7 +131,7 @@ 
 							$filterValues[":$field$vcount"] = $v;
 							$vcount++;
 						}
-						$inClause = implode(',',$inClause);
+						$inClause = implode(',', $inClause);
 						if (!empty($members[$field]) && $members[$field]['data_type_ref'] == 'link_multi') {
 							$linkName = "link$field";
 							if (!isset($linkJoins[$linkName]))
@@ -141,12 +141,12 @@ 
 							$filterSubClause[] = "AND $keyClause IN ($inClause)";
 						}
 					}
-					$filterClause = implode (' ', $filterSubClause);
+					$filterClause = implode(' ', $filterSubClause);
 				}
 				$linkJoinsClause = implode(' ', $linkJoins);
 
-				$query = "SELECT DISTINCT `o`.`_uuid`, $fieldsClause FROM `dds_object` `o` LEFT JOIN  `$table` `t` ON `o`.`_uuid`=`t`.`_uuid` " .
-					"$linkJoinsClause WHERE `o`.`_class_type` = '$classType' $filterClause $notDeleted ORDER BY $fieldsClause " .
+				$query = "SELECT DISTINCT `o`.`_uuid`, $fieldsClause FROM `dds_object` `o` LEFT JOIN  `$table` `t` ON `o`.`_uuid`=`t`.`_uuid` ".
+					"$linkJoinsClause WHERE `o`.`_class_type` = '$classType' $filterClause $notDeleted ORDER BY $fieldsClause ".
 					"LIMIT $limit[start], $limit[length]";
 				$command = neon()->db->createCommand($query);
 				if ($filters)
@@ -158,12 +158,12 @@ 
 					unset($r['_uuid']);
 
 					// set the map
-					$map[$uuid] = (count($fields)==1) ? current($r) : $r;
+					$map[$uuid] = (count($fields) == 1) ? current($r) : $r;
 				}
 				self::$_mapResultsCache[$cacheKey] = $map;
 			} catch (\Exception $e) {
 				$errorMessage = "Exception during getting a map. This may be caused by empty filters - you cannot filter on null. ".
-					"Your filters were: ".print_r($filters,true).". The error message is ".$e->getMessage();
+					"Your filters were: ".print_r($filters, true).". The error message is ".$e->getMessage();
 				\Neon::error($errorMessage, 'DDS');
 				debug_message($errorMessage);
 				return [];
@@ -175,7 +175,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function makeMapLookupRequest($objectUuids, $chainMapFields=[], $classType=null)
+	public function makeMapLookupRequest($objectUuids, $chainMapFields = [], $classType = null)
 	{
 		if (empty($objectUuids))
 			return null;
@@ -198,7 +198,7 @@ 
 		foreach ($linkedMembers as $lm) {
 			$requestKeys[] = $this->makeMapChainLookupRequest($objectUuids, [$lm]);
 		}
-		return implode('|',$requestKeys);
+		return implode('|', $requestKeys);
 	}
 
 	/**
@@ -217,7 +217,7 @@ 
 			foreach ($partials[0] as $u=>$p) {
 				foreach ($p as $i=>$v) {
 					if ($this->isUuid($v)) {
-						for ($i=1; $i<count($requestKeys); $i++) {
+						for ($i = 1; $i < count($requestKeys); $i++) {
 							if (array_key_exists($v, $partials[$i][1])) {
 								$partials[0][$u][$i] = $partials[$i][1][$v];
 								continue;
@@ -233,7 +233,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function makeMapChainLookupRequest($objectUuids, $chainMembers=[], $chainMapFields=[], $inReverse=false)
+	public function makeMapChainLookupRequest($objectUuids, $chainMembers = [], $chainMapFields = [], $inReverse = false)
 	{
 		if (empty($objectUuids))
 			return null;
@@ -273,7 +273,7 @@ 
 			$this->getMapLookupByLevel($chain);
 			foreach ($chain as $k=>$r) {
 				if ($r['next_uuid'])
-					$requests['chains'][($i+1)][$k]['uuid'] = $r['next_uuid'];
+					$requests['chains'][($i + 1)][$k]['uuid'] = $r['next_uuid'];
 			}
 		}
 		$this->convertMapRequestResults();
@@ -332,7 +332,7 @@ 
 			$requestsByUuid[$r['uuid']][] = $r;
 		}
 		$objectRows = DdsObject::find()
-			->select(['_uuid','_class_type'])
+			->select(['_uuid', '_class_type'])
 			->where(['_uuid'=>$endpoints])
 			->andWhere(['_deleted'=>0])
 			->asArray()
@@ -352,7 +352,7 @@ 
 
 			// now find all the maps members for the required classes
 			$mapFields = DdsMember::find()
-				->select(['class_type','member_ref'])
+				->select(['class_type', 'member_ref'])
 				->where(['class_type'=>$classTypes, 'deleted'=>0, 'map_field'=>1])
 				->asArray()
 				->all();
@@ -368,7 +368,7 @@ 
 			foreach ($objectsByClassMapsAndChain as $class => $chainMapObjects) {
 				foreach ($chainMapObjects as $chain => $mapObjects) {
 					foreach ($mapObjects as $mapField => $objectUuids) {
-						$objs = "'".implode("','",$objectUuids)."'";
+						$objs = "'".implode("','", $objectUuids)."'";
 						// make sure a map field can be created
 						$mapFieldsClause = '';
 						if ($mapField === self::$_defaultMapChain) {
@@ -377,7 +377,7 @@ 
 							$mapFieldsClause = "CAST(`$mapsByClass[$class]` AS CHAR)";
 						} else {
 							$mapFieldsClause = "CONCAT_WS('$hackySeparator'";
-							foreach (explode(',',$mapField) as $m) {
+							foreach (explode(',', $mapField) as $m) {
 								$mapFieldsClause .= ",CAST(`$m` AS CHAR)";
 							}
 							$mapFieldsClause .= ')';
@@ -402,7 +402,7 @@ 
 		$mapsByChainAndUuid = [];
 		foreach ($maps as $m) {
 			if (strpos($m['map'], $hackySeparator) !== false) {
-				$m['map'] = explode($hackySeparator,$m['map']);
+				$m['map'] = explode($hackySeparator, $m['map']);
 			}
 			$mapsByChainAndUuid[$m['chain']][$m['mapFields']][$m['uuid']] = $m;
 		}
@@ -473,14 +473,14 @@ 
 		$chainCount = count($chainMembers);
 		// split the chain up into requests per chain level if there are any
 		foreach ($chainMembers as $i=>$mc) {
-			$mapFieldKey = ($i == 0 ? 0 : $chainMembers[$i-1]);
-			$mapFields = !empty($chainMapFields[$mapFieldKey]) ? implode(',',$chainMapFields[$mapFieldKey]) : self::$_defaultMapChain;
-			$requests['chains'][$i][$requestKey] = ['uuid'=>($i===0?$objectUuid:null), 'map'=>null, 'mapFields'=>$mapFields, 'chain'=>$mc, 'key'=>$requestKey];
+			$mapFieldKey = ($i == 0 ? 0 : $chainMembers[$i - 1]);
+			$mapFields = !empty($chainMapFields[$mapFieldKey]) ? implode(',', $chainMapFields[$mapFieldKey]) : self::$_defaultMapChain;
+			$requests['chains'][$i][$requestKey] = ['uuid'=>($i === 0 ? $objectUuid : null), 'map'=>null, 'mapFields'=>$mapFields, 'chain'=>$mc, 'key'=>$requestKey];
 		}
 		// add a final chain for the last item
-		$mapFieldKey = ($chainCount == 0 ? 0 : $chainMembers[$chainCount-1]);
-		$mapFields = !empty($chainMapFields[$mapFieldKey]) ? implode(',',$chainMapFields[$mapFieldKey]) : self::$_defaultMapChain;
-		$requests['chains'][$chainCount][$requestKey] = ['uuid'=>($chainCount===0?$objectUuid:null), 'map'=>null, 'mapFields'=>$mapFields, 'chain'=>'__FINAL__', 'key'=>$requestKey];
+		$mapFieldKey = ($chainCount == 0 ? 0 : $chainMembers[$chainCount - 1]);
+		$mapFields = !empty($chainMapFields[$mapFieldKey]) ? implode(',', $chainMapFields[$mapFieldKey]) : self::$_defaultMapChain;
+		$requests['chains'][$chainCount][$requestKey] = ['uuid'=>($chainCount === 0 ? $objectUuid : null), 'map'=>null, 'mapFields'=>$mapFields, 'chain'=>'__FINAL__', 'key'=>$requestKey];
 
 		// and add the requestKey so we don't calculate this again
 		$requests['keys'][$requestKey] = [
@@ -509,7 +509,7 @@ 
 		$results = &static::$_mapResults;
 
 		$tempResults = [];
-		if (count($chains)===0)
+		if (count($chains) === 0)
 			return;
 		foreach ($chains as $level => $maps) {
 			foreach ($maps as $key=>$map) {

Braces +51 added lines, -35 removed lines

@@ -47,8 +47,9 @@ 
 	 */
 	public function getObjectMap($classType, $filters=[], $fields=[], $start=0, $length=1000, $includeDeleted=false)
 	{
-		if (!$classType)
-			throw new \InvalidArgumentException("Invalid classType '$classType' in getObjectMap. Correct calling code");
+		if (!$classType) {
+					throw new \InvalidArgumentException("Invalid classType '$classType' in getObjectMap. Correct calling code");
+		}
 
 		$cacheKey = md5(serialize(func_get_args()));
 		if (empty(self::$_mapResultsCache[$cacheKey])) {
@@ -73,8 +74,9 @@ 
 						$class2Member = Arr::index($linkedMemberClasses, 'class_type');
 						foreach ($linkedMembers as $lm) {
 							// only try to link through to tables that are within daedalus
-							if (isset($class2Member[$lm['link_class']]))
-								$field2link[$lm['member_ref']] = $class2Member[$lm['link_class']];
+							if (isset($class2Member[$lm['link_class']])) {
+															$field2link[$lm['member_ref']] = $class2Member[$lm['link_class']];
+							}
 						}
 					}
 					foreach ($fields as $field) {
@@ -82,9 +84,9 @@ 
 							$fl = $field2link[$field];
 							$table = $this->getTableFromClassType($fl['class_type']);
 							$getFields[] = "`$table`.`$fl[member_ref]`";
-							if ($linkedMembers[$field]['data_type_ref'] == 'link_uni')
-								$linkJoins[$table] = "LEFT JOIN `$table` ON `t`.`$field`=`$table`.`_uuid`";
-							else {
+							if ($linkedMembers[$field]['data_type_ref'] == 'link_uni') {
+															$linkJoins[$table] = "LEFT JOIN `$table` ON `t`.`$field`=`$table`.`_uuid`";
+							} else {
 								$linkName = 'link'.$field;
 								$linkJoins[$linkName] = "LEFT JOIN `dds_link` `$linkName` ON (`o`.`_uuid`=`$linkName`.`from_id` AND `$linkName`.`from_member`='$field')";
 								$linkJoins[$table] = "LEFT JOIN `$table` ON `$linkName`.`to_id` =`$table`.`_uuid`";
@@ -96,8 +98,9 @@ 
 					$fieldsClause = implode(', ', $getFields);
 				} else {
 					$member = $this->getMapMemberForClass($classType);
-					if (!$member)
-						throw new \RuntimeException("There is no mappable member field set on class $classType");
+					if (!$member) {
+											throw new \RuntimeException("There is no mappable member field set on class $classType");
+					}
 					// set this as an array for later
 					$fields = [$member['member_ref']];
 					$fieldsClause = "`t`.`$member[member_ref]`";
@@ -116,12 +119,14 @@ 
 					foreach ($filters as $field=>$value) {
 						if ($field == '_map_field_') {
 							$mapMember = $this->getMapMemberForClass($classType);
-							if ($mapMember && $value)
-								$filterSubClause[] = "AND `t`.`$mapMember[member_ref]` LIKE '%$value%'";
+							if ($mapMember && $value) {
+															$filterSubClause[] = "AND `t`.`$mapMember[member_ref]` LIKE '%$value%'";
+							}
 							continue;
 						}
-						if (!(isset($members[$field]) || in_array($field, $ddsObjectFields)))
-							continue;
+						if (!(isset($members[$field]) || in_array($field, $ddsObjectFields))) {
+													continue;
+						}
 						$keyClause = (in_array($field, $ddsObjectFields)) ? "`o`.`$field`" : "`t`.`$field`";
 						$value = is_array($value) ? $value : [$value];
 						$vcount = 1;
@@ -134,8 +139,9 @@ 
 						$inClause = implode(',',$inClause);
 						if (!empty($members[$field]) && $members[$field]['data_type_ref'] == 'link_multi') {
 							$linkName = "link$field";
-							if (!isset($linkJoins[$linkName]))
-								$linkJoins[$linkName] = "LEFT JOIN `dds_link` `$linkName` ON (`o`.`_uuid`=`$linkName`.`from_id` AND `$linkName`.`from_member`='$field')";
+							if (!isset($linkJoins[$linkName])) {
+															$linkJoins[$linkName] = "LEFT JOIN `dds_link` `$linkName` ON (`o`.`_uuid`=`$linkName`.`from_id` AND `$linkName`.`from_member`='$field')";
+							}
 							$filterSubClause[] = "AND `$linkName`.`to_id` IN ($inClause)";
 						} else {
 							$filterSubClause[] = "AND $keyClause IN ($inClause)";
@@ -149,8 +155,9 @@ 
 					"$linkJoinsClause WHERE `o`.`_class_type` = '$classType' $filterClause $notDeleted ORDER BY $fieldsClause " .
 					"LIMIT $limit[start], $limit[length]";
 				$command = neon()->db->createCommand($query);
-				if ($filters)
-					$command->bindValues($filterValues);
+				if ($filters) {
+									$command->bindValues($filterValues);
+				}
 				$rows = $command->queryAll();
 				foreach ($rows as $r) {
 					// extract out the uuid result
@@ -177,8 +184,9 @@ 
 	 */
 	public function makeMapLookupRequest($objectUuids, $chainMapFields=[], $classType=null)
 	{
-		if (empty($objectUuids))
-			return null;
+		if (empty($objectUuids)) {
+					return null;
+		}
 		/*  See if there are any linked fields that we need to get
 			The implementation here is somewhat crude. Generally speaking we are probably looking
 			at needing to implement graphql or something similar to easily manage all the possible
@@ -235,8 +243,9 @@ 
 	 */
 	public function makeMapChainLookupRequest($objectUuids, $chainMembers=[], $chainMapFields=[], $inReverse=false)
 	{
-		if (empty($objectUuids))
-			return null;
+		if (empty($objectUuids)) {
+					return null;
+		}
 
 		// create a request key based on the input parameters
 		$requestKey = md5(serialize(func_get_args()));
@@ -265,15 +274,17 @@ 
 	{
 		$requests = &static::$_mapRequests;
 		// check we have any requests to make
-		if (count($requests['chains']) === 0)
-			return;
+		if (count($requests['chains']) === 0) {
+					return;
+		}
 		// run through the chain and get the reverse maps for each level of requests
 		foreach ($requests['chains'] as $i=>&$chain) {
 			// the requests will be filled in during this call
 			$this->getMapLookupByLevel($chain);
 			foreach ($chain as $k=>$r) {
-				if ($r['next_uuid'])
-					$requests['chains'][($i+1)][$k]['uuid'] = $r['next_uuid'];
+				if ($r['next_uuid']) {
+									$requests['chains'][($i+1)][$k]['uuid'] = $r['next_uuid'];
+				}
 			}
 		}
 		$this->convertMapRequestResults();
@@ -322,8 +333,9 @@ 
 	 */
 	private function getMapLookupByLevel(&$requests)
 	{
-		if (empty($requests))
-			return;
+		if (empty($requests)) {
+					return;
+		}
 
 		$endpoints = [];
 		$requestsByUuid = [];
@@ -372,8 +384,9 @@ 
 						// make sure a map field can be created
 						$mapFieldsClause = '';
 						if ($mapField === self::$_defaultMapChain) {
-							if (!isset($mapsByClass[$class]))
-								continue;
+							if (!isset($mapsByClass[$class])) {
+															continue;
+							}
 							$mapFieldsClause = "CAST(`$mapsByClass[$class]` AS CHAR)";
 						} else {
 							$mapFieldsClause = "CONCAT_WS('$hackySeparator'";
@@ -436,8 +449,9 @@ 
 	 */
 	private function addRequest($requestKey, $objectUuid, $chainMembers, $chainMapFields, $inReverse)
 	{
-		if (empty($objectUuid))
-			return;
+		if (empty($objectUuid)) {
+					return;
+		}
 
 		// Treat a request for objectUuids as multiple single object map requests
 		// TODO NJ 20190415 - make this work properly with multiple uuids without needing multiple requests
@@ -466,8 +480,9 @@ 
 		$requests = &static::$_mapRequests; // to make the code slightly shorter
 
 		// check to see if the request has already added
-		if (isset($requests['keys'][$requestKey]))
-			return;
+		if (isset($requests['keys'][$requestKey])) {
+					return;
+		}
 
 		// calculate how many chains we are going down
 		$chainCount = count($chainMembers);
@@ -509,8 +524,9 @@ 
 		$results = &static::$_mapResults;
 
 		$tempResults = [];
-		if (count($chains)===0)
-			return;
+		if (count($chains)===0) {
+					return;
+		}
 		foreach ($chains as $level => $maps) {
 			foreach ($maps as $key=>$map) {
 				$tempResults[$key][$level][$map['uuid']] = $map['map'];

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

Braces +3 added lines, -2 removed lines

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