jenskooij / cloudcontrol

src/storage/Document.php

Indentation +56 added lines, -56 removed lines

@@ -20,60 +20,60 @@ 
  */
 class Document
 {
-    public $id;
-    public $path;
-    public $title;
-    public $slug;
-    public $type;
-    public $documentType;
-    public $documentTypeSlug;
-    public $state;
-    public $lastModificationDate;
-    public $creationDate;
-    public $lastModifiedBy;
-    protected $fields;
-    protected $bricks;
-    protected $dynamicBricks;
-    protected $content;
+	public $id;
+	public $path;
+	public $title;
+	public $slug;
+	public $type;
+	public $documentType;
+	public $documentTypeSlug;
+	public $state;
+	public $lastModificationDate;
+	public $creationDate;
+	public $lastModifiedBy;
+	protected $fields;
+	protected $bricks;
+	protected $dynamicBricks;
+	protected $content;
 
-    protected $dbHandle;
+	protected $dbHandle;
 
-    protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks');
-    protected $orderableFields = array('title', 'slug', 'type', 'documentType', 'documentTypeSlug', 'state', 'lastModificationDate', 'creationDate', 'lastModifiedBy');
+	protected $jsonEncodedFields = array('fields', 'bricks', 'dynamicBricks');
+	protected $orderableFields = array('title', 'slug', 'type', 'documentType', 'documentTypeSlug', 'state', 'lastModificationDate', 'creationDate', 'lastModifiedBy');
 
-    public static $DOCUMENT_STATES = array('published', 'unpublished');
+	public static $DOCUMENT_STATES = array('published', 'unpublished');
 
-    public function __get($name) {
-        if (in_array($name, $this->jsonEncodedFields)) {
-            if (is_string($this->$name)) {
-                return json_decode($this->$name);
-            } else {
-                return $this->$name;
-            }
-        } elseif ($name === 'content') {
-            if ($this->dbHandle === null) {
-                throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
-            } else {
-                if ($this->content === null) {
-                    return $this->getContent();
-                }
-            }
-        } elseif ($name === 'dbHandle') {
-            throw new \Exception('Trying to get protected property repository.');
-        }
-        return $this->$name;
-    }
+	public function __get($name) {
+		if (in_array($name, $this->jsonEncodedFields)) {
+			if (is_string($this->$name)) {
+				return json_decode($this->$name);
+			} else {
+				return $this->$name;
+			}
+		} elseif ($name === 'content') {
+			if ($this->dbHandle === null) {
+				throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
+			} else {
+				if ($this->content === null) {
+					return $this->getContent();
+				}
+			}
+		} elseif ($name === 'dbHandle') {
+			throw new \Exception('Trying to get protected property repository.');
+		}
+		return $this->$name;
+	}
 
-    public function __set($name, $value) {
-        if (in_array($name, $this->jsonEncodedFields)) {
-            $this->$name = json_encode($value);
-        } elseif ($name === 'content') {
-            // Dont do anything for now..
-            return;
-        }
+	public function __set($name, $value) {
+		if (in_array($name, $this->jsonEncodedFields)) {
+			$this->$name = json_encode($value);
+		} elseif ($name === 'content') {
+			// Dont do anything for now..
+			return;
+		}
 
-        $this->$name = $value;
-    }
+		$this->$name = $value;
+	}
 
 	/**
 	 * @param string $orderBy
@@ -82,15 +82,15 @@ 
 	 * @return array
 	 * @throws \Exception
 	 */
-    public function getContent($orderBy = 'title', $order = 'ASC')
-    {
-        if (empty($this->content)) {
-            $docs = $this->documentStorage->getDocumentsWithState($this->path);
-            $this->content = $docs;
-        }
+	public function getContent($orderBy = 'title', $order = 'ASC')
+	{
+		if (empty($this->content)) {
+			$docs = $this->documentStorage->getDocumentsWithState($this->path);
+			$this->content = $docs;
+		}
 
-    	return $this->content;
-    }
+		return $this->content;
+	}
 
 	/**
 	 * @return string

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
             }
         } elseif ($name === 'content') {
             if ($this->dbHandle === null) {
-                throw new \Exception('Document doesnt have a dbHandle handle. (path: ' . $this->path . ')');
+                throw new \Exception('Document doesnt have a dbHandle handle. (path: '.$this->path.')');
             } else {
                 if ($this->content === null) {
                     return $this->getContent();
@@ -97,7 +97,7 @@ 
 	 */
 	public function __toString()
 	{
-		return 'Document:' . $this->title;
+		return 'Document:'.$this->title;
 	}
 
 

src/storage/factories/RedirectsFactory.php

Indentation +21 added lines, -21 removed lines

@@ -10,26 +10,26 @@
 
 class RedirectsFactory
 {
-    /**
-     * Create a new redirect object from postvalues
-     *
-     * @param $postValues
-     * @return \stdClass
-     * @throws \Exception
-     */
-    public static function createRedirectFromPostValues($postValues)
-    {
-        if (isset($postValues['title'], $postValues['fromUrl'], $postValues['toUrl'])) {
-            $redirectObject = new \stdClass();
-            $redirectObject->title = $postValues['title'];
-            $redirectObject->slug = StringUtil::slugify($postValues['title']);
-            $redirectObject->fromUrl = $postValues['fromUrl'];
-            $redirectObject->toUrl = $postValues['toUrl'];
-            $redirectObject->type = $postValues['type'];
+	/**
+	 * Create a new redirect object from postvalues
+	 *
+	 * @param $postValues
+	 * @return \stdClass
+	 * @throws \Exception
+	 */
+	public static function createRedirectFromPostValues($postValues)
+	{
+		if (isset($postValues['title'], $postValues['fromUrl'], $postValues['toUrl'])) {
+			$redirectObject = new \stdClass();
+			$redirectObject->title = $postValues['title'];
+			$redirectObject->slug = StringUtil::slugify($postValues['title']);
+			$redirectObject->fromUrl = $postValues['fromUrl'];
+			$redirectObject->toUrl = $postValues['toUrl'];
+			$redirectObject->type = $postValues['type'];
 
-            return $redirectObject;
-        } else {
-            throw new \Exception('Trying to create valuelist with invalid data.');
-        }
-    }
+			return $redirectObject;
+		} else {
+			throw new \Exception('Trying to create valuelist with invalid data.');
+		}
+	}
 }
\ No newline at end of file

src/storage/factories/ValuelistFactory.php

Indentation +28 added lines, -28 removed lines

@@ -12,34 +12,34 @@
 
 class ValuelistFactory
 {
-    /**
-     * Create a sitemap item from post values
-     *
-     * @param $postValues
-     *
-     * @return \stdClass
-     * @throws \Exception
-     */
-    public static function createValuelistFromPostValues($postValues)
-    {
-        if (isset($postValues['title'])) {
-            $valuelistObject = new \stdClass();
-            $valuelistObject->title = $postValues['title'];
-            $valuelistObject->slug = StringUtil::slugify($postValues['title']);
-            $valuelistObject->pairs = new \stdClass();
-            if (isset($postValues['keys'], $postValues['values'])) {
-                foreach ($postValues['keys'] as $key => $value) {
-                    $valuelistObject->pairs->$value = $postValues['values'][$key];
-                }
-            }
-            $object_vars = get_object_vars($valuelistObject->pairs);
-            ksort($object_vars);
-            $valuelistObject->pairs = (object) $object_vars;
+	/**
+	 * Create a sitemap item from post values
+	 *
+	 * @param $postValues
+	 *
+	 * @return \stdClass
+	 * @throws \Exception
+	 */
+	public static function createValuelistFromPostValues($postValues)
+	{
+		if (isset($postValues['title'])) {
+			$valuelistObject = new \stdClass();
+			$valuelistObject->title = $postValues['title'];
+			$valuelistObject->slug = StringUtil::slugify($postValues['title']);
+			$valuelistObject->pairs = new \stdClass();
+			if (isset($postValues['keys'], $postValues['values'])) {
+				foreach ($postValues['keys'] as $key => $value) {
+					$valuelistObject->pairs->$value = $postValues['values'][$key];
+				}
+			}
+			$object_vars = get_object_vars($valuelistObject->pairs);
+			ksort($object_vars);
+			$valuelistObject->pairs = (object) $object_vars;
 
-            return $valuelistObject;
-        } else {
-            throw new \Exception('Trying to create valuelist with invalid data.');
-        }
-    }
+			return $valuelistObject;
+		} else {
+			throw new \Exception('Trying to create valuelist with invalid data.');
+		}
+	}
 
 }
\ No newline at end of file

src/storage/storage/DocumentStorage.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
 	public function getDocuments($state = 'published')
 	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
 		return $this->repository->getDocuments($state);
 	}
@@ -50,9 +50,9 @@ 
 	public function getDocumentBySlug($slug, $state = 'published')
 	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
-		$path = '/' . $slug;
+		$path = '/'.$slug;
 
 		return $this->repository->getDocumentByPath($path, $state);
 	}
@@ -66,16 +66,16 @@ 
 	public function saveDocument($postValues, $state = 'unpublished')
 	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
-		$oldPath = '/' . $postValues['path'];
+		$oldPath = '/'.$postValues['path'];
 
 		$container = $this->getDocumentContainerByPath($oldPath);
 		$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
 		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, $state);
@@ -89,9 +89,9 @@ 
 	{
 		$documentObject = DocumentFactory::createDocumentFromPostValues($postValues, new DocumentTypesStorage($this->repository));
 		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, $state);
@@ -102,7 +102,7 @@ 
 	 */
 	public function deleteDocumentBySlug($slug)
 	{
-		$path = '/' . $slug;
+		$path = '/'.$slug;
 		$this->repository->deleteDocumentByPath($path);
 	}
 

src/storage/storage/AbstractStorage.php

Spacing +3 added lines, -3 removed lines

@@ -38,19 +38,19 @@
 			array_pop($fileParts);
 			$fileNameWithoutExtension = implode('-', $fileParts);
 			$fileNameWithoutExtension = StringUtil::slugify($fileNameWithoutExtension);
-			$filename = $fileNameWithoutExtension . '.' . $extension;
+			$filename = $fileNameWithoutExtension.'.'.$extension;
 		} else {
 			$filename = StringUtil::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';
 			}

src/storage/storage/ValuelistsStorage.php

Indentation +73 added lines, -73 removed lines

@@ -12,83 +12,83 @@
 
 class ValuelistsStorage extends AbstractStorage
 {
-    /**
-     * Get all valuelists
-     *
-     * @return mixed
-     */
-    public function getValuelists()
-    {
-        return $this->repository->valuelists;
-    }
+	/**
+	 * Get all valuelists
+	 *
+	 * @return mixed
+	 */
+	public function getValuelists()
+	{
+		return $this->repository->valuelists;
+	}
 
-    public function addValuelist($postValues)
-    {
-        $valueListObject = ValuelistFactory::createValuelistFromPostValues($postValues);
-        $valuelists = $this->repository->valuelists;
-        $valuelists[] = $valueListObject;
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+	public function addValuelist($postValues)
+	{
+		$valueListObject = ValuelistFactory::createValuelistFromPostValues($postValues);
+		$valuelists = $this->repository->valuelists;
+		$valuelists[] = $valueListObject;
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 
-    /**
-     * Save changes to a valuelist
-     *
-     * @param $slug
-     * @param $postValues
-     *
-     * @throws \Exception
-     */
-    public function saveValuelist($slug, $postValues)
-    {
-        $valuelistObject = ValuelistFactory::createValuelistFromPostValues($postValues);
+	/**
+	 * Save changes to a valuelist
+	 *
+	 * @param $slug
+	 * @param $postValues
+	 *
+	 * @throws \Exception
+	 */
+	public function saveValuelist($slug, $postValues)
+	{
+		$valuelistObject = ValuelistFactory::createValuelistFromPostValues($postValues);
 
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $key => $valuelist) {
-            if ($valuelist->slug == $slug) {
-                $valuelists[$key] = $valuelistObject;
-            }
-        }
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $key => $valuelist) {
+			if ($valuelist->slug == $slug) {
+				$valuelists[$key] = $valuelistObject;
+			}
+		}
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 
-    /**
-     * Get a valuelist by its slug
-     *
-     * @param $slug
-     *
-     * @return mixed
-     */
-    public function getValuelistBySlug($slug)
-    {
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $valuelist) {
-            if ($valuelist->slug == $slug) {
-                return $valuelist;
-            }
-        }
+	/**
+	 * Get a valuelist by its slug
+	 *
+	 * @param $slug
+	 *
+	 * @return mixed
+	 */
+	public function getValuelistBySlug($slug)
+	{
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $valuelist) {
+			if ($valuelist->slug == $slug) {
+				return $valuelist;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Delete a sitemap item by its slug
-     *
-     * @param $slug
-     *
-     * @throws \Exception
-     */
-    public function deleteValuelistBySlug($slug)
-    {
-        $valuelists = $this->repository->valuelists;
-        foreach ($valuelists as $key => $valuelist) {
-            if ($valuelist->slug == $slug) {
-                unset($valuelists[$key]);
-            }
-        }
-        $valuelists = array_values($valuelists);
-        $this->repository->valuelists = $valuelists;
-        $this->save();
-    }
+	/**
+	 * Delete a sitemap item by its slug
+	 *
+	 * @param $slug
+	 *
+	 * @throws \Exception
+	 */
+	public function deleteValuelistBySlug($slug)
+	{
+		$valuelists = $this->repository->valuelists;
+		foreach ($valuelists as $key => $valuelist) {
+			if ($valuelist->slug == $slug) {
+				unset($valuelists[$key]);
+			}
+		}
+		$valuelists = array_values($valuelists);
+		$this->repository->valuelists = $valuelists;
+		$this->save();
+	}
 }
\ No newline at end of file

src/storage/storage/FilesStorage.php

Spacing +4 added lines, -4 removed lines

@@ -37,10 +37,10 @@ 
 		$destinationPath = $this->getDestinationPath();
 
 		$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)) {
@@ -83,7 +83,7 @@ 
 	public function deleteFileByName($filename)
 	{
 		$destinationPath = $this->getDestinationPath();
-		$destination = $destinationPath . '/' . $filename;
+		$destination = $destinationPath.'/'.$filename;
 
 		if (file_exists($destination)) {
 			$files = $this->getFiles();
@@ -113,7 +113,7 @@ 
 
     protected function getDestinationPath()
     {
-        $destinationPath = realpath($this->filesDir . DIRECTORY_SEPARATOR);
+        $destinationPath = realpath($this->filesDir.DIRECTORY_SEPARATOR);
         return $destinationPath;
     }
 }
\ No newline at end of file

Doc Comments +5 added lines, -1 removed lines

@@ -10,6 +10,10 @@ 
 {
     protected $filesDir;
 
+    /**
+     * @param \CloudControl\Cms\storage\Repository $repository
+     * @param string $filesDir
+     */
     public function __construct($repository, $filesDir)
     {
         parent::__construct($repository);
@@ -101,7 +105,7 @@ 
 	}
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getFilesDir()
     {

Indentation +20 added lines, -20 removed lines

@@ -8,16 +8,16 @@ 
 
 class FilesStorage extends AbstractStorage
 {
-    protected $filesDir;
+	protected $filesDir;
 
-    public function __construct($repository, $filesDir)
-    {
-        parent::__construct($repository);
-        $this->filesDir = $filesDir;
-    }
+	public function __construct($repository, $filesDir)
+	{
+		parent::__construct($repository);
+		$this->filesDir = $filesDir;
+	}
 
 
-    /**
+	/**
 	 * @return array
 	 */
 	public function getFiles() {
@@ -100,15 +100,15 @@ 
 		}
 	}
 
-    /**
-     * @return mixed
-     */
-    public function getFilesDir()
-    {
-        return $this->filesDir;
-    }
+	/**
+	 * @return mixed
+	 */
+	public function getFilesDir()
+	{
+		return $this->filesDir;
+	}
 
-    /**
+	/**
 	 * @param $a
 	 * @param $b
 	 *
@@ -119,9 +119,9 @@ 
 		return strcmp($a->file, $b->file);
 	}
 
-    protected function getDestinationPath()
-    {
-        $destinationPath = realpath($this->filesDir . DIRECTORY_SEPARATOR);
-        return $destinationPath;
-    }
+	protected function getDestinationPath()
+	{
+		$destinationPath = realpath($this->filesDir . DIRECTORY_SEPARATOR);
+		return $destinationPath;
+	}
 }
\ No newline at end of file

src/cc/Application.php

Doc Comments +5 added lines, -2 removed lines

@@ -83,6 +83,9 @@ 
             $this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
         }
 
+        /**
+         * @param Request $request
+         */
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
@@ -112,7 +115,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)
         {
@@ -177,7 +180,7 @@ 
          * @param array $parameters
          * @param \stdClass|null $matchedSitemapItem
          *
-         * @return mixed
+         * @return Component
          * @throws \Exception
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)

Indentation +273 added lines, -273 removed lines

@@ -2,277 +2,277 @@
 
 namespace CloudControl\Cms\cc {
 
-    use CloudControl\Cms\components\Component;
-    use CloudControl\Cms\storage\Storage;
-    use Whoops\Handler\PrettyPageHandler;
-    use Whoops\Run;
-
-    class Application
-    {
-        /**
-         * @var \stdClass
-         */
-        private $config;
-        /**
-         * @var \CloudControl\Cms\storage\Storage
-         */
-        private $storage;
-
-        /**
-         * @var \CloudControl\Cms\cc\Request
-         */
-        private $request;
-
-        /**
-         * @var array
-         */
-        private $matchedSitemapItems = array();
-
-        /**
-         * @var array
-         */
-        private $applicationComponents = array();
-
-        /**
-         * Application constructor.
-         */
-        public function __construct()
-        {
-            $this->config();
-            $this->storage();
-
-            $this->request = new Request();
-
-            $whoops = new Run;
-            $whoops->pushHandler(new PrettyPageHandler);
-            $whoops->register();
-
-            $this->redirectMatching($this->request);
-            $this->sitemapMatching($this->request);
-
-            $this->getApplicationComponents();
-
-            $this->runApplicationComponents();
-            $this->runSitemapComponents();
-
-            $this->renderApplicationComponents();
-            $this->renderSitemapComponents();
-        }
-
-        /**
-         * Initialize the config
-         *
-         * @throws \Exception
-         */
-        private function config()
-        {
-            $configPath = __DIR__ . '/../../config.json';
-            if (realpath($configPath) !== false) {
-                $json = file_get_contents($configPath);
-                $this->config = json_decode($json);
-            } else {
-                throw new \Exception('Framework not initialized yet. Consider running composer install');
-            }
-        }
-
-        /**
-         * Initialize the storage
-         */
-        private function storage()
-        {
-            $this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
-        }
-
-        private function redirectMatching($request)
-        {
-            $redirects = $this->storage->getRedirects()->getRedirects();
-            $relativeUri = '/' . $request::$relativeUri;
-
-            foreach ($redirects as $redirect) {
-                if (preg_match_all($redirect->fromUrl, $relativeUri, $matches)) {
-                    $toUrl = preg_replace($redirect->fromUrl, $redirect->toUrl, $relativeUri);
-                    if (substr($toUrl, 0, 1) == '/') {
-                        $toUrl = substr($toUrl, 1);
-                    }
-                    if ($redirect->type == '301') {
-                        header('HTTP/1.1 301 Moved Permanently');
-                        header('Location: ' . $request::$subfolders . $toUrl);
-                        exit;
-                    } elseif ($redirect->type == '302') {
-                        header('Location: ' . $request::$subfolders . $toUrl, true, 302);
-                        exit;
-                    } else {
-                        throw new \Exception('Invalid redirect type.');
-                    }
-                }
-            }
-        }
-
-        /**
-         * Loop through sitemap items and see if one matches the requestUri.
-         * If it does, add it tot the matchedSitemapItems array
-         *
-         * @param $request
-         */
-        private function sitemapMatching($request)
-        {
-            $sitemap = $this->storage->getSitemap()->getSitemap();
-            $relativeUri = '/' . $request::$relativeUri;
-
-            foreach ($sitemap as $sitemapItem) {
-                if ($sitemapItem->regex) {
-                    $matches = array();
-                    if (preg_match_all($sitemapItem->url, $relativeUri, $matches)) {
-                        // Make a clone, so it doesnt add the matches to the original
-                        $matchedClone = clone $sitemapItem;
-                        $matchedClone->matches = $matches;
-                        $this->matchedSitemapItems[] = $matchedClone;
-                        return;
-                    }
-                } else {
-                    if ($sitemapItem->url == $relativeUri) {
-                        $this->matchedSitemapItems[] = $sitemapItem;
-                        return;
-                    }
-                }
-            }
-        }
-
-        /**
-         * Loop through all application components and run them
-         *
-         * @throws \Exception
-         */
-        private function runApplicationComponents()
-        {
-            foreach ($this->applicationComponents as $key => $applicationComponent) {
-                $class = $applicationComponent->component;
-                $parameters = $applicationComponent->parameters;
-                $this->applicationComponents[$key]->{'object'} = $this->getComponentObject($class, null, $parameters, null);
-                $this->applicationComponents[$key]->{'object'}->run($this->storage);
-            }
-        }
-
-        /**
-         * Loop through all (matched) sitemap components and run them
-         *
-         * @throws \Exception
-         */
-        private function runSitemapComponents()
-        {
-            foreach ($this->matchedSitemapItems as $key => $sitemapItem) {
-                $class = $sitemapItem->component;
-                $template = $sitemapItem->template;
-                $parameters = $sitemapItem->parameters;
-
-                $this->matchedSitemapItems[$key]->object = $this->getComponentObject($class, $template, $parameters, $sitemapItem);
-
-                $this->matchedSitemapItems[$key]->object->run($this->storage);
-            }
-        }
-
-        /**
-         * @param string $class
-         * @param string $template
-         * @param array $parameters
-         * @param \stdClass|null $matchedSitemapItem
-         *
-         * @return mixed
-         * @throws \Exception
-         */
-        private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
-        {
-            $libraryComponentName = '\\CloudControl\Cms\\components\\' . $class;
-            $userComponentName = '\\components\\' . $class;
-
-            if (!class_exists($libraryComponentName, false)) {
-                $component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
-            } elseif (!class_exists($userComponentName, false)) {
-                $component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
-            } else {
-                throw new \Exception('Could not load component ' . $class);
-            }
-
-            if (!$component instanceof Component) {
-                throw new \Exception('Component not of type Component. Must inherit \CloudControl\Cms\components\Component');
-            }
-
-            return $component;
-        }
-
-        /**
-         * Loop through all application components and render them
-         */
-        private function renderApplicationComponents()
-        {
-            foreach ($this->applicationComponents as $applicationComponent) {
-                $applicationComponent->{'object'}->render();
-            }
-        }
-
-        /**
-         * Loop through all (matched) sitemap components and render them
-         */
-        private function renderSitemapComponents()
-        {
-            foreach ($this->matchedSitemapItems as $sitemapItem) {
-                $this->setCachingHeaders();
-                $sitemapItem->object->render($this);
-                ob_clean();
-                echo $sitemapItem->object->get();
-                ob_end_flush();
-                exit;
-            }
-        }
-
-        public function getAllApplicationComponentParameters()
-        {
-            $allParameters = array();
-            foreach ($this->applicationComponents as $applicationComponent) {
-                $parameters = $applicationComponent->{'object'}->getParameters();
-                $allParameters[] = $parameters;
-            }
-            return $allParameters;
-        }
-
-        public function unlockApplicationComponentParameters()
-        {
-            foreach ($this->applicationComponents as $applicationComponent) {
-                $parameters = $applicationComponent->{'object'}->getParameters();
-                extract($parameters);
-            }
-        }
-
-        /**
-         * Set the default caching of pages to 2 days
-         */
-        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));
-        }
-
-        /**
-         * @return string
-         */
-        public function getTemplateDir()
-        {
-            return $this->config->templateDir;
-        }
-
-        public function getStorageDir()
-        {
-            return $this->config->storageDir;
-        }
-
-        public function getApplicationComponents()
-        {
-            $this->applicationComponents = $this->storage->getApplicationComponents()->getApplicationComponents();
-        }
-
-        public function getRootDir()
-        {
-            return $this->config->rootDir;
-        }
-    }
+	use CloudControl\Cms\components\Component;
+	use CloudControl\Cms\storage\Storage;
+	use Whoops\Handler\PrettyPageHandler;
+	use Whoops\Run;
+
+	class Application
+	{
+		/**
+		 * @var \stdClass
+		 */
+		private $config;
+		/**
+		 * @var \CloudControl\Cms\storage\Storage
+		 */
+		private $storage;
+
+		/**
+		 * @var \CloudControl\Cms\cc\Request
+		 */
+		private $request;
+
+		/**
+		 * @var array
+		 */
+		private $matchedSitemapItems = array();
+
+		/**
+		 * @var array
+		 */
+		private $applicationComponents = array();
+
+		/**
+		 * Application constructor.
+		 */
+		public function __construct()
+		{
+			$this->config();
+			$this->storage();
+
+			$this->request = new Request();
+
+			$whoops = new Run;
+			$whoops->pushHandler(new PrettyPageHandler);
+			$whoops->register();
+
+			$this->redirectMatching($this->request);
+			$this->sitemapMatching($this->request);
+
+			$this->getApplicationComponents();
+
+			$this->runApplicationComponents();
+			$this->runSitemapComponents();
+
+			$this->renderApplicationComponents();
+			$this->renderSitemapComponents();
+		}
+
+		/**
+		 * Initialize the config
+		 *
+		 * @throws \Exception
+		 */
+		private function config()
+		{
+			$configPath = __DIR__ . '/../../config.json';
+			if (realpath($configPath) !== false) {
+				$json = file_get_contents($configPath);
+				$this->config = json_decode($json);
+			} else {
+				throw new \Exception('Framework not initialized yet. Consider running composer install');
+			}
+		}
+
+		/**
+		 * Initialize the storage
+		 */
+		private function storage()
+		{
+			$this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
+		}
+
+		private function redirectMatching($request)
+		{
+			$redirects = $this->storage->getRedirects()->getRedirects();
+			$relativeUri = '/' . $request::$relativeUri;
+
+			foreach ($redirects as $redirect) {
+				if (preg_match_all($redirect->fromUrl, $relativeUri, $matches)) {
+					$toUrl = preg_replace($redirect->fromUrl, $redirect->toUrl, $relativeUri);
+					if (substr($toUrl, 0, 1) == '/') {
+						$toUrl = substr($toUrl, 1);
+					}
+					if ($redirect->type == '301') {
+						header('HTTP/1.1 301 Moved Permanently');
+						header('Location: ' . $request::$subfolders . $toUrl);
+						exit;
+					} elseif ($redirect->type == '302') {
+						header('Location: ' . $request::$subfolders . $toUrl, true, 302);
+						exit;
+					} else {
+						throw new \Exception('Invalid redirect type.');
+					}
+				}
+			}
+		}
+
+		/**
+		 * Loop through sitemap items and see if one matches the requestUri.
+		 * If it does, add it tot the matchedSitemapItems array
+		 *
+		 * @param $request
+		 */
+		private function sitemapMatching($request)
+		{
+			$sitemap = $this->storage->getSitemap()->getSitemap();
+			$relativeUri = '/' . $request::$relativeUri;
+
+			foreach ($sitemap as $sitemapItem) {
+				if ($sitemapItem->regex) {
+					$matches = array();
+					if (preg_match_all($sitemapItem->url, $relativeUri, $matches)) {
+						// Make a clone, so it doesnt add the matches to the original
+						$matchedClone = clone $sitemapItem;
+						$matchedClone->matches = $matches;
+						$this->matchedSitemapItems[] = $matchedClone;
+						return;
+					}
+				} else {
+					if ($sitemapItem->url == $relativeUri) {
+						$this->matchedSitemapItems[] = $sitemapItem;
+						return;
+					}
+				}
+			}
+		}
+
+		/**
+		 * Loop through all application components and run them
+		 *
+		 * @throws \Exception
+		 */
+		private function runApplicationComponents()
+		{
+			foreach ($this->applicationComponents as $key => $applicationComponent) {
+				$class = $applicationComponent->component;
+				$parameters = $applicationComponent->parameters;
+				$this->applicationComponents[$key]->{'object'} = $this->getComponentObject($class, null, $parameters, null);
+				$this->applicationComponents[$key]->{'object'}->run($this->storage);
+			}
+		}
+
+		/**
+		 * Loop through all (matched) sitemap components and run them
+		 *
+		 * @throws \Exception
+		 */
+		private function runSitemapComponents()
+		{
+			foreach ($this->matchedSitemapItems as $key => $sitemapItem) {
+				$class = $sitemapItem->component;
+				$template = $sitemapItem->template;
+				$parameters = $sitemapItem->parameters;
+
+				$this->matchedSitemapItems[$key]->object = $this->getComponentObject($class, $template, $parameters, $sitemapItem);
+
+				$this->matchedSitemapItems[$key]->object->run($this->storage);
+			}
+		}
+
+		/**
+		 * @param string $class
+		 * @param string $template
+		 * @param array $parameters
+		 * @param \stdClass|null $matchedSitemapItem
+		 *
+		 * @return mixed
+		 * @throws \Exception
+		 */
+		private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
+		{
+			$libraryComponentName = '\\CloudControl\Cms\\components\\' . $class;
+			$userComponentName = '\\components\\' . $class;
+
+			if (!class_exists($libraryComponentName, false)) {
+				$component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
+			} elseif (!class_exists($userComponentName, false)) {
+				$component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
+			} else {
+				throw new \Exception('Could not load component ' . $class);
+			}
+
+			if (!$component instanceof Component) {
+				throw new \Exception('Component not of type Component. Must inherit \CloudControl\Cms\components\Component');
+			}
+
+			return $component;
+		}
+
+		/**
+		 * Loop through all application components and render them
+		 */
+		private function renderApplicationComponents()
+		{
+			foreach ($this->applicationComponents as $applicationComponent) {
+				$applicationComponent->{'object'}->render();
+			}
+		}
+
+		/**
+		 * Loop through all (matched) sitemap components and render them
+		 */
+		private function renderSitemapComponents()
+		{
+			foreach ($this->matchedSitemapItems as $sitemapItem) {
+				$this->setCachingHeaders();
+				$sitemapItem->object->render($this);
+				ob_clean();
+				echo $sitemapItem->object->get();
+				ob_end_flush();
+				exit;
+			}
+		}
+
+		public function getAllApplicationComponentParameters()
+		{
+			$allParameters = array();
+			foreach ($this->applicationComponents as $applicationComponent) {
+				$parameters = $applicationComponent->{'object'}->getParameters();
+				$allParameters[] = $parameters;
+			}
+			return $allParameters;
+		}
+
+		public function unlockApplicationComponentParameters()
+		{
+			foreach ($this->applicationComponents as $applicationComponent) {
+				$parameters = $applicationComponent->{'object'}->getParameters();
+				extract($parameters);
+			}
+		}
+
+		/**
+		 * Set the default caching of pages to 2 days
+		 */
+		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));
+		}
+
+		/**
+		 * @return string
+		 */
+		public function getTemplateDir()
+		{
+			return $this->config->templateDir;
+		}
+
+		public function getStorageDir()
+		{
+			return $this->config->storageDir;
+		}
+
+		public function getApplicationComponents()
+		{
+			$this->applicationComponents = $this->storage->getApplicationComponents()->getApplicationComponents();
+		}
+
+		public function getRootDir()
+		{
+			return $this->config->rootDir;
+		}
+	}
 }
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -66,7 +66,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);
@@ -80,13 +80,13 @@ 
          */
         private function storage()
         {
-            $this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
+            $this->storage = new Storage($this->config->rootDir.DIRECTORY_SEPARATOR.$this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
         }
 
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($redirects as $redirect) {
                 if (preg_match_all($redirect->fromUrl, $relativeUri, $matches)) {
@@ -96,10 +96,10 @@ 
                     }
                     if ($redirect->type == '301') {
                         header('HTTP/1.1 301 Moved Permanently');
-                        header('Location: ' . $request::$subfolders . $toUrl);
+                        header('Location: '.$request::$subfolders.$toUrl);
                         exit;
                     } elseif ($redirect->type == '302') {
-                        header('Location: ' . $request::$subfolders . $toUrl, true, 302);
+                        header('Location: '.$request::$subfolders.$toUrl, true, 302);
                         exit;
                     } else {
                         throw new \Exception('Invalid redirect type.');
@@ -117,7 +117,7 @@ 
         private function sitemapMatching($request)
         {
             $sitemap = $this->storage->getSitemap()->getSitemap();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($sitemap as $sitemapItem) {
                 if ($sitemapItem->regex) {
@@ -182,15 +182,15 @@ 
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
         {
-            $libraryComponentName = '\\CloudControl\Cms\\components\\' . $class;
-            $userComponentName = '\\components\\' . $class;
+            $libraryComponentName = '\\CloudControl\Cms\\components\\'.$class;
+            $userComponentName = '\\components\\'.$class;
 
             if (!class_exists($libraryComponentName, false)) {
                 $component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
             } elseif (!class_exists($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) {
@@ -248,8 +248,8 @@ 
          */
         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('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));
         }
 
         /**

src/components/BaseComponent.php

Indentation +30 added lines, -30 removed lines

@@ -2,11 +2,11 @@ 
 namespace CloudControl\Cms\components
 {
 
-    use CloudControl\Cms\cc\Application;
-    use CloudControl\Cms\cc\Request;
-    use CloudControl\Cms\storage\Storage;
+	use CloudControl\Cms\cc\Application;
+	use CloudControl\Cms\cc\Request;
+	use CloudControl\Cms\storage\Storage;
 
-    class BaseComponent implements Component
+	class BaseComponent implements Component
 	{
 		/**
 		 * @var string
@@ -94,17 +94,17 @@ 
 		 */
 		public function renderTemplate($template='', $obClean = true, $application=null)
 		{
-		    $templateDir = $this->getTemplateDir($template, $application);
-		    if ($application !== null) {
-                $rootDir = $application->getRootDir();
-                if (strpos($templateDir, $rootDir) === false) {
-                    $templatePath = $rootDir . DIRECTORY_SEPARATOR . $templateDir;
-                } else {
-                    $templatePath = $templateDir;
-                }
-            } else {
-		        $templatePath = $templateDir;
-            }
+			$templateDir = $this->getTemplateDir($template, $application);
+			if ($application !== null) {
+				$rootDir = $application->getRootDir();
+				if (strpos($templateDir, $rootDir) === false) {
+					$templatePath = $rootDir . DIRECTORY_SEPARATOR . $templateDir;
+				} else {
+					$templatePath = $templateDir;
+				}
+			} else {
+				$templatePath = $templateDir;
+			}
 			if (realpath($templatePath) !== false) {
 				if ($obClean) {
 					ob_clean();
@@ -151,19 +151,19 @@ 
 			return $this->parameters;
 		}
 
-        /**
-         * @param $template
-         * @param null | Application $application
-         * @return string
-         */
-        protected function getTemplateDir($template, $application=null)
-        {
-            $templatePath = '';
-            if ($application !== null) {
-                $templatePath = $application->getTemplateDir();
-            }
-            $templatePath = $templatePath . $template . '.php';
-            return $templatePath;
-        }
-    }
+		/**
+		 * @param $template
+		 * @param null | Application $application
+		 * @return string
+		 */
+		protected function getTemplateDir($template, $application=null)
+		{
+			$templatePath = '';
+			if ($application !== null) {
+				$templatePath = $application->getTemplateDir();
+			}
+			$templatePath = $templatePath . $template . '.php';
+			return $templatePath;
+		}
+	}
 }
\ No newline at end of file

Spacing +8 added lines, -8 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,13 +92,13 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
 		    $templateDir = $this->getTemplateDir($template, $application);
 		    if ($application !== null) {
                 $rootDir = $application->getRootDir();
                 if (strpos($templateDir, $rootDir) === false) {
-                    $templatePath = $rootDir . DIRECTORY_SEPARATOR . $templateDir;
+                    $templatePath = $rootDir.DIRECTORY_SEPARATOR.$templateDir;
                 } else {
                     $templatePath = $templateDir;
                 }
@@ -121,7 +121,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);
 				}
 			}
 		}
@@ -136,7 +136,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) {
@@ -156,13 +156,13 @@ 
          * @param null | Application $application
          * @return string
          */
-        protected function getTemplateDir($template, $application=null)
+        protected function getTemplateDir($template, $application = null)
         {
             $templatePath = '';
             if ($application !== null) {
                 $templatePath = $application->getTemplateDir();
             }
-            $templatePath = $templatePath . $template . '.php';
+            $templatePath = $templatePath.$template.'.php';
             return $templatePath;
         }
     }