Skip to content

Commit

Permalink
do not normalize from string DT/json/object
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvorisek
mvorisek committed Oct 1, 2021
1 parent 41fc27a commit 65c5ecf
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 66 deletions.
77 changes: 24 additions & 53 deletions src/Field.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ static function (Model $owner) use ($name) {
*/
public function normalize($value)
{
$this->getTypeObject(); // assert type exists

try {
if ($this->getOwner()->hook(Model::HOOK_NORMALIZE, [$this, $value]) === false) {
return $value;
Expand All @@ -96,30 +98,21 @@ public function normalize($value)
throw new ValidationException([$this->name => 'Must not be null'], $this->getOwner());
}

return;
return null;
}

$f = $this;

$type = $this->getTypeObject();
// TODO - breaking tests
/*$platform = $this->getOwner()->persistence !== null
? $this->getOwner()->persistence->getDatabasePlatform()
: new Persistence\GenericPlatform();
$value = $type->convertToPHPValue($type->convertToDatabaseValue($value, $platform), $platform);*/

// only string type fields can use empty string as legit value, for all
// other field types empty value is the same as no-value, nothing or null
if ($f->type && $f->type !== 'string' && $value === '') {
if ($this->type && $this->type !== 'string' && $value === '') {
if ($this->required && empty($value)) {
throw new ValidationException([$this->name => 'Must not be empty'], $this->getOwner());
}

return;
return null;
}

// validate scalar values
if (in_array($f->type, [null, 'string', 'text', 'integer', 'float', 'atk4_money'], true)) {
if (in_array($this->type, [null, 'string', 'text', 'integer', 'float', 'atk4_money'], true)) {
if (!is_scalar($value)) {
throw new ValidationException([$this->name => 'Must use scalar value'], $this->getOwner());
}
Expand All @@ -128,19 +121,17 @@ public function normalize($value)
}

// normalize
switch ($f->type) {
switch ($this->type) {
case null:
case 'string':
// remove all line-ends and trim
$value = trim(str_replace(["\r", "\n"], '', $value));
$value = trim(str_replace(["\r", "\n"], '', $value)); // remove all line-ends and trim
if ($this->required && empty($value)) {
throw new ValidationException([$this->name => 'Must not be empty'], $this->getOwner());
}

break;
case 'text':
// normalize line-ends to LF and trim
$value = trim(str_replace(["\r\n", "\r"], "\n", $value));
$value = trim(str_replace(["\r\n", "\r"], "\n", $value)); // normalize line-ends to LF and trim
if ($this->required && empty($value)) {
throw new ValidationException([$this->name => 'Must not be empty'], $this->getOwner());
}
Expand Down Expand Up @@ -174,58 +165,38 @@ public function normalize($value)
case 'date':
case 'datetime':
case 'time':
if (is_string($value)) {
$value = new \DateTime($value);
} elseif (!$value instanceof \DateTime) {
if ($value instanceof \DateTimeInterface) {
$value = new \DateTime($value->format('Y-m-d H:i:s.u'), $value->getTimezone());
} else {
throw new ValidationException(['Must be an instance of DateTimeInterface', 'value type' => get_debug_type($value)], $this->getOwner());
}
}

if ($f->type === 'date' && $value->format('H:i:s.u') !== '00:00:00.000000') {
// remove time portion from date type value
$value = (clone $value)->setTime(0, 0, 0);
}
if ($f->type === 'time' && $value->format('Y-m-d') !== '1970-01-01') {
// remove date portion from date type value
// need 1970 in place of 0 - DB
$value = (clone $value)->setDate(1970, 1, 1);
if (!$value instanceof \DateTimeInterface) {
throw new ValidationException(['Must be an instance of DateTimeInterface', 'type' => get_debug_type($value)], $this->getOwner());
}

break;
case 'json':
if (is_string($value) && $f->issetOwner() && $f->getOwner()->persistence) {
$value = $f->getOwner()->persistence->typecastLoadField($f, $value);
}

if (!is_array($value)) {
throw new ValidationException([$this->name => 'Must be an array'], $this->getOwner());
}

break;
case 'object':
if (is_string($value) && $f->issetOwner() && $f->getOwner()->persistence) {
$value = $f->getOwner()->persistence->typecastLoadField($f, $value);
}

if (!is_object($value)) {
throw new ValidationException([$this->name => 'Must be an object'], $this->getOwner());
}

break;
case 'int':
case 'str':
case 'bool':
throw (new Exception('Use of obsolete field type abbreviation. Use "integer", "string", "boolean" etc.'))
->addMoreInfo('type', $f->type);
}

/*if ($f->issetOwner() && $f->getOwner()->persistence) {
$value = $f->getOwner()->persistence->typecastSaveField($f, $value);
$value = $f->getOwner()->persistence->typecastLoadField($f, $value);
}*/
// normalize using DBAL type
$persistence = $this->getOwner()->persistence
?? new class() extends Persistence {
public function __construct()
{
}
};
try {
$value = $persistence->typecastSaveField($this, $value);
$value = $persistence->typecastLoadField($this, $value);
} catch (\Exception $e) {
throw new ValidationException([$this->name => 'Invalid value: ' . $e->getMessage()], $this->getOwner());
}

return $value;
} catch (Exception $e) {
Expand Down
8 changes: 0 additions & 8 deletions tests/FieldTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,14 +547,6 @@ public function testNormalize(): void
$this->assertFalse($m->get('boolean_enum'));
$m->set('boolean_enum', 'Y');
$this->assertTrue($m->get('boolean_enum'));

// date, datetime, time
$m->set('date', '2018-05-31');
$this->assertInstanceOf(\DateTime::class, $m->get('date'));
$m->set('datetime', '2018-05-31 12:13:14');
$this->assertInstanceOf(\DateTime::class, $m->get('datetime'));
$m->set('time', '12:13:14');
$this->assertInstanceOf(\DateTime::class, $m->get('time'));
}

public function testNormalizeException1(): void
Expand Down
10 changes: 5 additions & 5 deletions tests/TypecastingTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,13 +550,13 @@ public function testIntegerSave(): void

public function testDirtyTime(): void
{
$sql_time = '11:44:08';
$sql_time_new = '12:34:56';
$sql_time = new \DateTime('11:44:08 GMT');
$sql_time_new = new \DateTime('12:34:56 GMT');

$this->setDb([
'types' => [
[
'date' => $sql_time,
'date' => $sql_time->format('H:i:s'),
],
],
]);
Expand All @@ -578,8 +578,8 @@ public function testDirtyTime(): void

public function testDirtyTimeAfterSave(): void
{
$sql_time = '11:44:08';
$sql_time_new = '12:34:56';
$sql_time = new \DateTime('11:44:08 GMT');
$sql_time_new = new \DateTime('12:34:56 GMT');

$this->setDb([
'types' => [
Expand Down

0 comments on commit 65c5ecf

Please sign in to comment.