jenskooij / cloudcontrol

cloudcontrol/library/storage/Repository.php

Spacing +33 added lines, -33 removed lines

@@ -105,13 +105,13 @@ 
             if (in_array($name, $this->fileBasedSubsets)) {
                 return $this->$name;
             } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
             }
         } else {
             if (in_array($name, $this->fileBasedSubsets)) {
                 return $this->loadSubset($name);
             } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
             }
         }
     }
@@ -126,10 +126,10 @@ 
     {
         if (in_array($name, $this->fileBasedSubsets)) {
             $this->$name = $value;
-            $changes = $name . 'Changes';
+            $changes = $name.'Changes';
             $this->$changes = true;
         } else {
-            throw new \Exception('Trying to persist unknown subset in repository: ' . $name . ' <br /><pre>' . print_r($value, true) . '</pre>');
+            throw new \Exception('Trying to persist unknown subset in repository: '.$name.' <br /><pre>'.print_r($value, true).'</pre>');
         }
     }
 
@@ -155,9 +155,9 @@ 
     protected function saveSubset($subset)
     {
         $json = json_encode($this->$subset, JSON_PRETTY_PRINT);
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
         file_put_contents($subsetStoragePath, $json);
-        $changes = $subset . 'Changes';
+        $changes = $subset.'Changes';
         $this->$changes = false;
     }
 
@@ -168,7 +168,7 @@ 
      */
     protected function loadSubset($subset)
     {
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
         $json = file_get_contents($subsetStoragePath);
         $json = json_decode($json);
         $this->$subset = $json;
@@ -216,7 +216,7 @@ 
     public function getContentDbHandle()
     {
         if ($this->contentDbHandle === null) {
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
+            $this->contentDbHandle = new \PDO('sqlite:'.$this->storagePath.DIRECTORY_SEPARATOR.'content.db');
         }
         return $this->contentDbHandle;
     }
@@ -239,14 +239,14 @@ 
     public function getDocumentsByPath($folderPath)
     {
         $db = $this->getContentDbHandle();
-        $folderPathWithWildcard = $folderPath . '%';
+        $folderPathWithWildcard = $folderPath.'%';
 
         $stmt = $this->getDbStatement('
             SELECT *
               FROM documents
-             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
-               AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%"
-               AND path != ' . $db->quote($folderPath) . '
+             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard).'
+               AND substr(`path`, ' . (strlen($folderPath) + 1).') NOT LIKE "%/%"
+               AND path != ' . $db->quote($folderPath).'
           ORDER BY `type` DESC, `path` ASC
         ');
 
@@ -290,7 +290,7 @@ 
         $document = $this->fetchDocument('
             SELECT *
               FROM documents
-             WHERE path = ' . $db->quote($path) . '
+             WHERE path = ' . $db->quote($path).'
         ');
         if ($document instanceof Document && $document->type === 'folder') {
             $document->dbHandle = $db;
@@ -310,7 +310,7 @@ 
 			  FROM documents
 		');
 		$result = $stmt->fetch(\PDO::FETCH_ASSOC);
-		if (!is_array($result )) {
+		if (!is_array($result)) {
 			return 0;
 		}
 		return intval(current($result));
@@ -353,7 +353,7 @@ 
         if ($stmt === false) {
             $errorInfo = $db->errorInfo();
             $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+            throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
         }
         return $stmt;
     }
@@ -383,19 +383,19 @@ 
         $stmt = $this->getDbStatement('
             INSERT OR REPLACE INTO documents (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
             VALUES(
-              ' . $db->quote($documentObject->path) . ',
-              ' . $db->quote($documentObject->title) . ',
-              ' . $db->quote($documentObject->slug) . ',
-              ' . $db->quote($documentObject->type) . ',
-              ' . $db->quote($documentObject->documentType) . ',
-              ' . $db->quote($documentObject->documentTypeSlug) . ',
-              ' . $db->quote($documentObject->state) . ',
-              ' . $db->quote($documentObject->lastModificationDate) . ',
-              ' . $db->quote($documentObject->creationDate) . ',
-              ' . $db->quote($documentObject->lastModifiedBy) . ',
-              ' . $db->quote(json_encode($documentObject->fields)) . ',
-              ' . $db->quote(json_encode($documentObject->bricks)) . ',
-              ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
+              ' . $db->quote($documentObject->path).',
+              ' . $db->quote($documentObject->title).',
+              ' . $db->quote($documentObject->slug).',
+              ' . $db->quote($documentObject->type).',
+              ' . $db->quote($documentObject->documentType).',
+              ' . $db->quote($documentObject->documentTypeSlug).',
+              ' . $db->quote($documentObject->state).',
+              ' . $db->quote($documentObject->lastModificationDate).',
+              ' . $db->quote($documentObject->creationDate).',
+              ' . $db->quote($documentObject->lastModifiedBy).',
+              ' . $db->quote(json_encode($documentObject->fields)).',
+              ' . $db->quote(json_encode($documentObject->bricks)).',
+              ' . $db->quote(json_encode($documentObject->dynamicBricks)).'
             )
         ');
         $result = $stmt->execute();
@@ -416,16 +416,16 @@ 
             if ($documentToDelete->type == 'document') {
                 $stmt = $this->getDbStatement('
                     DELETE FROM documents
-                          WHERE path = ' . $db->quote($path) . '
+                          WHERE path = ' . $db->quote($path).'
                 ');
                 $stmt->execute();
             } elseif ($documentToDelete->type == 'folder') {
-                $folderPathWithWildcard = $path . '%';
+                $folderPathWithWildcard = $path.'%';
                 $stmt = $this->getDbStatement('
                     DELETE FROM documents
-                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . '
-                            AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/")
-                            OR path = ' . $db->quote($path) . '
+                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard).'
+                            AND substr(`path`, ' . (strlen($path) + 1).', 1) = "/")
+                            OR path = ' . $db->quote($path).'
                 ');
                 $stmt->execute();
             }

cloudcontrol/library/cc/AutoloadUtil.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 		}
 
 		global $rootPath;
-		$file = $rootPath . str_replace('\\', '/', $class) . ".php";
+		$file = $rootPath.str_replace('\\', '/', $class).".php";
 
 		if (file_exists($file)) {
 			return self::loadClassInExistingFile($class, $throwException, $file);
@@ -60,7 +60,7 @@ 
 		require_once($file);
 		if ($throwException) {
 			if (class_exists($class, false) === false && interface_exists($class, false) === false) {
-				throw new \Exception('Could not load class "' . $class . '" in file ' . $file);
+				throw new \Exception('Could not load class "'.$class.'" in file '.$file);
 			} else {
 				return true;
 			}
@@ -81,7 +81,7 @@ 
 	private static function handleUnloadableClassWithBacktrace($class, $throwException, $rootPath, $file, $debug_backtrace)
 	{
 		if ($throwException) {
-			errorHandler(0, 'Could not load class \'' . $class . '\' in file ' . $rootPath . $file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
+			errorHandler(0, 'Could not load class \''.$class.'\' in file '.$rootPath.$file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
 		} else {
 			return false;
 		}
@@ -98,7 +98,7 @@ 
 	private static function handleUnloadableClassWithoutBacktrace($class, $throwException, $file)
 	{
 		if ($throwException) {
-			throw new \Exception('Could not load class "' . $class . '" in file ' . $file . "\n" . 'Called from unknown origin.');
+			throw new \Exception('Could not load class "'.$class.'" in file '.$file."\n".'Called from unknown origin.');
 		} else {
 			return false;
 		}

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);
@@ -92,7 +92,7 @@ 
 		private function sitemapMatching($request)
 		{
 			$sitemap = $this->storage->getSitemap();
-			$relativeUri = '/' . $request::$relativeUri;
+			$relativeUri = '/'.$request::$relativeUri;
 
 			foreach ($sitemap as $sitemapItem) {
 				if ($sitemapItem->regex) {
@@ -155,17 +155,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) {
@@ -224,7 +224,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/cc/ErrorHandlingUtil.php

Spacing +18 added lines, -18 removed lines

@@ -43,25 +43,25 @@ 
 		$errstr = '';
 		switch ($jsonErrorNr) {
 			case JSON_ERROR_NONE:
-				$errstr .= ' - No errors' . PHP_EOL;
+				$errstr .= ' - No errors'.PHP_EOL;
 				break;
 			case JSON_ERROR_DEPTH:
-				$errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
+				$errstr .= ' - Maximum stack depth exceeded'.PHP_EOL;
 				break;
 			case JSON_ERROR_STATE_MISMATCH:
-				$errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
+				$errstr .= ' - Underflow or the modes mismatch'.PHP_EOL;
 				break;
 			case JSON_ERROR_CTRL_CHAR:
-				$errstr .= ' - Unexpected control character found' . PHP_EOL;
+				$errstr .= ' - Unexpected control character found'.PHP_EOL;
 				break;
 			case JSON_ERROR_SYNTAX:
-				$errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
+				$errstr .= ' - Syntax error, malformed JSON'.PHP_EOL;
 				break;
 			case JSON_ERROR_UTF8:
-				$errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
+				$errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded'.PHP_EOL;
 				break;
 			default:
-				$errstr = ' - Unknown error' . PHP_EOL;
+				$errstr = ' - Unknown error'.PHP_EOL;
 				break;
 		}
 		\errorHandler($jsonErrorNr, $errstr, $file, $line);
@@ -86,7 +86,7 @@ 
 	private static function renderCliException($message, $file, $line, $trace, $lines)
 	{
 		if (ob_get_contents()) ob_end_clean();
-		include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcli.php');
+		include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcli.php');
 		exit;
 	}
 
@@ -98,12 +98,12 @@ 
 	 */
 	private static function dontShowError($message, $file, $line, $httpHeader)
 	{
-		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-		header('X-Error-Message: ' . $message);
-		header('X-Error-File: ' . $file);
-		header('X-Error-Line: ' . $line);
-		if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcompact.php')) {
-			include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcompact.php');
+		header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
+		header('X-Error-Message: '.$message);
+		header('X-Error-File: '.$file);
+		header('X-Error-Line: '.$line);
+		if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcompact.php')) {
+			include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcompact.php');
 		} else {
 			header('Content-type: application/json');
 			die(json_encode('An error occured.'));
@@ -171,11 +171,11 @@ 
 			'httpHeader' => $httpHeader,
 		);
 
-		if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewdetailed.php')) {
-			header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-			include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewdetailed.php');
+		if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewdetailed.php')) {
+			header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
+			include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewdetailed.php');
 		} else {
-			header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+			header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
 			header('Content-type: application/json');
 			die(json_encode($error));
 		}

cloudcontrol/library/cc/autoloader.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'AutoloadUtil.php');
+require_once(__DIR__.DIRECTORY_SEPARATOR.'AutoloadUtil.php');
 spl_autoload_extensions('.php');
 spl_autoload_register("autoloader");
 
-$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
+$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/');
 
 /**
  * The function to be registered as the default autoload function

cloudcontrol/library/cc/errorhandler.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'ErrorHandlingUtil.php');
+require_once(__DIR__.DIRECTORY_SEPARATOR.'ErrorHandlingUtil.php');
 set_exception_handler('exceptionHandler');
 set_error_handler('errorHandler');
 register_shutdown_function('shutdownHandler');
@@ -10,8 +10,8 @@ 
  *
  * @param $e
  */
-function exceptionHandler ($e) {
-	\library\cc\ErrorHandlingUtil::renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace());
+function exceptionHandler($e) {
+	\library\cc\ErrorHandlingUtil::renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace());
 }
 
 /**
@@ -22,18 +22,18 @@ 
  * @param $errfile
  * @param $errline
  */
-function errorHandler ($errno, $errstr, $errfile, $errline) {
-	\library\cc\ErrorHandlingUtil::renderError($errstr,$errfile,$errline,$errno,debug_backtrace());
+function errorHandler($errno, $errstr, $errfile, $errline) {
+	\library\cc\ErrorHandlingUtil::renderError($errstr, $errfile, $errline, $errno, debug_backtrace());
 }
 
 /**
  * When an error occurs that kills the process, still try
  * to show it using a shutdownHandler.
  */
-function shutdownHandler () {
+function shutdownHandler() {
 	$error = error_get_last(); 
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
-		\library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']);
+		\library\cc\ErrorHandlingUtil::renderError($error['message'], $error['file'], $error['line'], $error['type']);
     }elseif ($error['type'] == 1) {
         dump($error);
     }

cloudcontrol/library/components/BaseComponent.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 		 * @param array   $parameters
 		 * @param         $matchedSitemapItem
 		 */
-		public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
+		public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
 		{
 			$this->template = $template;
 			$this->request = $request;
@@ -66,7 +66,7 @@ 
 		 *
 		 * @throws \Exception
 		 */
-		public function render($application=null)
+		public function render($application = null)
 		{
 			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
 		}
@@ -92,9 +92,9 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
-			$templatePath = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
+			$templatePath = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.$template.'.php';
 			if (realpath($templatePath) !== false) {
 				if ($obClean) {
 					ob_clean();
@@ -111,7 +111,7 @@ 
 				return ob_get_contents();
 			} else {
 				if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-					throw new \Exception('Couldnt find template ' . $templatePath);
+					throw new \Exception('Couldnt find template '.$templatePath);
 				}
 			}
 		}
@@ -126,7 +126,7 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function includeTemplate($template='', $parameters = array())
+		public function includeTemplate($template = '', $parameters = array())
 		{
 			if (is_array($parameters)) {
 				foreach ($parameters as $name => $value) {