newicon / neon

neon/core/grid/query/IQuery.php

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
 	 * @param mixed $value
 	 * @return $this - provide a fluent chainable interface
 	 */
-	public function where($column, $operator=null, $value=null);
+	public function where($column, $operator = null, $value = null);
 
 	/**
 	 * Add an array of key (column) => values as simple equality filters
@@ -54,7 +54,7 @@ 
 	 * @param string $column
 	 * @param string $order - 'ASC' | 'DESC'
 	 */
-	public function addOrderBy($column, $order='DESC');
+	public function addOrderBy($column, $order = 'DESC');
 
 	/**
 	 * Sets the order by clause to existing clause
@@ -62,7 +62,7 @@ 
 	 * @param string $column
 	 * @param string $order - 'ASC' | 'DESC'
 	 */
-	public function orderBy($column, $order='DESC');
+	public function orderBy($column, $order = 'DESC');
 
 	/**
 	 * Add a having clause to the query builder
@@ -74,7 +74,7 @@ 
 	 * @param mixed $value
 	 * @return $this - provide a fluent chainable interface
 	 */
-	public function having($column, $operator=null, $value=null);
+	public function having($column, $operator = null, $value = null);
 
 	/**
 	 * Create an orHaving clause
@@ -84,7 +84,7 @@ 
 	 * @param mixed $value
 	 * @return $this - provide a fluent chainable interface
 	 */
-	public function orHaving($column, $operator=null, $value=null);
+	public function orHaving($column, $operator = null, $value = null);
 
 	/**
 	 * return information on the current filters applied - for mysql this may be the raw query string - for

neon/core/db/ActiveRecord.php

Braces +3 added lines, -2 removed lines

@@ -147,8 +147,9 @@
 	{
 		$tableName = $this->tableName();
 		foreach($fields as $field) {
-			if (!$this->hasAttribute($field))
-				throw new \InvalidArgumentException("No '$field' exists on the '$tableName' table. $message");
+			if (!$this->hasAttribute($field)) {
+							throw new \InvalidArgumentException("No '$field' exists on the '$tableName' table. $message");
+			}
 		}
 	}
 

Spacing +9 added lines, -9 removed lines

@@ -141,10 +141,10 @@ 
 	 * @param string $message - optional message to display in the exception if the fields don't exist
 	 * @throws \InvalidArgumentException if fields don;t exist on the table
 	 */
-	public function fieldsMustExist($fields, $message='')
+	public function fieldsMustExist($fields, $message = '')
 	{
 		$tableName = $this->tableName();
-		foreach($fields as $field) {
+		foreach ($fields as $field) {
 			if (!$this->hasAttribute($field))
 				throw new \InvalidArgumentException("No '$field' exists on the '$tableName' table. $message");
 		}
@@ -289,7 +289,7 @@ 
 	 */
 	public function hasAttributeGetter($name, &$getter)
 	{
-		$getter = '__get_' . $name;
+		$getter = '__get_'.$name;
 		return method_exists($this, $getter);
 	}
 
@@ -302,7 +302,7 @@ 
 	 */
 	public function hasAttributeSetter($name, &$setter)
 	{
-		$setter = '__set_' . $name;
+		$setter = '__set_'.$name;
 		return method_exists($this, $setter);
 	}
 
@@ -331,11 +331,11 @@ 
 		}
 		// is a string - or lots of string arguments
 		// like $this->isDirty('name', 'title');
-		if (! is_array($attributes)) {
+		if (!is_array($attributes)) {
 			$attributes = func_get_args();
 		}
 
-		foreach($attributes as $attribute) {
+		foreach ($attributes as $attribute) {
 			return $this->isAttributeChanged($attribute);
 		}
 
@@ -350,7 +350,7 @@ 
 	 */
 	public function isClean($attributes = null)
 	{
-		return ! $this->isDirty(...func_get_args());
+		return !$this->isDirty(...func_get_args());
 	}
 
 	/**
@@ -397,7 +397,7 @@ 
 	{
 		$query = \Neon::createObject(static::$queryClass, [get_called_class()]);
 		if (static::$softDelete) {
-			$query->andWhere([static::tableName() .'.'. static::DELETED => 0]);
+			$query->andWhere([static::tableName().'.'.static::DELETED => 0]);
 		}
 		return $query;
 	}
@@ -418,7 +418,7 @@ 
 	 * @param boolean $withDeleted
 	 * @return ActiveQuery
 	 */
-	public static function query($withDeleted=false)
+	public static function query($withDeleted = false)
 	{
 		return $withDeleted ? static::findWithDeleted() : static::find();
 	}

neon/core/db/Migration.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 	 * @param string $comment
 	 * @return \yii\db\ColumnSchemaBuilder
 	 */
-	public function uuid64($comment='A uuid using base 64')
+	public function uuid64($comment = 'A uuid using base 64')
 	{
 		return $this->getDb()->getSchema()
 			->createColumnSchemaBuilder('char(22) CHARACTER SET latin1 COLLATE latin1_general_cs')
@@ -71,7 +71,7 @@ 
 		echo "    > $action ...";
 		$time = microtime(true);
 		$function();
-		echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+		echo ' done (time: '.sprintf('%.3f', microtime(true) - $time)."s)\n";
 	}
 
 	/**

neon/core/db/Migrator.php

Braces +25 added lines, -19 removed lines

@@ -113,8 +113,9 @@ 
 	public function getNewMigrationsForApp($appName)
 	{
 		$app = Neon::$app->getApp($appName);
-		if ($app === null)
-			throw new \Exception('No app exists with id "'.$appName.'"');
+		if ($app === null) {
+					throw new \Exception('No app exists with id "'.$appName.'"');
+		}
 		$alias = $app->getClassAlias().'/migrations';
 		$migrationAlias = $app->getMigrationAlias().'/migrations';
 		$applied = [];
@@ -136,8 +137,9 @@ 
 	 */
 	private function getNewMigrationsInPath($pathAlias, $applied, $migrationAlias=null)
 	{
-		if ($migrationAlias === null)
-			$migrationAlias = $pathAlias;
+		if ($migrationAlias === null) {
+					$migrationAlias = $pathAlias;
+		}
 		$migrations = [];
 		$migrationPath = Neon::getAlias($pathAlias);
 		if (file_exists($migrationPath)) {
@@ -402,9 +404,7 @@ 
 				$string = $prefix.$message;
 			}
 			return Console::stdout("$string\n");
-		}
-
-		else {
+		} else {
 			return $message;
 		}
 	}
@@ -431,15 +431,17 @@ 
 		foreach ($migrations as $migration) {
 			// remove any paths to get the migration itself
 			$migrationPart = $migration;
-			if (strpos($migration,'/')!==false)
-				$migrationPart = substr($migration, strrpos($migration,'/')+1);
+			if (strpos($migration,'/')!==false) {
+							$migrationPart = substr($migration, strrpos($migration,'/')+1);
+			}
 
 			$parts = explode('_', substr($migrationPart,1)); // remove initial m
 
 			// check it was a migration and has enough parts
 			if (count($parts) == 1) {
-				if (!is_numeric($parts[0]))
-					continue;
+				if (!is_numeric($parts[0])) {
+									continue;
+				}
 				$date = $parts[0];
 				$time = '000000';
 			} else {
@@ -449,24 +451,28 @@ 
 
 			// some handwritten migrations have bad datetimes
 			// capture case where no time has been set or is actually a date
-			if (!is_numeric($time) || strlen($time) != 6)
-				$time = '000000';
+			if (!is_numeric($time) || strlen($time) != 6) {
+							$time = '000000';
+			}
 			// some datetimes are YYYYMMDD and others YYMMDD. Canonicalise these
-			if (strlen($date)==6)
-				$date = "20$date";
+			if (strlen($date)==6) {
+							$date = "20$date";
+			}
 			// turn this into 'YYYY-MM-DD HH:MM:SS' and then into a timestamp
 			$dateTime = substr($date,0,4)."-".substr($date,4,2)."-".substr($date,6,2)." ".substr($time,0,2).":".substr($time,2,2).":".substr($time,4,2);
 			$timestamp = strtotime($dateTime);
-			if ($timestamp == false)
-				throw new \Exception("Invalid datetime in migration $migration. Date(yyyymmdd)=$date and time(hhmmss)=$time. Please fix.");
+			if ($timestamp == false) {
+							throw new \Exception("Invalid datetime in migration $migration. Date(yyyymmdd)=$date and time(hhmmss)=$time. Please fix.");
+			}
 			// beware migrations with same timestamp
 			$sortableMigrations[$timestamp][] = $migration;
 		}
 		ksort($sortableMigrations);
 		$sortedMigrations = [];
 		foreach ($sortableMigrations as $mgs) {
-			foreach ($mgs as $mig)
-				$sortedMigrations[] = $mig;
+			foreach ($mgs as $mig) {
+							$sortedMigrations[] = $mig;
+			}
 		}
 		return $sortedMigrations;
 	}

Spacing +14 added lines, -14 removed lines

@@ -99,7 +99,7 @@ 
 		}
 		foreach ($migrations as $migration) {
 			if (!$this->migrateUp($migration)) {
-				throw new \Exception('Migration failed : ' . $migration);
+				throw new \Exception('Migration failed : '.$migration);
 			}
 		}
 	}
@@ -134,7 +134,7 @@ 
 	 * @param array $applied  the set of already applied migrations
 	 * @return array   the set of new migrations to be run
 	 */
-	private function getNewMigrationsInPath($pathAlias, $applied, $migrationAlias=null)
+	private function getNewMigrationsInPath($pathAlias, $applied, $migrationAlias = null)
 	{
 		if ($migrationAlias === null)
 			$migrationAlias = $pathAlias;
@@ -143,11 +143,11 @@ 
 		if (file_exists($migrationPath)) {
 			$handle = opendir($migrationPath);
 			while (($file = readdir($handle)) !== false) {
-				if ($file === '.' || $file === '..' || is_dir($file) || pathinfo($file, PATHINFO_EXTENSION)!='php') {
+				if ($file === '.' || $file === '..' || is_dir($file) || pathinfo($file, PATHINFO_EXTENSION) != 'php') {
 					continue;
 				}
-				$path = $migrationPath . DIRECTORY_SEPARATOR . $file;
-				$migrationName = $migrationAlias . '/' . str_replace('.php', '', $file);
+				$path = $migrationPath.DIRECTORY_SEPARATOR.$file;
+				$migrationName = $migrationAlias.'/'.str_replace('.php', '', $file);
 				if (is_file($path) && !isset($applied[$migrationName])) {
 					$migrations[] = $migrationName;
 				}
@@ -272,7 +272,7 @@ 
 		// try migrate up
 		$migrations = $this->getNewMigrations();
 		foreach ($migrations as $i => $migration) {
-			if (strpos($migration, $version . '_') === 0) {
+			if (strpos($migration, $version.'_') === 0) {
 				$this->actionUp($i + 1);
 
 				return self::EXIT_CODE_NORMAL;
@@ -282,7 +282,7 @@ 
 		// try migrate down
 		$migrations = array_keys($this->getMigrationHistory(null));
 		foreach ($migrations as $i => $migration) {
-			if (strpos($migration, $version . '_') === 0) {
+			if (strpos($migration, $version.'_') === 0) {
 				if ($i === 0) {
 					$this->stdout("Already at '$originalVersion'. Nothing needs to be done.\n", Console::FG_YELLOW);
 				} else {
@@ -338,7 +338,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function stdout($message, $color='')
+	public function stdout($message, $color = '')
 	{
 		echo $message;
 	}
@@ -381,7 +381,7 @@ 
 	 * @param  string  $type - can be one of 'info' | 'error' | 'danger' | 'warning' | 'success'
 	 * @return string / stream
 	 */
-	public function log($message, $type='info')
+	public function log($message, $type = 'info')
 	{
 		$colors = [
 			'info' => Console::FG_BLUE, 'warning' => Console::FG_YELLOW,
@@ -431,10 +431,10 @@ 
 		foreach ($migrations as $migration) {
 			// remove any paths to get the migration itself
 			$migrationPart = $migration;
-			if (strpos($migration,'/')!==false)
-				$migrationPart = substr($migration, strrpos($migration,'/')+1);
+			if (strpos($migration, '/') !== false)
+				$migrationPart = substr($migration, strrpos($migration, '/') + 1);
 
-			$parts = explode('_', substr($migrationPart,1)); // remove initial m
+			$parts = explode('_', substr($migrationPart, 1)); // remove initial m
 
 			// check it was a migration and has enough parts
 			if (count($parts) == 1) {
@@ -452,10 +452,10 @@ 
 			if (!is_numeric($time) || strlen($time) != 6)
 				$time = '000000';
 			// some datetimes are YYYYMMDD and others YYMMDD. Canonicalise these
-			if (strlen($date)==6)
+			if (strlen($date) == 6)
 				$date = "20$date";
 			// turn this into 'YYYY-MM-DD HH:MM:SS' and then into a timestamp
-			$dateTime = substr($date,0,4)."-".substr($date,4,2)."-".substr($date,6,2)." ".substr($time,0,2).":".substr($time,2,2).":".substr($time,4,2);
+			$dateTime = substr($date, 0, 4)."-".substr($date, 4, 2)."-".substr($date, 6, 2)." ".substr($time, 0, 2).":".substr($time, 2, 2).":".substr($time, 4, 2);
 			$timestamp = strtotime($dateTime);
 			if ($timestamp == false)
 				throw new \Exception("Invalid datetime in migration $migration. Date(yyyymmdd)=$date and time(hhmmss)=$time. Please fix.");

neon/core/services/Formatter.php

Braces +6 added lines, -4 removed lines

@@ -42,14 +42,16 @@
 		parent::init();
 		// the main config can set this - but it can also be loaded by application settings (and possibly user setting in future)
 		$this->dateFormat = setting('settings', 'dateFormat', $this->dateFormat);
-		if ($this->dateFormat === 'custom')
-			$this->dateFormat = setting('settings', 'dateFormatCustom', $this->dateFormat);
+		if ($this->dateFormat === 'custom') {
+					$this->dateFormat = setting('settings', 'dateFormatCustom', $this->dateFormat);
+		}
 
 		$this->timeFormat = setting('settings', 'timeFormat', $this->timeFormat);
 		$this->nullDisplay = setting('settings', 'nullDisplay', $this->nullDisplay);
 		$this->datetimeFormat = setting('settings', 'datetimeFormat', $this->datetimeFormat);
-		if ($this->datetimeFormat === 'custom')
-			$this->datetimeFormat = setting('settings', 'datetimeFormatCustom', $this->datetimeFormat);
+		if ($this->datetimeFormat === 'custom') {
+					$this->datetimeFormat = setting('settings', 'datetimeFormatCustom', $this->datetimeFormat);
+		}
 	}
 
 	/**

neon/core/services/accountManager/AccountManager.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	public function getTenantDb()
 	{
 		// if the application does not support multi tenancy then simply return the main database
-		if ( ! neon()->multiTenant || ! $this->isOnMasterDomain()) {
+		if (!neon()->multiTenant || !$this->isOnMasterDomain()) {
 			return neon()->get('db');
 		}
 

neon/core/themes/blacktie/AppAsset.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 		'theme.css',
 		'https://fonts.googleapis.com/css?family=Nunito+Sans:200,200i,300,300i,400,400i,600,600i,700,700i'
 	];
-	public $sourcePath = __DIR__ . '/assets';
+	public $sourcePath = __DIR__.'/assets';
 	public $depends = [
 		'neon\core\assets\CoreAsset',
 		'\yii\bootstrap\BootstrapAsset',
@@ -30,6 +30,6 @@ 
 	public function init()
 	{
 		$info = neon()->assetManager->publish($this->sourcePath, $this->publishOptions);
-		neon()->view->registerJs('var NEON_THEME_URL = "' . $info[1] . '";', View::POS_HEAD, 'neonThemeData');
+		neon()->view->registerJs('var NEON_THEME_URL = "'.$info[1].'";', View::POS_HEAD, 'neonThemeData');
 	}
 }

neon/core/themes/neon/Assets.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 		'theme.css',
 		'https://fonts.googleapis.com/css?family=Nunito+Sans:200,200i,300,300i,400,400i,600,600i,700,700i,800,900',
 	];
-	public $sourcePath = __DIR__ . '/assets';
+	public $sourcePath = __DIR__.'/assets';
 	public $depends = [
 		'\neon\core\assets\CoreAsset',
 		'\yii\bootstrap\BootstrapAsset',
@@ -30,6 +30,6 @@ 
 	public function init()
 	{
 		$info = neon()->assetManager->publish($this->sourcePath, $this->publishOptions);
-		neon()->view->registerJs('var NEON_THEME_URL = "' . $info[1] . '";', View::POS_HEAD, 'neonThemeData');
+		neon()->view->registerJs('var NEON_THEME_URL = "'.$info[1].'";', View::POS_HEAD, 'neonThemeData');
 	}
 }

neon/core/form/fields/Choice.php

Braces +3 added lines, -2 removed lines

@@ -105,8 +105,9 @@
 	public function getItemsDisplay()
 	{
 		$items = $this->getItems();
-		foreach ($items as $key => $value)
-			$items[$key] = '<span class="neonField_labelText">'.$value.'</span>';
+		foreach ($items as $key => $value) {
+					$items[$key] = '<span class="neonField_labelText">'.$value.'</span>';
+		}
 		return $items;
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
 	 * Assumes a single value for the choice
 	 * @return string
 	 */
-	public function getValueDisplay($context='')
+	public function getValueDisplay($context = '')
 	{
 		$items = $this->getItems();
 		return isset($items[$this->getValue()]) ? $items[$this->getValue()] : '';