Record is not empty if constructed from a DataObject

Author: phpfui

Tests/Unit/CursorTest.php

@@ -30,6 +30,8 @@ public function testCursor() : void
 
 		foreach ($table->getDataObjectCursor() as $key => $record)
 			{
+			$customer = new \Tests\App\Record\Customer($record);
+			$this->assertFalse($customer->empty(), 'Record constructed from DataObject is empty');
 			$this->assertEquals($index++, $key, 'DataObjectCursor key is not correct');
 			$this->assertEquals($index, $record->customer_id, 'DataObjectCursor record is not correct');
 			$this->assertEquals($index, $record['customer_id'], 'DataObjectCursor array access is not correct');

src/PHPFUI/ORM/Condition.php

@@ -5,9 +5,9 @@
 /**
  * Conditions are used for the WHERE part of the query. Think of each Condition as enclosed in parentheses ().
  *
- * You start with an initial test: Field Operator Value (FOV) tupple.
+ * You start with an initial test: Field Value Operator (FVO) tupple.
  *
- * You can then add additional FOV tupples with a logical operator (AND, OR, AND NOT, OR NOT) separating the previous FOV tupple.
+ * You can then add additional FVO tupples with a logical operator (AND, OR, AND NOT, OR NOT) separating the previous FVO tupple.
  *
  * To add a sub condition in parentheses, add another Condition with the same logical operator separator.
  */
@@ -17,12 +17,12 @@ class Condition implements \Countable, \Stringable
 	private array $conditions = [];
 
 	/**
-	 * Start a Condition with a Field Operator Value (FOV) tupple.
+	 * Start a Condition with a Field Value Operator (FVO) tupple.
 	 *
-	 * Will try to parse FOV from string if $operator is null.
+	 * Will try to parse FVO from string if $operator is null.
 	 *
-	 * @param ?string    $field    single name (no .) of a field existing the the table.  Will try to parse FOV from string if $operator is null.
-	 * @param mixed     $value    to test field against.  Must be string for LIKE operators and an array for IN operators.
+	 * @param ?string $field single name (no .) of a field existing the the table.  Will try to parse FVO from string if $operator is null.
+	 * @param mixed $value to test field against.  Must be string for LIKE operators and an array for IN operators.
 	 * @param \PHPFUI\ORM\Operator $operator comparision of your choice
 	 */
 	public function __construct(?string $field = null, mixed $value = null, \PHPFUI\ORM\Operator $operator = new \PHPFUI\ORM\Operator\Equal())
@@ -90,23 +90,23 @@ public function __toString() : string
 		}
 
 	/**
-	 * Add logical AND between FOV tupples or Condition
+	 * Add logical AND between FVO tupples or Condition
 	 */
 	public function and(string | \PHPFUI\ORM\Condition $condition, mixed $value = null, \PHPFUI\ORM\Operator $operator = new \PHPFUI\ORM\Operator\Equal()) : self
 		{
 		return $this->add('AND', $condition, $operator, $value);
 		}
 
 	/**
-	 * Add logical AND NOT between FOV tupples or Condition
+	 * Add logical AND NOT between FVO tupples or Condition
 	 */
 	public function andNot(string | \PHPFUI\ORM\Condition $condition, mixed $value = null, \PHPFUI\ORM\Operator $operator = new \PHPFUI\ORM\Operator\Equal()) : self
 		{
 		return $this->add('AND NOT', $condition, $operator, $value);
 		}
 
 	/**
-	 * @return int  the number of FOV tupples in the condition
+	 * @return int  the number of FVO tupples in the condition
 	 */
 	public function count() : int
 		{
@@ -116,7 +116,7 @@ public function count() : int
 	/**
 	 * @return string[]  of all the fields used by the condition
 	 */
-	public function getFields(?self $condition = null) : array
+	public function getFields() : array
 		{
 		$retVal = [];
 
@@ -182,15 +182,15 @@ public function getJSON() : string
 		}
 
 	/**
-	 * Add logical OR between FOV tupples or Condition
+	 * Add logical OR between FVO tupples or Condition
 	 */
 	public function or(string | \PHPFUI\ORM\Condition $condition, mixed $value = null, \PHPFUI\ORM\Operator $operator = new \PHPFUI\ORM\Operator\Equal()) : self
 		{
 		return $this->add('OR', $condition, $operator, $value);
 		}
 
 	/**
-	 * Add logical OR NOT between FOV tupples or Condition
+	 * Add logical OR NOT between FVO tupples or Condition
 	 */
 	public function orNot(string | \PHPFUI\ORM\Condition $condition, mixed $value = null, \PHPFUI\ORM\Operator $operator = new \PHPFUI\ORM\Operator\Equal()) : self
 		{

src/PHPFUI/ORM/Record.php

@@ -105,6 +105,7 @@ public function __construct(int|array|null|string|\PHPFUI\ORM\DataObject $parame
 
 			case \PHPFUI\ORM\DataObject::class:
 				$this->current = \array_intersect_key($parameter->current, static::$fields);
+				$this->empty = false;
 
 				break;