Merge 00fd636f71 into 666b4094b4

src/Control/Controller.php

@@ -627,9 +627,8 @@ class Controller extends RequestHandler implements TemplateGlobalProvider
      * Caution: All parameters are expected to be URI-encoded already.
      *
      * @param string|array $arg One or more link segments, or list of link segments as an array
-     * @return string
      */
-    public static function join_links($arg = null)
+    public static function join_links($arg = null): string
     {
         if (func_num_args() === 1 && is_array($arg)) {
             $args = $arg;

tests/php/ORM/DBEnumTest.php

@@ -179,10 +179,18 @@ class DBEnumTest extends SapphireTest
     public function testSaveDefaultValue()
     {
         $obj = new FieldType\DBEnumTestObject();
-        $obj->Colour = null;
         $id = $obj->write();
         // Fetch the object from the database
-        $colour = FieldType\DBEnumTestObject::get()->byID($id)->Colour;
+        $obj = FieldType\DBEnumTestObject::get()->byID($id);
-        $this->assertEquals('Red', $colour);
+        $this->assertEquals('Red', $obj->Colour);
+        $this->assertEquals('Blue', $obj->ColourWithDefault);
+        // Set value to null and save
+        $obj->Colour = null;
+        $obj->ColourWithDefault = null;
+        $obj->write();
+        // Fetch the object from the database
+        $obj = FieldType\DBEnumTestObject::get()->byID($id);
+        $this->assertEquals(null, $obj->Colour);
+        $this->assertEquals(null, $obj->ColourWithDefault);
     }
 }

tests/php/ORM/FieldType/DBEnumTestObject.php

@@ -11,5 +11,6 @@ class DBEnumTestObject extends DataObject
 
     private static $db = [
         'Colour' => 'Enum("Red,Blue,Green")',
+        'ColourWithDefault' => 'Enum("Red,Blue,Green","Blue")',
     ];
 }