Refactoring

Author: phpfui

README.md

@@ -26,7 +26,7 @@ Performance [comparison of PHPFUI\ORM to Eloquent](https://github.com/phpfui/php
 ### Setup
 ```php
 $pdo = new \PHPFUI\ORM\PDOInstance($yourConnectionString);
-// permform any custom configuration settings needed on $pdo
+// perform any custom configuration settings needed on $pdo
 \PHPFUI\ORM::addConnection($pdo);
 ```
 

Tests/Unit/RecordTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\Unit;
+
+class RecordTest extends \PHPUnit\Framework\TestCase
+	{
+	public function testBadField() : void
+		{
+		$order = new \Tests\Fixtures\Record\Order();
+		$this->assertFalse($order->loaded());
+		$this->assertFalse(empty($order->ship_address));
+		$order->ship_address = '';
+		$this->assertTrue(empty($order->ship_address));
+		$this->assertTrue(empty($order->fred));
+		$this->assertFalse(isset($order->fred));
+		$this->expectException(\PHPFUI\ORM\Exception::class);
+		$order->fred = 'Fred';
+		}
+
+	public function testEmpty() : void
+		{
+		$order = new \Tests\Fixtures\Record\Order(30);
+		$this->assertTrue($order->loaded());
+		$this->assertFalse(empty($order->employee));
+		$order->employee_id = 0;
+		$this->assertTrue(empty($order->employee));
+		$this->assertTrue(empty($order->employee_id));
+		$order->employee = new \Tests\Fixtures\Record\Employee(1);
+		$this->assertFalse(empty($order->employee));
+		$this->assertFalse(empty($order->employee_id));
+		$order->employee = new \Tests\Fixtures\Record\Employee();
+		$this->assertTrue(empty($order->employee));
+		$this->assertTrue(empty($order->employee_id));
+		}
+	}

src/PHPFUI/ORM/DataObject.php

@@ -33,6 +33,14 @@ public function __get(string $field) : mixed
 		throw new \PHPFUI\ORM\Exception(self::class . " {$field} is not a valid field");
 		}
 
+	/**
+	 * Allows for empty($object->field) to work correctly
+	 */
+  public function __isset(string $field) : bool
+		{
+		return \array_key_exists($field, $this->current) || ! empty($this->current[$field . \PHPFUI\ORM::$idSuffix]);
+		}
+
 	public function __set(string $field, mixed $value) : void
 		{
 		if (! \array_key_exists($field, $this->current))
@@ -50,30 +58,30 @@ public function empty() : bool
 
 	public function isset(string $field) : bool
 		{
-		return \array_key_exists($field, $this->current);
+		return $this->__isset($field);
 		}
 
 	public function offsetExists($offset) : bool
 		{
 		return \array_key_exists($offset, $this->current);
 		}
 
+	/**
+	 * Low level get access to underlying data to implement ArrayAccess
+	 */
 	public function offsetGet($offset) : mixed
 		{
-		if (\array_key_exists($offset, $this->current))
-			{
-			return $this->current[$offset];
-			}
+		$this->validateFieldExists($offset);
 
-		throw new \PHPFUI\ORM\Exception(self::class . " {$offset} is not defined");
+		return $this->current[$offset] ?? null;
 		}
 
-  public function offsetSet($offset, $value) : void
+	/**
+	 * Low level set access to underlying data to implement ArrayAccess
+	 */
+	public function offsetSet($offset, $value) : void
 		{
-		if (! \array_key_exists($offset, $this->current))
-			{
-			throw new \PHPFUI\ORM\Exception(self::class . " {$offset} is not defined");
-			}
+		$this->validateFieldExists($offset);
 		$this->current[$offset] = $value;
 		}
 
@@ -87,4 +95,15 @@ public function toArray() : array
 		{
 		return $this->current;
 		}
+
+	protected function validateFieldExists(string $field) : void
+		{
+		if (! $this->__isset($field))
+			{
+			$message = static::class . "::{$field} is not a valid field";
+			\PHPFUI\ORM::log(\Psr\Log\LogLevel::ERROR, $message);
+
+			throw new \PHPFUI\ORM\Exception($message);
+			}
+		}
 	}

src/PHPFUI/ORM/Record.php

@@ -127,11 +127,11 @@ public function __get(string $field) : mixed
 		}
 
 	/**
-	 * Allows for empty($object->field) to work correctly
+	 * @inherit
 	 */
 	public function __isset(string $field) : bool
 		{
-		return (bool)(\array_key_exists($field, $this->current) || \array_key_exists($field, static::$virtualFields) || \array_key_exists($field . \PHPFUI\ORM::$idSuffix, $this->current));
+		return (bool)(parent::__isset($field) || \array_key_exists($field, static::$virtualFields));
 		}
 
 	public function __set(string $field, mixed $value) : void
@@ -153,8 +153,14 @@ public function __set(string $field, mixed $value) : void
 			{
 			$haveType = $value->getTableName();
 
-			if ($value instanceof \PHPFUI\ORM\Record && $field == $haveType)
+			if ($field == $haveType)
 				{
+				if ($value->empty())
+					{
+					$this->current[$id] = 0;
+
+					return;
+					}
 				$this->empty = false;
 
 				if (empty($value->{$id}))
@@ -443,25 +449,6 @@ public function loadFromSQL(string $sql, array $input = []) : bool
 		return true;
 		}
 
-	/**
-	 * Low level get access to underlying data to implement ArrayAccess
-	 */
-	public function offsetGet($offset) : mixed
-		{
-		$this->validateFieldExists($offset);
-
-		return $this->current[$offset] ?? null;
-		}
-
-	/**
-	 * Low level set access to underlying data to implement ArrayAccess
-	 */
-	public function offsetSet($offset, $value) : void
-		{
-		$this->validateFieldExists($offset);
-		$this->current[$offset] = $value;
-		}
-
  /**
   * Read a record from the db. If more than one match, only the first is loaded.
   *
@@ -734,6 +721,17 @@ protected function timeStamp(?int $timeStamp) : string
 		return \date('Y-m-d g:i a', $timeStamp);
 		}
 
+	protected function validateFieldExists(string $field) : void
+		{
+		if (! isset(static::$fields[$field]))
+			{
+			$message = static::class . "::{$field} is not a valid field";
+			\PHPFUI\ORM::log(\Psr\Log\LogLevel::ERROR, $message);
+
+			throw new \PHPFUI\ORM\Exception($message);
+			}
+		}
+
 	/**
 	 * Build a where clause
 	 *
@@ -878,15 +876,4 @@ private function privateInsert(bool $updateOnDuplicate, string $ignore = '') : i
 
 		return $returnValue;
 		}
-
-	private function validateFieldExists(string $field) : void
-		{
-		if (! isset(static::$fields[$field]))
-			{
-			$message = static::class . "::{$field} is not a valid field";
-			\PHPFUI\ORM::log(\Psr\Log\LogLevel::ERROR, $message);
-
-			throw new \PHPFUI\ORM\Exception($message);
-			}
-		}
 	}