newicon / neon

neon/firefly/services/driveManager/models/DbFile.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 	{
 		if (is_string($value)) {
 			if ($value != self::VISIBILITY_PRIVATE && $value != self::VISIBILITY_PUBLIC) {
-				throw new \InvalidArgumentException('The visibility must be set to either "' . self::VISIBILITY_PRIVATE . '" or "' . self::VISIBILITY_PUBLIC . '"');
+				throw new \InvalidArgumentException('The visibility must be set to either "'.self::VISIBILITY_PRIVATE.'" or "'.self::VISIBILITY_PUBLIC.'"');
 			}
 			$this->setAttribute('visibility', $value);
 		} // If the value is a boolean then a value of true means public a value of false means private
@@ -109,7 +109,7 @@ 
 			$this->setAttribute('visibility', $value ? self::VISIBILITY_PUBLIC : self::VISIBILITY_PRIVATE);
 		} // We have no idea what you passed in :-S
 		else {
-			throw new \InvalidArgumentException('Incorrect value being set on visibility, expecting either a boolean or a string, you gave ' . print_r($value, true));
+			throw new \InvalidArgumentException('Incorrect value being set on visibility, expecting either a boolean or a string, you gave '.print_r($value, true));
 		}
 	}
 

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

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 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')
 	{
 		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) {

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/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/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 +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;
 	}
 

Braces +6 added lines, -3 removed lines

@@ -46,8 +46,9 @@ 
 
 		// set expiry information on the file
 		$meta = $firefly->fileManager->getMeta($id);
-		if ($meta['mime_type'] == 'image/svg')
-			$meta['mime_type'] = 'image/svg+xml';
+		if ($meta['mime_type'] == 'image/svg') {
+					$meta['mime_type'] = 'image/svg+xml';
+		}
 		$this->sendCacheHeaders($meta['mime_type'], $meta['size'], $meta['updated_at'], md5($request->absoluteUrl), $meta['name']);
 		$download = $request->get('download', $request->get('dl', false));
 		try {
@@ -110,7 +111,9 @@ 
 			$processedImage = neon()->firefly->imageManager->process($idOrUrl, neon()->request->get());
 			$mimeType = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $processedImage);
 			// svgs don't seem display in browsers without specifically the svg+xml mime type
-			if ($mimeType === 'image/svg') $mimeType = 'image/svg+xml';
+			if ($mimeType === 'image/svg') {
+				$mimeType = 'image/svg+xml';
+			}
 			return [
 				// recalculate the mime type in case was spoofed
 				'size' => strlen($processedImage),

neon/firefly/controllers/api/MediaController.php

Spacing +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
 	 * @param string $path GET variable 'path' e.g. /my/folder
 	 * @return array
 	 */
-	public function actionList($path='', $deleted=0)
+	public function actionList($path = '', $deleted = 0)
 	{
 		$items = neon()->firefly->mediaManager->listContents($path, $deleted);
 		return ['data' => [
@@ -128,7 +128,7 @@ 
 		$transform = neon()->request->getBodyParam('transform');
 		// information of the current file
 		$sourceMeta = neon()->firefly->getMeta($transform['sourceImage']);
-		$transform['rotate'] =  Arr::get($transform, 'crop.rotate', false);
+		$transform['rotate'] = Arr::get($transform, 'crop.rotate', false);
 		$width = Arr::get($transform, 'crop.width', false);
 		$height = Arr::get($transform, 'crop.height', false);
 

Braces +9 added lines, -6 removed lines

@@ -221,15 +221,18 @@
 	{
 		$items = neon()->request->getBodyParam('items');
 		$into = neon()->request->getBodyParam('into');
-		if ($items === null)
-			throw new BadRequestHttpException('You must specify an "items" parameter - containing an array of item ids to move');
-		if ($into === null)
-			throw new BadRequestHttpException('You must specify an "into" parameter - specifying the directory to move the items into');
+		if ($items === null) {
+					throw new BadRequestHttpException('You must specify an "items" parameter - containing an array of item ids to move');
+		}
+		if ($into === null) {
+					throw new BadRequestHttpException('You must specify an "into" parameter - specifying the directory to move the items into');
+		}
 		if (strpos($into, '/') !== false) {
 			// into has been specified as a path
 			$dir = neon()->firefly->mediaManager->getDirectoryMeta($into);
-			if ($dir === null)
-				throw new BadRequestHttpException("No directory exists with the specified path of '$into' ");
+			if ($dir === null) {
+							throw new BadRequestHttpException("No directory exists with the specified path of '$into' ");
+			}
 			$into = $dir['id'];
 		}
 		return neon()->firefly->mediaManager->move($items, $into);

neon/firefly/migrations/m170830_121945_firefly_change_local_drive_to_media.php

Indentation +9 added lines, -9 removed lines

@@ -4,17 +4,17 @@
 
 class m170830_121945_firefly_change_local_drive_to_media extends Migration
 {
-    public function safeUp()
-    {
-        $this->execute('UPDATE firefly_file_manager SET drive = "media" WHERE drive = "local"');
-    }
+	public function safeUp()
+	{
+		$this->execute('UPDATE firefly_file_manager SET drive = "media" WHERE drive = "local"');
+	}
 
-    public function safeDown()
-    {
-        $this->execute('UPDATE firefly_file_manager SET drive = "local" WHERE drive = "media"');
-    }
+	public function safeDown()
+	{
+		$this->execute('UPDATE firefly_file_manager SET drive = "local" WHERE drive = "media"');
+	}
 
-    /*
+	/*
     // Use up()/down() to run migration code without a transaction.
     public function up()
     {

neon/firefly/migrations/m161123_191412_firefly_files_table.php

Indentation +6 added lines, -6 removed lines

@@ -5,8 +5,8 @@ 
 
 class m161123_191412_firefly_files_table extends Migration
 {
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		$this->createTable(DbFile::tableName(), [
 			// limit the path size on the db file storage driver.
 			// otherwise the key gets too big.
@@ -35,11 +35,11 @@ 
 			'created_at' => $this->datetime()->comment('When the file was first created'),
 			'PRIMARY KEY (`path`(150))'
 		]);
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$this->dropTable(DbFile::tableName());
-    }
+	}
 
 }