newicon / neon

neon/core/web/View.php

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/controllers/GridController.php

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);
 	}
 

neon/core/test/Unit.php

Braces +3 added lines, -2 removed lines

@@ -38,8 +38,9 @@
 		$source = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 		$sourceLen = strlen($source);
 		$string = '';
-		for ($i=0; $i<$size; $i++)
-			$string .= substr($source, rand(0, $sourceLen-1), 1);
+		for ($i=0; $i<$size; $i++) {
+					$string .= substr($source, rand(0, $sourceLen-1), 1);
+		}
 		return $string;
 	}
 

neon/firefly/services/driveManager/Drive.php

Braces +3 added lines, -1 removed lines

@@ -158,7 +158,9 @@
 
 		$result = $this->put($path = trim($path), $stream, $visibility);
 
-		if (is_resource($stream)) fclose($stream);
+		if (is_resource($stream)) {
+			fclose($stream);
+		}
 
 		return $result ? (bool) $path : false;
 	}

neon/firefly/services/driveManager/drivers/Db.php

Braces +1 added lines, -2 removed lines

@@ -203,8 +203,7 @@
 		$file = DbFile::findOne($dirname);
 		if ($file === null) {
 			$file = new DbFile(['path' => $dirname]);
-		}
-		else if ($file->type == DbFile::TYPE_FILE) {
+		} else if ($file->type == DbFile::TYPE_FILE) {
 			throw new FileExistsException('Can not create a directory as a file already exists.');
 		}
 		if ($visibility = $config->get('visibility')) {

neon/firefly/migrations/m190204_134239_firefly_interface_change_db_fix.php

Braces +15 added lines, -10 removed lines

@@ -33,22 +33,26 @@ 
 	private function convertFireflyGetsToFiles($search, $replace)
 	{
 		$potentiallyAffected = $this->db->createCommand("SELECT `class_type`, `member_ref` FROM `dds_member` WHERE `data_type_ref`='textlong'")->queryAll();
-		if (count($potentiallyAffected)==0)
-			return;
+		if (count($potentiallyAffected)==0) {
+					return;
+		}
 		$classes = [];
-		foreach ($potentiallyAffected as $pa)
-			$classes[$pa['class_type']][] = $pa['member_ref'];
+		foreach ($potentiallyAffected as $pa) {
+					$classes[$pa['class_type']][] = $pa['member_ref'];
+		}
 		$phoebeClasses = array_keys($classes);
 		$phoebe = neon('phoebe')->getIPhoebeType('daedalus');
 
 		$phoebeDefinition = [];
-		foreach ($phoebeClasses as $pc)
-			$phoebeDefinition[$pc] = $phoebe->getClass($pc, null, false);
+		foreach ($phoebeClasses as $pc) {
+					$phoebeDefinition[$pc] = $phoebe->getClass($pc, null, false);
+		}
 
 		$potentiallyAffectedLookup = [];
 		foreach ($potentiallyAffected as $pa) {
-			if (empty($potentiallyAffectedLookup[$pa['class_type']]))
-				$potentiallyAffectedLookup[$pa['class_type']] = [];
+			if (empty($potentiallyAffectedLookup[$pa['class_type']])) {
+							$potentiallyAffectedLookup[$pa['class_type']] = [];
+			}
 			$potentiallyAffectedLookup[$pa['class_type']][] = $pa['member_ref'];
 		}
 
@@ -77,8 +81,9 @@ 
 				foreach ($found as $objectData) {
 					$changes = [];
 					foreach ($fields as $field) {
-						if (!empty($objectData[$field]) && strpos($objectData[$field],$search)!==false)
-							$changes[$field] = str_replace($search, $replace, $objectData[$field]);
+						if (!empty($objectData[$field]) && strpos($objectData[$field],$search)!==false) {
+													$changes[$field] = str_replace($search, $replace, $objectData[$field]);
+						}
 					}
 					if (count($changes)) {
 						$dds->editObject($objectData['_uuid'], $changes);

neon/firefly/App.php

Braces +3 added lines, -2 removed lines

@@ -366,8 +366,9 @@
 	 */
 	public function isFileObjectValid($file, $throwExceptions=true)
 	{
-		if ($file instanceof IFile)
-			return true;
+		if ($file instanceof IFile) {
+					return true;
+		}
 		// not all objects have the privilege of implementing the IFile interface like \SplFileObject
 		// Firefly only cares about these two functions 'getRealPath' and 'getFilename'
 		$objectIsValid = is_object($file)

neon/cms/components/Theme.php

Braces +6 added lines, -4 removed lines

@@ -29,8 +29,9 @@ 
 			if (is_string($root) && count($themes)) {
 				foreach ($themes as $theme) {
 					$themePath = $root.$theme;
-					if (!isset($hierarchy[$theme]))
-						$hierarchy[$theme] = [];
+					if (!isset($hierarchy[$theme])) {
+											$hierarchy[$theme] = [];
+					}
 
 					// add the default template and plugin directories
 					$hierarchy[$theme]['templates'][] = $themePath;
@@ -104,8 +105,9 @@ 
 	private static function getRoot()
 	{
 		static $root = null;
-		if ($root === null)
-			$root = Neon::getAlias('@root/themes/');
+		if ($root === null) {
+					$root = Neon::getAlias('@root/themes/');
+		}
 		return $root;
 	}
 }

neon/cms/controllers/DataController.php

Braces +13 added lines, -10 removed lines

@@ -39,17 +39,19 @@ 
 	{
 		// see if we have a key and if not we can do nothing
 		$key = neon()->request->post('key');
-		if (empty($key))
-			return;
+		if (empty($key)) {
+					return;
+		}
 		$content = neon()->request->postUnsafe('content');
 		$content = Html::sanitise($content, $this->inlineAllowedTags);
 		$pageId = neon()->request->post('pageId', null);
 		try {
 			$result = neon('cms')->getICmsStaticData()->editStaticContent($key, $pageId, $content);
-			if ($result === true)
-				return ['success'=>true, 'saved'=>$content];
-			else
-				return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			if ($result === true) {
+							return ['success'=>true, 'saved'=>$content];
+			} else {
+							return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			}
 		} catch (\Exception $e) {
 			return neon()->debug ? ['success'=>false, 'errors'=>$e->getMessage()] : ['success'=>false];
 		}
@@ -67,10 +69,11 @@ 
 		$pageId = neon()->request->post('pageId', null);
 		try {
 			$result = neon()->cms->getICmsStaticData()->editStaticContent($key, $pageId, $content);
-			if ($result === true)
-				return ['success'=>true, 'saved'=>$content];
-			else if (neon()->debug)
-				return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			if ($result === true) {
+							return ['success'=>true, 'saved'=>$content];
+			} else if (neon()->debug) {
+							return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			}
 		} catch (\Exception $e) {
 			return neon()->debug ? ['success'=>false, 'errors'=>$e->getMessage()] : ['success'=>false];
 		}