jenskooij / cloudcontrol

cloudcontrol/library/components/cms/FilesRouting.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	}
 
 	/**
-	 * @param $request
+	 * @param Request $request
 	 * @param CmsComponent $cmsComponent
 	 */
 	private function newRoute($request, $cmsComponent)
@@ -83,7 +83,7 @@ 
 	}
 
 	/**
-	 * @param $request
+	 * @param Request $request
 	 * @param CmsComponent $cmsComponent
 	 */
 	private function deleteRoute($request, $cmsComponent)

Spacing +9 added lines, -9 removed lines

@@ -39,21 +39,21 @@ 
 	private function downloadRoute($slug, $cmsComponent)
 	{
 		$file = $cmsComponent->storage->getFiles()->getFileByName($slug);
-		$path = realpath(__DIR__ . '/../../../www/files/');
-		$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-		$size = filesize($path . '/' . $file->file);
+		$path = realpath(__DIR__.'/../../../www/files/');
+		$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
+		$size = filesize($path.'/'.$file->file);
 
 		header('Content-Description: File Transfer');
-		header('Content-Type: ' . $file->type);
-		header('Content-Disposition: attachment; filename=' . $quoted);
+		header('Content-Type: '.$file->type);
+		header('Content-Disposition: attachment; filename='.$quoted);
 		header('Content-Transfer-Encoding: binary');
 		header('Connection: Keep-Alive');
 		header('Expires: 0');
 		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 		header('Pragma: public');
-		header('Content-Length: ' . $size);
+		header('Content-Length: '.$size);
 
-		readfile($path . '/' . $file->file);
+		readfile($path.'/'.$file->file);
 		exit;
 	}
 
@@ -77,7 +77,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
 		if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) {
 			$cmsComponent->storage->getFiles()->addFile($_FILES[CmsComponent::FILES_PARAMETER_FILE]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 			exit;
 		}
 	}
@@ -89,7 +89,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getFiles()->deleteFileByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 		exit;
 	}
 

cloudcontrol/library/components/FormComponent.php

Doc Comments +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
 	 * submitting the form
 	 *
 	 * @param $postValues
-	 * @param $storage
+	 * @param Storage $storage
 	 */
 	protected function postSubmit($postValues, $storage)
 	{}
@@ -317,7 +317,7 @@ 
 	}
 
 	/**
-	 * @param $form
+	 * @param string|null $form
 	 */
 	private function setFormParameter($form)
 	{

cloudcontrol/library/storage/Storage.php

Spacing +13 added lines, -13 removed lines

@@ -62,7 +62,7 @@ 
 		 */
 		private function config()
 		{
-			$storagePath = __DIR__ . '/../../' . $this->storageDir;
+			$storagePath = __DIR__.'/../../'.$this->storageDir;
 			if (realpath($storagePath) === false) {
 				initFramework();
 				if (Repository::create($storagePath)) {
@@ -70,7 +70,7 @@ 
 					$repository->init();
 					$this->repository = $repository;
 				} else {
-					throw new \Exception('Could not create repository directory: ' . $storagePath);
+					throw new \Exception('Could not create repository directory: '.$storagePath);
 				}
 			} else {
 				$this->repository = new Repository($storagePath);
@@ -233,7 +233,7 @@ 
 		 */
 		public function getDocumentBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 
 			return $this->repository->getDocumentByPath($path);
 		}
@@ -243,14 +243,14 @@ 
 		 */
 		public function saveDocument($postValues)
 		{
-			$oldPath = '/' . $postValues['path'];
+			$oldPath = '/'.$postValues['path'];
 
 			$container = $this->getDocumentContainerByPath($oldPath);
 			$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, $this);
 			if ($container->path === '/') {
-				$newPath = $container->path . $documentObject->slug;
+				$newPath = $container->path.$documentObject->slug;
 			} else {
-				$newPath = $container->path . '/' . $documentObject->slug;
+				$newPath = $container->path.'/'.$documentObject->slug;
 			}
 			$documentObject->path = $newPath;
 			$this->repository->saveDocument($documentObject);
@@ -260,9 +260,9 @@ 
 		{
 			$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, $this);
 			if ($postValues['path'] === '/') {
-				$documentObject->path = $postValues['path'] . $documentObject->slug;
+				$documentObject->path = $postValues['path'].$documentObject->slug;
 			} else {
-				$documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
+				$documentObject->path = $postValues['path'].'/'.$documentObject->slug;
 			}
 
 			$this->repository->saveDocument($documentObject);
@@ -270,7 +270,7 @@ 
 
 		public function deleteDocumentBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -285,9 +285,9 @@ 
 		{
 			$documentFolderObject = DocumentFolderFactory::createDocumentFolderFromPostValues($postValues);
 			if ($postValues['path'] === '/') {
-				$documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+				$documentFolderObject->path = $postValues['path'].$documentFolderObject->slug;
 			} else {
-				$documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+				$documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug;
 			}
 			$this->repository->saveDocument($documentFolderObject);
 		}
@@ -301,7 +301,7 @@ 
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -315,7 +315,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 
 			return $this->repository->getDocumentByPath($path);
 		}

cloudcontrol/library/storage/storage/FilesStorage.php

Spacing +5 added lines, -5 removed lines

@@ -25,13 +25,13 @@ 
 	 */
 	public function addFile($postValues)
 	{
-		$destinationPath = realpath(__DIR__ . '/../../../www/files/');
+		$destinationPath = realpath(__DIR__.'/../../../www/files/');
 
 		$filename = $this->validateFilename($postValues['name'], $destinationPath);
-		$destination = $destinationPath . '/' . $filename;
+		$destination = $destinationPath.'/'.$filename;
 
 		if ($postValues['error'] != '0') {
-			throw new \Exception('Error uploading file. Error code: ' . $postValues['error']);
+			throw new \Exception('Error uploading file. Error code: '.$postValues['error']);
 		}
 
 		if (move_uploaded_file($postValues['tmp_name'], $destination)) {
@@ -73,8 +73,8 @@ 
 	 */
 	public function deleteFileByName($filename)
 	{
-		$destinationPath = realpath(__DIR__ . '/../../../www/files/');
-		$destination = $destinationPath . '/' . $filename;
+		$destinationPath = realpath(__DIR__.'/../../../www/files/');
+		$destination = $destinationPath.'/'.$filename;
 
 		if (file_exists($destination)) {
 			$files = $this->getFiles();