jenskooij / cloudcontrol

cloudcontrol/library/storage/JsonStorage.php

Spacing +31 added lines, -31 removed lines

@@ -33,7 +33,7 @@ 
 		 */
 		private function config()
 		{
-			$storagePath = __DIR__ . $this->storagePath;
+			$storagePath = __DIR__.$this->storagePath;
 			if (realpath($storagePath) !== false) {
 				$jsonString = file_get_contents($storagePath);
 				$this->repository = json_decode($jsonString);
@@ -189,7 +189,7 @@ 
 		 */
 		public function getDocumentBySlug($slug)
 		{
-			$documentContainer = $this->getDocumentContainerByPath('/' . $slug);
+			$documentContainer = $this->getDocumentContainerByPath('/'.$slug);
 			$indices = $documentContainer['indices'];
 
 			if ($indices === null) {
@@ -234,7 +234,7 @@ 
 				// Check for duplicates
 				foreach ($this->repository->documents as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'document') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[end($indices)] = $documentFolderObject;
@@ -242,10 +242,10 @@ 
 				// Check for duplicates
 				foreach ($previousFolder->content as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'document') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
-				$previousFolder->content[end($indices)] = $documentFolderObject ;
+				$previousFolder->content[end($indices)] = $documentFolderObject;
 			}
 
 			$this->save();
@@ -259,7 +259,7 @@ 
 				foreach ($this->repository->documents as $document) {
 					if ($document->slug == $documentFolderObject->slug && $document->type == 'document') {
 						// TODO make it so it doesnt throw an exception, but instead shows a warning
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[] = $documentFolderObject;
@@ -270,7 +270,7 @@ 
 					foreach ($containerFolder->content as $document) {
 						if ($document->slug == $documentFolderObject->slug && $document->type == 'document') {
 							// TODO make it so it doesnt throw an exception, but instead shows a warning
-							throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+							throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 						}
 					}
 				}
@@ -385,7 +385,7 @@ 
 				foreach ($this->repository->documents as $document) {
 					if ($document->slug == $documentFolderObject->slug && $document->type == 'folder') {
 						// TODO make it so it doesnt throw an exception, but instead shows a warning
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[] = $documentFolderObject;
@@ -406,7 +406,7 @@ 
 				foreach ($containerFolder->content as $document) {
 					if ($document->slug == $documentFolderObject->slug && $document->type == 'folder') {
 						// TODO make it so it doesnt throw an exception, but instead shows a warning
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$folder->content[] = $documentFolderObject;
@@ -458,7 +458,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-			$documentContainer = $this->getDocumentContainerByPath('/' . $slug);
+			$documentContainer = $this->getDocumentContainerByPath('/'.$slug);
 			$indices = $documentContainer['indices'];
 
 			$folder = $this->repository->documents;
@@ -502,7 +502,7 @@ 
 				// Check for duplicates
 				foreach ($this->repository->documents as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'folder') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
 				$this->repository->documents[end($indices)] = $documentFolderObject;
@@ -510,10 +510,10 @@ 
 				// Check for duplicates
 				foreach ($previousFolder->content as $index => $document) {
 					if (end($indices) !== $index && $document->slug == $documentFolderObject->slug && $document->type == 'folder') {
-						throw new \Exception('Duplicate slug: ' . $document->slug . ' in folder ' . $postValues['path']);
+						throw new \Exception('Duplicate slug: '.$document->slug.' in folder '.$postValues['path']);
 					}
 				}
-				$previousFolder->content[end($indices)] = $documentFolderObject ;
+				$previousFolder->content[end($indices)] = $documentFolderObject;
 			}
 
 			$this->save();
@@ -583,7 +583,7 @@ 
 					'previousDocument' => $previousDocument
 				);
 			} else {
-				throw new \Exception('Invalid path: ' . $path);
+				throw new \Exception('Invalid path: '.$path);
 			}
 		}
 
@@ -768,13 +768,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)) {
@@ -796,14 +796,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 {
@@ -845,7 +845,7 @@ 
 		 */
 		public function getFiles()
 		{
-			$files =  $this->repository->files;
+			$files = $this->repository->files;
 			usort($files, array($this, 'compareFiles'));
 			return $files;
 		}
@@ -857,13 +857,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)) {
@@ -887,23 +887,23 @@ 
 				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';
 				}
-				return $this->validateFilename($filename,$path);
+				return $this->validateFilename($filename, $path);
 			}
 			return $filename;
 		}
@@ -929,8 +929,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();
@@ -1226,11 +1226,11 @@ 
 		 * @throws \Exception
 		 */
 		private function save() {
-			$storagePath = __DIR__ . $this->storagePath;
+			$storagePath = __DIR__.$this->storagePath;
 			if (realpath($storagePath) !== false) {
 				file_put_contents($storagePath, json_encode($this->repository));
 			} else {
-				throw new \Exception('Couldnt find storagePath ' . $storagePath);
+				throw new \Exception('Couldnt find storagePath '.$storagePath);
 			}
 		}
 

cloudcontrol/library/components/DocumentComponent.php

Spacing +3 added lines, -3 removed lines

@@ -20,15 +20,15 @@
 				if (isset($this->parameters['document'])) {
 					$this->parameters['document'] = $storage->getDocumentBySlug($this->parameters['document']);
 				} else {
-					throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: ' . $this->matchedSitemapItem->title);
+					throw new \Exception('When not using a regex, you need to set the parameter `document` with the path to the document in this sitemap item: '.$this->matchedSitemapItem->title);
 				}
 			} else {
 				$relativeDocumentUri = current($this->matchedSitemapItem->matches[1]);
 				if (isset($this->parameters['folder'])) {
 					if (substr($this->parameters['folder'], -1) !== '/') {
-						$this->parameters['folder'] = $this->parameters['folder'] . '/';
+						$this->parameters['folder'] = $this->parameters['folder'].'/';
 					}
-					$relativeDocumentUri = $this->parameters['folder'] . $relativeDocumentUri;
+					$relativeDocumentUri = $this->parameters['folder'].$relativeDocumentUri;
 				}
 
 				$document = $storage->getDocumentBySlug($relativeDocumentUri);