newicon / neon

neon/cms/form/fields/ImageCompare.php

Spacing +3 added lines, -3 removed lines

@@ -48,14 +48,14 @@
 		];
     }
     
-    public function getValueDisplay($context='')
+    public function getValueDisplay($context = '')
 	{
 		$json = $this->getValue();
 		if (empty($json))
 			return neon()->formatter->asJson($this->getValue());
-		if ($context==='grid') {
+		if ($context === 'grid') {
 			$out = '';
-			foreach($json as $image) {
+			foreach ($json as $image) {
 				$url = neon()->firefly->getImage($image);
 				$out .= "<img src='$url' />";
 			}

neon/firefly/services/ImageManager.php

Spacing +4 added lines, -4 removed lines

@@ -81,14 +81,14 @@ 
 
 		if (Arr::get($params, 'fit', false)) {
 			// add callback functionality to retain maximal original image size
-			$image->fit($width, $height, function ($constraint) {
+			$image->fit($width, $height, function($constraint) {
 				$constraint->aspectRatio();
 				$constraint->upsize();
 			}, $params['fit']);
 		} elseif ($width || $height) {
 			$width = $width * $pd;
 			$height = $height * $pd;
-			$image->resize($width, $height, function ($constraint) {
+			$image->resize($width, $height, function($constraint) {
 				$constraint->aspectRatio();
 				$constraint->upsize();
 			});
@@ -134,7 +134,7 @@ 
 	{
 		$filter = Arr::get($params, 'filter', false);
 		if ($filter) {
-			$filters = explode(',',$filter);
+			$filters = explode(',', $filter);
 			if (in_array('greyscale', $filters, true)) {
 				$image->greyscale();
 			}
@@ -169,7 +169,7 @@ 
 				$x = Arr::get($crop, 'x', null);
 				$y = Arr::get($crop, 'y', null);
 			}
-			if ($w == 0 && $h == 0 && $x == 0 && $y ==0) {
+			if ($w == 0 && $h == 0 && $x == 0 && $y == 0) {
 				return $image;
 			}
 			$image->crop($w, $h, $x, $y);

neon/firefly/controllers/FileController.php

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
 		$id = $request->get('id');
 		if (!$firefly->fileManager->exists($id)) {
 			// show placeholder image - should be handled by image manager - controllers should not know
-			return neon()->response->sendFile(dirname(__DIR__) . '/assets/placeholder.jpg', 'No File', ['inline' => true]);
+			return neon()->response->sendFile(dirname(__DIR__).'/assets/placeholder.jpg', 'No File', ['inline' => true]);
 		}
 
 		// as the url is unique for a file we can be aggressive about caching
@@ -55,7 +55,7 @@ 
 			return $firefly->fileManager->sendFile($id, (bool) $download);
 		} catch (\Exception $e) {
 			// if path unknown respond with a blank placeholder
-			return neon()->response->sendFile(dirname(__DIR__) . '/assets/placeholder.jpg', 'No File', ['inline' => true]);
+			return neon()->response->sendFile(dirname(__DIR__).'/assets/placeholder.jpg', 'No File', ['inline' => true]);
 		}
 	}
 
@@ -81,7 +81,7 @@ 
 		$id = neon()->request->getRequired('id');
 
 		// create a unique request key - add v2 to force use of new cached version
-		$requestKey = neon()->request->absoluteUrl . 'v10';
+		$requestKey = neon()->request->absoluteUrl.'v10';
 
 		// see if we already have this in cache and the browser already has it too
 		// We want to remove the need to process images when ever possible
@@ -132,7 +132,7 @@ 
 	 */
 	public function generatePublicFile($id, $imageContent)
 	{
-		$dir = substr($id,0, 3);
+		$dir = substr($id, 0, 3);
 		$publicDir = neon()->getAlias("@webroot/assets/firefly/$dir");
 		if (!file_exists($publicDir)) {
 			FileHelper::createDirectory($publicDir);
@@ -167,7 +167,7 @@ 
 	 * Handle a request that can return a 304 not modified header
 	 * @param bool|string $cacheKey - default false - if cache key is specified
 	 */
-	public function handleNotModified($cacheKey=false)
+	public function handleNotModified($cacheKey = false)
 	{
 		$requestHeaders = neon()->request->headers;
 		$browserHasCache = (isset($requestHeaders['If-Modified-Since']) || isset($requestHeaders['If-None-Match']));
@@ -183,7 +183,7 @@ 
 	{
 		header($_SERVER['SERVER_PROTOCOL'].' 304 Not modified');
 		header('Cache-Control: private, max-age=30000000, immutable, only-if-cached');
-		header('Expires: ' . Carbon::now()->addYear(10)->toRfc1123String());
+		header('Expires: '.Carbon::now()->addYear(10)->toRfc1123String());
 		exit;
 	}
 

neon/cms/controllers/RenderController.php

Spacing +5 added lines, -5 removed lines

@@ -82,13 +82,13 @@ 
 	 * slug it uses - without this property the canonical function will return the url of the first blog-post
 	 * (collection page) it finds.
 	 */
-	public function actionPage($nice_id, $slug='')
+	public function actionPage($nice_id, $slug = '')
 	{
 		\Neon::beginProfile('COBE::RENDER_ACTION', 'cobe');
 		$cms = $this->getCms();
 		$page = $cms->getPage();
 		// check the page with the nice_id exists
-		if (! $page->setById($nice_id)) {
+		if (!$page->setById($nice_id)) {
 			$this->pageNotFound();
 		}
 		//return neon()->view->injectHtml('');
@@ -103,7 +103,7 @@ 
 		}
 
 		// Don't display draft pages unless in edit mode.
-		if ($page->isStatusDraft() && ! $page->isInEditMode()) {
+		if ($page->isStatusDraft() && !$page->isInEditMode()) {
 			$this->pageNotFound();
 		}
 
@@ -135,8 +135,8 @@ 
 			->innerJoin(CmsPage::tableName(), 'cms_page.nice_id = cms_url.nice_id')
 			->where("status='PUBLISHED'")
 			->all()
-		)->reduce(function($carry, $url){
-			return $carry . "\t<url>\n\t\t<loc>" . url($url['url'], true) . "</loc>\n\t</url>" . "\n";
+		)->reduce(function($carry, $url) {
+			return $carry."\t<url>\n\t\t<loc>".url($url['url'], true)."</loc>\n\t</url>"."\n";
 		});
 		header('Content-Type:application/rss+xml');
 		echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";

neon/core/web/UrlManager.php

Spacing +2 added lines, -2 removed lines

@@ -28,9 +28,9 @@
 		if (strpos($url, '://') === false) {
 			$hostInfo = setting('cms', 'canonical', $urlManager->getHostInfo());
 			if (strncmp($url, '//', 2) === 0) {
-				$url = substr($hostInfo, 0, strpos($hostInfo, '://')) . ':' . $url;
+				$url = substr($hostInfo, 0, strpos($hostInfo, '://')).':'.$url;
 			} else {
-				$url = $hostInfo . $url;
+				$url = $hostInfo.$url;
 			}
 		}
 		return Url::ensureScheme($url, null);

neon/core/view/SmartySharedPlugins.php

Switch Indentation +1 added lines, -4 removed lines

@@ -923,7 +923,4 @@
 		if (!empty($params['assign'])) {
 			$smarty->assign($params['assign'], $output);
 		} else {
-			return $output;
-		}
-	}
-}
+			return $output
\ No newline at end of file

Spacing +3 added lines, -6 removed lines

@@ -538,8 +538,8 @@ 
 
 		$html = [];
 		$params['loading'] = Arr::get($params, 'loading', 'lazy');
-		$params[Arr::get($params, 'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(['src' => $id, 'quality'=> $quality, 'widths'=>$widths]));
-		$params[Arr::get($params, 'src-name', 'src')] = $this->firefly_image(['id' => $id, 'w' => (int)$srcWidth, 'q' => $quality]);
+		$params[Arr::get($params,  'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(['src' => $id, 'quality'=> $quality, 'widths'=>$widths]));
+		$params[Arr::get($params,  'src-name', 'src')] = $this->firefly_image(['id' => $id, 'w' => (int)$srcWidth, 'q' => $quality]);
 
 		// alt
 		$params['alt'] = Arr::get($params, 'alt', $this->image_alt(['src' => $id]));
@@ -897,7 +897,4 @@ 
 		if (!empty($params['assign'])) {
 			$smarty->assign($params['assign'], $output);
 		} else {
-			return $output;
-		}
-	}
-}
+			return $output
\ No newline at end of file

neon/cms/components/CmsUrlRule.php

Spacing +2 added lines, -2 removed lines

@@ -30,11 +30,11 @@
 	 */
 	public function parseRequest($manager, $request)
 	{
-		$pathInfo = '/' . $request->getPathInfo();
+		$pathInfo = '/'.$request->getPathInfo();
 		$url = CmsUrl::find()->where(['url' => $pathInfo])->limit(1)->one();
 		// if the url is not in the url table then return false to continue processing other route rules
 		// typically in a neon setup the module/controller/action rule
-		if (! $url) return false;
+		if (!$url) return false;
 		// check if the url found represents a redirect
 		if ($url['redirect'] !== null) {
 			neon()->response->redirect($url['redirect'], 301)->send();

neon/core/form/fields/el/SwitchInput.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	public function getComponentDetails()
 	{
 		return [
-			'name' => 'switch',  'icon' => 'fa fa-toggle-on', 'group' => 'element ui',
+			'name' => 'switch', 'icon' => 'fa fa-toggle-on', 'group' => 'element ui',
 		];
 	}
 

neon/core/helpers/Html.php

Spacing +18 added lines, -18 removed lines

@@ -19,7 +19,7 @@ 
 	public static function displayAsTags($tagsArray, $class = 'label label-info')
 	{
 		$out = '';
-		foreach($tagsArray as $tag) {
+		foreach ($tagsArray as $tag) {
 			$out .= "<span class=\"$class\">$tag</span>";
 		}
 		return $out;
@@ -36,9 +36,9 @@ 
 	 *  - specify $options['icon']
 	 * @return string Html for the custom button
 	 */
-	public static function buttonCustom($url, $text, array $options=[])
+	public static function buttonCustom($url, $text, array $options = [])
 	{
-		$options['class'] = 'btn '. Arr::get($options, 'class', '');
+		$options['class'] = 'btn '.Arr::get($options, 'class', '');
 		$icon = Arr::remove($options, 'icon', '');
 		return self::a("<i class=\"$icon\"></i> ".$text, $url, $options);
 	}
@@ -50,10 +50,10 @@ 
 	 * @param string $text - button text
 	 * @return string Html for an edit button
 	 */
-	public static function buttonEdit($url, $text='Edit', $options=[])
+	public static function buttonEdit($url, $text = 'Edit', $options = [])
 	{
 		$options['icon'] = 'fa fa-pencil';
-		$options['class'] = 'btn-default ' . Arr::get($options, 'class', '');
+		$options['class'] = 'btn-default '.Arr::get($options, 'class', '');
 		return self::buttonCustom($url, $text, $options);
 	}
 
@@ -65,10 +65,10 @@ 
 	 * @see \yii\helpers\Url::to
 	 * @return string Html
 	 */
-	public static function buttonDelete($url, $text='Delete', $options=[])
+	public static function buttonDelete($url, $text = 'Delete', $options = [])
 	{
 		$options['icon'] = 'fa fa-trash';
-		$options['class'] =  'btn-danger ' . Arr::get($options, 'class', '');
+		$options['class'] = 'btn-danger '.Arr::get($options, 'class', '');
 		return self::buttonCustom($url, $text, $options);
 	}
 
@@ -80,7 +80,7 @@ 
 	 * @see \yii\helpers\Url::to
 	 * @return string Html
 	 */
-	public static function buttonAdd($url, $text='Add', $options=[])
+	public static function buttonAdd($url, $text = 'Add', $options = [])
 	{
 		$options['icon'] = 'fa fa-plus';
 		$options['class'] = 'btn-primary btn-add';
@@ -94,7 +94,7 @@ 
 	 * @param string $text button text
 	 * @return string Html
 	 */
-	public static function buttonCancel($url='', $text='Cancel', $options=[])
+	public static function buttonCancel($url = '', $text = 'Cancel', $options = [])
 	{
 		$options['icon'] = 'fa fa-arrow-left';
 		$options['class'] = 'btn-default btn-cancel';
@@ -130,7 +130,7 @@ 
 	public static function checkbox($name, $checked = false, $options = [])
 	{
 		$checkbox = parent::checkbox($name, $checked, $options);
-		return '<div class="checkbox">' . $checkbox . '</div>';
+		return '<div class="checkbox">'.$checkbox.'</div>';
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	public static function radio($name, $checked = false, $options = [])
 	{
 		$radio = parent::radio($name, $checked, $options);
-		return '<div class="radio">' . $radio . '</div>';
+		return '<div class="radio">'.$radio.'</div>';
 	}
 
 	/**
@@ -239,13 +239,13 @@ 
 	protected static function processTags($openingTags, &$tagsProcessed)
 	{
 		// append the closing tags to the list and add a comma for splitting later
-		$tagsStr = str_replace('>','>,',($openingTags.str_replace('<','</',$openingTags)));
+		$tagsStr = str_replace('>', '>,', ($openingTags.str_replace('<', '</', $openingTags)));
 		// create the replacement code with a highly unlikely set of strings
 		$replaceStr = str_replace(['</', '<', '/>', '>'], ['__NEWICON_CLOSELT__', '__NEWICON_LT__', '__NEWICON_CLOSERT__', '__NEWICON_RT__'], $tagsStr);
 
 		// now create the replacement and returned tags
-		$replaceTags = explode(',', substr($replaceStr,0,-1)); // ignore trailing comma
-		$returnTags = explode(',', substr($tagsStr,0,-1)); // ignore trailing comma
+		$replaceTags = explode(',', substr($replaceStr, 0, -1)); // ignore trailing comma
+		$returnTags = explode(',', substr($tagsStr, 0, -1)); // ignore trailing comma
 		$tagsProcessed[$openingTags] = ['replace'=>$replaceTags, 'return'=>$returnTags];
 	}
 
@@ -258,7 +258,7 @@ 
 	 * @param string $empty - what to show if the field is empty
 	 * @return string html
 	 */
-	public static function highlight($search, $html, $empty='')
+	public static function highlight($search, $html, $empty = '')
 	{
 		if ($html === null)
 			return neon()->formatter->nullDisplay;
@@ -280,7 +280,7 @@ 
 				// loadHtml seems to ignore the LIBXML_ERR_NONE setting
 				// we don;t care if we are not given perfectly formed html
 				// Even if we have serious issues in the html `$dom->saveHtml` makes a good expected effort
-				@$dom->loadHTML('<?xml encoding="utf-8" ?>' . $html, LIBXML_HTML_NOIMPLIED + LIBXML_HTML_NODEFDTD + LIBXML_NONET + LIBXML_ERR_NONE);
+				@$dom->loadHTML('<?xml encoding="utf-8" ?>'.$html, LIBXML_HTML_NOIMPLIED + LIBXML_HTML_NODEFDTD + LIBXML_NONET + LIBXML_ERR_NONE);
 				$xpath = new DOMXPath($dom);
 				$s = htmlentities($s);
 				$findStack = [];
@@ -290,8 +290,8 @@ 
 					// appendXml is useless and will break easily when exposed to characters
 					// preg_replace is a million times more robust....
 					// So keep the dom parser happy by replacing its internal text with an md5 key
-					$replace = preg_replace('/(' . preg_quote($s) . ')/i', '<span class="neonSearchHighlight">$1</span>', htmlentities($node->nodeValue));
-					$key = '{[' . md5($replace) . ']}';
+					$replace = preg_replace('/('.preg_quote($s).')/i', '<span class="neonSearchHighlight">$1</span>', htmlentities($node->nodeValue));
+					$key = '{['.md5($replace).']}';
 					$findStack[$key] = $replace;
 					$f->appendXML($key);
 					$node->parentNode->replaceChild($f, $node);