diff --git a/_config.php b/_config.php index 52b57cdc43..0fb43491fc 100644 --- a/_config.php +++ b/_config.php @@ -32,7 +32,6 @@ [SiteTree::class, 'link_shortcode_handler'] ); -// TODO Remove once we can configure CMSMenu through static, nested configuration files CMSMenu::remove_menu_class(CMSMain::class); CMSMenu::remove_menu_class(CMSPageEditController::class); CMSMenu::remove_menu_class(CMSPageSettingsController::class); diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php index a82b7cb4de..8dc694bbd9 100644 --- a/code/Controllers/CMSMain.php +++ b/code/Controllers/CMSMain.php @@ -80,8 +80,6 @@ * This class creates a 2-frame layout - left-tree and right-form - to sit beneath the main * admin menu. * - * @todo Create some base classes to contain the generic functionality that will be replicated. - * * @mixin LeftAndMainPageIconsExtension */ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionProvider, Flushable, MemberCacheFlusher @@ -702,7 +700,6 @@ public function updatetreenodes(HTTPRequest $request): HTTPResponse $markingSet->markUnexpanded($record); // Find the next & previous nodes, for proper positioning (Sort isn't good enough - it's not a raw offset) - // TODO: These methods should really be in hierarchy - for a start it assumes Sort exists $prev = null; $className = $this->config()->get('tree_class'); @@ -1372,7 +1369,6 @@ public function getEditForm($id = null, $fields = null) } } - // TODO Can't merge $FormAttributes in template at the moment $form->addExtraClass('center ' . $this->BaseCSSClasses()); // Set validation exemptions for specific actions $form->setValidationExemptActions([ @@ -1768,7 +1764,6 @@ public function save(array $data, Form $form): HTTPResponse return Security::permissionFailure($this); } - // TODO Coupling to SiteTree $record->HasBrokenLink = 0; $record->HasBrokenFile = 0; diff --git a/code/Controllers/CMSPageAddController.php b/code/Controllers/CMSPageAddController.php index c058946a6d..87a236e85e 100644 --- a/code/Controllers/CMSPageAddController.php +++ b/code/Controllers/CMSPageAddController.php @@ -132,10 +132,6 @@ public function AddForm() ]); }); - // TODO Re-enable search once it allows for HTML title display, - // see http://open.silverstripe.org/ticket/7455 - // $parentField->setShowSearch(true); - $parentModeField->addExtraClass('parent-mode'); // CMSMain->currentPageID() automatically sets the homepage, diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php index ac0107dfca..d4c6ca5640 100644 --- a/code/Controllers/ContentController.php +++ b/code/Controllers/ContentController.php @@ -45,7 +45,6 @@ * Subclasses of ContentController are generally instantiated by ModelAsController; this will create * a controller based on the URLSegment action variable, by looking in the SiteTree table. * - * @todo Can this be used for anything other than SiteTree controllers? */ class ContentController extends Controller { @@ -303,8 +302,6 @@ public function Menu($level) /** * Returns the default log-in form. * - * @todo Check if here should be returned just the default log-in form or - * all available log-in forms (also OpenID...) * @return \SilverStripe\Security\MemberAuthenticator\MemberLoginForm */ public function LoginForm() @@ -449,7 +446,6 @@ public function successfullyinstalled() $this->httpError(410); } - // TODO Allow this to work when allow_url_fopen=0 if (isset($_SESSION['StatsID']) && $_SESSION['StatsID']) { $url = 'http://ss2stat.silverstripe.com/Installation/installed?ID=' . $_SESSION['StatsID']; @file_get_contents($url ?? ''); diff --git a/code/Model/RedirectorPage.php b/code/Model/RedirectorPage.php index 97572142e7..3be0545624 100644 --- a/code/Model/RedirectorPage.php +++ b/code/Model/RedirectorPage.php @@ -164,7 +164,6 @@ public function syncLinkTracking() $this->HasBrokenLink = true; } } else { - // TODO implement checking of a remote site $this->HasBrokenLink = false; } } diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php index aaa06a9198..aefd7001c1 100755 --- a/code/Model/SiteTree.php +++ b/code/Model/SiteTree.php @@ -1958,7 +1958,6 @@ public function getLiveURLSegment() */ public function BackLinkTracking() { - // @todo - Implement PolymorphicManyManyList to replace this $list = ArrayList::create(); $siteTreelinkTable = SiteTreeLink::singleton()->baseTable(); diff --git a/code/Reports/BrokenFilesReport.php b/code/Reports/BrokenFilesReport.php index 609428c328..2c4b3426ec 100644 --- a/code/Reports/BrokenFilesReport.php +++ b/code/Reports/BrokenFilesReport.php @@ -46,7 +46,7 @@ public function columns() { return [ "Title" => [ - "title" => "Title", // todo: use NestedTitle(2) + "title" => "Title", "link" => true, ], ]; diff --git a/code/Reports/BrokenRedirectorPagesReport.php b/code/Reports/BrokenRedirectorPagesReport.php index a1390d62fa..62b8086b04 100644 --- a/code/Reports/BrokenRedirectorPagesReport.php +++ b/code/Reports/BrokenRedirectorPagesReport.php @@ -39,7 +39,7 @@ public function columns() { return [ "Title" => [ - "title" => "Title", // todo: use NestedTitle(2) + "title" => "Title", "link" => true, ], ]; diff --git a/code/Reports/BrokenVirtualPagesReport.php b/code/Reports/BrokenVirtualPagesReport.php index f4cee18124..ed680fe897 100644 --- a/code/Reports/BrokenVirtualPagesReport.php +++ b/code/Reports/BrokenVirtualPagesReport.php @@ -39,7 +39,7 @@ public function columns() { return [ "Title" => [ - "title" => "Title", // todo: use NestedTitle(2) + "title" => "Title", "link" => true, ], ]; diff --git a/code/Reports/EmptyPagesReport.php b/code/Reports/EmptyPagesReport.php index 8c3a211c18..814e51835b 100644 --- a/code/Reports/EmptyPagesReport.php +++ b/code/Reports/EmptyPagesReport.php @@ -43,7 +43,7 @@ public function columns() { return [ "Title" => [ - "title" => "Title", // todo: use NestedTitle(2) + "title" => "Title", "link" => true, ], ]; diff --git a/code/Reports/RecentlyEditedReport.php b/code/Reports/RecentlyEditedReport.php index 8522834c70..a0216420c0 100644 --- a/code/Reports/RecentlyEditedReport.php +++ b/code/Reports/RecentlyEditedReport.php @@ -38,7 +38,7 @@ public function columns() { return [ "Title" => [ - "title" => "Title", // todo: use NestedTitle(2) + "title" => "Title", "link" => true, ], ]; diff --git a/tests/behat/features/preview-a-page.feature b/tests/behat/features/preview-a-page.feature index c856803a19..9b40c24527 100644 --- a/tests/behat/features/preview-a-page.feature +++ b/tests/behat/features/preview-a-page.feature @@ -19,10 +19,6 @@ Feature: Preview a page And the preview contains "About Us" Then I set the CMS mode to "Edit mode" - # TODO: - # - Only tests correctly on fresh database - # - We should continue testing against it after we have fixtures ready - @javascript Scenario: I can see an updated preview when editing content And I go to "/admin/pages" Then I should see "About Us" in the tree diff --git a/tests/php/Model/SiteTreePermissionsTest.php b/tests/php/Model/SiteTreePermissionsTest.php index d3afc8d29e..2fdf721f2d 100644 --- a/tests/php/Model/SiteTreePermissionsTest.php +++ b/tests/php/Model/SiteTreePermissionsTest.php @@ -12,10 +12,6 @@ use SilverStripe\Subsites\Extensions\SiteTreeSubsites; use SilverStripe\Versioned\Versioned; -/** - * @todo Test canAddChildren() - * @todo Test canCreate() - */ class SiteTreePermissionsTest extends FunctionalTest { protected static $fixture_file = "SiteTreePermissionsTest.yml"; diff --git a/tests/php/Search/ZZZSearchFormTest.php b/tests/php/Search/ZZZSearchFormTest.php index 585e16f8b4..35bed9a6e6 100644 --- a/tests/php/Search/ZZZSearchFormTest.php +++ b/tests/php/Search/ZZZSearchFormTest.php @@ -21,9 +21,6 @@ use TractorCow\Fluent\Extension\FluentSiteTreeExtension; /** - * @todo Fix unpublished pages check in testPublishedPagesMatchedByTitle() - * @todo All tests run on unpublished pages at the moment, due to the searchform not distinguishing between them - * * Because this manipulates the test database in severe ways, I've renamed the test to force it to run last... */ class ZZZSearchFormTest extends FunctionalTest