Merge 4631aa0067 into 6bb9a0b33d

src/Control/Controller.php

@@ -627,8 +627,9 @@ 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): string
+    public static function join_links($arg = null)
     {
         if (func_num_args() === 1 && is_array($arg)) {
             $args = $arg;

tests/php/ORM/DBEnumTest.php

@@ -179,18 +179,10 @@ class DBEnumTest extends SapphireTest
     public function testSaveDefaultValue()
     {
         $obj = new FieldType\DBEnumTestObject();
+        $obj->Colour = null;
         $id = $obj->write();
         // Fetch the object from the database
-        $obj = FieldType\DBEnumTestObject::get()->byID($id);
-        $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);
+        $colour = FieldType\DBEnumTestObject::get()->byID($id)->Colour;
+        $this->assertEquals('Red', $colour);
     }
 }

tests/php/ORM/FieldType/DBEnumTestObject.php

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