newicon / neon

neon/daedalus/interfaces/IDdsChangeLogManagement.php

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
 	 * @param \neon\core\helpers\Iterator $iterator  Iterate over the results.
 	 * @return array  the change log data
 	 */
-	public function listChangeLog($fromDate=null, Iterator $iterator=null);
+	public function listChangeLog($fromDate = null, Iterator $iterator = null);
 
 	/**
 	 * List an object's change log, if the object's class has been set up to store changes
@@ -73,7 +73,7 @@ 
 	 * @return If the object's class is set to have a change log, this will return the
 	 *   change log for this object. Otherwise it will return a blank array.
 	 */
-	public function listObjectChangeLog($uuid, $fromDate=null, Iterator $iterator=null);
+	public function listObjectChangeLog($uuid, $fromDate = null, Iterator $iterator = null);
 
 	/**
 	 * List the history of an object, if the object's class has been set up to store changes.
@@ -84,7 +84,7 @@ 
 	 * @return If the object's class is set to have a change log, this will return the
 	 *   history for this object. Otherwise it will return a blank array.
 	 */
-	public function listObjectHistory($uuid, $fromDate=null, Iterator $iterator=null);
+	public function listObjectHistory($uuid, $fromDate = null, Iterator $iterator = null);
 
 	/**
 	 * Clear change log to a certain date and optionally for particular class types
@@ -98,7 +98,7 @@ 
 	 *   then the $classList is the set of log items to be preserved and all
 	 *   others are cleared.
 	 */
-	public function clearChangeLog($toDate, $classList=[], $clearClassList=true);
+	public function clearChangeLog($toDate, $classList = [], $clearClassList = true);
 
 	/**
 	 * Clear an object's change log
@@ -124,7 +124,7 @@ 
 	 *   This can be empty, if the item was deleted or destroyed for example.
 	 * @return string  the uuid of the created log entry
 	 */
-	public function addLogEntry($objectUuid, $class, $changeKey, $before=[], $after=[]);
+	public function addLogEntry($objectUuid, $class, $changeKey, $before = [], $after = []);
 
 	/**
 	 * Get the log entry
@@ -163,7 +163,7 @@ 
 	 * @param array $associateObjectUuids  any associated objects that are related to the principal one.
 	 * @return string  the uuid of the created log entry
 	 */
-	public function addGeneralComment($module, $classType, $comment, $objectUuid=null, array $associateObjectUuids=[]);
+	public function addGeneralComment($module, $classType, $comment, $objectUuid = null, array $associateObjectUuids = []);
 
 	/**
 	 * Get an object's value at a particular log point.

neon/daedalus/interfaces/IDdsObjectMapManagement.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 	 * @throw \InvalidArgumentException  if the class type does not exist
 	 * @throw \RuntimeException  if the map field does not exist
 	 */
-	public function getObjectMap($classType, $filters=[], $mapFields=[], $start=0, $length=1000, $includeDeleted=false);
+	public function getObjectMap($classType, $filters = [], $mapFields = [], $start = 0, $length = 1000, $includeDeleted = false);
 
 
 	/**
@@ -91,7 +91,7 @@ 
 	 * @return string $requestKey  returns a unique request key so the results can be
 	 *   found after committing.
 	 */
-	public function makeMapLookupRequest($objectUuids, $mapFields=[], $classType=null);
+	public function makeMapLookupRequest($objectUuids, $mapFields = [], $classType = null);
 
 	/**
 	 * Get hold of the requested map lookup
@@ -133,7 +133,7 @@ 
 	 *   found after committing. @see getMapChainLookupResult for the data structure
 	 *   returned
 	 */
-	public function makeMapChainLookupRequest($objectUuids, $chainMembers=[], $chainMapFields=[], $inReverse=false);
+	public function makeMapChainLookupRequest($objectUuids, $chainMembers = [], $chainMapFields = [], $inReverse = false);
 
 	/**
 	 * Commit the map requests stored so that all object chains are resolved

neon/daedalus/interfaces/IDdsAppMigrator.php

Spacing +1 added lines, -1 removed lines

@@ -52,6 +52,6 @@
 	 * @param boolean $delete  if set to true, then the migration is deleted
 	 *   regardless of whether or not any migrations were stored
 	 */
-	public function closeMigrationFile($delete=false);
+	public function closeMigrationFile($delete = false);
 
 }
\ No newline at end of file

neon/daedalus/interfaces/IDdsObjectManagement.php

Indentation +4 added lines, -4 removed lines

@@ -301,10 +301,10 @@
 	public function commitRequests();
 
  	/**
-	 * Extract data from the last committed requests
-	 * @param string $requestKey  the request key you want to extract for
-	 * @return array  the requested data or [] if none
-	 */
+ 	 * Extract data from the last committed requests
+ 	 * @param string $requestKey  the request key you want to extract for
+ 	 * @return array  the requested data or [] if none
+ 	 */
 	public function getLastCommitData($requestKey);
 
 

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

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