jenskooij / cloudcontrol

cloudcontrol/library/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

cloudcontrol/library/search/filters/StopWordsFilter.php

Indentation +30 added lines, -30 removed lines

@@ -11,37 +11,37 @@
 
 abstract class StopWordsFilter implements Filter
 {
-    protected $tokens;
-    protected $stopWords = array();
+	protected $tokens;
+	protected $stopWords = array();
 
-    /**
-     * StopWordsFilter constructor.
-     * @param array $tokens
-     */
-    public function __construct($tokens)
-    {
-        $this->tokens = $tokens;
-    }
+	/**
+	 * StopWordsFilter constructor.
+	 * @param array $tokens
+	 */
+	public function __construct($tokens)
+	{
+		$this->tokens = $tokens;
+	}
 
-    /**
-     * @return array
-     */
-    public function getFilterResults()
-    {
-        foreach ($this->stopWords as $stopWord) {
-            foreach ($this->tokens as $field => $tokens) {
-                if (isset($tokens[$stopWord])) {
-                    $tokens[$stopWord] = null;
-                    unset($tokens[$stopWord]);
-                    $tokens = array_filter($tokens);
-                    asort($tokens);
-                }
+	/**
+	 * @return array
+	 */
+	public function getFilterResults()
+	{
+		foreach ($this->stopWords as $stopWord) {
+			foreach ($this->tokens as $field => $tokens) {
+				if (isset($tokens[$stopWord])) {
+					$tokens[$stopWord] = null;
+					unset($tokens[$stopWord]);
+					$tokens = array_filter($tokens);
+					asort($tokens);
+				}
 
-                $this->tokens[$field] = $tokens;
-            }
-        }
-        $this->tokens = array_filter($this->tokens);
-        asort($this->tokens);
-        return $this->tokens;
-    }
+				$this->tokens[$field] = $tokens;
+			}
+		}
+		$this->tokens = array_filter($this->tokens);
+		asort($this->tokens);
+		return $this->tokens;
+	}
 }
\ No newline at end of file

cloudcontrol/library/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 = '\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/cc/AutoloadUtil.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 		}
 
 		global $rootPath;
-		$file = $rootPath . str_replace('\\', '/', $class) . ".php";
+		$file = $rootPath.str_replace('\\', '/', $class).".php";
 
 		if (file_exists($file)) {
 			return self::loadClassInExistingFile($class, $throwException, $file);
@@ -60,7 +60,7 @@ 
 		require_once($file);
 		if ($throwException) {
 			if (class_exists($class, false) === false && interface_exists($class, false) === false) {
-				throw new \Exception('Could not load class "' . $class . '" in file ' . $file);
+				throw new \Exception('Could not load class "'.$class.'" in file '.$file);
 			} else {
 				return true;
 			}
@@ -81,7 +81,7 @@ 
 	private static function handleUnloadableClassWithBacktrace($class, $throwException, $rootPath, $file, $debug_backtrace)
 	{
 		if ($throwException) {
-			errorHandler(0, 'Could not load class \'' . $class . '\' in file ' . $rootPath . $file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
+			errorHandler(0, 'Could not load class \''.$class.'\' in file '.$rootPath.$file, $debug_backtrace[2]['file'], $debug_backtrace[2]['line']);
 		} else {
 			return false;
 		}
@@ -98,7 +98,7 @@ 
 	private static function handleUnloadableClassWithoutBacktrace($class, $throwException, $file)
 	{
 		if ($throwException) {
-			throw new \Exception('Could not load class "' . $class . '" in file ' . $file . "\n" . 'Called from unknown origin.');
+			throw new \Exception('Could not load class "'.$class.'" in file '.$file."\n".'Called from unknown origin.');
 		} else {
 			return false;
 		}

cloudcontrol/library/cc/errortemplates/errorviewcli.php

Spacing +10 added lines, -10 removed lines

@@ -2,21 +2,21 @@ 
 | THE FOLLOWING ERROR OCCURED                                                                                                                  |
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
- <?php echo $message . PHP_EOL; ?>
+ <?php echo $message.PHP_EOL; ?>
 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 | IN FILE                                                                                                                                      |
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
- <?php echo $file . ':' . $line . PHP_EOL; ?>
+ <?php echo $file.':'.$line.PHP_EOL; ?>
 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 | CONTENTS OF THE FILE                                                                                                                         |
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
 <?php
-foreach($lines as $nr => $currentLine) {
-	echo ($nr == $line ? '* ' : '  ' ) . str_pad($nr, 3, "0", STR_PAD_LEFT) . ' ' . $currentLine;
+foreach ($lines as $nr => $currentLine) {
+	echo ($nr == $line ? '* ' : '  ').str_pad($nr, 3, "0", STR_PAD_LEFT).' '.$currentLine;
 }
 ?>
 
@@ -25,11 +25,11 @@ 
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
 <?php
-foreach($trace as $row) {
-	echo (isset($row['file']) ? basename($row['file']) : '') . ':'
-		. (isset($row['line']) ? $row['line'] : '') . "\t\t\t"
-		. (isset($row['class']) ? $row['class'] : ' ') . "\t\t\t"
-		. (isset($row['type']) ? $row['type'] : ' ') . "\t\t\t"
-		. (isset($row['function']) ? $row['function'] : ' ') . PHP_EOL;
+foreach ($trace as $row) {
+	echo (isset($row['file']) ? basename($row['file']) : '').':'
+		. (isset($row['line']) ? $row['line'] : '')."\t\t\t"
+		. (isset($row['class']) ? $row['class'] : ' ')."\t\t\t"
+		. (isset($row['type']) ? $row['type'] : ' ')."\t\t\t"
+		. (isset($row['function']) ? $row['function'] : ' ').PHP_EOL;
 }
 ?>
\ No newline at end of file

cloudcontrol/library/cc/ErrorHandlingUtil.php

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
 	 */
 	public static function renderError($message = '', $file = '', $line = '', $code = 0, $trace = array(), $httpHeader = 'HTTP/1.0 500 Internal Server Error')
 	{
-		if (ob_get_contents()) ob_end_clean();
+		if (ob_get_contents()) {
+			ob_end_clean();
+		}
 		$line = intval($line);
 
 		if (self::canShowError()) {
@@ -85,7 +87,9 @@ 
 
 	private static function renderCliException($message, $file, $line, $trace, $lines)
 	{
-		if (ob_get_contents()) ob_end_clean();
+		if (ob_get_contents()) {
+			ob_end_clean();
+		}
 		include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcli.php');
 		exit;
 	}

Spacing +11 added lines, -11 removed lines

@@ -75,7 +75,7 @@ 
 	private static function renderCliException($message, $file, $line, $trace, $lines)
 	{
 		if (ob_get_contents()) ob_end_clean();
-		include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcli.php');
+		include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcli.php');
 		exit;
 	}
 
@@ -87,12 +87,12 @@ 
 	 */
 	private static function dontShowError($message, $file, $line, $httpHeader)
 	{
-		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-		header('X-Error-Message: ' . $message);
-		header('X-Error-File: ' . $file);
-		header('X-Error-Line: ' . $line);
-		if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcompact.php')) {
-			include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewcompact.php');
+		header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
+		header('X-Error-Message: '.$message);
+		header('X-Error-File: '.$file);
+		header('X-Error-Line: '.$line);
+		if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcompact.php')) {
+			include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewcompact.php');
 		} else {
 			header('Content-type: application/json');
 			die(json_encode('An error occured.'));
@@ -160,11 +160,11 @@ 
 			'httpHeader' => $httpHeader,
 		);
 
-		if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewdetailed.php')) {
-			header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
-			include(__DIR__ . DIRECTORY_SEPARATOR . 'errortemplates/errorviewdetailed.php');
+		if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewdetailed.php')) {
+			header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
+			include(__DIR__.DIRECTORY_SEPARATOR.'errortemplates/errorviewdetailed.php');
 		} else {
-			header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+			header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
 			header('Content-type: application/json');
 			die(json_encode($error));
 		}

cloudcontrol/library/cc/autoloader.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'AutoloadUtil.php');
+require_once(__DIR__.DIRECTORY_SEPARATOR.'AutoloadUtil.php');
 spl_autoload_extensions('.php');
 spl_autoload_register("autoloader");
 
-$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)) . '/../../') . '/');
+$rootPath = str_replace('\\', '/', realpath(str_replace('\\', '/', dirname(__FILE__)).'/../../').'/');
 
 /**
  * The function to be registered as the default autoload function

cloudcontrol/library/cc/errorhandler.php

Indentation +4 added lines, -4 removed lines

@@ -32,11 +32,11 @@
  */
 function shutdownHandler () {
 	$error = error_get_last(); 
-    if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
+	if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
 		\library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']);
-    }elseif ($error['type'] == 1) {
-        dump($error);
-    }
+	}elseif ($error['type'] == 1) {
+		dump($error);
+	}
 }
 
 

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'ErrorHandlingUtil.php');
+require_once(__DIR__.DIRECTORY_SEPARATOR.'ErrorHandlingUtil.php');
 set_exception_handler('exceptionHandler');
 set_error_handler('errorHandler');
 register_shutdown_function('shutdownHandler');
@@ -10,8 +10,8 @@ 
  *
  * @param $e
  */
-function exceptionHandler ($e) {
-	\library\cc\ErrorHandlingUtil::renderError($e->getMessage(),$e->getFile(),$e->getLine(),$e->getCode(),$e->getTrace());
+function exceptionHandler($e) {
+	\library\cc\ErrorHandlingUtil::renderError($e->getMessage(), $e->getFile(), $e->getLine(), $e->getCode(), $e->getTrace());
 }
 
 /**
@@ -22,18 +22,18 @@ 
  * @param $errfile
  * @param $errline
  */
-function errorHandler ($errno, $errstr, $errfile, $errline) {
-	\library\cc\ErrorHandlingUtil::renderError($errstr,$errfile,$errline,$errno,debug_backtrace());
+function errorHandler($errno, $errstr, $errfile, $errline) {
+	\library\cc\ErrorHandlingUtil::renderError($errstr, $errfile, $errline, $errno, debug_backtrace());
 }
 
 /**
  * When an error occurs that kills the process, still try
  * to show it using a shutdownHandler.
  */
-function shutdownHandler () {
+function shutdownHandler() {
 	$error = error_get_last(); 
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
-		\library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']);
+		\library\cc\ErrorHandlingUtil::renderError($error['message'], $error['file'], $error['line'], $error['type']);
     }elseif ($error['type'] == 1) {
         dump($error);
     }

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	$error = error_get_last(); 
     if (isset($error['type'], $error['message'], $error['file'], $error['line'])) { 
 		\library\cc\ErrorHandlingUtil::renderError($error['message'],$error['file'],$error['line'], $error['type']);
-    }elseif ($error['type'] == 1) {
+    } elseif ($error['type'] == 1) {
         dump($error);
     }
 }

cloudcontrol/library/components/BaseComponent.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 		 * @param array   $parameters
 		 * @param         $matchedSitemapItem
 		 */
-		public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem)
+		public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
 		{
 			$this->template = $template;
 			$this->request = $request;
@@ -66,7 +66,7 @@ 
 		 *
 		 * @throws \Exception
 		 */
-		public function render($application=null)
+		public function render($application = null)
 		{
 			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
 		}
@@ -92,9 +92,9 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function renderTemplate($template='', $obClean = true, $application=null)
+		public function renderTemplate($template = '', $obClean = true, $application = null)
 		{
-			$templatePath = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $template . '.php';
+			$templatePath = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR.$template.'.php';
 			if (realpath($templatePath) !== false) {
 				if ($obClean) {
 					ob_clean();
@@ -111,7 +111,7 @@ 
 				return ob_get_contents();
 			} else {
 				if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-					throw new \Exception('Couldnt find template ' . $templatePath);
+					throw new \Exception('Couldnt find template '.$templatePath);
 				}
 			}
 		}
@@ -126,7 +126,7 @@ 
 		 * @return string
 		 * @throws \Exception
 		 */
-		public function includeTemplate($template='', $parameters = array())
+		public function includeTemplate($template = '', $parameters = array())
 		{
 			if (is_array($parameters)) {
 				foreach ($parameters as $name => $value) {