jenskooij / cloudcontrol

cloudcontrol/library/storage/JsonStorage.php

Indentation +96 added lines, -96 removed lines

@@ -2,19 +2,19 @@ 
 namespace library\storage
 {
 
-    use library\crypt\Crypt;
-    use library\images\ImageResizer;
+	use library\crypt\Crypt;
+	use library\images\ImageResizer;
 
-    /**
+	/**
 	 * Class JsonStorage
 	 * @package library\storage
 	 */
 	class JsonStorage implements Storage
 	{
 		private $storageDir;
-        /**
-         * @var Repository
-         */
+		/**
+		 * @var Repository
+		 */
 		private $repository;
 
 		/**
@@ -76,12 +76,12 @@ 
 			return $return;
 		}
 
-        /**
-         * Get user by slug
-         *
-         * @param $slug
-         * @return array
-         */
+		/**
+		 * Get user by slug
+		 *
+		 * @param $slug
+		 * @return array
+		 */
 		public function getUserBySlug($slug)
 		{
 			$return = array();
@@ -97,23 +97,23 @@ 
 			return $return;
 		}
 
-        /**
-         * Get all users
-         *
-         * @return mixed
-         */
+		/**
+		 * Get all users
+		 *
+		 * @return mixed
+		 */
 		public function getUsers()
 		{
 			return $this->repository->users;
 		}
 
-        /**
-         * Save user
-         *
-         * @param $slug
-         * @param $postValues
-         * @throws \Exception
-         */
+		/**
+		 * Save user
+		 *
+		 * @param $slug
+		 * @param $postValues
+		 * @throws \Exception
+		 */
 		public function saveUser($slug, $postValues)
 		{
 			$userObj = $this->createUserFromPostValues($postValues);
@@ -134,12 +134,12 @@ 
 			$this->save();
 		}
 
-        /**
-         * Add user
-         *
-         * @param $postValues
-         * @throws \Exception
-         */
+		/**
+		 * Add user
+		 *
+		 * @param $postValues
+		 * @throws \Exception
+		 */
 		public function addUser($postValues)
 		{
 			$userObj = $this->createUserFromPostValues($postValues);
@@ -148,17 +148,17 @@ 
 			if (!empty($doesItExist)) {
 				throw new \Exception('Trying to add username that already exists.');
 			}
-            $users = $this->repository->users;
-            $users[] = $userObj;
-            $this->repository->users = $users;
+			$users = $this->repository->users;
+			$users[] = $userObj;
+			$this->repository->users = $users;
 			$this->save();
 		}
 
-        /**
-         * Delete user by slug
-         * @param $slug
-         * @throws \Exception
-         */
+		/**
+		 * Delete user by slug
+		 * @param $slug
+		 * @throws \Exception
+		 */
 		public function deleteUserBySlug($slug)
 		{
 			$userToDelete = $this->getUserBySlug($slug);
@@ -175,12 +175,12 @@ 
 			$this->save();
 		}
 
-        /**
-         * Create user from POST values
-         * @param $postValues
-         * @return \stdClass
-         * @throws \Exception
-         */
+		/**
+		 * Create user from POST values
+		 * @param $postValues
+		 * @return \stdClass
+		 * @throws \Exception
+		 */
 		private function createUserFromPostValues($postValues)
 		{
 			if (isset($postValues['username'])) {
@@ -229,40 +229,40 @@ 
 		 */
 		public function getDocumentBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			return $this->repository->getDocumentByPath($path);
 		}
 
 		public function saveDocument($postValues)
 		{
-            $oldPath = '/' . $postValues['path'];
+			$oldPath = '/' . $postValues['path'];
 
-            $container = $this->getDocumentContainerByPath($oldPath);
-            $documentObject = $this->createDocumentFromPostValues($postValues);
-            if ($container->path === '/') {
-                $newPath = $container->path . $documentObject->slug;
-            } else {
-                $newPath = $container->path . '/' . $documentObject->slug;
-            }
-            $documentObject->path = $newPath;
-            $this->repository->saveDocument($documentObject);
-        }
+			$container = $this->getDocumentContainerByPath($oldPath);
+			$documentObject = $this->createDocumentFromPostValues($postValues);
+			if ($container->path === '/') {
+				$newPath = $container->path . $documentObject->slug;
+			} else {
+				$newPath = $container->path . '/' . $documentObject->slug;
+			}
+			$documentObject->path = $newPath;
+			$this->repository->saveDocument($documentObject);
+		}
 
 		public function addDocument($postValues)
 		{
 			$documentObject = $this->createDocumentFromPostValues($postValues);
-            if ($postValues['path'] === '/') {
-                $documentObject->path = $postValues['path'] . $documentObject->slug;
-            } else {
-                $documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
-            }
+			if ($postValues['path'] === '/') {
+				$documentObject->path = $postValues['path'] . $documentObject->slug;
+			} else {
+				$documentObject->path = $postValues['path'] . '/' . $documentObject->slug;
+			}
 
-            $this->repository->saveDocument($documentObject);
+			$this->repository->saveDocument($documentObject);
 		}
 
 		public function deleteDocumentBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -313,13 +313,13 @@ 
 							$brickArray[] = $brickObj;
 						}
 
-                        $bricks = $documentObj->bricks;
+						$bricks = $documentObj->bricks;
 						$bricks[$brickSlug] = $brickArray;
-                        $documentObj->bricks = $bricks;
+						$documentObj->bricks = $bricks;
 					} else {
-                        $bricks = $documentObj->bricks;
+						$bricks = $documentObj->bricks;
 						$bricks[$brickSlug] = $brick;
-                        $documentObj->bricks = $bricks;
+						$documentObj->bricks = $bricks;
 					}
 				}
 			}
@@ -330,9 +330,9 @@ 
 						$brickObj = new \stdClass();
 						$brickObj->type = $brickTypeSlug;
 						$brickObj->fields = $brickContent;
-                        $dynamicBricks = $documentObj->dynamicBricks;
+						$dynamicBricks = $documentObj->dynamicBricks;
 						$dynamicBricks[] = $brickObj;
-                        $documentObj->dynamicBricks = $dynamicBricks;
+						$documentObj->dynamicBricks = $dynamicBricks;
 					}
 				}
 			}
@@ -348,13 +348,13 @@ 
 		 */
 		public function addDocumentFolder($postValues)
 		{
-            $documentFolderObject = $this->createDocumentFolderFromPostValues($postValues);
-            if ($postValues['path'] === '/') {
-                $documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
-            } else {
-                $documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
-            }
-            $this->repository->saveDocument($documentFolderObject);
+			$documentFolderObject = $this->createDocumentFolderFromPostValues($postValues);
+			if ($postValues['path'] === '/') {
+				$documentFolderObject->path = $postValues['path'] . $documentFolderObject->slug;
+			} else {
+				$documentFolderObject->path = $postValues['path'] . '/' . $documentFolderObject->slug;
+			}
+			$this->repository->saveDocument($documentFolderObject);
 		}
 
 		/**
@@ -366,7 +366,7 @@ 
 		 */
 		public function deleteDocumentFolderBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			$this->repository->deleteDocumentByPath($path);
 		}
 
@@ -380,7 +380,7 @@ 
 		 */
 		public function getDocumentFolderBySlug($slug)
 		{
-            $path = '/' . $slug;
+			$path = '/' . $slug;
 			return $this->repository->getDocumentByPath($path);
 		}
 
@@ -393,7 +393,7 @@ 
 		 */
 		public function saveDocumentFolder($postValues)
 		{
-            $this->addDocumentFolder($postValues);
+			$this->addDocumentFolder($postValues);
 		}
 
 		/**
@@ -406,7 +406,7 @@ 
 		 */
 		private function getDocumentContainerByPath($path)
 		{
-            return $this->repository->getDocumentContainerByPath($path);
+			return $this->repository->getDocumentContainerByPath($path);
 		}
 
 		/**
@@ -610,9 +610,9 @@ 
 				$imageObject->size = $postValues['size'];
 				$imageObject->set = $fileNames;
 
-                $images = $this->repository->images;
+				$images = $this->repository->images;
 				$images[] = $imageObject;
-                $this->repository->images = $images;
+				$this->repository->images = $images;
 
 				$this->save();
 			} else {
@@ -647,7 +647,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getImageByName($filename)
 		{
 			$images = $this->getImages();
@@ -698,9 +698,9 @@ 
 				$file->type = $postValues['type'];
 				$file->size = $postValues['size'];
 
-                $files = $this->repository->files;
+				$files = $this->repository->files;
 				$files[] = $file;
-                $this->repository->files = $files;
+				$this->repository->files = $files;
 				$this->save();
 			} else {
 				throw new \Exception('Error moving uploaded file');
@@ -739,7 +739,7 @@ 
 		/**
 		 * @param $filename
 		 * @return null
-         */
+		 */
 		public function getFileByName($filename)
 		{
 			$files = $this->getFiles();
@@ -754,7 +754,7 @@ 
 		/**
 		 * @param $filename
 		 * @throws \Exception
-         */
+		 */
 		public function deleteFileByName($filename)
 		{
 			$destinationPath = realpath(__DIR__ . '/../../www/files/');
@@ -799,9 +799,9 @@ 
 		{
 			$documentTypeObject = $this->createDocumentTypeFromPostValues($postValues);
 
-            $documentTypes = $this->repository->documentTypes;
-            $documentTypes[] = $documentTypeObject;
-            $this->repository->documentTypes = $documentTypes;
+			$documentTypes = $this->repository->documentTypes;
+			$documentTypes[] = $documentTypeObject;
+			$this->repository->documentTypes = $documentTypes;
 
 			$this->save();
 		}
@@ -947,9 +947,9 @@ 
 		{
 			$brickObject = $this->createBrickFromPostValues($postValues);
 
-            $bricks = $this->repository->bricks;
-            $bricks[] = $brickObject;
-            $this->repository->bricks = $bricks;
+			$bricks = $this->repository->bricks;
+			$bricks[] = $brickObject;
+			$this->repository->bricks = $bricks;
 
 			$this->save();
 		}
@@ -1154,9 +1154,9 @@ 
 		{
 			$imageSetObject = $this->createImageSetFromPostValues($postValues);
 
-            $imageSet = $this->repository->imageSet;
-            $imageSet[] = $imageSetObject;
-            $this->repository->imageSet = $imageSet;
+			$imageSet = $this->repository->imageSet;
+			$imageSet[] = $imageSetObject;
+			$this->repository->imageSet = $imageSet;
 
 			$this->save();
 		}

cloudcontrol/library/components/cms/SearchRouting.php

Doc Comments +7 added lines

@@ -58,6 +58,10 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_SEARCH);
 	}
 
+	/**
+	 * @param \library\cc\Request $request
+	 * @param CmsComponent $cmsComponent
+	 */
 	private function ajaxUpdateIndexRoute($request, $cmsComponent)
 	{
 		$cmsComponent->subTemplate = 'cms/search/update-index';
@@ -93,6 +97,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $obj
+	 */
 	private function showJson($obj, $httpHeader = 'HTTP/1.0 200 OK') {
 		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
 		header('Content-type: application/json');

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
 				$indexer->replaceOldIndex();
 				$this->showJson('done');
 			} else {
-				$this->showJson('Invalid step: ' . $step . '.', 'HTTP/1.0 500 Internal Server Error');
+				$this->showJson('Invalid step: '.$step.'.', 'HTTP/1.0 500 Internal Server Error');
 			}
 		} else {
 			$this->showJson('No step defined.', 'HTTP/1.0 500 Internal Server Error');
@@ -94,7 +94,7 @@ 
 	}
 
 	private function showJson($obj, $httpHeader = 'HTTP/1.0 200 OK') {
-		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+		header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
 		header('Content-type: application/json');
 		die(json_encode($obj));
 		exit;

cloudcontrol/library/search/CharacterFilter.php

Doc Comments +3 added lines, -3 removed lines

@@ -38,9 +38,9 @@ 
 	/**
 	 * Filter out all special characters, like punctuation and characters with accents
 	 *
-	 * @param $string
+	 * @param string $string
 	 *
-	 * @return mixed|string
+	 * @return string
 	 */
 	private function filterSpecialCharacters($string)
 	{
@@ -73,7 +73,7 @@ 
 	}
 
 	/**
-	 * @return mixed|string
+	 * @return string
 	 */
 	public function getFilteredString()
 	{

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 	{
 		$string = strip_tags($string);
 		$string = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $string); // Remove special alphanumeric characters
-		$string = str_replace(array('+', '=', '!', ',', '.',';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces
+		$string = str_replace(array('+', '=', '!', ',', '.', ';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces
 		$string = preg_replace("/[\r\n]+/", " ", $string); // Replace multiple newlines with a single space.
 		$string = preg_replace("/[\t]+/", " ", $string); // Replace multiple tabs with a single space.
 		$string = preg_replace("/[^a-zA-Z0-9 ]/", '', $string); // Filter out everything that is not alphanumeric or a space
@@ -64,7 +64,7 @@ 
 	{
 		$encoding = mb_detect_encoding($string, mb_detect_order(), false);
 
-		if($encoding == "UTF-8") {
+		if ($encoding == "UTF-8") {
 			$string = mb_convert_encoding($string, 'UTF-8', 'UTF-8');
 		}
 

cloudcontrol/library/search/Indexer.php

Doc Comments +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
 	}
 
 	/**
-	 * @return int|mixed
+	 * @return integer
 	 */
 	private function getTotalDocumentCount()
 	{
@@ -154,7 +154,7 @@ 
 
 	/**
 	 * Adds a logline with the time since last log
-	 * @param $string
+	 * @param string $string
 	 */
 	private function addLog($string)
 	{

Spacing +6 added lines, -6 removed lines

@@ -58,7 +58,7 @@ 
 		$this->resetIndex();
 		$this->addLog('Retrieving documents to be indexed.');
 		$documents = $this->storage->getDocuments();
-		$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();
@@ -159,7 +159,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);
 	}
 
@@ -171,8 +171,8 @@ 
 	protected function getSearchDbHandle()
 	{
 		if ($this->searchDbHandle === null) {
-			$path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR;
-			$this->searchDbHandle = new \PDO('sqlite:' . $path . self::SEARCH_TEMP_DB);
+			$path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
+			$this->searchDbHandle = new \PDO('sqlite:'.$path.self::SEARCH_TEMP_DB);
 		}
 		return $this->searchDbHandle;
 	}
@@ -183,7 +183,7 @@ 
 	public function replaceOldIndex()
 	{
 		$this->searchDbHandle = null;
-		$path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . $this->storageDir . DIRECTORY_SEPARATOR;
-		rename($path . self::SEARCH_TEMP_DB, $path . 'search.db');
+		$path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.$this->storageDir.DIRECTORY_SEPARATOR;
+		rename($path.self::SEARCH_TEMP_DB, $path.'search.db');
 	}
 }
\ No newline at end of file

cloudcontrol/library/search/indexer/TermCount.php

Doc Comments +2 added lines, -2 removed lines

@@ -85,8 +85,8 @@
 
 	/**
 	 * @param $values
-	 * @param $sql
-	 * @param $db
+	 * @param string $sql
+	 * @param resource $db
 	 *
 	 * @throws \Exception
 	 */

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 	protected function applyFilters($tokens)
 	{
 		foreach ($this->filters as $filterName) {
-			$filterClassName = '\library\search\filters\\' . $filterName;
+			$filterClassName = '\library\search\filters\\'.$filterName;
 			$filter = new $filterClassName($tokens);
 			$tokens = $filter->getFilterResults();
 		}
@@ -68,7 +68,7 @@ 
 		foreach ($documentTermCount as $field => $countArray) {
 			$quotedField = $db->quote($field);
 			foreach ($countArray as $term => $count) {
-				$values[] = $quotedDocumentPath . ', ' . $db->quote($term) . ', ' . $db->quote($count) . ', ' . $quotedField;
+				$values[] = $quotedDocumentPath.', '.$db->quote($term).', '.$db->quote($count).', '.$quotedField;
 				$i += 1;
 				if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
 					$this->executeStoreDocumentTermCount($values, $sql, $db);
@@ -92,13 +92,13 @@ 
 	 */
 	protected function executeStoreDocumentTermCount($values, $sql, $db)
 	{
-		$sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
+		$sql .= '('.implode('),'.PHP_EOL.'(', $values).');';
 
 		$stmt = $db->prepare($sql);
 		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>');
 		}
 	}
 }
\ No newline at end of file

cloudcontrol/library/search/Search.php

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 	 * Queries the search index for a given token
 	 * and the query norm.
 	 * @param $token
-	 * @param $queryNorm
+	 * @param integer $queryNorm
 	 *
 	 * @return array
 	 * @throws \Exception

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 = '\library\search\filters\\' . $filterName;
+			$filterClassName = '\library\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, '\library\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, '\library\search\results\SearchSuggestion');
 			$allResults = array_merge($result, $allResults);

cloudcontrol/library/search/filters/DutchStopWords.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 class DutchStopWords implements Filter
 {
 	protected $tokens;
-	protected $dutchStopWords = array('aan','af','al','alles','als','altijd','andere','ben','bij','daar','dan','dat','de','der','deze','die','dit','doch','doen','door','doorgaans','dus','een','eens','en','er','ge','geen','geweest','haar','had','heb','hebben','heeft','hem','het','hier','hij','hoe','hun','iemand','iets','ik','in','is','ja','je','kan','kon','kunnen','maar','me','meer','men','met','mij','mijn','moet','na','naar','niet','niets','nog','nu','of','om','omdat','ons','ook','op','over','reeds','te','tegen','toch','toen','tot','u','uit','uw','van','veel','voor','want','waren','was','wat','we','wel','werd','wezen','wie','wij','wil','worden','zal','ze','zei','zelf','zich','zij','zijn','zo','zodat','zonder','zou');
+	protected $dutchStopWords = array('aan', 'af', 'al', 'alles', 'als', 'altijd', 'andere', 'ben', 'bij', 'daar', 'dan', 'dat', 'de', 'der', 'deze', 'die', 'dit', 'doch', 'doen', 'door', 'doorgaans', 'dus', 'een', 'eens', 'en', 'er', 'ge', 'geen', 'geweest', 'haar', 'had', 'heb', 'hebben', 'heeft', 'hem', 'het', 'hier', 'hij', 'hoe', 'hun', 'iemand', 'iets', 'ik', 'in', 'is', 'ja', 'je', 'kan', 'kon', 'kunnen', 'maar', 'me', 'meer', 'men', 'met', 'mij', 'mijn', 'moet', 'na', 'naar', 'niet', 'niets', 'nog', 'nu', 'of', 'om', 'omdat', 'ons', 'ook', 'op', 'over', 'reeds', 'te', 'tegen', 'toch', 'toen', 'tot', 'u', 'uit', 'uw', 'van', 'veel', 'voor', 'want', 'waren', 'was', 'wat', 'we', 'wel', 'werd', 'wezen', 'wie', 'wij', 'wil', 'worden', 'zal', 'ze', 'zei', 'zelf', 'zich', 'zij', 'zijn', 'zo', 'zodat', 'zonder', 'zou');
 
 	/**
 	 * DutchStopWords constructor.

cloudcontrol/library/search/indexer/TermFieldLengthNorm.php

Spacing +6 added lines, -6 removed lines

@@ -45,18 +45,18 @@ 
 		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>');
 		}
 		if (($stmt->execute()) === 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>');
 		}
 		$uniqueFieldsPerDocument = $stmt->fetchAll(\PDO::FETCH_OBJ);
 		$values = array();
 		$i = 0;
 		foreach ($uniqueFieldsPerDocument as $fieldRow) {
-			$values[] = 'UPDATE term_frequency SET termNorm = 1/sqrt(' . intval($fieldRow->termCount) . ') WHERE documentPath = ' . $db->quote($fieldRow->documentPath) . ' AND field = ' . $db->quote($fieldRow->field) . ';';
+			$values[] = 'UPDATE term_frequency SET termNorm = 1/sqrt('.intval($fieldRow->termCount).') WHERE documentPath = '.$db->quote($fieldRow->documentPath).' AND field = '.$db->quote($fieldRow->field).';';
 			$i += 1;
 			if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
 				$this->executeUpdateTermNorm($values, $db);
@@ -76,13 +76,13 @@ 
 	 */
 	private function executeUpdateTermNorm($values, $db)
 	{
-		$sql  = 'BEGIN TRANSACTION;' . PHP_EOL;
-		$sql .= implode(PHP_EOL, $values) . PHP_EOL;
+		$sql  = 'BEGIN TRANSACTION;'.PHP_EOL;
+		$sql .= implode(PHP_EOL, $values).PHP_EOL;
 		$sql .= 'COMMIT;';
 		if (($db->exec($sql)) === 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>');
 		}
 	}
 }
\ No newline at end of file

cloudcontrol/library/search/indexer/InverseDocumentFrequency.php

Spacing +2 added lines, -2 removed lines

@@ -47,14 +47,14 @@
 		if (!$stmt = $db->prepare($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>');
 		}
 		$stmt->bindValue(':documentCount', $this->documentCount);
 		$result = $stmt->execute();
 		if ($result === 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>');
 		}
 	}
 }
\ No newline at end of file