newicon / neon

neon/core/helpers/File.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	 */
 	public static function maxUploadSize()
 	{
-		$postMax =  Str::toBytes(ini_get('post_max_size'));
+		$postMax = Str::toBytes(ini_get('post_max_size'));
 		$uploadMax = Str::toBytes(ini_get('upload_max_filesize'));
 		return min($postMax, $uploadMax);
 	}

neon/core/helpers/Url.php

Spacing +9 added lines, -9 removed lines

@@ -31,9 +31,9 @@ 
 	 * @param bool $scheme - whether to add the http / https scheme
 	 * @return string
 	 */
-	public static function baseUrl($url, $scheme=false)
+	public static function baseUrl($url, $scheme = false)
 	{
-		return self::base($scheme) . '/' . ltrim($url, '/');
+		return self::base($scheme).'/'.ltrim($url, '/');
 	}
 
 	/**
@@ -42,9 +42,9 @@ 
 	 * @param type $scheme
 	 * @return type
 	 */
-	public static function getPageUrl($pageId, $scheme=false)
+	public static function getPageUrl($pageId, $scheme = false)
 	{
-		return self::base($scheme) . neon('cms')->page->getUrlOfPage($pageId);
+		return self::base($scheme).neon('cms')->page->getUrlOfPage($pageId);
 	}
 
 	/**
@@ -58,18 +58,18 @@ 
 	 * @return boolean
 	 * @deprected use neon()->request->isRoute(); which copes with unlimited nesting and wilcard patterns as well as param matching
 	 */
-	public static function isRoute($route, $currentUrl=false)
+	public static function isRoute($route, $currentUrl = false)
 	{
 		// deprecated('\neon\core\helpers\Url::isRoute', 'Please use neon()->request->isRoute() which copes with unlimited nesting and wilcard patterns as well as param matching');
 		$r = explode('/', trim($route, '/'));
 		$currentUrl ? $currentUrl : \Neon::$app->controller->getRoute();
-		$currentRoute = explode('/', trim($currentUrl,'/'));
+		$currentRoute = explode('/', trim($currentUrl, '/'));
 
 		$m = Arr::getValue($currentRoute, 0); // module
 		$c = Arr::getValue($currentRoute, 1); // controller
 		$a = Arr::getValue($currentRoute, 2); // action
 
-		switch(count($r)){
+		switch (count($r)) {
 			case 1:
 				// match just module
 				return $r[0] == $m;
@@ -78,7 +78,7 @@ 
 				return ($r[0] == $m && $r[1] == $c);
 			case 3:
 				// match the module / controller /action
-				return ($r[0] == $m && $r[1] == $c && $r[2] == $a) ;
+				return ($r[0] == $m && $r[1] == $c && $r[2] == $a);
 		}
 		return false;
 	}
@@ -108,7 +108,7 @@ 
 		// if an array is passed in it will get nested one level because of the spread operator
 		if (is_array($urls[0])) $urls = $urls[0];
 		$currentUrl = neon()->request->getPathInfo();
-		foreach($urls as $url) {
+		foreach ($urls as $url) {
 			$url = str_replace(Url::base(), '', $url);
 			if ($currentUrl !== '' && ltrim($url, '/') === $currentUrl) {
 				return true;

Braces +3 added lines, -1 removed lines

@@ -106,7 +106,9 @@
 	public static function isUrl(...$urls)
 	{
 		// if an array is passed in it will get nested one level because of the spread operator
-		if (is_array($urls[0])) $urls = $urls[0];
+		if (is_array($urls[0])) {
+			$urls = $urls[0];
+		}
 		$currentUrl = neon()->request->getPathInfo();
 		foreach($urls as $url) {
 			$url = str_replace(Url::base(), '', $url);

neon/core/helpers/Page.php

Indentation +3 added lines, -3 removed lines

@@ -175,9 +175,9 @@
 			]);
 		}
  		if ($userItems) {
-		    $out .= \yii\widgets\Menu::widget([
-			    // this is the old code to use the yii/bootstrap extension
-			    // it becomes very hard to remove bootstrap if we use these.
+			$out .= \yii\widgets\Menu::widget([
+				// this is the old code to use the yii/bootstrap extension
+				// it becomes very hard to remove bootstrap if we use these.
 				'options'=> ['class' => 'navbar-nav navbar-right nav'],
 				'items'=> $userItems['items']
 			]);

Spacing +6 added lines, -6 removed lines

@@ -59,7 +59,7 @@ 
 			'load'  => View::POS_LOAD,
 		];
 		if (!array_key_exists($position, $positions)) {
-			throw new \Exception('The javascript position specified must be one of ' . print_r(array_keys($positions)) . ', you specified "'.$position.'"');
+			throw new \Exception('The javascript position specified must be one of '.print_r(array_keys($positions)).', you specified "'.$position.'"');
 		}
 		Js::begin(['position' => $positions[$position]]);
 	}
@@ -116,7 +116,7 @@ 
 	 * @param string $image - url
 	 * @return string
 	 */
-	public static function userMenuCard($name=null, $email=null, $image=null)
+	public static function userMenuCard($name = null, $email = null, $image = null)
 	{
 		if ($name == null && $email == null && $image == null) {
 			$u = neon()->user;
@@ -141,7 +141,7 @@ 
 		static::getMenuManager()->add('user', [
 			'template' => '<a href="{url}" class="dropdown-toggle navbarUserDropdown" data-toggle="dropdown">{label}</a>',
 			'options' => ['class'=>'dropdown navbarUserDropdown'],
-			'label' => neon()->user->isGuest ? 'Guest' : '<img class="nav-avatar avatar" src="' . neon()->user->getImageUrl(30) . '"/> ' . neon()->user->getName(),
+			'label' => neon()->user->isGuest ? 'Guest' : '<img class="nav-avatar avatar" src="'.neon()->user->getImageUrl(30).'"/> '.neon()->user->getName(),
 			'url' => ['/user/account/index'],
 			'linkOptions' => ['class' => 'navbarUserDropdown'],
 			'encode' => false,
@@ -153,12 +153,12 @@ 
 
 				//['label' => '<i class="fa fa-cog" aria-hidden="true"></i> My Account', 'url' => ['/user/account/index'], 'encode'=>false ],
 				//'<li class="divider"></li>',
-				['label' => '<i class="fa fa-sign-out" aria-hidden="true"></i> Log Out', 'url' => ['/user/account/logout'], 'encode'=>false ]
+				['label' => '<i class="fa fa-sign-out" aria-hidden="true"></i> Log Out', 'url' => ['/user/account/logout'], 'encode'=>false]
 			]
 		]);
 		$adminItems = static::getMenuManager()->getMainAdminMenu();
-		foreach($adminItems as $key => $items) {
-			foreach($items as $key2 => $item) {
+		foreach ($adminItems as $key => $items) {
+			foreach ($items as $key2 => $item) {
 				if (isset($item['visible'])) {
 					$adminItems[$key][$key2]['visible'] = value($item['visible']);
 				}

neon/core/helpers/Converter.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param string $type - one of 'date' | 'datetime' | 'time'
 	 * @return null|string date in format defined by $toFormat
 	 */
-	public static function convertDate($date, $fromFormat, $toFormat, $type='date')
+	public static function convertDate($date, $fromFormat, $toFormat, $type = 'date')
 	{
 		$date = \DateTime::createFromFormat(self::convertDateFormatToPhp($fromFormat), $date);
 		return is_bool($date) ? null : $date->format(self::convertDateFormatToPhp($toFormat, $type));
@@ -63,7 +63,7 @@ 
 	 * @param string $type - one of 'date' | 'datetime' | 'time'
 	 * @return string - string representing a php date format
 	 */
-	public static function convertDateFormatToPhp($format, $type='date')
+	public static function convertDateFormatToPhp($format, $type = 'date')
 	{
 		if (strncmp($format, 'php:', 4) === 0)
 			return substr($format, 4);

Braces +12 added lines, -8 removed lines

@@ -47,10 +47,12 @@ 
 	 */
 	public static function convertDateFormatToJui($format)
 	{
-		if (strncmp($format, 'php:', 4) === 0)
-			return self::convertDatePhpToJui(substr($format, 4));
-		if (strncmp($format, 'icu:', 4) === 0)
-			return self::convertDateIcuToJui(substr($format, 4));
+		if (strncmp($format, 'php:', 4) === 0) {
+					return self::convertDatePhpToJui(substr($format, 4));
+		}
+		if (strncmp($format, 'icu:', 4) === 0) {
+					return self::convertDateIcuToJui(substr($format, 4));
+		}
 		return self::convertDateIcuToJui($format);
 	}
 
@@ -65,10 +67,12 @@ 
 	 */
 	public static function convertDateFormatToPhp($format, $type='date')
 	{
-		if (strncmp($format, 'php:', 4) === 0)
-			return substr($format, 4);
-		if (strncmp($format, 'icu:', 4) === 0)
-			return self::convertDateIcuToPhp(substr($format, 4), $type);
+		if (strncmp($format, 'php:', 4) === 0) {
+					return substr($format, 4);
+		}
+		if (strncmp($format, 'icu:', 4) === 0) {
+					return self::convertDateIcuToPhp(substr($format, 4), $type);
+		}
 		// assume icu format by default - this is the default used by neon()->formatter->dateFormat
 		return self::convertDateIcuToPhp($format, $type);
 	}

neon/core/helpers/Str.php

Spacing +11 added lines, -13 removed lines

@@ -202,7 +202,7 @@ 
 			return static::$snakeCache[$key][$delimiter];
 		}
 
-		if (! ctype_lower($value)) {
+		if (!ctype_lower($value)) {
 			$value = preg_replace('/\s+/u', '', $value);
 
 			$value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value));
@@ -343,8 +343,7 @@ 
 	public static function replaceFirst($search, $replace, $subject)
 	{
 		$position = strpos($subject, $search);
-		return $position === false ? $subject :
-			substr_replace($subject, $replace, $position, strlen($search));
+		return $position === false ? $subject : substr_replace($subject, $replace, $position, strlen($search));
 	}
 
 	/**
@@ -376,8 +375,7 @@ 
 	public static function iReplaceFirst($search, $replace, $subject)
 	{
 		$position = stripos($subject, $search);
-		return $position === false ? $subject :
-			substr_replace($subject, $replace, $position, strlen($search));
+		return $position === false ? $subject : substr_replace($subject, $replace, $position, strlen($search));
 	}
 
 	/**
@@ -392,7 +390,7 @@ 
 	{
 		preg_match('/^\s*+(?:\S++\s*+){1,'.$words.'}/u', $value, $matches);
 
-		if (! isset($matches[0]) || static::length($value) === static::length($matches[0])) {
+		if (!isset($matches[0]) || static::length($value) === static::length($matches[0])) {
 			return $value;
 		}
 
@@ -418,9 +416,9 @@ 
 	 */
 	public static function toBytes($string)
 	{
-		sscanf ($string, '%u%c', $number, $suffix);
+		sscanf($string, '%u%c', $number, $suffix);
 		if (isset ($suffix)) {
-			$number = $number * pow (1024, strpos (' KMGTP', strtoupper($suffix)));
+			$number = $number * pow(1024, strpos(' KMGTP', strtoupper($suffix)));
 		}
 		return $number;
 	}
@@ -437,7 +435,7 @@ 
 		$base = log($size, 1024);
 		$suffixes = array('', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB');
 
-		return round(pow(1024, $base - floor($base)), $precision) .' '. $suffixes[floor($base)];
+		return round(pow(1024, $base - floor($base)), $precision).' '.$suffixes[floor($base)];
 	}
 
 	/**
@@ -538,14 +536,14 @@ 
 	 * @param array|string $allowedUnits
 	 * @return bool
 	 */
-	public static function validateNumericWithUnits($value, $allowedUnits=[])
+	public static function validateNumericWithUnits($value, $allowedUnits = [])
 	{
 		if (!$allowedUnits) return is_numeric($value);
-		if (is_string($allowedUnits)) $allowedUnits=[$allowedUnits];
+		if (is_string($allowedUnits)) $allowedUnits = [$allowedUnits];
 		foreach ($allowedUnits as $unit) {
-			$checkNumber = substr($value,0, -strlen($unit));
+			$checkNumber = substr($value, 0, -strlen($unit));
 			$checkUnit = substr($value, -strlen($unit));
-			if ($checkUnit==$unit && is_numeric($checkNumber)) {
+			if ($checkUnit == $unit && is_numeric($checkNumber)) {
 				return true;
 			}
 		}

Braces +6 added lines, -2 removed lines

@@ -540,8 +540,12 @@
 	 */
 	public static function validateNumericWithUnits($value, $allowedUnits=[])
 	{
-		if (!$allowedUnits) return is_numeric($value);
-		if (is_string($allowedUnits)) $allowedUnits=[$allowedUnits];
+		if (!$allowedUnits) {
+			return is_numeric($value);
+		}
+		if (is_string($allowedUnits)) {
+			$allowedUnits=[$allowedUnits];
+		}
 		foreach ($allowedUnits as $unit) {
 			$checkNumber = substr($value,0, -strlen($unit));
 			$checkUnit = substr($value, -strlen($unit));

neon/core/helpers/Css.php

Spacing +2 added lines, -2 removed lines

@@ -44,12 +44,12 @@
 	 */
 	public static function replaceRelativeUrls($cssContent, $publishedCssFilePath)
 	{
-		$content = preg_replace_callback('/url\(([^)]*)\)/', function ($matches) use ($publishedCssFilePath) {
+		$content = preg_replace_callback('/url\(([^)]*)\)/', function($matches) use ($publishedCssFilePath) {
 			$url = trim($matches[1], '\'"');
 			// ignore non url (urls e.g. data:image url paths) and absolute urls
 			if (Url::isAbsolute($url))
 				return $matches[0];
-			return 'url("' . dirname($publishedCssFilePath) . '/' . $url . '")';
+			return 'url("'.dirname($publishedCssFilePath).'/'.$url.'")';
 		}, $cssContent);
 		return $content;
 	}

Braces +3 added lines, -2 removed lines

@@ -47,8 +47,9 @@
 		$content = preg_replace_callback('/url\(([^)]*)\)/', function ($matches) use ($publishedCssFilePath) {
 			$url = trim($matches[1], '\'"');
 			// ignore non url (urls e.g. data:image url paths) and absolute urls
-			if (Url::isAbsolute($url))
-				return $matches[0];
+			if (Url::isAbsolute($url)) {
+							return $matches[0];
+			}
 			return 'url("' . dirname($publishedCssFilePath) . '/' . $url . '")';
 		}, $cssContent);
 		return $content;

neon/core/console/ServeController.php

Indentation +13 added lines, -13 removed lines

@@ -20,18 +20,18 @@
  */
 class ServeController extends YiiServeController
 {
-    /**
-     * @var int port to serve on.
-     */
-    public $port = 8080;
-    /**
-     * @var string path or path alias to directory to serve
-     */
-    public $docroot = '@root/public';
-    /**
-     * @var string path to router script.
-     * See https://secure.php.net/manual/en/features.commandline.webserver.php
-     */
-    public $router;
+	/**
+	 * @var int port to serve on.
+	 */
+	public $port = 8080;
+	/**
+	 * @var string path or path alias to directory to serve
+	 */
+	public $docroot = '@root/public';
+	/**
+	 * @var string path to router script.
+	 * See https://secure.php.net/manual/en/features.commandline.webserver.php
+	 */
+	public $router;
 
 }

neon/core/console/HelpController.php

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
 		if (isset($commands['core/help'])) {
 			unset($commands['core/help']);
 		}
-		$this->stdout("\nThis is Neon version " . \Neon::getVersion() . ".\n");
+		$this->stdout("\nThis is Neon version ".\Neon::getVersion().".\n");
 		if (!empty($commands)) {
 			$this->stdout("\nThe following commands are available:\n\n", Console::BOLD);
 			$len = 0;
@@ -47,7 +47,7 @@ 
 					if (!empty($actions)) {
 						$prefix = $controller->getUniqueId();
 						foreach ($actions as $action) {
-							$string = $prefix . '/' . $action;
+							$string = $prefix.'/'.$action;
 							if ($action === $controller->defaultAction) {
 								$string .= ' (default)';
 							}
@@ -59,7 +59,7 @@ 
 				} elseif (($l = strlen($command)) > $len) {
 					$len = $l;
 				}
-				$this->stdout('- ' . $this->ansiFormat($command, Console::FG_YELLOW));
+				$this->stdout('- '.$this->ansiFormat($command, Console::FG_YELLOW));
 				$this->stdout(str_repeat(' ', $len + 4 - strlen($command)));
 				$this->stdout(Console::wrapText($description, $len + 4 + 2), Console::BOLD);
 				$this->stdout("\n");
@@ -71,8 +71,8 @@ 
 					if (!empty($actions)) {
 						$prefix = $controller->getUniqueId();
 						foreach ($actions as $action) {
-							$string = '  ' . $prefix . '/' . $action;
-							$this->stdout('  ' . $this->ansiFormat($string, Console::FG_GREEN));
+							$string = '  '.$prefix.'/'.$action;
+							$this->stdout('  '.$this->ansiFormat($string, Console::FG_GREEN));
 							if ($action === $controller->defaultAction) {
 								$string .= ' (default)';
 								$this->stdout(' (default)', Console::FG_YELLOW);
@@ -90,8 +90,8 @@ 
 			}
 			$scriptName = $this->getScriptName();
 			$this->stdout("\nTo see the help of each command, enter:\n", Console::BOLD);
-			$this->stdout("\n  $scriptName " . $this->ansiFormat('help', Console::FG_YELLOW) . ' '
-							. $this->ansiFormat('<command-name>', Console::FG_CYAN) . "\n\n");
+			$this->stdout("\n  $scriptName ".$this->ansiFormat('help', Console::FG_YELLOW).' '
+							. $this->ansiFormat('<command-name>', Console::FG_CYAN)."\n\n");
 		} else {
 			$this->stdout("\nNo commands are found.\n\n", Console::BOLD);
 		}
@@ -104,8 +104,8 @@ 
 	 */
 	protected function getDefaultHelpHeader()
 	{
-		return "\nThis is Yii version " . \Yii::getVersion() . ".\n"
-			. "\nThis is Neon version " . \Neon::getVersion() . ".\n";
+		return "\nThis is Yii version ".\Yii::getVersion().".\n"
+			. "\nThis is Neon version ".\Neon::getVersion().".\n";
 
 	}
 
@@ -114,13 +114,13 @@ 
 	 */
 	protected function getModuleCommands($module)
 	{
-		$prefix = $module instanceof Application ? '' : $module->getUniqueId() . '/';
+		$prefix = $module instanceof Application ? '' : $module->getUniqueId().'/';
 
 		$commands = [];
 
 		if ($module->id != 'core') {
 			foreach (array_keys($module->controllerMap) as $id) {
-				$commands[] = $prefix . $id;
+				$commands[] = $prefix.$id;
 			}
 		}
 
@@ -130,11 +130,11 @@ 
 			$files = scandir($controllerPath);
 			foreach ($files as $file) {
 				if (!empty($file) && substr_compare($file, 'Controller.php', -14, 14) === 0) {
-					$controllerClass = $module->controllerNamespace . '\\' . substr(basename($file), 0, -4);
+					$controllerClass = $module->controllerNamespace.'\\'.substr(basename($file), 0, -4);
 					if ($this->validateControllerClass($controllerClass)) {
 //						if ($prefix == 'core' || $prefix == 'core/')
 //							continue;
-						$commands[] = $prefix . Inflector::camel2id(substr(basename($file), 0, -14));
+						$commands[] = $prefix.Inflector::camel2id(substr(basename($file), 0, -14));
 					}
 				}
 			}

neon/core/console/MigrateController.php

Indentation +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
  */
 class MigrateController extends \yii\console\controllers\MigrateController
 {
-    /**
-     * @inheritdoc
-     */
-    public $templateFile = '@neon/core/views/migration.php';
+	/**
+	 * @inheritdoc
+	 */
+	public $templateFile = '@neon/core/views/migration.php';
 
 	/**
 	 * @var string Define the app that is responsible for this migration.

Spacing +7 added lines, -7 removed lines

@@ -76,7 +76,7 @@ 
 				if ($app === null) {
 					throw new Exception('No app exists with id "'.$this->app.'"');
 				}
-				$this->getMigrator()->migrationPath = $app->getClassAlias() . '/migrations';
+				$this->getMigrator()->migrationPath = $app->getClassAlias().'/migrations';
 				$this->migrationPath = $this->getMigrator()->migrationPath;
 			}
 			return true;
@@ -120,8 +120,8 @@ 
 		if (!preg_match('/^\w+$/', $name)) {
 			throw new Exception("The migration name should contain letters, digits and/or underscore characters only.");
 		}
-		$name = 'm' . gmdate('Ymd_His') . '_' . $app . '_' . $name;
-		$file = neon()->getAlias($this->migrationPath . DIRECTORY_SEPARATOR . $name . '.php');
+		$name = 'm'.gmdate('Ymd_His').'_'.$app.'_'.$name;
+		$file = neon()->getAlias($this->migrationPath.DIRECTORY_SEPARATOR.$name.'.php');
 		if ($this->confirm("Create new migration '$file'?")) {
 			$content = Yii::$app->getView()->renderFile(Neon::getAlias($this->templateFile), ['className' => $name]);
 			FileHelper::createDirectory(dirname($file));
@@ -151,10 +151,10 @@ 
 		$success = $this->migrator->migrateUp($class);
 		$time = microtime(true) - $start;
 		if ($success) {
-			$this->stdout("*** applied $class (time: " . sprintf("%.3f", $time) . "s)\n\n", Console::FG_GREEN);
+			$this->stdout("*** applied $class (time: ".sprintf("%.3f", $time)."s)\n\n", Console::FG_GREEN);
 			return true;
 		} else {
-			$this->stdout("*** failed to apply $class (time: " . sprintf("%.3f", $time) . "s)\n\n", Console::FG_RED);
+			$this->stdout("*** failed to apply $class (time: ".sprintf("%.3f", $time)."s)\n\n", Console::FG_RED);
 			return false;
 		}
 	}
@@ -171,11 +171,11 @@ 
 		$success = $this->migrator->migrateDown($class);
 		if ($success) {
 			$time = microtime(true) - $start;
-			$this->stdout("*** reverted $class (time: " . sprintf("%.3f", $time) . "s)\n\n", Console::FG_GREEN);
+			$this->stdout("*** reverted $class (time: ".sprintf("%.3f", $time)."s)\n\n", Console::FG_GREEN);
 			return true;
 		} else {
 			$time = microtime(true) - $start;
-			$this->stdout("*** failed to revert $class (time: " . sprintf("%.3f", $time) . "s)\n\n", Console::FG_RED);
+			$this->stdout("*** failed to revert $class (time: ".sprintf("%.3f", $time)."s)\n\n", Console::FG_RED);
 			return false;
 		}
 	}

Braces +3 added lines, -2 removed lines

@@ -54,8 +54,9 @@
 	 */
 	public function getMigrator()
 	{
-		if ($this->_migrator === null)
-			$this->_migrator = new Migrator;
+		if ($this->_migrator === null) {
+					$this->_migrator = new Migrator;
+		}
 		return $this->_migrator;
 	}