Detect invalid null assignments

Author: phpfui

Tests/Unit/MiscellaneousTest.php

@@ -10,6 +10,24 @@ enum TestEnum : int
 
 class MiscellaneousTest extends \PHPUnit\Framework\TestCase
 	{
+	public function testNullAssignment() : void
+		{
+		$po = new \Tests\App\Record\PurchaseOrder();
+		$po->payment_method = 'Cash';
+		$this->assertNotNull($po->payment_method);
+		$po->payment_method = null;
+		$this->assertNull($po->payment_method);
+		}
+
+	public function testNullAssignmentError() : void
+		{
+		$po = new \Tests\App\Record\PurchaseOrder();
+		$this->assertIsFloat($po->shipping_fee);
+		$this->assertEquals(0.0, $po->shipping_fee);
+		$this->expectException(\PHPFUI\ORM\Exception::class);
+		$po->shipping_fee = null;
+		}
+
 	public function testEnumCondition() : void
 		{
 		$condition = new \PHPFUI\ORM\Condition('field', TestEnum::YES);

Tests/Unit/ValidationTest.php

@@ -890,7 +890,6 @@ public function testRequired() : void
 		$this->assertArrayHasKey('required', $errors);
 		$this->assertContains('This field is required', $errors['required']);
 
-		$crud->required = null;
 		$validator->validate();
 		$this->assertNotEmpty($validator->getErrors());
 		}

src/PHPFUI/ORM/Record.php

@@ -186,7 +186,17 @@ public function __set(string $field, mixed $value) : void
 		$expectedType = static::$fields[$field][self::PHP_TYPE_INDEX];
 		$haveType = \get_debug_type($value);
 
-		if (null !== $value && $haveType != $expectedType)
+		if (null === $value)
+			{
+			if (! static::$fields[$field][self::ALLOWS_NULL_INDEX])
+				{
+				$message = static::class . "::{$field} does not allow nulls";
+				\PHPFUI\ORM::log(\Psr\Log\LogLevel::WARNING, $message);
+
+				throw new \PHPFUI\ORM\Exception($message);
+				}
+			}
+		elseif ($haveType != $expectedType)
 			{
 			$message = static::class . "::{$field} is of type {$expectedType} but being assigned a type of {$haveType}";
 			\PHPFUI\ORM::log(\Psr\Log\LogLevel::WARNING, $message);
@@ -741,11 +751,6 @@ protected function validateFieldExists(string $field) : void
 	 */
 	private function buildWhere(array|int|string $key, array &$input) : string
 		{
-		if ('*' === $key)
-			{
-			return '';
-			}
-
 		if (! \is_array($key))
 			{
 			$key = [static::$primaryKeys[0] => $key];

src/PHPFUI/ORM/Tool/Generate/CRUD.php

@@ -179,7 +179,8 @@ protected function getLine(\PHPFUI\ORM\Schema\Field $field) : string
 			case 'float':
 				if (null !== $field->defaultValue)
 					{
-					$defaultValue = 'NULL' !== $field->defaultValue ? (float)$field->defaultValue : 'NULL';
+					$temp = str_replace("'", '', $field->defaultValue);
+					$defaultValue = 'NULL' !== $field->defaultValue ? $temp : 'NULL';
 					}
 
 				break;