Releasing 1.2.2

Author: technicalguru

src/TgDatabase/Criterion/LogicalExpression.php

@@ -16,6 +16,19 @@ public function __construct($op, ...$criterions) {
 		}
 	}
 
+	/**
+	  * Dynamically add more criterions to the expression.
+	  * @param mixed $criterions - more criterions to be added.
+	  */
+	public function add(...$criterions) {
+		if ((count($criterions) == 1) and is_array($criterions[0])) {
+			$this->criterions = array_merge($this->criterions, $criterions[0]);
+		} else {
+			$this->criterions = array_merge($this->criterions, $criterions);
+		}
+		return $this;
+	}
+
 	/**
 	  * Render the SQL fragment.
 	  * @param Criteria $localCriteria   - local criteria object (e.g. subquery)

src/TgDatabase/Restrictions.php

@@ -121,13 +121,19 @@ public static function notIn($propertyName, $values) {
 	  * Apply an "and" conjunction.
 	  */
 	public static function and(...$expressions) {
+		if ((count($expressions) == 1) && is_array($expressions[0])) {
+			return new LogicalExpression('AND', $expressions[0]);
+		}
 		return new LogicalExpression('AND', $expressions);
 	}
 
 	/**
 	  * Apply an "or" conjunction.
 	  */
 	public static function or(...$expressions) {
+		if ((count($expressions) == 1) && is_array($expressions[0])) {
+			return new LogicalExpression('OR', $expressions[0]);
+		}
 		return new LogicalExpression('OR', $expressions);
 	}