newicon / neon

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/config/common.php

Spacing +4 added lines, -4 removed lines

@@ -114,12 +114,12 @@ 
 				// routes are either set by extending from AdminController or defined here
 				'neon-administrator' => [
 					'label' => 'Neon Administrator',
-					'routes' => [ '^/admin/.*' ],
+					'routes' => ['^/admin/.*'],
 					'homeUrl' => '/admin'  // default url if not going elsewhere
 				],
 				'neon-developer' => [
 					'label' => 'Neon Developer',
-					'routes' => [ '^/admin/.*' ],
+					'routes' => ['^/admin/.*'],
 					'homeUrl' => '/admin'  // default url if not going elsewhere
 				],
 			]
@@ -299,7 +299,7 @@ 
 					'maxFileSize' => 1024 * 2,
 					'maxLogFiles' => 20,
 					'logVars' => ['_GET', '_POST', '_FILES', '_SESSION', '_SERVER'],
-					'maskVars' => ['_SERVER.HTTP_AUTHORIZATION','_SERVER.PHP_AUTH_USER','_SERVER.PHP_AUTH_PW','_SERVER.DB_PASSWORD','_SERVER.NEON_SECRET','_SERVER.NEON_ENCRYPTION_KEY']
+					'maskVars' => ['_SERVER.HTTP_AUTHORIZATION', '_SERVER.PHP_AUTH_USER', '_SERVER.PHP_AUTH_PW', '_SERVER.DB_PASSWORD', '_SERVER.NEON_SECRET', '_SERVER.NEON_ENCRYPTION_KEY']
 				],
 				'warning' => [
 					'class' => 'yii\log\FileTarget',
@@ -308,7 +308,7 @@ 
 					'maxFileSize' => 1024 * 2,
 					'maxLogFiles' => 20,
 					'logVars' => ['_GET', '_POST', '_FILES', '_SESSION', '_SERVER'],
-					'maskVars' => ['_SERVER.HTTP_AUTHORIZATION','_SERVER.PHP_AUTH_USER','_SERVER.PHP_AUTH_PW','_SERVER.DB_PASSWORD','_SERVER.NEON_SECRET','_SERVER.NEON_ENCRYPTION_KEY']
+					'maskVars' => ['_SERVER.HTTP_AUTHORIZATION', '_SERVER.PHP_AUTH_USER', '_SERVER.PHP_AUTH_PW', '_SERVER.DB_PASSWORD', '_SERVER.NEON_SECRET', '_SERVER.NEON_ENCRYPTION_KEY']
 				],
 				'trace' => [
 					// to enable trace logging set ['components']['log']['targets']['trace']['enabled'] to true in the app config

neon/core/config/console.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		],
 		// the user module could define this on boot.
 		// but this is useful if you need to make any project specific adjustments
-		'session' => [ // for use session in console application
+		'session' => [// for use session in console application
 			'class' => 'yii\web\DbSession'
 		],
 	],

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/SiteController.php

Spacing +3 added lines, -3 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;
 		}
 
@@ -49,7 +49,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);
 		}
@@ -64,7 +64,7 @@ 
 	 */
 	public function getCustomErrorPage($errorCode)
 	{
-		$themeFile = neon('cms')->getThemeAlias() . "/error_$errorCode.tpl";
+		$themeFile = neon('cms')->getThemeAlias()."/error_$errorCode.tpl";
 		if (!$this->findView($themeFile)) {
 			return false;
 		}

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