diff --git a/README.md b/README.md index e32a2a71a..f4c3614ad 100644 --- a/README.md +++ b/README.md @@ -229,7 +229,7 @@ Agile Data has a usage patters that will automatically restrict access by this c With Agile Data you can move your data from one persistence to another seamlessly. If you rely on some feature that your new persistence does not support (e.g. Expression) you can replace them a callback calculation, that executes on your App server. -As usual - the rest of your application is not affected and you can even use multiple types of different persistences and still navigate through references. +As usual - the rest of your application is not affected and you can even use multiple types of different persistencies and still navigate through references. #### Support diff --git a/bootstrap-types.php b/bootstrap-types.php index 3d3287037..73d9a58e1 100644 --- a/bootstrap-types.php +++ b/bootstrap-types.php @@ -33,7 +33,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str return (string) round((float) $value, 4); } - public function convertToPHPValue($value, AbstractPlatform $platform): float + public function convertToPHPValue($value, AbstractPlatform $platform): ?float { $v = $this->convertToDatabaseValue($value, $platform); diff --git a/codecov.yml b/codecov.yml index 3c0ef09f0..2d4a1cb29 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,6 +1,5 @@ ignore: - docs - - locale comment: false coverage: status: diff --git a/composer.json b/composer.json index 572610bb9..560f048e1 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ } ], "require": { - "php": ">=7.4.0", + "php": ">=7.4 <8.2", "ext-intl": "*", "ext-pdo": "*", "atk4/core": "dev-develop", @@ -42,7 +42,7 @@ "mvorisek/atk4-hintable": "~1.5.0" }, "require-release": { - "php": ">=7.4.0", + "php": ">=7.4 <8.2", "ext-intl": "*", "ext-pdo": "*", "atk4/core": "~3.1.0", diff --git a/docs/design.rst b/docs/design.rst index 3c042a9b3..4e762efbd 100644 --- a/docs/design.rst +++ b/docs/design.rst @@ -516,7 +516,7 @@ So getting back to the operation above, lets look at it in more details:: While "vip_orders" is actually a DataSet, executing count() will cross you over into persistence layer. However this method is returning a new object, which is then -executed when you call getOne(). For SQL persistences it returns \Atk4\Data\Persistence\Sql\Query +executed when you call getOne(). For SQL persistencies it returns \Atk4\Data\Persistence\Sql\Query object, for example. Even though for a brief moment you had your hands on a "database-vendor specific" @@ -534,7 +534,7 @@ will not violate SRP (Single Responsibility Principle) Unique Features of Persistence Layer ------------------------------------ -More often than not, your application is designed and built with a specific +More often thannot, your application is designed and built with a specific persistence layer in mind. If you are using SQL database, you want to diff --git a/docs/field_boolean.rst b/docs/field_boolean.rst deleted file mode 100644 index 977c351e9..000000000 --- a/docs/field_boolean.rst +++ /dev/null @@ -1,8 +0,0 @@ - -.. php:namespace:: Atk4\Data\Field - -.. php:class:: Boolean - -Boolean -======= - diff --git a/docs/model.rst b/docs/model.rst index a05c0cf8c..6d10cd87a 100644 --- a/docs/model.rst +++ b/docs/model.rst @@ -230,16 +230,9 @@ Second argument to addField() will contain a seed for the Field class:: $this->addField('surname', ['default' => 'Smith']); -Additionally, `type` property can be used to determine the best `Field` class to handle -the type:: - - $field = $this->addField('is_married', ['type' => 'boolean']); - - // $field class now will be Field\Boolean - You may also specify your own Field implementation:: - $field = $this->addField('amount_and_currency', new MyAmountCurrencyField()); + $field = $this->addField('amount_and_currency', [MyAmountCurrencyField::class]); Read more about :php:class:`Field` diff --git a/docs/overview.rst b/docs/overview.rst index 11d908a34..50e2e8992 100644 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -47,7 +47,7 @@ basic functionality is divided into 3 major areas: - Fields (or Columns) - DataSets (or Rows) - - Databases (or Persistences) + - Databases (or Persistencies) Each of the above corresponds to a PHP class, which may use composition principle to hide implementation details. @@ -171,7 +171,7 @@ MongoDB), you would need to define the field differently:: }); When you use persistence-specific code, you must be aware that it will not map -into persistences that does not support features you have used. +into persistencies that does not support features you have used. In most cases that is OK as if you prefer to stay with same database type, for instance, the above expression will still be usable with any SQL vendor, but if @@ -217,7 +217,7 @@ Persistence Scaling =================== Although in most cases you would be executing operation against SQL persistence, -Agile Data makes it very easy to use models with a simpler persistences. +Agile Data makes it very easy to use models with a simpler persistencies. For example, consider you want to output a "table" to the user using HTML by using Agile UI:: @@ -229,7 +229,7 @@ using Agile UI:: echo $htmltable->render(); -Class `\\Atk4\\Ui\\Table` here is designed to work with persistences and models - +Class `\\Atk4\\Ui\\Table` here is designed to work with persistencies and models - it will populate columns of correct type, fetch data, calculate totals if needed. But what if you have your data inside an array? You can use :php:class:`Persistence\Static_` for that:: diff --git a/docs/persistence.rst b/docs/persistence.rst index 2f31a780e..6abc020b7 100644 --- a/docs/persistence.rst +++ b/docs/persistence.rst @@ -297,48 +297,48 @@ Type Matrix .. todo:: this section might need cleanup -+----+----+----------------------------------------------------------+------+----+-----+ -| ty | al | description | nati | sq | mon | -| pe | ia | | ve | l | go | -| | s( | | | | | -| | es | | | | | -| | ) | | | | | -+====+====+==========================================================+======+====+=====+ -| st | | Will be trim() ed. | | | | -| ri | | | | | | -| ng | | | | | | -+----+----+----------------------------------------------------------+------+----+-----+ -| in | in | will cast to int make sure it's not passed as a string. | -394 | 49 | 49 | -| t | te | | , | | | -| | ge | | "49" | | | -| | r | | | | | -+----+----+----------------------------------------------------------+------+----+-----+ -| fl | | decimal number with floating point | 3.28 | | | -| oa | | | 84, | | | -| t | | | | | | -+----+----+----------------------------------------------------------+------+----+-----+ -| mo | | Will convert loosly-specified currency into float or | "£3, | 38 | | -| ne | | dedicated format for storage. Optionally support 'fmt' | 294. | 29 | | -| y | | property. | 48", | 4. | | -| | | | 3.99 | 48 | | -| | | | 999 | , | | -| | | | | 4 | | -+----+----+----------------------------------------------------------+------+----+-----+ -| bo | bo | true / false type value. Optionally specify | true | 1 | tru | -| ol | ol | 'enum' => ['N','Y'] to store true as 'Y' and false as 'N'. | | | e | -| | ea | By default uses [0,1]. | | | | -| | n | | | | | -+----+----+----------------------------------------------------------+------+----+-----+ -| ar | | Optionally pass 'fmt' option, which is 'json' by | [2 => | {2 | sto | -| ra | | default. Will json\_encode and json\_decode(..., true) | "bar | :" | red | -| y | | the value if database does not support array storage. | "] | ba | as- | -| | | | | r" | is | -| | | | | } | | -+----+----+----------------------------------------------------------+------+----+-----+ -| bi | | Supports storage of binary data like BLOBs | | | | -| na | | | | | | -| ry | | | | | | -+----+----+----------------------------------------------------------+------+----+-----+ ++----+----------------------------------------------------------+------+----+-----+ +| ty | description | nati | sq | mon | +| pe | | ve | l | go | +| | | | | | +| | | | | | +| | | | | | ++====+==========================================================+======+====+=====+ +| st | Will be trim() ed. | | | | +| ri | | | | | +| ng | | | | | ++----+----------------------------------------------------------+------+----+-----+ +| in | will cast to int make sure it's not passed as a string. | -394 | 49 | 49 | +| te | | , | | | +| ge | | "49" | | | +| r | | | | | ++----+----------------------------------------------------------+------+----+-----+ +| fl | decimal number with floating point | 3.28 | | | +| oa | | 84, | | | +| t | | | | | ++----+----------------------------------------------------------+------+----+-----+ +| at | Will convert loosly-specified currency into float or | "£3, | 38 | | +| k4 | dedicated format for storage. Optionally support 'fmt' | 294. | 29 | | +| _m | property. | 48", | 4. | | +| on | | 3.99 | 48 | | +| y | | 999 | , | | +| | | | 4 | | ++----+----------------------------------------------------------+------+----+-----+ +| bo | true / false type value. | true | 1 | tru | +| ol | | | | e | +| ea | | | | | +| n | | | | | ++----+----------------------------------------------------------+------+----+-----+ +| js | Optionally pass 'fmt' option, which is 'json' by | [2 => | {2 | sto | +| on | default. Will json_encode and json_decode(..., true) | "bar | :" | red | +| | the value if database does not support array storage. | "] | ba | as- | +| | | | r" | is | +| | | | } | | ++----+----------------------------------------------------------+------+----+-----+ +| bi | Supports storage of binary data like BLOBs | | | | +| na | | | | | +| ry | | | | | ++----+----------------------------------------------------------+------+----+-----+ - Money: http://php.net/manual/en/numberformatter.parsecurrency.php. - money: See also @@ -544,7 +544,7 @@ The other, more appropriate option is to re-use a vanilla Order record:: } -Working with Multiple Persistences +Working with Multiple Persistencies ================================== Normally when you load the model and save it later, it ends up in the same @@ -573,7 +573,7 @@ Agile Data, so you will have to create logic yourself, which is actually quite simple. You can use several designs. I will create a method inside my application class -to load records from two persistences that are stored inside properties of my +to load records from two persistencies that are stored inside properties of my application:: function loadQuick($class, $id) { diff --git a/docs/references.rst b/docs/references.rst index c0377a6c5..24bf032d2 100644 --- a/docs/references.rst +++ b/docs/references.rst @@ -51,7 +51,7 @@ model that has a persistence set. (See Reference::getModel()) Persistence ----------- -Agile Data supports traversal between persistences. The code above does not +Agile Data supports traversal between persistencies. The code above does not explicitly assign database to Model_Order. But what if destination model does not reside inside the same database? diff --git a/docs/sql.rst b/docs/sql.rst index 84d1fcdef..6efb9ef69 100644 --- a/docs/sql.rst +++ b/docs/sql.rst @@ -329,7 +329,7 @@ procedures you will loose portability of your application. We do have our legacy applications to maintain, so Stored Procedures and SQL extensions are here to stay. By making your Model rely on those extensions you -will loose ability to use the same model with non-sql persistences. +will loose ability to use the same model with non-sql persistencies. Sometimes you can fence the code like this:: @@ -338,7 +338,7 @@ Sometimes you can fence the code like this:: } Or define your pure model, then extend it to add SQL capabilities. Note that -using single model with cross-persistences should still be possible, so you +using single model with cross-persistencies should still be possible, so you should be able to retrieve model data from stored procedure then cache it. as a Model method diff --git a/docs/typecasting.rst b/docs/typecasting.rst index 3d40640fa..26d3ae510 100644 --- a/docs/typecasting.rst +++ b/docs/typecasting.rst @@ -144,7 +144,7 @@ Field may use serialization to further encode field value for the storage purpos Array and Object types ---------------------- -Some types may require serialization for some persistences, for instance types +Some types may require serialization for some persistencies, for instance types 'json' and 'object' cannot be stored in SQL natively. `json` type can be used to store these in JSON. diff --git a/docs/types.rst b/docs/types.rst index e17284f5a..45d617e95 100644 --- a/docs/types.rst +++ b/docs/types.rst @@ -79,7 +79,7 @@ Supported Types ATK Data prior to 1.5 supports the following types: - string - - boolean ([':php:class:`Boolean`']) + - boolean - integer ([':php:class:`Number`', 'precision' => 0]) - money ([':php:class:`Number`', 'prefix' => '€', 'precision' => 2]) - float ([':php:class:`Number`', 'type' => 'float']) @@ -118,17 +118,3 @@ All measurements are implemented with :php:class:`Units` and can be further exte echo $model->getField('speed')->format(); // 30km/s echo $model->getField('speed')->format('m'); // 30000m/s - -List of Field Classes -===================== - -.. toctree:: - :maxdepth: 1 - - field_boolean - field_text - field_number - field_datetime - field_units - - diff --git a/locale/en/atk.php b/locale/en/atk.php deleted file mode 100644 index fff4182e6..000000000 --- a/locale/en/atk.php +++ /dev/null @@ -1,23 +0,0 @@ - 'Field requires array for defaults', - 'Field value can not be base64 encoded because it is not of string type' => 'Field value can not be base64 encoded because it is not of string type ({{field}})', - 'Mandatory field value cannot be null' => 'Mandatory field value cannot be null ({{field}})', - 'Model is already related to another persistence' => 'Model is already related to another persistence', - 'Must not be null' => 'Must not be null', - 'Test with plural' => [ - 'zero' => 'Test zero', - 'one' => 'Test is one', - 'other' => 'Test are {{count}}', - ], - 'There was error while decoding JSON' => 'There was error while decoding JSON', - 'Unable to determine persistence driver type from DSN' => 'Unable to determine persistence driver type from DSN', - 'Unable to serialize field value on load' => 'Unable to serialize field value on load ({{field}})', - 'Unable to serialize field value on save' => 'Unable to serialize field value on save ({{field}})', - 'Unable to typecast field value on load' => 'Unable to typecast field value on load ({{field}})', - 'Unable to typecast field value on save' => 'Unable to typecast field value on save ({{field}})', - 'Record with specified ID was not found' => 'Record with specified ID was not found', -]; diff --git a/locale/it/atk.php b/locale/it/atk.php deleted file mode 100644 index 0ebb5e936..000000000 --- a/locale/it/atk.php +++ /dev/null @@ -1,22 +0,0 @@ - 'Il campo richiede un array per i valori predefiniti', - 'Field value can not be base64 encoded because it is not of string type' => 'Il valore del campo non può essere codificato in base64 perché non è di tipo stringa ({{field}})', - 'Mandatory field value cannot be null' => 'Il valore del campo obbligatorio non può essere nullo ({{field}})', - 'Model is already related to another persistence' => 'Il modello è già collegato a una persistenza', - 'Must not be null' => 'Non deve essere nullo', - 'Test with plural' => [ - 'zero' => 'Test zero', - 'one' => 'Test è uno', - 'other' => 'Test sono {{count}}', - ], - 'There was error while decoding JSON' => 'Si è verificato un errore durante la decodifica di JSON', - 'Unable to determine persistence driver type from DSN' => 'Impossibile determinare il driver di persistenza via DSN', - 'Unable to serialize field value on load' => 'Impossibile serializzare il valore durante il caricamento ({{field}})', - 'Unable to serialize field value on save' => 'Impossibile serializzare il valore durante il salvataggio ({{field}})', - 'Unable to typecast field value on load' => 'Impossibile serializzare il valore durante il caricamento ({{field}})', - 'Unable to typecast field value on save' => 'Impossibile serializzare il valore durante il salvataggio ({{field}})', -]; diff --git a/locale/ru/atk.php b/locale/ru/atk.php deleted file mode 100644 index e006caa92..000000000 --- a/locale/ru/atk.php +++ /dev/null @@ -1,21 +0,0 @@ - 'Значение поля не может быть закодировано в base64, поскольку оно не имеет строкового типа ({{field}})', - 'Mandatory field value cannot be null' => 'Обязательное значение поля не может быть пустым ({{field}})', - 'Model is already related to another persistence' => 'Модель уже связана с другим постоянством', - 'Test with plural' => [ - 'zero' => 'Тест ноль', - 'one' => 'Тест один', - 'other' => 'Тест {{count}}', - ], - 'There was error while decoding JSON' => 'Произошла ошибка при декодировании JSON', - 'Unable to determine persistence driver type from DSN' => 'Невозможно определить постоянство драйвера из DSN', - 'Unable to serialize field value on load' => 'Невозможно сериализовать значение поля при загрузке ({{field}})', - 'Unable to serialize field value on save' => 'Невозможно сериализовать значение поля при сохранении ({{field}})', - 'Unable to typecast field value on load' => 'Невозможно установить тип поля при загрузке ({{field}})', - 'Unable to typecast field value on save' => 'Невозможно сериализовать значение поля при сохранении ({{field}})', - 'Record with specified ID was not found' => 'Запись с данным ID не найдена', -]; diff --git a/src/Field.php b/src/Field.php index 7931db679..3bebbe4cf 100644 --- a/src/Field.php +++ b/src/Field.php @@ -93,116 +93,158 @@ public function normalize($value) return $value; } - if ($value === null) { - if ($this->required/* known bug, see https://github.com/atk4/data/issues/575, fix in https://github.com/atk4/data/issues/576 || $this->mandatory*/) { - throw new ValidationException([$this->name => 'Must not be null'], $this->getOwner()); + if (is_string($value)) { + switch ($this->type) { + case null: + case 'string': + $value = trim(str_replace(["\r", "\n"], '', $value)); // remove all line-ends and trim + + break; + case 'text': + $value = trim(str_replace(["\r\n", "\r"], "\n", $value)); // normalize line-ends to LF and trim + + break; + case 'boolean': + case 'integer': + $value = preg_replace('/\s+|[,`\']/', '', $value); + + break; + case 'float': + case 'atk4_money': + $value = preg_replace('/\s+|[,`\'](?=.*\.)/', '', $value); + + break; } - return null; + switch ($this->type) { + case 'boolean': + case 'integer': + case 'float': + case 'atk4_money': + if ($value === '') { + $value = null; + } elseif (!is_numeric($value)) { + throw new Exception('Must be numeric'); + } + + break; + } + } elseif ($value !== null) { + switch ($this->type) { + case null: + case 'string': + case 'text': + case 'integer': + case 'float': + case 'atk4_money': + if (is_bool($value)) { + if ($this->type === 'boolean') { + $value = $value ? '1' : '0'; + } else { + throw new Exception('Must not be boolean type'); + } + } elseif (is_scalar($value)) { + $value = (string) $value; + } else { + throw new Exception('Must be scalar'); + } + + break; + } } - // 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 ($this->type && $this->type !== 'string' && $value === '') { - if ($this->required && empty($value)) { - throw new ValidationException([$this->name => 'Must not be empty'], $this->getOwner()); + // normalize using persistence typecasting + $persistence = $this->getOwner()->persistence + ?? new class() extends Persistence { + public function __construct() + { + } + }; + $value = $persistence->typecastSaveField($this, $value); + $value = $persistence->typecastLoadField($this, $value); + + if ($value === null) { + if ($this->required/* known bug, see https://github.com/atk4/data/issues/575, fix in https://github.com/atk4/data/issues/576 || $this->mandatory*/) { + throw new Exception('Must not be null'); } return null; } - // validate scalar values - 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()); - } - - $value = (string) $value; + if ($value === '' && $this->required) { + throw new Exception('Must not be empty'); } - // normalize switch ($this->type) { case null: case 'string': - $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': - $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()); + throw new Exception('Must not be empty'); } break; - case 'integer': - $value = preg_replace('/\s+|[,`\']/', '', $value); - if (!is_numeric($value)) { - throw new ValidationException([$this->name => 'Must be numeric'], $this->getOwner()); - } - $value = (int) $value; + case 'boolean': if ($this->required && empty($value)) { - throw new ValidationException([$this->name => 'Must not be a zero'], $this->getOwner()); + throw new Exception('Must be true'); } break; + case 'integer': case 'float': case 'atk4_money': - $value = preg_replace('/\s+|[,`\'](?=.*\.)/', '', $value); - if (!is_numeric($value)) { - throw new ValidationException([$this->name => 'Must be numeric'], $this->getOwner()); - } - $value = $this->getTypeObject()->convertToPHPValue($value, new Persistence\GenericPlatform()); if ($this->required && empty($value)) { - throw new ValidationException([$this->name => 'Must not be a zero'], $this->getOwner()); + throw new Exception('Must not be a zero'); } break; - case 'boolean': - throw new Exception('Use Field\Boolean for type=boolean'); case 'date': case 'datetime': case 'time': if (!$value instanceof \DateTimeInterface) { - throw new ValidationException(['Must be an instance of DateTimeInterface', 'type' => get_debug_type($value)], $this->getOwner()); + throw new Exception('Must be an instance of DateTimeInterface'); } break; case 'json': if (!is_array($value)) { - throw new ValidationException([$this->name => 'Must be an array'], $this->getOwner()); + throw new Exception('Must be an array'); } break; case 'object': if (!is_object($value)) { - throw new ValidationException([$this->name => 'Must be an object'], $this->getOwner()); + throw new Exception('Must be an object'); } break; } - // 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()); + if ($this->enum) { + if ($value === null || $value === '') { + $value = null; + } elseif (!in_array($value, $this->enum, true)) { + throw new Exception('Value is not one of the allowed values: ' . implode(', ', $this->enum)); + } } - return $value; - } catch (Exception $e) { - $e->addMoreInfo('field', $this); + if ($this->values) { + if ($value === null || $value === '') { + $value = null; + } elseif ((!is_string($value) && !is_int($value)) || !array_key_exists($value, $this->values)) { + throw new Exception('Value is not one of the allowed values: ' . implode(', ', array_keys($this->values))); + } + } - throw $e; + return $value; + } catch (\Exception $e) { + $messages = []; + do { + $messages[] = $e->getMessage(); + } while ($e = $e->getPrevious()); + + throw (new ValidationException([$this->name => implode(': ', $messages)], $this->getOwner())) + ->addMoreInfo('field', $this); } } @@ -214,6 +256,9 @@ public function __construct() public function toString($value = null): string { $value = ($value === null /* why not func_num_args() === 1 */ ? $this->get() : $this->normalize($value)); + if (is_bool($value)) { + $value = $value ? '1' : '0'; + } return (string) $this->typecastSaveField($value, true); } diff --git a/src/Field/Boolean.php b/src/Field/Boolean.php deleted file mode 100644 index 5f3ca4538..000000000 --- a/src/Field/Boolean.php +++ /dev/null @@ -1,107 +0,0 @@ -_init(); - - // Backwards compatibility - if ($this->enum) { - $this->valueFalse = $this->enum[0]; - $this->valueTrue = $this->enum[1]; - //unset($this->enum); - } - } - - /** - * Normalize value to boolean value. - * - * @param mixed $value - */ - public function normalize($value): ?bool - { - if ($value === null || $value === '') { - return null; - } elseif (is_bool($value)) { - return $value; - } - - if ($value === $this->valueTrue) { - return true; - } elseif ($value === $this->valueFalse) { - return false; - } - - if (is_numeric($value)) { - return (bool) $value; - } - - throw new ValidationException([$this->name => 'Must be a boolean value'], $this->getOwner()); - } - - /** - * Casts field value to string. - * - * @param mixed $value Optional value - */ - public function toString($value = null): string - { - $v = ($value === null ? $this->get() : $this->normalize($value)); - - return $v === true ? '1' : '0'; - } - - /** - * Validate if value is allowed for this field. - * - * @param mixed $value - */ - public function validate($value): void - { - // if value required, then only valueTrue is allowed - if ($this->required && $value !== $this->valueTrue) { - throw new ValidationException([$this->name => 'Must be selected'], $this->getOwner()); - } - } -} diff --git a/src/Field/Callback.php b/src/Field/Callback.php index 502c513fe..da7bff4e9 100644 --- a/src/Field/Callback.php +++ b/src/Field/Callback.php @@ -16,30 +16,14 @@ class Callback extends \Atk4\Data\Field init as _init; } - /** - * Method to execute for evaluation. - * - * @var \Closure - */ - public $expr; - - /** - * Expressions are always read_only. - * - * @var bool - */ + /** @var bool Expressions are always read_only. */ public $read_only = true; - - /** - * Never persist this field. - * - * @var bool - */ + /** @var bool Never persist this field. */ public $never_persist = true; - /** - * Initialization. - */ + /** @var \Closure Method to execute for evaluation. */ + public $expr; + protected function init(): void { $this->_init(); diff --git a/src/Field/Email.php b/src/Field/Email.php index b953e3c9c..11bbd42a6 100644 --- a/src/Field/Email.php +++ b/src/Field/Email.php @@ -15,8 +15,6 @@ * $user->addField('email_mx_check', [Field\Email::class, 'dns_check' => true]); * $user->addField('email_with_name', [Field\Email::class, 'include_names' => true]); * $user->addField('emails', [Field\Email::class, 'allow_multiple' => true, 'separator' => [',',';']]); - * - * Various options can also be combined. */ class Email extends Field { @@ -40,13 +38,6 @@ class Email extends Field */ public $separator = [',']; - /** - * Perform normalization. - * - * @param mixed $value - * - * @return mixed - */ public function normalize($value) { if ($value === null) { diff --git a/src/Locale.php b/src/Locale.php deleted file mode 100644 index d954c4526..000000000 --- a/src/Locale.php +++ /dev/null @@ -1,21 +0,0 @@ -compare($this->id_field, $this->_entityId)) { $this->unload(); // data for different ID were loaded, make sure to discard them - throw (new Exception('Model instance is an entity, ID can not be changed to a different one')) + throw (new Exception('Model instance is an entity, ID cannot be changed to a different one')) ->addMoreInfo('entityId', $this->_entityId) ->addMoreInfo('newId', $id); } @@ -574,7 +585,7 @@ public function fieldFactory(array $seed = null): Field { $seed = Factory::mergeSeeds( $seed, - isset($seed['type']) ? ($this->typeToFieldSeed[$seed['type']] ?? null) : null, + isset($seed['type']) ? ($this->fieldSeedByType[$seed['type']] ?? null) : null, $this->_default_seed_addField ); @@ -582,8 +593,7 @@ public function fieldFactory(array $seed = null): Field } /** @var array */ - protected $typeToFieldSeed = [ - 'boolean' => [Field\Boolean::class], + protected $fieldSeedByType = [ ]; /** @@ -762,9 +772,8 @@ public function set(string $field, $value) try { $value = $f->normalize($value); } catch (Exception $e) { - $e->addMoreInfo('field', $field); + $e->addMoreInfo('field', $f); $e->addMoreInfo('value', $value); - $e->addMoreInfo('f', $f); throw $e; } @@ -779,48 +788,12 @@ public function set(string $field, $value) return $this; } - // perform bunch of standard validation here. This can be re-factored in the future. if ($f->read_only) { throw (new Exception('Attempting to change read-only field')) ->addMoreInfo('field', $field) ->addMoreInfo('model', $this); } - // enum property support - if (isset($f->enum) && $f->enum && $f->type !== 'boolean') { - if ($value === '') { - $value = null; - } - if ($value !== null && !in_array($value, $f->enum, true)) { - throw (new Exception('This is not one of the allowed values for the field')) - ->addMoreInfo('field', $field) - ->addMoreInfo('model', $this) - ->addMoreInfo('value', $value) - ->addMoreInfo('enum', $f->enum); - } - } - - // values property support - if ($f->values) { - if ($value === '') { - $value = null; - } elseif ($value === null) { - // all is good - } elseif (!is_string($value) && !is_int($value)) { - throw (new Exception('Field can be only one of pre-defined value, so only "string" and "int" keys are supported')) - ->addMoreInfo('field', $field) - ->addMoreInfo('model', $this) - ->addMoreInfo('value', $value) - ->addMoreInfo('values', $f->values); - } elseif (!array_key_exists($value, $f->values)) { - throw (new Exception('This is not one of the allowed values for the field')) - ->addMoreInfo('field', $field) - ->addMoreInfo('model', $this) - ->addMoreInfo('value', $value) - ->addMoreInfo('values', $f->values); - } - } - if (array_key_exists($field, $dirtyRef) && $f->compare($dirtyRef[$field], $value)) { unset($dirtyRef[$field]); } elseif (!array_key_exists($field, $dirtyRef)) { @@ -2001,6 +1974,39 @@ public function addCalculatedField(string $name, $expression) // }}} + protected function warnPropertyDoesNotExist(string $name): void + { + if (!isset($this->getHintableProps()[$name])) { + $this->__di_warnPropertyDoesNotExist($name); + } + } + + public function __isset(string $name): bool + { + return $this->__hintable_isset($name); + } + + /** + * @return mixed + */ + public function &__get(string $name) + { + return $this->__hintable_get($name); + } + + /** + * @param mixed $value + */ + public function __set(string $name, $value): void + { + $this->__hintable_set($name, $value); + } + + public function __unset(string $name): void + { + $this->__hintable_unset($name); + } + // {{{ Debug Methods /** diff --git a/src/Model/FieldPropertiesTrait.php b/src/Model/FieldPropertiesTrait.php index 1687fb5d4..2096bdc5e 100644 --- a/src/Model/FieldPropertiesTrait.php +++ b/src/Model/FieldPropertiesTrait.php @@ -22,7 +22,7 @@ trait FieldPropertiesTrait /** * For fields that can be selected, values can represent interpretation of the values, - * for instance ['F' => 'Female', 'M' => 'Male'];. + * for instance ['F' => 'Female', 'M' => 'Male']. * * @var array|null */ diff --git a/src/Model/Scope/AbstractScope.php b/src/Model/Scope/AbstractScope.php index c40e9e44e..a57ab016c 100644 --- a/src/Model/Scope/AbstractScope.php +++ b/src/Model/Scope/AbstractScope.php @@ -6,6 +6,7 @@ use Atk4\Core\InitializerTrait; use Atk4\Core\TrackableTrait; +use Atk4\Core\WarnDynamicPropertyTrait; use Atk4\Data\Exception; use Atk4\Data\Model; @@ -18,6 +19,7 @@ abstract class AbstractScope init as _init; } use TrackableTrait; + use WarnDynamicPropertyTrait; /** * Method is executed when the scope is added to parent scope using Scope::add(). diff --git a/src/Persistence.php b/src/Persistence.php index d66eb7cd2..a25fe6751 100644 --- a/src/Persistence.php +++ b/src/Persistence.php @@ -4,18 +4,23 @@ namespace Atk4\Data; +use Atk4\Core\ContainerTrait; +use Atk4\Core\DiContainerTrait; +use Atk4\Core\DynamicMethodTrait; use Atk4\Core\Factory; +use Atk4\Core\HookTrait; +use Atk4\Core\NameTrait; use Doctrine\DBAL\Platforms; abstract class Persistence { - use \Atk4\Core\ContainerTrait { + use ContainerTrait { add as _add; } - use \Atk4\Core\DiContainerTrait; - use \Atk4\Core\DynamicMethodTrait; - use \Atk4\Core\HookTrait; - use \Atk4\Core\NameTrait; + use DiContainerTrait; + use DynamicMethodTrait; + use HookTrait; + use NameTrait; /** @const string */ public const HOOK_AFTER_ADD = self::class . '@afterAdd'; @@ -103,7 +108,7 @@ protected function initPersistence(Model $m): void /** * Atomic executes operations within one begin/end transaction. Not all - * persistences will support atomic operations, so by default we just + * persistencies will support atomic operations, so by default we just * don't do anything. * * @return mixed @@ -174,10 +179,7 @@ public function typecastSaveRow(Model $model, array $row): array $field = $model->getField($fieldName); - // SQL Expression cannot be converted - if (!$value instanceof \Atk4\Data\Persistence\Sql\Expressionable) { - $value = $this->typecastSaveField($field, $value); - } + $value = $this->typecastSaveField($field, $value); // check null values for mandatory fields if ($value === null && $field->mandatory) { @@ -195,8 +197,12 @@ public function typecastSaveRow(Model $model, array $row): array * types to PHP native types. * * NOTE: Please DO NOT perform "actual" field mapping here, because data - * may be "aliased" from SQL persistences or mapped depending on persistence + * may be "aliased" from SQL persistencies or mapped depending on persistence * driver. + * + * @param array $row + * + * @return array */ public function typecastLoadRow(Model $model, array $row): array { @@ -232,16 +238,20 @@ public function typecastSaveField(Field $field, $value) return null; } + // SQL Expression cannot be converted + if ($value instanceof Persistence\Sql\Expressionable) { + return $value; + } + try { $v = $this->_typecastSaveField($field, $value); - if ($v !== null && !is_scalar($v) && !$v instanceof Persistence\Sql\Expressionable) { // @phpstan-ignore-line - throw (new Exception('Unexpected non-scalar value')) - ->addMoreInfo('type', get_debug_type($v)); + if ($v !== null && !is_scalar($v)) { // @phpstan-ignore-line + throw new Exception('Unexpected non-scalar value'); } return $v; } catch (\Exception $e) { - throw (new Exception('Unable to typecast field value on save', 0, $e)) + throw (new Exception('Typecast save error', 0, $e)) ->addMoreInfo('field', $field->short_name); } } @@ -250,7 +260,7 @@ public function typecastSaveField(Field $field, $value) * Cast specific field value from the way how it's stored inside * persistence to a PHP format. * - * @param mixed $value + * @param scalar|null $value * * @return mixed */ @@ -258,18 +268,14 @@ public function typecastLoadField(Field $field, $value) { if ($value === null) { return null; + } elseif (!is_scalar($value)) { + throw new Exception('Unexpected non-scalar value'); } try { - // 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 ($field->type && $field->type !== 'string' && $value === '') { - return null; - } - return $this->_typecastLoadField($field, $value); } catch (\Exception $e) { - throw (new Exception('Unable to typecast field value on load', 0, $e)) + throw (new Exception('Typecast parse error', 0, $e)) ->addMoreInfo('field', $field->short_name); } } @@ -280,152 +286,86 @@ public function typecastLoadField(Field $field, $value) * * @param mixed $value * - * @return scalar|Persistence\Sql\Expressionable|null + * @return scalar|null */ protected function _typecastSaveField(Field $field, $value) { - // work only on cloned value - $value = is_object($value) ? clone $value : $value; - - switch ($field->type) { - case 'boolean': - // if enum is not set, then simply cast value to boolean - if (!is_array($field->enum)) { - $value = (bool) $value; - - break; - } + if (in_array($field->type, ['json', 'object'], true) && $value === '') { // TODO remove later + return null; + } - // if enum is set, first lets see if it matches one of those precisely - if ($value === $field->enum[1]) { - $value = true; - } elseif ($value === $field->enum[0]) { - $value = false; - } + // native DBAL DT types have no microseconds support + if (in_array($field->type, ['datetime', 'date', 'time'], true) + && str_starts_with(get_class($field->getTypeObject()), 'Doctrine\DBAL\Types\\')) { + if ($value === '') { + return null; + } elseif (!$value instanceof \DateTimeInterface) { + throw new Exception('Must be instance of DateTimeInterface'); + } - // finally, convert into appropriate value - $value = $value ? $field->enum[1] : $field->enum[0]; - - break; - case 'date': - case 'datetime': - case 'time': - if ($value instanceof \DateTimeInterface) { - $format = ['date' => 'Y-m-d', 'datetime' => 'Y-m-d H:i:s.u', 'time' => 'H:i:s.u']; - $format = $field->persist_format ?: $format[$field->type]; - - // datetime only - set to persisting timezone - if ($field->type === 'datetime' && isset($field->persist_timezone)) { - $value = new \DateTime($value->format('Y-m-d H:i:s.u'), $value->getTimezone()); - $value->setTimezone(new \DateTimeZone($field->persist_timezone)); - } - $value = $value->format($format); - } + if ($field->type === 'datetime' && isset($field->persist_timezone)) { + $value = new \DateTime($value->format('Y-m-d H:i:s.u'), $value->getTimezone()); + $value->setTimezone(new \DateTimeZone($field->persist_timezone)); + } - break; - case 'array': - case 'object': - case 'json': - $value = $field->getTypeObject()->convertToDatabaseValue($value, $this->getDatabasePlatform()); // TODO typecast everything, not only this type + $formats = ['date' => 'Y-m-d', 'datetime' => 'Y-m-d H:i:s.u', 'time' => 'H:i:s.u']; + $format = $field->persist_format ?: $formats[$field->type]; + $value = $value->format($format); - break; + return $value; } - return $value; + return $field->getTypeObject()->convertToDatabaseValue($value, $this->getDatabasePlatform()); } /** * This is the actual field typecasting, which you can override in your * persistence to implement necessary typecasting. * - * @param mixed $value + * @param scalar|null $value * * @return mixed */ protected function _typecastLoadField(Field $field, $value) { - // work only on cloned value - $value = is_object($value) ? clone $value : $value; - - switch ($field->type) { - case 'string': - case 'text': - // do nothing - it's ok as it is - break; - case 'integer': - $value = (int) $value; - - break; - case 'float': - case 'atk4_money': - $value = (float) $value; - - break; - case 'boolean': - if (is_array($field->enum)) { - if ($value === $field->enum[0]) { - $value = false; - } elseif ($value === $field->enum[1]) { - $value = true; - } else { - $value = null; - } - } elseif ($value === '') { - $value = null; - } else { - $value = (bool) $value; - } - - break; - case 'date': - case 'datetime': - case 'time': - $dt_class = \DateTime::class; - $tz_class = \DateTimeZone::class; + // TODO casting optionally to null should be handled by type itself solely + if ($value === '' && in_array($field->type, ['boolean', 'integer', 'float', 'datetime', 'date', 'time', 'json', 'object'], true)) { + return null; + } + // native DBAL DT types have no microseconds support + if (in_array($field->type, ['datetime', 'date', 'time'], true) + && str_starts_with(get_class($field->getTypeObject()), 'Doctrine\DBAL\Types\\')) { + if ($field->persist_format) { + $format = $field->persist_format; + } else { // ! symbol in date format is essential here to remove time part of DateTime - don't remove, this is not a bug - $format = ['date' => '+!Y-m-d', 'datetime' => '+!Y-m-d H:i:s', 'time' => '+!H:i:s']; - if ($field->persist_format) { - $format = $field->persist_format; - } else { - $format = $format[$field->type]; - if (strpos($value, '.') !== false) { // time possibly with microseconds, otherwise invalid format - $format = preg_replace('~(?<=H:i:s)(?![. ]*u)~', '.u', $format); - } - } - - // datetime only - set from persisting timezone - if ($field->type === 'datetime' && isset($field->persist_timezone)) { - $value = $dt_class::createFromFormat($format, $value, new $tz_class($field->persist_timezone)); - if ($value !== false) { - $value->setTimezone(new $tz_class(date_default_timezone_get())); - } - } else { - $value = $dt_class::createFromFormat($format, $value); - } - - if ($value === false) { - throw (new Exception('Incorrectly formatted date/time')) - ->addMoreInfo('format', $format) - ->addMoreInfo('value', $value) - ->addMoreInfo('field', $field); + $formats = ['date' => '+!Y-m-d', 'datetime' => '+!Y-m-d H:i:s', 'time' => '+!H:i:s']; + $format = $formats[$field->type]; + if (strpos($value, '.') !== false) { // time possibly with microseconds, otherwise invalid format + $format = preg_replace('~(?<=H:i:s)(?![. ]*u)~', '.u', $format); } + } - // need to cast here because DateTime::createFromFormat returns DateTime object not $dt_class - // this is what Carbon::instance(DateTime $dt) method does for example - if ($dt_class !== \DateTime::class) { // @phpstan-ignore-line - $value = new $dt_class($value->format('Y-m-d H:i:s.u'), $value->getTimezone()); + if ($field->type === 'datetime' && isset($field->persist_timezone)) { + $value = \DateTime::createFromFormat($format, $value, new \DateTimeZone($field->persist_timezone)); + if ($value !== false) { + $value->setTimezone(new \DateTimeZone(date_default_timezone_get())); } + } else { + $value = \DateTime::createFromFormat($format, $value); + } - break; - case 'array': - case 'object': - case 'json': - $value = $field->getTypeObject()->convertToPHPValue($value, $this->getDatabasePlatform()); // TODO typecast everything, not only this type + if ($value === false) { + throw (new Exception('Incorrectly formatted date/time')) + ->addMoreInfo('format', $format) + ->addMoreInfo('value', $value) + ->addMoreInfo('field', $field); + } - break; + return $value; } - return $value; + return $field->getTypeObject()->convertToPHPValue($value, $this->getDatabasePlatform()); } } diff --git a/src/Persistence/Array_/Db/Table.php b/src/Persistence/Array_/Db/Table.php index bcc9e3f1d..8bf0632d7 100644 --- a/src/Persistence/Array_/Db/Table.php +++ b/src/Persistence/Array_/Db/Table.php @@ -46,7 +46,7 @@ protected function assertValidIdentifier($name): void protected function assertValidValue($value): void { if ($value instanceof self || $value instanceof Row) { - throw new Exception('Value can not be an ' . get_class($value) . ' object'); + throw new Exception('Value cannot be an ' . get_class($value) . ' object'); } elseif (!is_scalar($value) && $value !== null) { throw (new Exception('Value must be scalar')) ->addMoreInfo('value', $value); diff --git a/src/Persistence/Csv.php b/src/Persistence/Csv.php index b9ef0a582..45a58b070 100644 --- a/src/Persistence/Csv.php +++ b/src/Persistence/Csv.php @@ -109,7 +109,7 @@ public function openFile(string $mode = 'r'): void if (!$this->handle) { $this->handle = fopen($this->file, $mode); if ($this->handle === false) { - throw (new Exception('Can not open CSV file.')) + throw (new Exception('Cannot open CSV file.')) ->addMoreInfo('file', $this->file) ->addMoreInfo('mode', $mode); } @@ -150,7 +150,7 @@ public function putLine(array $data): void { $ok = fputcsv($this->handle, $data, $this->delimiter, $this->enclosure, $this->escape_char); if ($ok === false) { - throw new Exception('Can not write to CSV file.'); + throw new Exception('Cannot write to CSV file.'); } } diff --git a/src/Persistence/Sql.php b/src/Persistence/Sql.php index 1407cc25a..b0eaaddec 100644 --- a/src/Persistence/Sql.php +++ b/src/Persistence/Sql.php @@ -187,7 +187,7 @@ protected function initPersistence(Model $model): void return $m->persistence->expr($m, ...$args); }); $model->addMethod('dsql', static function (Model $m, ...$args) { - return $m->persistence->dsql($m, ...$args); + return $m->persistence->dsql($m, ...$args); // @phpstan-ignore-line }); $model->addMethod('exprNow', static function (Model $m, ...$args) { return $m->persistence->exprNow($m, ...$args); diff --git a/src/Persistence/Sql/Connection.php b/src/Persistence/Sql/Connection.php index 5a4440367..a705dc916 100644 --- a/src/Persistence/Sql/Connection.php +++ b/src/Persistence/Sql/Connection.php @@ -4,6 +4,7 @@ namespace Atk4\Data\Persistence\Sql; +use Atk4\Core\DiContainerTrait; use Doctrine\DBAL\Connection as DbalConnection; use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\Platforms\AbstractPlatform; @@ -17,7 +18,7 @@ */ abstract class Connection { - use \Atk4\Core\DiContainerTrait; + use DiContainerTrait; /** @var string Query classname */ protected $query_class = Query::class; diff --git a/src/Persistence/Sql/Expression.php b/src/Persistence/Sql/Expression.php index 2475a71bf..01faae2cf 100644 --- a/src/Persistence/Sql/Expression.php +++ b/src/Persistence/Sql/Expression.php @@ -4,6 +4,7 @@ namespace Atk4\Data\Persistence\Sql; +use Atk4\Core\WarnDynamicPropertyTrait; use Doctrine\DBAL\Connection as DbalConnection; use Doctrine\DBAL\Exception as DbalException; use Doctrine\DBAL\Platforms\PostgreSQL94Platform; @@ -14,6 +15,8 @@ */ class Expression implements Expressionable, \ArrayAccess { + use WarnDynamicPropertyTrait; + /** @const string "[]" in template, escape as parameter */ protected const ESCAPE_PARAM = 'param'; /** @const string "{}" in template, escape as identifier */ diff --git a/src/Persistence/Sql/Oracle/Connection.php b/src/Persistence/Sql/Oracle/Connection.php index 4a05d316a..f75c3a105 100644 --- a/src/Persistence/Sql/Oracle/Connection.php +++ b/src/Persistence/Sql/Oracle/Connection.php @@ -40,7 +40,7 @@ protected static function connectDbalConnection(array $dsn) // TODO remove once atk4/data tests can be run consistently without errors if (class_exists(\PHPUnit\Framework\TestCase::class, false)) { // called from phpunit $notReusableFunc = function (string $message): void { - echo "\n" . 'connection for CI can not be reused:' . "\n" . $message . "\n"; + echo "\n" . 'connection for CI cannot be reused:' . "\n" . $message . "\n"; self::$ciLastConnectPdo = null; }; diff --git a/src/Persistence/Sql/Query.php b/src/Persistence/Sql/Query.php index 0a71910a0..8e8add46e 100644 --- a/src/Persistence/Sql/Query.php +++ b/src/Persistence/Sql/Query.php @@ -1200,7 +1200,7 @@ public function mode($mode) { $prop = 'template_' . $mode; - if (isset($this->{$prop})) { + if (@isset($this->{$prop})) { // @ is needed to pass phpunit without a deprecation warning $this->mode = $mode; $this->template = $this->{$prop}; } else { diff --git a/src/Reference.php b/src/Reference.php index efe64e1db..b1c844a85 100644 --- a/src/Reference.php +++ b/src/Reference.php @@ -4,7 +4,10 @@ namespace Atk4\Data; +use Atk4\Core\DiContainerTrait; use Atk4\Core\Factory; +use Atk4\Core\InitializerTrait; +use Atk4\Core\TrackableTrait; /** * Reference implements a link between one model and another. The basic components for @@ -17,11 +20,11 @@ */ class Reference { - use \Atk4\Core\DiContainerTrait; - use \Atk4\Core\InitializerTrait { + use DiContainerTrait; + use InitializerTrait { init as _init; } - use \Atk4\Core\TrackableTrait; + use TrackableTrait; /** * Use this alias for related entity by default. This can help you diff --git a/src/Schema/TestCase.php b/src/Schema/TestCase.php index 5a30633a5..2804cec13 100644 --- a/src/Schema/TestCase.php +++ b/src/Schema/TestCase.php @@ -112,7 +112,7 @@ public function createMigrator(Model $model = null): Migration */ public function dropTableIfExists(string $tableName): self { - // we can not use SchemaManager::dropTable directly because of + // we cannot use SchemaManager::dropTable directly because of // our custom Oracle sequence for PK/AI $this->createMigrator()->table($tableName)->dropIfExists(); diff --git a/src/Util/DeepCopy.php b/src/Util/DeepCopy.php index 28ba6a2ed..d158d1c4d 100644 --- a/src/Util/DeepCopy.php +++ b/src/Util/DeepCopy.php @@ -4,6 +4,7 @@ namespace Atk4\Data\Util; +use Atk4\Core\DebugTrait; use Atk4\Data\Model; use Atk4\Data\Reference\HasMany; use Atk4\Data\Reference\HasOne; @@ -20,7 +21,7 @@ */ class DeepCopy { - use \Atk4\Core\DebugTrait; + use DebugTrait; /** @const string */ public const HOOK_AFTER_COPY = self::class . '@afterCopy'; diff --git a/src/ValidationException.php b/src/ValidationException.php index 0132dda9c..380962faa 100644 --- a/src/ValidationException.php +++ b/src/ValidationException.php @@ -18,7 +18,7 @@ class ValidationException extends Exception public function __construct(array $errors, Model $model = null, $intent = null) { if (count($errors) === 0) { - throw new Exception('Incorrect use of ValidationException, at least one error must be given'); + throw new Exception('At least one error must be given'); } $this->errors = $errors; diff --git a/tests/ContainsManyTest.php b/tests/ContainsManyTest.php index 7c767df85..9c6030afa 100644 --- a/tests/ContainsManyTest.php +++ b/tests/ContainsManyTest.php @@ -267,7 +267,7 @@ public function testNestedContainsMany(): void 1 => [ $i->lines->fieldName()->id => 1, $i->lines->fieldName()->vat_rate_id => 1, - $i->lines->fieldName()->price => 10, + $i->lines->fieldName()->price => '10', $i->lines->fieldName()->qty => 2, $i->lines->fieldName()->add_date => $formatDtForCompareFunc(new \DateTime('2019-06-01')), $i->lines->fieldName()->discounts => json_encode([ @@ -286,7 +286,7 @@ public function testNestedContainsMany(): void 2 => [ $i->lines->fieldName()->id => 2, $i->lines->fieldName()->vat_rate_id => 2, - $i->lines->fieldName()->price => 15, + $i->lines->fieldName()->price => '15', $i->lines->fieldName()->qty => 5, $i->lines->fieldName()->add_date => $formatDtForCompareFunc(new \DateTime('2019-07-01')), $i->lines->fieldName()->discounts => json_encode([ diff --git a/tests/FieldTest.php b/tests/FieldTest.php index 26f136129..a81f4e28a 100644 --- a/tests/FieldTest.php +++ b/tests/FieldTest.php @@ -499,7 +499,6 @@ public function testNormalize(): void $m->addField('money', ['type' => 'atk4_money']); $m->addField('float', ['type' => 'float']); $m->addField('boolean', ['type' => 'boolean']); - $m->addField('boolean_enum', ['type' => 'boolean', 'enum' => ['N', 'Y']]); $m->addField('date', ['type' => 'date']); $m->addField('datetime', ['type' => 'datetime']); $m->addField('time', ['type' => 'time']); @@ -542,11 +541,6 @@ public function testNormalize(): void $this->assertFalse($m->get('boolean')); $m->set('boolean', 1); $this->assertTrue($m->get('boolean')); - - $m->set('boolean_enum', 'N'); - $this->assertFalse($m->get('boolean_enum')); - $m->set('boolean_enum', 'Y'); - $this->assertTrue($m->get('boolean_enum')); } public function testNormalizeException1(): void @@ -685,7 +679,6 @@ public function testToString(): void $m->addField('money', ['type' => 'atk4_money']); $m->addField('float', ['type' => 'float']); $m->addField('boolean', ['type' => 'boolean']); - $m->addField('boolean_enum', ['type' => 'boolean', 'enum' => ['N', 'Y']]); $m->addField('date', ['type' => 'date']); $m->addField('datetime', ['type' => 'datetime']); $m->addField('time', ['type' => 'time']); @@ -700,8 +693,6 @@ public function testToString(): void $this->assertSame('123.456789', $m->getField('float')->toString(123.456789)); $this->assertSame('1', $m->getField('boolean')->toString(true)); $this->assertSame('0', $m->getField('boolean')->toString(false)); - $this->assertSame('1', $m->getField('boolean_enum')->toString('Y')); - $this->assertSame('0', $m->getField('boolean_enum')->toString('N')); $this->assertSame('2019-01-20', $m->getField('date')->toString(new \DateTime('2019-01-20T12:23:34 UTC'))); $this->assertSame('2019-01-20 12:23:34.000000', $m->getField('datetime')->toString(new \DateTime('2019-01-20 12:23:34 UTC'))); $this->assertSame('12:23:34.000000', $m->getField('time')->toString(new \DateTime('2019-01-20 12:23:34 UTC'))); @@ -817,40 +808,16 @@ public function testSetNull(): void public function testBoolean(): void { $m = new Model(); - $m->addField('is_vip_1', ['type' => 'boolean', 'enum' => ['No', 'Yes']]); - $m->addField('is_vip_2', ['type' => 'boolean', 'valueTrue' => 1, 'valueFalse' => 0]); - $m->addField('is_vip_3', ['type' => 'boolean', 'valueTrue' => 'Y', 'valueFalse' => 'N']); - $m = $m->createEntity(); - - $m->set('is_vip_1', 'No'); - $this->assertFalse($m->get('is_vip_1')); - $m->set('is_vip_1', 'Yes'); - $this->assertTrue($m->get('is_vip_1')); - $m->set('is_vip_1', false); - $this->assertFalse($m->get('is_vip_1')); - $m->set('is_vip_1', true); - $this->assertTrue($m->get('is_vip_1')); - $m->set('is_vip_1', 0); - $this->assertFalse($m->get('is_vip_1')); - $m->set('is_vip_1', 1); - $this->assertTrue($m->get('is_vip_1')); - - $m->set('is_vip_2', 0); - $this->assertFalse($m->get('is_vip_2')); - $m->set('is_vip_2', 1); - $this->assertTrue($m->get('is_vip_2')); - $m->set('is_vip_2', false); - $this->assertFalse($m->get('is_vip_2')); - $m->set('is_vip_2', true); - $this->assertTrue($m->get('is_vip_2')); - - $m->set('is_vip_3', 'N'); - $this->assertFalse($m->get('is_vip_3')); - $m->set('is_vip_3', 'Y'); - $this->assertTrue($m->get('is_vip_3')); - $m->set('is_vip_3', false); - $this->assertFalse($m->get('is_vip_3')); - $m->set('is_vip_3', true); - $this->assertTrue($m->get('is_vip_3')); + $m->addField('is_vip', ['type' => 'boolean']); + $m = $m->createEntity(); + + $m->set('is_vip', false); + $this->assertFalse($m->get('is_vip')); + $m->set('is_vip', true); + $this->assertTrue($m->get('is_vip')); + $m->set('is_vip', 0); + $this->assertFalse($m->get('is_vip')); + $m->set('is_vip', 1); + $this->assertTrue($m->get('is_vip')); } } diff --git a/tests/LocaleTest.php b/tests/LocaleTest.php deleted file mode 100644 index 49d720b29..000000000 --- a/tests/LocaleTest.php +++ /dev/null @@ -1,53 +0,0 @@ -expectException(Exception::class); - $exc = new Locale(); - } - - public function testGetPath(): void - { - $rootDir = realpath(dirname(__DIR__) . '/src/..'); - $this->assertSame($rootDir . \DIRECTORY_SEPARATOR . 'locale', realpath(Locale::getPath())); - } - - public function testLocaleIntegration(): void - { - $trans = Translator::instance(); - $trans->setDefaultLocale('ru'); - - $p = new Persistence\Array_([ - 'user' => [ - 1 => ['name' => 'John', 'surname' => 'Smith'], - 2 => ['name' => 'Sarah', 'surname' => 'Jones'], - ], - ]); - - try { - $m = new Model($p, ['table' => 'user']); - $m->addField('name'); - $m->addField('surname'); - $m = $m->load(4); - } catch (Exception $e) { - $this->assertStringContainsString('Запись', json_decode($e->getJson(), true)['message']); - - return; - } - - $this->fail('Expected exception'); - } -} diff --git a/tests/Persistence/Sql/ExpressionTest.php b/tests/Persistence/Sql/ExpressionTest.php index 1335fcbb2..db4f8f67a 100644 --- a/tests/Persistence/Sql/ExpressionTest.php +++ b/tests/Persistence/Sql/ExpressionTest.php @@ -487,7 +487,7 @@ public function testArrayAccess(): void */ public function testIteratorAggregate(): void { - // TODO can not test this without actual DB connection and executing expression + // TODO cannot test this without actual DB connection and executing expression } /** diff --git a/tests/TypecastingTest.php b/tests/TypecastingTest.php index 78334d594..a642757d4 100644 --- a/tests/TypecastingTest.php +++ b/tests/TypecastingTest.php @@ -245,8 +245,8 @@ public function testTypeCustom1(): void 'date' => '2013-02-20', 'datetime' => '2013-02-20 20:00:12.235689', 'time' => '12:00:50.235689', - 'b1' => 'Y', - 'b2' => 'N', + 'b1' => '1', + 'b2' => '0', 'integer' => '2940', 'money' => '8.20', 'float' => '8.202343', @@ -263,8 +263,8 @@ public function testTypeCustom1(): void $m->addField('date', ['type' => 'date']); $m->addField('datetime', ['type' => 'datetime']); $m->addField('time', ['type' => 'time']); - $m->addField('b1', ['type' => 'boolean', 'enum' => ['N', 'Y']]); - $m->addField('b2', ['type' => 'boolean', 'enum' => ['N', 'Y']]); + $m->addField('b1', ['type' => 'boolean']); + $m->addField('b2', ['type' => 'boolean']); $m->addField('money', ['type' => 'atk4_money']); $m->addField('float', ['type' => 'float']); $m->addField('integer', ['type' => 'integer']); @@ -377,16 +377,6 @@ public function testLoadBy(): void $this->assertTrue($m2->loaded()); } - public function testTypecastBoolean(): void - { - $db = new Persistence\Sql($this->db->connection); - $m = new Model($db, ['table' => 'job']); - - $f = $m->addField('closed', ['type' => 'boolean', 'enum' => ['N', 'Y']]); - - $this->assertSame('N', $db->typecastSaveField($f, 'N')); - } - public function testTypecastTimezone(): void { $db = new Persistence\Sql($this->db->connection);