jenskooij / cloudcontrol

src/CloudControl.php

Indentation +145 added lines, -145 removed lines

@@ -11,150 +11,150 @@
 
 class CloudControl
 {
-    public static function run()
-    {
-        new Application();
-    }
-
-    public static function postInstall(Event $event)
-    {
-        $event->getIO()->write("Post install");
-        self::checkInstall($event);
-    }
-
-    public static function postUpdate(Event $event)
-    {
-        $event->getIO()->write("Post update");
-        self::checkInstall($event);
-    }
-
-    /**
-     * @param Event $event
-     */
-    private static function checkInstall(Event $event)
-    {
-        if (!function_exists('getRelativePath')) {
-            require_once(__DIR__ . DIRECTORY_SEPARATOR . 'util' . DIRECTORY_SEPARATOR . 'functions.php');
-        }
-
-        $event->getIO()->write("");
-        $event->getIO()->write("********************************************************");
-        $event->getIO()->write("*** Checking installation of Cloud Control framework ***");
-        $event->getIO()->write("********************************************************");
-        $event->getIO()->write("");
-
-        $vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
-        $rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
-
-        $baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
-        $configObject = self::getConfig($event, $baseConfigTargetPath);
-
-        $configObject->{'vendorDir'} = realpath($vendorDir);
-        $configObject->{'rootDir'} = $rootDir;
-        $configObject->{'templateDir'} = self::createDir($event, $rootDir, 'templates');
-        $configObject->{'storageDir'} = self::createDir($event, $rootDir, $configObject->{'storageDir'});
-        $configObject->{'publicDir'} = self::createDir($event, $rootDir, 'public');
-        $configObject->{'jsDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'js');
-        $configObject->{'cssDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'css');
-        $configObject->{'imagesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'images');
-        $configObject->{'filesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'files');
-
-        $baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
-        $baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
-
-        self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
-        self::saveConfig($event, $baseConfigTargetPath, $configObject);
-        self::copyInstallFile($event, 'public.htaccess', $configObject->{'publicDir'}, '.htaccess');
-        self::copyInstallFile($event, 'root.htaccess', $configObject->{'rootDir'}, '.htaccess');
-        self::copyInstallFile($event, 'base.php', $configObject->{'templateDir'});
-        self::copyInstallFile($event, 'cms.css', $configObject->{'cssDir'});
-        self::copyInstallFile($event, 'cms.js', $configObject->{'jsDir'});
-        self::copyInstallFile($event, 'index.php', $configObject->{'publicDir'});
-
-        $event->getIO()->write("");
-        $event->getIO()->write("[SUCCESS] Installation is complete");
-        $event->getIO()->write("");
-    }
-
-    /**
-     * @param Event $event
-     * @param $baseConfigTargetPath
-     * @param $configObject
-     * @internal param $rootDir
-     * @internal param $vendorDir
-     * @internal param $templateDir
-     * @internal param $storageDir
-     * @internal param $baseConfigDefaultPath
-     * @internal param $baseConfigTargetPath
-     * @internal param $storageDir
-     */
-    private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
-    {
-        file_put_contents($baseConfigTargetPath, json_encode($configObject));
-        $event->getIO()->write("[INFO] Saved config to: " . $baseConfigTargetPath);
-    }
-
-    private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
-    {
-        $sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
-
-
-        if ($destinationFileName === null) {
-            $destinationFileName = $sourceFileName;
-        }
-
-        if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
-            $destinationFullPath = realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName;
-            if (file_exists($destinationFullPath)) {
-                $event->getIO()->write("[INFO] File already exists: " . $destinationFullPath);
-            } else {
-                copy($sourceFilePath, $destinationFullPath);
-                $event->getIO()->write("[INSTALL] Copied file: " . $sourceFileName . ' to ' . $destinationPath);
-            }
-        } else {
-            $event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
-        }
-    }
-
-    /**
-     * @param $storageDir
-     * @param $baseStorageDefaultPath
-     * @param $baseStorageSqlPath
-     */
-    private static function createStorage($storageDir, $baseStorageDefaultPath, $baseStorageSqlPath)
-    {
-        $repository = new Repository($storageDir);
-        $repository->init($baseStorageDefaultPath, $baseStorageSqlPath);
-    }
-
-    private static function createDir(Event $event, $rootDir, $dirName)
-    {
-        $dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
-        if (!is_dir($dir)) {
-            mkdir($dir);
-            $event->getIO()->write("[INSTALL] Created dir: " . $dir);
-        } else {
-            $event->getIO()->write("[INFO] Dir already exists: " . $dir);
-        }
-        return \getRelativePath($rootDir, $dir);
-    }
-
-    /**
-     * @param $configTargetPath
-     * @return mixed
-     */
-    private static function getConfig(Event $event, $configTargetPath)
-    {
-        $baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_config.json');
-
-        if (file_exists($configTargetPath)) {
-            $config = json_decode(file_get_contents($configTargetPath));
-            $event->getIO()->write("[INFO] Using existing config");
-        } else {
-            $config = json_decode(file_get_contents($baseConfigDefaultPath));
-            $event->getIO()->write("[INSTALL] Created default config");
-        }
-        return $config;
-    }
+	public static function run()
+	{
+		new Application();
+	}
+
+	public static function postInstall(Event $event)
+	{
+		$event->getIO()->write("Post install");
+		self::checkInstall($event);
+	}
+
+	public static function postUpdate(Event $event)
+	{
+		$event->getIO()->write("Post update");
+		self::checkInstall($event);
+	}
+
+	/**
+	 * @param Event $event
+	 */
+	private static function checkInstall(Event $event)
+	{
+		if (!function_exists('getRelativePath')) {
+			require_once(__DIR__ . DIRECTORY_SEPARATOR . 'util' . DIRECTORY_SEPARATOR . 'functions.php');
+		}
+
+		$event->getIO()->write("");
+		$event->getIO()->write("********************************************************");
+		$event->getIO()->write("*** Checking installation of Cloud Control framework ***");
+		$event->getIO()->write("********************************************************");
+		$event->getIO()->write("");
+
+		$vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
+		$rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+
+		$baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
+		$configObject = self::getConfig($event, $baseConfigTargetPath);
+
+		$configObject->{'vendorDir'} = realpath($vendorDir);
+		$configObject->{'rootDir'} = $rootDir;
+		$configObject->{'templateDir'} = self::createDir($event, $rootDir, 'templates');
+		$configObject->{'storageDir'} = self::createDir($event, $rootDir, $configObject->{'storageDir'});
+		$configObject->{'publicDir'} = self::createDir($event, $rootDir, 'public');
+		$configObject->{'jsDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'js');
+		$configObject->{'cssDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'css');
+		$configObject->{'imagesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'images');
+		$configObject->{'filesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'files');
+
+		$baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
+		$baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
+
+		self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
+		self::saveConfig($event, $baseConfigTargetPath, $configObject);
+		self::copyInstallFile($event, 'public.htaccess', $configObject->{'publicDir'}, '.htaccess');
+		self::copyInstallFile($event, 'root.htaccess', $configObject->{'rootDir'}, '.htaccess');
+		self::copyInstallFile($event, 'base.php', $configObject->{'templateDir'});
+		self::copyInstallFile($event, 'cms.css', $configObject->{'cssDir'});
+		self::copyInstallFile($event, 'cms.js', $configObject->{'jsDir'});
+		self::copyInstallFile($event, 'index.php', $configObject->{'publicDir'});
+
+		$event->getIO()->write("");
+		$event->getIO()->write("[SUCCESS] Installation is complete");
+		$event->getIO()->write("");
+	}
+
+	/**
+	 * @param Event $event
+	 * @param $baseConfigTargetPath
+	 * @param $configObject
+	 * @internal param $rootDir
+	 * @internal param $vendorDir
+	 * @internal param $templateDir
+	 * @internal param $storageDir
+	 * @internal param $baseConfigDefaultPath
+	 * @internal param $baseConfigTargetPath
+	 * @internal param $storageDir
+	 */
+	private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
+	{
+		file_put_contents($baseConfigTargetPath, json_encode($configObject));
+		$event->getIO()->write("[INFO] Saved config to: " . $baseConfigTargetPath);
+	}
+
+	private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
+	{
+		$sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
+
+
+		if ($destinationFileName === null) {
+			$destinationFileName = $sourceFileName;
+		}
+
+		if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
+			$destinationFullPath = realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName;
+			if (file_exists($destinationFullPath)) {
+				$event->getIO()->write("[INFO] File already exists: " . $destinationFullPath);
+			} else {
+				copy($sourceFilePath, $destinationFullPath);
+				$event->getIO()->write("[INSTALL] Copied file: " . $sourceFileName . ' to ' . $destinationPath);
+			}
+		} else {
+			$event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
+		}
+	}
+
+	/**
+	 * @param $storageDir
+	 * @param $baseStorageDefaultPath
+	 * @param $baseStorageSqlPath
+	 */
+	private static function createStorage($storageDir, $baseStorageDefaultPath, $baseStorageSqlPath)
+	{
+		$repository = new Repository($storageDir);
+		$repository->init($baseStorageDefaultPath, $baseStorageSqlPath);
+	}
+
+	private static function createDir(Event $event, $rootDir, $dirName)
+	{
+		$dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
+		if (!is_dir($dir)) {
+			mkdir($dir);
+			$event->getIO()->write("[INSTALL] Created dir: " . $dir);
+		} else {
+			$event->getIO()->write("[INFO] Dir already exists: " . $dir);
+		}
+		return \getRelativePath($rootDir, $dir);
+	}
+
+	/**
+	 * @param $configTargetPath
+	 * @return mixed
+	 */
+	private static function getConfig(Event $event, $configTargetPath)
+	{
+		$baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_config.json');
+
+		if (file_exists($configTargetPath)) {
+			$config = json_decode(file_get_contents($configTargetPath));
+			$event->getIO()->write("[INFO] Using existing config");
+		} else {
+			$config = json_decode(file_get_contents($baseConfigDefaultPath));
+			$event->getIO()->write("[INSTALL] Created default config");
+		}
+		return $config;
+	}
 
 }
\ No newline at end of file

src/cc/Application.php

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

src/storage/Repository.php

Indentation +329 added lines, -329 removed lines

@@ -24,210 +24,210 @@ 
  */
 class Repository
 {
-    protected $storagePath;
-
-    protected $fileBasedSubsets = array('sitemap', 'applicationComponents', 'documentTypes', 'bricks', 'imageSet', 'images', 'files', 'users', 'valuelists', 'redirects');
-
-    protected $sitemap;
-    protected $sitemapChanges = false;
-
-    protected $applicationComponents;
-    protected $applicationComponentsChanges = false;
-
-    protected $documentTypes;
-    protected $documentTypesChanges = false;
-
-    protected $bricks;
-    protected $bricksChanges = false;
-
-    protected $imageSet;
-    protected $imageSetChanges = false;
-
-    protected $images;
-    protected $imagesChanges = false;
-
-    protected $files;
-    protected $filesChanges = false;
-
-    protected $users;
-    protected $usersChanges = false;
-
-    protected $valuelists;
-    protected $valuelistsChanges = false;
-
-    protected $redirects;
-    protected $redirectsChanges = false;
-
-    protected $contentDbHandle;
-
-
-    /**
-     * Repository constructor.
-     * @param $storagePath
-     * @throws \Exception
-     */
-    public function __construct($storagePath)
-    {
-        $storagePath = realpath($storagePath);
-        if (is_dir($storagePath) && $storagePath !== false) {
-            $this->storagePath = $storagePath;
-        } else {
-            throw new \Exception('Repository not yet initialized.');
-        }
-    }
-
-    /**
-     * Creates the folder in which to create all storage related files
-     *
-     * @param $storagePath
-     * @return bool
-     */
-    public static function create($storagePath)
-    {
-        return mkdir($storagePath);
-    }
-
-    /**
-     * Initiates default storage
-     * @param $baseStorageDefaultPath
-     * @param $baseStorageSqlPath
-     */
-    public function init($baseStorageDefaultPath, $baseStorageSqlPath)
-    {
-        $storageDefaultPath = realpath($baseStorageDefaultPath);
-        $contentSqlPath = realpath($baseStorageSqlPath);
-
-        $this->initConfigStorage($storageDefaultPath);
-        $this->initContentDb($contentSqlPath);
-
-        $this->save();
-    }
-
-    /**
-     * Load filebased subset and return it's contents
-     *
-     * @param $name
-     * @return mixed|string
-     * @throws \Exception
-     */
-    public function __get($name)
-    {
-        if (isset($this->$name)) {
-            if (in_array($name, $this->fileBasedSubsets)) {
-                return $this->$name;
-            } else {
-                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);
-            }
-        }
-    }
-
-    /**
-     * Set filebased subset contents
-     * @param $name
-     * @param $value
-     * @throws \Exception
-     */
-    public function __set($name, $value)
-    {
-        if (in_array($name, $this->fileBasedSubsets)) {
-            $this->$name = $value;
-            $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>');
-        }
-    }
-
-    /**
-     * Persist all subsets
-     */
-    public function save()
-    {
-        $host = $this;
-        array_map(function ($value) use ($host) {
-            $host->saveSubset($value);
+	protected $storagePath;
+
+	protected $fileBasedSubsets = array('sitemap', 'applicationComponents', 'documentTypes', 'bricks', 'imageSet', 'images', 'files', 'users', 'valuelists', 'redirects');
+
+	protected $sitemap;
+	protected $sitemapChanges = false;
+
+	protected $applicationComponents;
+	protected $applicationComponentsChanges = false;
+
+	protected $documentTypes;
+	protected $documentTypesChanges = false;
+
+	protected $bricks;
+	protected $bricksChanges = false;
+
+	protected $imageSet;
+	protected $imageSetChanges = false;
+
+	protected $images;
+	protected $imagesChanges = false;
+
+	protected $files;
+	protected $filesChanges = false;
+
+	protected $users;
+	protected $usersChanges = false;
+
+	protected $valuelists;
+	protected $valuelistsChanges = false;
+
+	protected $redirects;
+	protected $redirectsChanges = false;
+
+	protected $contentDbHandle;
+
+
+	/**
+	 * Repository constructor.
+	 * @param $storagePath
+	 * @throws \Exception
+	 */
+	public function __construct($storagePath)
+	{
+		$storagePath = realpath($storagePath);
+		if (is_dir($storagePath) && $storagePath !== false) {
+			$this->storagePath = $storagePath;
+		} else {
+			throw new \Exception('Repository not yet initialized.');
+		}
+	}
+
+	/**
+	 * Creates the folder in which to create all storage related files
+	 *
+	 * @param $storagePath
+	 * @return bool
+	 */
+	public static function create($storagePath)
+	{
+		return mkdir($storagePath);
+	}
+
+	/**
+	 * Initiates default storage
+	 * @param $baseStorageDefaultPath
+	 * @param $baseStorageSqlPath
+	 */
+	public function init($baseStorageDefaultPath, $baseStorageSqlPath)
+	{
+		$storageDefaultPath = realpath($baseStorageDefaultPath);
+		$contentSqlPath = realpath($baseStorageSqlPath);
+
+		$this->initConfigStorage($storageDefaultPath);
+		$this->initContentDb($contentSqlPath);
+
+		$this->save();
+	}
+
+	/**
+	 * Load filebased subset and return it's contents
+	 *
+	 * @param $name
+	 * @return mixed|string
+	 * @throws \Exception
+	 */
+	public function __get($name)
+	{
+		if (isset($this->$name)) {
+			if (in_array($name, $this->fileBasedSubsets)) {
+				return $this->$name;
+			} else {
+				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);
+			}
+		}
+	}
+
+	/**
+	 * Set filebased subset contents
+	 * @param $name
+	 * @param $value
+	 * @throws \Exception
+	 */
+	public function __set($name, $value)
+	{
+		if (in_array($name, $this->fileBasedSubsets)) {
+			$this->$name = $value;
+			$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>');
+		}
+	}
+
+	/**
+	 * Persist all subsets
+	 */
+	public function save()
+	{
+		$host = $this;
+		array_map(function ($value) use ($host) {
+			$host->saveSubset($value);
 		}, $this->fileBasedSubsets);
-    }
-
-    /**
-     * Persist subset to disk
-     * @param $subset
-     */
-    public function saveSubset($subset)
-    {
+	}
+
+	/**
+	 * Persist subset to disk
+	 * @param $subset
+	 */
+	public function saveSubset($subset)
+	{
 		$changes = $subset . 'Changes';
 		if ($this->$changes === true) {
-            if (!defined('JSON_PRETTY_PRINT')) {
-                $json = json_encode($this->$subset);
-            } else {
-                $json = json_encode($this->$subset, JSON_PRETTY_PRINT);
-            }
+			if (!defined('JSON_PRETTY_PRINT')) {
+				$json = json_encode($this->$subset);
+			} else {
+				$json = json_encode($this->$subset, JSON_PRETTY_PRINT);
+			}
 			$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
 			file_put_contents($subsetStoragePath, $json);
 
 			$this->$changes = false;
 		}
-    }
-
-    /**
-     * Load subset from disk
-     * @param $subset
-     * @return mixed|string
-     */
-    protected function loadSubset($subset)
-    {
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
-        $json = file_get_contents($subsetStoragePath);
-        $json = json_decode($json);
-        $this->$subset = $json;
-        return $json;
-    }
-
-    /**
-     * @param $contentSqlPath
-     */
-    protected function initContentDb($contentSqlPath)
-    {
-        $db = $this->getContentDbHandle();
-        $sql = file_get_contents($contentSqlPath);
-        $db->exec($sql);
-    }
-
-    /**
-     * @param $storageDefaultPath
-     */
-    protected function initConfigStorage($storageDefaultPath)
-    {
-        $json = file_get_contents($storageDefaultPath);
-        $json = json_decode($json);
-        $this->initConfigIfNotExists($json, 'sitemap');
-        $this->initConfigIfNotExists($json, 'applicationComponents');
-        $this->initConfigIfNotExists($json, 'documentTypes');
-        $this->initConfigIfNotExists($json, 'bricks');
-        $this->initConfigIfNotExists($json, 'imageSet');
-        $this->initConfigIfNotExists($json, 'images');
-        $this->initConfigIfNotExists($json, 'files');
-        $this->initConfigIfNotExists($json, 'users');
-        $this->initConfigIfNotExists($json, 'valuelists');
-        $this->initConfigIfNotExists($json, 'redirects');
-    }
-
-    /**
-     * @return \PDO
-     */
-    public function getContentDbHandle()
-    {
-        if ($this->contentDbHandle === null) {
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
-        }
-        return $this->contentDbHandle;
-    }
+	}
+
+	/**
+	 * Load subset from disk
+	 * @param $subset
+	 * @return mixed|string
+	 */
+	protected function loadSubset($subset)
+	{
+		$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+		$json = file_get_contents($subsetStoragePath);
+		$json = json_decode($json);
+		$this->$subset = $json;
+		return $json;
+	}
+
+	/**
+	 * @param $contentSqlPath
+	 */
+	protected function initContentDb($contentSqlPath)
+	{
+		$db = $this->getContentDbHandle();
+		$sql = file_get_contents($contentSqlPath);
+		$db->exec($sql);
+	}
+
+	/**
+	 * @param $storageDefaultPath
+	 */
+	protected function initConfigStorage($storageDefaultPath)
+	{
+		$json = file_get_contents($storageDefaultPath);
+		$json = json_decode($json);
+		$this->initConfigIfNotExists($json, 'sitemap');
+		$this->initConfigIfNotExists($json, 'applicationComponents');
+		$this->initConfigIfNotExists($json, 'documentTypes');
+		$this->initConfigIfNotExists($json, 'bricks');
+		$this->initConfigIfNotExists($json, 'imageSet');
+		$this->initConfigIfNotExists($json, 'images');
+		$this->initConfigIfNotExists($json, 'files');
+		$this->initConfigIfNotExists($json, 'users');
+		$this->initConfigIfNotExists($json, 'valuelists');
+		$this->initConfigIfNotExists($json, 'redirects');
+	}
+
+	/**
+	 * @return \PDO
+	 */
+	public function getContentDbHandle()
+	{
+		if ($this->contentDbHandle === null) {
+			$this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
+		}
+		return $this->contentDbHandle;
+	}
 
 	/**
 	 * Get all documents
@@ -237,13 +237,13 @@ 
 	 * @return array
 	 * @throws \Exception
 	 */
-    public function getDocuments($state = 'published')
-    {
+	public function getDocuments($state = 'published')
+	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
 			throw new \Exception('Unsupported document state: ' . $state);
 		}
-        return $this->getDocumentsByPath('/', $state);
-    }
+		return $this->getDocumentsByPath('/', $state);
+	}
 
 	public function getDocumentsWithState($folderPath = '/')
 	{
@@ -290,51 +290,51 @@ 
 	 * @return array
 	 * @throws \Exception
 	 */
-    public function getDocumentsByPath($folderPath, $state = 'published')
-    {
-    	if (!in_array($state, Document::$DOCUMENT_STATES)) {
-    		throw new \Exception('Unsupported document state: ' . $state);
+	public function getDocumentsByPath($folderPath, $state = 'published')
+	{
+		if (!in_array($state, Document::$DOCUMENT_STATES)) {
+			throw new \Exception('Unsupported document state: ' . $state);
 		}
-        $db = $this->getContentDbHandle();
-        $folderPathWithWildcard = $folderPath . '%';
+		$db = $this->getContentDbHandle();
+		$folderPathWithWildcard = $folderPath . '%';
 
-        $sql = 'SELECT *
+		$sql = 'SELECT *
               FROM documents_' . $state . '
              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';
-        $stmt = $this->getDbStatement($sql);
+		$stmt = $this->getDbStatement($sql);
 
-        $documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
-        foreach ($documents as $key => $document) {
+		$documents = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
+		foreach ($documents as $key => $document) {
 			$documents = $this->setAssetsToDocumentFolders($document, $db, $documents, $key);
-        }
-        return $documents;
-    }
-
-
-    /**
-     * @param $path
-     * @return bool|Document
-     */
-    public function getDocumentContainerByPath($path)
-    {
-        $document = $this->getDocumentByPath($path, 'unpublished');
-        if ($document === false) {
-            return false;
-        }
-        $slugLength = strlen($document->slug);
-        $containerPath = substr($path, 0, -$slugLength);
-        if ($containerPath === '/') {
-            return $this->getRootFolder();
-        }
-        if (substr($containerPath, -1) === '/'){
+		}
+		return $documents;
+	}
+
+
+	/**
+	 * @param $path
+	 * @return bool|Document
+	 */
+	public function getDocumentContainerByPath($path)
+	{
+		$document = $this->getDocumentByPath($path, 'unpublished');
+		if ($document === false) {
+			return false;
+		}
+		$slugLength = strlen($document->slug);
+		$containerPath = substr($path, 0, -$slugLength);
+		if ($containerPath === '/') {
+			return $this->getRootFolder();
+		}
+		if (substr($containerPath, -1) === '/'){
 			$containerPath = substr($containerPath, 0, -1);
 		}
-        $containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
-        return $containerFolder;
-    }
+		$containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
+		return $containerFolder;
+	}
 
 	/**
 	 * @param        $path
@@ -343,23 +343,23 @@ 
 	 * @return bool|\CloudControl\Cms\storage\Document
 	 * @throws \Exception
 	 */
-    public function getDocumentByPath($path, $state = 'published')
-    {
+	public function getDocumentByPath($path, $state = 'published')
+	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
 			throw new \Exception('Unsupported document state: ' . $state);
 		}
-        $db = $this->getContentDbHandle();
-        $document = $this->fetchDocument('
+		$db = $this->getContentDbHandle();
+		$document = $this->fetchDocument('
             SELECT *
               FROM documents_' .  $state . '
              WHERE path = ' . $db->quote($path) . '
         ');
-        if ($document instanceof Document && $document->type === 'folder') {
-            $document->dbHandle = $db;
-            $document->documentStorage = new DocumentStorage($this);
-        }
-        return $document;
-    }
+		if ($document instanceof Document && $document->type === 'folder') {
+			$document->dbHandle = $db;
+			$document->documentStorage = new DocumentStorage($this);
+		}
+		return $document;
+	}
 
 	/**
 	 * Returns the count of all documents stored in the db
@@ -454,58 +454,58 @@ 
 	}
 
 	/**
-     * Return the results of the query as array of Documents
-     * @param $sql
-     * @return array
-     * @throws \Exception
-     */
-    protected function fetchAllDocuments($sql)
-    {
-        $stmt = $this->getDbStatement($sql);
-        return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
-    }
-
-    /**
-     * Return the result of the query as Document
-     * @param $sql
-     * @return mixed
-     * @throws \Exception
-     */
-    protected function fetchDocument($sql)
-    {
-        $stmt = $this->getDbStatement($sql);
-        return $stmt->fetchObject('\CloudControl\Cms\storage\Document');
-    }
-
-    /**
-     * Prepare the sql statement
-     * @param $sql
-     * @return \PDOStatement
-     * @throws \Exception
-     */
-    protected function getDbStatement($sql)
-    {
-        $db = $this->getContentDbHandle();
-        $stmt = $db->query($sql);
-        if ($stmt === false) {
-            $errorInfo = $db->errorInfo();
-            $errorMsg = $errorInfo[2];
-            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-        }
-        return $stmt;
-    }
-
-    /**
-     * Create a (non-existent) root folder Document and return it
-     * @return Document
-     */
-    protected function getRootFolder()
-    {
-        $rootFolder = new Document();
-        $rootFolder->path = '/';
-        $rootFolder->type = 'folder';
-        return $rootFolder;
-    }
+	 * Return the results of the query as array of Documents
+	 * @param $sql
+	 * @return array
+	 * @throws \Exception
+	 */
+	protected function fetchAllDocuments($sql)
+	{
+		$stmt = $this->getDbStatement($sql);
+		return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\storage\Document');
+	}
+
+	/**
+	 * Return the result of the query as Document
+	 * @param $sql
+	 * @return mixed
+	 * @throws \Exception
+	 */
+	protected function fetchDocument($sql)
+	{
+		$stmt = $this->getDbStatement($sql);
+		return $stmt->fetchObject('\CloudControl\Cms\storage\Document');
+	}
+
+	/**
+	 * Prepare the sql statement
+	 * @param $sql
+	 * @return \PDOStatement
+	 * @throws \Exception
+	 */
+	protected function getDbStatement($sql)
+	{
+		$db = $this->getContentDbHandle();
+		$stmt = $db->query($sql);
+		if ($stmt === false) {
+			$errorInfo = $db->errorInfo();
+			$errorMsg = $errorInfo[2];
+			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+		}
+		return $stmt;
+	}
+
+	/**
+	 * Create a (non-existent) root folder Document and return it
+	 * @return Document
+	 */
+	protected function getRootFolder()
+	{
+		$rootFolder = new Document();
+		$rootFolder->path = '/';
+		$rootFolder->type = 'folder';
+		return $rootFolder;
+	}
 
 	/**
 	 * Save the document to the database
@@ -517,13 +517,13 @@ 
 	 * @throws \Exception
 	 * @internal param $path
 	 */
-    public function saveDocument($documentObject, $state = 'published')
-    {
+	public function saveDocument($documentObject, $state = 'published')
+	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
 			throw new \Exception('Unsupported document state: ' . $state);
 		}
-        $db = $this->getContentDbHandle();
-        $stmt = $this->getDbStatement('
+		$db = $this->getContentDbHandle();
+		$stmt = $this->getDbStatement('
             INSERT OR REPLACE INTO documents_' . $state . ' (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
             VALUES(
               ' . $db->quote($documentObject->path) . ',
@@ -541,9 +541,9 @@ 
               ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
             )
         ');
-        $result = $stmt->execute();
-        return $result;
-    }
+		$result = $stmt->execute();
+		return $result;
+	}
 
 	/**
 	 * Delete the document from the database
@@ -554,29 +554,29 @@ 
 	 * @internal param string $state
 	 *
 	 */
-    public function deleteDocumentByPath($path)
-    {
-        $db = $this->getContentDbHandle();
-        $documentToDelete = $this->getDocumentByPath($path, 'unpublished');
-        if ($documentToDelete instanceof Document) {
-            if ($documentToDelete->type == 'document') {
-                $stmt = $this->getDbStatement('
+	public function deleteDocumentByPath($path)
+	{
+		$db = $this->getContentDbHandle();
+		$documentToDelete = $this->getDocumentByPath($path, 'unpublished');
+		if ($documentToDelete instanceof Document) {
+			if ($documentToDelete->type == 'document') {
+				$stmt = $this->getDbStatement('
                     DELETE FROM documents_unpublished
                           WHERE path = ' . $db->quote($path) . '
                 ');
-                $stmt->execute();
-            } elseif ($documentToDelete->type == 'folder') {
-                $folderPathWithWildcard = $path . '%';
-                $stmt = $this->getDbStatement('
+				$stmt->execute();
+			} elseif ($documentToDelete->type == 'folder') {
+				$folderPathWithWildcard = $path . '%';
+				$stmt = $this->getDbStatement('
                     DELETE FROM documents_unpublished
                           WHERE (path LIKE ' . $db->quote($folderPathWithWildcard) . '
                             AND substr(`path`, ' . (strlen($path) + 1) . ', 1) = "/")
                             OR path = ' . $db->quote($path) . '
                 ');
-                $stmt->execute();
-            }
-        }
-    }
+				$stmt->execute();
+			}
+		}
+	}
 
 	/**
 	 * @param $document
@@ -597,15 +597,15 @@ 
 		return $documents;
 	}
 
-    private function initConfigIfNotExists($json, $subsetName)
-    {
-        $subsetFileName = $this->storagePath . DIRECTORY_SEPARATOR . $subsetName . '.json';
-        if (file_exists($subsetFileName)) {
-            $this->loadSubset($subsetName);
-        } else {
-            $changes = $subsetName . 'Changes';
-            $this->$subsetName = $json->$subsetName;
-            $this->$changes = true;
-        }
-    }
+	private function initConfigIfNotExists($json, $subsetName)
+	{
+		$subsetFileName = $this->storagePath . DIRECTORY_SEPARATOR . $subsetName . '.json';
+		if (file_exists($subsetFileName)) {
+			$this->loadSubset($subsetName);
+		} else {
+			$changes = $subsetName . 'Changes';
+			$this->$subsetName = $json->$subsetName;
+			$this->$changes = true;
+		}
+	}
 }
\ No newline at end of file

src/storage/storage/RedirectsStorage.php

Indentation +83 added lines, -83 removed lines

@@ -10,94 +10,94 @@
 
 class RedirectsStorage extends AbstractStorage
 {
-    /**
-     * Get all redirects
-     *
-     * @return mixed
-     */
-    public function getRedirects()
-    {
-        $redirects = $this->repository->redirects;
-        if ($redirects === null) {
-            $redirects = array();
-        }
-        usort($redirects, array($this, 'cmp'));
-        return $redirects;
-    }
+	/**
+	 * Get all redirects
+	 *
+	 * @return mixed
+	 */
+	public function getRedirects()
+	{
+		$redirects = $this->repository->redirects;
+		if ($redirects === null) {
+			$redirects = array();
+		}
+		usort($redirects, array($this, 'cmp'));
+		return $redirects;
+	}
 
-    /**
-     * Add a new redirect
-     * @param $postValues
-     */
-    public function addRedirect($postValues) {
-        $redirectObject = RedirectsFactory::createRedirectFromPostValues($postValues);
-        $redirects = $this->repository->redirects;
-        $redirects[] = $redirectObject;
-        $this->repository->redirects = $redirects;
-        $this->save();
-    }
+	/**
+	 * Add a new redirect
+	 * @param $postValues
+	 */
+	public function addRedirect($postValues) {
+		$redirectObject = RedirectsFactory::createRedirectFromPostValues($postValues);
+		$redirects = $this->repository->redirects;
+		$redirects[] = $redirectObject;
+		$this->repository->redirects = $redirects;
+		$this->save();
+	}
 
-    /**
-     * Get a redirect by it's slug
-     *
-     * @param $slug
-     * @return \stdClass|null
-     */
-    public function getRedirectBySlug($slug)
-    {
-        $redirects = $this->repository->redirects;
-        foreach ($redirects as $redirect) {
-            if ($redirect->slug == $slug) {
-                return $redirect;
-            }
-        }
+	/**
+	 * Get a redirect by it's slug
+	 *
+	 * @param $slug
+	 * @return \stdClass|null
+	 */
+	public function getRedirectBySlug($slug)
+	{
+		$redirects = $this->repository->redirects;
+		foreach ($redirects as $redirect) {
+			if ($redirect->slug == $slug) {
+				return $redirect;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Save a redirect by it's slug
-     * @param $slug
-     * @param $postValues
-     */
-    public function saveRedirect($slug, $postValues)
-    {
-        $redirectObject = RedirectsFactory::createRedirectFromPostValues($postValues);
+	/**
+	 * Save a redirect by it's slug
+	 * @param $slug
+	 * @param $postValues
+	 */
+	public function saveRedirect($slug, $postValues)
+	{
+		$redirectObject = RedirectsFactory::createRedirectFromPostValues($postValues);
 
-        $redirects = $this->repository->redirects;
-        foreach ($redirects as $key => $redirect) {
-            if ($redirect->slug == $slug) {
-                $redirects[$key] = $redirectObject;
-            }
-        }
-        $this->repository->redirects = $redirects;
-        $this->save();
-    }
+		$redirects = $this->repository->redirects;
+		foreach ($redirects as $key => $redirect) {
+			if ($redirect->slug == $slug) {
+				$redirects[$key] = $redirectObject;
+			}
+		}
+		$this->repository->redirects = $redirects;
+		$this->save();
+	}
 
-    /**
-     * Delete a redirect by it's slug
-     * @param $slug
-     */
-    public function deleteRedirectBySlug($slug)
-    {
-        $redirects = $this->repository->redirects;
-        foreach ($redirects as $key => $redirect) {
-            if ($redirect->slug == $slug) {
-                unset($redirects[$key]);
-            }
-        }
-        $redirects = array_values($redirects);
-        $this->repository->redirects = $redirects;
-        $this->save();
-    }
+	/**
+	 * Delete a redirect by it's slug
+	 * @param $slug
+	 */
+	public function deleteRedirectBySlug($slug)
+	{
+		$redirects = $this->repository->redirects;
+		foreach ($redirects as $key => $redirect) {
+			if ($redirect->slug == $slug) {
+				unset($redirects[$key]);
+			}
+		}
+		$redirects = array_values($redirects);
+		$this->repository->redirects = $redirects;
+		$this->save();
+	}
 
-    /**
-     * Compare a redirect by it's title
-     * @param $a
-     * @param $b
-     * @return int
-     */
-    public static function cmp($a, $b) {
-        return strcmp($a->title, $b->title);
-    }
+	/**
+	 * Compare a redirect by it's title
+	 * @param $a
+	 * @param $b
+	 * @return int
+	 */
+	public static function cmp($a, $b) {
+		return strcmp($a->title, $b->title);
+	}
 }
\ No newline at end of file

src/storage/storage/FilesStorage.php

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