jenskooij / cloudcontrol

library/cc/Application.php

Doc Comments +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
 		 * Loop through sitemap items and see if one matches the requestUri.
 		 * If it does, add it tot the matchedSitemapItems array
 		 *
-		 * @param $request
+		 * @param Request $request
 		 */
 		private function sitemapMatching($request)
 		{
@@ -146,7 +146,7 @@ 
 		 * @param string $template
 		 * @param array  $parameters
 		 *
-		 * @return mixed
+		 * @return \library\components\Component
 		 * @throws \Exception
 		 */
 		private function getComponentObject($class='', $template='', $parameters=array())

Spacing +7 added lines, -7 removed lines

@@ -61,12 +61,12 @@ 
 		 */
 		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);
 			} else {
-				throw new \Exception('Couldn\'t find config file in path ' . $configPath);
+				throw new \Exception('Couldn\'t find config file in path '.$configPath);
 			}
 		}
 
@@ -89,7 +89,7 @@ 
 		private function sitemapMatching($request)
 		{
 			$sitemap = $this->storage->getSitemap();
-			$relativeUri = '/' . $request::$relativeUri;
+			$relativeUri = '/'.$request::$relativeUri;
 
 			foreach ($sitemap as $sitemapItem) {
 				if ($sitemapItem->regex) {
@@ -149,17 +149,17 @@ 
 		 * @return mixed
 		 * @throws \Exception
 		 */
-		private function getComponentObject($class='', $template='', $parameters=array())
+		private function getComponentObject($class = '', $template = '', $parameters = array())
 		{
-			$libraryComponentName = '\\library\\components\\' . $class;
-			$userComponentName = '\\components\\' . $class;
+			$libraryComponentName = '\\library\\components\\'.$class;
+			$userComponentName = '\\components\\'.$class;
 			
 			if (\autoLoad($libraryComponentName, false)) {
 				$component = new $libraryComponentName($template, $this->request, $parameters);
 			} elseif (\autoLoad($userComponentName, false)) {
 				$component = new $userComponentName($template, $this->request, $parameters);
 			} else {
-				throw new \Exception('Could not load component ' . $class);
+				throw new \Exception('Could not load component '.$class);
 			}
 			
 			if (!$component instanceof \library\components\Component) {

library/cc/cc.php

Doc Comments -1 removed lines

@@ -29,7 +29,6 @@
  * Dumps a var_dump of the passed arguments with <pre> tags surrounding it.
  * Dies afterwards
  *
- * @param mixed $data    The data to be displayed
  */
 function dump()
 {

Spacing +2 added lines, -2 removed lines

@@ -35,13 +35,13 @@
 {
 	$debug_backtrace = current(debug_backtrace());
 	if (PHP_SAPI == 'cli') {
-		echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+		echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
 		foreach (func_get_args() as $data) {
 			var_dump($data);
 		}
 	} else {
 		ob_clean();
-		echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+		echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
 		echo '<pre>';
 		foreach (func_get_args() as $data) {
 			echo "<code>";

library/components/Component.php

Doc Comments +1 added lines

@@ -17,6 +17,7 @@
 		 * @param                     $template
 		 * @param Request $request
 		 * @param                     $parameters
+		 * @return void
 		 */
 		function __construct($template, Request $request, $parameters);
 

library/cc/errorhandler.php

Indentation +34 added lines, -34 removed lines

@@ -31,11 +31,11 @@ 
  */
 function shutdownHandler () {
 	$error = error_get_last(); 
-    if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
-        errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
-    }elseif ($error['type'] == 1) {
-        dump($error);
-    }
+	if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
+		errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
+	}elseif ($error['type'] == 1) {
+		dump($error);
+	}
 }
 
 /**
@@ -49,28 +49,28 @@ 
 	$jsonErrorNr = json_last_error();
 	$errstr = '';
 	switch ($jsonErrorNr) {
-        case JSON_ERROR_NONE:
-            $errstr .= ' - No errors' . PHP_EOL;
-        break;
-        case JSON_ERROR_DEPTH:
-            $errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
-        break;
-        case JSON_ERROR_STATE_MISMATCH:
-            $errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
-        break;
-        case JSON_ERROR_CTRL_CHAR:
-            $errstr .= ' - Unexpected control character found' . PHP_EOL;
-        break;
-        case JSON_ERROR_SYNTAX:
-            $errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
-        break;
-        case JSON_ERROR_UTF8:
-            $errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
-        break;
-        default:
-            $errstr = ' - Unknown error' . PHP_EOL;
-        break;
-    }
+		case JSON_ERROR_NONE:
+			$errstr .= ' - No errors' . PHP_EOL;
+		break;
+		case JSON_ERROR_DEPTH:
+			$errstr .= ' - Maximum stack depth exceeded' . PHP_EOL;
+		break;
+		case JSON_ERROR_STATE_MISMATCH:
+			$errstr .= ' - Underflow or the modes mismatch' . PHP_EOL;
+		break;
+		case JSON_ERROR_CTRL_CHAR:
+			$errstr .= ' - Unexpected control character found' . PHP_EOL;
+		break;
+		case JSON_ERROR_SYNTAX:
+			$errstr .= ' - Syntax error, malformed JSON' . PHP_EOL;
+		break;
+		case JSON_ERROR_UTF8:
+			$errstr .= ' - Malformed UTF-8 characters, possibly incorrectly encoded' . PHP_EOL;
+		break;
+		default:
+			$errstr = ' - Unknown error' . PHP_EOL;
+		break;
+	}
 	errorHandler ($jsonErrorNr, $errstr, $file, $line);
 }
 
@@ -86,14 +86,14 @@ 
  */
 function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
 	$file_lines = file_exists($file) ? file($file) : array();
-    $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
-    $lines = array();
+	$range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
+	$lines = array();
 
-    foreach ($range as $line_number) {
-        if(isset($file_lines[$line_number-1])) {
-            $lines[$line_number] = $file_lines[$line_number-1];
-        }
-    }
+	foreach ($range as $line_number) {
+		if(isset($file_lines[$line_number-1])) {
+			$lines[$line_number] = $file_lines[$line_number-1];
+		}
+	}
 	if (ob_get_contents()) ob_end_clean();
 	$error = array(
 		'message' 		=> $message,

Spacing +19 added lines, -19 removed lines

@@ -9,8 +9,8 @@ 
  *
  * @param $e
  */
-function exceptionHandler ($e) {
-	renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace());
+function exceptionHandler($e) {
+	renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace());
 }
 
 /**
@@ -21,18 +21,18 @@ 
  * @param $errfile
  * @param $errline
  */
-function errorHandler ($errno, $errstr, $errfile, $errline) {
-	renderError($errstr,$errfile,$errline,$errno,debug_backtrace());
+function errorHandler($errno, $errstr, $errfile, $errline) {
+	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'])) { 
-        errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
+        errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
     }elseif ($error['type'] == 1) {
         dump($error);
     }
@@ -50,28 +50,28 @@ 
 	$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);
+	errorHandler($jsonErrorNr, $errstr, $file, $line);
 }
 
 /**
@@ -84,14 +84,14 @@ 
  * @param array  $trace
  * @param string $httpHeader
  */
-function renderError ($message='', $file='', $line='', $code=0, $trace=array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
+function renderError($message = '', $file = '', $line = '', $code = 0, $trace = array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error') {
 	$file_lines = file_exists($file) ? file($file) : array();
     $range = ($line - 15) < 0 ? range(1, 30) : range($line - 15, $line + 15);
     $lines = array();
 
     foreach ($range as $line_number) {
-        if(isset($file_lines[$line_number-1])) {
-            $lines[$line_number] = $file_lines[$line_number-1];
+        if (isset($file_lines[$line_number - 1])) {
+            $lines[$line_number] = $file_lines[$line_number - 1];
         }
     }
 	if (ob_get_contents()) ob_end_clean();
@@ -104,8 +104,8 @@ 
 		'trace' 		=> $trace,
 		'httpHeader' 	=> $httpHeader,
 	);
-	if (file_exists(realpath(__DIR__) . '/errorview.php')) {
-		include(realpath(__DIR__) . '/errorview.php');
+	if (file_exists(realpath(__DIR__).'/errorview.php')) {
+		include(realpath(__DIR__).'/errorview.php');
 	} else {
 		header('Content-type: application/json');
 		die(json_encode($error));

Braces +4 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	$error = error_get_last(); 
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
         errorHandler($error['type'],$error['message'],$error['file'],$error['line']);
-    }elseif ($error['type'] == 1) {
+    } elseif ($error['type'] == 1) {
         dump($error);
     }
 }
@@ -94,7 +94,9 @@ 
             $lines[$line_number] = $file_lines[$line_number-1];
         }
     }
-	if (ob_get_contents()) ob_end_clean();
+	if (ob_get_contents()) {
+		ob_end_clean();
+	}
 	$error = array(
 		'message' 		=> $message,
 		'file' 			=> $file,

library/cc/Request.php

Spacing +2 added lines, -2 removed lines

@@ -47,10 +47,10 @@
 		{
 			global $rootPath;
 			
-			self::$subfolders = '/' . str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
+			self::$subfolders = '/'.str_replace('//', '/', str_replace(str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']), "", $rootPath));
 			self::$requestUri = $_SERVER['REQUEST_URI'];
 			self::$queryString = $_SERVER['QUERY_STRING'];
-			self::$relativeUri = str_replace('?' . self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
+			self::$relativeUri = str_replace('?'.self::$queryString, '', str_replace(self::$subfolders, '', self::$requestUri));
 			self::$requestParameters = explode('/', self::$relativeUri);
 			
 			self::$get = $_GET;

library/cc/autoloader.php

Spacing +5 added lines, -5 removed lines

@@ -2,7 +2,7 @@ 
 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 functino
@@ -32,14 +32,14 @@ 
 	}
 	
 	global $rootPath;
-	$file = $rootPath . str_replace('\\', '/', $class) . ".php";
+	$file = $rootPath.str_replace('\\', '/', $class).".php";
 	$debug_backtrace = debug_backtrace();
 	
 	if (file_exists($file)) {
 		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;
 			}
@@ -48,13 +48,13 @@ 
 	} else {
 		if (isset($debug_backtrace[2]) && isset($debug_backtrace[2]['file']) && isset($debug_backtrace[2]['line'])) {			
 			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;
 			}			
 		} else {
 			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;
 			}

library/storage/JsonStorage.php

Spacing +7 added lines, -7 removed lines

@@ -18,12 +18,12 @@ 
 		
 		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);
 			} else {
-				throw new \Exception('Couldnt find storagePath ' . $storagePath);
+				throw new \Exception('Couldnt find storagePath '.$storagePath);
 			}
 		}
 		
@@ -320,17 +320,17 @@ 
 		 *
 		 */
 		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);
 			}
 		}
 		
-		private function slugify($str, $replace=array(), $delimiter='-') {
-			if( !empty($replace) ) {
-				$str = str_replace((array)$replace, ' ', $str);
+		private function slugify($str, $replace = array(), $delimiter = '-') {
+			if (!empty($replace)) {
+				$str = str_replace((array) $replace, ' ', $str);
 			}
 
 			$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);

library/components/CmsComponent.php

Spacing +12 added lines, -12 removed lines

@@ -71,7 +71,7 @@ 
 		 */
 		protected function showLogin()
 		{
-			$loginTemplatePath = __DIR__ . '../../../templates/cms/login.php';
+			$loginTemplatePath = __DIR__.'../../../templates/cms/login.php';
 			if (realpath($loginTemplatePath) !== false) {
 				ob_clean();
 				extract($this->parameters);
@@ -79,7 +79,7 @@ 
 				ob_end_flush();
 				exit;
 			} else {
-				throw new \Exception('Cannot load login template ' . $loginTemplatePath);
+				throw new \Exception('Cannot load login template '.$loginTemplatePath);
 			}
 		}
 
@@ -114,7 +114,7 @@ 
 				$this->parameters['mainNavClass'] = 'sitemap';
 				if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) {
 					$this->storage->addSitemapItem($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/sitemap/edit' && isset($request::$get['slug'])) {
@@ -123,13 +123,13 @@ 
 				$sitemapItem = $this->storage->getSitemapItemBySlug($request::$get['slug']);
 				if (isset($request::$post['title'], $request::$post['template'], $request::$post['component'])) {
 					$this->storage->saveSitemapItem($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 					exit;
 				}
 				$this->parameters['sitemapItem'] = $sitemapItem;
 			} elseif ($relativeCmsUri == '/sitemap/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteSitemapItemBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/sitemap');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/sitemap');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration') {
 				$template = 'cms/configuration';
@@ -144,7 +144,7 @@ 
 				$bricks = $this->storage->getBricks();
 				if (isset($request::$post['title'])) {
 					$this->storage->addDocumentType($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 					exit;
 				}
 				$this->parameters['bricks'] = $bricks;
@@ -155,14 +155,14 @@ 
 				$bricks = $this->storage->getBricks();
 				if (isset($request::$post['title'])) {
 					$this->storage->saveDocumentType($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 					exit;
 				}
 				$this->parameters['documentType'] = $documentType;
 				$this->parameters['bricks'] = $bricks;
 			} elseif ($relativeCmsUri == '/configuration/document-types/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteDocumentTypeBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/document-types');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/document-types');
 				exit;
 			} elseif ($relativeCmsUri == '/configuration/bricks') {
 				$template = 'cms/configuration/bricks';
@@ -173,7 +173,7 @@ 
 				$this->parameters['mainNavClass'] = 'configuration';
 				if (isset($request::$post['title'])) {
 					$this->storage->addBrick($request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 					exit;
 				}
 			} elseif ($relativeCmsUri == '/configuration/bricks/edit' && isset($request::$get['slug'])) {
@@ -182,18 +182,18 @@ 
 				$brick = $this->storage->getBrickBySlug($request::$get['slug']);
 				if (isset($request::$post['title'])) {
 					$this->storage->saveBrick($request::$get['slug'], $request::$post);
-					header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+					header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 					exit;
 				}
 				$this->parameters['brick'] = $brick;
 			} elseif ($relativeCmsUri == '/configuration/bricks/delete' && isset($request::$get['slug'])) {
 				$this->storage->deleteBrickBySlug($request::$get['slug']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix'] . '/configuration/bricks');
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix'].'/configuration/bricks');
 				exit;
 			} elseif ($relativeCmsUri == '/log-off') {
 				$_SESSION['cloudcontrol'] = null;
 				unset($_SESSION['cloudcontrol']);
-				header('Location: ' . $request::$subfolders . $this->parameters['cmsPrefix']);
+				header('Location: '.$request::$subfolders.$this->parameters['cmsPrefix']);
 				exit;
 			}
 

library/components/BaseComponent.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
 		 * @param Request $request
 		 * @param array               $parameters
 		 */
-		public function __construct($template='', Request $request, $parameters=array())
+		public function __construct($template = '', Request $request, $parameters = array())
 		{
 			$this->template = $template;
 			$this->request = $request;
@@ -80,16 +80,16 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='')
+		public function renderTemplate($template = '')
 		{
-			$templatePath = __DIR__ . '../../../templates/' . $template . '.php';
+			$templatePath = __DIR__.'../../../templates/'.$template.'.php';
 			if (realpath($templatePath) !== false) {
 				ob_clean();
 				extract($this->parameters);
 				include($templatePath);
 				return ob_get_contents();
 			} else {
-				throw new \Exception('Couldnt find template ' . $templatePath);
+				throw new \Exception('Couldnt find template '.$templatePath);
 			}
 		}
 	}