newicon / neon

neon/core/interfaces/IDataMapProvider.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param int $length - the number of rows to return
 	 * @return array an array of key value pairs
 	 */
-	public function getDataMap($key, $query='', $filters=[], $fields=[], $start = 0, $length = 100);
+	public function getDataMap($key, $query = '', $filters = [], $fields = [], $start = 0, $length = 100);
 
 	/**
 	 * Looks up maps from the map ids.
@@ -50,7 +50,7 @@ 
 	 *   If not set then return the default map field for the class.
 	 * @return string
 	 */
-	public function makeMapLookupRequest($key, $ids, $fields=[]);
+	public function makeMapLookupRequest($key, $ids, $fields = []);
 
 	/**
 	 * Return results from a previously called makeMapLookupRequest request

neon/core/Env.php

Spacing +7 added lines, -7 removed lines

@@ -56,12 +56,12 @@ 
 	 * @param  string  $file  - the path to the config file
 	 * @throws \Exception - if the environment variable value is an array
 	 */
-	public static function setEnvironmentFromFile($file, $overwrite=false)
+	public static function setEnvironmentFromFile($file, $overwrite = false)
 	{
 		if (file_exists($file)) {
 			// we need to load in the locally set environment ini file
 			$iniSettings = parse_ini_file($file, false, INI_SCANNER_TYPED);
-			foreach($iniSettings as $name => $value) {
+			foreach ($iniSettings as $name => $value) {
 				Env::setEnvironmentVariable($name, $value, $overwrite);
 			}
 		}
@@ -75,7 +75,7 @@ 
 	 * @param  bool  $overwrite  Whether to force overwriting the environment variable if it already exists defaults to false
 	 * @throws \Exception - if the environment variable value is an array
 	 */
-	public static function setEnvironmentVariable($key, $value, $overwrite=false)
+	public static function setEnvironmentVariable($key, $value, $overwrite = false)
 	{
 		if (is_array($value)) {
 			throw new \Exception('Environment variables do not support nesting. The variable "'.print_r($key, true).'" is poop.');
@@ -109,9 +109,9 @@ 
 			throw new \Exception('DIR_ROOT constant must be defined as the path to the root of your neon application');
 		}
 
-		defined('DIR_CONFIG') || define('DIR_CONFIG', DIR_ROOT . '/config');
-		defined('DIR_VAR') || define('DIR_VAR', DIR_ROOT . '/var');
-		defined('DIR_SYSTEM') || define('DIR_SYSTEM', DIR_ROOT . '/system');
+		defined('DIR_CONFIG') || define('DIR_CONFIG', DIR_ROOT.'/config');
+		defined('DIR_VAR') || define('DIR_VAR', DIR_ROOT.'/var');
+		defined('DIR_SYSTEM') || define('DIR_SYSTEM', DIR_ROOT.'/system');
 
 		Env::environment();
 		if (!class_exists('Neon'))
@@ -156,7 +156,7 @@ 
 	 * @param string $name
 	 * @param boolean $saveToEnvFile
 	 */
-	private static function createEnvironmentVariable($name, $saveToEnvFile=true)
+	private static function createEnvironmentVariable($name, $saveToEnvFile = true)
 	{
 		$value = Hash::uuid64().Hash::uuid64().Hash::uuid64().Hash::uuid64();
 		if ($saveToEnvFile && file_exists(DIR_CONFIG.'/env.ini'))

Braces +12 added lines, -8 removed lines

@@ -34,8 +34,9 @@ 
 	 */
 	public static function getNeonSecret()
 	{
-		if (empty(env('NEON_SECRET')))
-			Env::createEnvironmentVariable('NEON_SECRET');
+		if (empty(env('NEON_SECRET'))) {
+					Env::createEnvironmentVariable('NEON_SECRET');
+		}
 		return env('NEON_SECRET');
 	}
 
@@ -45,8 +46,9 @@ 
 	 */
 	public static function getNeonEncryptionKey()
 	{
-		if (empty(env('NEON_ENCRYPTION_KEY')))
-			Env::createEnvironmentVariable('NEON_ENCRYPTION_KEY');
+		if (empty(env('NEON_ENCRYPTION_KEY'))) {
+					Env::createEnvironmentVariable('NEON_ENCRYPTION_KEY');
+		}
 		return env('NEON_ENCRYPTION_KEY');
 	}
 
@@ -114,8 +116,9 @@ 
 		defined('DIR_SYSTEM') || define('DIR_SYSTEM', DIR_ROOT . '/system');
 
 		Env::environment();
-		if (!class_exists('Neon'))
-			require DIR_NEON.'/core/Yii.php';
+		if (!class_exists('Neon')) {
+					require DIR_NEON.'/core/Yii.php';
+		}
 
 		\Neon::setAlias('neon', DIR_NEON);
 		\Neon::setAlias('root', DIR_ROOT);
@@ -159,8 +162,9 @@ 
 	private static function createEnvironmentVariable($name, $saveToEnvFile=true)
 	{
 		$value = Hash::uuid64().Hash::uuid64().Hash::uuid64().Hash::uuid64();
-		if ($saveToEnvFile && file_exists(DIR_CONFIG.'/env.ini'))
-			file_put_contents(DIR_CONFIG.'/env.ini', PHP_EOL."$name = '$value'", FILE_APPEND | LOCK_EX);
+		if ($saveToEnvFile && file_exists(DIR_CONFIG.'/env.ini')) {
+					file_put_contents(DIR_CONFIG.'/env.ini', PHP_EOL."$name = '$value'", FILE_APPEND | LOCK_EX);
+		}
 		static::setEnvironmentVariable($name, $value, true);
 	}
 

neon/core/ApplicationWeb.php

Spacing +2 added lines, -2 removed lines

@@ -165,7 +165,7 @@ 
 		// Register the core apps
 		$this->registerApps($this->getCoreApps());
 		// Check neon is installed
-		if (! $this->isInstalled() || InstallHelper::isInstallRoute()) {
+		if (!$this->isInstalled() || InstallHelper::isInstallRoute()) {
 			// We can not bootstrap the apps as they can not rely on a database connection
 			// so conclude the bootstrap process
 			return;
@@ -184,7 +184,7 @@ 
 	 */
 	public function getDocsPath()
 	{
-		return __DIR__ . '/docs';
+		return __DIR__.'/docs';
 	}
 
 	/**

Braces +3 added lines, -2 removed lines

@@ -102,8 +102,9 @@
 	public function init()
 	{
 		parent::init();
-		if ($this->isInstalled() && neon()->dev)
-			neon()->dev->debugBootstrap();
+		if ($this->isInstalled() && neon()->dev) {
+					neon()->dev->debugBootstrap();
+		}
 	}
 
 	/**

neon/core/validators/NumberValidator.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	public function getClientOptions($model, $attribute)
 	{
 		$options = parent::getClientOptions($model, $attribute);
-		$options['integerOnly']=$this->integerOnly;
+		$options['integerOnly'] = $this->integerOnly;
 		return $options;
 	}
 }
\ No newline at end of file

neon/core/validators/EmailValidator.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 			'message' => $this->formatMessage($this->message, [
 				'attribute' => $model->getAttributeLabel($attribute),
 			]),
-			'enableIDN' => (bool)$this->enableIDN,
+			'enableIDN' => (bool) $this->enableIDN,
 		];
 		if ($this->skipOnEmpty) {
 			$options['skipOnEmpty'] = 1;

neon/core/validators/Validator.php

Spacing +5 added lines, -5 removed lines

@@ -19,8 +19,8 @@ 
 		'captcha' => ['class'=>'yii\captcha\CaptchaValidator'],
 		'compare' => ['class'=>'yii\validators\CompareValidator'],
 		'date' => ['class'=>'neon\core\validators\DateValidator'],
-		'datetime' => ['class' => 'neon\core\validators\DateValidator', 'type' => DateValidator::TYPE_DATETIME,],
-		'time' => ['class' => 'yii\validators\DateValidator', 'type' => DateValidator::TYPE_TIME,],
+		'datetime' => ['class' => 'neon\core\validators\DateValidator', 'type' => DateValidator::TYPE_DATETIME, ],
+		'time' => ['class' => 'yii\validators\DateValidator', 'type' => DateValidator::TYPE_TIME, ],
 		'default' => ['class'=>'yii\validators\DefaultValueValidator'],
 		'double' => ['class'=>'neon\core\validators\NumberValidator'],
 		'each' => ['class'=>'yii\validators\EachValidator'],
@@ -30,13 +30,13 @@ 
 		'filter' => ['class'=>'yii\validators\FilterValidator'],
 		'image' => ['class'=>'yii\validators\ImageValidator'],
 		'in' => ['class'=>'yii\validators\RangeValidator'],
-		'integer' => ['class' => 'neon\core\validators\NumberValidator', 'integerOnly' => true,],
+		'integer' => ['class' => 'neon\core\validators\NumberValidator', 'integerOnly' => true, ],
 		'match' => ['class'=>'neon\core\validators\RegularExpressionValidator'],
 		'number' => ['class'=>'neon\core\validators\NumberValidator'],
 		'required' => ['class'=>'neon\core\validators\RequiredValidator'],
 		'safe' => ['class'=>'yii\validators\SafeValidator'],
 		'string' => ['class'=>'neon\core\validators\StringValidator'],
-		'trim' => ['class' => 'yii\validators\FilterValidator', 'filter' => 'trim', 'skipOnArray' => true,],
+		'trim' => ['class' => 'yii\validators\FilterValidator', 'filter' => 'trim', 'skipOnArray' => true, ],
 		'unique' => ['class'=>'yii\validators\UniqueValidator'],
 		'url' => ['class'=>'neon\core\validators\UrlValidator'],
 		'ip' => ['class'=>'yii\validators\IpValidator'],
@@ -63,7 +63,7 @@ 
 
 		if ($type instanceof \Closure || ($model->hasMethod($type) && !isset(static::$builtInValidators[$type]))) {
 			// method-based validator
-			$params['class'] = __NAMESPACE__ . '\InlineValidator';
+			$params['class'] = __NAMESPACE__.'\InlineValidator';
 			$params['method'] = $type;
 		} else {
 			if (isset(static::$builtInValidators[$type])) {

neon/core/validators/MockModel.php

Spacing +2 added lines, -2 removed lines

@@ -17,9 +17,9 @@
 	 * @param string $label
 	 * @return MockModel|null
 	 */
-	public static function get($label='')
+	public static function get($label = '')
 	{
-		if (self::$mock===null)
+		if (self::$mock === null)
 			self::$mock = new self();
 		self::$mock->label = $label;
 		return self::$mock;

Braces +3 added lines, -2 removed lines

@@ -19,8 +19,9 @@
 	 */
 	public static function get($label='')
 	{
-		if (self::$mock===null)
-			self::$mock = new self();
+		if (self::$mock===null) {
+					self::$mock = new self();
+		}
 		self::$mock->label = $label;
 		return self::$mock;
 	}

neon/core/grid/DdsGrid.php

Spacing +3 added lines, -3 removed lines

@@ -232,7 +232,7 @@ 
 	/**
 	 * Add the edit and delete DDS object buttons to the grid
 	 */
-	public function addActionButtonColumn($title=false)
+	public function addActionButtonColumn($title = false)
 	{
 		$buttonCol = $this->addButtonColumn('edit')->setTitle($title);
 
@@ -246,7 +246,7 @@ 
 
 		if ($this->hasScope('deleted') && $this->isScopeActive('deleted')) {
 			if ($this->showGridUndeleteButton) {
-				$buttonCol->addButton('undelete', '','', 'fa fa-undo', 'btn-default', [
+				$buttonCol->addButton('undelete', '', '', 'fa fa-undo', 'btn-default', [
 					'data-toggle' => 'tooltip',
 					'title' => 'Restore',
 					'data-action' => 'actionUndelete'
@@ -377,7 +377,7 @@ 
 	 * Load appropriate columns based on DDS details
 	 * @deprecated - just set the classType - either in the init or the config
 	 */
-	public function ddsLoadGrid($classType, $includeDeleted=false, $pageSize=50)
+	public function ddsLoadGrid($classType, $includeDeleted = false, $pageSize = 50)
 	{
 		if ($this->title == null)
 			$this->title = $classType;

Braces +18 added lines, -12 removed lines

@@ -148,8 +148,9 @@ 
 	{
 		$this->_classType = $value;
 		// Set a default title
-		if ($this->title === null)
-			$this->title = $this->_classType;
+		if ($this->title === null) {
+					$this->title = $this->_classType;
+		}
 	}
 
 	/**
@@ -191,18 +192,21 @@ 
 		parent::init();
 		// don't configure the grid if the class type has not been set!
 		if ($this->_classType === null) {
-			if (neon()->debug)
-				throw new \RuntimeException('You need to configure the grid class type before calling init');
+			if (neon()->debug) {
+							throw new \RuntimeException('You need to configure the grid class type before calling init');
+			}
 			return null;
 		}
 
 		$this->addColumnsFromClassMembers();
 		$this->addDdsObjectColumns();
 
-		if ($this->useActiveScope)
-			$this->addScope('active', 'Active');
-		if ($this->useDeletedScope)
-			$this->addScope('deleted', 'Deleted');
+		if ($this->useActiveScope) {
+					$this->addScope('active', 'Active');
+		}
+		if ($this->useDeletedScope) {
+					$this->addScope('deleted', 'Deleted');
+		}
 	}
 
 	/**
@@ -368,8 +372,9 @@ 
 			'class' => 'neon\core\grid\column\DefinitionColumn',
 			'member' => new $columnType($member),
 		];
-		if (is_array($config))
-			$colConfig = array_merge($colConfig, $config);
+		if (is_array($config)) {
+					$colConfig = array_merge($colConfig, $config);
+		}
 		return $this->addColumn($member, $colConfig);
 	}
 
@@ -379,8 +384,9 @@ 
 	 */
 	public function ddsLoadGrid($classType, $includeDeleted=false, $pageSize=50)
 	{
-		if ($this->title == null)
-			$this->title = $classType;
+		if ($this->title == null) {
+					$this->title = $classType;
+		}
 		// TODO: should be in constructor can't create a DDS grid without the DDS class ref
 		$this->classType = $classType;
 

neon/core/grid/PhoebeDataProvider.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 			}
 		}
 
-		$paginator =  [
+		$paginator = [
 			'start' => $pagination->getOffset(),
 			'length' => $pagination->getLimit(),
 			'total' => $pagination->totalCount
@@ -75,7 +75,7 @@ 
 		$form = $this->getForm();
 
 		$data = [];
-		foreach($results as $object) {
+		foreach ($results as $object) {
 			$form->reset();
 			$form->loadFromDb($object);
 			$data[] = array_merge($object, $form->getDataDisplay());

Braces +9 added lines, -6 removed lines

@@ -42,10 +42,12 @@ 
 
 	public function init()
 	{
-		if (empty($this->phoebeType))
-			throw new \RuntimeException('PhoebeDataProvider: the phoebe type has not been set. It needs to be set on construction');
-		if (empty($this->classType))
-			throw new \RuntimeException('PhoebeDataProvider: the phoebe class type has not been set. It needs to be set on construction');
+		if (empty($this->phoebeType)) {
+					throw new \RuntimeException('PhoebeDataProvider: the phoebe type has not been set. It needs to be set on construction');
+		}
+		if (empty($this->classType)) {
+					throw new \RuntimeException('PhoebeDataProvider: the phoebe class type has not been set. It needs to be set on construction');
+		}
 	}
 
 	/**
@@ -142,8 +144,9 @@ 
 	 */
 	protected function getFormDefinition()
 	{
-		if ($this->formDefinition == null)
-			$this->formDefinition = neon('phoebe')->getFormDefinition($this->phoebeType, $this->classType);
+		if ($this->formDefinition == null) {
+					$this->formDefinition = neon('phoebe')->getFormDefinition($this->phoebeType, $this->classType);
+		}
 		return $this->formDefinition;
 	}