newicon / neon

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(',');
 	}

Braces +3 added lines, -2 removed lines

@@ -56,8 +56,9 @@
 	 */
 	public function getClient()
 	{
-		if ($this->_client === null)
-			$this->_client = new Client();
+		if ($this->_client === null) {
+					$this->_client = new Client();
+		}
 		return $this->_client;
 	}
 

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'))

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');
 	}
 
@@ -115,8 +117,9 @@ 
 		defined('DIR_PUBLIC') || define('DIR_PUBLIC', DIR_ROOT . '/public');
 
 		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);
@@ -162,8 +165,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/migrations/m141106_185632_log_init.php

Indentation +58 added lines, -58 removed lines

@@ -17,71 +17,71 @@
  */
 class m141106_185632_log_init extends Migration
 {
-    /**
-     * @var DbTarget[] Targets to create log table for
-     */
-    private $dbTargets = [];
+	/**
+	 * @var DbTarget[] Targets to create log table for
+	 */
+	private $dbTargets = [];
 
-    /**
-     * @throws InvalidConfigException
-     * @return DbTarget[]
-     */
-    protected function getDbTargets()
-    {
-        if ($this->dbTargets === []) {
-            $log = Yii::$app->getLog();
+	/**
+	 * @throws InvalidConfigException
+	 * @return DbTarget[]
+	 */
+	protected function getDbTargets()
+	{
+		if ($this->dbTargets === []) {
+			$log = Yii::$app->getLog();
 
-            $usedTargets = [];
-            foreach ($log->targets as $target) {
-                if ($target instanceof DbTarget) {
-                    $currentTarget = [
-                        $target->db,
-                        $target->logTable,
-                    ];
-                    if (!in_array($currentTarget, $usedTargets, true)) {
-                        // do not create same table twice
-                        $usedTargets[] = $currentTarget;
-                        $this->dbTargets[] = $target;
-                    }
-                }
-            }
-        }
+			$usedTargets = [];
+			foreach ($log->targets as $target) {
+				if ($target instanceof DbTarget) {
+					$currentTarget = [
+						$target->db,
+						$target->logTable,
+					];
+					if (!in_array($currentTarget, $usedTargets, true)) {
+						// do not create same table twice
+						$usedTargets[] = $currentTarget;
+						$this->dbTargets[] = $target;
+					}
+				}
+			}
+		}
 
-        return $this->dbTargets;
-    }
+		return $this->dbTargets;
+	}
 
-    public function up()
-    {
-        foreach ($this->getDbTargets() as $target) {
-            $this->db = $target->db;
+	public function up()
+	{
+		foreach ($this->getDbTargets() as $target) {
+			$this->db = $target->db;
 
-            $tableOptions = null;
-            if ($this->db->driverName === 'mysql') {
-                // http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
-                $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
-            }
+			$tableOptions = null;
+			if ($this->db->driverName === 'mysql') {
+				// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+				$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+			}
 
-            $this->createTable($target->logTable, [
-                'id' => $this->bigPrimaryKey(),
-                'level' => $this->integer(),
-                'category' => $this->string(),
-                'log_time' => $this->double(),
-                'prefix' => $this->text(),
-                'message' => $this->text(),
-            ], $tableOptions);
+			$this->createTable($target->logTable, [
+				'id' => $this->bigPrimaryKey(),
+				'level' => $this->integer(),
+				'category' => $this->string(),
+				'log_time' => $this->double(),
+				'prefix' => $this->text(),
+				'message' => $this->text(),
+			], $tableOptions);
 
-            $this->createIndex('idx_log_level', $target->logTable, 'level');
-            $this->createIndex('idx_log_category', $target->logTable, 'category');
-            $this->createIndex('idx_log_time', $target->logTable, 'log_time');
-        }
-    }
+			$this->createIndex('idx_log_level', $target->logTable, 'level');
+			$this->createIndex('idx_log_category', $target->logTable, 'category');
+			$this->createIndex('idx_log_time', $target->logTable, 'log_time');
+		}
+	}
 
-    public function down()
-    {
-        foreach ($this->getDbTargets() as $target) {
-            $this->db = $target->db;
+	public function down()
+	{
+		foreach ($this->getDbTargets() as $target) {
+			$this->db = $target->db;
 
-            $this->dropTable($target->logTable);
-        }
-    }
+			$this->dropTable($target->logTable);
+		}
+	}
 }

neon/core/helpers.php

Braces +20 added lines, -14 removed lines

@@ -32,10 +32,11 @@ 
 	{
 		echo dp_string(...$dump);
 		$backtrace = backtrace_line_by_function('dp');
-		if (neon()->debug)
-			echo $backtrace;
-		else
-			\Neon::error($backtrace);
+		if (neon()->debug) {
+					echo $backtrace;
+		} else {
+					\Neon::error($backtrace);
+		}
 	}
 }
 
@@ -86,8 +87,9 @@ 
 			$str .= "<pre>$debug</pre>";
 		}
 
-		if (neon()->debug)
-			return $str;
+		if (neon()->debug) {
+					return $str;
+		}
 		\Neon::error($str);
 		return '';
 	}
@@ -125,8 +127,9 @@ 
 	function debug_message(...$dump)
 	{
 		// security feature to ensure debug is not displayed unless in debug mode
-		if (!neon()->debug)
-			return '';
+		if (!neon()->debug) {
+					return '';
+		}
 		return dp_string(...$dump);
 	}
 }
@@ -190,8 +193,9 @@ 
 	 */
 	function url($url = '', $absolute = false)
 	{
-		if ($url === null)
-			return '';
+		if ($url === null) {
+					return '';
+		}
 		$url = is_string($url) ? "/$url" : $url;
 		return Url::toRoute($url, $absolute);
 	}
@@ -248,8 +252,9 @@ 
 	 */
 	function truthy($value)
 	{
-		if ($value && strtolower($value) !== "false")
-			return true;
+		if ($value && strtolower($value) !== "false") {
+					return true;
+		}
 		return false;
 	}
 }
@@ -455,8 +460,9 @@ 
 	function faker()
 	{
 		static $faker = null;
-		if ($faker === null)
-			$faker = \Faker\Factory::create();
+		if ($faker === null) {
+					$faker = \Faker\Factory::create();
+		}
 		return $faker;
 	}
 }

Spacing +46 added lines, -46 removed lines

@@ -17,7 +17,7 @@ 
 use \Carbon\Carbon;
 use neon\core\helpers\Url;
 
-if (! function_exists('dp')) {
+if (!function_exists('dp')) {
 	/**
 	 * Debug function. Prints all passed in arguments to the screen.
 	 * arguments containing objects or arrays are output using print_r
@@ -39,7 +39,7 @@ 
 	}
 }
 
-if (! function_exists('backtrace_line_by_function')) {
+if (!function_exists('backtrace_line_by_function')) {
 	/**
 	 * Tries to get the line and file that called the specified functions
 	 * - will return the earliest match in execution order that it found.
@@ -51,9 +51,9 @@ 
 	{
 		$bt = debug_backtrace();
 		$lineInfo = '';
-		foreach($bt as $trace) {
+		foreach ($bt as $trace) {
 			if (isset($trace['function']) && $trace['function'] === $functionToShow) {
-				$lineInfo = '==> [' . (isset($trace['file']) ? $trace['file'] : ' unknown file '). ':' . (isset($trace['line']) ? $trace['line'] : ' unknown line ' ) . ']';
+				$lineInfo = '==> ['.(isset($trace['file']) ? $trace['file'] : ' unknown file ').':'.(isset($trace['line']) ? $trace['line'] : ' unknown line ').']';
 				break;
 			}
 		}
@@ -61,7 +61,7 @@ 
 	}
 }
 
-if (! function_exists('dp_string')) {
+if (!function_exists('dp_string')) {
 	/**
 	 * This generates a nice debug string and returns it. It will only
 	 * print to the screen if you are in debug mode. Otherwise it prints
@@ -93,7 +93,7 @@ 
 	}
 }
 
-if (! function_exists('dd')) {
+if (!function_exists('dd')) {
 	/**
 	 * This is the same as the dp (debug print) function but exits after
 	 * **Note:** If not in debug will print to log error and not exit
@@ -113,7 +113,7 @@ 
 	}
 }
 
-if (! function_exists('debug_message')) {
+if (!function_exists('debug_message')) {
 	/**
 	 * This is the same as the dp_string (debug print) function however it returns the string
 	 * The main difference is that it will only output a message if neon is in debug mode
@@ -132,7 +132,7 @@ 
 }
 
 
-if (! function_exists('neon')) {
+if (!function_exists('neon')) {
 	/**
 	 * Shortcut method to ```\Neon::$app```
 	 * @param string $name
@@ -144,7 +144,7 @@ 
 	}
 }
 
-if (! function_exists('setting')) {
+if (!function_exists('setting')) {
 	/**
 	 * Get a setting value
 	 *
@@ -155,13 +155,13 @@ 
 	 * the setting has been set in the current session
 	 * @return string
 	 */
-	function setting($app, $name, $default=null, $refresh=false)
+	function setting($app, $name, $default = null, $refresh = false)
 	{
 		return neon()->getSettingsManager()->get($app, $name, $default, $refresh);
 	}
 }
 
-if (! function_exists('set_setting')) {
+if (!function_exists('set_setting')) {
 	/**
 	 * @param string $app the app responsible for this setting
 	 * @param string $name the setting name
@@ -174,7 +174,7 @@ 
 	}
 }
 
-if (! function_exists('url')) {
+if (!function_exists('url')) {
 	/**
 	 * Alias of \neon\core\helpers\Url::to
 	 * @see \neon\core\helpers\Url::to()
@@ -197,7 +197,7 @@ 
 	}
 }
 
-if (! function_exists('url_base')) {
+if (!function_exists('url_base')) {
 	/**
 	 * Returns the base URL of the current request.
 	 * @param boolean|string $scheme the URI scheme to use in the returned base URL:
@@ -213,7 +213,7 @@ 
 	}
 }
 
-if (! function_exists('to_bytes')) {
+if (!function_exists('to_bytes')) {
 	/**
 	 * Returns the number of bytes as integer from a strings like `128K` | `128M` | `2G` | `1T` | `1P`
 	 *
@@ -225,7 +225,7 @@ 
 	}
 }
 
-if (! function_exists('format_bytes')) {
+if (!function_exists('format_bytes')) {
 	/**
 	 * Output a formatted size like '128M' from bytes.
 	 *
@@ -238,7 +238,7 @@ 
 	}
 }
 
-if (! function_exists('truthy')) {
+if (!function_exists('truthy')) {
 	/**
 	 * Php if statement handles truthy and falsey string conversions by default e.g. evaluating a '0' string to false
 	 * however a string of 'false' is evaluated as true. This function resolves that difference. This should be used
@@ -254,7 +254,7 @@ 
 	}
 }
 
-if (! function_exists('env')) {
+if (!function_exists('env')) {
 	/**
 	 * Gets the value of an environment variable.
 	 * Interprets 'true', 'false', 'empty' and 'null' strings appropriately
@@ -289,7 +289,7 @@ 
 	}
 }
 
-if (! function_exists('neon_secret')) {
+if (!function_exists('neon_secret')) {
 	/**
 	 * Gets the value of NEON_SECRET creating it if missing
 	 * @return string
@@ -299,7 +299,7 @@ 
 	}
 }
 
-if (! function_exists('neon_encryption_key')) {
+if (!function_exists('neon_encryption_key')) {
 	/**
 	 * Gets the value of NEON_SECRET creating it if missing
 	 * @return string
@@ -309,7 +309,7 @@ 
 	}
 }
 
-if (! function_exists('value')) {
+if (!function_exists('value')) {
 	/**
 	 * Return the value of the given value.
 	 * If the $value is a Closure, it will first be executed then its result returned
@@ -323,7 +323,7 @@ 
 	}
 }
 
-if (! function_exists('collect')) {
+if (!function_exists('collect')) {
 	/**
 	 * Create a collection from the given value.
 	 *
@@ -336,7 +336,7 @@ 
 	}
 }
 
-if (! function_exists('now')) {
+if (!function_exists('now')) {
 	/**
 	 * Create a new Carbon instance for the current time.
 	 *
@@ -349,27 +349,27 @@ 
 	}
 }
 
-if (! function_exists('profile_begin')) {
+if (!function_exists('profile_begin')) {
 	/**
 	 * @param string $name
 	 */
-	function profile_begin($name, $category='neon')
+	function profile_begin($name, $category = 'neon')
 	{
 		\Neon::beginProfile($name, $category);
 	}
 }
 
-if (! function_exists('profile_end')) {
+if (!function_exists('profile_end')) {
 	/**
 	 * @param string $name
 	 */
-	function profile_end($name=null, $category='neon')
+	function profile_end($name = null, $category = 'neon')
 	{
 		\Neon::endProfile($name, $category);
 	}
 }
 
-if (! function_exists('encrypt')) {
+if (!function_exists('encrypt')) {
 	/**
 	 * @param string $data
 	 * @return string - encrypted data
@@ -380,7 +380,7 @@ 
 	}
 }
 
-if (! function_exists('decrypt')) {
+if (!function_exists('decrypt')) {
 	/**
 	 * @param string $data
 	 * @return string - encrypted data
@@ -391,7 +391,7 @@ 
 	}
 }
 
-if (! function_exists('get_alias')) {
+if (!function_exists('get_alias')) {
 	/**
 	 * @param string $path
 	 * @return string - resolved path
@@ -402,7 +402,7 @@ 
 	}
 }
 
-if (! function_exists('on_url')) {
+if (!function_exists('on_url')) {
 	/**
 	 * This function is useful for checking if links should be active,
 	 *
@@ -422,7 +422,7 @@ 
 		return \neon\core\helpers\Url::isUrl(...$urls);
 	}
 }
-if (! function_exists('_t')) {
+if (!function_exists('_t')) {
 	/**
 	 * Translates a message to the target language
 	 * This function is a wrapper to the \Neon::t method
@@ -442,12 +442,12 @@ 
 	 * @param string $category  if provided will save the text to that category. Defaults to 'neon'
 	 * @return string the translated message.
 	 */
-	function _t($text, $params=[], $category='neon')
+	function _t($text, $params = [], $category = 'neon')
 	{
 		return \Neon::t($category, $text, $params);
 	}
 }
-if (! function_exists('faker')) {
+if (!function_exists('faker')) {
 	/**
 	 * Generate a faker object
 	 * @return \Faker\Generator;
@@ -460,7 +460,7 @@ 
 		return $faker;
 	}
 }
-if (! function_exists('user_is')) {
+if (!function_exists('user_is')) {
 	/**
 	 * @return boolean whether the user is/has a particular role
 	 */
@@ -470,7 +470,7 @@ 
 	}
 }
 
-if (! function_exists('user_can')) {
+if (!function_exists('user_can')) {
 	/**
 	 * Whether the user can perform a permission
 	 * @param $permission
@@ -481,18 +481,18 @@ 
 		return neon()->user->can($permission);
 	}
 }
-if (! function_exists('uuid')) {
+if (!function_exists('uuid')) {
 	/**
 	 * Generate a universally unique id
 	 * @param string $separator - default '-'
 	 * @return bool
 	 */
-	function uuid($separator='-')
+	function uuid($separator = '-')
 	{
 		return \neon\core\helpers\Hash::uuid($separator);
 	}
 }
-if (! function_exists('uuid64')) {
+if (!function_exists('uuid64')) {
 	/**
 	 * Generate a universally unique id in base64
 	 * @return bool
@@ -502,7 +502,7 @@ 
 		return \neon\core\helpers\Hash::uuid64();
 	}
 }
-if (! function_exists('id')) {
+if (!function_exists('id')) {
 	/**
 	 * Generate a html friendly UUID64
 	 * @return string
@@ -512,7 +512,7 @@ 
 		return \neon\core\helpers\Hash::id();
 	}
 }
-if (! function_exists('is_route')) {
+if (!function_exists('is_route')) {
 	/**
 	 * Test whether the current application is on a particular route
 	 * This is url rewrite safe! However you must reference the module/controller/action and not the url directly
@@ -523,12 +523,12 @@ 
 	 * @param array $params
 	 * @return boolean - whether on the route
 	 */
-	function is_route($pattern, $params=[])
+	function is_route($pattern, $params = [])
 	{
 		return neon()->request->isRoute($pattern, $params);
 	}
 }
-if (! function_exists('abort')) {
+if (!function_exists('abort')) {
 	/**
 	 * Throw a HttpException with the given data.
 	 *
@@ -544,7 +544,7 @@ 
 	}
 }
 
-if (! function_exists('abort_if')) {
+if (!function_exists('abort_if')) {
 	/**
 	 * Throw a HttpException with the given data if the given condition is true.
 	 *
@@ -562,7 +562,7 @@ 
 		}
 	}
 }
-if (! function_exists('request')) {
+if (!function_exists('request')) {
 	/**
 	 * Get an instance of the current request or an input item from the request.
 	 *
@@ -581,7 +581,7 @@ 
 		return is_null($value) ? value($default) : $value;
 	}
 }
-if (! function_exists('object_get')) {
+if (!function_exists('object_get')) {
 	/**
 	 * Get an item from an object using "dot" notation.
 	 *
@@ -597,7 +597,7 @@ 
 		}
 
 		foreach (explode('.', $key) as $segment) {
-			if (! is_object($object) || ! isset($object->{$segment})) {
+			if (!is_object($object) || !isset($object->{$segment})) {
 				return value($default);
 			}
 

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)

Braces +15 added lines, -10 removed lines

@@ -61,8 +61,9 @@ 
 	 */
 	public static function uuid2uuid64($uuid, $encoding='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-')
 	{
-		if (strlen($uuid)==22)
-			return $uuid;
+		if (strlen($uuid)==22) {
+					return $uuid;
+		}
 
 		// remove any hyphens
 		$uuid = str_replace('-','',$uuid);
@@ -101,8 +102,9 @@ 
 		// 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']));
+		if (method_exists($object, 'toArray')) {
+					$data = array_merge($data, $object->toArray(['objectToken']));
+		}
 		$token = sha1(serialize($data) . env('NEON_SECRET'));
 		neon()->cache->set($token, $data, $duration); // 24 hour
 		return neon()->security->maskToken($token);
@@ -119,17 +121,20 @@ 
 	public static function getObjectFromToken($token, $expectClass=null)
 	{
 		$data = neon()->cache->get(neon()->security->unmaskToken($token));
-		if ($data === null)
-			throw new NotFoundHttpException('Does not exist or has timed out');
+		if ($data === null) {
+					throw new NotFoundHttpException('Does not exist or has timed out');
+		}
 
-		if (!isset($data['class']) || !class_exists($data['class']))
-			throw new BadRequestHttpException('Not a valid class');
+		if (!isset($data['class']) || !class_exists($data['class'])) {
+					throw new BadRequestHttpException('Not a valid class');
+		}
 
 		// instantiate the class
 		$class = Arr::remove($data, 'class');
 		$object = new $class($data);
-		if ($expectClass !== null && !$object instanceof $expectClass)
-			throw new BadRequestHttpException('Not a valid class');
+		if ($expectClass !== null && !$object instanceof $expectClass) {
+					throw new BadRequestHttpException('Not a valid class');
+		}
 
 		return $object;
 	}

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;

Braces +17 added lines, -7 removed lines

@@ -107,8 +107,9 @@ 
 	public function getMenu()
 	{
 		// if the menu has been overridden
-		if ($this->_menu !== null)
-			return $this->_menu;
+		if ($this->_menu !== null) {
+					return $this->_menu;
+		}
 		return $this->getDefaultMenu();
 	}
 
@@ -343,13 +344,19 @@ 
 	{
 		$path = $this->getPath().Str::start($subPath, '/');
 		$classes = [];
-		if (!file_exists($path)) return [];
+		if (!file_exists($path)) {
+			return [];
+		}
 		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;
+			if (!$class) {
+				continue;
+			}
 			// if we want to check the instance of the class and the $class is NOT an $instanceOf the class then skip
-			if ($instanceOf && !is_a($class, $instanceOf, true)) continue;
+			if ($instanceOf && !is_a($class, $instanceOf, true)) {
+				continue;
+			}
 			$classes[] = $class;
 		}
 		return $classes;
@@ -365,9 +372,12 @@ 
 	{
 		$alias = $this->getClassAlias();
 		$fileName = basename($file);
-		if (in_array($fileName, ['Yii.php', 'Neon.php'])) return false;
-		if (!ctype_upper($fileName[0]))
+		if (in_array($fileName, ['Yii.php', 'Neon.php'])) {
 			return false;
+		}
+		if (!ctype_upper($fileName[0])) {
+					return false;
+		}
 		$class = str_replace([$this->getPath(), '/', '@', '.php'], ['', '\\', '\\', ''], $alias.$file);
 		return $class;
 	}

neon/core/view/SmartyRenderer.php

Braces +6 added lines, -4 removed lines

@@ -25,12 +25,14 @@
 		// set up the theme directories
 		foreach ($themeHierarchy as $theme) {
 			if (isset($theme['templates'])) {
-				foreach ($theme['templates'] as $tplDir)
-					$this->smarty->addTemplateDir($tplDir);
+				foreach ($theme['templates'] as $tplDir) {
+									$this->smarty->addTemplateDir($tplDir);
+				}
 			}
 			if (isset($theme['plugins'])) {
-				foreach ($theme['plugins'] as $pluginDir)
-					$this->smarty->addPluginsDir($pluginDir);
+				foreach ($theme['plugins'] as $pluginDir) {
+									$this->smarty->addPluginsDir($pluginDir);
+				}
 			}
 		}
 	}