newicon / neon

neon/phoebe/controllers/common/PhoebeController.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	 * @param string $type the phoebe class type
 	 * @return \neon\core\form\Form
 	 */
-	protected function getPhoebeForm($type, &$isNewForm=null, $addExtras=true, $builder=false)
+	protected function getPhoebeForm($type, &$isNewForm = null, $addExtras = true, $builder = false)
 	{
 		$form = null;
 		$isNewForm = false;

Braces +21 added lines, -14 removed lines

@@ -61,8 +61,9 @@ 
 			$class = $this->getClass($type);
 			if ($builder) {
 				$definition = $class->getClassBuilderDefinition();
-			} else
-				$definition = $class->getClassFormDefinition();
+			} else {
+							$definition = $class->getClassFormDefinition();
+			}
 			$fieldCount = count($definition['fields']);
 			$isNewForm = count($definition) == 0 ? true : false;
 			$form = new \neon\core\form\Form($definition);
@@ -114,8 +115,9 @@ 
 	protected function getBuilderDefinition($classType)
 	{
 		$class = null;
-		if ($classType)
-			$class = $this->getClass($classType);
+		if ($classType) {
+					$class = $this->getClass($classType);
+		}
 		return $class ? $class->getClassBuilderDefinition() : [];
 	}
 
@@ -127,8 +129,9 @@ 
 	protected function getClassDefinition($classType)
 	{
 		$class = null;
-		if ($classType)
-			$class = $this->getClass($classType);
+		if ($classType) {
+					$class = $this->getClass($classType);
+		}
 		return $class ? $class->definition : [];
 	}
 
@@ -151,8 +154,9 @@ 
 	protected function getObject($id)
 	{
 		$object = $this->phoebe()->getObject($id);
-		if (!$object)
-			throw new \yii\web\HttpException(404);
+		if (!$object) {
+					throw new \yii\web\HttpException(404);
+		}
 		return $object;
 	}
 
@@ -164,8 +168,9 @@ 
 	protected function deleteObject($id)
 	{
 		$object = $this->phoebe()->getObject($id);
-		if ($object)
-			return $object->deleteObject();
+		if ($object) {
+					return $object->deleteObject();
+		}
 		return null;
 	}
 
@@ -177,8 +182,9 @@ 
 	protected function undeleteObject($id)
 	{
 		$object = $this->phoebe()->getObject($id);
-		if ($object)
-			return $object->undeleteObject();
+		if ($object) {
+					return $object->undeleteObject();
+		}
 		return null;
 	}
 
@@ -190,8 +196,9 @@ 
 	protected function destroyObject($id)
 	{
 		$object = $this->phoebe()->getObject($id);
-		if ($object)
-			return $object->destroyObject();
+		if ($object) {
+					return $object->destroyObject();
+		}
 		return null;
 	}
 }

neon/phoebe/controllers/common/PhoebeValidator.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  */
 class PhoebeValidator
 {
-	public static function validateForm($phoebeType, $classType, $name=null)
+	public static function validateForm($phoebeType, $classType, $name = null)
 	{
 		// get hold of the form
 		$form = neon('phoebe')->getForm($phoebeType, $classType, []);

Braces +3 added lines, -2 removed lines

@@ -11,8 +11,9 @@
 	{
 		// get hold of the form
 		$form = neon('phoebe')->getForm($phoebeType, $classType, []);
-		if ($name)
-			$form->setName($name);
+		if ($name) {
+					$form->setName($name);
+		}
 		return $form->ajaxValidation();
 	}
 }

neon/phoebe/builders/database/assets/FormBuilderAsset.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 class FormBuilderAsset extends \yii\web\AssetBundle
 {
-	public $sourcePath = __DIR__ . '/publish';
+	public $sourcePath = __DIR__.'/publish';
 
 	public $js = [
 		'store.js',

neon/phoebe/builders/appforms/assets/AppFormBuilderAsset.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 class AppFormBuilderAsset extends \yii\web\AssetBundle
 {
-	public $sourcePath = __DIR__ . '/publish';
+	public $sourcePath = __DIR__.'/publish';
 
 	public $js = [
 		'manifest.js',

neon/phoebe/migrations/m171011_143735_forms_phoebe.php

Indentation +6 added lines, -6 removed lines

@@ -7,11 +7,11 @@
  */
 class m171011_143735_forms_phoebe extends Migration
 {
-    public function safeUp()
-    {
-    }
+	public function safeUp()
+	{
+	}
 
-    public function safeDown()
-    {
-    }
+	public function safeDown()
+	{
+	}
 }

neon/phoebe/App.php

Spacing +4 added lines, -4 removed lines

@@ -91,7 +91,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getDataMap($key, $query='', $filters=[], $fields=[], $start=0, $length=100)
+	public function getDataMap($key, $query = '', $filters = [], $fields = [], $start = 0, $length = 100)
 	{
 		// convert generic form builder filters to phoebe class ones
 		$filters = Arr::replaceKeys($filters, ['uuid'=> 'class_type']);
@@ -173,7 +173,7 @@ 
 	 *   that you want to display and in what order
 	 * @return array
 	 */
-	public function getFormDefinition($phoebeType, $classType, array $fields=[])
+	public function getFormDefinition($phoebeType, $classType, array $fields = [])
 	{
 		$cacheKey = md5(serialize(func_get_args()));
 		return neon()->cacheArray->getOrSet($cacheKey, function() use ($classType, $phoebeType, $fields) {
@@ -426,7 +426,7 @@ 
 	 * @return bool - returns true if saved correctly or the set of errors if the
 	 *   form couldn't validate
 	 */
-	public function saveForm($phoebeType, $classType, $form=null, $formName=null, $metaInfo=null, &$uuid=null, &$changeLogUuids=[])
+	public function saveForm($phoebeType, $classType, $form = null, $formName = null, $metaInfo = null, &$uuid = null, &$changeLogUuids = [])
 	{
 		$changeLogUuids = [];
 		if (!$form) {
@@ -509,7 +509,7 @@ 
 					$itemKey = substr($key, strlen($this->formMetaDataSourceString));
 					if (empty($meta['dataSources'][$itemKey]))
 						$meta['dataSources'][$itemKey] = $v;
-				} else if ($key==$this->formMetaReturnUrlString && empty($meta['returnUrl'])) {
+				} else if ($key == $this->formMetaReturnUrlString && empty($meta['returnUrl'])) {
 					$meta['returnUrl'] = $v;
 				}
 			}

Braces +60 added lines, -40 removed lines

@@ -252,16 +252,18 @@ 
 		$formDefinition = [];
 		if (!empty($options['uuid'])) {
 			$object = $phoebe->getObject($options['uuid']);
-			if (!$object)
-				throw new \RuntimeException('The requested form object was not found. Uuid='.$options['uuid']);
+			if (!$object) {
+							throw new \RuntimeException('The requested form object was not found. Uuid='.$options['uuid']);
+			}
 			$class = $object->getIPhoebeClass();
 			$formDefinition = $class->getClassFormDefinition($fields);
 		} else {
 			// otherwise get a clean class
 			if ($classType) {
 				$formDefinition = $this->getFormDefinition($phoebeType, $classType, $fields);
-				if (!count($formDefinition))
-					throw new \RuntimeException('The requested form type was not found. Type='.$classType);
+				if (!count($formDefinition)) {
+									throw new \RuntimeException('The requested form type was not found. Type='.$classType);
+				}
 			}
 		}
 		$fieldCount = count($formDefinition['fields']);
@@ -269,16 +271,19 @@ 
 
 
 		// temporary code to cover problems with differences between appForms and ddsForms
-		if ($phoebeType !== 'applicationForm' && !empty($options['initialiseFromDds']))
-			throw new \RuntimeException('Only applicationForms work with initialiseFromDds');
+		if ($phoebeType !== 'applicationForm' && !empty($options['initialiseFromDds'])) {
+					throw new \RuntimeException('Only applicationForms work with initialiseFromDds');
+		}
 
 		// set the form class
-		if (!empty($options['cssClass']))
-			$form->setAttributes(['class'=>$options['cssClass']]);
+		if (!empty($options['cssClass'])) {
+					$form->setAttributes(['class'=>$options['cssClass']]);
+		}
 
 		// set the form id
-		if (!empty($options['id']))
-			$form->setId($options['id']);
+		if (!empty($options['id'])) {
+					$form->setId($options['id']);
+		}
 		$formId = $form->getId();
 		if ($printOnly) {
 			$form->printOnly = true;
@@ -289,17 +294,20 @@ 
 		}
 
 		// set the forms label - allow clearing of it via empty string
-		if (isset($options['label']))
-			$form->setLabel($options['label']);
+		if (isset($options['label'])) {
+					$form->setLabel($options['label']);
+		}
 
 
 		// check to see if we are not posting from the client, populate it from the database
 		// !set the form name before checking data set!
-		if (!empty($options['name']))
-			$form->setName($options['name']);
+		if (!empty($options['name'])) {
+					$form->setName($options['name']);
+		}
 		if (!empty($options['initialiseFromDds']) && (!$object || !$object->data)) {
-			if (!$object)
-				$object = $phoebe->createStubObject($classType);
+			if (!$object) {
+							$object = $phoebe->createStubObject($classType);
+			}
 			$object->initialiseFromDds($options['initialiseFromDds']);
 		}
 		if ($object && !$form->hasRequestData()) {
@@ -307,8 +315,9 @@ 
 		}
 
 		if (!($printOnly || $readOnly)) {
-			if (!empty($options['uuid']))
-				$form->addFieldHidden("{$this->formMetaPrefix}{$this->formMetaUuidString}", ['value'=>$options['uuid']]);
+			if (!empty($options['uuid'])) {
+							$form->addFieldHidden("{$this->formMetaPrefix}{$this->formMetaUuidString}", ['value'=>$options['uuid']]);
+			}
 
 			// set any additional data sources
 			if (!empty($options['dataSources'])) {
@@ -316,8 +325,9 @@ 
 					$form->addFieldHidden("{$this->formMetaPrefix}{$this->formMetaDataSourceString}$key", ['value'=>$value]);
 					// for dds forms, set the values on the form too for initial display
 					if ($phoebeType == 'daedalus') {
-						if ($form->hasField($key))
-							$form->getField($key)->setValue($value);
+						if ($form->hasField($key)) {
+													$form->getField($key)->setValue($value);
+						}
 					}
 				}
 			}
@@ -328,8 +338,9 @@ 
 			if (!empty($options['mapFilters'])) {
 				foreach ($options['mapFilters'] as $key=>$filters) {
 					$f = $form->getField($key);
-					if ($f && isset($f->dataMapFilters))
-						$f->dataMapFilters = $filters;
+					if ($f && isset($f->dataMapFilters)) {
+											$f->dataMapFilters = $filters;
+					}
 				}
 			}
 
@@ -339,8 +350,9 @@ 
 			if (!empty($options['mapFields'])) {
 				foreach ($options['mapFields'] as $key=>$mapFields) {
 					$f = $form->getField($key);
-					if ($f && isset($f->dataMapFields))
-						$f->dataMapFields = $mapFields;
+					if ($f && isset($f->dataMapFields)) {
+											$f->dataMapFields = $mapFields;
+					}
 				}
 			}
 
@@ -365,20 +377,24 @@ 
 			}
 
 			// set the forms action
-			if (!empty($options['action']))
-				$form->setAction($options['action']);
+			if (!empty($options['action'])) {
+							$form->setAction($options['action']);
+			}
 
 			// set whether or not ajax validation is required
-			if (isset($options['enableAjaxValidation']))
-				$form->enableAjaxValidation = (boolean) $options['enableAjaxValidation'];
+			if (isset($options['enableAjaxValidation'])) {
+							$form->enableAjaxValidation = (boolean) $options['enableAjaxValidation'];
+			}
 
 			// set whether or not ajax submission is required
-			if (isset($options['enableAjaxSubmission']))
-				$form->enableAjaxSubmission = (boolean) $options['enableAjaxSubmission'];
+			if (isset($options['enableAjaxSubmission'])) {
+							$form->enableAjaxSubmission = (boolean) $options['enableAjaxSubmission'];
+			}
 
 			// set where the form will check itself via ajaxValidation
-			if (!empty($options['ajaxValidationUrl']))
-				$form->validationUrl = $options['ajaxValidationUrl'];
+			if (!empty($options['ajaxValidationUrl'])) {
+							$form->validationUrl = $options['ajaxValidationUrl'];
+			}
 
 			// set where the browser will go to after completion of the form
 			if (!empty($options['returnUrl'])) {
@@ -438,8 +454,9 @@ 
 			$definition = $this->getFormDefinition($phoebeType, $classType);
 			$form = new \neon\core\form\Form($definition);
 		}
-		if (!empty($formName))
-			$form->setName($formName);
+		if (!empty($formName)) {
+					$form->setName($formName);
+		}
 		if ($form->processRequest()) {
 			$data = $form->getData();
 			// prevent multiple renders resulting in multiple saves of the form
@@ -461,13 +478,15 @@ 
 					$changeLogUuids['add'] = $object->getChangeLogUuid();
 				}
 				$uuid = $object->uuid;
-				if (!empty($meta['dataSources']))
-					$object->setDataSources($meta['dataSources']);
+				if (!empty($meta['dataSources'])) {
+									$object->setDataSources($meta['dataSources']);
+				}
 				if ($object->editObject($data) === true) {
 					$alreadySubmitted[$submittedCheck] = $uuid;
 					$changeLogUuids['edit'] = $object->getChangeLogUuid();
-					if (!empty($meta['returnUrl']))
-						neon()->response->redirect(html_entity_decode($meta['returnUrl']));
+					if (!empty($meta['returnUrl'])) {
+											neon()->response->redirect(html_entity_decode($meta['returnUrl']));
+					}
 					return true;
 				}
 			} else {
@@ -512,8 +531,9 @@ 
 					$meta['uuid'] = $v;
 				} else if (strpos($key, $this->formMetaDataSourceString) === 0) {
 					$itemKey = substr($key, strlen($this->formMetaDataSourceString));
-					if (empty($meta['dataSources'][$itemKey]))
-						$meta['dataSources'][$itemKey] = $v;
+					if (empty($meta['dataSources'][$itemKey])) {
+											$meta['dataSources'][$itemKey] = $v;
+					}
 				} else if ($key==$this->formMetaReturnUrlString && empty($meta['returnUrl'])) {
 					$meta['returnUrl'] = $v;
 				}

neon/user/interfaces/iUser.php

Spacing +1 added lines, -1 removed lines

@@ -80,5 +80,5 @@
 	 * @param string $role
 	 * @return null | string  the url if found
 	 */
-	public function getHomeUrl($role=null);
+	public function getHomeUrl($role = null);
 }
\ No newline at end of file

neon/user/interfaces/IUserManagement.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
 	 * @return array  users as
 	 *   [['uuid'=>'username']...]
 	 */
-	public function listUsers(Iterator &$iterator=null);
+	public function listUsers(Iterator &$iterator = null);
 
 	/**
 	 * Find a set of users based on a partial search string
@@ -47,7 +47,7 @@ 
 	 * @return array  users as
 	 *   [['uuid'=>'username']...]
 	 */
-	public function searchUsers($search, Iterator &$iterator=null);
+	public function searchUsers($search, Iterator &$iterator = null);
 
 	/**
 	 * Create a new User
@@ -59,7 +59,7 @@ 
 	 *   calling this must also be a superuser
 	 * @return string  - the users uuid
 	 */
-	public function addUser($username, $email, $password, $roles=[], $superuser=false);
+	public function addUser($username, $email, $password, $roles = [], $superuser = false);
 
 	/**
 	 * Get hold of an User given the user uuid

neon/user/models/User.php

Spacing +7 added lines, -7 removed lines

@@ -165,7 +165,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getHomeUrl($role=null)
+	public function getHomeUrl($role = null)
 	{
 		$userRoles = $this->getRoles();
 		$availableRoles = neon('user')->getRoles(true);
@@ -333,14 +333,14 @@ 
 	 * @see getUserListUncached for details
 	 * @return array
 	 */
-	public static function getUserList($query='', $filters=[], $fields=[], $start=0, $length=100)
+	public static function getUserList($query = '', $filters = [], $fields = [], $start = 0, $length = 100)
 	{
 		// because we need to cache according to the args we cannot store
 		// results in cache rather cacheArray. This is so we can clear cache
 		// appropriately in other calls such as edit and delete. Also user
 		// information should not be available in cached files
 		return neon()->cacheArray->getOrSet(
-			[static::CACHE_KEY_USER_LIST,func_get_args()],
+			[static::CACHE_KEY_USER_LIST, func_get_args()],
 			function() use ($query, $filters, $fields, $start, $length) {
 				return self::getUserListUncached($query, $filters, $fields, $start, $length);
 			}
@@ -359,7 +359,7 @@ 
 	 * @param int $length - the total number of rows to return
 	 * @return array
 	 */
-	public static function getUserListUncached($query='',$filters=[], $fields=[], $start=0, $length=100)
+	public static function getUserListUncached($query = '', $filters = [], $fields = [], $start = 0, $length = 100)
 	{
 		$q = self::find()->select(array_merge(['uuid', 'username', 'email'], $fields));
 		if ($q !== '')
@@ -384,7 +384,7 @@ 
 	{
 		return collect($userRows)->mapWithKeys(function($row, $key) use($fields) {
 			if (empty($fields))
-				return [$row['uuid'] => $row['username'] ? $row['username'] . ' - ' . $row['email'] : $row['email']];
+				return [$row['uuid'] => $row['username'] ? $row['username'].' - '.$row['email'] : $row['email']];
 			return [$row['uuid'] => $row];
 		})->all();
 	}
@@ -504,7 +504,7 @@ 
 	 */
 	public function generatePasswordResetToken()
 	{
-		$this->password_reset_token = neon()->security->generateRandomString() . '_' . time();
+		$this->password_reset_token = neon()->security->generateRandomString().'_'.time();
 	}
 
 	/**
@@ -621,7 +621,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getImageUrl($size=40)
+	public function getImageUrl($size = 40)
 	{
 		return Html::gravatar($this->email, $size, 'mm', 'g');
 	}

Braces +30 added lines, -20 removed lines

@@ -125,8 +125,9 @@ 
 	 */
 	public function getRoles()
 	{
-		if (!isset(static::$_userRoles[$this->id]))
-			static::$_userRoles[$this->id] = array_keys(neon()->authManager->getRolesByUser($this->id));
+		if (!isset(static::$_userRoles[$this->id])) {
+					static::$_userRoles[$this->id] = array_keys(neon()->authManager->getRolesByUser($this->id));
+		}
 		return is_array(static::$_userRoles[$this->id]) ? static::$_userRoles[$this->id] : [];
 	}
 
@@ -139,8 +140,9 @@ 
 		$authManager->revokeAll($this->id);
 		foreach ($roles as $role) {
 			$r = $authManager->getRole($role);
-			if ($r)
-				$authManager->assign($r, $this->id);
+			if ($r) {
+							$authManager->assign($r, $this->id);
+			}
 		}
 		unset(static::$_userRoles[$this->id]);
 	}
@@ -172,12 +174,14 @@ 
 
 		// searching in a specific role?
 		if (!empty($role)) {
-			if (isset($availableRoles[$role]['homeUrl']))
-				return $availableRoles[$role]['homeUrl'];
+			if (isset($availableRoles[$role]['homeUrl'])) {
+							return $availableRoles[$role]['homeUrl'];
+			}
 		} else { // or finding any one?
 			foreach ($userRoles as $role) {
-				if (isset($availableRoles[$role]['homeUrl']))
-					return $availableRoles[$role]['homeUrl'];
+				if (isset($availableRoles[$role]['homeUrl'])) {
+									return $availableRoles[$role]['homeUrl'];
+				}
 
 			}
 		}
@@ -204,8 +208,9 @@ 
 	public static function findIdentity($id)
 	{
 		// The id must be a uuid64
-		if (!Hash::isUuid64($id))
-			return null;
+		if (!Hash::isUuid64($id)) {
+					return null;
+		}
 		// The string conversion here is important to ensure the id is correctly quoted as a string
 		// otherwise if the $id is a number it will match uuid's that start with that number!
 		return self::findOne(['uuid' => (string) $id, 'status' => self::STATUS_ACTIVE]);
@@ -231,8 +236,9 @@ 
 	public static function findIdentityByInviteToken($token)
 	{
 		$invite = UserInvite::findInviteByInviteToken($token);
-		if (!$invite)
-			return null;
+		if (!$invite) {
+					return null;
+		}
 		return User::findOne(['uuid' => $invite->user_id, 'status' => [User::STATUS_PENDING]]);
 	}
 
@@ -362,10 +368,12 @@ 
 	public static function getUserListUncached($query='',$filters=[], $fields=[], $start=0, $length=100)
 	{
 		$q = self::find()->select(array_merge(['uuid', 'username', 'email'], $fields));
-		if ($q !== '')
-			$q->where(['or', ['like', 'username', $query], ['like', 'email', $query]]);
-		if (!empty($filters))
-			$q->andWhere($filters);
+		if ($q !== '') {
+					$q->where(['or', ['like', 'username', $query], ['like', 'email', $query]]);
+		}
+		if (!empty($filters)) {
+					$q->andWhere($filters);
+		}
 		$q->offset($start)
 			->limit($length)
 			->orderBy(['username' => SORT_ASC, 'email' => SORT_ASC])
@@ -383,8 +391,9 @@ 
 	public static function formatDataMapItems($userRows, $fields)
 	{
 		return collect($userRows)->mapWithKeys(function($row, $key) use($fields) {
-			if (empty($fields))
-				return [$row['uuid'] => $row['username'] ? $row['username'] . ' - ' . $row['email'] : $row['email']];
+			if (empty($fields)) {
+							return [$row['uuid'] => $row['username'] ? $row['username'] . ' - ' . $row['email'] : $row['email']];
+			}
 			return [$row['uuid'] => $row];
 		})->all();
 	}
@@ -538,8 +547,9 @@ 
 	{
 		// remove any caches and authorisations against the user
 		neon()->cacheArray->delete(static::CACHE_KEY_USER_LIST);
-		if ($this->id)
-			neon()->authManager->revokeAll($this->id);
+		if ($this->id) {
+					neon()->authManager->revokeAll($this->id);
+		}
 		return parent::beforeDelete();
 	}