Passed
Push — develop ( 0cf906...cb779b )
by Jens
06:50
created
src/search/indexer/InverseDocumentFrequency.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,14 +47,14 @@
 block discarded – undo
47 47
 		if (!$stmt = $db->prepare($sql)) {
48 48
 			$errorInfo = $db->errorInfo();
49 49
 			$errorMsg = $errorInfo[2];
50
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
50
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
51 51
 		}
52 52
 		$stmt->bindValue(':documentCount', $this->documentCount);
53 53
 		$result = $stmt->execute();
54 54
 		if ($result === false) {
55 55
 			$errorInfo = $db->errorInfo();
56 56
 			$errorMsg = $errorInfo[2];
57
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
57
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
58 58
 		}
59 59
 	}
60 60
 }
61 61
\ No newline at end of file
Please login to merge, or discard this patch.
src/search/filters/DutchStopWords.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,5 +10,5 @@
 block discarded – undo
10 10
 
11 11
 class DutchStopWords extends StopWordsFilter
12 12
 {
13
-	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');
13
+	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');
14 14
 }
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
src/search/filters/StopWordsFilter.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -11,37 +11,37 @@
 block discarded – undo
11 11
 
12 12
 abstract class StopWordsFilter implements Filter
13 13
 {
14
-    protected $tokens;
15
-    protected $stopWords = array();
14
+	protected $tokens;
15
+	protected $stopWords = array();
16 16
 
17
-    /**
18
-     * StopWordsFilter constructor.
19
-     * @param array $tokens
20
-     */
21
-    public function __construct($tokens)
22
-    {
23
-        $this->tokens = $tokens;
24
-    }
17
+	/**
18
+	 * StopWordsFilter constructor.
19
+	 * @param array $tokens
20
+	 */
21
+	public function __construct($tokens)
22
+	{
23
+		$this->tokens = $tokens;
24
+	}
25 25
 
26
-    /**
27
-     * @return array
28
-     */
29
-    public function getFilterResults()
30
-    {
31
-        foreach ($this->stopWords as $stopWord) {
32
-            foreach ($this->tokens as $field => $tokens) {
33
-                if (isset($tokens[$stopWord])) {
34
-                    $tokens[$stopWord] = null;
35
-                    unset($tokens[$stopWord]);
36
-                    $tokens = array_filter($tokens);
37
-                    asort($tokens);
38
-                }
26
+	/**
27
+	 * @return array
28
+	 */
29
+	public function getFilterResults()
30
+	{
31
+		foreach ($this->stopWords as $stopWord) {
32
+			foreach ($this->tokens as $field => $tokens) {
33
+				if (isset($tokens[$stopWord])) {
34
+					$tokens[$stopWord] = null;
35
+					unset($tokens[$stopWord]);
36
+					$tokens = array_filter($tokens);
37
+					asort($tokens);
38
+				}
39 39
 
40
-                $this->tokens[$field] = $tokens;
41
-            }
42
-        }
43
-        $this->tokens = array_filter($this->tokens);
44
-        asort($this->tokens);
45
-        return $this->tokens;
46
-    }
40
+				$this->tokens[$field] = $tokens;
41
+			}
42
+		}
43
+		$this->tokens = array_filter($this->tokens);
44
+		asort($this->tokens);
45
+		return $this->tokens;
46
+	}
47 47
 }
48 48
\ No newline at end of file
Please login to merge, or discard this patch.
src/search/Search.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -79,13 +79,13 @@  discard block
 block discarded – undo
79 79
 		if (!$stmt = $db->query($sql)) {
80 80
 			$errorInfo = $db->errorInfo();
81 81
 			$errorMsg = $errorInfo[2];
82
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
82
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
83 83
 		}
84 84
 		$result = $stmt->fetch(\PDO::FETCH_COLUMN);
85 85
 		if (false === $result) {
86 86
 			$errorInfo = $db->errorInfo();
87 87
 			$errorMsg = $errorInfo[2];
88
-			throw new \Exception('SQLite Exception: ' . $errorMsg . ' in SQL: <br /><pre>' . $sql . '</pre>');
88
+			throw new \Exception('SQLite Exception: '.$errorMsg.' in SQL: <br /><pre>'.$sql.'</pre>');
89 89
 		}
90 90
 		return intval($result);
91 91
 	}
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 	protected function applyFilters($tokens)
119 119
 	{
120 120
 		foreach ($this->filters as $filterName) {
121
-			$filterClassName = '\CloudControl\Cms\search\filters\\' . $filterName;
121
+			$filterClassName = '\CloudControl\Cms\search\filters\\'.$filterName;
122 122
 			$filter = new $filterClassName($tokens);
123 123
 			$tokens = $filter->getFilterResults();
124 124
 		}
@@ -154,13 +154,13 @@  discard block
 block discarded – undo
154 154
 		  GROUP BY term_frequency.documentPath, term_frequency.term
155 155
 		  ORDER BY score DESC
156 156
 		';
157
-		if(!$stmt = $db->prepare($sql)) {
158
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
157
+		if (!$stmt = $db->prepare($sql)) {
158
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
159 159
 		}
160 160
 		$stmt->bindValue(':query', $token);
161 161
 		$stmt->bindValue(':queryNorm', $queryNorm);
162 162
 		if (!$stmt->execute()) {
163
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
163
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
164 164
 		}
165 165
 		return $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchResult');
166 166
 	}
@@ -216,13 +216,13 @@  discard block
 block discarded – undo
216 216
 		$sql = '
217 217
 			SELECT (1 / sqrt(SUM(inverseDocumentFrequency))) as queryNorm
218 218
 			  FROM inverse_document_frequency
219
-			 WHERE term IN (' . $terms . ') 
219
+			 WHERE term IN (' . $terms.') 
220 220
 		';
221
-		if(!$stmt = $db->prepare($sql)) {
222
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
221
+		if (!$stmt = $db->prepare($sql)) {
222
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
223 223
 		}
224 224
 		if (!$stmt->execute()) {
225
-			throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
225
+			throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
226 226
 		}
227 227
 		$result = $stmt->fetch(\PDO::FETCH_OBJ);
228 228
 		return $result->queryNorm == null ? 1 : $result->queryNorm;
@@ -272,11 +272,11 @@  discard block
 block discarded – undo
272 272
 			';
273 273
 			$stmt = $db->prepare($sql);
274 274
 			if ($stmt === false) {
275
-				throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
275
+				throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
276 276
 			}
277 277
 			$stmt->bindValue(':token', $token);
278 278
 			if (($stmt === false) | (!$stmt->execute())) {
279
-				throw new \Exception('SQLite exception: <pre>' . print_r($db->errorInfo(), true) . '</pre> for SQL:<pre>' . $sql . '</pre>');
279
+				throw new \Exception('SQLite exception: <pre>'.print_r($db->errorInfo(), true).'</pre> for SQL:<pre>'.$sql.'</pre>');
280 280
 			}
281 281
 			$result = $stmt->fetchAll(\PDO::FETCH_CLASS, '\CloudControl\Cms\search\results\SearchSuggestion');
282 282
 			$allResults = array_merge($result, $allResults);
Please login to merge, or discard this patch.
src/search/DocumentTokenizer.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,11 +89,11 @@  discard block
 block discarded – undo
89 89
 
90 90
 	private function tokenizeBrick($brick, $brickSlug)
91 91
 	{
92
-		$fields  = $brick->fields;
92
+		$fields = $brick->fields;
93 93
 		$brickDefinition = $this->storage->getBricks()->getBrickBySlug($brick->type);
94 94
 		foreach ($fields as $fieldName => $field) {
95 95
 			$fieldType = $this->getFieldType($fieldName, $brickDefinition);
96
-			$this->tokenizeField($field, $brickSlug . '__' . $fieldName, $fieldType);
96
+			$this->tokenizeField($field, $brickSlug.'__'.$fieldName, $fieldType);
97 97
 		}
98 98
 	}
99 99
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	{
102 102
 		$dynamicBricks = $this->document->dynamicBricks;
103 103
 		foreach ($dynamicBricks as $key => $brick) {
104
-			$this->tokenizeBrick($brick, 'dynamicBricks__' . $brick->type . $key);
104
+			$this->tokenizeBrick($brick, 'dynamicBricks__'.$brick->type.$key);
105 105
 		}
106 106
 	}
107 107
 
@@ -154,6 +154,6 @@  discard block
 block discarded – undo
154 154
 			}
155 155
 		}
156 156
 
157
-		throw new \Exception('Unknown field type for field' . $fieldName . ' in document ' . $this->document->path);
157
+		throw new \Exception('Unknown field type for field'.$fieldName.' in document '.$this->document->path);
158 158
 	}
159 159
 }
160 160
\ No newline at end of file
Please login to merge, or discard this patch.
src/search/SearchDbConnected.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	protected function configureDatabase()
54 54
 	{
55 55
 		$db = $this->getSearchDbHandle();
56
-		$sqlPath = __DIR__ . DIRECTORY_SEPARATOR . '../cc/install/search.sql';
56
+		$sqlPath = __DIR__.DIRECTORY_SEPARATOR.'../cc/install/search.sql';
57 57
 		$searchSql = file_get_contents($sqlPath);
58 58
 		$db->exec($searchSql);
59 59
 	}
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 	protected function getSearchDbHandle()
70 70
 	{
71 71
 		if ($this->searchDbHandle === null) {
72
-			$path = $this->storageDir . DIRECTORY_SEPARATOR;
73
-			$this->searchDbHandle = new \PDO('sqlite:' . $path . 'search.db');
72
+			$path = $this->storageDir.DIRECTORY_SEPARATOR;
73
+			$this->searchDbHandle = new \PDO('sqlite:'.$path.'search.db');
74 74
 		}
75 75
 		return $this->searchDbHandle;
76 76
 	}
Please login to merge, or discard this patch.
src/search/CharacterFilter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 		$string = strip_tags($string);
49 49
 		$string = trim($string);
50 50
 		$string = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $string); // Remove special alphanumeric characters
51
-		$string = str_replace(array('+', '=', '!', ',', '.',';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces
51
+		$string = str_replace(array('+', '=', '!', ',', '.', ';', ':', '?'), ' ', $string); // Replace sentence breaking charaters with spaces
52 52
 		$string = preg_replace("/[\r\n]+/", " ", $string); // Replace multiple newlines with a single space.
53 53
 		$string = preg_replace("/[\t]+/", " ", $string); // Replace multiple tabs with a single space.
54 54
 		$string = preg_replace("/[^a-zA-Z0-9 ]/", '', $string); // Filter out everything that is not alphanumeric or a space
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 	{
67 67
 		$encoding = mb_detect_encoding($string, mb_detect_order(), false);
68 68
 
69
-		if($encoding == "UTF-8") {
69
+		if ($encoding == "UTF-8") {
70 70
 			$string = mb_convert_encoding($string, 'UTF-8', 'UTF-8');
71 71
 		}
72 72
 
Please login to merge, or discard this patch.
src/search/Indexer.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 		$this->storage->getDocuments()->cleanPublishedDeletedDocuments();
61 61
 		$this->addLog('Retrieving documents to be indexed.');
62 62
 		$documents = $this->storage->getDocuments()->getPublishedDocumentsNoFolders();
63
-		$this->addLog('Start Document Term Count for ' . count($documents) . ' documents');
63
+		$this->addLog('Start Document Term Count for '.count($documents).' documents');
64 64
 		$this->createDocumentTermCount($documents);
65 65
 		$this->addLog('Start Document Term Frequency.');
66 66
 		$this->createDocumentTermFrequency();
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 	private function addLog($string)
162 162
 	{
163 163
 		$currentTime = round(microtime(true) * 1000);
164
-		$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;
164
+		$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;
165 165
 		$this->lastLog = round(microtime(true) * 1000);
166 166
 	}
167 167
 
@@ -173,8 +173,8 @@  discard block
 block discarded – undo
173 173
 	protected function getSearchDbHandle()
174 174
 	{
175 175
 		if ($this->searchDbHandle === null) {
176
-			$path = $this->storageDir . DIRECTORY_SEPARATOR;
177
-			$this->searchDbHandle = new \PDO('sqlite:' . $path . self::SEARCH_TEMP_DB);
176
+			$path = $this->storageDir.DIRECTORY_SEPARATOR;
177
+			$this->searchDbHandle = new \PDO('sqlite:'.$path.self::SEARCH_TEMP_DB);
178 178
 		}
179 179
 		return $this->searchDbHandle;
180 180
 	}
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 	public function replaceOldIndex()
186 186
 	{
187 187
 		$this->searchDbHandle = null;
188
-		$path = $this->storageDir . DIRECTORY_SEPARATOR;
189
-		rename($path . self::SEARCH_TEMP_DB, $path . 'search.db');
188
+		$path = $this->storageDir.DIRECTORY_SEPARATOR;
189
+		rename($path.self::SEARCH_TEMP_DB, $path.'search.db');
190 190
 	}
191 191
 }
192 192
\ No newline at end of file
Please login to merge, or discard this patch.
src/crypt/Crypt.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 				$output = '';
50 50
 				for ($i = 0; $i < $count; $i += 16) {
51 51
 					$random_state =
52
-						md5(microtime() . $random_state);
52
+						md5(microtime().$random_state);
53 53
 					$output .=
54 54
 						pack('H*', md5($random_state));
55 55
 				}
Please login to merge, or discard this patch.