Remove transforms, not needed with 8.4

Author: phpfui

src/PHPFUI/ORM/Record.php

@@ -27,9 +27,6 @@ abstract class Record extends DataObject
 
 	protected static bool $deleteChildren = true;
 
-	/** @var array<string,array<callable>> */
-	protected static array $displayTransforms = [];
-
 	protected bool $empty = true;
 
 	/** @var array<string,array<mixed>> */
@@ -40,9 +37,6 @@ abstract class Record extends DataObject
 	/** @var array<string> */
 	protected static array $primaryKeys = [];
 
-	/** @var array<string,array<callable>> */
-	protected static array $setTransforms = [];
-
 	protected static string $table = '';
 
 	protected string $validator = '';
@@ -129,24 +123,7 @@ public function __get(string $field) : mixed
 			return $relationshipObject->getValue($relationship);
 			}
 
-		if (isset(static::$fields[$field]))
-			{
-			return $this->displayTransform($field);
-			}
-
-		$id = $field . \PHPFUI\ORM::$idSuffix;
-
-		if (\array_key_exists($id, $this->current))
-			{
-			$type = '\\' . \PHPFUI\ORM::$recordNamespace . '\\' . \PHPFUI\ORM::getBaseClassName($field);
-
-			if (\class_exists($type))
-				{
-				return new $type($this->current[$id]);
-				}
-			}
-
-		throw new \PHPFUI\ORM\Exception(static::class . "::{$field} is not a valid field");
+		return parent::__get($field);
 		}
 
 	/**
@@ -201,12 +178,6 @@ public function __set(string $field, mixed $value) : void
 			}
 
 		$this->validateFieldExists($field);
-
-		if (isset(static::$setTransforms[$field]))
-			{
-			$value = static::$setTransforms[$field]($value);
-			}
-
 		$expectedType = static::$fields[$field][self::PHP_TYPE_INDEX];
 		$haveType = \get_debug_type($value);
 
@@ -243,24 +214,6 @@ public function __set(string $field, mixed $value) : void
 		$this->current[$field] = $value;
 		}
 
-	/**
-	 * Add a transform for get.  Callback is passed value.
-	 */
-	public static function addDisplayTransform(string $field, callable $callback) : void
-		{
-		static::$displayTransforms[$field] = $callback;
-		}
-
-	/**
-	 * Add a transform for set.  Callback is passed value.
-	 */
-	public function addSetTransform(string $field, callable $callback) : static
-		{
-		static::$setTransforms[$field] = $callback;
-
-		return $this;
-		}
-
 	public function blankDate(?string $date) : string
 		{
 		if ('1000-01-01' > $date)
@@ -322,24 +275,6 @@ public function delete() : bool
 		return \PHPFUI\ORM::execute($sql, $input);
 		}
 
-	/**
-	 * Transform a field for display
-	 */
-	public function displayTransform(string $field, mixed $value = null) : mixed
-		{
-		if (null === $value)
-			{
-			$value = $this->current[$field] ?? null;
-			}
-
-		if (! isset(static::$displayTransforms[$field]))
-			{
-			return $value;
-			}
-
-		return static::$displayTransforms[$field]($value);
-		}
-
 	/**
 	 * @return bool  true if empty (default values)
 	 */
@@ -612,11 +547,6 @@ public function setFrom(array $values, bool $loaded = false) : static
 			if (isset(static::$fields[$field]))
 				{
 				$this->empty = false;
-
-				if (isset(static::$setTransforms[$field]))
-					{
-					$value = static::$setTransforms[$field]($value);
-					}
 				$this->current[$field] = $value;
 				}
 			}

src/PHPFUI/ORM/Table.php

@@ -333,28 +333,6 @@ public function delete(bool $allowDeleteAll = false) : static
 		return $this;
 		}
 
-	/**
-	 * transform any field or table.field from join
-	 */
-	public function displayTransform(string $field, mixed $value = null) : mixed
-		{
-		$parts = \explode('_', $field);
-
-		if (2 <= \count($parts))
-			{
-			$field = $parts[1];
-
-			if (isset($this->joins[$parts[0]]))
-				{
-				$joinedTable = $this->joins[$parts[0]][0];
-
-				return $joinedTable->displayTransform($field, $value);
-				}
-			}
-
-		return $this->instance->displayTransform($field, $value);
-		}
-
 	/**
 	 * @param array<string,mixed> $parameters
 	 */