Icybee / module-files

lib/Block/EditBlock.php

Unused Use Statements -3 removed lines

@@ -11,13 +11,10 @@
 
 namespace Icybee\Modules\Files\Block;
 
-use ICanBoogie\I18n;
 use ICanBoogie\Operation;
-
 use Brickrouge\Element;
 use Brickrouge\Document;
 use Brickrouge\Form;
-
 use Icybee\Modules\Files as Root;
 use Icybee\Modules\Files\File;
 

Braces +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
 			try
 			{
 				$path = $this->record->pathname->relative;
-			}
-			catch (\Exception $e)
+			} catch (\Exception $e)
 			{
 				#
 				# the associated file might have disappeared

Spacing +6 added lines, -6 removed lines

@@ -36,8 +36,8 @@ 
 	{
 		parent::add_assets($document);
 
-		$document->css->add(Root\DIR . 'public/edit.css');
-		$document->js->add(Root\DIR . 'public/edit.js');
+		$document->css->add(Root\DIR.'public/edit.css');
+		$document->js->add(Root\DIR.'public/edit.js');
 	}
 
 	protected function lazy_get_values()
@@ -52,7 +52,7 @@ 
 
 	protected function lazy_get_children()
 	{
-		$folder = \ICanBoogie\REPOSITORY . 'tmp';
+		$folder = \ICanBoogie\REPOSITORY.'tmp';
 
 		if (!is_writable($folder))
 		{
@@ -60,7 +60,7 @@ 
 
 				Element::CHILDREN => [
 
-					$this->t('The folder %folder is not writable !', [ '%folder' => $folder ])
+					$this->t('The folder %folder is not writable !', ['%folder' => $folder])
 
 				]
 			];
@@ -117,9 +117,9 @@ 
 
 				Form::LABEL => 'file',
 				Element::REQUIRED => empty($nid),
-				\Brickrouge\File::FILE_WITH_LIMIT => $this->app->site->metas[$this->module->flat_id . '.max_file_size'],
+				\Brickrouge\File::FILE_WITH_LIMIT => $this->app->site->metas[$this->module->flat_id.'.max_file_size'],
 				Element::WEIGHT => -100,
-				\Brickrouge\File::T_UPLOAD_URL => Operation::encode($this->module->id . '/upload'),
+				\Brickrouge\File::T_UPLOAD_URL => Operation::encode($this->module->id.'/upload'),
 
 				'value' => $path
 

lib/Hooks.php

Doc Comments +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 class Hooks
 {
 	/**
-	 * @param Core|Binding\CoreBindings $app
+	 * @param Core $app
 	 *
 	 * @return FileStorageIndex
 	 */
@@ -31,7 +31,7 @@ 
 	}
 
 	/**
-	 * @param Core|Binding\CoreBindings $app
+	 * @param Core $app
 	 *
 	 * @return FileStorage
 	 */

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 use ICanBoogie\Errors;
 use ICanBoogie\HTTP\Request;
 use ICanBoogie\HTTP\File as HTTPFile;
-
 use Icybee\Modules\Files\File;
 use Icybee\Modules\Files\Module;
 

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	{
 		static $index;
 
-		return $index ?: $index = new FileStorageIndex(\ICanBoogie\REPOSITORY . 'files-index');
+		return $index ?: $index = new FileStorageIndex(\ICanBoogie\REPOSITORY.'files-index');
 	}
 
 	/**
@@ -39,6 +39,6 @@ 
 	{
 		static $manager;
 
-		return $manager ?: $manager = new FileStorage(\ICanBoogie\REPOSITORY . 'files', $app->file_storage_index);
+		return $manager ?: $manager = new FileStorage(\ICanBoogie\REPOSITORY.'files', $app->file_storage_index);
 	}
 }

lib/Operation/SaveOperation.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 use ICanBoogie\Errors;
 use ICanBoogie\HTTP\Request;
 use ICanBoogie\HTTP\File as HTTPFile;
-
 use Icybee\Modules\Files\File;
 use Icybee\Modules\Files\Module;
 

Braces +2 added lines, -4 removed lines

@@ -114,8 +114,7 @@ 
 			$pathname = \ICanBoogie\REPOSITORY . 'tmp' . DIRECTORY_SEPARATOR . $filename;
 
 			$file->move($pathname);
-		}
-		else if ($path && strpos($path, \ICanBoogie\strip_root(\ICanBoogie\REPOSITORY . "files")) !== 0)
+		} else if ($path && strpos($path, \ICanBoogie\strip_root(\ICanBoogie\REPOSITORY . "files")) !== 0)
 		{
 			$file = $this->resolve_request_file_from_pathname($path);
 
@@ -175,8 +174,7 @@ 
 
 				]);
 			}
-		}
-		else if (!$this->key)
+		} else if (!$this->key)
 		{
 			$errors->add(File::HTTP_FILE, "File is required.");
 		}

Spacing +6 added lines, -6 removed lines

@@ -111,17 +111,17 @@ 
 		if ($file && $file->is_valid)
 		{
 			$filename = \ICanBoogie\generate_v4_uuid();
-			$pathname = \ICanBoogie\REPOSITORY . 'tmp' . DIRECTORY_SEPARATOR . $filename;
+			$pathname = \ICanBoogie\REPOSITORY.'tmp'.DIRECTORY_SEPARATOR.$filename;
 
 			$file->move($pathname);
 		}
-		else if ($path && strpos($path, \ICanBoogie\strip_root(\ICanBoogie\REPOSITORY . "files")) !== 0)
+		else if ($path && strpos($path, \ICanBoogie\strip_root(\ICanBoogie\REPOSITORY."files")) !== 0)
 		{
 			$file = $this->resolve_request_file_from_pathname($path);
 
 			if (!$file)
 			{
-				$this->response->errors->add(File::HTTP_FILE, "Invalid or deleted file: %pathname", [ 'pathname' => $path ]);
+				$this->response->errors->add(File::HTTP_FILE, "Invalid or deleted file: %pathname", ['pathname' => $path]);
 			}
 		}
 
@@ -161,7 +161,7 @@ 
 				$error_message = $errors->add(
 					File::HTTP_FILE,
 					"Maximum file size is :size Mb",
-					[ ':size' => round($max_file_size / 1024) ]
+					[':size' => round($max_file_size / 1024)]
 				);
 			}
 
@@ -170,7 +170,7 @@ 
 				$error_message = $errors->add(
 					File::HTTP_FILE,
 					"Only the following file types are accepted: %accepted.",
-					[ '%accepted' => implode(', ', $this->accept)
+					['%accepted' => implode(', ', $this->accept)
 				]);
 			}
 
@@ -220,7 +220,7 @@ 
 	protected function resolve_request_file_from_pathname($pathname)
 	{
 		$filename = basename($pathname);
-		$info_pathname = \ICanBoogie\REPOSITORY . 'tmp' . DIRECTORY_SEPARATOR . $filename . '.info';
+		$info_pathname = \ICanBoogie\REPOSITORY.'tmp'.DIRECTORY_SEPARATOR.$filename.'.info';
 
 		if (!file_exists($info_pathname))
 		{

lib/Routing/FilesController.php

Unused Use Statements -2 removed lines

@@ -12,12 +12,10 @@
 namespace Icybee\Modules\Files\Routing;
 
 use ICanBoogie\HTTP\FileResponse;
-use ICanBoogie\HTTP\Request;
 use ICanBoogie\Routing\Controller;
 use ICanBoogie\Binding\Routing\ControllerBindings;
 use ICanBoogie\Binding\Routing\ForwardUndefinedPropertiesToApplication;
 use ICanBoogie\Module\ControllerBindings as ModuleBindings;
-
 use Icybee\Modules\Files\Binding\CoreBindings;
 use Icybee\Modules\Files\File;
 

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 		return new FileResponse($pathname, $this->request, [
 
 			FileResponse::OPTION_ETAG => $pathname->hash,
-			FileResponse::OPTION_FILENAME => $record->title . $record->extension,
+			FileResponse::OPTION_FILENAME => $record->title.$record->extension,
 			FileResponse::OPTION_MIME => $record->mime
 
 		]);

lib/Storage/FileStorage.php

Doc Comments +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 	 *
 	 * If a file has no reference left it is deleted.
 	 *
-	 * @param $key_or_id_or_uuid_or_hash
+	 * @param string $key_or_id_or_uuid_or_hash
 	 */
 	public function release($key_or_id_or_uuid_or_hash)
 	{

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
 			throw new \InvalidArgumentException("`\$root` parameter cannot be empty.");
 		}
 
-		$this->root = rtrim($root, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+		$this->root = rtrim($root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 		$this->index = $index;
 	}
 
@@ -69,7 +69,7 @@ 
 	{
 		$this->assert_hash_is_used($hash);
 
-		$key = IndexKey::from([ $nid, $uuid, $hash ]);
+		$key = IndexKey::from([$nid, $uuid, $hash]);
 
 		$this->index->add($key);
 
@@ -165,7 +165,7 @@ 
 	protected function find_by_hash($hash)
 	{
 		$di = new \DirectoryIterator($this->root);
-		$di = new \RegexIterator($di, '#^' . preg_quote($hash) . '\-#');
+		$di = new \RegexIterator($di, '#^'.preg_quote($hash).'\-#');
 
 		foreach ($di as $file)
 		{
@@ -204,7 +204,7 @@ 
 	{
 		$hash = $hash ?: $this->hash($pathname);
 
-		return Pathname::from([ $this->root, $hash ]);
+		return Pathname::from([$this->root, $hash]);
 	}
 
 	/**

lib/Storage/FileStorageIndex.php

Doc Comments +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 	/**
 	 * Deletes key(s) from the index.
 	 *
-	 * @param IndexKey|int|string $key_or_id_or_uuid_or_hash
+	 * @param IndexKey $key_or_id_or_uuid_or_hash
 	 *
 	 * @throws \InvalidArgumentException if `$key_or_id_or_uuid_or_hash` is not of the expected type.
 	 */

Spacing +9 added lines, -9 removed lines

@@ -80,7 +80,7 @@ 
 	 */
 	public function __construct($root)
 	{
-		$this->root = rtrim($root, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+		$this->root = rtrim($root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public function add(IndexKey $key)
 	{
-		touch($this->root . $key);
+		touch($this->root.$key);
 
 		foreach ($this->find_by_id($key->id) as $match)
 		{
@@ -133,7 +133,7 @@ 
 
 		foreach ($matching as $match)
 		{
-			unlink($this->root . $match);
+			unlink($this->root.$match);
 		}
 	}
 
@@ -159,7 +159,7 @@ 
 
 		$type = $methods[self::resolve_matching_type($key_or_id_or_uuid_or_hash)];
 
-		return $this->{ 'find_by_' . $type }($key_or_id_or_uuid_or_hash);
+		return $this->{ 'find_by_'.$type }($key_or_id_or_uuid_or_hash);
 	}
 
 	/**
@@ -171,9 +171,9 @@ 
 	 */
 	protected function find_by_key($key)
 	{
-		$pathname = $this->root . $key;
+		$pathname = $this->root.$key;
 
-		return file_exists($pathname) ? [ $key ] : null;
+		return file_exists($pathname) ? [$key] : null;
 	}
 
 	/**
@@ -185,7 +185,7 @@ 
 	 */
 	protected function find_by_id($id)
 	{
-		return $this->matching('#^' . preg_quote(IndexKey::encode_id($id)) . '\-#');
+		return $this->matching('#^'.preg_quote(IndexKey::encode_id($id)).'\-#');
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 */
 	protected function find_by_encoded_uuid($encoded_uuid)
 	{
-		return $this->matching("#^.{" . IndexKey::ENCODED_ID_LENGTH . '}\-' . preg_quote($encoded_uuid) . '\-#');
+		return $this->matching("#^.{".IndexKey::ENCODED_ID_LENGTH.'}\-'.preg_quote($encoded_uuid).'\-#');
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 */
 	protected function find_by_hash($hash)
 	{
-		return $this->matching("#^.{" . IndexKey::ENCODED_ID_LENGTH . '}\-.{' . IndexKey::ENCODED_UUID_LENGTH . '}\-' . preg_quote($hash) . '#');
+		return $this->matching("#^.{".IndexKey::ENCODED_ID_LENGTH.'}\-.{'.IndexKey::ENCODED_UUID_LENGTH.'}\-'.preg_quote($hash).'#');
 	}
 
 	/**

lib/Storage/IndexKey.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	 *
 	 * @param string $key
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	static private function parse_key($key)
 	{

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
 		$encoded_uuid = substr($key, self::ENCODED_ID_LENGTH + 1, self::ENCODED_UUID_LENGTH);
 		$hash = substr($key, self::ENCODED_ID_LENGTH + 1 + self::ENCODED_UUID_LENGTH + 1);
 
-		return [ $encoded_id, $encoded_uuid, $hash ];
+		return [$encoded_id, $encoded_uuid, $hash];
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	static public function encode_id($id)
 	{
-		return sprintf('%0' . self::ENCODED_ID_LENGTH . 'x', $id);
+		return sprintf('%0'.self::ENCODED_ID_LENGTH.'x', $id);
 	}
 
 	/**
@@ -132,7 +132,7 @@ 
 			throw new \LogicException("Invalid UUID: $uuid.");
 		}
 
-		return Base64::encode_unpadded(hex2bin(strtr($uuid, [ '-' => '' ])));
+		return Base64::encode_unpadded(hex2bin(strtr($uuid, ['-' => ''])));
 	}
 
 	/**

lib/Block/ManageBlock/DownloadColumn.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
  */
 class DownloadColumn extends ManageBlock\Column
 {
-	public function __construct(ManageBlock $manager, $id, array $options=[])
+	public function __construct(ManageBlock $manager, $id, array $options = [])
 	{
 		parent::__construct($manager, $id, [
 

lib/Facets/SizeCriterion.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		{
 			$value = $modifiers['size'];
 
-			if (in_array($value, [ 'l', 'm', 's' ]))
+			if (in_array($value, ['l', 'm', 's']))
 			{
 				$filters['size'] = $value;
 			}

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
 			if (in_array($value, [ 'l', 'm', 's' ]))
 			{
 				$filters['size'] = $value;
-			}
-			else
+			} else
 			{
 				unset($filters['size']);
 			}