jenskooij / cloudcontrol

src/cc/Application.php

Doc Comments +5 added lines, -2 removed lines

@@ -83,6 +83,9 @@ 
             $this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
         }
 
+        /**
+         * @param Request $request
+         */
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
@@ -112,7 +115,7 @@ 
          * Loop through sitemap items and see if one matches the requestUri.
          * If it does, add it tot the matchedSitemapItems array
          *
-         * @param $request
+         * @param Request $request
          */
         private function sitemapMatching($request)
         {
@@ -177,7 +180,7 @@ 
          * @param array $parameters
          * @param \stdClass|null $matchedSitemapItem
          *
-         * @return mixed
+         * @return Component
          * @throws \Exception
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)

Spacing +11 added lines, -11 removed lines

@@ -66,7 +66,7 @@ 
          */
         private function config()
         {
-            $configPath = __DIR__ . '/../../config.json';
+            $configPath = __DIR__.'/../../config.json';
             if (realpath($configPath) !== false) {
                 $json = file_get_contents($configPath);
                 $this->config = json_decode($json);
@@ -80,13 +80,13 @@ 
          */
         private function storage()
         {
-            $this->storage = new Storage($this->config->rootDir . DIRECTORY_SEPARATOR . $this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
+            $this->storage = new Storage($this->config->rootDir.DIRECTORY_SEPARATOR.$this->config->storageDir, $this->config->imagesDir, $this->config->filesDir);
         }
 
         private function redirectMatching($request)
         {
             $redirects = $this->storage->getRedirects()->getRedirects();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($redirects as $redirect) {
                 if (preg_match_all($redirect->fromUrl, $relativeUri, $matches)) {
@@ -96,10 +96,10 @@ 
                     }
                     if ($redirect->type == '301') {
                         header('HTTP/1.1 301 Moved Permanently');
-                        header('Location: ' . $request::$subfolders . $toUrl);
+                        header('Location: '.$request::$subfolders.$toUrl);
                         exit;
                     } elseif ($redirect->type == '302') {
-                        header('Location: ' . $request::$subfolders . $toUrl, true, 302);
+                        header('Location: '.$request::$subfolders.$toUrl, true, 302);
                         exit;
                     } else {
                         throw new \Exception('Invalid redirect type.');
@@ -117,7 +117,7 @@ 
         private function sitemapMatching($request)
         {
             $sitemap = $this->storage->getSitemap()->getSitemap();
-            $relativeUri = '/' . $request::$relativeUri;
+            $relativeUri = '/'.$request::$relativeUri;
 
             foreach ($sitemap as $sitemapItem) {
                 if ($sitemapItem->regex) {
@@ -182,15 +182,15 @@ 
          */
         private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem)
         {
-            $libraryComponentName = '\\CloudControl\Cms\\components\\' . $class;
-            $userComponentName = '\\components\\' . $class;
+            $libraryComponentName = '\\CloudControl\Cms\\components\\'.$class;
+            $userComponentName = '\\components\\'.$class;
 
             if (!class_exists($libraryComponentName, false)) {
                 $component = new $libraryComponentName($template, $this->request, $parameters, $matchedSitemapItem);
             } elseif (!class_exists($userComponentName, false)) {
                 $component = new $userComponentName($template, $this->request, $parameters, $matchedSitemapItem);
             } else {
-                throw new \Exception('Could not load component ' . $class);
+                throw new \Exception('Could not load component '.$class);
             }
 
             if (!$component instanceof Component) {
@@ -248,8 +248,8 @@ 
          */
         public function setCachingHeaders()
         {
-            header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
-            header("Cache-Control: max-age=" . (60 * 60 * 24 * 2));
+            header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + (60 * 60 * 24 * 2))); // 2 days
+            header("Cache-Control: max-age=".(60 * 60 * 24 * 2));
         }
 
         /**

src/storage/storage/FilesStorage.php

Doc Comments +5 added lines, -1 removed lines

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

src/components/BaseComponent.php

Spacing +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 		 * @param array   $parameters
 		 * @param         $matchedSitemapItem
 		 */
-		public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
+		public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
 		{
 			$this->template = $template;
 			$this->request = $request;
@@ -66,7 +66,7 @@ 
 		 *
 		 * @throws \Exception
 		 */
-		public function render($application=null)
+		public function render($application = null)
 		{
 			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
 		}
@@ -92,13 +92,13 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
 		    $templateDir = $this->getTemplateDir($template, $application);
 		    if ($application !== null) {
                 $rootDir = $application->getRootDir();
                 if (strpos($templateDir, $rootDir) === false) {
-                    $templatePath = $rootDir . DIRECTORY_SEPARATOR . $templateDir;
+                    $templatePath = $rootDir.DIRECTORY_SEPARATOR.$templateDir;
                 } else {
                     $templatePath = $templateDir;
                 }
@@ -121,7 +121,7 @@ 
 				return ob_get_contents();
 			} else {
 				if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-					throw new \Exception('Couldnt find template ' . $templatePath);
+					throw new \Exception('Couldnt find template '.$templatePath);
 				}
 			}
 		}
@@ -136,7 +136,7 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function includeTemplate($template='', $parameters = array())
+		public function includeTemplate($template = '', $parameters = array())
 		{
 			if (is_array($parameters)) {
 				foreach ($parameters as $name => $value) {
@@ -156,13 +156,13 @@ 
          * @param null | Application $application
          * @return string
          */
-        protected function getTemplateDir($template, $application=null)
+        protected function getTemplateDir($template, $application = null)
         {
             $templatePath = '';
             if ($application !== null) {
                 $templatePath = $application->getTemplateDir();
             }
-            $templatePath = $templatePath . $template . '.php';
+            $templatePath = $templatePath.$template.'.php';
             return $templatePath;
         }
     }

src/components/CmsComponent.php

Spacing +4 added lines, -4 removed lines

@@ -170,7 +170,7 @@ 
 				$whitelistIps = explode(',', $this->parameters[self::PARAMETER_WHITELIST_IPS]);
 				$whitelistIps = array_map("trim", $whitelistIps);
 				if (!in_array($remoteAddress, $whitelistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is not on whitelist');
+					throw new \Exception('Ip address '.$remoteAddress.' is not on whitelist');
 				}
 			}
 		}
@@ -186,7 +186,7 @@ 
 				$blacklistIps = explode(',', $this->parameters[self::PARAMETER_BLACKLIST_IPS]);
 				$blacklistIps = array_map("trim", $blacklistIps);
 				if (in_array($remoteAddress, $blacklistIps)) {
-					throw new \Exception('Ip address ' . $remoteAddress . ' is on blacklist');
+					throw new \Exception('Ip address '.$remoteAddress.' is on blacklist');
 				}
 			}
 		}
@@ -230,7 +230,7 @@ 
 			if ($relativeCmsUri == '/log-off') {
 				$_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL] = null;
 				unset($_SESSION[self::SESSION_PARAMETER_CLOUD_CONTROL]);
-				header('Location: ' . $request::$subfolders . $this->parameters[self::PARAMETER_CMS_PREFIX]);
+				header('Location: '.$request::$subfolders.$this->parameters[self::PARAMETER_CMS_PREFIX]);
 				exit;
 			}
 		}
@@ -371,7 +371,7 @@ 
 
         protected function getTemplateDir($template, $application = null)
         {
-            return __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
+            return __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.$template.'.php';
         }
     }
 }
\ No newline at end of file

src/components/cms/FilesRouting.php

Spacing +8 added lines, -8 removed lines

@@ -40,20 +40,20 @@ 
 	{
 		$file = $cmsComponent->storage->getFiles()->getFileByName($slug);
 		$path = realpath($cmsComponent->storage->getFiles()->getFilesDir());
-		$quoted = sprintf('"%s"', addcslashes(basename($path . '/' . $file->file), '"\\'));
-		$size = filesize($path . '/' . $file->file);
+		$quoted = sprintf('"%s"', addcslashes(basename($path.'/'.$file->file), '"\\'));
+		$size = filesize($path.'/'.$file->file);
 
 		header('Content-Description: File Transfer');
-		header('Content-Type: ' . $file->type);
-		header('Content-Disposition: attachment; filename=' . $quoted);
+		header('Content-Type: '.$file->type);
+		header('Content-Disposition: attachment; filename='.$quoted);
 		header('Content-Transfer-Encoding: binary');
 		header('Connection: Keep-Alive');
 		header('Expires: 0');
 		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 		header('Pragma: public');
-		header('Content-Length: ' . $size);
+		header('Content-Length: '.$size);
 
-		readfile($path . '/' . $file->file);
+		readfile($path.'/'.$file->file);
 		exit;
 	}
 
@@ -77,7 +77,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_FILES);
 		if (isset($_FILES[CmsComponent::FILES_PARAMETER_FILE])) {
 			$cmsComponent->storage->getFiles()->addFile($_FILES[CmsComponent::FILES_PARAMETER_FILE]);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 			exit;
 		}
 	}
@@ -89,7 +89,7 @@ 
 	private function deleteRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getFiles()->deleteFileByName($request::$get[CmsComponent::FILES_PARAMETER_FILE]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/files');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/files');
 		exit;
 	}
 

src/util/functions.php

Spacing +11 added lines, -11 removed lines

@@ -11,7 +11,7 @@ 
 {
     $debug_backtrace = current(debug_backtrace());
     if (PHP_SAPI == 'cli') {
-        echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+        echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
         foreach (func_get_args() as $data) {
             var_dump($data);
         }
@@ -29,7 +29,7 @@ 
 <body>
 END;
 
-        echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+        echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
         echo '<pre>';
         foreach (func_get_args() as $data) {
             echo "<code>";
@@ -55,9 +55,9 @@ 
 {
     if (!isset($_GET['unsanitized'])) {
         $search = array(
-            '/\>[^\S ]+/s',     // strip whitespaces after tags, except space
-            '/[^\S ]+\</s',     // strip whitespaces before tags, except space
-            '/(\s)+/s',         // shorten multiple whitespace sequences
+            '/\>[^\S ]+/s', // strip whitespaces after tags, except space
+            '/[^\S ]+\</s', // strip whitespaces before tags, except space
+            '/(\s)+/s', // shorten multiple whitespace sequences
             '/<!--(.|\s)*?-->/' // Remove HTML comments
         );
 
@@ -85,7 +85,7 @@ 
  */
 function utf8Convert($array)
 {
-    array_walk_recursive($array, function (&$item) {
+    array_walk_recursive($array, function(&$item) {
         if (!mb_detect_encoding($item, 'utf-8', true)) {
             $item = utf8_encode($item);
         }
@@ -105,8 +105,8 @@ 
 function getRelativePath($from, $to)
 {
     // some compatibility fixes for Windows paths
-    $from = is_dir($from) ? rtrim($from, '\/') . DIRECTORY_SEPARATOR : $from;
-    $to = is_dir($to) ? rtrim($to, '\/') . DIRECTORY_SEPARATOR : $to;
+    $from = is_dir($from) ? rtrim($from, '\/').DIRECTORY_SEPARATOR : $from;
+    $to = is_dir($to) ? rtrim($to, '\/').DIRECTORY_SEPARATOR : $to;
     $from = str_replace('\\', DIRECTORY_SEPARATOR, $from);
     $to = str_replace('\\', DIRECTORY_SEPARATOR, $to);
 
@@ -128,13 +128,13 @@ 
                 $relPath = array_pad($relPath, $padLength, '..');
                 break;
             } else {
-                $relPath[0] = '.' . DIRECTORY_SEPARATOR . $relPath[0];
+                $relPath[0] = '.'.DIRECTORY_SEPARATOR.$relPath[0];
             }
         }
     }
     $relPath = implode(DIRECTORY_SEPARATOR, $relPath);
-    while (strpos($relPath, '.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR) !== false) {
-        $relPath = str_replace('.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR, '.' . DIRECTORY_SEPARATOR, $relPath);
+    while (strpos($relPath, '.'.DIRECTORY_SEPARATOR.'.'.DIRECTORY_SEPARATOR) !== false) {
+        $relPath = str_replace('.'.DIRECTORY_SEPARATOR.'.'.DIRECTORY_SEPARATOR, '.'.DIRECTORY_SEPARATOR, $relPath);
     }
     return $relPath;
 }
\ No newline at end of file

src/storage/Repository.php

Spacing +54 added lines, -54 removed lines

@@ -116,13 +116,13 @@ 
             if (in_array($name, $this->fileBasedSubsets)) {
                 return $this->$name;
             } else {
-                throw new \Exception('Trying to get undefined property from Repository: ' . $name);
+                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);
+                throw new \Exception('Trying to get undefined property from Repository: '.$name);
             }
         }
     }
@@ -137,10 +137,10 @@ 
     {
         if (in_array($name, $this->fileBasedSubsets)) {
             $this->$name = $value;
-            $changes = $name . 'Changes';
+            $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>');
+            throw new \Exception('Trying to persist unknown subset in repository: '.$name.' <br /><pre>'.print_r($value, true).'</pre>');
         }
     }
 
@@ -150,7 +150,7 @@ 
     public function save()
     {
         $host = $this;
-        array_map(function ($value) use ($host) {
+        array_map(function($value) use ($host) {
             $host->saveSubset($value);
 		}, $this->fileBasedSubsets);
     }
@@ -161,14 +161,14 @@ 
      */
     public function saveSubset($subset)
     {
-		$changes = $subset . 'Changes';
+		$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);
             }
-			$subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+			$subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
 			file_put_contents($subsetStoragePath, $json);
 
 			$this->$changes = false;
@@ -182,7 +182,7 @@ 
      */
     protected function loadSubset($subset)
     {
-        $subsetStoragePath = $this->storagePath . DIRECTORY_SEPARATOR . $subset . '.json';
+        $subsetStoragePath = $this->storagePath.DIRECTORY_SEPARATOR.$subset.'.json';
         $json = file_get_contents($subsetStoragePath);
         $json = json_decode($json);
         $this->$subset = $json;
@@ -224,7 +224,7 @@ 
     public function getContentDbHandle()
     {
         if ($this->contentDbHandle === null) {
-            $this->contentDbHandle = new \PDO('sqlite:' . $this->storagePath . DIRECTORY_SEPARATOR . 'content.db');
+            $this->contentDbHandle = new \PDO('sqlite:'.$this->storagePath.DIRECTORY_SEPARATOR.'content.db');
         }
         return $this->contentDbHandle;
     }
@@ -240,7 +240,7 @@ 
     public function getDocuments($state = 'published')
     {
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
         return $this->getDocumentsByPath('/', $state);
     }
@@ -248,7 +248,7 @@ 
 	public function getDocumentsWithState($folderPath = '/')
 	{
 		$db = $this->getContentDbHandle();
-		$folderPathWithWildcard = $folderPath . '%';
+		$folderPathWithWildcard = $folderPath.'%';
 
 		$ifRootIndex = 1;
 		if ($folderPath == '/') {
@@ -263,10 +263,10 @@ 
               FROM documents_unpublished
 		 LEFT JOIN documents_published
          		ON documents_published.path = documents_unpublished.path
-             WHERE documents_unpublished.`path` LIKE ' . $db->quote($folderPathWithWildcard) . '
-               AND substr(documents_unpublished.`path`, ' . (strlen($folderPath) + $ifRootIndex + 1) . ') NOT LIKE "%/%"
-               AND length(documents_unpublished.`path`) > ' . (strlen($folderPath) + $ifRootIndex) . '
-               AND documents_unpublished.path != ' . $db->quote($folderPath) . '
+             WHERE documents_unpublished.`path` LIKE ' . $db->quote($folderPathWithWildcard).'
+               AND substr(documents_unpublished.`path`, ' . (strlen($folderPath) + $ifRootIndex + 1).') NOT LIKE "%/%"
+               AND length(documents_unpublished.`path`) > ' . (strlen($folderPath) + $ifRootIndex).'
+               AND documents_unpublished.path != ' . $db->quote($folderPath).'
           ORDER BY documents_unpublished.`type` DESC, documents_unpublished.`path` ASC
         ';
 		$stmt = $this->getDbStatement($sql);
@@ -293,16 +293,16 @@ 
     public function getDocumentsByPath($folderPath, $state = 'published')
     {
     	if (!in_array($state, Document::$DOCUMENT_STATES)) {
-    		throw new \Exception('Unsupported document state: ' . $state);
+    		throw new \Exception('Unsupported document state: '.$state);
 		}
         $db = $this->getContentDbHandle();
-        $folderPathWithWildcard = $folderPath . '%';
+        $folderPathWithWildcard = $folderPath.'%';
 
         $sql = 'SELECT *
-              FROM documents_' . $state . '
-             WHERE `path` LIKE ' . $db->quote($folderPathWithWildcard) . '
-               AND substr(`path`, ' . (strlen($folderPath) + 1) . ') NOT LIKE "%/%"
-               AND path != ' . $db->quote($folderPath) . '
+              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);
 
@@ -329,7 +329,7 @@ 
         if ($containerPath === '/') {
             return $this->getRootFolder();
         }
-        if (substr($containerPath, -1) === '/'){
+        if (substr($containerPath, -1) === '/') {
 			$containerPath = substr($containerPath, 0, -1);
 		}
         $containerFolder = $this->getDocumentByPath($containerPath, 'unpublished');
@@ -346,13 +346,13 @@ 
     public function getDocumentByPath($path, $state = 'published')
     {
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
         $db = $this->getContentDbHandle();
         $document = $this->fetchDocument('
             SELECT *
-              FROM documents_' .  $state . '
-             WHERE path = ' . $db->quote($path) . '
+              FROM documents_' .  $state.'
+             WHERE path = ' . $db->quote($path).'
         ');
         if ($document instanceof Document && $document->type === 'folder') {
             $document->dbHandle = $db;
@@ -372,16 +372,16 @@ 
 	public function getTotalDocumentCount($state = 'published')
 	{
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
 		$db = $this->getContentDbHandle();
 		$stmt = $db->query('
 			SELECT count(*)
-			  FROM documents_' . $state . '
+			  FROM documents_' . $state.'
 			 WHERE `type` != "folder"
 		');
 		$result = $stmt->fetch(\PDO::FETCH_ASSOC);
-		if (!is_array($result )) {
+		if (!is_array($result)) {
 			return 0;
 		}
 		return intval(current($result));
@@ -400,7 +400,7 @@ 
 		if ($stmt === false || !$stmt->execute()) {
 			$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 $result;
 	}
@@ -410,7 +410,7 @@ 
 			$sql = '
 				INSERT OR REPLACE INTO documents_published 
 					  (`id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`publicationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
-				SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time() . ' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
+				SELECT `id`,`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,"published" as state,`lastModificationDate`,`creationDate`,' . time().' as publicationDate, `lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`
 				  FROM documents_unpublished
 				 WHERE `path` = :path
 			';
@@ -423,7 +423,7 @@ 
 		if ($stmt === false) {
 			$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>');
 		}
 		$stmt->bindValue(':path', $path);
 		$stmt->execute();
@@ -490,7 +490,7 @@ 
         if ($stmt === false) {
             $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 $stmt;
     }
@@ -520,25 +520,25 @@ 
     public function saveDocument($documentObject, $state = 'published')
     {
 		if (!in_array($state, Document::$DOCUMENT_STATES)) {
-			throw new \Exception('Unsupported document state: ' . $state);
+			throw new \Exception('Unsupported document state: '.$state);
 		}
         $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`)
+            INSERT OR REPLACE INTO documents_' . $state.' (`path`,`title`,`slug`,`type`,`documentType`,`documentTypeSlug`,`state`,`lastModificationDate`,`creationDate`,`lastModifiedBy`,`fields`,`bricks`,`dynamicBricks`)
             VALUES(
-              ' . $db->quote($documentObject->path) . ',
-              ' . $db->quote($documentObject->title) . ',
-              ' . $db->quote($documentObject->slug) . ',
-              ' . $db->quote($documentObject->type) . ',
-              ' . $db->quote($documentObject->documentType) . ',
-              ' . $db->quote($documentObject->documentTypeSlug) . ',
-              ' . $db->quote($documentObject->state) . ',
-              ' . $db->quote($documentObject->lastModificationDate) . ',
-              ' . $db->quote($documentObject->creationDate) . ',
-              ' . $db->quote($documentObject->lastModifiedBy) . ',
-              ' . $db->quote(json_encode($documentObject->fields)) . ',
-              ' . $db->quote(json_encode($documentObject->bricks)) . ',
-              ' . $db->quote(json_encode($documentObject->dynamicBricks)) . '
+              ' . $db->quote($documentObject->path).',
+              ' . $db->quote($documentObject->title).',
+              ' . $db->quote($documentObject->slug).',
+              ' . $db->quote($documentObject->type).',
+              ' . $db->quote($documentObject->documentType).',
+              ' . $db->quote($documentObject->documentTypeSlug).',
+              ' . $db->quote($documentObject->state).',
+              ' . $db->quote($documentObject->lastModificationDate).',
+              ' . $db->quote($documentObject->creationDate).',
+              ' . $db->quote($documentObject->lastModifiedBy).',
+              ' . $db->quote(json_encode($documentObject->fields)).',
+              ' . $db->quote(json_encode($documentObject->bricks)).',
+              ' . $db->quote(json_encode($documentObject->dynamicBricks)).'
             )
         ');
         $result = $stmt->execute();
@@ -562,16 +562,16 @@ 
             if ($documentToDelete->type == 'document') {
                 $stmt = $this->getDbStatement('
                     DELETE FROM documents_unpublished
-                          WHERE path = ' . $db->quote($path) . '
+                          WHERE path = ' . $db->quote($path).'
                 ');
                 $stmt->execute();
             } elseif ($documentToDelete->type == 'folder') {
-                $folderPathWithWildcard = $path . '%';
+                $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) . '
+                          WHERE (path LIKE ' . $db->quote($folderPathWithWildcard).'
+                            AND substr(`path`, ' . (strlen($path) + 1).', 1) = "/")
+                            OR path = ' . $db->quote($path).'
                 ');
                 $stmt->execute();
             }
@@ -599,11 +599,11 @@ 
 
     private function initConfigIfNotExists($json, $subsetName)
     {
-        $subsetFileName = $this->storagePath . DIRECTORY_SEPARATOR . $subsetName . '.json';
+        $subsetFileName = $this->storagePath.DIRECTORY_SEPARATOR.$subsetName.'.json';
         if (file_exists($subsetFileName)) {
             $this->loadSubset($subsetName);
         } else {
-            $changes = $subsetName . 'Changes';
+            $changes = $subsetName.'Changes';
             $this->$subsetName = $json->$subsetName;
             $this->$changes = true;
         }