ci: pass tests

PhpGt · Sep 17, 2023 · 38c5244 · 38c5244
1 parent 521dc33
commit 38c5244
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 42 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -5,6 +5,12 @@
 	colors="true"
 	cacheDirectory="test/phpunit/.phpunit.cache"
 	bootstrap="vendor/autoload.php"
+	displayDetailsOnIncompleteTests="true"
+	displayDetailsOnSkippedTests="true"
+	displayDetailsOnTestsThatTriggerDeprecations="true"
+	displayDetailsOnTestsThatTriggerErrors="true"
+	displayDetailsOnTestsThatTriggerNotices="true"
+	displayDetailsOnTestsThatTriggerWarnings="true"
 >
 	<coverage />
 

diff --git a/src/Condition/Condition.php b/src/Condition/Condition.php
@@ -17,54 +17,68 @@ public function getLogic():string {
 
 	public function getCondition(
 		string $subLogic = null,
-		string $separator = "\n\t"
+		string $separator = "\n\t",
 	):string {
 		$condition = "";
 		$brackets = false;
 
 		foreach($this->parts as $i => $part) {
-			if(strlen($condition) > 0) {
-				$condition .= $separator;
-			}
+			$condition = $this->addPartToCondition(
+				$i,
+				$part,
+				$condition,
+				$separator,
+				$subLogic,
+			);
+			$brackets = $brackets || $part instanceof Condition;
+		}
 
-			if($part instanceof Condition) {
-				$logic = $part->getLogic();
+		if($brackets) {
+			$condition = "( $condition )";
+		}
 
-				if(strlen($condition) > 0) {
-					$condition .= $logic;
-					$condition .= " ";
-				}
-				$condition .= $part->getCondition($logic);
-				$brackets = true;
-				continue;
-			}
-			elseif(is_string($part)) {
-				if($part[0] === "?") {
-					$part = substr($part, 1) . " = ?";
-				}
-				elseif($part[0] === ":") {
-					$part = substr($part, 1) . " = $part";
-				}
-			}
+		return $condition;
+	}
 
-			if($i > 0) {
-				if($subLogic) {
-					$condition .= $subLogic;
-				}
-				else {
-					$condition .= $this->getLogic();
-				}
+	private function addPartToCondition(
+		int $i,
+		string|Condition $part,
+		string $condition,
+		string $separator,
+		string $subLogic = null,
+	):string {
+		if(strlen($condition) > 0) {
+			$condition .= $separator;
+		}
 
-				$condition .= " ";
+		if($part instanceof Condition) {
+			$logic = $part->getLogic();
+			if(strlen($condition) > 0) {
+				$condition .= "$logic ";
+			}
+			$condition .= $part->getCondition($logic);
+		}
+		else {
+			$part = $this->processStringPart($part);
+			if($i > 0) {
+				$subLogic = $subLogic ?: $this->getLogic();
+				$condition .= "$subLogic ";
 			}
 			$condition .= $part;
 		}
 
-		if($brackets) {
-			$condition = "( $condition )";
+		return $condition;
+	}
+
+	private function processStringPart(string $part):string {
+		if($part[0] === "?") {
+			$part = substr($part, 1) . " = ?";
+		}
+		elseif($part[0] === ":") {
+			$part = substr($part, 1) . " = $part";
 		}
 
-		return $condition;
+		return $part;
 	}
 
 	public function getShortParameterSyntax():?string {
@@ -75,7 +89,7 @@ public function getShortParameterSyntax():?string {
 
 			$char1 = $part[0];
 			if($char1 === "?"
-			|| $char1 === ":") {
+				|| $char1 === ":") {
 				return $char1;
 			}
 		}

diff --git a/src/Query/ReplaceQuery.php b/src/Query/ReplaceQuery.php
@@ -57,7 +57,7 @@ public function select():?SelectQuery {
 	protected function normaliseSet(array $setData):array {
 		$normalised = [];
 
-		if(is_array($setData[0])) {
+		if(isset($setData[0]) && is_array($setData[0])) {
 			$setData = $setData[0];
 		}
 

diff --git a/src/Query/SelectQuery.php b/src/Query/SelectQuery.php
@@ -1,6 +1,7 @@
 <?php
 namespace Gt\SqlBuilder\Query;
 
+/** @SuppressWarnings(PHPMD.TooManyPublicMethods) */
 abstract class SelectQuery extends SqlQuery {
 	public function __construct(
 		protected bool $subQuery = false

diff --git a/src/Query/SqlQuery.php b/src/Query/SqlQuery.php
@@ -6,6 +6,7 @@
 use Gt\SqlBuilder\Condition\MixedIndexedAndNamedParametersException;
 use Stringable;
 
+/** @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */
 abstract class SqlQuery implements Stringable {
 	const PRE_QUERY_COMMENT = "/* preQuery */";
 	const POST_QUERY_COMMENT = "/* postQuery */";
@@ -29,7 +30,11 @@ public function postQuery():string {
 		return "";
 	}
 
-	/** @param array<string, string>|array<string, string[]|mixed> $clauses */
+	/**
+	 * @param array<string, string>|array<string, string[]|mixed> $clauses
+	 * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+	 * @phpcs:disable Generic.Metrics.CyclomaticComplexity
+	 */
 	protected function processClauseList(array $clauses):string {
 		$query = "";
 
@@ -59,33 +64,33 @@ protected function processClauseList(array $clauses):string {
 			elseif($name === "partition") {
 				$query .= $this->processPartitionClause($parts);
 			}
-			elseif(strstr($name, "rowSelect")) {
+			elseif(str_contains($name, "rowSelect")) {
 				if(isset($parts[0]) && $parts[0] instanceof SelectQuery) {
 					$query .= $parts[0];
 				}
 			}
-			elseif(strstr($name, "join")) {
+			elseif(str_contains($name, "join")) {
 				$query .= $this->processJoinClause(
 					$name,
 					$parts
 				);
 			}
-			elseif(strstr($name, "limit")) {
+			elseif(str_contains($name, "limit")) {
 				if(isset($parts[0])) {
 					$query .= "\nlimit $parts[0]";
 				}
 			}
-			elseif(strstr($name, "offset")) {
+			elseif(str_contains($name, "offset")) {
 				if(isset($parts[0])) {
 					$query .= "\noffset $parts[0]";
 				}
 			}
-			elseif(strstr($name, "create definition")) {
+			elseif(str_contains($name, "create definition")) {
 				$query .= "(";
 				$query .= implode(", \n", $parts);
 				$query .= ")";
 			}
-			elseif(strstr($name, "alter options")) {
+			elseif(str_contains($name, "alter options")) {
 				$query .= implode(", \n", $parts);
 			}
 			else {