Merge branch '0.4' into 1

code/TestPage.php

@@ -50,7 +50,7 @@ class TestPage extends Page implements \TestPageInterface
                 $parent = static::getOrCreateParentPage();
                 $page->ParentID = $parent->ID;
                 $page->write();
-                $page->publish('Stage', 'Live');
+                $page->copyVersionToStage('Stage', 'Live');
             });
         }
     }
@@ -72,7 +72,7 @@ class TestPage extends Page implements \TestPageInterface
                     )
                 );
                 $parent->write();
-                $parent->doPublish();
+                $parent->publishRecursive();
             }
         });
 

code/TestRegistryPage.php

@@ -21,7 +21,7 @@ class TestRegistryPage extends RegistryPage
                 $page->ParentID = $parent->ID;
                 $page->DataClass = TestRegistryDataObject::class;
                 $page->write();
-                $page->publish('Stage', 'Live');
+                $page->copyVersionToStage('Stage', 'Live');
             });
         }
     }

code/fields/GridFieldTestNavigation.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace SilverStripe\FrameworkTest\Fields\Admin;
+
+use SilverStripe\Admin\ModelAdmin;
+use SilverStripe\FrameworkTest\Model\Company;
+
+class GridFieldTestNavigation extends ModelAdmin
+{
+    private static string $url_segment = 'gridfield-test-navigation';
+    private static string $menu_title = 'GridField Test Navigation';
+    private static string $menu_icon_class = 'font-icon-block-banner';
+
+    private static array $managed_models = [
+        Company::class,
+    ];
+
+    private static $page_length = 5;
+}

code/tasks/FTPageMakerTask.php

@@ -82,7 +82,7 @@ class FTPageMakerTask extends BuildTask
             $page->ParentID = $parentID;
             $page->Title = "Test page {$fullPrefix}";
             $page->write();
-            $page->publish('Stage', 'Live');
+            $page->copyVersionToStage('Stage', 'Live');
 
             echo "Created '$page->Title' ($page->ClassName)\n";