newicon / neon

neon/install/forms/InstallDatabase.php

Spacing +9 added lines, -9 removed lines

@@ -6,7 +6,7 @@ 
 
 class InstallDatabase extends \yii\base\Model
 {
-	public $name='';
+	public $name = '';
 	public $username;
 	public $password;
 	public $host = 'localhost';
@@ -54,21 +54,21 @@ 
 		} else {
 			if ($result == InstallHelper::ERROR_DB_UNKNOWN_DATABASE) {
 				// Attempt to create the database (if asked to do so)
-				if ($this->create_database == 1 ) {
-					if (! $this->createDatabase($exception)) {
+				if ($this->create_database == 1) {
+					if (!$this->createDatabase($exception)) {
 						$this->error_message = 'cant_create_database';
-						$this->addError('name', 'Failed to create database "' . $this->name . '" Database error: ' . $exception);
+						$this->addError('name', 'Failed to create database "'.$this->name.'" Database error: '.$exception);
 					}
-				}  else {
+				} else {
 					// This is useful information - but not an error therefore in
-					if (! $this->isAjaxValidating) {
+					if (!$this->isAjaxValidating) {
 						$this->error_message = 'unknown_database';
-						$this->addError('name', 'Unknown database name "' . $this->name . '"');
+						$this->addError('name', 'Unknown database name "'.$this->name.'"');
 					}
 				}
 			} else if ($result == InstallHelper::ERROR_DB_UNKNOWN_HOST) {
 				$this->error_message = 'unknown_host';
-				$this->addError('host', 'Unknown host name "' . $this->host . '"');
+				$this->addError('host', 'Unknown host name "'.$this->host.'"');
 			} else if ($result == InstallHelper::ERROR_DB_ACCESS_DENIED) {
 				$this->error_message = 'access_denied';
 				$this->addError('username', 'The username either does not exist or does not work with the given password');
@@ -92,7 +92,7 @@ 
 			$config['dsn'] = 'mysql:host='.$this->host.';';
 			$connection = new \neon\core\db\Connection($config);
 			try {
-				$connection->createCommand('CREATE DATABASE ' . $this->name)->execute();
+				$connection->createCommand('CREATE DATABASE '.$this->name)->execute();
 			} catch (\yii\db\Exception $e) {
 				// could not create the database
 				$exception = $e->getMessage();

neon/core/mail/transport/MailgunTransport.php

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
 	 */
 	protected function getTo(Swift_Mime_SimpleMessage $message)
 	{
-		return collect($this->allContacts($message))->map(function ($display, $address) {
+		return collect($this->allContacts($message))->map(function($display, $address) {
 			return $display ? $display." <{$address}>" : $address;
 		})->values()->implode(',');
 	}

neon/core/themes/ni/Assets.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,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',
@@ -29,6 +29,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/Env.php

Spacing +8 added lines, -8 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,10 +109,10 @@ 
 			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_PUBLIC') || define('DIR_PUBLIC', DIR_ROOT . '/public');
+		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_PUBLIC') || define('DIR_PUBLIC', DIR_ROOT.'/public');
 
 		Env::environment();
 		if (!class_exists('Neon'))
@@ -159,7 +159,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'))

neon/core/helpers/Hash.php

Spacing +11 added lines, -11 removed lines

@@ -26,10 +26,10 @@ 
 	 * @param  string  $separator the section separator for the uuid - normally '-'
 	 * @return string
 	 */
-	public static function uuid($separator='-')
+	public static function uuid($separator = '-')
 	{
-		$sha = sha1(uniqid('', true).rand(1000000,9999999));
-		return substr($sha,0,8).$separator.substr($sha,9,4).$separator.'3'.substr($sha,15,3).$separator.'8'.substr($sha,19,3).$separator.substr($sha,22,12);
+		$sha = sha1(uniqid('', true).rand(1000000, 9999999));
+		return substr($sha, 0, 8).$separator.substr($sha, 9, 4).$separator.'3'.substr($sha, 15, 3).$separator.'8'.substr($sha, 19, 3).$separator.substr($sha, 22, 12);
 	}
 
 	/**
@@ -37,7 +37,7 @@ 
 	 * @param string encoding - characters used for the encoding
 	 * @return string
 	 */
-	public static function uuid64($encoding='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-')
+	public static function uuid64($encoding = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-')
 	{
 		$uuid = self::uuid(''); // create a uuid without any '-' in it
 		return self::uuid2uuid64($uuid, $encoding);
@@ -59,13 +59,13 @@ 
 	 * @param string encoding - characters used for the encoding
 	 * @return string
 	 */
-	public static function uuid2uuid64($uuid, $encoding='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-')
+	public static function uuid2uuid64($uuid, $encoding = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-')
 	{
-		if (strlen($uuid)==22)
+		if (strlen($uuid) == 22)
 			return $uuid;
 
 		// remove any hyphens
-		$uuid = str_replace('-','',$uuid);
+		$uuid = str_replace('-', '', $uuid);
 
 		$uuid .= '0'; // 33 hexadecimal characters = 22 64-cimal chars.
 		// to convert from base-16 to base-64 (not Base64)
@@ -75,7 +75,7 @@ 
 		while ($position < 33) {
 			$snip = substr($uuid, $position, 3);
 			$number = hexdec($snip);
-			$uuid64 .= $encoding[(integer)floor($number/64)].$encoding[(integer)($number%64)];
+			$uuid64 .= $encoding[(integer) floor($number / 64)].$encoding[(integer) ($number % 64)];
 			$position += 3;
 		}
 		return $uuid64;
@@ -96,14 +96,14 @@ 
 	 * @return string token
 	 * @throws \ReflectionException
 	 */
-	public static function setObjectToToken($object, $duration=86400)
+	public static function setObjectToToken($object, $duration = 86400)
 	{
 		// get public properties of child class
 		$data = \Neon::getObjectVars($object);
 		$data['class'] = get_class($object);
 		if (method_exists($object, 'toArray'))
 			$data = array_merge($data, $object->toArray(['objectToken']));
-		$token = sha1(serialize($data) . env('NEON_SECRET'));
+		$token = sha1(serialize($data).env('NEON_SECRET'));
 		neon()->cache->set($token, $data, $duration); // 24 hour
 		return neon()->security->maskToken($token);
 	}
@@ -116,7 +116,7 @@ 
 	 * @throws BadRequestHttpException
 	 * @throws NotFoundHttpException
 	 */
-	public static function getObjectFromToken($token, $expectClass=null)
+	public static function getObjectFromToken($token, $expectClass = null)
 	{
 		$data = neon()->cache->get(neon()->security->unmaskToken($token));
 		if ($data === null)

neon/core/controllers/ErrorController.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 
 		// If we have requested json we should return the error as json
 		$acceptsJson = array_key_exists('application/json', neon()->request->getAcceptableContentTypes());
-		if (neon()->request->getIsAjax() || $acceptsJson ) {
+		if (neon()->request->getIsAjax() || $acceptsJson) {
 			return $data;
 		}
 
@@ -57,7 +57,7 @@ 
 			return $this->render($errorPage, $data);
 		}
 		// Look up specific framework view file e.g `core/view/error_404.php`
-		$viewForError = 'error_' . $data['status'];
+		$viewForError = 'error_'.$data['status'];
 		if ($this->findView($viewForError)) {
 			return $this->render($viewForError, $data);
 		}
@@ -72,8 +72,8 @@ 
 	 */
 	public function getCustomErrorPage($errorCode)
 	{
-		$themeFileOld = neon('cms')->getThemeAlias() . "/error_$errorCode.tpl";
-		$themeFile = neon('cms')->getThemeAlias() . "/pages/errors/$errorCode.tpl";
+		$themeFileOld = neon('cms')->getThemeAlias()."/error_$errorCode.tpl";
+		$themeFile = neon('cms')->getThemeAlias()."/pages/errors/$errorCode.tpl";
 		if ($this->findView($themeFile)) {
 			return $themeFile;
 		}

neon/core/BaseApp.php

Spacing +10 added lines, -10 removed lines

@@ -66,7 +66,7 @@ 
 			$class = \get_class($this);
 			if (($pos = strrpos($class, '\\')) !== false) {
 				$controllers = neon()->isConsoleApp() ? 'console' : 'controllers';
-				$this->controllerNamespace = substr($class, 0, $pos) . '\\' . $controllers;
+				$this->controllerNamespace = substr($class, 0, $pos).'\\'.$controllers;
 			}
 		}
 		parent::init();
@@ -146,7 +146,7 @@ 
 	 * @param boolean $refresh - default false
 	 * @return type
 	 */
-	public function getSetting($name, $default=null, $refresh=false)
+	public function getSetting($name, $default = null, $refresh = false)
 	{
 		$settingManager = neon()->settingsManager;
 		return $settingManager->get($this->id, $name, $default, $refresh);
@@ -186,7 +186,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function uninstall(){}
+	public function uninstall() {}
 
 	/**
 	 * Get the alias key to this module (App)
@@ -196,7 +196,7 @@ 
 	 */
 	public function getClassAlias()
 	{
-		return '@' . rtrim(str_replace(['\\', 'App'], ['/', ''], get_called_class()), "/");
+		return '@'.rtrim(str_replace(['\\', 'App'], ['/', ''], get_called_class()), "/");
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 */
 	public function getAssetsPath()
 	{
-		return $this->getPath() . '/assets';
+		return $this->getPath().'/assets';
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 	 */
 	public function getDocsPath()
 	{
-		return $this->getPath() . '/docs';
+		return $this->getPath().'/docs';
 	}
 
 	/**
@@ -267,7 +267,7 @@ 
 	public function getDataMapProviders()
 	{
 		$availableMaps = [];
-		foreach(neon()->getAllApps() as $name => $config) {
+		foreach (neon()->getAllApps() as $name => $config) {
 			$app = neon($name);
 			if ($app instanceof IDataMapProvider) {
 				$maps = $app->getDataMapTypes();
@@ -293,7 +293,7 @@ 
 		if ($provider === null) {
 			throw new \Exception("The map provider '$name' specified can not be found.");
 		}
-		if (! $provider instanceof IDataMapProvider) {
+		if (!$provider instanceof IDataMapProvider) {
 			throw new \Exception("The Provider '$name' must implement the 'neon\\core\\interfaces\\IDataMapProvider' interface.");
 		}
 		return $provider;
@@ -339,12 +339,12 @@ 
 	 * @param string $instanceOf - a string defining a class or interface that the ckasses must implement or be
 	 * @return array
 	 */
-	public function getClasses($subPath='', $instanceOf=false)
+	public function getClasses($subPath = '', $instanceOf = false)
 	{
 		$path = $this->getPath().Str::start($subPath, '/');
 		$classes = [];
 		if (!file_exists($path)) return [];
-		foreach(\neon\core\helpers\File::findFiles("$path", ['only' => ['*.php']]) as $file) {
+		foreach (\neon\core\helpers\File::findFiles("$path", ['only' => ['*.php']]) as $file) {
 			$class = $this->getClassFromFile($file);
 			// the class is not valid then skip
 			if (!$class) continue;

neon/core/validators/UniqueValidator.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 		$prefixedConditions = [];
 		foreach ($conditions as $columnName => $columnValue) {
 			if (strpos($columnName, '(') === false) {
-				$columnName = preg_replace('/^' . preg_quote($alias) . '\.(.*)$/', '$1', $columnName);
+				$columnName = preg_replace('/^'.preg_quote($alias).'\.(.*)$/', '$1', $columnName);
 				if (strpos($columnName, '[[') === 0) {
 					$prefixedColumn = "{$alias}.{$columnName}";
 				} else {

neon/core/form/fields/Time.php

Spacing +5 added lines, -5 removed lines

@@ -55,9 +55,9 @@ 
 	{
 		$bits = explode(':', $timeString);
 		return [
-			'hh' => Arr::get($bits,0, '00'),
-			'mm' => Arr::get($bits,1, '00'),
-			'ss' => Arr::get($bits,2, '00')
+			'hh' => Arr::get($bits, 0, '00'),
+			'mm' => Arr::get($bits, 1, '00'),
+			'ss' => Arr::get($bits, 2, '00')
 		];
 	}
 
@@ -107,7 +107,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function getValueDisplay($context='')
+	public function getValueDisplay($context = '')
 	{
 		// don't show seconds if they are not to be set
 		return neon()->formatter->asTime($this->getValue());
@@ -125,7 +125,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function processAsFilter(IQuery $query, $searchData=null)
+	public function processAsFilter(IQuery $query, $searchData = null)
 	{
 		$searchData = ($searchData === null) ? $this->getValue() : $searchData;
 		if (!empty($searchData)) {