newicon / neon

neon/phoebe/controllers/database/IndexController.php

Spacing +5 added lines, -5 removed lines

@@ -98,8 +98,8 @@ 
 		$exclude = ['neon\core\form\fields\filters\File'];
 		$appClasses = neon()->getAppClasses('', \neon\core\interfaces\IComponent::class);
 		$out = [];
-		foreach($appClasses as $app => $classes) {
-			foreach($classes as $class) {
+		foreach ($appClasses as $app => $classes) {
+			foreach ($classes as $class) {
 				/** @var \neon\core\form\fields\Field $f */
 				$f = new $class(uuid(), []);
 				// register all form field js scripts
@@ -186,7 +186,7 @@ 
 			}
 		}
 		return $this->render('create-table-raw.tpl', [
-			'class' => [ 'label' => 'Create Table'],
+			'class' => ['label' => 'Create Table'],
 			'form'=>$form
 		]);
 	}
@@ -204,11 +204,11 @@ 
 			'label' => $data['label'],
 			'fields' => []
 		];
-		$fields = json_decode($data['fields'],true);
+		$fields = json_decode($data['fields'], true);
 		if (is_array($fields)) {
 			foreach ($fields as $field) {
 				$field['classLabel'] = isset($field['classLabel']) ? $field['classLabel'] : ucwords($field['class']);
-				$field['label'] = isset($field['label']) ? $field['label'] : ucwords(str_replace(['_','-'],' ',$field['name']));
+				$field['label'] = isset($field['label']) ? $field['label'] : ucwords(str_replace(['_', '-'], ' ', $field['name']));
 				$definition['fields'][] = $field;
 			}
 			return $definition;

Braces +12 added lines, -6 removed lines

@@ -54,8 +54,9 @@ 
 	 */
 	public function actionEdit($type = null)
 	{
-		if (!$this->canDevelop())
-			throw new HttpException(403, 'This operation is not permitted here');
+		if (!$this->canDevelop()) {
+					throw new HttpException(403, 'This operation is not permitted here');
+		}
 
 		$form = $this->getPhoebeForm($type, $isNewForm, false, true);
 		return $this->render('edit-fields', [
@@ -95,9 +96,13 @@ 
 				// register all form field js scripts
 				$f->registerScripts(neon()->view);
 				$class = substr($class, 1);
-				if (in_array($class, $exclude)) continue;
+				if (in_array($class, $exclude)) {
+					continue;
+				}
 				$details = $f->getComponentDetails();
-				if ($details === false) continue;
+				if ($details === false) {
+					continue;
+				}
 				$defaultField = Arr::except($f->toArray(), ['dataKey']);
 				$cmp = Arr::merge($defaultField, [
 					'class' => $class,
@@ -162,8 +167,9 @@ 
 			]
 		];
 		$form = new \neon\core\form\Form($formDefinition);
-		if (neon()->request->isAjax)
-			return $form->ajaxValidation();
+		if (neon()->request->isAjax) {
+					return $form->ajaxValidation();
+		}
 		if ($form->processRequest()) {
 			$data = $form->getData();
 			$definition = $this->canonicaliseDefinition($data);

neon/utilities/controllers/ClearCacheController.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
 		$cmp = neon()->getApp($app)->get($component);
 		if ($cmp !== null && $cmp instanceof CacheInterface) {
 			if ($cmp->flush()) {
-				neon()->session->setFlash('success', $component . ' cache successfully flushed');
+				neon()->session->setFlash('success', $component.' cache successfully flushed');
 				return $this->redirect(['/utilities/clear-cache/index']);
 			}
 		}
@@ -65,10 +65,10 @@ 
 	public function actionClearAll()
 	{
 		$caches = $this->getCaches();
-		foreach($caches as $app => $caches) {
+		foreach ($caches as $app => $caches) {
 			$a = neon()->getApp($app);
 			if ($a === null) return;
-			foreach($caches as $name => $component) {
+			foreach ($caches as $name => $component) {
 				$cmp = $a->get($name);
 				if ($cmp !== null && $cmp instanceof CacheInterface) {
 					$cmp->flush();
@@ -92,7 +92,7 @@ 
 		$r = new Renderer();
 		$r->smarty->clearCompiledTemplate();
 		$r->smarty->clearAllCache();
-		foreach(neon()->view->renderers as $ext => $config) {
+		foreach (neon()->view->renderers as $ext => $config) {
 			$renderer = neon()->view->getRendererByExtension($ext);
 			if ($renderer instanceof ICanFlushTemplates) {
 				$renderer->flushTemplates();

Braces +6 added lines, -2 removed lines

@@ -67,7 +67,9 @@ 
 		$caches = $this->getCaches();
 		foreach($caches as $app => $caches) {
 			$a = neon()->getApp($app);
-			if ($a === null) return;
+			if ($a === null) {
+				return;
+			}
 			foreach($caches as $name => $component) {
 				$cmp = $a->get($name);
 				if ($cmp !== null && $cmp instanceof CacheInterface) {
@@ -132,7 +134,9 @@ 
 	public function getCaches()
 	{
 		return collect(neon()->getAllApps())->map(function($config, $app) {
-			$a = neon()->getApp($app); if ($a === null) return;
+			$a = neon()->getApp($app); if ($a === null) {
+				return;
+			}
 			return $this->getCacheComponents($a->getComponents());
 		})
 		->put('neon', $this->getCacheComponents(neon()->getComponents()))

neon/utilities/controllers/DbBackupController.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 	public function actionBackup()
 	{
 		$backup = neon()->db->backup();
-		neon()->session->setFlash('success', 'New backup created ' . $backup);
+		neon()->session->setFlash('success', 'New backup created '.$backup);
 		$zipPath = $this->zip($backup);
 		return neon()->getResponse()->sendFile($zipPath, null, [
 			'mimeType' => 'application/zip',
@@ -73,7 +73,7 @@ 
 	private function zip($file)
 	{
 		File::createDirectory(neon()->getAlias('@runtime/temp'));
-		$zipPath = neon()->getAlias('@runtime/temp/'.pathinfo($file, PATHINFO_FILENAME) . '.zip');
+		$zipPath = neon()->getAlias('@runtime/temp/'.pathinfo($file, PATHINFO_FILENAME).'.zip');
 
 		if (is_file($zipPath) && !File::unlink($zipPath)) {
 			\Neon::warning("Unable to delete the file \"{$zipPath}\": ", __METHOD__);
@@ -81,7 +81,7 @@ 
 
 		$zip = new ZipArchive();
 		if ($zip->open($zipPath, ZipArchive::CREATE) !== true) {
-			throw new \Exception('Cannot create zip at ' . $zipPath);
+			throw new \Exception('Cannot create zip at '.$zipPath);
 		}
 		$zip->addFile($file, pathinfo($file, PATHINFO_BASENAME));
 		$zip->close();

neon/utilities/controllers/requirements.php

Spacing +7 added lines, -7 removed lines

@@ -7,9 +7,9 @@ 
 
 function maxExecutionTimeRequirement()
 {
-	$maxExecutionTime = (int)trim(ini_get('max_execution_time'));
+	$maxExecutionTime = (int) trim(ini_get('max_execution_time'));
 
-	$humanTime = $maxExecutionTime . ($maxExecutionTime === 0 ? ' (no limit)' : '');
+	$humanTime = $maxExecutionTime.($maxExecutionTime === 0 ? ' (no limit)' : '');
 	$memo = "Neon requires a minimum PHP max execution time of 120 seconds. The max_execution_time directive in php.ini is currently set to {$humanTime}.";
 
 	return array(
@@ -25,7 +25,7 @@ 
 	$memoryLimit = ini_get('memory_limit');
 	$bytes = getByteSize($memoryLimit);
 
-	$humanLimit = $memoryLimit . ($memoryLimit === -1 ? ' (no limit)' : '');
+	$humanLimit = $memoryLimit.($memoryLimit === -1 ? ' (no limit)' : '');
 	$memo = "Neon requires a minimum PHP memory limit of 256M. The memory_limit directive in php.ini is currently set to {$humanLimit}.";
 
 	return array(
@@ -67,10 +67,10 @@ 
 {
 	// Copied from craft\helpers\App::phpConfigValueInBytes()
 	if (!preg_match('/(\d+)(K|M|G)/i', $value, $matches)) {
-		return (int)$value;
+		return (int) $value;
 	}
 
-	$value = (int)$matches[1];
+	$value = (int) $matches[1];
 
 	// Multiply!
 	switch (strtolower($matches[2])) {
@@ -258,7 +258,7 @@ 
         (for example, plural in
         <a href=\"http://www.yiiframework.com/doc-2.0/yii-i18n-formatter.html#asRelativeTime%28%29-detail\">
         Formatter::asRelativeTime()</a>) in the <code>yii\i18n\Formatter</code> class. Your current ICU version is ' .
-			(defined('INTL_ICU_VERSION') ? INTL_ICU_VERSION : '(ICU is missing)') . '.'
+			(defined('INTL_ICU_VERSION') ? INTL_ICU_VERSION : '(ICU is missing)').'.'
 	],
 	[
 		'name' => 'ICU Data version',
@@ -269,7 +269,7 @@ 
         (for example, plural in
         <a href=\"http://www.yiiframework.com/doc-2.0/yii-i18n-formatter.html#asRelativeTime%28%29-detail\">
         Formatter::asRelativeTime()</a>) in the <code>yii\i18n\Formatter</code> class. Your current ICU Data version is ' .
-			(defined('INTL_ICU_DATA_VERSION') ? INTL_ICU_DATA_VERSION : '(ICU Data is missing)') . '.'
+			(defined('INTL_ICU_DATA_VERSION') ? INTL_ICU_DATA_VERSION : '(ICU Data is missing)').'.'
 	],
 	[
 		'name' => 'Parse Ini File',

neon/utilities/App.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 	public function checkAuthorization(string $class): bool
 	{
 		/** @var string|IUtilitiy $class */
-		return neon()->getUser()->checkPermission('utility:' . $class::id());
+		return neon()->getUser()->checkPermission('utility:'.$class::id());
 	}
 
 	/**

neon/firefly/services/FileManager.php

Spacing +12 added lines, -12 removed lines

@@ -107,12 +107,12 @@ 
 		$q = new Query();
 		foreach ($all as $i => $field) {
 			if ($i === 0) {
-				$q->select(['_uuid'],"'$field[class_type]' as 'class',")
-					->from('ddt_' . $field['class_type'])
+				$q->select(['_uuid'], "'$field[class_type]' as 'class',")
+					->from('ddt_'.$field['class_type'])
 					->where([$field['member_ref'] => $uuid]);
 			} else {
-				$q->union((new Query())->select(['_uuid'],"'$field[class_type]' as 'class',")
-					->from('ddt_' . $field['class_type'])
+				$q->union((new Query())->select(['_uuid'], "'$field[class_type]' as 'class',")
+					->from('ddt_'.$field['class_type'])
 					->where([$field['member_ref'] => $uuid]));
 			}
 		}
@@ -183,7 +183,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getImage($uuid, $params=[])
+	public function getImage($uuid, $params = [])
 	{
 		$p = array_merge(['/firefly/file/img', 'id'=>$uuid], $params);
 		return Url::to($p, true);
@@ -234,7 +234,7 @@ 
 		try {
 			$f = $this->_get($uuid);
 			return $f->delete();
-		} catch(FileNotFoundException $e) {
+		} catch (FileNotFoundException $e) {
 			return false;
 		}
 	}
@@ -299,7 +299,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function sendFile($uuid, $download=false)
+	public function sendFile($uuid, $download = false)
 	{
 		$meta = $this->getMeta($uuid);
 		$drive = $this->getDriveFor($uuid, $file);
@@ -341,7 +341,7 @@ 
 	public function getFileName($uuid)
 	{
 		$meta = $this->getMeta($uuid);
-		return isset($meta['name']) ? $meta['name'] : false ;
+		return isset($meta['name']) ? $meta['name'] : false;
 	}
 
 	/**
@@ -364,7 +364,7 @@ 
 	public function getSize($uuid)
 	{
 		$meta = $this->getMeta($uuid);
-		return isset($meta['size']) ? $meta['size'] : false ;
+		return isset($meta['size']) ? $meta['size'] : false;
 	}
 
 	/**
@@ -435,16 +435,16 @@ 
 	 * @param  string  $name  - The actual file name
 	 * @return  string  - The full file past on the drive
 	 */
-	protected function _generatePath(&$name=null, $fm)
+	protected function _generatePath(&$name = null, $fm)
 	{
 		$info = pathinfo($name);
 		$fileName = $info['filename'];
-		$extension = isset($info['extension']) ? '.' . $info['extension'] : '';
+		$extension = isset($info['extension']) ? '.'.$info['extension'] : '';
 		if (empty($fileName)) {
 			$fileName = 'nameless';
 			$name = 'nameless';
 		}
-		return date('Y') . '/' . date('m') . '/' . $fileName . '.' . $fm->uuid . $extension;
+		return date('Y').'/'.date('m').'/'.$fileName.'.'.$fm->uuid.$extension;
 	}
 
 }

Braces +18 added lines, -9 removed lines

@@ -66,7 +66,9 @@ 
 		neon()->firefly->isFileObjectValid($file);
 		$stream = fopen($file->getRealPath(), 'r+');
 		$uuid = $this->save($stream, $file->getFilename(), $meta);
-		if (is_resource($stream)) fclose($stream);
+		if (is_resource($stream)) {
+			fclose($stream);
+		}
 		return $uuid;
 	}
 
@@ -105,8 +107,9 @@ 
 			->orWhere(['data_type_ref' => 'file_ref_multi'])
 			->all();
 			
-		if (empty($all))
-			return [];
+		if (empty($all)) {
+					return [];
+		}
 
 		$q = new Query();
 		foreach ($all as $i => $field) {
@@ -249,7 +252,9 @@ 
 	public function destroy($uuid)
 	{
 		$file = Model::findWithDeleted()->where(['uuid' => $uuid])->one();
-		if ($file === null) return false;
+		if ($file === null) {
+			return false;
+		}
 		return $file->destroy();
 	}
 
@@ -332,7 +337,9 @@ 
 			$driver = $this->getDriveFor($uuid, $file);
 			$hash = $driver->hash($file['path']);
 			$model = $this->_get($uuid);
-			if (!$hash) return false;
+			if (!$hash) {
+				return false;
+			}
 			$model->file_hash = $hash;
 			$model->save();
 		}
@@ -396,8 +403,9 @@ 
 	{
 		$model = $this->_get($uuid);
 		$model->attributes = $updates;
-		if (!$model->save())
-			throw new HttpException(400, $model->getErrors());
+		if (!$model->save()) {
+					throw new HttpException(400, $model->getErrors());
+		}
 		return $model->toArray();
 	}
 
@@ -411,8 +419,9 @@ 
 	public function findFile($drive, $path)
 	{
 		$model = Model::find()->where(['drive' => $drive, 'path' => $path])->one();
-		if ($model === null)
-			return null;
+		if ($model === null) {
+					return null;
+		}
 		return $model->toArray();
 	}
 

neon/firefly/services/driveManager/interfaces/IFileSystem.php

Spacing +2 added lines, -2 removed lines

@@ -165,7 +165,7 @@ 
 	 * @throws \InvalidArgumentException if the $contents is an object and it does not have a getRealPath function
 	 * @return bool  True on success, false on failure.
 	 */
-	public function put($path, $contents, $visibility=null);
+	public function put($path, $contents, $visibility = null);
 
 	/**
 	 * Get meta data for this file
@@ -235,7 +235,7 @@ 
 	 * @param  string  $algorithm  - Any algorithm supported by hash()
 	 * @return string  return the hash output string on success or an empty string if the file path can not be read as a stream
 	 */
-	public function hash($path, $algorithm='md5');
+	public function hash($path, $algorithm = 'md5');
 
 	/**
 	 * Get the underlying Flysystem driver

neon/firefly/services/fileManager/models/FileManager.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 	 * @param string $uuid
 	 * @return FileManager|null
 	 */
-	public static function get($uuid, $throwNotFoundExcaption=true)
+	public static function get($uuid, $throwNotFoundExcaption = true)
 	{
 		$model = neon()->cache->getOrSet($uuid, static function() use ($uuid) {
 			return static::findOne($uuid);

Braces +3 added lines, -2 removed lines

@@ -107,8 +107,9 @@
 		$model = neon()->cache->getOrSet($uuid, static function() use ($uuid) {
 			return static::findOne($uuid);
 		});
-		if ($model === null && $throwNotFoundExcaption)
-			throw new FileNotFoundException("No file with id '$uuid' exists.");
+		if ($model === null && $throwNotFoundExcaption) {
+					throw new FileNotFoundException("No file with id '$uuid' exists.");
+		}
 		return $model;
 	}
 

neon/firefly/services/fileManager/interfaces/IFileManager.php

Spacing +3 added lines, -3 removed lines

@@ -134,7 +134,7 @@ 
 	 *   'h' => height
 	 * @return string
 	 */
-	public function getImage($uuid, $params=[]);
+	public function getImage($uuid, $params = []);
 
 	/**
 	 * Get a file's visibility.
@@ -215,7 +215,7 @@ 
 	 * - otherwise it will just return the value from the database
 	 * @return string|false - string the md5 checksum of the file contents, false on failure
 	 */
-	public function getFileHash($uuid, $refresh=false);
+	public function getFileHash($uuid, $refresh = false);
 
 	/**
 	 * Get the file size in bytes
@@ -243,7 +243,7 @@ 
 	 * If false will display the file in the browser
 	 * @return Response
 	 */
-	public function sendFile($uuid, $download=false);
+	public function sendFile($uuid, $download = false);
 
 	/**
 	 * Find a file manager file data by its drive and path location