newicon / neon

neon/core/ApplicationTrait.php

Indentation +6 added lines, -6 removed lines

@@ -553,9 +553,9 @@ 
 	}
 
   	/**
-	 * The install specific to the core apps (admin, user, settings, etc)
-	 * @return void
-	 */
+  	 * The install specific to the core apps (admin, user, settings, etc)
+  	 * @return void
+  	 */
 	public function installCore()
 	{
 		foreach ($this->getCoreApps() as $appName => $config) {
@@ -565,9 +565,9 @@ 
 	}
 
 	/**
-  	 * Run the install function of each app
-  	 * @return void
-  	 */
+	 * Run the install function of each app
+	 * @return void
+	 */
   	public function installApps()
   	{
 		foreach ($this->getApps() as $appName => $config) {

Spacing +11 added lines, -11 removed lines

@@ -206,7 +206,7 @@ 
 	 */
 	public function getApps()
 	{
-		if ($this->_appsRequiredOrder==false) {
+		if ($this->_appsRequiredOrder == false) {
 			$this->orderAppsByRequired($this->_apps, $ordered);
 			$this->setApps($ordered);
 			$this->_appsRequiredOrder = true;
@@ -241,7 +241,7 @@ 
 	 */
 	public function getCoreApps()
 	{
-		if ($this->_coreAppsRequiredOrder==false) {
+		if ($this->_coreAppsRequiredOrder == false) {
 			$this->orderAppsByRequired($this->_coreApps, $ordered);
 			$this->setCoreApps($ordered);
 			$this->_coreAppsRequiredOrder = true;
@@ -278,7 +278,7 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getConfig($path, $required=true)
+	public static function getConfig($path, $required = true)
 	{
 		$file = Neon::getAlias($path);
 		$fileExists = file_exists($file);
@@ -289,7 +289,7 @@ 
 			throw new \Exception('The config file alias: "'.$path.'" can not be found. File path: "'.$file.'". This config file is required.');
 		}
 		// The file does NOT exist and it is NOT required
-		if (!$fileExists && !$required){
+		if (!$fileExists && !$required) {
 			// the config is not required so we can just return an empty array
 			return [];
 		}
@@ -351,7 +351,7 @@ 
 	 */
 	public function registerApps($apps)
 	{
-		foreach($apps as $name => $config) {
+		foreach ($apps as $name => $config) {
 			$this->registerApp($name, $config);
 		}
 	}
@@ -467,7 +467,7 @@ 
 	{
 		$apps = array_merge($this->getCoreApps(), $this->getApps());
 		$ret = [];
-		foreach($apps as $app => $config) {
+		foreach ($apps as $app => $config) {
 			$appObject = $this->getApp($app);
 			// apps that are disabled will return null
 			if ($appObject !== null)
@@ -528,7 +528,7 @@ 
 	 */
 	public function getClassAlias()
 	{
-		return '@' . str_replace(['\\', 'Application'], ['/', ''], get_called_class());
+		return '@'.str_replace(['\\', 'Application'], ['/', ''], get_called_class());
 	}
 
 	/**
@@ -625,7 +625,7 @@ 
 				$client = new \GuzzleHttp\Client();
 				$res = $client->request('GET', 'https://neon.newicon.net/api/versions/', ['connect_timeout' => 2]);
 				$versions = json_decode((string) $res->getBody());
-			} catch(\Exception $e) {
+			} catch (\Exception $e) {
 				$versions = [];
 			}
 			return $versions;
@@ -642,7 +642,7 @@ 
 		$versions = $this->getNeonVersions();
 		$newerVersion = [];
 		$neonVersion = neon()->getVersion();
-		foreach($versions as $v) {
+		foreach ($versions as $v) {
 			if (version_compare($v, $neonVersion, '>')) {
 				$newerVersion[] = $v;
 			}
@@ -679,7 +679,7 @@ 
 	 */
 	private function setModuleAliases($name, $aliases)
 	{
-		foreach($aliases as $alias)
+		foreach ($aliases as $alias)
 			static::$_moduleAliases[$alias] = $name;
 	}
 
@@ -701,7 +701,7 @@ 
 	 * @param string $instanceOf - a string defining a class or interface that the classes must implement or be
 	 * @return array indexed by the app name to a list of valid classes
 	 */
-	public function getAppClasses($subPath='', $instanceOf=false)
+	public function getAppClasses($subPath = '', $instanceOf = false)
 	{
 		profile_begin('neon:getAppClasses');
 		foreach (neon()->getAllApps() as $key => $config) {

Braces +24 added lines, -14 removed lines

@@ -414,8 +414,9 @@ 
 		$this->setModule($name, $config);
 
 		// set up any alternatives for this
-		if (isset($config['appAliases']))
-			$this->setModuleAliases($name, $config['appAliases']);
+		if (isset($config['appAliases'])) {
+					$this->setModuleAliases($name, $config['appAliases']);
+		}
 	}
 
 	/**
@@ -442,7 +443,9 @@ 
 	 */
 	public function getApp($name)
 	{
-		if ($name === 'neon') return $this;
+		if ($name === 'neon') {
+			return $this;
+		}
 		$module = $this->getModuleFromName($name);
 		return $this->getModule($module);
 	}
@@ -470,8 +473,9 @@ 
 		foreach($apps as $app => $config) {
 			$appObject = $this->getApp($app);
 			// apps that are disabled will return null
-			if ($appObject !== null)
-				$ret[$app] = $this->getApp($app);
+			if ($appObject !== null) {
+							$ret[$app] = $this->getApp($app);
+			}
 		}
 		return $ret;
 	}
@@ -487,8 +491,9 @@ 
 	public function orderAppsByRequired($apps, &$ordered = null, &$read = null)
 	{
 		static $initialApps = null;
-		if ($ordered == null)
-			$initialApps = $apps;
+		if ($ordered == null) {
+					$initialApps = $apps;
+		}
 		$ordered = $ordered == null ? [] : $ordered;
 		$read = $read == null ? [] : $read;
 		foreach ($apps as $key=>$app) {
@@ -499,15 +504,17 @@ 
 				foreach ($requires as $r) {
 					$r = trim($r);
 					// prevent circular references breaking the system
-					if (!array_key_exists($r, $read))
-						$required[$r] = $initialApps[$r];
+					if (!array_key_exists($r, $read)) {
+											$required[$r] = $initialApps[$r];
+					}
 				}
 				if (count($required)) {
 					$this->orderAppsByRequired($required, $ordered, $read);
 				}
 			}
-			if (!array_key_exists($key, $ordered))
-				$ordered[$key] = $app;
+			if (!array_key_exists($key, $ordered)) {
+							$ordered[$key] = $app;
+			}
 		}
 	}
 
@@ -679,8 +686,9 @@ 
 	 */
 	private function setModuleAliases($name, $aliases)
 	{
-		foreach($aliases as $alias)
-			static::$_moduleAliases[$alias] = $name;
+		foreach($aliases as $alias) {
+					static::$_moduleAliases[$alias] = $name;
+		}
 	}
 
 	/**
@@ -707,7 +715,9 @@ 
 		foreach (neon()->getAllApps() as $key => $config) {
 			$app = neon()->getApp($key);
 			// disabled apps wil return null
-			if ($app === null) continue;
+			if ($app === null) {
+				continue;
+			}
 			$classes[$key] = $app->getClasses('form/fields', $instanceOf);
 		}
 		profile_end('neon:getAppClasses');

neon/core/web/AssetManager.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	 */
 	protected function hash($path)
 	{
-		if (isset($this->publishOptions['path'])){
+		if (isset($this->publishOptions['path'])) {
 			// if a path is specified then use this instead of a hash
 			return $this->publishOptions['path'];
 		}

neon/core/web/JsonResponseFormatter.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 		// of text/html instead of application/json then we are probably browsing the API
 		// and therefore want a prettier version of the response.
 		$acceptableContentTypes = array_keys(neon()->request->getAcceptableContentTypes());
-		$contentTypeIsHtml =  (isset($acceptableContentTypes[0]) && $acceptableContentTypes[0] === 'text/html');
+		$contentTypeIsHtml = (isset($acceptableContentTypes[0]) && $acceptableContentTypes[0] === 'text/html');
 		$prettyGetVarExists = (neon()->request->get('_pretty', false) !== false);
 		if ($contentTypeIsHtml || $prettyGetVarExists) {
 			$this->prettyPrint = true;

neon/core/web/StyleManager.php

Spacing +5 added lines, -5 removed lines

@@ -48,14 +48,14 @@ 
 	public function getForm()
 	{
 		$f = new \neon\core\form\Form('style');
-		foreach($this->getDefinition() as $field) {
+		foreach ($this->getDefinition() as $field) {
 			$f->add($field);
 		}
 		$f->load($this->getStyles());
 		return $f;
 	}
 
-	public function loadStyles($key='default')
+	public function loadStyles($key = 'default')
 	{
 		return setting('cms', 'styles');
 	}
@@ -67,7 +67,7 @@ 
 	 * @param array $options
 	 * @return string - the current value for the style if the style variable with he name $name already exists
 	 */
-	public function add($name, $default, $type, $options=[])
+	public function add($name, $default, $type, $options = [])
 	{
 		// check if a style property already exists
 		$styleValue = $this->getStyleValue($name, $default);
@@ -79,13 +79,13 @@ 
 		return $styleValue;
 	}
 
-	public function getStyleValue($name, $default='')
+	public function getStyleValue($name, $default = '')
 	{
 		$styles = $this->getStyles();
 		return Arr::get($styles, $name, $default);
 	}
 
-	public function set($name, $value, $field=null, $key='default')
+	public function set($name, $value, $field = null, $key = 'default')
 	{
 		$styles = $this->getStyles();
 		Arr::setValue($styles, $name, $value);

Braces +3 added lines, -2 removed lines

@@ -72,8 +72,9 @@
 		// check if a style property already exists
 		$styleValue = $this->getStyleValue($name, $default);
 		$options['name'] = $name;
-		if (!isset($options['class']))
-			$options['class'] = $type;
+		if (!isset($options['class'])) {
+					$options['class'] = $type;
+		}
 		$options['label'] = Arr::get($options, 'label', Str::humanize($name));
 		$this->set($name, $styleValue, $options);
 		return $styleValue;

neon/core/web/View.php

Spacing +17 added lines, -17 removed lines

@@ -124,7 +124,7 @@ 
 	public function findView($view, $context)
 	{
 		$exists = file_exists($this->findViewFile($view, $context));
-		return $exists ? $this->findViewFile($view, $context) : false ;
+		return $exists ? $this->findViewFile($view, $context) : false;
 	}
 
 	/**
@@ -191,7 +191,7 @@ 
 		profile_begin('renderHeadHtml');
 		if ($this->cssConcatenate)
 			$this->cssFiles = $this->resolveFiles($this->cssFiles, 'css');
-		$out = parent::renderHeadHtml() . "\n" . $this->getHtmlFragment(self::POS_HEAD);
+		$out = parent::renderHeadHtml()."\n".$this->getHtmlFragment(self::POS_HEAD);
 		profile_end('renderHeadHtml');
 		return $out;
 	}
@@ -201,7 +201,7 @@ 
 	 */
 	public function renderBodyBeginHtml()
 	{
-		return parent::renderBodyBeginHtml() . "\n" . $this->getHtmlFragment(self::POS_BEGIN);
+		return parent::renderBodyBeginHtml()."\n".$this->getHtmlFragment(self::POS_BEGIN);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 			if (isset($this->jsFiles[self::POS_END]))
 				$this->jsFiles[self::POS_END] = $this->resolveFiles($this->jsFiles[self::POS_END], 'js');
 		}
-		$out = parent::renderBodyEndHtml($ajaxMode) . "\n" . $this->getHtmlFragment(self::POS_END);
+		$out = parent::renderBodyEndHtml($ajaxMode)."\n".$this->getHtmlFragment(self::POS_END);
 		profile_end('renderBodyEndHtml');
 		return $out;
 	}
@@ -254,13 +254,13 @@ 
 	 * @throws \yii\base\Exception - if the file/directory containing the new concatenated file could not be created
 	 * @return array - new array of css files to replace $this->cssFiles
 	 */
-	public function resolveFiles($files, $type='css')
+	public function resolveFiles($files, $type = 'css')
 	{
 		// should cache results here
 		$concatFiles = $this->findFilesToConcatenate($files);
 		$url = ($type === 'css') ? $this->cssConcatenateFiles($concatFiles) : $this->jsConcatenateFiles($concatFiles);
 		// replace css/js files to be output with the one concatenated file
-		foreach($concatFiles as $fileKey) unset($files[$fileKey]);
+		foreach ($concatFiles as $fileKey) unset($files[$fileKey]);
 		$files[$url] = ($type === 'css') ? Html::cssFile($url) : Html::jsFile($url);
 		return $files;
 	}
@@ -277,7 +277,7 @@ 
 	 * @throws \yii\base\Exception - if the file/directory containing the new concatenated file could not be created
 	 * @return string - url to dynamic css file url
 	 */
-	public function cssConcatenateFiles($concatenateFiles, &$key='')
+	public function cssConcatenateFiles($concatenateFiles, &$key = '')
 	{
 		$key = md5(serialize([$concatenateFiles, $this->cssMinify]));
 
@@ -291,7 +291,7 @@ 
 				// for cache busting. Lets remove get params ? (namely the cache busting ?v=)
 				$file = substr($fileKey, 0, strpos($fileKey, '?'));
 				// Get the disk file path - replace web root path with the disk root path
-				$fileName = $rootPath . Str::replaceFirst($webPath, '', $file);
+				$fileName = $rootPath.Str::replaceFirst($webPath, '', $file);
 				// make sure local css url's are made absolute
 				$css = Css::replaceRelativeUrls(file_get_contents($fileName), $fileKey);
 				$cssConcat .= $css;
@@ -327,14 +327,14 @@ 
 				// remove get params ? (namely the cache busting ?v=)
 				$file = substr($fileKey, 0, strpos($fileKey, '?'));
 				// replace overlap web root path
-				$fileName = $rootPath . (empty($webPath) ? $file : Str::replaceFirst($webPath, '', $file));
+				$fileName = $rootPath.(empty($webPath) ? $file : Str::replaceFirst($webPath, '', $file));
 				// make sure we can find the file here
 				// we must concatenate each file on a new line to prevent
 				// line comments commenting out the first line of the next file
 				if (substr($fileName, -6) === 'min.js') {
-					$jsConcat .= "\n" . file_get_contents($fileName);
+					$jsConcat .= "\n".file_get_contents($fileName);
 				} else {
-					$jsConcat .= "\n" . file_get_contents($fileName);
+					$jsConcat .= "\n".file_get_contents($fileName);
 					// if allow auto php minify: its a bit too slow
 					//$jsConcat .= \JShrink\Minifier::minify(file_get_contents($fileName), array('flaggedComments' => false));
 				}
@@ -382,10 +382,10 @@ 
 	 */
 	private function _assetManagerGenerate($path, $callback)
 	{
-		$file = neon()->getAlias(neon()->assetManager->basePath . $path);
-		if (! file_exists($file))
+		$file = neon()->getAlias(neon()->assetManager->basePath.$path);
+		if (!file_exists($file))
 			File::createFile($file, $callback());
-		return neon()->assetManager->baseUrl . $path;
+		return neon()->assetManager->baseUrl.$path;
 	}
 
 	/**
@@ -397,7 +397,7 @@ 
 	 * @param $styleKey
 	 * @return string
 	 */
-	public function getCssByKey($key, $styleKey='')
+	public function getCssByKey($key, $styleKey = '')
 	{
 		$css = '';
 		// load css file
@@ -420,7 +420,7 @@ 
 	 */
 	public function getCssFileByKey($key)
 	{
-		return '@webroot/assets/css/' . $key . '.css';
+		return '@webroot/assets/css/'.$key.'.css';
 	}
 
 	/**
@@ -429,7 +429,7 @@ 
 	 * @param string $styleKey - a key to identify the style to load
 	 * @return array
 	 */
-	public function getStyleData($styleKey='')
+	public function getStyleData($styleKey = '')
 	{
 		return neon()->view->styleManager->getStyles();
 	}

Braces +21 added lines, -13 removed lines

@@ -189,8 +189,9 @@ 
 	public function renderHeadHtml()
 	{
 		profile_begin('renderHeadHtml');
-		if ($this->cssConcatenate)
-			$this->cssFiles = $this->resolveFiles($this->cssFiles, 'css');
+		if ($this->cssConcatenate) {
+					$this->cssFiles = $this->resolveFiles($this->cssFiles, 'css');
+		}
 		$out = parent::renderHeadHtml() . "\n" . $this->getHtmlFragment(self::POS_HEAD);
 		profile_end('renderHeadHtml');
 		return $out;
@@ -211,8 +212,9 @@ 
 	{
 		profile_begin('renderBodyEndHtml');
 		if ($this->jsConcatenate) {
-			if (isset($this->jsFiles[self::POS_END]))
-				$this->jsFiles[self::POS_END] = $this->resolveFiles($this->jsFiles[self::POS_END], 'js');
+			if (isset($this->jsFiles[self::POS_END])) {
+							$this->jsFiles[self::POS_END] = $this->resolveFiles($this->jsFiles[self::POS_END], 'js');
+			}
 		}
 		$out = parent::renderBodyEndHtml($ajaxMode) . "\n" . $this->getHtmlFragment(self::POS_END);
 		profile_end('renderBodyEndHtml');
@@ -260,7 +262,9 @@ 
 		$concatFiles = $this->findFilesToConcatenate($files);
 		$url = ($type === 'css') ? $this->cssConcatenateFiles($concatFiles) : $this->jsConcatenateFiles($concatFiles);
 		// replace css/js files to be output with the one concatenated file
-		foreach($concatFiles as $fileKey) unset($files[$fileKey]);
+		foreach($concatFiles as $fileKey) {
+			unset($files[$fileKey]);
+		}
 		$files[$url] = ($type === 'css') ? Html::cssFile($url) : Html::jsFile($url);
 		return $files;
 	}
@@ -359,11 +363,13 @@ 
 		$concatenateFiles = [];
 		foreach ($files as $fileKey => $tag) {
 			// Do not concatenate externally loaded files (for e.g. from cdns)
-			if (Url::isAbsolute($fileKey))
-				continue;
+			if (Url::isAbsolute($fileKey)) {
+							continue;
+			}
 			// remove excluded files - files we do not want to concatenate
-			if (Str::contains($tag, 'concatenate="false"'))
-				continue;
+			if (Str::contains($tag, 'concatenate="false"')) {
+							continue;
+			}
 			$concatenateFiles[] = $fileKey;
 		}
 		profile_end('_findFilesToConcatenate');
@@ -383,8 +389,9 @@ 
 	private function _assetManagerGenerate($path, $callback)
 	{
 		$file = neon()->getAlias(neon()->assetManager->basePath . $path);
-		if (! file_exists($file))
-			File::createFile($file, $callback());
+		if (! file_exists($file)) {
+					File::createFile($file, $callback());
+		}
 		return neon()->assetManager->baseUrl . $path;
 	}
 
@@ -407,8 +414,9 @@ 
 			$this->renderFile($file, $this->getStyleData($styleKey))
 			: file_get_contents(neon()->getAlias($file));
 		// minify css file
-		if (neon()->view->cssMinify)
-			$css = Css::minify($css);
+		if (neon()->view->cssMinify) {
+					$css = Css::minify($css);
+		}
 		return $css;
 	}
 

neon/core/web/AdminController.php

Spacing +2 added lines, -2 removed lines

@@ -56,11 +56,11 @@
 			// allow authenticated users
 			[
 				'allow' => true,
-				'roles' => [ 'neon-administrator' ]
+				'roles' => ['neon-administrator']
 			],
 			[
 				'allow' => true,
-				'matchCallback' => function ($rule, $action) {
+				'matchCallback' => function($rule, $action) {
 					return neon()->user->isSuper();
 				}
 			]

neon/core/controllers/FormController.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	 * @return array
 	 * @throws \Exception
 	 */
-	public function actionGetMapObjects($objectToken, $formField, $query=null, $start=0, $length=100)
+	public function actionGetMapObjects($objectToken, $formField, $query = null, $start = 0, $length = 100)
 	{
 		/** @var \neon\core\form\Form $form */
 		$form = Hash::getObjectFromToken($objectToken);

neon/core/controllers/CssController.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 		// NOTE: may be useful to add this to the request / view as a helper function if the headers work
 		// `neon()->response->sendCachePermanentHeaders()`;
 		header("Content-type: text/css; charset: UTF-8");
-		header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cacheSeconds) . " GMT");
+		header("Expires: ".gmdate("D, d M Y H:i:s", time() + $cacheSeconds)." GMT");
 		header("Pragma: cache");
 		header("Cache-Control: public, max-age=$cacheSeconds");
 		// return css content with correct headers

neon/core/controllers/GridController.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	private function createCSVFile()
 	{
 		// create a temp directory
-		$tmpDir = \Yii::$app->runtimePath . '/csvtmp';
+		$tmpDir = \Yii::$app->runtimePath.'/csvtmp';
 		if (!is_dir($tmpDir) && (!@mkdir($tmpDir) && !is_dir($tmpDir))) {
 			throw new \yii\web\NotFoundHttpException('temp directory does not exist');
 		}

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
 			unset($rows);
 		} while ($hasRows === true);
 		$handle = fopen($csvFile, 'r');
-		if ($handle)
-			neon()->response->sendStreamAsFile($handle, $grid->title.'.csv')->send();
+		if ($handle) {
+					neon()->response->sendStreamAsFile($handle, $grid->title.'.csv')->send();
+		}
 		@unlink($csvFile);
 	}