jenskooij / cloudcontrol

cloudcontrol/library/cc/Application.php

Doc Comments +2 added lines, -2 removed lines

@@ -88,7 +88,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)
 		{
@@ -150,7 +150,7 @@ 
 		 * @param string $template
 		 * @param array  $parameters
 		 *
-		 * @return mixed
+		 * @return Component
 		 * @throws \Exception
 		 */
 		private function getComponentObject($class='', $template='', $parameters=array(), $matchedSitemapItem)

Spacing +8 added lines, -8 removed lines

@@ -65,12 +65,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);
 			}
 		}
 
@@ -93,7 +93,7 @@ 
 		private function sitemapMatching($request)
 		{
 			$sitemap = $this->storage->getSitemap();
-			$relativeUri = '/' . $request::$relativeUri;
+			$relativeUri = '/'.$request::$relativeUri;
 
 			foreach ($sitemap as $sitemapItem) {
 				if ($sitemapItem->regex) {
@@ -156,17 +156,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 (\autoLoad($libraryComponentName, false)) {
 				$component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
 			} elseif (\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) {
@@ -225,7 +225,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/components/DocumentComponent.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
 					if (isset($this->parameters['document'])) {
 						$this->parameters[$this->documentParameterName] = $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 {
 					if (isset($this->parameters['document'])) {
@@ -45,9 +45,9 @@ 
 						$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);

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;
@@ -67,7 +67,7 @@ 
 		 *
 		 * @throws \Exception
 		 */
-		public function render($application=null)
+		public function render($application = null)
 		{
 			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
 		}
@@ -93,9 +93,9 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
-			$templatePath = __DIR__ . '/../../templates/' . $template . '.php';
+			$templatePath = __DIR__.'/../../templates/'.$template.'.php';
 			if (realpath($templatePath) !== false) {
 				if ($obClean) {
 					ob_clean();
@@ -112,7 +112,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);
 				}
 			}
 		}
@@ -127,7 +127,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) {