jenskooij / cloudcontrol

src/search/indexer/TermFrequency.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 			$i = 0;
 			foreach ($termsForDocumentField as $term) {
 				$frequency = intval($term->count) / $documentField->totalTermCount;
-				$values[] = $quotedDocumentPath . ','  . $quotedField . ', ' . $db->quote($term->term) . ', ' . $db->quote($frequency);
+				$values[] = $quotedDocumentPath.','.$quotedField.', '.$db->quote($term->term).', '.$db->quote($frequency);
 				$i += 1;
 				if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
 					$this->executeStore($sql, $values, $db);
@@ -101,11 +101,11 @@ 
 
 	private function executeStore($sql, $values, $db)
 	{
-		$sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
+		$sql .= '('.implode('),'.PHP_EOL.'(', $values).');';
 		if (!$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>');
 		}
 	}
 

Indentation +69 added lines, -69 removed lines

@@ -24,92 +24,92 @@
  */
 class TermFrequency
 {
-	/**
-	 * @var \PDO
-	 */
-	protected $dbHandle;
+    /**
+     * @var \PDO
+     */
+    protected $dbHandle;
 
-	/**
-	 * TermFrequency constructor.
-	 *
-	 * @param \PDO $dbHandle
-	 */
-	public function __construct($dbHandle)
-	{
-		$this->dbHandle = $dbHandle;
-	}
+    /**
+     * TermFrequency constructor.
+     *
+     * @param \PDO $dbHandle
+     */
+    public function __construct($dbHandle)
+    {
+        $this->dbHandle = $dbHandle;
+    }
 
-	public function execute()
-	{
-		$db = $this->dbHandle;
-		$totalTermCountPerDocument = $this->getTotalTermCountPerDocument($db);
-		foreach ($totalTermCountPerDocument as $documentField) {
-			$termsForDocumentField = $this->getTermsForDocumentField($documentField->documentPath, $documentField->field);
-			$sql = '
+    public function execute()
+    {
+        $db = $this->dbHandle;
+        $totalTermCountPerDocument = $this->getTotalTermCountPerDocument($db);
+        foreach ($totalTermCountPerDocument as $documentField) {
+            $termsForDocumentField = $this->getTermsForDocumentField($documentField->documentPath, $documentField->field);
+            $sql = '
 				INSERT INTO term_frequency (documentPath, field, term, frequency)
 					 VALUES 
 			';
-			$quotedDocumentPath = $db->quote($documentField->documentPath);
-			$quotedField = $db->quote($documentField->field);
-			$values = array();
-			$i = 0;
-			foreach ($termsForDocumentField as $term) {
-				$frequency = intval($term->count) / $documentField->totalTermCount;
-				$values[] = $quotedDocumentPath . ','  . $quotedField . ', ' . $db->quote($term->term) . ', ' . $db->quote($frequency);
-				$i += 1;
-				if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
-					$this->executeStore($sql, $values, $db);
-					$i = 0;
-					$values = array();
-				}
-			}
-			if (count($values) != 0) {
-				$this->executeStore($sql, $values, $db);
-			}
-		}
-	}
+            $quotedDocumentPath = $db->quote($documentField->documentPath);
+            $quotedField = $db->quote($documentField->field);
+            $values = array();
+            $i = 0;
+            foreach ($termsForDocumentField as $term) {
+                $frequency = intval($term->count) / $documentField->totalTermCount;
+                $values[] = $quotedDocumentPath . ','  . $quotedField . ', ' . $db->quote($term->term) . ', ' . $db->quote($frequency);
+                $i += 1;
+                if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
+                    $this->executeStore($sql, $values, $db);
+                    $i = 0;
+                    $values = array();
+                }
+            }
+            if (count($values) != 0) {
+                $this->executeStore($sql, $values, $db);
+            }
+        }
+    }
 
-	private function getTermsForDocumentField($documentPath, $field)
-	{
-		$db = $this->dbHandle;
-		$stmt = $db->prepare('
+    private function getTermsForDocumentField($documentPath, $field)
+    {
+        $db = $this->dbHandle;
+        $stmt = $db->prepare('
 			SELECT `term`, `count`
 			  FROM `term_count`
 			 WHERE `documentPath` = :documentPath
 			   AND `field` = :field
 		');
-		$stmt->bindValue(':documentPath', $documentPath);
-		$stmt->bindValue(':field', $field);
-		$stmt->execute();
-		return $stmt->fetchAll(\PDO::FETCH_CLASS);
-	}
+        $stmt->bindValue(':documentPath', $documentPath);
+        $stmt->bindValue(':field', $field);
+        $stmt->execute();
+        return $stmt->fetchAll(\PDO::FETCH_CLASS);
+    }
 
-	/**
-	 * @param $db
-	 *
-	 * @return mixed
-	 */
-	private function getTotalTermCountPerDocument($db)
-	{
-		$stmt = $db->prepare('
+    /**
+     * @param $db
+     *
+     * @return mixed
+     */
+    private function getTotalTermCountPerDocument($db)
+    {
+        $stmt = $db->prepare('
 			SELECT documentPath, field, SUM(count) as totalTermCount
 			  FROM term_count
 		  GROUP BY documentPath, field
 		');
-		$stmt->execute();
-		$totalTermCountPerDocument = $stmt->fetchAll(\PDO::FETCH_CLASS);
+        $stmt->execute();
+        $totalTermCountPerDocument = $stmt->fetchAll(\PDO::FETCH_CLASS);
 
-		return $totalTermCountPerDocument;
-	}
+        return $totalTermCountPerDocument;
+    }
 
-	private function executeStore($sql, $values, $db)
-	{
-		$sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
-		if (!$db->query($sql)) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
-		}
-	}
+    private function executeStore($sql, $values, $db)
+    {
+        $sql .= '(' . implode('),' . PHP_EOL . '(', $values) . ');';
+        if (!$db->query($sql)) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
+        }
+    }
 
 }
\ No newline at end of file

src/search/indexer/TermCount.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,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();
 		}
@@ -66,7 +66,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);
@@ -90,12 +90,12 @@ 
 	 */
 	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>');
 		}
 	}
 

Indentation +100 added lines, -100 removed lines

@@ -14,113 +14,113 @@
 
 class TermCount
 {
-	/**
-	 * @var \PDO
-	 */
-	protected $dbHandle;
-	protected $documents;
-	protected $filters;
-	protected $storage;
+    /**
+     * @var \PDO
+     */
+    protected $dbHandle;
+    protected $documents;
+    protected $filters;
+    protected $storage;
 
-	/**
-	 * TermCount constructor.
-	 *
-	 * @param \PDO    $dbHandle
-	 * @param array   $documents
-	 * @param array   $filters
-	 * @param Storage $jsonStorage
-	 */
-	public function __construct($dbHandle, $documents, $filters, $jsonStorage)
-	{
-		$this->dbHandle = $dbHandle;
-		$this->documents = $documents;
-		$this->filters = $filters;
-		$this->storage = $jsonStorage;
-	}
+    /**
+     * TermCount constructor.
+     *
+     * @param \PDO    $dbHandle
+     * @param array   $documents
+     * @param array   $filters
+     * @param Storage $jsonStorage
+     */
+    public function __construct($dbHandle, $documents, $filters, $jsonStorage)
+    {
+        $this->dbHandle = $dbHandle;
+        $this->documents = $documents;
+        $this->filters = $filters;
+        $this->storage = $jsonStorage;
+    }
 
-	public function execute()
-	{
-		$this->iterateDocumentsAndCreateTermCount($this->documents);
-	}
+    public function execute()
+    {
+        $this->iterateDocumentsAndCreateTermCount($this->documents);
+    }
 
-	protected function applyFilters($tokens)
-	{
-		foreach ($this->filters as $filterName) {
-			$filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
-			$filter = new $filterClassName($tokens);
-			$tokens = $filter->getFilterResults();
-		}
-		return $tokens;
-	}
+    protected function applyFilters($tokens)
+    {
+        foreach ($this->filters as $filterName) {
+            $filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
+            $filter = new $filterClassName($tokens);
+            $tokens = $filter->getFilterResults();
+        }
+        return $tokens;
+    }
 
-	protected function storeDocumentTermCount($document, $documentTermCount)
-	{
-		$db = $this->dbHandle;
-		$sqlStart = '
+    protected function storeDocumentTermCount($document, $documentTermCount)
+    {
+        $db = $this->dbHandle;
+        $sqlStart = '
 			INSERT INTO `term_count` (`documentPath`, `term`, `count`, `field`)
 				 VALUES ';
-		$sql = $sqlStart;
-		$values = array();
-		$quotedDocumentPath = $db->quote($document->path);
-		$i = 0;
-		foreach ($documentTermCount as $field => $countArray) {
-			$quotedField = $db->quote($field);
-			foreach ($countArray as $term => $count) {
-				$values[] = $quotedDocumentPath . ', ' . $db->quote($term) . ', ' . $db->quote($count) . ', ' . $quotedField;
-				$i += 1;
-				if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
-					$this->executeStoreDocumentTermCount($values, $sql, $db);
-					$values = array();
-					$sql = $sqlStart;
-					$i = 0;
-				}
-			}
-		}
-		if (count($values) != 0) {
-			$this->executeStoreDocumentTermCount($values, $sql, $db);
-		}
-	}
+        $sql = $sqlStart;
+        $values = array();
+        $quotedDocumentPath = $db->quote($document->path);
+        $i = 0;
+        foreach ($documentTermCount as $field => $countArray) {
+            $quotedField = $db->quote($field);
+            foreach ($countArray as $term => $count) {
+                $values[] = $quotedDocumentPath . ', ' . $db->quote($term) . ', ' . $db->quote($count) . ', ' . $quotedField;
+                $i += 1;
+                if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
+                    $this->executeStoreDocumentTermCount($values, $sql, $db);
+                    $values = array();
+                    $sql = $sqlStart;
+                    $i = 0;
+                }
+            }
+        }
+        if (count($values) != 0) {
+            $this->executeStoreDocumentTermCount($values, $sql, $db);
+        }
+    }
 
-	/**
-	 * @param $values
-	 * @param $sql
-	 * @param $db
-	 *
-	 * @throws \Exception
-	 */
-	protected function executeStoreDocumentTermCount($values, $sql, $db)
-	{
-		$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>');
-		}
-	}
+    /**
+     * @param $values
+     * @param $sql
+     * @param $db
+     *
+     * @throws \Exception
+     */
+    protected function executeStoreDocumentTermCount($values, $sql, $db)
+    {
+        $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>');
+        }
+    }
 
-	/**
-	 * @param $document
-	 */
-	private function createTermCountForDocument($document)
-	{
-		$tokenizer = new DocumentTokenizer($document, $this->storage);
-		$tokens = $tokenizer->getTokens();
-		$documentTermCount = $this->applyFilters($tokens);
-		$this->storeDocumentTermCount($document, $documentTermCount);
-	}
+    /**
+     * @param $document
+     */
+    private function createTermCountForDocument($document)
+    {
+        $tokenizer = new DocumentTokenizer($document, $this->storage);
+        $tokens = $tokenizer->getTokens();
+        $documentTermCount = $this->applyFilters($tokens);
+        $this->storeDocumentTermCount($document, $documentTermCount);
+    }
 
-	/**
-	 * @param $documents
-	 */
-	private function iterateDocumentsAndCreateTermCount($documents)
-	{
-		foreach ($documents as $document) {
-			if ($document->type === 'folder') {
-				$this->iterateDocumentsAndCreateTermCount($document->content);
-			} else {
-				$this->createTermCountForDocument($document);
-			}
-		}
-	}
+    /**
+     * @param $documents
+     */
+    private function iterateDocumentsAndCreateTermCount($documents)
+    {
+        foreach ($documents as $document) {
+            if ($document->type === 'folder') {
+                $this->iterateDocumentsAndCreateTermCount($document->content);
+            } else {
+                $this->createTermCountForDocument($document);
+            }
+        }
+    }
 }
\ No newline at end of file

src/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

Indentation +61 added lines, -61 removed lines

@@ -17,72 +17,72 @@
  */
 class TermFieldLengthNorm
 {
-	/**
-	 * @var \PDO
-	 */
-	protected $dbHandle;
+    /**
+     * @var \PDO
+     */
+    protected $dbHandle;
 
-	/**
-	 * TermFieldLengthNorm constructor.
-	 *
-	 * @param \PDO $dbHandle
-	 */
-	public function __construct($dbHandle)
-	{
-		$this->dbHandle = $dbHandle;
-	}
+    /**
+     * TermFieldLengthNorm constructor.
+     *
+     * @param \PDO $dbHandle
+     */
+    public function __construct($dbHandle)
+    {
+        $this->dbHandle = $dbHandle;
+    }
 
-	public function execute()
-	{
-		$db = $this->dbHandle;
-		$db->sqliteCreateFunction('sqrt', 'sqrt', 1);
-		$sql = '
+    public function execute()
+    {
+        $db = $this->dbHandle;
+        $db->sqliteCreateFunction('sqrt', 'sqrt', 1);
+        $sql = '
 		SELECT documentPath, field, COUNT(`count`) as termCount
 		  FROM term_count
 	  GROUP BY documentPath, field
 		';
-		$stmt = $db->prepare($sql);
-		if ($stmt === false) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			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>');
-		}
-		$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) . ';';
-			$i += 1;
-			if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
-				$this->executeUpdateTermNorm($values, $db);
-				$values = array();
-				$i = 0;
-			}
-		}
-		if (count($values) != 0) {
-			$this->executeUpdateTermNorm($values, $db);
-		}
-	}
+        $stmt = $db->prepare($sql);
+        if ($stmt === false) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            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>');
+        }
+        $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) . ';';
+            $i += 1;
+            if ($i >= Indexer::SQLITE_MAX_COMPOUND_SELECT) {
+                $this->executeUpdateTermNorm($values, $db);
+                $values = array();
+                $i = 0;
+            }
+        }
+        if (count($values) != 0) {
+            $this->executeUpdateTermNorm($values, $db);
+        }
+    }
 
-	/**
-	 * @param array $values
-	 * @param \PDO $db
-	 * @throws \Exception
-	 */
-	private function executeUpdateTermNorm($values, $db)
-	{
-		$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>');
-		}
-	}
+    /**
+     * @param array $values
+     * @param \PDO $db
+     * @throws \Exception
+     */
+    private function executeUpdateTermNorm($values, $db)
+    {
+        $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>');
+        }
+    }
 }
\ No newline at end of file

src/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

Indentation +39 added lines, -39 removed lines

@@ -10,51 +10,51 @@
 
 class InverseDocumentFrequency
 {
-	/**
-	 * @var \PDO
-	 */
-	protected $dbHandle;
-	protected $documentCount;
+    /**
+     * @var \PDO
+     */
+    protected $dbHandle;
+    protected $documentCount;
 
-	/**
-	 * InverseDocumentFrequency constructor.
-	 *
-	 * @param \PDO 	$dbHandle
-	 * @param int   $documentCount
-	 */
-	public function __construct($dbHandle, $documentCount)
-	{
-		$this->dbHandle = $dbHandle;
-		$this->documentCount = $documentCount;
-	}
+    /**
+     * InverseDocumentFrequency constructor.
+     *
+     * @param \PDO 	$dbHandle
+     * @param int   $documentCount
+     */
+    public function __construct($dbHandle, $documentCount)
+    {
+        $this->dbHandle = $dbHandle;
+        $this->documentCount = $documentCount;
+    }
 
-	/**
-	 * Formula to calculate:
-	 * 		idf(t) = 1 + log ( totalDocuments / (documentsThatContainTheTerm + 1))
-	 * @throws \Exception
-	 */
-	public function execute()
-	{
-		$db = $this->dbHandle;
-		$db->sqliteCreateFunction('log', 'log', 1);
-		$sql = '
+    /**
+     * Formula to calculate:
+     * 		idf(t) = 1 + log ( totalDocuments / (documentsThatContainTheTerm + 1))
+     * @throws \Exception
+     */
+    public function execute()
+    {
+        $db = $this->dbHandle;
+        $db->sqliteCreateFunction('log', 'log', 1);
+        $sql = '
 		INSERT INTO inverse_document_frequency (term, inverseDocumentFrequency)
 		SELECT DISTINCT term, (1+(log(:documentCount / COUNT(documentPath) + 1))) as inverseDocumentFrequency
 					  FROM term_count
 				  GROUP BY term
 		';
 
-		if (!$stmt = $db->prepare($sql)) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			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>');
-		}
-	}
+        if (!$stmt = $db->prepare($sql)) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            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>');
+        }
+    }
 }
\ No newline at end of file

src/search/filters/DutchStopWords.php

Spacing +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
 
 class DutchStopWords extends StopWordsFilter
 {
-	protected $stopWords = 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 $stopWords = 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');
 }
\ No newline at end of file

Indentation +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
 
 class DutchStopWords extends StopWordsFilter
 {
-	protected $stopWords = 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 $stopWords = 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');
 }
\ No newline at end of file

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);

Indentation +225 added lines, -225 removed lines

@@ -26,117 +26,117 @@ 
  */
 class Search extends SearchDbConnected
 {
-	/**
-	 * @var Tokenizer
-	 */
-	protected $tokenizer;
-	protected $results = array();
+    /**
+     * @var Tokenizer
+     */
+    protected $tokenizer;
+    protected $results = array();
 
-	/**
-	 * An array containing classes implementing \CloudControl\Cms\search\Filters
-	 * These will be applied to all tokenizers
-	 * @var array
-	 */
-	protected $filters = array(
-		'DutchStopWords',
-		'EnglishStopWords'
-	);
+    /**
+     * An array containing classes implementing \CloudControl\Cms\search\Filters
+     * These will be applied to all tokenizers
+     * @var array
+     */
+    protected $filters = array(
+        'DutchStopWords',
+        'EnglishStopWords'
+    );
 
-	/**
-	 * Returns an array of SeachResult and / or SearchSuggestion objects,
-	 * based on the tokens in the Tokenizer
-	 * @param Tokenizer $tokenizer
-	 *
-	 * @return array
-	 */
-	public function getDocumentsForTokenizer(Tokenizer $tokenizer)
-	{
-		$this->tokenizer = $tokenizer;
-		$resultsPerTokens = $this->queryTokens();
+    /**
+     * Returns an array of SeachResult and / or SearchSuggestion objects,
+     * based on the tokens in the Tokenizer
+     * @param Tokenizer $tokenizer
+     *
+     * @return array
+     */
+    public function getDocumentsForTokenizer(Tokenizer $tokenizer)
+    {
+        $this->tokenizer = $tokenizer;
+        $resultsPerTokens = $this->queryTokens();
 
-		$flatResults = $this->flattenResults($resultsPerTokens);
-		$flatResults = $this->applyQueryCoordination($flatResults);
-		usort($flatResults, array($this, "scoreCompare"));
+        $flatResults = $this->flattenResults($resultsPerTokens);
+        $flatResults = $this->applyQueryCoordination($flatResults);
+        usort($flatResults, array($this, "scoreCompare"));
 
-		$flatResults = array_merge($this->getSearchSuggestions(), $flatResults);
+        $flatResults = array_merge($this->getSearchSuggestions(), $flatResults);
 
-		return $flatResults;
-	}
+        return $flatResults;
+    }
 
-	/**
-	 * Returns the amount of distinct documents
-	 * that are currently in the search index.
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function getIndexedDocuments()
-	{
-		$db = $this->getSearchDbHandle();
-		$sql = '
+    /**
+     * Returns the amount of distinct documents
+     * that are currently in the search index.
+     * @return int
+     * @throws \Exception
+     */
+    public function getIndexedDocuments()
+    {
+        $db = $this->getSearchDbHandle();
+        $sql = '
 			SELECT count(DISTINCT documentPath) as indexedDocuments
 			  FROM term_frequency
 		';
-		if (!$stmt = $db->query($sql)) {
-			$errorInfo = $db->errorInfo();
-			$errorMsg = $errorInfo[2];
-			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>');
-		}
-		return intval($result);
-	}
+        if (!$stmt = $db->query($sql)) {
+            $errorInfo = $db->errorInfo();
+            $errorMsg = $errorInfo[2];
+            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>');
+        }
+        return intval($result);
+    }
 
-	/**
-	 * Queries each token present in the Tokenizer
-	 * and returns SearchResult objects for the found
-	 * documents
-	 * @return array
-	 */
-	private function queryTokens()
-	{
-		$tokens = $this->getTokens();
+    /**
+     * Queries each token present in the Tokenizer
+     * and returns SearchResult objects for the found
+     * documents
+     * @return array
+     */
+    private function queryTokens()
+    {
+        $tokens = $this->getTokens();
 
-		$queryNorm = $this->getQueryNorm($tokens);
-		$results = array();
-		foreach ($tokens as $token) {
-			$results[$token] = $this->getResultsForToken($token, $queryNorm);
-		}
-		return $results;
-	}
+        $queryNorm = $this->getQueryNorm($tokens);
+        $results = array();
+        foreach ($tokens as $token) {
+            $results[$token] = $this->getResultsForToken($token, $queryNorm);
+        }
+        return $results;
+    }
 
-	/**
-	 * Applies the Filter objects in the the filter array to the
-	 * tokens in the Tokenizer
-	 * @param $tokens
-	 *
-	 * @return mixed
-	 */
-	protected function applyFilters($tokens)
-	{
-		foreach ($this->filters as $filterName) {
-			$filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
-			$filter = new $filterClassName($tokens);
-			$tokens = $filter->getFilterResults();
-		}
-		return $tokens;
-	}
+    /**
+     * Applies the Filter objects in the the filter array to the
+     * tokens in the Tokenizer
+     * @param $tokens
+     *
+     * @return mixed
+     */
+    protected function applyFilters($tokens)
+    {
+        foreach ($this->filters as $filterName) {
+            $filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
+            $filter = new $filterClassName($tokens);
+            $tokens = $filter->getFilterResults();
+        }
+        return $tokens;
+    }
 
-	/**
-	 * Queries the search index for a given token
-	 * and the query norm.
-	 * @param $token
-	 * @param $queryNorm
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function getResultsForToken($token, $queryNorm) {
-		$db = $this->getSearchDbHandle();
-		$sql = '
+    /**
+     * Queries the search index for a given token
+     * and the query norm.
+     * @param $token
+     * @param $queryNorm
+     *
+     * @return array
+     * @throws \Exception
+     */
+    public function getResultsForToken($token, $queryNorm) {
+        $db = $this->getSearchDbHandle();
+        $sql = '
 			SELECT (:queryNorm * 
 						(SUM(term_frequency.frequency) --TF
 						* inverse_document_frequency.inverseDocumentFrequency -- IDF
@@ -154,113 +154,113 @@ 
 		  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>');
-		}
-		$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>');
-		}
-		return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchResult');
-	}
+        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>');
+        }
+        return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchResult');
+    }
 
-	/**
-	 * @param $resultsPerTokens
-	 *
-	 * @return array
-	 */
-	private function flattenResults($resultsPerTokens)
-	{
-		$finalResults = array();
-		foreach ($resultsPerTokens as $token => $resultPerToken) {
-			foreach ($resultPerToken as $result) {
-				if (isset($finalResults[$result->documentPath])) {
-					$finalResults[$result->documentPath]->score += $result->score;
-					$finalResults[$result->documentPath]->matchingTokens[] = $token;
-				} else {
-					$resultObj = new SearchResult();
-					$resultObj->documentPath = $result->documentPath;
-					$resultObj->matchingTokens = array($token);
-					$resultObj->score = floatval($result->score);
-					$resultObj->setStorage($this->storage);
-					$finalResults[$result->documentPath] = $resultObj;
-				}
-			}
-		}
-		return $finalResults;
-	}
+    /**
+     * @param $resultsPerTokens
+     *
+     * @return array
+     */
+    private function flattenResults($resultsPerTokens)
+    {
+        $finalResults = array();
+        foreach ($resultsPerTokens as $token => $resultPerToken) {
+            foreach ($resultPerToken as $result) {
+                if (isset($finalResults[$result->documentPath])) {
+                    $finalResults[$result->documentPath]->score += $result->score;
+                    $finalResults[$result->documentPath]->matchingTokens[] = $token;
+                } else {
+                    $resultObj = new SearchResult();
+                    $resultObj->documentPath = $result->documentPath;
+                    $resultObj->matchingTokens = array($token);
+                    $resultObj->score = floatval($result->score);
+                    $resultObj->setStorage($this->storage);
+                    $finalResults[$result->documentPath] = $resultObj;
+                }
+            }
+        }
+        return $finalResults;
+    }
 
-	private function scoreCompare($a, $b) {
-		if ($a->score == $b->score) {
-			return 0;
-		}
-		return ($a->score > $b->score) ? -1 : 1;
-	}
+    private function scoreCompare($a, $b) {
+        if ($a->score == $b->score) {
+            return 0;
+        }
+        return ($a->score > $b->score) ? -1 : 1;
+    }
 
-	/**
-	 * Calculates the query norm for all tokens in the Tokenizer
-	 * @param $tokens
-	 *
-	 * @return int
-	 * @throws \Exception
-	 */
-	private function getQueryNorm($tokens)
-	{
-		$db = $this->getSearchDbHandle();
-		$db->sqliteCreateFunction('sqrt', 'sqrt', 1);
-		foreach ($tokens as $key => $token) {
-			$tokens[$key] = $db->quote($token);
-		}
-		$terms = implode(',', $tokens);
-		$sql = '
+    /**
+     * Calculates the query norm for all tokens in the Tokenizer
+     * @param $tokens
+     *
+     * @return int
+     * @throws \Exception
+     */
+    private function getQueryNorm($tokens)
+    {
+        $db = $this->getSearchDbHandle();
+        $db->sqliteCreateFunction('sqrt', 'sqrt', 1);
+        foreach ($tokens as $key => $token) {
+            $tokens[$key] = $db->quote($token);
+        }
+        $terms = implode(',', $tokens);
+        $sql = '
 			SELECT (1 / sqrt(SUM(inverseDocumentFrequency))) as queryNorm
 			  FROM inverse_document_frequency
 			 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->execute()) {
-			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;
-	}
+        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>');
+        }
+        $result = $stmt->fetch(\PDO::FETCH_OBJ);
+        return $result->queryNorm == null ? 1 : $result->queryNorm;
+    }
 
-	/**
-	 * Applies query coordination to all results
-	 * @param $flatResults
-	 *
-	 * @return mixed
-	 */
-	private function applyQueryCoordination($flatResults)
-	{
-		$tokenVector = $this->tokenizer->getTokenVector();
-		$tokens = array_keys($tokenVector);
-		$tokenCount = count($tokens);
-		foreach ($flatResults as $key => $result) {
-			$matchCount = count($result->matchingTokens);
-			$result->score = ($matchCount / $tokenCount) * $result->score;
-			$flatResults[$key] = $result;
-		}
-		return $flatResults;
-	}
+    /**
+     * Applies query coordination to all results
+     * @param $flatResults
+     *
+     * @return mixed
+     */
+    private function applyQueryCoordination($flatResults)
+    {
+        $tokenVector = $this->tokenizer->getTokenVector();
+        $tokens = array_keys($tokenVector);
+        $tokenCount = count($tokens);
+        foreach ($flatResults as $key => $result) {
+            $matchCount = count($result->matchingTokens);
+            $result->score = ($matchCount / $tokenCount) * $result->score;
+            $flatResults[$key] = $result;
+        }
+        return $flatResults;
+    }
 
-	/**
-	 * Uses the levenshtein algorithm to determine the term that is
-	 * closest to the token that was input for the search
-	 * @return array
-	 * @throws \Exception
-	 */
-	private function getSearchSuggestions()
-	{
-		$tokens = $this->getTokens();
-		$allResults = array();
-		foreach ($tokens as $token) {
-			$db = $this->getSearchDbHandle();
-			$db->sqliteCreateFunction('levenshtein', 'levenshtein', 2);
-			$sql = '
+    /**
+     * Uses the levenshtein algorithm to determine the term that is
+     * closest to the token that was input for the search
+     * @return array
+     * @throws \Exception
+     */
+    private function getSearchSuggestions()
+    {
+        $tokens = $this->getTokens();
+        $allResults = array();
+        foreach ($tokens as $token) {
+            $db = $this->getSearchDbHandle();
+            $db->sqliteCreateFunction('levenshtein', 'levenshtein', 2);
+            $sql = '
 				SELECT *
 				  FROM (
 				  	SELECT :token as original, term, levenshtein(term, :token) as editDistance
@@ -270,35 +270,35 @@ 
 			  	     )
 			  	   WHERE editDistance > 0
 			';
-			$stmt = $db->prepare($sql);
-			if ($stmt === false) {
-				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>');
-			}
-			$result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchSuggestion');
-			$allResults = array_merge($result, $allResults);
-		}
-		return $allResults;
-	}
+            $stmt = $db->prepare($sql);
+            if ($stmt === false) {
+                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>');
+            }
+            $result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchSuggestion');
+            $allResults = array_merge($result, $allResults);
+        }
+        return $allResults;
+    }
 
-	/**
-	 * Retrieves all tokens from the tokenizer
-	 * @return array
-	 */
-	private function getTokens()
-	{
-		$tokenVector = array(
-			'query' => array(),
-		);
-		$tokenVector['query'] = $this->tokenizer->getTokenVector();
-		$tokens = $this->applyFilters($tokenVector);
-		if (!empty($tokens)) {
-			$tokens = array_keys($tokens['query']);
-		}
+    /**
+     * Retrieves all tokens from the tokenizer
+     * @return array
+     */
+    private function getTokens()
+    {
+        $tokenVector = array(
+            'query' => array(),
+        );
+        $tokenVector['query'] = $this->tokenizer->getTokenVector();
+        $tokens = $this->applyFilters($tokenVector);
+        if (!empty($tokens)) {
+            $tokens = array_keys($tokens['query']);
+        }
 
-		return $tokens;
-	}
+        return $tokens;
+    }
 }
\ No newline at end of file

src/search/DocumentTokenizer.php

Spacing +4 added lines, -4 removed lines

@@ -89,11 +89,11 @@ 
 
 	private function tokenizeBrick($brick, $brickSlug)
 	{
-		$fields  = $brick->fields;
+		$fields = $brick->fields;
 		$brickDefinition = $this->storage->getBricks()->getBrickBySlug($brick->type);
 		foreach ($fields as $fieldName => $field) {
 			$fieldType = $this->getFieldType($fieldName, $brickDefinition);
-			$this->tokenizeField($field, $brickSlug . '__' . $fieldName, $fieldType);
+			$this->tokenizeField($field, $brickSlug.'__'.$fieldName, $fieldType);
 		}
 	}
 
@@ -101,7 +101,7 @@ 
 	{
 		$dynamicBricks = $this->document->dynamicBricks;
 		foreach ($dynamicBricks as $key => $brick) {
-			$this->tokenizeBrick($brick, 'dynamicBricks__' . $brick->type . $key);
+			$this->tokenizeBrick($brick, 'dynamicBricks__'.$brick->type.$key);
 		}
 	}
 
@@ -154,6 +154,6 @@ 
 			}
 		}
 
-		throw new \Exception('Unknown field type for field' . $fieldName . ' in document ' . $this->document->path);
+		throw new \Exception('Unknown field type for field'.$fieldName.' in document '.$this->document->path);
 	}
 }
\ No newline at end of file

Indentation +145 added lines, -145 removed lines

@@ -13,149 +13,149 @@
 
 class DocumentTokenizer
 {
-	/**
-	 * @var Document
-	 */
-	protected $document;
-
-	/**
-	 * @var array
-	 */
-	protected $tokenVector = array();
-	protected $storage;
-
-	/**
-	 * Tokenizer constructor.
-	 *
-	 * @param \CloudControl\Cms\storage\Document $document
-	 * @param Storage                   $storage
-	 */
-	public function __construct(Document $document, Storage $storage)
-	{
-		$this->document = $document;
-		$this->storage = $storage;
-		$this->tokenize();
-	}
-
-	/**
-	 * Execute tokenization of all document fields
-	 */
-	private function tokenize()
-	{
-		$this->tokenizeTitle();
-		$this->tokenizeFields();
-		$this->tokenizeBricks();
-		$this->tokenizeDynamicBricks();
-		$this->tokenVector = array_filter($this->tokenVector);
-		arsort($this->tokenVector);
-	}
-
-	private function tokenizeTitle()
-	{
-		$filteredString = new CharacterFilter($this->document->title);
-		$tokenizer = new Tokenizer($filteredString);
-		$this->addTokenVectorToVector($tokenizer->getTokenVector(), 'title');
-	}
-
-	private function tokenizeFields()
-	{
-		$fields = $this->document->fields;
-		$documentDefinition = $this->storage->getDocumentTypes()->getDocumentTypeBySlug($this->document->documentTypeSlug);
-		foreach ($fields as $fieldName => $field) {
-			$fieldType = $this->getFieldType($fieldName, $documentDefinition);
-			$this->tokenizeField($field, $fieldName, $fieldType);
-		}
-	}
-
-	private function tokenizeField($field, $fieldName, $fieldType)
-	{
-		foreach ($field as $value) {
-			// Only index fields that contain text
-			if (in_array($fieldType, array('String', 'Text', 'Rich Text'))) {
-				$filteredString = new CharacterFilter($value);
-				$tokenizer = new Tokenizer($filteredString);
-				$this->addTokenVectorToVector($tokenizer->getTokenVector(), $fieldName);
-			}
-		}
-	}
-
-	private function tokenizeBricks()
-	{
-		$bricks = $this->document->bricks;
-		foreach ($bricks as $brickSlug => $bricks) {
-			foreach ($bricks as $brick) {
-				$this->tokenizeBrick($brick, $brickSlug);
-			}
-		}
-	}
-
-	private function tokenizeBrick($brick, $brickSlug)
-	{
-		$fields  = $brick->fields;
-		$brickDefinition = $this->storage->getBricks()->getBrickBySlug($brick->type);
-		foreach ($fields as $fieldName => $field) {
-			$fieldType = $this->getFieldType($fieldName, $brickDefinition);
-			$this->tokenizeField($field, $brickSlug . '__' . $fieldName, $fieldType);
-		}
-	}
-
-	private function tokenizeDynamicBricks()
-	{
-		$dynamicBricks = $this->document->dynamicBricks;
-		foreach ($dynamicBricks as $key => $brick) {
-			$this->tokenizeBrick($brick, 'dynamicBricks__' . $brick->type . $key);
-		}
-	}
-
-	public function getTokens()
-	{
-		return $this->tokenVector;
-	}
-
-	/**
-	 * Add a token to the existing tokenvector
-	 * @param     		$token
-	 * @param string    $field
-	 * @param int 		$count
-	 */
-	private function addTokenToVector($token, $field, $count = 1)
-	{
-		if (!empty($token)) {
-			if (isset($this->tokenVector[$field][$token])) {
-				$this->tokenVector[$field][$token] += $count;
-			} else {
-				$this->tokenVector[$field][$token] = $count;
-			}
-		}
-	}
-
-	/**
-	 * Add a complete token vector to the existing one.
-	 * @param $tokenVector
-	 * @param $field
-	 */
-	private function addTokenVectorToVector($tokenVector, $field)
-	{
-		foreach ($tokenVector as $token => $count) {
-			$this->addTokenToVector($token, $field, $count);
-		}
-	}
-
-	/**
-	 * Get the type for a field
-	 * @param $fieldName
-	 * @param $documentDefinition
-	 * @return mixed
-	 * @throws \Exception
-	 */
-	private function getFieldType($fieldName, $documentDefinition)
-	{
-		foreach ($documentDefinition->fields as $fieldTypeDefinition) {
-			if ($fieldTypeDefinition->slug === $fieldName) {
-				return $fieldTypeDefinition->type;
-			}
-		}
-
-		throw new \Exception('Unknown field type for field' . $fieldName . ' in document ' . $this->document->path);
-	}
+    /**
+     * @var Document
+     */
+    protected $document;
+
+    /**
+     * @var array
+     */
+    protected $tokenVector = array();
+    protected $storage;
+
+    /**
+     * Tokenizer constructor.
+     *
+     * @param \CloudControl\Cms\storage\Document $document
+     * @param Storage                   $storage
+     */
+    public function __construct(Document $document, Storage $storage)
+    {
+        $this->document = $document;
+        $this->storage = $storage;
+        $this->tokenize();
+    }
+
+    /**
+     * Execute tokenization of all document fields
+     */
+    private function tokenize()
+    {
+        $this->tokenizeTitle();
+        $this->tokenizeFields();
+        $this->tokenizeBricks();
+        $this->tokenizeDynamicBricks();
+        $this->tokenVector = array_filter($this->tokenVector);
+        arsort($this->tokenVector);
+    }
+
+    private function tokenizeTitle()
+    {
+        $filteredString = new CharacterFilter($this->document->title);
+        $tokenizer = new Tokenizer($filteredString);
+        $this->addTokenVectorToVector($tokenizer->getTokenVector(), 'title');
+    }
+
+    private function tokenizeFields()
+    {
+        $fields = $this->document->fields;
+        $documentDefinition = $this->storage->getDocumentTypes()->getDocumentTypeBySlug($this->document->documentTypeSlug);
+        foreach ($fields as $fieldName => $field) {
+            $fieldType = $this->getFieldType($fieldName, $documentDefinition);
+            $this->tokenizeField($field, $fieldName, $fieldType);
+        }
+    }
+
+    private function tokenizeField($field, $fieldName, $fieldType)
+    {
+        foreach ($field as $value) {
+            // Only index fields that contain text
+            if (in_array($fieldType, array('String', 'Text', 'Rich Text'))) {
+                $filteredString = new CharacterFilter($value);
+                $tokenizer = new Tokenizer($filteredString);
+                $this->addTokenVectorToVector($tokenizer->getTokenVector(), $fieldName);
+            }
+        }
+    }
+
+    private function tokenizeBricks()
+    {
+        $bricks = $this->document->bricks;
+        foreach ($bricks as $brickSlug => $bricks) {
+            foreach ($bricks as $brick) {
+                $this->tokenizeBrick($brick, $brickSlug);
+            }
+        }
+    }
+
+    private function tokenizeBrick($brick, $brickSlug)
+    {
+        $fields  = $brick->fields;
+        $brickDefinition = $this->storage->getBricks()->getBrickBySlug($brick->type);
+        foreach ($fields as $fieldName => $field) {
+            $fieldType = $this->getFieldType($fieldName, $brickDefinition);
+            $this->tokenizeField($field, $brickSlug . '__' . $fieldName, $fieldType);
+        }
+    }
+
+    private function tokenizeDynamicBricks()
+    {
+        $dynamicBricks = $this->document->dynamicBricks;
+        foreach ($dynamicBricks as $key => $brick) {
+            $this->tokenizeBrick($brick, 'dynamicBricks__' . $brick->type . $key);
+        }
+    }
+
+    public function getTokens()
+    {
+        return $this->tokenVector;
+    }
+
+    /**
+     * Add a token to the existing tokenvector
+     * @param     		$token
+     * @param string    $field
+     * @param int 		$count
+     */
+    private function addTokenToVector($token, $field, $count = 1)
+    {
+        if (!empty($token)) {
+            if (isset($this->tokenVector[$field][$token])) {
+                $this->tokenVector[$field][$token] += $count;
+            } else {
+                $this->tokenVector[$field][$token] = $count;
+            }
+        }
+    }
+
+    /**
+     * Add a complete token vector to the existing one.
+     * @param $tokenVector
+     * @param $field
+     */
+    private function addTokenVectorToVector($tokenVector, $field)
+    {
+        foreach ($tokenVector as $token => $count) {
+            $this->addTokenToVector($token, $field, $count);
+        }
+    }
+
+    /**
+     * Get the type for a field
+     * @param $fieldName
+     * @param $documentDefinition
+     * @return mixed
+     * @throws \Exception
+     */
+    private function getFieldType($fieldName, $documentDefinition)
+    {
+        foreach ($documentDefinition->fields as $fieldTypeDefinition) {
+            if ($fieldTypeDefinition->slug === $fieldName) {
+                return $fieldTypeDefinition->type;
+            }
+        }
+
+        throw new \Exception('Unknown field type for field' . $fieldName . ' in document ' . $this->document->path);
+    }
 }
\ No newline at end of file

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;
 	}

Indentation +51 added lines, -51 removed lines

@@ -17,61 +17,61 @@
  */
 abstract class SearchDbConnected
 {
-	/**
-	 * @var \PDO
-	 */
-	protected $searchDbHandle;
+    /**
+     * @var \PDO
+     */
+    protected $searchDbHandle;
 
-	/**
-	 * @var \CloudControl\Cms\storage\Storage
-	 */
-	protected $storage;
-	/**
-	 * @var string
-	 */
-	protected $storageDir;
+    /**
+     * @var \CloudControl\Cms\storage\Storage
+     */
+    protected $storage;
+    /**
+     * @var string
+     */
+    protected $storageDir;
 
-	/**
-	 * Indexer constructor.
-	 *
-	 * @param \CloudControl\Cms\storage\Storage $storage
-	 */
-	public function __construct(Storage $storage)
-	{
-		$this->storageDir = $storage->getStorageDir();
-		$this->storage = $storage;
-		$this->initializeDb();
-	}
+    /**
+     * Indexer constructor.
+     *
+     * @param \CloudControl\Cms\storage\Storage $storage
+     */
+    public function __construct(Storage $storage)
+    {
+        $this->storageDir = $storage->getStorageDir();
+        $this->storage = $storage;
+        $this->initializeDb();
+    }
 
-	protected function initializeDb()
-	{
-		if (!$this->isDatabaseConfigured()) {
-			$this->configureDatabase();
-		}
-	}
+    protected function initializeDb()
+    {
+        if (!$this->isDatabaseConfigured()) {
+            $this->configureDatabase();
+        }
+    }
 
-	protected function configureDatabase()
-	{
-		$db = $this->getSearchDbHandle();
-		$sqlPath = __DIR__ . DIRECTORY_SEPARATOR . '../cc/install/search.sql';
-		$searchSql = file_get_contents($sqlPath);
-		$db->exec($searchSql);
-	}
+    protected function configureDatabase()
+    {
+        $db = $this->getSearchDbHandle();
+        $sqlPath = __DIR__ . DIRECTORY_SEPARATOR . '../cc/install/search.sql';
+        $searchSql = file_get_contents($sqlPath);
+        $db->exec($searchSql);
+    }
 
-	protected function isDatabaseConfigured()
-	{
-		$db = $this->getSearchDbHandle();
-		$stmt = $db->query('SELECT name FROM sqlite_master WHERE type=\'table\' AND name=\'term_count\';');
-		$result = $stmt->fetchAll();
-		return !empty($result);
-	}
+    protected function isDatabaseConfigured()
+    {
+        $db = $this->getSearchDbHandle();
+        $stmt = $db->query('SELECT name FROM sqlite_master WHERE type=\'table\' AND name=\'term_count\';');
+        $result = $stmt->fetchAll();
+        return !empty($result);
+    }
 
-	protected function getSearchDbHandle()
-	{
-		if ($this->searchDbHandle === null) {
-			$path = $this->storageDir . DIRECTORY_SEPARATOR;
-			$this->searchDbHandle = new \PDO('sqlite:' . $path . 'search.db');
-		}
-		return $this->searchDbHandle;
-	}
+    protected function getSearchDbHandle()
+    {
+        if ($this->searchDbHandle === null) {
+            $path = $this->storageDir . DIRECTORY_SEPARATOR;
+            $this->searchDbHandle = new \PDO('sqlite:' . $path . 'search.db');
+        }
+        return $this->searchDbHandle;
+    }
 }
\ No newline at end of file

src/search/CharacterFilter.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 		$string = strip_tags($string);
 		$string = trim($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
@@ -66,7 +66,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');
 		}
 

Indentation +65 added lines, -65 removed lines

@@ -9,76 +9,76 @@
 
 class CharacterFilter
 {
-	protected $originalString;
-	protected $filteredString = '';
+    protected $originalString;
+    protected $filteredString = '';
 
-	/**
-	 * CharacterFilter constructor.
-	 *
-	 * @param $string
-	 */
-	public function __construct($string)
-	{
-		$this->originalString = $string;
-		$string = $this->convertToUTF8($string);
-		$string = mb_strtolower($string);
-		$string = $this->filterSpecialCharacters($string);
-		$this->filteredString = $string;
-	}
+    /**
+     * CharacterFilter constructor.
+     *
+     * @param $string
+     */
+    public function __construct($string)
+    {
+        $this->originalString = $string;
+        $string = $this->convertToUTF8($string);
+        $string = mb_strtolower($string);
+        $string = $this->filterSpecialCharacters($string);
+        $this->filteredString = $string;
+    }
 
-	/**
-	 * Returns the filtered string
-	 * @return string|void
-	 */
-	public function __toString()
-	{
-		return $this->filteredString;
-	}
+    /**
+     * Returns the filtered string
+     * @return string|void
+     */
+    public function __toString()
+    {
+        return $this->filteredString;
+    }
 
-	/**
-	 * Filter out all special characters, like punctuation and characters with accents
-	 *
-	 * @param $string
-	 *
-	 * @return mixed|string
-	 */
-	private function filterSpecialCharacters($string)
-	{
-		$string = str_replace('<', ' <', $string); // This is need, otherwise this: <h1>something</h1><h2>something</h2> will result in somethingsomething
-		$string = strip_tags($string);
-		$string = trim($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 = 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
-		$string = preg_replace('!\s+!', ' ', $string); // Replace multiple spaces with a single space
-		return $string;
-	}
+    /**
+     * Filter out all special characters, like punctuation and characters with accents
+     *
+     * @param $string
+     *
+     * @return mixed|string
+     */
+    private function filterSpecialCharacters($string)
+    {
+        $string = str_replace('<', ' <', $string); // This is need, otherwise this: <h1>something</h1><h2>something</h2> will result in somethingsomething
+        $string = strip_tags($string);
+        $string = trim($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 = 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
+        $string = preg_replace('!\s+!', ' ', $string); // Replace multiple spaces with a single space
+        return $string;
+    }
 
-	/**
-	 * Convert the string to UTF-8 encoding
-	 * @param $string
-	 *
-	 * @return string
-	 */
-	private function convertToUTF8($string)
-	{
-		$encoding = mb_detect_encoding($string, mb_detect_order(), false);
+    /**
+     * Convert the string to UTF-8 encoding
+     * @param $string
+     *
+     * @return string
+     */
+    private function convertToUTF8($string)
+    {
+        $encoding = mb_detect_encoding($string, mb_detect_order(), false);
 
-		if($encoding == "UTF-8") {
-			$string = mb_convert_encoding($string, 'UTF-8', 'UTF-8');
-		}
+        if($encoding == "UTF-8") {
+            $string = mb_convert_encoding($string, 'UTF-8', 'UTF-8');
+        }
 
-		$out = iconv(mb_detect_encoding($string, mb_detect_order(), false), "UTF-8//IGNORE", $string);
-		return $out;
-	}
+        $out = iconv(mb_detect_encoding($string, mb_detect_order(), false), "UTF-8//IGNORE", $string);
+        return $out;
+    }
 
-	/**
-	 * @return mixed|string
-	 */
-	public function getFilteredString()
-	{
-		return $this->filteredString;
-	}
+    /**
+     * @return mixed|string
+     */
+    public function getFilteredString()
+    {
+        return $this->filteredString;
+    }
 }
\ No newline at end of file