newicon / neon

neon/firefly/services/driveManager/Drive.php

Spacing +3 added lines, -3 removed lines

@@ -235,7 +235,7 @@ 
 
 		foreach ($paths as $path) {
 			try {
-				if (! $this->_flysystem->delete($path)) {
+				if (!$this->_flysystem->delete($path)) {
 					$success = false;
 				}
 			} catch (FileNotFoundException $e) {
@@ -414,10 +414,10 @@ 
 	 * @param  string  $algorithm  - Any algorithm supported by hash()
 	 * @return bool|string  return false on failure the hash output string on success
 	 */
-	public function hash($path, $algorithm='md5')
+	public function hash($path, $algorithm = 'md5')
 	{
 		if (!in_array($algorithm, hash_algos())) {
-			throw new \InvalidArgumentException('Hash algorithm ' . $algorithm . ' is not supported');
+			throw new \InvalidArgumentException('Hash algorithm '.$algorithm.' is not supported');
 		}
 		$stream = $this->_flysystem->readStream($path);
 		if ($stream === false) {

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

Spacing +4 added lines, -4 removed lines

@@ -183,7 +183,7 @@ 
 			->all();
 		$success = true;
 		foreach ($files as $file) {
-			if ( ! $this->delete($file['path'])) {
+			if (!$this->delete($file['path'])) {
 				$success = false;
 			}
 		}
@@ -296,7 +296,7 @@ 
 			$query->where(['like', 'path', $directory]);
 		}
 		$result = $query->asArray()->limit(1000)->all();
-		$result = array_map(function($r){
+		$result = array_map(function($r) {
 			return DbFile::convertToFileSystemFormat($r);
 		}, $result);
 		return Util::emulateDirectories($result);
@@ -312,7 +312,7 @@ 
 	{
 		$path = rtrim($path, '/');
 		$sanitizedPath = addcslashes($path, '_%');
-		return $sanitizedPath . '/';
+		return $sanitizedPath.'/';
 	}
 
 	/**
@@ -396,7 +396,7 @@ 
 	 * @param  string  $path
 	 * @throws \neon\firefly\services\fileManager\FileExceedsMemoryLimitException
 	 */
-	protected function _checkFileSizeLimit($path, $message='')
+	protected function _checkFileSizeLimit($path, $message = '')
 	{
 		if (function_exists('ini_get')) {
 			$bytes = to_bytes(ini_get('memory_limit'));

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/services/ImageManager.php

Spacing +5 added lines, -5 removed lines

@@ -37,11 +37,11 @@ 
 
 			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->upsize();
 				});
 			} elseif ($width || $height) {
-				$image->resize($width, $height, function ($constraint) {
+				$image->resize($width, $height, function($constraint) {
 					$constraint->aspectRatio();
 					$constraint->upsize();
 				});
@@ -92,7 +92,7 @@ 
 
 			$response = $image->response(null, $quality);
 
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$imageContent = $this->getNotReadableImageContents();
 			return $imageContent;
 		}
@@ -106,7 +106,7 @@ 
 	 */
 	public function runFilter(Image $image, $filter)
 	{
-		$filters = explode(',',$filter);
+		$filters = explode(',', $filter);
 		if (in_array('greyscale', $filters, true)) {
 			$this->runGreyscaleFilter($image);
 		}
@@ -158,7 +158,7 @@ 
 			$x = Arr::get($params, 'x', null);
 			$y = Arr::get($params, '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/services/MediaManager.php

Spacing +7 added lines, -7 removed lines

@@ -74,7 +74,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);
@@ -109,7 +109,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function listContents($directory = '', $withDeleted=false)
+	public function listContents($directory = '', $withDeleted = false)
 	{
 		$directory = $this->getRealPath($directory);
 		$item = Media::findDirectoryByPath($directory, $withDeleted);
@@ -125,7 +125,7 @@ 
 			->asArray();
 		$items = $query->all();
 
-		foreach($items as $key => $item) {
+		foreach ($items as $key => $item) {
 			$items[$key]['path'] = Media::formatPath($item['path']);
 		}
 		return $items;
@@ -134,7 +134,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function addFile($id, $path='/')
+	public function addFile($id, $path = '/')
 	{
 		// Find the file
 		$fileMeta = neon()->firefly->getMeta($id);
@@ -240,7 +240,7 @@ 
 	 */
 	public function setRootPath($path)
 	{
-		$this->_rootPath = rtrim($path, '/') . '/';
+		$this->_rootPath = rtrim($path, '/').'/';
 	}
 
 	/**
@@ -298,7 +298,7 @@ 
 		$items = Media::findAll(['id' => $items]);
 		// update each item
 		$success = [];
-		foreach($items as $item) {
+		foreach ($items as $item) {
 			$success[] = $item->moveInto($into);
 		}
 		return !in_array(false, $success);
@@ -314,7 +314,7 @@ 
 	 */
 	public function getRealPath($path)
 	{
-		$path = $this->getRootPath() . ltrim($path, '/');
+		$path = $this->getRootPath().ltrim($path, '/');
 		return strlen($path) === 1 ? '/' : rtrim($path, '/');
 	}
 }

Braces +32 added lines, -21 removed lines

@@ -46,8 +46,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;
@@ -76,7 +77,9 @@ 
 		$parts = [];
 		foreach($bits as $i => $bit) {
 			$bitsCurrent[] = $bit;
-			if ($i == 0) continue;
+			if ($i == 0) {
+				continue;
+			}
 			$parts[] = implode('/', $bitsCurrent);
 		}
 		return $parts;
@@ -90,11 +93,13 @@ 
 	public function validateAbsoluteDirectoryPath($directory)
 	{
 		// 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.");
+		}
 	}
 
 	/**
@@ -170,10 +175,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;
 	}
 
@@ -249,8 +255,9 @@ 
 	public function getDirectoryMeta($path)
 	{
 		$dir = Media::findDirectoryByPath($path);
-		if ($dir === null)
-			return null;
+		if ($dir === null) {
+					return null;
+		}
 		return $dir->toArray();
 	}
 
@@ -260,8 +267,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();
@@ -275,8 +283,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();
 	}
 
@@ -288,11 +297,13 @@ 
 		// get the "into" folder
 		$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]);

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

Spacing +3 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
 	 *   'h' => height
 	 * @return string
 	 */
-	public function getImage($uuid, $params=[]);
+	public function getImage($uuid, $params = []);
 
 	/**
 	 * Get a file's visibility.
@@ -205,7 +205,7 @@ 
 	 * - otherwise it will just return the value from the database
 	 * @return string the md5 checksum of the file contents
 	 */
-	public function getFileHash($uuid, $refresh=false);
+	public function getFileHash($uuid, $refresh = false);
 
 	/**
 	 * Get the file size in bytes
@@ -233,7 +233,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/DriveManager.php

Spacing +2 added lines, -2 removed lines

@@ -179,11 +179,11 @@
 
 		// get the adapter driver for the drive (e.g. S3 | local)
 		$configObj = (new $driver($config));
-		if ( ! $configObj instanceof IDriverConfig) {
+		if (!$configObj instanceof IDriverConfig) {
 			throw new \InvalidArgumentException('The driver specified is not a valid implementation of \neon\firefly\services\fileSystem\interfaces\IDriverConfig');
 		}
 		$driverObj = $configObj->getAdapter();
-		if ( ! $driverObj instanceof AdapterInterface) {
+		if (!$driverObj instanceof AdapterInterface) {
 			throw new \InvalidArgumentException('The driver config object ('.$driver.') does not provide a valid driver implementing \League\Flysystem\AdapterInterface');
 		}
 		// get the generic Filesystem adapter

neon/firefly/services/FileManager.php

Spacing +7 added lines, -7 removed lines

@@ -134,7 +134,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);
@@ -245,7 +245,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function sendFile($uuid, $download=false)
+	public function sendFile($uuid, $download = false)
 	{
 		$meta = $this->getMeta($uuid);
 		$drive = $this->getDriveFor($uuid, $file);
@@ -286,7 +286,7 @@ 
 	public function getFileName($uuid)
 	{
 		$meta = $this->getMeta($uuid);
-		return isset($meta['name']) ? $meta['name'] : false ;
+		return isset($meta['name']) ? $meta['name'] : false;
 	}
 
 	/**
@@ -309,7 +309,7 @@ 
 	public function getSize($uuid)
 	{
 		$meta = $this->getMeta($uuid);
-		return isset($meta['size']) ? $meta['size'] : false ;
+		return isset($meta['size']) ? $meta['size'] : false;
 	}
 
 	/**
@@ -380,16 +380,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 +6 added lines, -3 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;
 	}
 
@@ -336,8 +338,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/plupload/Receiver.php

Indentation +111 added lines, -111 removed lines

@@ -51,68 +51,68 @@ 
 	 * Receiver constructor.
 	 * @param Request $request
 	 */
-    public function __construct(Request $request)
-    {
-        $this->_request = $request;
-    }
+	public function __construct(Request $request)
+	{
+		$this->_request = $request;
+	}
 
-    /**
-     * Get the temporary path where plupload will store the file uploads
-     * @return string - writable directory path
-     */
-    public function getPath()
-    {
-        $path = neon()->getAlias('@runtime/plupload');
-        if (!is_dir($path)) {
-            mkdir($path, 0755, true);
-        }
-        return $path;
-    }
+	/**
+	 * Get the temporary path where plupload will store the file uploads
+	 * @return string - writable directory path
+	 */
+	public function getPath()
+	{
+		$path = neon()->getAlias('@runtime/plupload');
+		if (!is_dir($path)) {
+			mkdir($path, 0755, true);
+		}
+		return $path;
+	}
 
-    /**
-     * Whether the plupload upload will be uploaded in chunks
-     * @return bool
-     */
-    public function hasChunks()
-    {
-        return (bool) $this->_request->getBodyParam('chunks', false);
-    }
+	/**
+	 * Whether the plupload upload will be uploaded in chunks
+	 * @return bool
+	 */
+	public function hasChunks()
+	{
+		return (bool) $this->_request->getBodyParam('chunks', false);
+	}
 
-    /**
-     * Receive a plupload upload
-     * @param string $name  - Name of the request variable that holds
-     * the plupload file(s) - typically the name of the plupload input field
-     * @param  \Closure  $handler  - A handler function that is passed the uploaded file
-     * method signature is: function(\neon\core\web\UploadedFile $file) {}
-     * @return array  - return the result of the upload back to plupload, this should be json encoded
-     */
-    public function receive($name, \Closure $handler)
-    {
-        $response = [];
-        $response['jsonrpc'] = '2.0';
-        if ($this->hasChunks()) {
-            $result = $this->receiveChunks($name, $handler);
-        } else {
-            $result = $this->receiveSingle($name, $handler);
-        }
-        $response['result'] = $result;
-	    $response['id'] = 'plup';
-        return $response;
-    }
+	/**
+	 * Receive a plupload upload
+	 * @param string $name  - Name of the request variable that holds
+	 * the plupload file(s) - typically the name of the plupload input field
+	 * @param  \Closure  $handler  - A handler function that is passed the uploaded file
+	 * method signature is: function(\neon\core\web\UploadedFile $file) {}
+	 * @return array  - return the result of the upload back to plupload, this should be json encoded
+	 */
+	public function receive($name, \Closure $handler)
+	{
+		$response = [];
+		$response['jsonrpc'] = '2.0';
+		if ($this->hasChunks()) {
+			$result = $this->receiveChunks($name, $handler);
+		} else {
+			$result = $this->receiveSingle($name, $handler);
+		}
+		$response['result'] = $result;
+		$response['id'] = 'plup';
+		return $response;
+	}
 
-    /**
-     * Process single file upload
-     * @param string $name
-     * @param \Closure $handler - function to call on successful upload completed
-     * @return bool|mixed
-     */
-    public function receiveSingle($name, \Closure $handler)
-    {
-        if ($this->_request->file($name)) {
-            return $handler($this->_request->file($name));
-        }
-        return false;
-    }
+	/**
+	 * Process single file upload
+	 * @param string $name
+	 * @param \Closure $handler - function to call on successful upload completed
+	 * @return bool|mixed
+	 */
+	public function receiveSingle($name, \Closure $handler)
+	{
+		if ($this->_request->file($name)) {
+			return $handler($this->_request->file($name));
+		}
+		return false;
+	}
 
 	/**
 	 * Process chunked file upload
@@ -121,30 +121,30 @@ 
 	 * @throws \Exception
 	 * @return bool
 	 */
-    public function receiveChunks($name, $handler)
-    {
-        $result = false;
-        if ($this->_request->file($name)) {
-            $file = $this->_request->file($name);
-            $chunk = (int) $this->_request->getBodyParam("chunk", 0);
-            $chunks = (int) $this->_request->getBodyParam("chunks", 0 );
-            $originalName = $this->_request->getBodyParam('name');
-            $filePath = $this->getPath().'/'.$originalName.'.part';
-            $this->_removeOldData($filePath);
-            $this->_appendData($filePath, $file);
-            if ($chunk == $chunks - 1) {
-                $file = new UploadedFile([
-                    'name' => $originalName,
-                    'size' => filesize($filePath),
-                    'tempName' => $filePath,
-                    'error' => UPLOAD_ERR_OK
-                ]);
-                $result = $handler($file);
-                unlink($filePath);
-            }
-        }
-        return $result;
-    }
+	public function receiveChunks($name, $handler)
+	{
+		$result = false;
+		if ($this->_request->file($name)) {
+			$file = $this->_request->file($name);
+			$chunk = (int) $this->_request->getBodyParam("chunk", 0);
+			$chunks = (int) $this->_request->getBodyParam("chunks", 0 );
+			$originalName = $this->_request->getBodyParam('name');
+			$filePath = $this->getPath().'/'.$originalName.'.part';
+			$this->_removeOldData($filePath);
+			$this->_appendData($filePath, $file);
+			if ($chunk == $chunks - 1) {
+				$file = new UploadedFile([
+					'name' => $originalName,
+					'size' => filesize($filePath),
+					'tempName' => $filePath,
+					'error' => UPLOAD_ERR_OK
+				]);
+				$result = $handler($file);
+				unlink($filePath);
+			}
+		}
+		return $result;
+	}
 
 	/**
 	 * Todo: requires test
@@ -164,15 +164,15 @@ 
 	 * @param string $path Optional firefly media virtual path
 	 * @return array
 	 */
-    public function receiveToFirefly($name, $path='/')
-    {
-    	return $this->receive($name, function (UploadedFile $file) use ($path) {
-    		// save file to firefly
-		    $id = neon()->firefly->fileManager->saveFile($file);
-		    $meta = neon()->firefly->mediaManager->addFile($id, $path);
-		    return $meta;
-	    });
-    }
+	public function receiveToFirefly($name, $path='/')
+	{
+		return $this->receive($name, function (UploadedFile $file) use ($path) {
+			// save file to firefly
+			$id = neon()->firefly->fileManager->saveFile($file);
+			$meta = neon()->firefly->mediaManager->addFile($id, $path);
+			return $meta;
+		});
+	}
 
 	/**
 	 * Receives a file and saves it to firefly file manager only.
@@ -206,29 +206,29 @@ 
 	 * @param UploadedFile $file
 	 * @throws PluploadException
 	 */
-    protected function _appendData($filePathPartial, UploadedFile $file)
-    {
-        if (!$out = fopen($filePathPartial, 'ab')) {
-            throw new PluploadException('Failed to open output stream.', 102);
-        }
-        if (!$in = fopen($file->getRealPath(), 'rb')) {
-            throw new PluploadException('Failed to open input stream', 101);
-        }
-        while ($buff = fread($in, 4096)) {
-            fwrite($out, $buff);
-        }
-        fclose($out);
-        fclose($in);
-    }
+	protected function _appendData($filePathPartial, UploadedFile $file)
+	{
+		if (!$out = fopen($filePathPartial, 'ab')) {
+			throw new PluploadException('Failed to open output stream.', 102);
+		}
+		if (!$in = fopen($file->getRealPath(), 'rb')) {
+			throw new PluploadException('Failed to open input stream', 101);
+		}
+		while ($buff = fread($in, 4096)) {
+			fwrite($out, $buff);
+		}
+		fclose($out);
+		fclose($in);
+	}
 
 	/**
 	 * Remove old files
 	 * @param string $filePath
 	 */
-    protected function _removeOldData($filePath)
-    {
-        if (file_exists($filePath) && filemtime($filePath) < time() - $this->maxFileAge) {
-            unlink($filePath);
-        }
-    }
+	protected function _removeOldData($filePath)
+	{
+		if (file_exists($filePath) && filemtime($filePath) < time() - $this->maxFileAge) {
+			unlink($filePath);
+		}
+	}
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -127,7 +127,7 @@ 
         if ($this->_request->file($name)) {
             $file = $this->_request->file($name);
             $chunk = (int) $this->_request->getBodyParam("chunk", 0);
-            $chunks = (int) $this->_request->getBodyParam("chunks", 0 );
+            $chunks = (int) $this->_request->getBodyParam("chunks", 0);
             $originalName = $this->_request->getBodyParam('name');
             $filePath = $this->getPath().'/'.$originalName.'.part';
             $this->_removeOldData($filePath);
@@ -164,9 +164,9 @@ 
 	 * @param string $path Optional firefly media virtual path
 	 * @return array
 	 */
-    public function receiveToFirefly($name, $path='/')
+    public function receiveToFirefly($name, $path = '/')
     {
-    	return $this->receive($name, function (UploadedFile $file) use ($path) {
+    	return $this->receive($name, function(UploadedFile $file) use ($path) {
     		// save file to firefly
 		    $id = neon()->firefly->fileManager->saveFile($file);
 		    $meta = neon()->firefly->mediaManager->addFile($id, $path);
@@ -193,7 +193,7 @@ 
 	 */
 	public function receiveToFireflyFileManager($name)
 	{
-		return $this->receive($name, function (UploadedFile $file)  {
+		return $this->receive($name, function(UploadedFile $file) {
 			// save file to firefly
 			$id = neon()->firefly->fileManager->saveFile($file);
 			return neon()->firefly->fileManager->getMeta($id);

neon/firefly/controllers/FileController.php

Indentation +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
 	 * Send appropriate cache headers
 	 * @param string $mime - mime type of file
 	 * @param string|int $size - size in bytes of response
- 	 * @param string $modified - MySQL Datetime
+	 * @param string $modified - MySQL Datetime
 	 * @param string $eTag - eTag token header to use
 	 * @param string $name - filename string to use in content disposition header
 	 */

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,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
@@ -46,7 +46,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]);
 		}
 	}
 
@@ -73,11 +73,11 @@ 
 		if (!$firefly->fileManager->exists($id)) {
 			// throw new HttpException(404);
 			// 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]);
 		}
 
 		// create a unique request key - add v2 to force use of new cached versioning
-		$requestKey = $request->absoluteUrl . "v2";
+		$requestKey = $request->absoluteUrl."v2";
 
 		// check this is an image before continuing - type image and not svg
 		// Handle SVG images correctly (we do not need to process vector images)
@@ -125,7 +125,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);
@@ -160,7 +160,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']));
@@ -176,7 +176,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;
 	}
 

Braces +3 added lines, -2 removed lines

@@ -82,8 +82,9 @@
 		// check this is an image before continuing - type image and not svg
 		// Handle SVG images correctly (we do not need to process vector images)
 		$meta = $firefly->fileManager->getMeta($id);
-		if (strpos($meta['mime_type'], 'image') === false || strpos($meta['mime_type'], 'svg') !== false)
-			return $this->actionGet();
+		if (strpos($meta['mime_type'], 'image') === false || strpos($meta['mime_type'], 'svg') !== false) {
+					return $this->actionGet();
+		}
 
 		// 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