Merge baeaef4b61 into ebbd6427b2

src/ORM/FieldType/DBBoolean.php

@@ -13,8 +13,7 @@ class DBBoolean extends DBField
 {
     public function __construct($name = null, $defaultVal = 0)
     {
-        $defaultValue = $defaultVal ? 1 : 0;
+        $this->defaultVal = ($defaultVal) ? 1 : 0;
-        $this->setDefaultValue($defaultValue);
 
         parent::__construct($name);
     }
@@ -26,7 +25,7 @@ class DBBoolean extends DBField
             'precision' => 1,
             'sign' => 'unsigned',
             'null' => 'not null',
-            'default' => $this->getDefaultValue(),
+            'default' => $this->defaultVal,
             'arrayValue' => $this->arrayValue
         ];
         $values = ['type' => 'boolean', 'parts' => $parts];

src/ORM/FieldType/DBField.php

@@ -122,7 +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
+     * @deprecated 5.4.0 Call setDefaultValue() in constructor instead
      */
     protected $defaultVal;
 

src/ORM/FieldType/DBFloat.php

@@ -13,8 +13,7 @@ class DBFloat extends DBField
 
     public function __construct($name = null, $defaultVal = 0)
     {
-        $defaultValue = is_float($defaultVal) ? $defaultVal : (float) 0;
+        $this->defaultVal = is_float($defaultVal) ? $defaultVal : (float) 0;
-        $this->setDefaultValue($defaultValue);
 
         parent::__construct($name);
     }
@@ -24,7 +23,7 @@ class DBFloat extends DBField
         $parts = [
             'datatype' => 'float',
             'null' => 'not null',
-            'default' => $this->getDefaultValue(),
+            'default' => $this->defaultVal,
             'arrayValue' => $this->arrayValue
         ];
         $values = ['type' => 'float', 'parts' => $parts];

src/ORM/FieldType/DBInt.php

@@ -15,8 +15,7 @@ class DBInt extends DBField
 
     public function __construct($name = null, $defaultVal = 0)
     {
-        $defaultValue = is_int($defaultVal) ? $defaultVal : 0;
+        $this->defaultVal = is_int($defaultVal) ? $defaultVal : 0;
-        $this->setDefaultValue($defaultValue);
 
         parent::__construct($name);
     }
@@ -44,7 +43,7 @@ class DBInt extends DBField
             'datatype' => 'int',
             'precision' => 11,
             'null' => 'not null',
-            'default' => $this->getDefaultValue(),
+            'default' => $this->defaultVal,
             'arrayValue' => $this->arrayValue
         ];
         $values = ['type' => 'int', 'parts' => $parts];