newicon / neon

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/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

neon/firefly/services/mediaManager/models/Media.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
 	 * @param boolean $withDeleted
 	 * @return Media|null|\yii\db\ActiveRecord
 	 */
-	public static function findDirectoryByPath($path, $withDeleted=false)
+	public static function findDirectoryByPath($path, $withDeleted = false)
 	{
 		$path = static::getPath($path);
 		return static::query($withDeleted)
@@ -87,7 +87,7 @@ 
 	 * @param string $parentPath - the parent path used to find the parent node
 	 * @return Media|null|\yii\db\ActiveRecord
 	 */
-	public static function findParentByPath($path, &$parentPath='')
+	public static function findParentByPath($path, &$parentPath = '')
 	{
 		$info = pathinfo($path);
 		$parentPath = $info['dirname'];
@@ -111,7 +111,7 @@ 
 		$node = new static(['path' => $path, 'type' => 'dir', 'parent_id' => $parent->id]);
 		$node->save();
 		if ($node->hasErrors()) {
-			throw new \Exception('Model validation errors: ' . print_r($node->getErrors(), true));
+			throw new \Exception('Model validation errors: '.print_r($node->getErrors(), true));
 		}
 		return $node->toArray();
 	}
@@ -121,7 +121,7 @@ 
 	 *
 	 * @return array|Media[]
 	 */
-	public function getChildren($withDeleted=false)
+	public function getChildren($withDeleted = false)
 	{
 		return $this->getChildrenQuery($withDeleted)
 			->all();
@@ -236,7 +236,7 @@ 
 		if ($this->isDir()) {
 			//$this->updateChildPaths();
 			$originalPath = $this->path;
-			$newPath = str_replace('//', '/', $intoNode->path .'/'.basename($this->path));
+			$newPath = str_replace('//', '/', $intoNode->path.'/'.basename($this->path));
 			$this->path = $newPath;
 			$save = $this->save();
 			if ($save) {
@@ -257,7 +257,7 @@ 
 	public function updateChildPaths()
 	{
 		$this->updatePath();
-		foreach($this->getChildren(true) as $child)
+		foreach ($this->getChildren(true) as $child)
 			$child->updateChildPaths();
 	}
 
@@ -277,11 +277,11 @@ 
 	public function rebuildPath()
 	{
 		$path = collect($this->getAncestors())->prepend($this)
-			->map(function($item){ return ($item->type === MEDIA::TYPE_DIR) ? basename($item->path) : ''; })
+			->map(function($item) { return ($item->type === MEDIA::TYPE_DIR) ? basename($item->path) : ''; })
 			->reverse()
 			->implode('/');
 		// allow for root node
-		$path = ($path==='') ? '/' : $path;
+		$path = ($path === '') ? '/' : $path;
 		// prevent trailing slash on files
 		return rtrim($path, '/');
 	}
@@ -322,7 +322,7 @@ 
 	public static function replacePaths($findPath, $replacePath, $wherePath)
 	{
 		$tableName = static::tableName();
-		$sql = 'UPDATE ' . $tableName . ' SET path = REPLACE(path, :findPath, :replacePath) WHERE path LIKE :wherePath';
+		$sql = 'UPDATE '.$tableName.' SET path = REPLACE(path, :findPath, :replacePath) WHERE path LIKE :wherePath';
 		return Media::getDb()->createCommand($sql)
 			->bindValues([
 				':findPath' => $findPath,
@@ -337,7 +337,7 @@ 
 	 *
 	 * @return \neon\core\db\ActiveQuery
 	 */
-	public function getChildrenQuery($withDeleted=false)
+	public function getChildrenQuery($withDeleted = false)
 	{
 		return static::query($withDeleted)
 			->where(['parent_id' => $this->id]);

Braces +21 added lines, -13 removed lines

@@ -106,8 +106,9 @@ 
 	public static function createDirectory($path)
 	{
 		$parent = static::findParentByPath($path, $parentPath);
-		if ($parent === null)
-			throw new \Exception("Directory does not exist with path '$parentPath'");
+		if ($parent === null) {
+					throw new \Exception("Directory does not exist with path '$parentPath'");
+		}
 		$node = new static(['path' => $path, 'type' => 'dir', 'parent_id' => $parent->id]);
 		$node->save();
 		if ($node->hasErrors()) {
@@ -157,11 +158,13 @@ 
 	{
 		$path = $this->$attribute;
 		// must be absolute and start with /
-		if ($path[0] !== '/')
-			$this->addError('path', "Must be absolute path and start with a '/' provided: '$path'");
+		if ($path[0] !== '/') {
+					$this->addError('path', "Must be absolute path and start with a '/' provided: '$path'");
+		}
 		// prevent folders with no names being created
-		if (strpos($path, '//') !== false)
-			$this->addError('path', "Path can not contain a double forward slash");
+		if (strpos($path, '//') !== false) {
+					$this->addError('path', "Path can not contain a double forward slash");
+		}
 	}
 
 	/**
@@ -216,11 +219,12 @@ 
 	public function  moveInto(Media $intoNode)
 	{
 		// We must ensure we are not moving the item into itself!
-		if ($intoNode->id === $this->id)
-			return [
+		if ($intoNode->id === $this->id) {
+					return [
 				'success' => false,
 				'error' => 'Can not move an item inside itself'
 			];
+		}
 		// update the parentlatest version
 		$this->parent_id = $intoNode->id;
 		$success = false;
@@ -257,8 +261,9 @@ 
 	public function updateChildPaths()
 	{
 		$this->updatePath();
-		foreach($this->getChildren(true) as $child)
-			$child->updateChildPaths();
+		foreach($this->getChildren(true) as $child) {
+					$child->updateChildPaths();
+		}
 	}
 
 	/**
@@ -295,7 +300,9 @@ 
 		$parents = [];
 		do {
 			$item = $item->getParent();
-			if ($item) $parents[] = $item;
+			if ($item) {
+				$parents[] = $item;
+			}
 		} while ($item !== null);
 		return $parents;
 	}
@@ -380,8 +387,9 @@ 
 	 */
 	public static function getPath($path)
 	{
-		if ($path === '/' && neon()->firefly->mediaManager->getRootPath() !== '/')
-			$path = neon()->firefly->mediaManager->getRootPath();
+		if ($path === '/' && neon()->firefly->mediaManager->getRootPath() !== '/') {
+					$path = neon()->firefly->mediaManager->getRootPath();
+		}
 		return $path;
 	}
 

neon/firefly/services/MediaManager.php

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,7 @@ 
 		$bits = explode('/', $path);
 		$bitsCurrent = [];
 		$parts = [];
-		foreach($bits as $i => $bit) {
+		foreach ($bits as $i => $bit) {
 			$bitsCurrent[] = $bit;
 			if ($i == 0) continue;
 			$parts[] = implode('/', $bitsCurrent);
@@ -118,7 +118,7 @@ 
 	 * @param array $filters - array of additional search filters passed to Query where clause
 	 * @return array|\yii\db\ActiveRecord[]
 	 */
-	private function _listQuery($directory = '', $withDeleted=false, $filters=[])
+	private function _listQuery($directory = '', $withDeleted = false, $filters = [])
 	{
 		$directory = $this->getRealPath($directory);
 		$item = Media::findDirectoryByPath($directory, $withDeleted);
@@ -142,7 +142,7 @@ 
 
 		return collect($items)->map(function($item) use ($filesIndex) {
 			$file = $filesIndex->get($item['id']);
-			$item['concatName'] = $item['path'] .'/'. ($file ? $file['name'] : '');
+			$item['concatName'] = $item['path'].'/'.($file ? $file['name'] : '');
 			$item['file'] = $file;
 			$item['path'] = Media::formatPath($item['path']);
 			return $item;
@@ -152,7 +152,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function listContents($directory = '', $withDeleted=false)
+	public function listContents($directory = '', $withDeleted = false)
 	{
 		return $this->_listQuery($directory, $withDeleted);
 	}
@@ -173,7 +173,7 @@ 
 		$items = $query->all();
 
 
-		foreach($items as $key => $item) {
+		foreach ($items as $key => $item) {
 			$items[$key]['path'] = Media::formatPath($item['path']);
 		}
 		return $items;
@@ -182,7 +182,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function addFile($id, $path='/')
+	public function addFile($id, $path = '/')
 	{
 		// Find the file
 		$fileMeta = neon()->firefly->getMeta($id);
@@ -255,7 +255,7 @@ 
 
 
 		// make sure it does not already exist
-		if (! empty(Media::findDirectoryByPath($newPath))) {
+		if (!empty(Media::findDirectoryByPath($newPath))) {
 			throw new DirectoryExistsException("The directory '$newPath' already exists");
 		}
 		$node->path = $newPath;
@@ -288,7 +288,7 @@ 
 	 */
 	public function setRootPath($path)
 	{
-		$this->_rootPath = rtrim($path, '/') . '/';
+		$this->_rootPath = rtrim($path, '/').'/';
 	}
 
 	/**
@@ -353,7 +353,7 @@ 
 			->where(['deleted' => 1])
 			->all();
 		$destroyed = [];
-		foreach($items as $item) {
+		foreach ($items as $item) {
 			$destroyed[$item->id] = $item->destroy();
 		}
 		return $destroyed;
@@ -378,7 +378,7 @@ 
 		$items = Media::findAll(['id' => $items]);
 		// update each item
 		$success = [];
-		foreach($items as $item) {
+		foreach ($items as $item) {
 			$success[$item->id] = $item->moveInto($into);
 		}
 		return $success;
@@ -394,7 +394,7 @@ 
 	 */
 	public function getRealPath($path)
 	{
-		$path = $this->getRootPath() . ltrim($path, '/');
+		$path = $this->getRootPath().ltrim($path, '/');
 		return strlen($path) === 1 ? '/' : rtrim($path, '/');
 	}
 }

Braces +44 added lines, -26 removed lines

@@ -48,8 +48,9 @@ 
 		}, $paths);
 
 		if (empty($created)) {
-			if ($directory == '')
-				throw new DirectoryExistsException("The root directory already exists");
+			if ($directory == '') {
+							throw new DirectoryExistsException("The root directory already exists");
+			}
 			throw new DirectoryExistsException("The directory '$directory' already exists");
 		}
 		return $created;
@@ -78,7 +79,9 @@ 
 		$parts = [];
 		foreach($bits as $i => $bit) {
 			$bitsCurrent[] = $bit;
-			if ($i == 0) continue;
+			if ($i == 0) {
+				continue;
+			}
 			$parts[] = implode('/', $bitsCurrent);
 		}
 		return $parts;
@@ -91,14 +94,17 @@ 
 	 */
 	public function validateAbsoluteDirectoryPath($directory)
 	{
-		if (!is_string($directory))
-			throw new InvalidDirectoryException("Invalid directory parameter '$directory'. The directory must be absolute string path and start with '/'.");
+		if (!is_string($directory)) {
+					throw new InvalidDirectoryException("Invalid directory parameter '$directory'. The directory must be absolute string path and start with '/'.");
+		}
 		// must be absolute and start with /
-		if ($directory[0] !== '/')
-			throw new InvalidDirectoryException("Invalid directory parameter '$directory'. The directory must be absolute path and start with '/'.");
+		if ($directory[0] !== '/') {
+					throw new InvalidDirectoryException("Invalid directory parameter '$directory'. The directory must be absolute path and start with '/'.");
+		}
 		// prevent folders with no names being created
-		if (strpos($directory, '//') !== false)
-			throw new InvalidDirectoryException("Invalid directory parameter '$directory'. You can not have empty path sections containing '//' each directory needs a name.");
+		if (strpos($directory, '//') !== false) {
+					throw new InvalidDirectoryException("Invalid directory parameter '$directory'. You can not have empty path sections containing '//' each directory needs a name.");
+		}
 	}
 
 	/**
@@ -123,7 +129,9 @@ 
 		$directory = $this->getRealPath($directory);
 		$item = Media::findDirectoryByPath($directory, $withDeleted);
 
-		if (empty($item)) return [];
+		if (empty($item)) {
+			return [];
+		}
 
 		$m = Media::tableName();
 		$f = FileManager::tableName();
@@ -132,8 +140,9 @@ 
 			->orderBy("type ASC, $m.path, $f.name ASC")
 			->leftJoin(FileManager::tableName(), "id = $f.uuid")
 			->asArray();
-		if (!empty($filters))
-			$query->where($filters);
+		if (!empty($filters)) {
+					$query->where($filters);
+		}
 		$items = $query->all();
 
 		$ids = collect($items)->pluck('id');
@@ -218,10 +227,11 @@ 
 			throw new BadRequestHttpException('A name cannot contain a "/" character');
 		}
 
-		if ($node->isDir())
-			$this->_updateDirectoryName($node, $name);
-		else
-			$this->_updateFileName($node, $name);
+		if ($node->isDir()) {
+					$this->_updateDirectoryName($node, $name);
+		} else {
+					$this->_updateFileName($node, $name);
+		}
 		return true;
 	}
 
@@ -297,7 +307,9 @@ 
 	public function getDirectoryMeta($path)
 	{
 		$dir = Media::findDirectoryByPath($path);
-		if ($dir === null) return [];
+		if ($dir === null) {
+			return [];
+		}
 		return $dir->toArray();
 	}
 
@@ -307,7 +319,9 @@ 
 	public function getMeta($id)
 	{
 		$item = Media::find()->where(['id' => $id])->asArray()->one();
-		if ($item === null) return [];
+		if ($item === null) {
+			return [];
+		}
 		if ($item['type'] === 'file') {
 			$item['file'] = neon()->firefly->fileManager->getMeta($id);
 		}
@@ -320,8 +334,9 @@ 
 	public function delete($id)
 	{
 		$item = Media::findOne($id);
-		if ($item === null)
-			throw new NotFoundHttpException("No item with id '$id' could be found'");
+		if ($item === null) {
+					throw new NotFoundHttpException("No item with id '$id' could be found'");
+		}
 		$result = $item->delete();
 		if ($result === false) {
 			return $item->getErrors();
@@ -335,8 +350,9 @@ 
 	public function destroy($id)
 	{
 		$item = Media::findWithDeleted()->where(['id' => $id])->one();
-		if ($item === null)
-			throw new NotFoundHttpException("No item with id '$id' could be found'");
+		if ($item === null) {
+					throw new NotFoundHttpException("No item with id '$id' could be found'");
+		}
 		return $item->destroy();
 	}
 
@@ -368,11 +384,13 @@ 
 		$into = Media::findOne($intoId);
 
 		// throw error if it doesn't exist
-		if ($into === null)
-			throw new NotFoundHttpException("No item with id '$intoId' could be found'");
+		if ($into === null) {
+					throw new NotFoundHttpException("No item with id '$intoId' could be found'");
+		}
 		// throw error if its not a directory
-		if (!$into->isDir())
-			throw new BadRequestHttpException("This is not a directory - you can only move items into directories");
+		if (!$into->isDir()) {
+					throw new BadRequestHttpException("This is not a directory - you can only move items into directories");
+		}
 
 		// find all items to move
 		$items = Media::findAll(['id' => $items]);