Merge branch '5.1' into 5

code/Controllers/ModelAsController.php

@@ -104,20 +104,22 @@ class ModelAsController extends Controller implements NestedController
     public function getNestedController(): ContentController
     {
         $request = $this->getRequest();
+        $urlSegment = $request->param('URLSegment');
 
-        if (!$URLSegment = $request->param('URLSegment')) {
+        if ($urlSegment === false || $urlSegment === null || $urlSegment === '') {
             throw new Exception('ModelAsController->getNestedController(): was not passed a URLSegment value.');
         }
 
         // url encode unless it's multibyte (already pre-encoded in the database)
         $filter = URLSegmentFilter::create();
+
         if (!$filter->getAllowMultibyte()) {
-            $URLSegment = rawurlencode($URLSegment ?? '');
+            $urlSegment = rawurlencode($urlSegment ?? '');
         }
 
         // Select child page
         $tableName = DataObject::singleton(SiteTree::class)->baseTable();
-        $conditions = [sprintf('"%s"."URLSegment"', $tableName) => $URLSegment];
+        $conditions = [sprintf('"%s"."URLSegment"', $tableName) => $urlSegment];
         if (SiteTree::config()->get('nested_urls')) {
             $conditions[] = [sprintf('"%s"."ParentID"', $tableName) => 0];
         }

code/Model/SiteTree.php

@@ -465,7 +465,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
         $parentIDExpr = sprintf('"%s"."ParentID"', $tableName);
 
         $link = trim(Director::makeRelative($link) ?? '', '/');
-        if (!$link) {
+        if ($link === false || $link === null || $link === '') {
             $link = RootURLController::get_homepage_link();
         }
 
@@ -1645,6 +1645,11 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
         }
     }
 
+    private function hasURLSegment(): bool
+    {
+        return $this->URLSegment !== false && $this->URLSegment !== null && $this->URLSegment !== '';
+    }
+
     protected function onBeforeWrite()
     {
         parent::onBeforeWrite();
@@ -1665,7 +1670,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
             'New {pagetype}',
             ['pagetype' => $this->i18n_singular_name()]
         ));
-        if ((!$this->URLSegment || $this->URLSegment == $defaultSegment) && $this->Title) {
+        if ((!$this->hasURLSegment() || $this->URLSegment == $defaultSegment) && $this->Title) {
             $this->URLSegment = $this->generateURLSegment($this->Title);
         } elseif ($this->isChanged('URLSegment', 2)) {
             // Do a strict check on change level, to avoid double encoding caused by
@@ -1673,7 +1678,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
             $filter = URLSegmentFilter::create();
             $this->URLSegment = $filter->filter($this->URLSegment);
             // If after sanitising there is no URLSegment, give it a reasonable default
-            if (!$this->URLSegment) {
+            if (!$this->hasURLSegment()) {
                 $this->URLSegment = "page-$this->ID";
             }
         }

tests/php/Model/SiteTreeTest.php

@@ -131,6 +131,7 @@ class SiteTreeTest extends SapphireTest
             'object'   => 'object',
             'controller' => 'controller',
             'numericonly' => '1930',
+            'numeric0' => '0',
         ];
 
         foreach ($expectedURLs as $fixture => $urlSegment) {
@@ -467,6 +468,7 @@ class SiteTreeTest extends SapphireTest
         $about    = $this->objFromFixture(SiteTree::class, 'about');
         $staff    = $this->objFromFixture(SiteTree::class, 'staff');
         $product  = $this->objFromFixture(SiteTree::class, 'product1');
+        $numeric0 = $this->objFromFixture(SiteTree::class, 'numeric0');
 
         SiteTree::config()->nested_urls = false;
 
@@ -475,6 +477,7 @@ class SiteTreeTest extends SapphireTest
         $this->assertEquals($about->ID, SiteTree::get_by_link($about->Link(), false)->ID);
         $this->assertEquals($staff->ID, SiteTree::get_by_link($staff->Link(), false)->ID);
         $this->assertEquals($product->ID, SiteTree::get_by_link($product->Link(), false)->ID);
+        $this->assertEquals($numeric0->ID, SiteTree::get_by_link($numeric0->Link(), false)->ID);
 
         Config::modify()->set(SiteTree::class, 'nested_urls', true);
 
@@ -483,6 +486,7 @@ class SiteTreeTest extends SapphireTest
         $this->assertEquals($about->ID, SiteTree::get_by_link($about->Link(), false)->ID);
         $this->assertEquals($staff->ID, SiteTree::get_by_link($staff->Link(), false)->ID);
         $this->assertEquals($product->ID, SiteTree::get_by_link($product->Link(), false)->ID);
+        $this->assertEquals($numeric0->ID, SiteTree::get_by_link($numeric0->Link(), false)->ID);
 
         $this->assertEquals(
             $staff->ID,
@@ -497,6 +501,7 @@ class SiteTreeTest extends SapphireTest
         $about = $this->objFromFixture(SiteTree::class, 'about');
         $staff = $this->objFromFixture(SiteTree::class, 'staff');
         $product = $this->objFromFixture(SiteTree::class, 'product1');
+        $numeric0 = $this->objFromFixture(SiteTree::class, 'numeric0');
 
         $base = 'https://example.test/';
         $this->assertEquals($home->ID, SiteTree::get_by_link(Controller::join_links($base, '/'), false)->ID);
@@ -504,12 +509,14 @@ class SiteTreeTest extends SapphireTest
         $this->assertEquals($about->ID, SiteTree::get_by_link(Controller::join_links($base, $about->Link()), false)->ID);
         $this->assertEquals($staff->ID, SiteTree::get_by_link(Controller::join_links($base, $staff->Link()), false)->ID);
         $this->assertEquals($product->ID, SiteTree::get_by_link(Controller::join_links($base, $product->Link()), false)->ID);
+        $this->assertEquals($numeric0->ID, SiteTree::get_by_link(Controller::join_links($base, $numeric0->Link()), false)->ID);
     }
 
     public function testRelativeLink()
     {
         $about = $this->objFromFixture(SiteTree::class, 'about');
         $staff = $this->objFromFixture(SiteTree::class, 'staff');
+        $numeric0 = $this->objFromFixture(SiteTree::class, 'numeric0');
 
         Config::modify()->set(SiteTree::class, 'nested_urls', true);
 
@@ -523,6 +530,7 @@ class SiteTreeTest extends SapphireTest
             $staff->RelativeLink(),
             'Matches URLSegment plus parent on second level without parameters'
         );
+        $this->assertEquals('0/', $numeric0->RelativeLink(), 'Matches URLSegment for segment = 0');
         $this->assertEquals(
             'about-us/edit',
             $about->RelativeLink('edit'),

tests/php/Model/SiteTreeTest.yml

@@ -112,6 +112,9 @@ SilverStripe\CMS\Model\SiteTree:
   breadcrumbs5:
     Title: 'Breadcrumbs 5'
     Parent: =>SilverStripe\CMS\Model\SiteTree.breadcrumbs4
+  numeric0:
+    Title: 'urlsegment is 0'
+    URLSegment: '0'
 
 SilverStripe\CMS\Tests\Model\SiteTreeTest_Conflicted:
   parent: