Skip to content

Commit

Permalink
Merge pull request #11427 from creative-commoners/pulls/5/field-valid…
Browse files Browse the repository at this point in the history
…ator-depr

API Add deprecation
GuySartorelli authored Oct 20, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
wkloucek Willy Kloucek
2 parents ebbd642 + 8ec068f commit 969d7b4
Showing 4 changed files with 10 additions and 6 deletions.
5 changes: 3 additions & 2 deletions src/ORM/FieldType/DBBoolean.php
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@ class DBBoolean extends DBField
{
public function __construct($name = null, $defaultVal = 0)
{
$this->defaultVal = ($defaultVal) ? 1 : 0;
$defaultValue = $defaultVal ? 1 : 0;
$this->setDefaultValue($defaultValue);

parent::__construct($name);
}
@@ -25,7 +26,7 @@ public function requireField()
'precision' => 1,
'sign' => 'unsigned',
'null' => 'not null',
'default' => $this->defaultVal,
'default' => $this->getDefaultValue(),
'arrayValue' => $this->arrayValue
];
$values = ['type' => 'boolean', 'parts' => $parts];
1 change: 1 addition & 0 deletions src/ORM/FieldType/DBField.php
Original file line number Diff line number Diff line change
@@ -122,6 +122,7 @@ abstract class DBField extends ViewableData implements DBIndexable
* @var $default mixed Default-value in the database.
* Might be overridden on DataObject-level, but still useful for setting defaults on
* already existing records after a db-build.
* @deprecated 5.4.0 Use getDefaultValue() and setDefaultValue() instead
*/
protected $defaultVal;

5 changes: 3 additions & 2 deletions src/ORM/FieldType/DBFloat.php
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@ class DBFloat extends DBField

public function __construct($name = null, $defaultVal = 0)
{
$this->defaultVal = is_float($defaultVal) ? $defaultVal : (float) 0;
$defaultValue = is_float($defaultVal) ? $defaultVal : (float) 0;
$this->setDefaultValue($defaultValue);

parent::__construct($name);
}
@@ -23,7 +24,7 @@ public function requireField()
$parts = [
'datatype' => 'float',
'null' => 'not null',
'default' => $this->defaultVal,
'default' => $this->getDefaultValue(),
'arrayValue' => $this->arrayValue
];
$values = ['type' => 'float', 'parts' => $parts];
5 changes: 3 additions & 2 deletions src/ORM/FieldType/DBInt.php
Original file line number Diff line number Diff line change
@@ -15,7 +15,8 @@ class DBInt extends DBField

public function __construct($name = null, $defaultVal = 0)
{
$this->defaultVal = is_int($defaultVal) ? $defaultVal : 0;
$defaultValue = is_int($defaultVal) ? $defaultVal : 0;
$this->setDefaultValue($defaultValue);

parent::__construct($name);
}
@@ -43,7 +44,7 @@ public function requireField()
'datatype' => 'int',
'precision' => 11,
'null' => 'not null',
'default' => $this->defaultVal,
'default' => $this->getDefaultValue(),
'arrayValue' => $this->arrayValue
];
$values = ['type' => 'int', 'parts' => $parts];

0 comments on commit 969d7b4

Please sign in to comment.