jenskooij / cloudcontrol

cloudcontrol/library/cc/Application.php

Spacing +7 added lines, -7 removed lines

@@ -63,7 +63,7 @@ 
 		 */
 		private function config()
 		{
-			$configPath = __DIR__ . '/../../config.json';
+			$configPath = __DIR__.'/../../config.json';
 			if (realpath($configPath) !== false) {
 				$json = file_get_contents($configPath);
 				$this->config = json_decode($json);
@@ -90,7 +90,7 @@ 
 		private function sitemapMatching($request)
 		{
 			$sitemap = $this->storage->getSitemap()->getSitemap();
-			$relativeUri = '/' . $request::$relativeUri;
+			$relativeUri = '/'.$request::$relativeUri;
 
 			foreach ($sitemap as $sitemapItem) {
 				if ($sitemapItem->regex) {
@@ -153,17 +153,17 @@ 
 		 * @return mixed
 		 * @throws \Exception
 		 */
-		private function getComponentObject($class='', $template='', $parameters=array(), $matchedSitemapItem)
+		private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
 		{
-			$libraryComponentName = '\\library\\components\\' . $class;
-			$userComponentName = '\\components\\' . $class;
+			$libraryComponentName = '\\library\\components\\'.$class;
+			$userComponentName = '\\components\\'.$class;
 
 			if (AutoloadUtil::autoLoad($libraryComponentName, false)) {
 				$component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} elseif (AutoloadUtil::autoLoad($userComponentName, false)) {
 				$component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} else {
-				throw new \Exception('Could not load component ' . $class);
+				throw new \Exception('Could not load component '.$class);
 			}
 			
 			if (!$component instanceof Component) {
@@ -222,7 +222,7 @@ 
 		public function setCachingHeaders()
 		{
 			header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
-			header("Cache-Control: max-age=" . (60 * 60 * 24 * 2));
+			header("Cache-Control: max-age=".(60 * 60 * 24 * 2));
 		}
 
 		/**

cloudcontrol/library/storage/Storage.php

Doc Comments +2 added lines, -2 removed lines

@@ -330,7 +330,7 @@ 
 		/**
 		 * Convert path to indeces
 		 *
-		 * @param $path
+		 * @param string $path
 		 *
 		 * @return array
 		 * @throws \Exception
@@ -583,7 +583,7 @@ 
 		 *
 		 */
 		/**
-		 * @return array
+		 * @return \stdClass[]
 		 */
 		public function getBricks()
 		{

Spacing +18 added lines, -18 removed lines

@@ -57,7 +57,7 @@ 
 		 */
 		private function config()
 		{
-			$storagePath = __DIR__ . '/../../' . $this->storageDir;
+			$storagePath = __DIR__.'/../../'.$this->storageDir;
 			if (realpath($storagePath) === false) {
 				initFramework();
 				if (Repository::create($storagePath)) {
@@ -65,7 +65,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);
@@ -228,7 +228,7 @@ 
 		 */
 		public function getDocumentBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 
 			return $this->repository->getDocumentByPath($path);
 		}
@@ -238,14 +238,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);
@@ -255,9 +255,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);
@@ -265,7 +265,7 @@ 
 
 		public function deleteDocumentBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -280,9 +280,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);
 		}
@@ -296,7 +296,7 @@ 
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -310,7 +310,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 
 			return $this->repository->getDocumentByPath($path);
 		}
@@ -407,13 +407,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)) {
@@ -455,8 +455,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();

cloudcontrol/library/components/cms/configuration/ImageSetRouting.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 		$imageSet = $cmsComponent->storage->getImageSet()->getImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getImageSet()->saveImageSet($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_IMAGE_SET, $imageSet);
@@ -72,7 +72,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_CONFIGURATION);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getImageSet()->addImageSet($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 			exit;
 		}
 	}
@@ -84,7 +84,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getImageSet()->deleteImageSetBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/image-set');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/image-set');
 		exit;
 	}
 }
\ No newline at end of file

cloudcontrol/library/storage/storage/Storage.php

Spacing +3 added lines, -3 removed lines

@@ -35,19 +35,19 @@
 			array_pop($fileParts);
 			$fileNameWithoutExtension = implode('-', $fileParts);
 			$fileNameWithoutExtension = slugify($fileNameWithoutExtension);
-			$filename = $fileNameWithoutExtension . '.' . $extension;
+			$filename = $fileNameWithoutExtension.'.'.$extension;
 		} else {
 			$filename = slugify($filename);
 		}
 
-		if (file_exists($path . '/' . $filename)) {
+		if (file_exists($path.'/'.$filename)) {
 			$fileParts = explode('.', $filename);
 			if (count($fileParts) > 1) {
 				$extension = end($fileParts);
 				array_pop($fileParts);
 				$fileNameWithoutExtension = implode('-', $fileParts);
 				$fileNameWithoutExtension .= '-copy';
-				$filename = $fileNameWithoutExtension . '.' . $extension;
+				$filename = $fileNameWithoutExtension.'.'.$extension;
 			} else {
 				$filename .= '-copy';
 			}

cloudcontrol/library/storage/storage/ImagesStorage.php

Spacing +5 added lines, -5 removed lines

@@ -33,13 +33,13 @@ 
 	 */
 	public function addImage($postValues)
 	{
-		$destinationPath = realpath(__DIR__ . '/../../../www/images/');
+		$destinationPath = realpath(__DIR__.'/../../../www/images/');
 
 		$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)) {
@@ -64,14 +64,14 @@ 
 	 */
 	public function deleteImageByName($filename)
 	{
-		$destinationPath = realpath(__DIR__ . '/../../../www/images/');
+		$destinationPath = realpath(__DIR__.'/../../../www/images/');
 
 		$images = $this->getImages();
 
 		foreach ($images as $key => $image) {
 			if ($image->file == $filename) {
 				foreach ($image->set as $imageSetFilename) {
-					$destination = $destinationPath . '/' . $imageSetFilename;
+					$destination = $destinationPath.'/'.$imageSetFilename;
 					if (file_exists($destination)) {
 						unlink($destination);
 					} else {