Update SearchController.php

Author: peterujah

src/SearchController.php

@@ -38,43 +38,42 @@ class SearchController{
 	/**
      * @var string SQL Query 
     */
-	private string $QueryCondition = '';
+	private $QueryCondition = "";
 
 	/**
      * @var string Search query algorithm that needs to be used
     */
-	private string $searchAlgorithm;
+	private $searchAlgorithm;
 
 	/**
      * @var string Search request query value
     */
-	private mixed $searchQuery = '';
-
+	private $searchQuery = null;
 
 	/**
-     * @var array MYSQL database table rows to search form
+     * @var array MYSQL database table rows to search from
     */
-	private array $paramArray = [];
+	private $paramArray = [];
 
 	/**
      * @var string MYSQL database table row for tag value
     */
-	private string $paramTags;
+	private $paramTags;
 
 	/**
-     * @var string SQL LIKE query operator to be used
+     * @var string SQL LIKE query operator to be use
     */
-	private string $operators;
+	private $operators;
 
 	/**
      * @var string SQL query prefix
     */
-	private string $queryStart;
+	private $queryStart;
 
 	/**
      * @var string SQL query suffix
     */
-	private string $queryEnd;
+	private $queryEnd;
 
 	public function __construct(string $algorithm = self::OR) {
 		$this->searchAlgorithm = $algorithm;
@@ -88,35 +87,39 @@ public function __construct(string $algorithm = self::OR) {
      *
      * @param array          $param columns
      */
-	public function setParameter(array $param=[]): void{
+	public function setParameter(array $param=[]): self{
 		$this->paramArray = $param;
+		return $this;
 	}
 
 	/**
      * Set initial SQL queries.
      *
      * @param string          $query query
      */
-	public function setSQLQuery(string $query): void{
+	public function setSQLQuery(string $query): self{
 		$this->QueryCondition = $query;
+		return $this;
 	}
 
 	/**
      * Set database search operator pattern.
      *
      * @param string          $pattern name
      */
-	public function setOperators(string $pattern): void{
+	public function setOperators(string $pattern): self{
 		$this->operators = $pattern;
+		return $this;
 	}
 
 	/**
      * Set database tag table column name.
      *
      * @param string          $column name
      */
-	public function setTags(string $column): void{
+	public function setTags(string $column): self{
 		$this->paramTags = $column;
+		return $this;
 	}
 
 	/**
@@ -125,27 +128,29 @@ public function setTags(string $column): void{
      * @param string          $query query value
      * @return object|SearchController 
      */
-	public function setQuery(string $query): SearchController{
-		$this->searchQuery = strtolower(htmlspecialchars($query, ENT_QUOTES, "UTF-8"));
+	public function setQuery(mixed $query): self{
+		$this->searchQuery = htmlspecialchars((string) $query, ENT_QUOTES, "UTF-8");
 		return $this;
 	}
 
 	/**
      * Set query prefix string.
      *
-     * @param string          $start query prefix
+     * @param string          $str query prefix
      */
-	public function setStart(string $start): void{
-		$this->queryStart = $start;
+	public function setStart(string $str): self{
+		$this->queryStart = $str;
+		return $this;
 	}
 
 	/**
      * Set query suffix string.
      *
-     * @param string          $end query suffix
+     * @param string          $str query suffix
      */
-	public function setEnd(string $end): void{
-		$this->queryEnd = $end;
+	public function setEnd(string $str): self{
+		$this->queryEnd = $str;
+		return $this;
 	}
 
 	/**
@@ -154,8 +159,9 @@ public function setEnd(string $end): void{
 	public function split(): void{
 		if(strpos($this->searchQuery, " ") !== false) {
 			$this->searchQuery = explode(" ", $this->searchQuery);
+			return;
 		}
-		//$this->searchQuery = [$this->searchQuery];
+		$this->searchQuery = [$this->searchQuery];
 	}
 
 	/**
@@ -165,29 +171,39 @@ public function split(): void{
      * @return string query
      */
 
-	private function format(string $value): string {
+	private function format(string $value): string{
 		$queryString = "";
 		foreach($this->paramArray as $col){
 			$sqlQuery = str_replace("query", $value, $this->operators);
-			$queryString .= "LOWER($col) {$this->queryStart} '{$sqlQuery}' {$this->queryEnd} ";
+			$queryString .=  $col . " {$this->queryStart} '{$sqlQuery}' {$this->queryEnd} ";
 		}
 		return $queryString;
 	}
 
-	private function buildQuery(): string{
+	/**
+     * Get query from string
+     * @return string query
+     */
+	private function getQueryFromString(): string{
 		return rtrim($this->format($this->searchQuery) , " {$this->queryEnd} ");
 	}
 
-	private function buildArrayQuery(int $i = 0): string{
-		return rtrim($this->format($this->searchQuery[$i]) , " {$this->queryEnd} ");;
+	/**
+     * Get query from array 
+     *
+     * @param int  $index query index
+     * @return string query
+     */
+	private function getQueryFromArray(int $index = 0): string {
+		return rtrim($this->format($this->searchQuery[$index]) , " {$this->queryEnd} ");;
 	}
 
 	/**
-     * Determine which search method to use while creating a query.
+     * Determine which search method to use while creating query.
      *
      * @return string SQL query
      */
-	private function buildSQL(): string{
+	private function buildSearchQueryMethod(): string{
 		$sql = "";
 		if(!empty($this->paramTags)){
 			if(is_array($this->searchQuery)) {
@@ -202,13 +218,13 @@ private function buildSQL(): string{
 			if(is_array($this->searchQuery)) {
 				$arrayCount = count($this->searchQuery); 
 				for ($i = 0; $i < $arrayCount; $i++) {
-					$sql .= $this->buildArrayQuery($i);
+					$sql .= $this->getQueryFromArray($i);
 					if ($i != $arrayCount - 1) { 
 						$sql .=  " {$this->queryEnd} ";
 					}
 				}
 			} else {
-				$sql .= $this->buildQuery();
+				$sql .= $this->getQueryFromString();
 			}
 		}
 		return $sql;
@@ -233,34 +249,34 @@ public function getQuery(): string{
 					case self::OR: 
 						$this->setStart(self::LIKE);
 						$this->setEnd(self::OR);
-						$this->QueryCondition .= $this->buildSQL(); 
+						$this->QueryCondition .= $this->buildSearchQueryMethod(); 
 						$this->QueryCondition .= " )";
 					break; 
 
 					case self::AND: 
 						$this->setStart(self::LIKE);
 						$this->setEnd(self::AND);
-						$this->QueryCondition .= $this->buildSQL(); 
+						$this->QueryCondition .= $this->buildSearchQueryMethod(); 
 						$this->QueryCondition .= " )";
 					break; 
 
 					case self::NAND: 
 						$this->setStart(self::NOT_LIKE);
 						$this->setEnd(self::AND);
-						$this->QueryCondition .= $this->buildSQL(); 
+						$this->QueryCondition .= $this->buildSearchQueryMethod(); 
 						$this->QueryCondition .= " )";
 					break; 
 
 					case self::NOR: 
 						$this->setStart(self::NOT_LIKE);
 						$this->setEnd(self::OR);
-						$this->QueryCondition .= $this->buildSQL(); 
+						$this->QueryCondition .= $this->buildSearchQueryMethod(); 
 						$this->QueryCondition .= " )";
 					break; 
 					default: 
 						$this->setStart(self::LIKE);
 						$this->setEnd(self::OR);
-						$this->QueryCondition .= $this->buildSQL(); 
+						$this->QueryCondition .= $this->buildSearchQueryMethod(); 
 						$this->QueryCondition .= " )";
 					break;
 				}