Update SearchController.php

Author: peterujah

src/SearchController.php

@@ -38,42 +38,43 @@ class SearchController{
 	/**
      * @var string SQL Query 
     */
-	private $QueryCondition = "";
+	private string $queryCondition = '';
 
 	/**
      * @var string Search query algorithm that needs to be used
     */
-	private $searchAlgorithm;
+	private string $searchAlgorithm;
 
 	/**
-     * @var string Search request query value
+     * @var string|array Search request query value
     */
-	private $searchQuery = null;
+	private string|array $searchQuery = '';
+
 
 	/**
-     * @var array MYSQL database table rows to search from
+     * @var array MYSQL database table rows to search form
     */
-	private $paramArray = [];
+	private array $paramArray = [];
 
 	/**
      * @var string MYSQL database table row for tag value
     */
-	private $paramTags;
+	private string $paramTags = '';
 
 	/**
-     * @var string SQL LIKE query operator to be use
+     * @var string SQL LIKE query operator to be used
     */
-	private $operators;
+	private string $operators;
 
 	/**
      * @var string SQL query prefix
     */
-	private $queryStart;
+	private string $queryStart;
 
 	/**
      * @var string SQL query suffix
     */
-	private $queryEnd;
+	private string $queryEnd;
 
 	public function __construct(string $algorithm = self::OR) {
 		$this->searchAlgorithm = $algorithm;
@@ -85,146 +86,181 @@ public function __construct(string $algorithm = self::OR) {
 	/**
      * Set database search table  columns.
      *
-     * @param array          $param columns
+     * @param array $param columns
+	 * 
+	 * @return self
      */
-	public function setParameter(array $param=[]): self{
+	public function setParameter(array $param): self
+	{
 		$this->paramArray = $param;
+
 		return $this;
 	}
 
 	/**
      * Set initial SQL queries.
      *
-     * @param string          $query query
+     * @param string $query query
+	 * 
+	 * @return self
      */
-	public function setSQLQuery(string $query): self{
-		$this->QueryCondition = $query;
+	public function setIniQuery(string $query): self
+	{
+		$this->queryCondition = $query;
+
 		return $this;
 	}
 
 	/**
      * Set database search operator pattern.
      *
-     * @param string          $pattern name
+     * @param string $pattern name
+	 * 
+	 * @return self
      */
-	public function setOperators(string $pattern): self{
+	public function setOperators(string $pattern): self
+	{
 		$this->operators = $pattern;
+
 		return $this;
 	}
 
 	/**
      * Set database tag table column name.
      *
-     * @param string          $column name
+     * @param string $column name
+	 * 
+	 * @return self
      */
-	public function setTags(string $column): self{
+	public function setTags(string $column): self
+	{
 		$this->paramTags = $column;
+
 		return $this;
 	}
 
 	/**
      * Set search query value.
      *
-     * @param string          $query query value
-     * @return object|SearchController 
-     */
-	public function setQuery(mixed $query): self{
-		$this->searchQuery = htmlspecialchars((string) $query, ENT_QUOTES, "UTF-8");
+     * @param string $query query value
+	 * 
+     * @return self
+    */
+	public function setQuery(string $query): self
+	{
+		$this->searchQuery = strtolower(htmlspecialchars($query, ENT_QUOTES, "UTF-8"));
+
 		return $this;
 	}
 
 	/**
      * Set query prefix string.
      *
-     * @param string          $str query prefix
+     * @param string $start query prefix
+	 * 
+	 * @return self
      */
-	public function setStart(string $str): self{
-		$this->queryStart = $str;
+	public function setStart(string $start): self
+	{
+		$this->queryStart = $start;
+
 		return $this;
 	}
 
 	/**
      * Set query suffix string.
      *
-     * @param string          $str query suffix
+     * @param string  $end query suffix
+	 * 
+	 * @return self
      */
-	public function setEnd(string $str): self{
-		$this->queryEnd = $str;
+	public function setEnd(string $end): self
+	{
+		$this->queryEnd = $end;
+
 		return $this;
 	}
 
 	/**
      * Split search query value by space.
+	 * 
+	 * @return void
      */
-	public function split(): void{
-		if(strpos($this->searchQuery, " ") !== false) {
+	public function split(): void
+	{
+		if(is_string($this->searchQuery) && strpos($this->searchQuery, " ") !== false) {
 			$this->searchQuery = explode(" ", $this->searchQuery);
-			return;
 		}
-		$this->searchQuery = [$this->searchQuery];
+		//$this->searchQuery = [$this->searchQuery];
 	}
 
 	/**
      * Create SQL query from the specified pattern.
      *
-     * @param string          $value query value
-     * @return string query
+     * @param string $value query value
+	 * 
+     * @return string $query
      */
-
-	private function format(string $value): string{
-		$queryString = "";
+	private function format(string $value): string 
+	{
+		$query = "";
 		foreach($this->paramArray as $col){
 			$sqlQuery = str_replace("query", $value, $this->operators);
-			$queryString .=  $col . " {$this->queryStart} '{$sqlQuery}' {$this->queryEnd} ";
+			$query .= "LOWER($col) {$this->queryStart} '{$sqlQuery}' {$this->queryEnd} ";
 		}
-		return $queryString;
+		return $query;
 	}
 
 	/**
-     * Get query from string
+     * Build query string 
+	 * 
      * @return string query
-     */
-	private function getQueryFromString(): string{
+    */
+	private function buildQuery(): string
+	{
 		return rtrim($this->format($this->searchQuery) , " {$this->queryEnd} ");
 	}
 
 	/**
-     * Get query from array 
-     *
-     * @param int  $index query index
+     * Build query array 
+	 * 
+	 * @param int $index array index 
+	 * 
      * @return string query
-     */
-	private function getQueryFromArray(int $index = 0): string {
+    */
+	private function buildArrayQuery(int $index = 0): string
+	{
 		return rtrim($this->format($this->searchQuery[$index]) , " {$this->queryEnd} ");;
 	}
 
 	/**
-     * Determine which search method to use while creating query.
+     * Determine which search method to use while creating a query.
      *
      * @return string SQL query
-     */
-	private function buildSearchQueryMethod(): string{
-		$sql = "";
-		if(!empty($this->paramTags)){
-			if(is_array($this->searchQuery)) {
-				foreach($this->searchQuery as $tag){
-					$sql .= "FIND_IN_SET('{$tag}',{$this->paramTags}) {$this->queryEnd} ";
-				}
-				$sql = rtrim($sql , " {$this->queryEnd} ");
-			}else{
-				$sql .= "FIND_IN_SET('{$this->searchQuery}',{$this->paramTags})"; 
-			}
-		}else{
+    */
+	private function buildSQL(): string
+	{
+		$sql = '';
+		if($this->paramTags === ''){
 			if(is_array($this->searchQuery)) {
 				$arrayCount = count($this->searchQuery); 
 				for ($i = 0; $i < $arrayCount; $i++) {
-					$sql .= $this->getQueryFromArray($i);
+					$sql .= $this->buildArrayQuery($i);
 					if ($i != $arrayCount - 1) { 
 						$sql .=  " {$this->queryEnd} ";
 					}
 				}
 			} else {
-				$sql .= $this->getQueryFromString();
+				$sql .= $this->buildQuery();
+			}
+		}else{
+			if(is_array($this->searchQuery)) {
+				foreach($this->searchQuery as $tag){
+					$sql .= "FIND_IN_SET('{$tag}',{$this->paramTags}) {$this->queryEnd} ";
+				}
+				$sql = rtrim($sql , " {$this->queryEnd} ");
+			}else{
+				$sql .= "FIND_IN_SET('{$this->searchQuery}',{$this->paramTags})"; 
 			}
 		}
 		return $sql;
@@ -234,54 +270,56 @@ private function buildSearchQueryMethod(): string{
      * Execute search query.
      *
      * @return string SQL query
-     */
-	public function getQuery(): string{
-		if (!empty($this->searchQuery)){ 
-			if (!empty($this->searchQuery)){ 
-				if (!empty($this->QueryCondition)){ 
-					$this->QueryCondition .= " AND (";
-				}else { 
-					$this->QueryCondition .=  " WHERE (";
-				} 
-				
-				switch ($this->searchAlgorithm){
-					
-					case self::OR: 
-						$this->setStart(self::LIKE);
-						$this->setEnd(self::OR);
-						$this->QueryCondition .= $this->buildSearchQueryMethod(); 
-						$this->QueryCondition .= " )";
-					break; 
-				
-					case self::AND: 
-						$this->setStart(self::LIKE);
-						$this->setEnd(self::AND);
-						$this->QueryCondition .= $this->buildSearchQueryMethod(); 
-						$this->QueryCondition .= " )";
-					break; 
-				
-					case self::NAND: 
-						$this->setStart(self::NOT_LIKE);
-						$this->setEnd(self::AND);
-						$this->QueryCondition .= $this->buildSearchQueryMethod(); 
-						$this->QueryCondition .= " )";
-					break; 
-				
-					case self::NOR: 
-						$this->setStart(self::NOT_LIKE);
-						$this->setEnd(self::OR);
-						$this->QueryCondition .= $this->buildSearchQueryMethod(); 
-						$this->QueryCondition .= " )";
-					break; 
-					default: 
-						$this->setStart(self::LIKE);
-						$this->setEnd(self::OR);
-						$this->QueryCondition .= $this->buildSearchQueryMethod(); 
-						$this->QueryCondition .= " )";
-					break;
-				}
-			} 
+    */
+	public function getQuery(): string
+	{
+		if ($this->searchQuery === '' || $this->searchQuery === []){ 
+			return $this->queryCondition;
+		}
+
+		if($this->queryCondition === ''){
+			$this->queryCondition .=  " WHERE (";
+		}else{
+			$this->queryCondition .= " AND (";
 		}
-		return $this->QueryCondition;
+		
+		switch ($this->searchAlgorithm){
+			
+			case self::OR: 
+				$this->setStart(self::LIKE);
+				$this->setEnd(self::OR);
+				$this->queryCondition .= $this->buildSQL(); 
+				$this->queryCondition .= " )";
+			break; 
+		
+			case self::AND: 
+				$this->setStart(self::LIKE);
+				$this->setEnd(self::AND);
+				$this->queryCondition .= $this->buildSQL(); 
+				$this->queryCondition .= " )";
+			break; 
+		
+			case self::NAND: 
+				$this->setStart(self::NOT_LIKE);
+				$this->setEnd(self::AND);
+				$this->queryCondition .= $this->buildSQL(); 
+				$this->queryCondition .= " )";
+			break; 
+		
+			case self::NOR: 
+				$this->setStart(self::NOT_LIKE);
+				$this->setEnd(self::OR);
+				$this->queryCondition .= $this->buildSQL(); 
+				$this->queryCondition .= " )";
+			break; 
+			default: 
+				$this->setStart(self::LIKE);
+				$this->setEnd(self::OR);
+				$this->queryCondition .= $this->buildSQL(); 
+				$this->queryCondition .= " )";
+			break;
+		}
+	
+		return $this->queryCondition;
 	}
 }