jenskooij / cloudcontrol

src/search/Search.php

Spacing +12 added lines, -12 removed lines

@@ -79,13 +79,13 @@ 
 		if (!$stmt = $db->query($sql)) {
 			$errorInfo = $db->errorInfo();
 			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
 		}
 		$result = $stmt->fetch(\PDO::FETCH_COLUMN);
 		if (false === $result) {
 			$errorInfo = $db->errorInfo();
 			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
 		}
 		return intval($result);
 	}
@@ -118,7 +118,7 @@ 
 	protected function applyFilters($tokens)
 	{
 		foreach ($this->filters as $filterName) {
-			$filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
+			$filterClassName = '\CloudControl\Cms\search\filters\\'.$filterName;
 			$filter = new $filterClassName($tokens);
 			$tokens = $filter->getFilterResults();
 		}
@@ -154,13 +154,13 @@ 
 		  GROUP BY term_frequency.documentPath, term_frequency.term
 		  ORDER BY score DESC
 		';
-		if(!$stmt = $db->prepare($sql)) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+		if (!$stmt = $db->prepare($sql)) {
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 		}
 		$stmt->bindValue(':query', $token);
 		$stmt->bindValue(':queryNorm', $queryNorm);
 		if (!$stmt->execute()) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 		}
 		return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchResult');
 	}
@@ -216,13 +216,13 @@ 
 		$sql = '
 			SELECT (1 / sqrt(SUM(inverseDocumentFrequency))) as queryNorm
 			  FROM inverse_document_frequency
-			 WHERE term IN (' . $terms . ') 
+			 WHERE term IN (' . $terms.') 
 		';
-		if(!$stmt = $db->prepare($sql)) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+		if (!$stmt = $db->prepare($sql)) {
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 		}
 		if (!$stmt->execute()) {
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 		}
 		$result = $stmt->fetch(\PDO::FETCH_OBJ);
 		return $result->queryNorm == null ? 1 : $result->queryNorm;
@@ -272,11 +272,11 @@ 
 			';
 			$stmt = $db->prepare($sql);
 			if ($stmt === false) {
-				throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+				throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 			}
 			$stmt->bindValue(':token', $token);
 			if (($stmt === false) | (!$stmt->execute())) {
-				throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
+				throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
 			}
 			$result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchSuggestion');
 			$allResults = array_merge($result, $allResults);

src/search/SearchDbConnected.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 	protected function configureDatabase()
 	{
 		$db = $this->getSearchDbHandle();
-		$sqlPath = __DIR__ . DIRECTORY_SEPARATOR . '../cc/install/search.sql';
+		$sqlPath = __DIR__.DIRECTORY_SEPARATOR.'../cc/install/search.sql';
 		$searchSql = file_get_contents($sqlPath);
 		$db->exec($searchSql);
 	}
@@ -69,8 +69,8 @@ 
 	protected function getSearchDbHandle()
 	{
 		if ($this->searchDbHandle === null) {
-			$path = $this->storageDir . DIRECTORY_SEPARATOR;
-			$this->searchDbHandle = new \PDO('sqlite:' . $path . 'search.db');
+			$path = $this->storageDir.DIRECTORY_SEPARATOR;
+			$this->searchDbHandle = new \PDO('sqlite:'.$path.'search.db');
 		}
 		return $this->searchDbHandle;
 	}

src/search/Indexer.php

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 		$this->storage->getDocuments()->cleanPublishedDeletedDocuments();
 		$this->addLog('Retrieving documents to be indexed.');
 		$documents = $this->storage->getDocuments()->getPublishedDocumentsNoFolders();
-		$this->addLog('Start Document Term Count for ' . count($documents) . ' documents');
+		$this->addLog('Start Document Term Count for '.count($documents).' documents');
 		$this->createDocumentTermCount($documents);
 		$this->addLog('Start Document Term Frequency.');
 		$this->createDocumentTermFrequency();
@@ -161,7 +161,7 @@ 
 	private function addLog($string)
 	{
 		$currentTime = round(microtime(true) * 1000);
-		$this->log .= date('d-m-Y H:i:s - ') . str_pad($string, 50, " ", STR_PAD_RIGHT) . "\t" . ($currentTime - $this->lastLog) . 'ms since last log. ' . "\t" . ($currentTime - $this->loggingStart) . 'ms since start.' . PHP_EOL;
+		$this->log .= date('d-m-Y H:i:s - ').str_pad($string, 50, " ", STR_PAD_RIGHT)."\t".($currentTime - $this->lastLog).'ms since last log. '."\t".($currentTime - $this->loggingStart).'ms since start.'.PHP_EOL;
 		$this->lastLog = round(microtime(true) * 1000);
 	}
 
@@ -173,8 +173,8 @@ 
 	protected function getSearchDbHandle()
 	{
 		if ($this->searchDbHandle === null) {
-			$path = $this->storageDir . DIRECTORY_SEPARATOR;
-			$this->searchDbHandle = new \PDO('sqlite:' . $path . self::SEARCH_TEMP_DB);
+			$path = $this->storageDir.DIRECTORY_SEPARATOR;
+			$this->searchDbHandle = new \PDO('sqlite:'.$path.self::SEARCH_TEMP_DB);
 		}
 		return $this->searchDbHandle;
 	}
@@ -185,7 +185,7 @@ 
 	public function replaceOldIndex()
 	{
 		$this->searchDbHandle = null;
-		$path = $this->storageDir . DIRECTORY_SEPARATOR;
-		rename($path . self::SEARCH_TEMP_DB, $path . 'search.db');
+		$path = $this->storageDir.DIRECTORY_SEPARATOR;
+		rename($path.self::SEARCH_TEMP_DB, $path.'search.db');
 	}
 }
\ No newline at end of file

src/storage/Storage.php

Indentation +48 added lines, -48 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 namespace CloudControl\Cms\storage {
 
-    use CloudControl\Cms\storage\factories\DocumentFolderFactory;
-    use CloudControl\Cms\storage\storage\ApplicationComponentsStorage;
-    use CloudControl\Cms\storage\storage\BricksStorage;
-    use CloudControl\Cms\storage\storage\DocumentStorage;
-    use CloudControl\Cms\storage\storage\DocumentTypesStorage;
-    use CloudControl\Cms\storage\storage\FilesStorage;
-    use CloudControl\Cms\storage\storage\ImageSetStorage;
-    use CloudControl\Cms\storage\storage\ImagesStorage;
-    use CloudControl\Cms\storage\storage\RedirectsStorage;
-    use CloudControl\Cms\storage\storage\SitemapStorage;
-    use CloudControl\Cms\storage\storage\UsersStorage;
-    use CloudControl\Cms\storage\storage\ValuelistsStorage;
+	use CloudControl\Cms\storage\factories\DocumentFolderFactory;
+	use CloudControl\Cms\storage\storage\ApplicationComponentsStorage;
+	use CloudControl\Cms\storage\storage\BricksStorage;
+	use CloudControl\Cms\storage\storage\DocumentStorage;
+	use CloudControl\Cms\storage\storage\DocumentTypesStorage;
+	use CloudControl\Cms\storage\storage\FilesStorage;
+	use CloudControl\Cms\storage\storage\ImageSetStorage;
+	use CloudControl\Cms\storage\storage\ImagesStorage;
+	use CloudControl\Cms\storage\storage\RedirectsStorage;
+	use CloudControl\Cms\storage\storage\SitemapStorage;
+	use CloudControl\Cms\storage\storage\UsersStorage;
+	use CloudControl\Cms\storage\storage\ValuelistsStorage;
 
-    /**
+	/**
 	 * Class JsonStorage
-     * @package CloudControl\Cms\storage
+	 * @package CloudControl\Cms\storage
 	 */
 	class Storage
 	{
@@ -61,20 +61,20 @@ 
 		 * @var DocumentStorage
 		 */
 		protected $documents;
-        /**
-         * @var RedirectsStorage
-         */
-        protected $redirects;
-        /**
-         * @var String
-         */
-        protected $imagesDir;
-        /**
-         * @var String
-         */
-        protected $filesDir;
+		/**
+		 * @var RedirectsStorage
+		 */
+		protected $redirects;
+		/**
+		 * @var String
+		 */
+		protected $imagesDir;
+		/**
+		 * @var String
+		 */
+		protected $filesDir;
 
-        /**
+		/**
 		 * @var String
 		 */
 		private $storageDir;
@@ -83,18 +83,18 @@ 
 		 */
 		private $repository;
 
-        /**
-         * JsonStorage constructor.
-         *
-         * @param string $storageDir
-         * @param $imagesDir
-         * @param $filesDir
-         */
-        public function __construct($storageDir, $imagesDir, $filesDir)
+		/**
+		 * JsonStorage constructor.
+		 *
+		 * @param string $storageDir
+		 * @param $imagesDir
+		 * @param $filesDir
+		 */
+		public function __construct($storageDir, $imagesDir, $filesDir)
 		{
 			$this->storageDir = $storageDir;
-            $this->imagesDir = $imagesDir;
-            $this->filesDir = $filesDir;
+			$this->imagesDir = $imagesDir;
+			$this->filesDir = $filesDir;
 			$this->config();
 		}
 
@@ -238,7 +238,7 @@ 
 		{
 			if (!$this->images instanceof ImagesStorage) {
 
-                $this->images = new ImagesStorage($this->repository, $this->imagesDir);
+				$this->images = new ImagesStorage($this->repository, $this->imagesDir);
 			}
 			return $this->images;
 		}
@@ -337,16 +337,16 @@ 
 			return $this->valuelists;
 		}
 
-        /**
-         * @return \CloudControl\Cms\storage\storage\RedirectsStorage
-         */
-        public function getRedirects()
-        {
-            if (!$this->redirects instanceof RedirectsStorage) {
-                $this->redirects = new RedirectsStorage($this->repository);
-            }
-            return $this->redirects;
-        }
+		/**
+		 * @return \CloudControl\Cms\storage\storage\RedirectsStorage
+		 */
+		public function getRedirects()
+		{
+			if (!$this->redirects instanceof RedirectsStorage) {
+				$this->redirects = new RedirectsStorage($this->repository);
+			}
+			return $this->redirects;
+		}
 
 	}
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -113,7 +113,7 @@ 
 					$repository->init();
 					$this->repository = $repository;
 				} else {
-					throw new \Exception('Could not create repository directory: ' . $storagePath);
+					throw new \Exception('Could not create repository directory: '.$storagePath);
 				}
 			} else {
 				$this->repository = new Repository($storagePath);
@@ -156,9 +156,9 @@ 
 		{
 			$documentFolderObject = DocumentFolderFactory::createDocumentFolderFromPostValues($postValues);
 			if ($postValues['path'] === '/') {
-				$documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+				$documentFolderObject->path = $postValues['path'].$documentFolderObject->slug;
 			} else {
-				$documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+				$documentFolderObject->path = $postValues['path'].'/'.$documentFolderObject->slug;
 			}
 			$this->repository->saveDocument($documentFolderObject, 'published');
 			$this->repository->saveDocument($documentFolderObject, 'unpublished');
@@ -173,7 +173,7 @@ 
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->deleteDocumentByPath($path, 'published');
 			$this->repository->deleteDocumentByPath($path, 'unpublished');
 			$this->repository->cleanPublishedDeletedDocuments();
@@ -181,13 +181,13 @@ 
 
 		public function publishDocumentBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->publishDocumentByPath($path);
 		}
 
 		public function unpublishDocumentBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 			$this->repository->unpublishDocumentByPath($path);
 		}
 
@@ -201,7 +201,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-			$path = '/' . $slug;
+			$path = '/'.$slug;
 
 			return $this->repository->getDocumentByPath($path);
 		}

src/storage/Repository.php

Indentation +329 added lines, -329 removed lines

@@ -24,221 +24,221 @@ 
  */
 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)
-    {
-        // TODO Make sure storage isnt overwritten when its already initialized
-        $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)
+	{
+		// TODO Make sure storage isnt overwritten when its already initialized
+		$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->sitemap = $json->sitemap;
-        $this->sitemapChanges = true;
-        $this->applicationComponents = $json->applicationComponents;
-        $this->applicationComponentsChanges = true;
-        $this->documentTypes = $json->documentTypes;
-        $this->documentTypesChanges = true;
-        $this->bricks = $json->bricks;
-        $this->bricksChanges = true;
-        $this->imageSet = $json->imageSet;
-        $this->imageSetChanges = true;
-        $this->images = $json->images;
-        $this->imagesChanges = true;
-        $this->files = $json->files;
-        $this->filesChanges = true;
-        $this->users = $json->users;
-        $this->usersChanges = true;
-        $this->valuelists = $json->valuelists;
-        $this->valuelistsChanges = true;
-        $this->redirects = $json->redirects;
-        $this->redirectsChanges = true;
-    }
-
-    /**
-     * @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->sitemap = $json->sitemap;
+		$this->sitemapChanges = true;
+		$this->applicationComponents = $json->applicationComponents;
+		$this->applicationComponentsChanges = true;
+		$this->documentTypes = $json->documentTypes;
+		$this->documentTypesChanges = true;
+		$this->bricks = $json->bricks;
+		$this->bricksChanges = true;
+		$this->imageSet = $json->imageSet;
+		$this->imageSetChanges = true;
+		$this->images = $json->images;
+		$this->imagesChanges = true;
+		$this->files = $json->files;
+		$this->filesChanges = true;
+		$this->users = $json->users;
+		$this->usersChanges = true;
+		$this->valuelists = $json->valuelists;
+		$this->valuelistsChanges = true;
+		$this->redirects = $json->redirects;
+		$this->redirectsChanges = true;
+	}
+
+	/**
+	 * @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
@@ -248,13 +248,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 = '/')
 	{
@@ -301,51 +301,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
@@ -354,23 +354,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
@@ -465,58 +465,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
@@ -528,13 +528,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) . ',
@@ -552,9 +552,9 @@ 
               ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
             )
         ');
-        $result = $stmt->execute();
-        return $result;
-    }
+		$result = $stmt->execute();
+		return $result;
+	}
 
 	/**
 	 * Delete the document from the database
@@ -565,29 +565,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