Icybee / module-files

lib/Operation/SaveOperation.php

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

Unused Use Statements -1 removed lines

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

lib/Module.php

Braces +3 added lines, -6 removed lines

@@ -45,8 +45,7 @@ 
 				mkdir($path);
 
 				file_put_contents($path . DIRECTORY_SEPARATOR . '.htaccess', 'Deny from all');
-			}
-			else
+			} else
 			{
 				$errors->add($this->id, "Unable to create %directory directory, its parent is not writable.", [ '%directory' => $path ]);
 			}
@@ -67,8 +66,7 @@ 
 				mkdir($path);
 
 				file_put_contents($path . DIRECTORY_SEPARATOR . '.htaccess', 'Allow from all');
-			}
-			else
+			} else
 			{
 				$errors->add($this->id, "Unable to create %directory directory, its parent is not writable", [ '%directory' => $path ]);
 			}
@@ -89,8 +87,7 @@ 
 				mkdir($path);
 
 				file_put_contents($path . DIRECTORY_SEPARATOR . '.htaccess', 'Deny from all');
-			}
-			else
+			} else
 			{
 				$errors->add($this->id, 'Unable to create %directory directory, its parent is not writable', [ '%directory' => $path ]);
 			}

Spacing +16 added lines, -16 removed lines

@@ -34,7 +34,7 @@ 
 		# $repository/tmp
 		#
 
-		$path = $repository . 'tmp';
+		$path = $repository.'tmp';
 
 		if (!file_exists($path))
 		{
@@ -44,11 +44,11 @@ 
 			{
 				mkdir($path);
 
-				file_put_contents($path . DIRECTORY_SEPARATOR . '.htaccess', 'Deny from all');
+				file_put_contents($path.DIRECTORY_SEPARATOR.'.htaccess', 'Deny from all');
 			}
 			else
 			{
-				$errors->add($this->id, "Unable to create %directory directory, its parent is not writable.", [ '%directory' => $path ]);
+				$errors->add($this->id, "Unable to create %directory directory, its parent is not writable.", ['%directory' => $path]);
 			}
 		}
 
@@ -56,7 +56,7 @@ 
 		# $repository/files
 		#
 
-		$path = $repository . 'files';
+		$path = $repository.'files';
 
 		if (!file_exists($path))
 		{
@@ -66,11 +66,11 @@ 
 			{
 				mkdir($path);
 
-				file_put_contents($path . DIRECTORY_SEPARATOR . '.htaccess', 'Allow from all');
+				file_put_contents($path.DIRECTORY_SEPARATOR.'.htaccess', 'Allow from all');
 			}
 			else
 			{
-				$errors->add($this->id, "Unable to create %directory directory, its parent is not writable", [ '%directory' => $path ]);
+				$errors->add($this->id, "Unable to create %directory directory, its parent is not writable", ['%directory' => $path]);
 			}
 		}
 
@@ -78,7 +78,7 @@ 
 		# $repository/files-index
 		#
 
-		$path = $repository . 'files-index';
+		$path = $repository.'files-index';
 
 		if (!file_exists($path))
 		{
@@ -88,11 +88,11 @@ 
 			{
 				mkdir($path);
 
-				file_put_contents($path . DIRECTORY_SEPARATOR . '.htaccess', 'Deny from all');
+				file_put_contents($path.DIRECTORY_SEPARATOR.'.htaccess', 'Deny from all');
 			}
 			else
 			{
-				$errors->add($this->id, 'Unable to create %directory directory, its parent is not writable', [ '%directory' => $path ]);
+				$errors->add($this->id, 'Unable to create %directory directory, its parent is not writable', ['%directory' => $path]);
 			}
 		}
 
@@ -118,22 +118,22 @@ 
 		# $repository/tmp
 		#
 
-		$path = $repository . 'tmp';
+		$path = $repository.'tmp';
 
 		if (!is_dir($path))
 		{
-			$errors->add($this->id, "The %directory directory is missing.", [ '%directory' => $path ]);
+			$errors->add($this->id, "The %directory directory is missing.", ['%directory' => $path]);
 		}
 
 		#
 		# $repository/files
 		#
 
-		$path = $repository . 'files';
+		$path = $repository.'files';
 
 		if (!is_dir($path))
 		{
-			$errors->add($this->id, "The %directory directory is missing.", [ '%directory' => $path ]);
+			$errors->add($this->id, "The %directory directory is missing.", ['%directory' => $path]);
 		}
 
 		return parent::is_installed($errors);
@@ -141,18 +141,18 @@ 
 
 	public function clean_temporary_files($lifetime = 3600)
 	{
-		$path = \ICanBoogie\REPOSITORY . 'tmp';
+		$path = \ICanBoogie\REPOSITORY.'tmp';
 
 		if (!is_dir($path))
 		{
-			\ICanBoogie\log_error('The directory %directory does not exists', [ '%directory' => $path ]);
+			\ICanBoogie\log_error('The directory %directory does not exists', ['%directory' => $path]);
 
 			return;
 		}
 
 		if (!is_writable($path))
 		{
-			\ICanBoogie\log_error('The directory %directory is not writable', [ '%directory' => $path ]);
+			\ICanBoogie\log_error('The directory %directory is not writable', ['%directory' => $path]);
 
 			return;
 		}

lib/FileUpload.php

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 namespace Icybee\Modules\Files;
 
 use Brickrouge\Element;
-use ICanBoogie\I18n;
 
 class FileUpload extends \Brickrouge\File
 {

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 
 			foreach ($details as $detail)
 			{
-				$rc .= '<li>' . $detail . '</li>';
+				$rc .= '<li>'.$detail.'</li>';
 			}
 
 			$rc .= '</ul>';
@@ -54,7 +54,7 @@ 
 
 			'class' => "icon-download-alt",
 			'href' => $path,
-			'title' => $this->t('download', [], [ 'scope' => 'fileupload.element' ])
+			'title' => $this->t('download', [], ['scope' => 'fileupload.element'])
 
 		]);
 	}

updates.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
 
 		foreach ($model->select("nid, path")->mode(\PDO::FETCH_NUM) as list($nid, $path))
 		{
-			$update('.' . pathinfo($path, PATHINFO_EXTENSION), $nid);
+			$update('.'.pathinfo($path, PATHINFO_EXTENSION), $nid);
 		}
 	}
 
@@ -84,7 +84,7 @@ 
 
 		foreach ($model->select("nid, uuid, path")->mode(\PDO::FETCH_NUM) as list($nid, $uuid, $path))
 		{
-			$path = $document_root . $path;
+			$path = $document_root.$path;
 
 			if (!file_exists($path))
 			{
@@ -94,7 +94,7 @@ 
 			}
 
 			$hash = $storage->add($path)->hash;
-			$index->add(IndexKey::from([ $nid, $uuid, $hash ]));
+			$index->add(IndexKey::from([$nid, $uuid, $hash]));
 		}
 
 		$model->remove_column('path');

lib/Storage/Pathname.php

Spacing +4 added lines, -4 removed lines

@@ -157,7 +157,7 @@ 
 			return static::from_pathname($pathname_or_parts);
 		}
 
-		throw new \InvalidArgumentException("Expected an array or a string, got: " . gettype($pathname_or_parts) . ".");
+		throw new \InvalidArgumentException("Expected an array or a string, got: ".gettype($pathname_or_parts).".");
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	static protected function from_parts(array $parts)
 	{
-		list($root, $hash, $random) = $parts + [ 2 => null];
+		list($root, $hash, $random) = $parts + [2 => null];
 
 		$random = $random ?: self::random();
 
@@ -191,7 +191,7 @@ 
 	{
 		$ds = preg_quote(DIRECTORY_SEPARATOR);
 
-		if (!preg_match("#(.+{$ds})" . self::FILENAME_REGEX . '$#', $pathname, $matches))
+		if (!preg_match("#(.+{$ds})".self::FILENAME_REGEX.'$#', $pathname, $matches))
 		{
 			throw new \InvalidArgumentException("Invalid hash pathname: $pathname.");
 		}
@@ -218,6 +218,6 @@ 
 	 */
 	public function __toString()
 	{
-		return $this->root . $this->filename;
+		return $this->root.$this->filename;
 	}
 }

lib/Block/ManageBlock.php

Spacing +2 added lines, -2 removed lines

@@ -26,14 +26,14 @@
 	{
 		parent::add_assets($document);
 
-		$document->css->add(Root\DIR . '/public/manage.css');
+		$document->css->add(Root\DIR.'/public/manage.css');
 	}
 
 	public function __construct(Module $module, array $attributes)
 	{
 		parent::__construct($module, $attributes + [
 
-			self::T_COLUMNS_ORDER => [ 'title', 'size', 'download', 'is_online', 'uid', 'mime', 'updated_at' ]
+			self::T_COLUMNS_ORDER => ['title', 'size', 'download', 'is_online', 'uid', 'mime', 'updated_at']
 
 		]);
 	}

config/prototype.php

Spacing +3 added lines, -3 removed lines

@@ -13,11 +13,11 @@
 
 use ICanBoogie;
 
-$hooks = Hooks::class . '::';
+$hooks = Hooks::class.'::';
 
 return [
 
-	ICanBoogie\Core::class . '::lazy_get_file_storage_index' => $hooks . 'get_file_storage_index',
-	ICanBoogie\Core::class . '::lazy_get_file_storage' => $hooks . 'get_file_storage'
+	ICanBoogie\Core::class.'::lazy_get_file_storage_index' => $hooks.'get_file_storage_index',
+	ICanBoogie\Core::class.'::lazy_get_file_storage' => $hooks.'get_file_storage'
 
 ];

config/routes.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 	'files:show' => [
 
 		'pattern' => '/files/<uuid:{:uuid:}><extension:[\.a-z]*>',
-		'controller' => FilesController::class . '#show',
+		'controller' => FilesController::class.'#show',
 		'via' => Request::METHOD_GET
 
 	],
@@ -28,7 +28,7 @@ 
 	'files:download' => [
 
 		'pattern' => '/files/download/<uuid:{:uuid:}><extension:[\.a-z]*>',
-		'controller' => FilesController::class . '#download',
+		'controller' => FilesController::class.'#download',
 		'via' => Request::METHOD_GET
 
 	],
@@ -36,14 +36,14 @@ 
 	'files:protected:show' => [
 
 		'pattern' => '/files/<nid:\d+><extension:[\.a-z]*>',
-		'controller' => FilesAdminController::class . '#show'
+		'controller' => FilesAdminController::class.'#show'
 
 	],
 
 	'files:protected:download' => [
 
 		'pattern' => '/files/download/<nid:\d+><extension:[\.a-z]*>',
-		'controller' => FilesAdminController::class . '#download'
+		'controller' => FilesAdminController::class.'#download'
 
 	]
 

descriptor.php

Spacing +4 added lines, -4 removed lines

@@ -27,10 +27,10 @@
 			Model::EXTENDING => 'nodes',
 			Model::SCHEMA => [
 
-				'size' => [ 'integer', 'unsigned' => true ],
-				'mime' => [ 'varchar', 'charset' => 'ascii/general_ci' ],
-				'extension' => [ 'varchar', 16, 'charset' => 'ascii/general_ci' ],
-				'short_hash' => [ 'char', 8 ],
+				'size' => ['integer', 'unsigned' => true],
+				'mime' => ['varchar', 'charset' => 'ascii/general_ci'],
+				'extension' => ['varchar', 16, 'charset' => 'ascii/general_ci'],
+				'short_hash' => ['char', 8],
 				'description' => 'text'
 
 			]