From 6cb20778786e92ba8fa606ab866cffc19175c064 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 9 Aug 2017 13:22:56 +1200 Subject: [PATCH 1/3] Move files to new location --- tests/{controller => php/Controllers}/CMSBatchActionsTest.php | 0 tests/{controller => php/Controllers}/CMSBatchActionsTest.yml | 0 tests/{controller => php/Controllers}/CMSMainTest.php | 0 tests/{controller => php/Controllers}/CMSMainTest.yml | 0 tests/{controller => php/Controllers}/CMSMainTest_ClassA.php | 0 tests/{controller => php/Controllers}/CMSMainTest_ClassB.php | 0 tests/{controller => php/Controllers}/CMSMainTest_HiddenClass.php | 0 tests/{controller => php/Controllers}/CMSMainTest_NotRoot.php | 0 .../Controllers}/CMSPageHistoryControllerTest.php | 0 .../Controllers}/CMSPageHistoryControllerTest.yml | 0 tests/{controller => php/Controllers}/CMSSiteTreeFilterTest.php | 0 tests/{controller => php/Controllers}/CMSSiteTreeFilterTest.yml | 0 tests/{controller => php/Controllers}/CMSTreeTest.php | 0 tests/{controller => php/Controllers}/CMSTreeTest.yml | 0 .../Controllers}/ContentControllerPermissionsTest.php | 0 .../Controllers}/ContentControllerSearchExtensionTest.php | 0 tests/{controller => php/Controllers}/ContentControllerTest.php | 0 tests/{controller => php/Controllers}/ContentControllerTest.yml | 0 .../{controller => php/Controllers}/ContentControllerTestPage.php | 0 .../Controllers}/ContentControllerTestPageController.php | 0 .../Controllers}/ContentControllerTestPageWithoutController.php | 0 .../Controllers}/ContentControllerTest_Page.php | 0 .../Controllers}/ContentControllerTest_PageController.php | 0 tests/{controller => php/Controllers}/ModelAsControllerTest.php | 0 tests/{controller => php/Controllers}/RootURLControllerTest.php | 0 tests/{controller => php/Controllers}/RootURLControllerTest.yml | 0 .../{controller => php/Controllers}/SilverStripeNavigatorTest.php | 0 .../Controllers}/SilverStripeNavigatorTest_ProtectedTestItem.php | 0 .../Controllers}/SilverStripeNavigatorTest_TestItem.php | 0 .../templates/ContentControllerTestPageWithoutController.ss | 0 .../controllertest/templates/ContentControllerTestPage_test.ss | 0 .../Controllers}/themes/controllertest/templates/Controller.ss | 0 .../Controllers}/themes/controllertest/templates/Layout/Page.ss | 0 .../Controllers}/themes/controllertest/templates/Page.ss | 0 tests/{model => php/Model}/FileLinkTrackingTest.php | 0 tests/{model => php/Model}/FileLinkTrackingTest.yml | 0 tests/{model => php/Model}/RedirectorPageTest.php | 0 tests/{model => php/Model}/RedirectorPageTest.yml | 0 .../{model => php/Model}/RedirectorPageTest_RedirectExtension.php | 0 tests/{model => php/Model}/SiteTreeActionsTest.php | 0 tests/{model => php/Model}/SiteTreeActionsTest.yml | 0 tests/{model => php/Model}/SiteTreeActionsTest_Page.php | 0 tests/{model => php/Model}/SiteTreeBacklinksTest.php | 0 tests/{model => php/Model}/SiteTreeBacklinksTest.yml | 0 tests/{model => php/Model}/SiteTreeBacklinksTest_DOD.php | 0 tests/{model => php/Model}/SiteTreeBrokenLinksTest.php | 0 tests/{model => php/Model}/SiteTreeBrokenLinksTest.yml | 0 tests/{model => php/Model}/SiteTreeHTMLEditorFieldTest.php | 0 tests/{model => php/Model}/SiteTreeHTMLEditorFieldTest.yml | 0 tests/{model => php/Model}/SiteTreeLinkTrackingTest.php | 0 tests/{model => php/Model}/SiteTreePermissionsTest.php | 0 tests/{model => php/Model}/SiteTreePermissionsTest.yml | 0 tests/{model => php/Model}/SiteTreeTest.php | 0 tests/{model => php/Model}/SiteTreeTest.yml | 0 tests/{model => php/Model}/SiteTreeTest_AdminDenied.php | 0 tests/{model => php/Model}/SiteTreeTest_AdminDeniedExtension.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassA.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassB.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassC.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassCext.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassD.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassE.php | 0 tests/{model => php/Model}/SiteTreeTest_Conflicted.php | 0 tests/{model => php/Model}/SiteTreeTest_ConflictedController.php | 0 tests/{model => php/Model}/SiteTreeTest_DataObject.php | 0 tests/{model => php/Model}/SiteTreeTest_Extension.php | 0 tests/{model => php/Model}/SiteTreeTest_ExtensionA.php | 0 tests/{model => php/Model}/SiteTreeTest_ExtensionB.php | 0 tests/{model => php/Model}/SiteTreeTest_LegacyControllerName.php | 0 .../Model}/SiteTreeTest_LegacyControllerName_Controller.php | 0 tests/{model => php/Model}/SiteTreeTest_NotRoot.php | 0 tests/{model => php/Model}/SiteTreeTest_NullHtmlCleaner.php | 0 tests/{model => php/Model}/SiteTreeTest_PageNode.php | 0 tests/{model => php/Model}/SiteTreeTest_PageNodeController.php | 0 tests/{model => php/Model}/SiteTreeTest_StageStatusInherit.php | 0 tests/{model => php/Model}/VirtualPageTest.php | 0 tests/{model => php/Model}/VirtualPageTest.yml | 0 tests/{model => php/Model}/VirtualPageTest_ClassA.php | 0 tests/{model => php/Model}/VirtualPageTest_ClassAController.php | 0 tests/{model => php/Model}/VirtualPageTest_ClassB.php | 0 tests/{model => php/Model}/VirtualPageTest_ClassC.php | 0 tests/{model => php/Model}/VirtualPageTest_NotRoot.php | 0 tests/{model => php/Model}/VirtualPageTest_PageExtension.php | 0 .../Model}/VirtualPageTest_PageWithAllowedChildren.php | 0 tests/{model => php/Model}/VirtualPageTest_TestDBField.php | 0 tests/{model => php/Model}/VirtualPageTest_VirtualPageSub.php | 0 .../{model => php/Model}/themes/virtualpagetest/templates/Page.ss | 0 .../themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss | 0 tests/{reports => php/Reports}/CmsReportsTest.php | 0 tests/{reports => php/Reports}/CmsReportsTest.yml | 0 tests/{search => php/Search}/CMSMainSearchFormTest.php | 0 tests/{search => php/Search}/SearchFormTest.php | 0 tests/{search => php/Search}/SearchFormTest.yml | 0 tests/{tasks => php/Tasks}/MigrateSiteTreeLinkingTaskTest.php | 0 tests/{tasks => php/Tasks}/MigrateSiteTreeLinkingTaskTest.yml | 0 tests/{tasks => php/Tasks}/RemoveOrphanedPagesTaskTest.php | 0 tests/{tasks => php/Tasks}/RemoveOrphanedPagesTaskTest.yml | 0 97 files changed, 0 insertions(+), 0 deletions(-) rename tests/{controller => php/Controllers}/CMSBatchActionsTest.php (100%) rename tests/{controller => php/Controllers}/CMSBatchActionsTest.yml (100%) rename tests/{controller => php/Controllers}/CMSMainTest.php (100%) rename tests/{controller => php/Controllers}/CMSMainTest.yml (100%) rename tests/{controller => php/Controllers}/CMSMainTest_ClassA.php (100%) rename tests/{controller => php/Controllers}/CMSMainTest_ClassB.php (100%) rename tests/{controller => php/Controllers}/CMSMainTest_HiddenClass.php (100%) rename tests/{controller => php/Controllers}/CMSMainTest_NotRoot.php (100%) rename tests/{controller => php/Controllers}/CMSPageHistoryControllerTest.php (100%) rename tests/{controller => php/Controllers}/CMSPageHistoryControllerTest.yml (100%) rename tests/{controller => php/Controllers}/CMSSiteTreeFilterTest.php (100%) rename tests/{controller => php/Controllers}/CMSSiteTreeFilterTest.yml (100%) rename tests/{controller => php/Controllers}/CMSTreeTest.php (100%) rename tests/{controller => php/Controllers}/CMSTreeTest.yml (100%) rename tests/{controller => php/Controllers}/ContentControllerPermissionsTest.php (100%) rename tests/{controller => php/Controllers}/ContentControllerSearchExtensionTest.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTest.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTest.yml (100%) rename tests/{controller => php/Controllers}/ContentControllerTestPage.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTestPageController.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTestPageWithoutController.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTest_Page.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTest_PageController.php (100%) rename tests/{controller => php/Controllers}/ModelAsControllerTest.php (100%) rename tests/{controller => php/Controllers}/RootURLControllerTest.php (100%) rename tests/{controller => php/Controllers}/RootURLControllerTest.yml (100%) rename tests/{controller => php/Controllers}/SilverStripeNavigatorTest.php (100%) rename tests/{controller => php/Controllers}/SilverStripeNavigatorTest_ProtectedTestItem.php (100%) rename tests/{controller => php/Controllers}/SilverStripeNavigatorTest_TestItem.php (100%) rename tests/{controller => php/Controllers}/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss (100%) rename tests/{controller => php/Controllers}/themes/controllertest/templates/ContentControllerTestPage_test.ss (100%) rename tests/{controller => php/Controllers}/themes/controllertest/templates/Controller.ss (100%) rename tests/{controller => php/Controllers}/themes/controllertest/templates/Layout/Page.ss (100%) rename tests/{controller => php/Controllers}/themes/controllertest/templates/Page.ss (100%) rename tests/{model => php/Model}/FileLinkTrackingTest.php (100%) rename tests/{model => php/Model}/FileLinkTrackingTest.yml (100%) rename tests/{model => php/Model}/RedirectorPageTest.php (100%) rename tests/{model => php/Model}/RedirectorPageTest.yml (100%) rename tests/{model => php/Model}/RedirectorPageTest_RedirectExtension.php (100%) rename tests/{model => php/Model}/SiteTreeActionsTest.php (100%) rename tests/{model => php/Model}/SiteTreeActionsTest.yml (100%) rename tests/{model => php/Model}/SiteTreeActionsTest_Page.php (100%) rename tests/{model => php/Model}/SiteTreeBacklinksTest.php (100%) rename tests/{model => php/Model}/SiteTreeBacklinksTest.yml (100%) rename tests/{model => php/Model}/SiteTreeBacklinksTest_DOD.php (100%) rename tests/{model => php/Model}/SiteTreeBrokenLinksTest.php (100%) rename tests/{model => php/Model}/SiteTreeBrokenLinksTest.yml (100%) rename tests/{model => php/Model}/SiteTreeHTMLEditorFieldTest.php (100%) rename tests/{model => php/Model}/SiteTreeHTMLEditorFieldTest.yml (100%) rename tests/{model => php/Model}/SiteTreeLinkTrackingTest.php (100%) rename tests/{model => php/Model}/SiteTreePermissionsTest.php (100%) rename tests/{model => php/Model}/SiteTreePermissionsTest.yml (100%) rename tests/{model => php/Model}/SiteTreeTest.php (100%) rename tests/{model => php/Model}/SiteTreeTest.yml (100%) rename tests/{model => php/Model}/SiteTreeTest_AdminDenied.php (100%) rename tests/{model => php/Model}/SiteTreeTest_AdminDeniedExtension.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassA.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassB.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassC.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassCext.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassD.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassE.php (100%) rename tests/{model => php/Model}/SiteTreeTest_Conflicted.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ConflictedController.php (100%) rename tests/{model => php/Model}/SiteTreeTest_DataObject.php (100%) rename tests/{model => php/Model}/SiteTreeTest_Extension.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ExtensionA.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ExtensionB.php (100%) rename tests/{model => php/Model}/SiteTreeTest_LegacyControllerName.php (100%) rename tests/{model => php/Model}/SiteTreeTest_LegacyControllerName_Controller.php (100%) rename tests/{model => php/Model}/SiteTreeTest_NotRoot.php (100%) rename tests/{model => php/Model}/SiteTreeTest_NullHtmlCleaner.php (100%) rename tests/{model => php/Model}/SiteTreeTest_PageNode.php (100%) rename tests/{model => php/Model}/SiteTreeTest_PageNodeController.php (100%) rename tests/{model => php/Model}/SiteTreeTest_StageStatusInherit.php (100%) rename tests/{model => php/Model}/VirtualPageTest.php (100%) rename tests/{model => php/Model}/VirtualPageTest.yml (100%) rename tests/{model => php/Model}/VirtualPageTest_ClassA.php (100%) rename tests/{model => php/Model}/VirtualPageTest_ClassAController.php (100%) rename tests/{model => php/Model}/VirtualPageTest_ClassB.php (100%) rename tests/{model => php/Model}/VirtualPageTest_ClassC.php (100%) rename tests/{model => php/Model}/VirtualPageTest_NotRoot.php (100%) rename tests/{model => php/Model}/VirtualPageTest_PageExtension.php (100%) rename tests/{model => php/Model}/VirtualPageTest_PageWithAllowedChildren.php (100%) rename tests/{model => php/Model}/VirtualPageTest_TestDBField.php (100%) rename tests/{model => php/Model}/VirtualPageTest_VirtualPageSub.php (100%) rename tests/{model => php/Model}/themes/virtualpagetest/templates/Page.ss (100%) rename tests/{model => php/Model}/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss (100%) rename tests/{reports => php/Reports}/CmsReportsTest.php (100%) rename tests/{reports => php/Reports}/CmsReportsTest.yml (100%) rename tests/{search => php/Search}/CMSMainSearchFormTest.php (100%) rename tests/{search => php/Search}/SearchFormTest.php (100%) rename tests/{search => php/Search}/SearchFormTest.yml (100%) rename tests/{tasks => php/Tasks}/MigrateSiteTreeLinkingTaskTest.php (100%) rename tests/{tasks => php/Tasks}/MigrateSiteTreeLinkingTaskTest.yml (100%) rename tests/{tasks => php/Tasks}/RemoveOrphanedPagesTaskTest.php (100%) rename tests/{tasks => php/Tasks}/RemoveOrphanedPagesTaskTest.yml (100%) diff --git a/tests/controller/CMSBatchActionsTest.php b/tests/php/Controllers/CMSBatchActionsTest.php similarity index 100% rename from tests/controller/CMSBatchActionsTest.php rename to tests/php/Controllers/CMSBatchActionsTest.php diff --git a/tests/controller/CMSBatchActionsTest.yml b/tests/php/Controllers/CMSBatchActionsTest.yml similarity index 100% rename from tests/controller/CMSBatchActionsTest.yml rename to tests/php/Controllers/CMSBatchActionsTest.yml diff --git a/tests/controller/CMSMainTest.php b/tests/php/Controllers/CMSMainTest.php similarity index 100% rename from tests/controller/CMSMainTest.php rename to tests/php/Controllers/CMSMainTest.php diff --git a/tests/controller/CMSMainTest.yml b/tests/php/Controllers/CMSMainTest.yml similarity index 100% rename from tests/controller/CMSMainTest.yml rename to tests/php/Controllers/CMSMainTest.yml diff --git a/tests/controller/CMSMainTest_ClassA.php b/tests/php/Controllers/CMSMainTest_ClassA.php similarity index 100% rename from tests/controller/CMSMainTest_ClassA.php rename to tests/php/Controllers/CMSMainTest_ClassA.php diff --git a/tests/controller/CMSMainTest_ClassB.php b/tests/php/Controllers/CMSMainTest_ClassB.php similarity index 100% rename from tests/controller/CMSMainTest_ClassB.php rename to tests/php/Controllers/CMSMainTest_ClassB.php diff --git a/tests/controller/CMSMainTest_HiddenClass.php b/tests/php/Controllers/CMSMainTest_HiddenClass.php similarity index 100% rename from tests/controller/CMSMainTest_HiddenClass.php rename to tests/php/Controllers/CMSMainTest_HiddenClass.php diff --git a/tests/controller/CMSMainTest_NotRoot.php b/tests/php/Controllers/CMSMainTest_NotRoot.php similarity index 100% rename from tests/controller/CMSMainTest_NotRoot.php rename to tests/php/Controllers/CMSMainTest_NotRoot.php diff --git a/tests/controller/CMSPageHistoryControllerTest.php b/tests/php/Controllers/CMSPageHistoryControllerTest.php similarity index 100% rename from tests/controller/CMSPageHistoryControllerTest.php rename to tests/php/Controllers/CMSPageHistoryControllerTest.php diff --git a/tests/controller/CMSPageHistoryControllerTest.yml b/tests/php/Controllers/CMSPageHistoryControllerTest.yml similarity index 100% rename from tests/controller/CMSPageHistoryControllerTest.yml rename to tests/php/Controllers/CMSPageHistoryControllerTest.yml diff --git a/tests/controller/CMSSiteTreeFilterTest.php b/tests/php/Controllers/CMSSiteTreeFilterTest.php similarity index 100% rename from tests/controller/CMSSiteTreeFilterTest.php rename to tests/php/Controllers/CMSSiteTreeFilterTest.php diff --git a/tests/controller/CMSSiteTreeFilterTest.yml b/tests/php/Controllers/CMSSiteTreeFilterTest.yml similarity index 100% rename from tests/controller/CMSSiteTreeFilterTest.yml rename to tests/php/Controllers/CMSSiteTreeFilterTest.yml diff --git a/tests/controller/CMSTreeTest.php b/tests/php/Controllers/CMSTreeTest.php similarity index 100% rename from tests/controller/CMSTreeTest.php rename to tests/php/Controllers/CMSTreeTest.php diff --git a/tests/controller/CMSTreeTest.yml b/tests/php/Controllers/CMSTreeTest.yml similarity index 100% rename from tests/controller/CMSTreeTest.yml rename to tests/php/Controllers/CMSTreeTest.yml diff --git a/tests/controller/ContentControllerPermissionsTest.php b/tests/php/Controllers/ContentControllerPermissionsTest.php similarity index 100% rename from tests/controller/ContentControllerPermissionsTest.php rename to tests/php/Controllers/ContentControllerPermissionsTest.php diff --git a/tests/controller/ContentControllerSearchExtensionTest.php b/tests/php/Controllers/ContentControllerSearchExtensionTest.php similarity index 100% rename from tests/controller/ContentControllerSearchExtensionTest.php rename to tests/php/Controllers/ContentControllerSearchExtensionTest.php diff --git a/tests/controller/ContentControllerTest.php b/tests/php/Controllers/ContentControllerTest.php similarity index 100% rename from tests/controller/ContentControllerTest.php rename to tests/php/Controllers/ContentControllerTest.php diff --git a/tests/controller/ContentControllerTest.yml b/tests/php/Controllers/ContentControllerTest.yml similarity index 100% rename from tests/controller/ContentControllerTest.yml rename to tests/php/Controllers/ContentControllerTest.yml diff --git a/tests/controller/ContentControllerTestPage.php b/tests/php/Controllers/ContentControllerTestPage.php similarity index 100% rename from tests/controller/ContentControllerTestPage.php rename to tests/php/Controllers/ContentControllerTestPage.php diff --git a/tests/controller/ContentControllerTestPageController.php b/tests/php/Controllers/ContentControllerTestPageController.php similarity index 100% rename from tests/controller/ContentControllerTestPageController.php rename to tests/php/Controllers/ContentControllerTestPageController.php diff --git a/tests/controller/ContentControllerTestPageWithoutController.php b/tests/php/Controllers/ContentControllerTestPageWithoutController.php similarity index 100% rename from tests/controller/ContentControllerTestPageWithoutController.php rename to tests/php/Controllers/ContentControllerTestPageWithoutController.php diff --git a/tests/controller/ContentControllerTest_Page.php b/tests/php/Controllers/ContentControllerTest_Page.php similarity index 100% rename from tests/controller/ContentControllerTest_Page.php rename to tests/php/Controllers/ContentControllerTest_Page.php diff --git a/tests/controller/ContentControllerTest_PageController.php b/tests/php/Controllers/ContentControllerTest_PageController.php similarity index 100% rename from tests/controller/ContentControllerTest_PageController.php rename to tests/php/Controllers/ContentControllerTest_PageController.php diff --git a/tests/controller/ModelAsControllerTest.php b/tests/php/Controllers/ModelAsControllerTest.php similarity index 100% rename from tests/controller/ModelAsControllerTest.php rename to tests/php/Controllers/ModelAsControllerTest.php diff --git a/tests/controller/RootURLControllerTest.php b/tests/php/Controllers/RootURLControllerTest.php similarity index 100% rename from tests/controller/RootURLControllerTest.php rename to tests/php/Controllers/RootURLControllerTest.php diff --git a/tests/controller/RootURLControllerTest.yml b/tests/php/Controllers/RootURLControllerTest.yml similarity index 100% rename from tests/controller/RootURLControllerTest.yml rename to tests/php/Controllers/RootURLControllerTest.yml diff --git a/tests/controller/SilverStripeNavigatorTest.php b/tests/php/Controllers/SilverStripeNavigatorTest.php similarity index 100% rename from tests/controller/SilverStripeNavigatorTest.php rename to tests/php/Controllers/SilverStripeNavigatorTest.php diff --git a/tests/controller/SilverStripeNavigatorTest_ProtectedTestItem.php b/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php similarity index 100% rename from tests/controller/SilverStripeNavigatorTest_ProtectedTestItem.php rename to tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php diff --git a/tests/controller/SilverStripeNavigatorTest_TestItem.php b/tests/php/Controllers/SilverStripeNavigatorTest_TestItem.php similarity index 100% rename from tests/controller/SilverStripeNavigatorTest_TestItem.php rename to tests/php/Controllers/SilverStripeNavigatorTest_TestItem.php diff --git a/tests/controller/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss b/tests/php/Controllers/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss similarity index 100% rename from tests/controller/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss rename to tests/php/Controllers/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss diff --git a/tests/controller/themes/controllertest/templates/ContentControllerTestPage_test.ss b/tests/php/Controllers/themes/controllertest/templates/ContentControllerTestPage_test.ss similarity index 100% rename from tests/controller/themes/controllertest/templates/ContentControllerTestPage_test.ss rename to tests/php/Controllers/themes/controllertest/templates/ContentControllerTestPage_test.ss diff --git a/tests/controller/themes/controllertest/templates/Controller.ss b/tests/php/Controllers/themes/controllertest/templates/Controller.ss similarity index 100% rename from tests/controller/themes/controllertest/templates/Controller.ss rename to tests/php/Controllers/themes/controllertest/templates/Controller.ss diff --git a/tests/controller/themes/controllertest/templates/Layout/Page.ss b/tests/php/Controllers/themes/controllertest/templates/Layout/Page.ss similarity index 100% rename from tests/controller/themes/controllertest/templates/Layout/Page.ss rename to tests/php/Controllers/themes/controllertest/templates/Layout/Page.ss diff --git a/tests/controller/themes/controllertest/templates/Page.ss b/tests/php/Controllers/themes/controllertest/templates/Page.ss similarity index 100% rename from tests/controller/themes/controllertest/templates/Page.ss rename to tests/php/Controllers/themes/controllertest/templates/Page.ss diff --git a/tests/model/FileLinkTrackingTest.php b/tests/php/Model/FileLinkTrackingTest.php similarity index 100% rename from tests/model/FileLinkTrackingTest.php rename to tests/php/Model/FileLinkTrackingTest.php diff --git a/tests/model/FileLinkTrackingTest.yml b/tests/php/Model/FileLinkTrackingTest.yml similarity index 100% rename from tests/model/FileLinkTrackingTest.yml rename to tests/php/Model/FileLinkTrackingTest.yml diff --git a/tests/model/RedirectorPageTest.php b/tests/php/Model/RedirectorPageTest.php similarity index 100% rename from tests/model/RedirectorPageTest.php rename to tests/php/Model/RedirectorPageTest.php diff --git a/tests/model/RedirectorPageTest.yml b/tests/php/Model/RedirectorPageTest.yml similarity index 100% rename from tests/model/RedirectorPageTest.yml rename to tests/php/Model/RedirectorPageTest.yml diff --git a/tests/model/RedirectorPageTest_RedirectExtension.php b/tests/php/Model/RedirectorPageTest_RedirectExtension.php similarity index 100% rename from tests/model/RedirectorPageTest_RedirectExtension.php rename to tests/php/Model/RedirectorPageTest_RedirectExtension.php diff --git a/tests/model/SiteTreeActionsTest.php b/tests/php/Model/SiteTreeActionsTest.php similarity index 100% rename from tests/model/SiteTreeActionsTest.php rename to tests/php/Model/SiteTreeActionsTest.php diff --git a/tests/model/SiteTreeActionsTest.yml b/tests/php/Model/SiteTreeActionsTest.yml similarity index 100% rename from tests/model/SiteTreeActionsTest.yml rename to tests/php/Model/SiteTreeActionsTest.yml diff --git a/tests/model/SiteTreeActionsTest_Page.php b/tests/php/Model/SiteTreeActionsTest_Page.php similarity index 100% rename from tests/model/SiteTreeActionsTest_Page.php rename to tests/php/Model/SiteTreeActionsTest_Page.php diff --git a/tests/model/SiteTreeBacklinksTest.php b/tests/php/Model/SiteTreeBacklinksTest.php similarity index 100% rename from tests/model/SiteTreeBacklinksTest.php rename to tests/php/Model/SiteTreeBacklinksTest.php diff --git a/tests/model/SiteTreeBacklinksTest.yml b/tests/php/Model/SiteTreeBacklinksTest.yml similarity index 100% rename from tests/model/SiteTreeBacklinksTest.yml rename to tests/php/Model/SiteTreeBacklinksTest.yml diff --git a/tests/model/SiteTreeBacklinksTest_DOD.php b/tests/php/Model/SiteTreeBacklinksTest_DOD.php similarity index 100% rename from tests/model/SiteTreeBacklinksTest_DOD.php rename to tests/php/Model/SiteTreeBacklinksTest_DOD.php diff --git a/tests/model/SiteTreeBrokenLinksTest.php b/tests/php/Model/SiteTreeBrokenLinksTest.php similarity index 100% rename from tests/model/SiteTreeBrokenLinksTest.php rename to tests/php/Model/SiteTreeBrokenLinksTest.php diff --git a/tests/model/SiteTreeBrokenLinksTest.yml b/tests/php/Model/SiteTreeBrokenLinksTest.yml similarity index 100% rename from tests/model/SiteTreeBrokenLinksTest.yml rename to tests/php/Model/SiteTreeBrokenLinksTest.yml diff --git a/tests/model/SiteTreeHTMLEditorFieldTest.php b/tests/php/Model/SiteTreeHTMLEditorFieldTest.php similarity index 100% rename from tests/model/SiteTreeHTMLEditorFieldTest.php rename to tests/php/Model/SiteTreeHTMLEditorFieldTest.php diff --git a/tests/model/SiteTreeHTMLEditorFieldTest.yml b/tests/php/Model/SiteTreeHTMLEditorFieldTest.yml similarity index 100% rename from tests/model/SiteTreeHTMLEditorFieldTest.yml rename to tests/php/Model/SiteTreeHTMLEditorFieldTest.yml diff --git a/tests/model/SiteTreeLinkTrackingTest.php b/tests/php/Model/SiteTreeLinkTrackingTest.php similarity index 100% rename from tests/model/SiteTreeLinkTrackingTest.php rename to tests/php/Model/SiteTreeLinkTrackingTest.php diff --git a/tests/model/SiteTreePermissionsTest.php b/tests/php/Model/SiteTreePermissionsTest.php similarity index 100% rename from tests/model/SiteTreePermissionsTest.php rename to tests/php/Model/SiteTreePermissionsTest.php diff --git a/tests/model/SiteTreePermissionsTest.yml b/tests/php/Model/SiteTreePermissionsTest.yml similarity index 100% rename from tests/model/SiteTreePermissionsTest.yml rename to tests/php/Model/SiteTreePermissionsTest.yml diff --git a/tests/model/SiteTreeTest.php b/tests/php/Model/SiteTreeTest.php similarity index 100% rename from tests/model/SiteTreeTest.php rename to tests/php/Model/SiteTreeTest.php diff --git a/tests/model/SiteTreeTest.yml b/tests/php/Model/SiteTreeTest.yml similarity index 100% rename from tests/model/SiteTreeTest.yml rename to tests/php/Model/SiteTreeTest.yml diff --git a/tests/model/SiteTreeTest_AdminDenied.php b/tests/php/Model/SiteTreeTest_AdminDenied.php similarity index 100% rename from tests/model/SiteTreeTest_AdminDenied.php rename to tests/php/Model/SiteTreeTest_AdminDenied.php diff --git a/tests/model/SiteTreeTest_AdminDeniedExtension.php b/tests/php/Model/SiteTreeTest_AdminDeniedExtension.php similarity index 100% rename from tests/model/SiteTreeTest_AdminDeniedExtension.php rename to tests/php/Model/SiteTreeTest_AdminDeniedExtension.php diff --git a/tests/model/SiteTreeTest_ClassA.php b/tests/php/Model/SiteTreeTest_ClassA.php similarity index 100% rename from tests/model/SiteTreeTest_ClassA.php rename to tests/php/Model/SiteTreeTest_ClassA.php diff --git a/tests/model/SiteTreeTest_ClassB.php b/tests/php/Model/SiteTreeTest_ClassB.php similarity index 100% rename from tests/model/SiteTreeTest_ClassB.php rename to tests/php/Model/SiteTreeTest_ClassB.php diff --git a/tests/model/SiteTreeTest_ClassC.php b/tests/php/Model/SiteTreeTest_ClassC.php similarity index 100% rename from tests/model/SiteTreeTest_ClassC.php rename to tests/php/Model/SiteTreeTest_ClassC.php diff --git a/tests/model/SiteTreeTest_ClassCext.php b/tests/php/Model/SiteTreeTest_ClassCext.php similarity index 100% rename from tests/model/SiteTreeTest_ClassCext.php rename to tests/php/Model/SiteTreeTest_ClassCext.php diff --git a/tests/model/SiteTreeTest_ClassD.php b/tests/php/Model/SiteTreeTest_ClassD.php similarity index 100% rename from tests/model/SiteTreeTest_ClassD.php rename to tests/php/Model/SiteTreeTest_ClassD.php diff --git a/tests/model/SiteTreeTest_ClassE.php b/tests/php/Model/SiteTreeTest_ClassE.php similarity index 100% rename from tests/model/SiteTreeTest_ClassE.php rename to tests/php/Model/SiteTreeTest_ClassE.php diff --git a/tests/model/SiteTreeTest_Conflicted.php b/tests/php/Model/SiteTreeTest_Conflicted.php similarity index 100% rename from tests/model/SiteTreeTest_Conflicted.php rename to tests/php/Model/SiteTreeTest_Conflicted.php diff --git a/tests/model/SiteTreeTest_ConflictedController.php b/tests/php/Model/SiteTreeTest_ConflictedController.php similarity index 100% rename from tests/model/SiteTreeTest_ConflictedController.php rename to tests/php/Model/SiteTreeTest_ConflictedController.php diff --git a/tests/model/SiteTreeTest_DataObject.php b/tests/php/Model/SiteTreeTest_DataObject.php similarity index 100% rename from tests/model/SiteTreeTest_DataObject.php rename to tests/php/Model/SiteTreeTest_DataObject.php diff --git a/tests/model/SiteTreeTest_Extension.php b/tests/php/Model/SiteTreeTest_Extension.php similarity index 100% rename from tests/model/SiteTreeTest_Extension.php rename to tests/php/Model/SiteTreeTest_Extension.php diff --git a/tests/model/SiteTreeTest_ExtensionA.php b/tests/php/Model/SiteTreeTest_ExtensionA.php similarity index 100% rename from tests/model/SiteTreeTest_ExtensionA.php rename to tests/php/Model/SiteTreeTest_ExtensionA.php diff --git a/tests/model/SiteTreeTest_ExtensionB.php b/tests/php/Model/SiteTreeTest_ExtensionB.php similarity index 100% rename from tests/model/SiteTreeTest_ExtensionB.php rename to tests/php/Model/SiteTreeTest_ExtensionB.php diff --git a/tests/model/SiteTreeTest_LegacyControllerName.php b/tests/php/Model/SiteTreeTest_LegacyControllerName.php similarity index 100% rename from tests/model/SiteTreeTest_LegacyControllerName.php rename to tests/php/Model/SiteTreeTest_LegacyControllerName.php diff --git a/tests/model/SiteTreeTest_LegacyControllerName_Controller.php b/tests/php/Model/SiteTreeTest_LegacyControllerName_Controller.php similarity index 100% rename from tests/model/SiteTreeTest_LegacyControllerName_Controller.php rename to tests/php/Model/SiteTreeTest_LegacyControllerName_Controller.php diff --git a/tests/model/SiteTreeTest_NotRoot.php b/tests/php/Model/SiteTreeTest_NotRoot.php similarity index 100% rename from tests/model/SiteTreeTest_NotRoot.php rename to tests/php/Model/SiteTreeTest_NotRoot.php diff --git a/tests/model/SiteTreeTest_NullHtmlCleaner.php b/tests/php/Model/SiteTreeTest_NullHtmlCleaner.php similarity index 100% rename from tests/model/SiteTreeTest_NullHtmlCleaner.php rename to tests/php/Model/SiteTreeTest_NullHtmlCleaner.php diff --git a/tests/model/SiteTreeTest_PageNode.php b/tests/php/Model/SiteTreeTest_PageNode.php similarity index 100% rename from tests/model/SiteTreeTest_PageNode.php rename to tests/php/Model/SiteTreeTest_PageNode.php diff --git a/tests/model/SiteTreeTest_PageNodeController.php b/tests/php/Model/SiteTreeTest_PageNodeController.php similarity index 100% rename from tests/model/SiteTreeTest_PageNodeController.php rename to tests/php/Model/SiteTreeTest_PageNodeController.php diff --git a/tests/model/SiteTreeTest_StageStatusInherit.php b/tests/php/Model/SiteTreeTest_StageStatusInherit.php similarity index 100% rename from tests/model/SiteTreeTest_StageStatusInherit.php rename to tests/php/Model/SiteTreeTest_StageStatusInherit.php diff --git a/tests/model/VirtualPageTest.php b/tests/php/Model/VirtualPageTest.php similarity index 100% rename from tests/model/VirtualPageTest.php rename to tests/php/Model/VirtualPageTest.php diff --git a/tests/model/VirtualPageTest.yml b/tests/php/Model/VirtualPageTest.yml similarity index 100% rename from tests/model/VirtualPageTest.yml rename to tests/php/Model/VirtualPageTest.yml diff --git a/tests/model/VirtualPageTest_ClassA.php b/tests/php/Model/VirtualPageTest_ClassA.php similarity index 100% rename from tests/model/VirtualPageTest_ClassA.php rename to tests/php/Model/VirtualPageTest_ClassA.php diff --git a/tests/model/VirtualPageTest_ClassAController.php b/tests/php/Model/VirtualPageTest_ClassAController.php similarity index 100% rename from tests/model/VirtualPageTest_ClassAController.php rename to tests/php/Model/VirtualPageTest_ClassAController.php diff --git a/tests/model/VirtualPageTest_ClassB.php b/tests/php/Model/VirtualPageTest_ClassB.php similarity index 100% rename from tests/model/VirtualPageTest_ClassB.php rename to tests/php/Model/VirtualPageTest_ClassB.php diff --git a/tests/model/VirtualPageTest_ClassC.php b/tests/php/Model/VirtualPageTest_ClassC.php similarity index 100% rename from tests/model/VirtualPageTest_ClassC.php rename to tests/php/Model/VirtualPageTest_ClassC.php diff --git a/tests/model/VirtualPageTest_NotRoot.php b/tests/php/Model/VirtualPageTest_NotRoot.php similarity index 100% rename from tests/model/VirtualPageTest_NotRoot.php rename to tests/php/Model/VirtualPageTest_NotRoot.php diff --git a/tests/model/VirtualPageTest_PageExtension.php b/tests/php/Model/VirtualPageTest_PageExtension.php similarity index 100% rename from tests/model/VirtualPageTest_PageExtension.php rename to tests/php/Model/VirtualPageTest_PageExtension.php diff --git a/tests/model/VirtualPageTest_PageWithAllowedChildren.php b/tests/php/Model/VirtualPageTest_PageWithAllowedChildren.php similarity index 100% rename from tests/model/VirtualPageTest_PageWithAllowedChildren.php rename to tests/php/Model/VirtualPageTest_PageWithAllowedChildren.php diff --git a/tests/model/VirtualPageTest_TestDBField.php b/tests/php/Model/VirtualPageTest_TestDBField.php similarity index 100% rename from tests/model/VirtualPageTest_TestDBField.php rename to tests/php/Model/VirtualPageTest_TestDBField.php diff --git a/tests/model/VirtualPageTest_VirtualPageSub.php b/tests/php/Model/VirtualPageTest_VirtualPageSub.php similarity index 100% rename from tests/model/VirtualPageTest_VirtualPageSub.php rename to tests/php/Model/VirtualPageTest_VirtualPageSub.php diff --git a/tests/model/themes/virtualpagetest/templates/Page.ss b/tests/php/Model/themes/virtualpagetest/templates/Page.ss similarity index 100% rename from tests/model/themes/virtualpagetest/templates/Page.ss rename to tests/php/Model/themes/virtualpagetest/templates/Page.ss diff --git a/tests/model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss b/tests/php/Model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss similarity index 100% rename from tests/model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss rename to tests/php/Model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss diff --git a/tests/reports/CmsReportsTest.php b/tests/php/Reports/CmsReportsTest.php similarity index 100% rename from tests/reports/CmsReportsTest.php rename to tests/php/Reports/CmsReportsTest.php diff --git a/tests/reports/CmsReportsTest.yml b/tests/php/Reports/CmsReportsTest.yml similarity index 100% rename from tests/reports/CmsReportsTest.yml rename to tests/php/Reports/CmsReportsTest.yml diff --git a/tests/search/CMSMainSearchFormTest.php b/tests/php/Search/CMSMainSearchFormTest.php similarity index 100% rename from tests/search/CMSMainSearchFormTest.php rename to tests/php/Search/CMSMainSearchFormTest.php diff --git a/tests/search/SearchFormTest.php b/tests/php/Search/SearchFormTest.php similarity index 100% rename from tests/search/SearchFormTest.php rename to tests/php/Search/SearchFormTest.php diff --git a/tests/search/SearchFormTest.yml b/tests/php/Search/SearchFormTest.yml similarity index 100% rename from tests/search/SearchFormTest.yml rename to tests/php/Search/SearchFormTest.yml diff --git a/tests/tasks/MigrateSiteTreeLinkingTaskTest.php b/tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.php similarity index 100% rename from tests/tasks/MigrateSiteTreeLinkingTaskTest.php rename to tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.php diff --git a/tests/tasks/MigrateSiteTreeLinkingTaskTest.yml b/tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.yml similarity index 100% rename from tests/tasks/MigrateSiteTreeLinkingTaskTest.yml rename to tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.yml diff --git a/tests/tasks/RemoveOrphanedPagesTaskTest.php b/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php similarity index 100% rename from tests/tasks/RemoveOrphanedPagesTaskTest.php rename to tests/php/Tasks/RemoveOrphanedPagesTaskTest.php diff --git a/tests/tasks/RemoveOrphanedPagesTaskTest.yml b/tests/php/Tasks/RemoveOrphanedPagesTaskTest.yml similarity index 100% rename from tests/tasks/RemoveOrphanedPagesTaskTest.yml rename to tests/php/Tasks/RemoveOrphanedPagesTaskTest.yml From 9f268a18b5b11bbcb8463c06b64fb04ceff6b1a2 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 9 Aug 2017 13:25:12 +1200 Subject: [PATCH 2/3] Run add-namespace command --- .upgrade.yml | 70 +++++++++++++++++++ tests/php/Controllers/CMSBatchActionsTest.php | 5 ++ tests/php/Controllers/CMSMainTest.php | 5 ++ tests/php/Controllers/CMSMainTest_ClassA.php | 5 ++ tests/php/Controllers/CMSMainTest_ClassB.php | 5 ++ .../Controllers/CMSMainTest_HiddenClass.php | 5 ++ tests/php/Controllers/CMSMainTest_NotRoot.php | 5 ++ .../CMSPageHistoryControllerTest.php | 5 ++ .../php/Controllers/CMSSiteTreeFilterTest.php | 5 ++ tests/php/Controllers/CMSTreeTest.php | 5 ++ .../ContentControllerPermissionsTest.php | 5 ++ .../ContentControllerSearchExtensionTest.php | 5 ++ .../php/Controllers/ContentControllerTest.php | 5 ++ .../Controllers/ContentControllerTestPage.php | 5 ++ .../ContentControllerTestPageController.php | 5 ++ ...entControllerTestPageWithoutController.php | 5 ++ .../ContentControllerTest_Page.php | 5 ++ .../ContentControllerTest_PageController.php | 5 ++ .../php/Controllers/ModelAsControllerTest.php | 5 ++ .../php/Controllers/RootURLControllerTest.php | 5 ++ .../Controllers/SilverStripeNavigatorTest.php | 5 ++ ...rStripeNavigatorTest_ProtectedTestItem.php | 5 ++ .../SilverStripeNavigatorTest_TestItem.php | 5 ++ tests/php/Model/FileLinkTrackingTest.php | 5 ++ tests/php/Model/RedirectorPageTest.php | 5 ++ .../RedirectorPageTest_RedirectExtension.php | 5 ++ tests/php/Model/SiteTreeActionsTest.php | 5 ++ tests/php/Model/SiteTreeActionsTest_Page.php | 5 ++ tests/php/Model/SiteTreeBacklinksTest.php | 5 ++ tests/php/Model/SiteTreeBacklinksTest_DOD.php | 5 ++ tests/php/Model/SiteTreeBrokenLinksTest.php | 5 ++ .../php/Model/SiteTreeHTMLEditorFieldTest.php | 5 ++ tests/php/Model/SiteTreeLinkTrackingTest.php | 5 ++ tests/php/Model/SiteTreePermissionsTest.php | 5 ++ tests/php/Model/SiteTreeTest.php | 6 ++ tests/php/Model/SiteTreeTest_AdminDenied.php | 5 ++ .../SiteTreeTest_AdminDeniedExtension.php | 5 ++ tests/php/Model/SiteTreeTest_ClassA.php | 5 ++ tests/php/Model/SiteTreeTest_ClassB.php | 5 ++ tests/php/Model/SiteTreeTest_ClassC.php | 5 ++ tests/php/Model/SiteTreeTest_ClassCext.php | 5 ++ tests/php/Model/SiteTreeTest_ClassD.php | 5 ++ tests/php/Model/SiteTreeTest_ClassE.php | 5 ++ tests/php/Model/SiteTreeTest_Conflicted.php | 5 ++ .../SiteTreeTest_ConflictedController.php | 5 ++ tests/php/Model/SiteTreeTest_DataObject.php | 5 ++ tests/php/Model/SiteTreeTest_Extension.php | 5 ++ tests/php/Model/SiteTreeTest_ExtensionA.php | 5 ++ tests/php/Model/SiteTreeTest_ExtensionB.php | 5 ++ .../SiteTreeTest_LegacyControllerName.php | 5 ++ ...eeTest_LegacyControllerName_Controller.php | 5 ++ tests/php/Model/SiteTreeTest_NotRoot.php | 5 ++ .../Model/SiteTreeTest_NullHtmlCleaner.php | 5 ++ tests/php/Model/SiteTreeTest_PageNode.php | 5 ++ .../Model/SiteTreeTest_PageNodeController.php | 5 ++ .../Model/SiteTreeTest_StageStatusInherit.php | 5 ++ tests/php/Model/VirtualPageTest.php | 5 +- tests/php/Model/VirtualPageTest_ClassA.php | 5 ++ .../VirtualPageTest_ClassAController.php | 5 ++ tests/php/Model/VirtualPageTest_ClassB.php | 5 ++ tests/php/Model/VirtualPageTest_ClassC.php | 5 ++ tests/php/Model/VirtualPageTest_NotRoot.php | 5 ++ .../Model/VirtualPageTest_PageExtension.php | 5 ++ ...irtualPageTest_PageWithAllowedChildren.php | 5 ++ .../php/Model/VirtualPageTest_TestDBField.php | 5 ++ .../Model/VirtualPageTest_VirtualPageSub.php | 5 ++ tests/php/Reports/CmsReportsTest.php | 5 ++ tests/php/Search/CMSMainSearchFormTest.php | 5 ++ tests/php/Search/SearchFormTest.php | 5 ++ .../Tasks/MigrateSiteTreeLinkingTaskTest.php | 5 ++ .../php/Tasks/RemoveOrphanedPagesTaskTest.php | 5 ++ 71 files changed, 419 insertions(+), 2 deletions(-) diff --git a/.upgrade.yml b/.upgrade.yml index e9039eb2..4038b207 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -76,5 +76,75 @@ mappings: URLSegmentField: SilverStripe\CMS\Forms\SiteTreeURLSegmentField CMSPagesController_Tools_ss: SilverStripe\CMS\Controllers\CMSPagesController LeftAndMain: SilverStripe\Admin\LeftAndMain + CMSBatchActionsTest: SilverStripe\CMS\Tests\CMSBatchActionsTest + CMSMainTest: SilverStripe\CMS\Tests\CMSMainTest + CMSMainTest_ClassA: SilverStripe\CMS\Tests\CMSMainTest_ClassA + CMSMainTest_ClassB: SilverStripe\CMS\Tests\CMSMainTest_ClassB + CMSMainTest_HiddenClass: SilverStripe\CMS\Tests\CMSMainTest_HiddenClass + CMSMainTest_NotRoot: SilverStripe\CMS\Tests\CMSMainTest_NotRoot + CMSPageHistoryControllerTest: SilverStripe\CMS\Tests\CMSPageHistoryControllerTest + CMSSiteTreeFilterTest: SilverStripe\CMS\Tests\CMSSiteTreeFilterTest + CMSTreeTest: SilverStripe\CMS\Tests\CMSTreeTest + ContentControllerPermissionsTest: SilverStripe\CMS\Tests\ContentControllerPermissionsTest + ContentControllerSearchExtensionTest: SilverStripe\CMS\Tests\ContentControllerSearchExtensionTest + ContentControllerTest: SilverStripe\CMS\Tests\ContentControllerTest + ContentControllerTest_Page: SilverStripe\CMS\Tests\ContentControllerTest_Page + ContentControllerTest_PageController: SilverStripe\CMS\Tests\ContentControllerTest_PageController + ContentControllerTestPage: SilverStripe\CMS\Tests\ContentControllerTestPage + ContentControllerTestPageController: SilverStripe\CMS\Tests\ContentControllerTestPageController + ContentControllerTestPageWithoutController: SilverStripe\CMS\Tests\ContentControllerTestPageWithoutController + ModelAsControllerTest: SilverStripe\CMS\Tests\ModelAsControllerTest + RootURLControllerTest: SilverStripe\CMS\Tests\RootURLControllerTest + SilverStripeNavigatorTest: SilverStripe\CMS\Tests\SilverStripeNavigatorTest + SilverStripeNavigatorTest_ProtectedTestItem: SilverStripe\CMS\Tests\SilverStripeNavigatorTest_ProtectedTestItem + SilverStripeNavigatorTest_TestItem: SilverStripe\CMS\Tests\SilverStripeNavigatorTest_TestItem + FileLinkTrackingTest: SilverStripe\CMS\Tests\FileLinkTrackingTest + RedirectorPageTest: SilverStripe\CMS\Tests\RedirectorPageTest + RedirectorPageTest_RedirectExtension: SilverStripe\CMS\Tests\RedirectorPageTest_RedirectExtension + SiteTreeActionsTest: SilverStripe\CMS\Tests\SiteTreeActionsTest + SiteTreeActionsTest_Page: SilverStripe\CMS\Tests\SiteTreeActionsTest_Page + SiteTreeBacklinksTest: SilverStripe\CMS\Tests\SiteTreeBacklinksTest + SiteTreeBacklinksTest_DOD: SilverStripe\CMS\Tests\SiteTreeBacklinksTest_DOD + SiteTreeBrokenLinksTest: SilverStripe\CMS\Tests\SiteTreeBrokenLinksTest + SiteTreeHTMLEditorFieldTest: SilverStripe\CMS\Tests\SiteTreeHTMLEditorFieldTest + SiteTreeLinkTrackingTest: SilverStripe\CMS\Tests\SiteTreeLinkTrackingTest + SiteTreePermissionsTest: SilverStripe\CMS\Tests\SiteTreePermissionsTest + SiteTreeTest: SilverStripe\CMS\Tests\SiteTreeTest + SiteTreeTest_AdminDenied: SilverStripe\CMS\Tests\SiteTreeTest_AdminDenied + SiteTreeTest_AdminDeniedExtension: SilverStripe\CMS\Tests\SiteTreeTest_AdminDeniedExtension + SiteTreeTest_ClassA: SilverStripe\CMS\Tests\SiteTreeTest_ClassA + SiteTreeTest_ClassB: SilverStripe\CMS\Tests\SiteTreeTest_ClassB + SiteTreeTest_ClassC: SilverStripe\CMS\Tests\SiteTreeTest_ClassC + SiteTreeTest_ClassCext: SilverStripe\CMS\Tests\SiteTreeTest_ClassCext + SiteTreeTest_ClassD: SilverStripe\CMS\Tests\SiteTreeTest_ClassD + SiteTreeTest_ClassE: SilverStripe\CMS\Tests\SiteTreeTest_ClassE + SiteTreeTest_Conflicted: SilverStripe\CMS\Tests\SiteTreeTest_Conflicted + SiteTreeTest_ConflictedController: SilverStripe\CMS\Tests\SiteTreeTest_ConflictedController + SiteTreeTest_DataObject: SilverStripe\CMS\Tests\SiteTreeTest_DataObject + SiteTreeTest_Extension: SilverStripe\CMS\Tests\SiteTreeTest_Extension + SiteTreeTest_ExtensionA: SilverStripe\CMS\Tests\SiteTreeTest_ExtensionA + SiteTreeTest_ExtensionB: SilverStripe\CMS\Tests\SiteTreeTest_ExtensionB + SiteTreeTest_LegacyControllerName: SilverStripe\CMS\Tests\SiteTreeTest_LegacyControllerName + SiteTreeTest_LegacyControllerName_Controller: SilverStripe\CMS\Tests\SiteTreeTest_LegacyControllerName_Controller + SiteTreeTest_NotRoot: SilverStripe\CMS\Tests\SiteTreeTest_NotRoot + SiteTreeTest_NullHtmlCleaner: SilverStripe\CMS\Tests\SiteTreeTest_NullHtmlCleaner + SiteTreeTest_PageNode: SilverStripe\CMS\Tests\SiteTreeTest_PageNode + SiteTreeTest_PageNodeController: SilverStripe\CMS\Tests\SiteTreeTest_PageNodeController + SiteTreeTest_StageStatusInherit: SilverStripe\CMS\Tests\SiteTreeTest_StageStatusInherit + VirtualPageTest: SilverStripe\CMS\Tests\VirtualPageTest + VirtualPageTest_ClassA: SilverStripe\CMS\Tests\VirtualPageTest_ClassA + VirtualPageTest_ClassAController: SilverStripe\CMS\Tests\VirtualPageTest_ClassAController + VirtualPageTest_ClassB: SilverStripe\CMS\Tests\VirtualPageTest_ClassB + VirtualPageTest_ClassC: SilverStripe\CMS\Tests\VirtualPageTest_ClassC + VirtualPageTest_NotRoot: SilverStripe\CMS\Tests\VirtualPageTest_NotRoot + VirtualPageTest_PageExtension: SilverStripe\CMS\Tests\VirtualPageTest_PageExtension + VirtualPageTest_PageWithAllowedChildren: SilverStripe\CMS\Tests\VirtualPageTest_PageWithAllowedChildren + VirtualPageTest_TestDBField: SilverStripe\CMS\Tests\VirtualPageTest_TestDBField + VirtualPageTest_VirtualPageSub: SilverStripe\CMS\Tests\VirtualPageTest_VirtualPageSub + CmsReportsTest: SilverStripe\CMS\Tests\CmsReportsTest + CMSMainSearchFormTest: SilverStripe\CMS\Tests\CMSMainSearchFormTest + ZZZSearchFormTest: SilverStripe\CMS\Tests\ZZZSearchFormTest + MigrateSiteTreeLinkingTaskTest: SilverStripe\CMS\Tests\MigrateSiteTreeLinkingTaskTest + RemoveOrphanedPagesTaskTest: SilverStripe\CMS\Tests\RemoveOrphanedPagesTaskTest excludedPaths: - '*/_config/legacy.yml' diff --git a/tests/php/Controllers/CMSBatchActionsTest.php b/tests/php/Controllers/CMSBatchActionsTest.php index 8196f18b..eb4ef570 100644 --- a/tests/php/Controllers/CMSBatchActionsTest.php +++ b/tests/php/Controllers/CMSBatchActionsTest.php @@ -1,5 +1,8 @@ Fixture tree * From 4f6af36369826f79e8411863a41b49136507d6cf Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 9 Aug 2017 14:53:38 +1200 Subject: [PATCH 3/3] Manual fixes to automatic namespacing --- .travis.yml | 2 +- composer.json | 6 +- phpcs.xml.dist | 4 - tests/php/Controllers/CMSBatchActionsTest.php | 5 +- tests/php/Controllers/CMSMainTest.php | 50 +++++------ tests/php/Controllers/CMSMainTest_ClassA.php | 8 +- tests/php/Controllers/CMSMainTest_ClassB.php | 6 +- .../Controllers/CMSMainTest_HiddenClass.php | 4 +- tests/php/Controllers/CMSMainTest_NotRoot.php | 6 +- .../CMSPageHistoryControllerTest.php | 8 +- .../php/Controllers/CMSSiteTreeFilterTest.php | 11 +-- tests/php/Controllers/CMSTreeTest.php | 5 +- .../ContentControllerPermissionsTest.php | 9 +- .../ContentControllerSearchExtensionTest.php | 4 +- .../php/Controllers/ContentControllerTest.php | 43 +++++----- .../php/Controllers/ContentControllerTest.yml | 8 +- .../Controllers/ContentControllerTestPage.php | 6 +- .../ContentControllerTestPageController.php | 4 +- ...entControllerTestPageWithoutController.php | 4 +- .../ContentControllerTest_Page.php | 6 +- .../ContentControllerTest_PageController.php | 4 +- .../php/Controllers/ModelAsControllerTest.php | 9 +- .../php/Controllers/RootURLControllerTest.php | 9 +- .../Controllers/SilverStripeNavigatorTest.php | 25 ++---- ...rStripeNavigatorTest_ProtectedTestItem.php | 4 +- .../SilverStripeNavigatorTest_TestItem.php | 5 +- ...tentControllerTestPageWithoutController.ss | 0 .../ContentControllerTestPage_test.ss | 0 tests/php/Model/FileLinkTrackingTest.php | 7 +- tests/php/Model/RedirectorPageTest.php | 11 +-- .../RedirectorPageTest_RedirectExtension.php | 6 +- tests/php/Model/SiteTreeActionsTest.php | 17 ++-- tests/php/Model/SiteTreeActionsTest_Page.php | 4 +- tests/php/Model/SiteTreeBacklinksTest.php | 13 +-- tests/php/Model/SiteTreeBacklinksTest_DOD.php | 5 +- tests/php/Model/SiteTreeBrokenLinksTest.php | 7 +- .../php/Model/SiteTreeHTMLEditorFieldTest.php | 17 ++-- tests/php/Model/SiteTreeLinkTrackingTest.php | 4 +- tests/php/Model/SiteTreePermissionsTest.php | 17 ++-- tests/php/Model/SiteTreeTest.php | 55 +++++------- tests/php/Model/SiteTreeTest.yml | 6 +- tests/php/Model/SiteTreeTest_AdminDenied.php | 12 +-- .../SiteTreeTest_AdminDeniedExtension.php | 5 +- tests/php/Model/SiteTreeTest_ClassA.php | 6 +- tests/php/Model/SiteTreeTest_ClassB.php | 10 ++- tests/php/Model/SiteTreeTest_ClassC.php | 6 +- tests/php/Model/SiteTreeTest_ClassCext.php | 11 +-- tests/php/Model/SiteTreeTest_ClassD.php | 14 ++-- tests/php/Model/SiteTreeTest_ClassE.php | 6 +- tests/php/Model/SiteTreeTest_Conflicted.php | 6 +- .../SiteTreeTest_ConflictedController.php | 5 +- tests/php/Model/SiteTreeTest_DataObject.php | 7 +- tests/php/Model/SiteTreeTest_Extension.php | 5 +- tests/php/Model/SiteTreeTest_ExtensionA.php | 5 +- tests/php/Model/SiteTreeTest_ExtensionB.php | 5 +- .../SiteTreeTest_LegacyControllerName.php | 6 +- ...eeTest_LegacyControllerName_Controller.php | 4 +- tests/php/Model/SiteTreeTest_NotRoot.php | 6 +- .../Model/SiteTreeTest_NullHtmlCleaner.php | 5 +- tests/php/Model/SiteTreeTest_PageNode.php | 6 +- .../Model/SiteTreeTest_PageNodeController.php | 4 +- .../Model/SiteTreeTest_StageStatusInherit.php | 7 +- tests/php/Model/VirtualPageTest.php | 84 ++++++++++++------- tests/php/Model/VirtualPageTest.yml | 4 +- tests/php/Model/VirtualPageTest_ClassA.php | 12 +-- .../VirtualPageTest_ClassAController.php | 4 +- tests/php/Model/VirtualPageTest_ClassB.php | 10 ++- tests/php/Model/VirtualPageTest_ClassC.php | 6 +- tests/php/Model/VirtualPageTest_NotRoot.php | 6 +- .../Model/VirtualPageTest_PageExtension.php | 5 +- ...irtualPageTest_PageWithAllowedChildren.php | 6 +- .../php/Model/VirtualPageTest_TestDBField.php | 5 +- .../Model/VirtualPageTest_VirtualPageSub.php | 7 +- .../Tests/Model}/VirtualPageTest_ClassA.ss | 0 tests/php/Reports/CmsReportsTest.php | 16 +--- tests/php/Search/CMSMainSearchFormTest.php | 11 +-- tests/php/Search/SearchFormTest.php | 23 ++--- .../Tasks/MigrateSiteTreeLinkingTaskTest.php | 33 +++----- .../php/Tasks/RemoveOrphanedPagesTaskTest.php | 9 +- 79 files changed, 313 insertions(+), 493 deletions(-) rename tests/php/Controllers/themes/controllertest/templates/{ => SilverStripe/CMS/Tests/Controllers}/ContentControllerTestPageWithoutController.ss (100%) rename tests/php/Controllers/themes/controllertest/templates/{ => SilverStripe/CMS/Tests/Controllers}/ContentControllerTestPage_test.ss (100%) rename tests/php/Model/themes/virtualpagetest/templates/{ => SilverStripe/CMS/Tests/Model}/VirtualPageTest_ClassA.ss (100%) diff --git a/.travis.yml b/.travis.yml index c39d558d..9c43f4ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ before_script: - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi script: - - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests flush=1; fi + - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests/php/ flush=1; fi - if [[ $BEHAT_TEST ]]; then vendor/bin/behat @cms; fi - if [[ $NPM_TEST ]]; then git diff-files --quiet -w --relative=client; fi - if [[ $NPM_TEST ]]; then git diff -w --no-color --relative=client; fi diff --git a/composer.json b/composer.json index 9a7a0cf3..a964d82d 100644 --- a/composer.json +++ b/composer.json @@ -40,14 +40,16 @@ } }, "scripts": { - "lint": "phpcs -s code/ tests/" + "lint": "phpcs -s code/ tests/php/ tests/behat/src/", + "lint-clean": "phpcbf code/ tests/php/ tests/behat/src/" }, "autoload": { "psr-4": { "SilverStripe\\CMS\\": "code/", + "SilverStripe\\CMS\\Tests\\": "code/php/", "SilverStripe\\CMS\\Tests\\Behaviour\\": "tests/behat/src/" } }, "prefer-stable": true, "minimum-stability": "dev" -} \ No newline at end of file +} diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 7ea013ab..0238f051 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -9,10 +9,6 @@ - - - - diff --git a/tests/php/Controllers/CMSBatchActionsTest.php b/tests/php/Controllers/CMSBatchActionsTest.php index eb4ef570..9a8a8363 100644 --- a/tests/php/Controllers/CMSBatchActionsTest.php +++ b/tests/php/Controllers/CMSBatchActionsTest.php @@ -1,7 +1,6 @@ get(CacheInterface::class . '.CMSMain_SiteTreeHints'); // Login as user with root creation privileges - $user = $this->objFromFixture('SilverStripe\\Security\\Member', 'rootedituser'); + $user = $this->objFromFixture(Member::class, 'rootedituser'); Security::setCurrentUser($user); $cache->clear(); - $rawHints = singleton('SilverStripe\\CMS\\Controllers\\CMSMain')->SiteTreeHints(); + $rawHints = singleton(CMSMain::class)->SiteTreeHints(); $this->assertNotNull($rawHints); $rawHints = preg_replace('/^"(.*)"$/', '$1', Convert::xml2raw($rawHints)); @@ -70,25 +62,25 @@ class CMSMainTest extends FunctionalTest $this->assertArrayHasKey('All', $hints); $this->assertArrayHasKey( - 'CMSMainTest_ClassA', + CMSMainTest_ClassA::class, $hints['All'], 'Global list shows allowed classes' ); $this->assertArrayNotHasKey( - 'CMSMainTest_HiddenClass', + CMSMainTest_HiddenClass::class, $hints['All'], 'Global list does not list hidden classes' ); $this->assertNotContains( - 'CMSMainTest_ClassA', + CMSMainTest_ClassA::class, $hints['Root']['disallowedChildren'], 'Limits root classes' ); $this->assertContains( - 'CMSMainTest_NotRoot', + CMSMainTest_NotRoot::class, $hints['Root']['disallowedChildren'], 'Limits root classes' ); @@ -118,7 +110,7 @@ class CMSMainTest extends FunctionalTest // But it can create a ClassB $this->assertNotContains( - 'CMSMainTest_ClassB', + CMSMainTest_ClassB::class, $children, 'Limited parent omits explicitly allowed classes in disallowedChildren' ); @@ -131,7 +123,7 @@ class CMSMainTest extends FunctionalTest { $page1 = $this->objFromFixture(Page::class, "page1"); $page2 = $this->objFromFixture(Page::class, "page2"); - $this->session()->set('loggedInAs', $this->idFromFixture('SilverStripe\\Security\\Member', 'admin')); + $this->session()->set('loggedInAs', $this->idFromFixture(Member::class, 'admin')); $response = $this->get('admin/pages/publishall?confirm=1'); $this->assertContains( @@ -283,8 +275,8 @@ class CMSMainTest extends FunctionalTest $origFollow = $this->autoFollowRedirection; $this->autoFollowRedirection = false; - $cmsUser = $this->objFromFixture('SilverStripe\\Security\\Member', 'allcmssectionsuser'); - $rootEditUser = $this->objFromFixture('SilverStripe\\Security\\Member', 'rootedituser'); + $cmsUser = $this->objFromFixture(Member::class, 'allcmssectionsuser'); + $rootEditUser = $this->objFromFixture(Member::class, 'rootedituser'); // with insufficient permissions Security::setCurrentUser($cmsUser); @@ -337,7 +329,7 @@ class CMSMainTest extends FunctionalTest $origFollow = $this->autoFollowRedirection; $this->autoFollowRedirection = false; - $adminUser = $this->objFromFixture('SilverStripe\\Security\\Member', 'admin'); + $adminUser = $this->objFromFixture(Member::class, 'admin'); Security::setCurrentUser($adminUser); // Create toplevel page @@ -346,7 +338,7 @@ class CMSMainTest extends FunctionalTest 'admin/pages/add/AddForm', array( 'ParentID' => '0', - 'PageType' => 'CMSMainTest_ClassA', + 'PageType' => CMSMainTest_ClassA::class, 'Locale' => 'en_US', 'action_doAdd' => 1, 'ajax' => 1 @@ -366,7 +358,7 @@ class CMSMainTest extends FunctionalTest 'admin/pages/add/AddForm', array( 'ParentID' => $newPageId, - 'PageType' => 'CMSMainTest_ClassB', + 'PageType' => CMSMainTest_ClassB::class, 'Locale' => 'en_US', 'action_doAdd' => 1, 'ajax' => 1 @@ -412,7 +404,7 @@ class CMSMainTest extends FunctionalTest { $page3 = $this->objFromFixture(Page::class, 'page3'); $page31 = $this->objFromFixture(Page::class, 'page31'); - $adminuser = $this->objFromFixture('SilverStripe\\Security\\Member', 'admin'); + $adminuser = $this->objFromFixture(Member::class, 'admin'); Security::setCurrentUser($adminuser); $response = $this->get('admin/pages/edit/show/' . $page31->ID); @@ -572,17 +564,17 @@ class CMSMainTest extends FunctionalTest $page->write(); $form = $cms->getEditForm($page->ID); - $form->loadDataFrom(['ClassName' => 'CMSMainTest_ClassB']); + $form->loadDataFrom(['ClassName' => CMSMainTest_ClassB::class]); $result = $cms->save([ 'ID' => $page->ID, - 'ClassName' => 'CMSMainTest_ClassB' + 'ClassName' => CMSMainTest_ClassB::class ], $form); $this->assertEquals(200, $result->getStatusCode()); $newPage = SiteTree::get()->byID($page->ID); - $this->assertInstanceOf('CMSMainTest_ClassB', $newPage); - $this->assertEquals('CMSMainTest_ClassB', $newPage->ClassName); + $this->assertInstanceOf(CMSMainTest_ClassB::class, $newPage); + $this->assertEquals(CMSMainTest_ClassB::class, $newPage->ClassName); $this->assertEquals('Class A', $newPage->Title); } } diff --git a/tests/php/Controllers/CMSMainTest_ClassA.php b/tests/php/Controllers/CMSMainTest_ClassA.php index b5751557..9f507739 100644 --- a/tests/php/Controllers/CMSMainTest_ClassA.php +++ b/tests/php/Controllers/CMSMainTest_ClassA.php @@ -1,16 +1,16 @@ ID; $deletedPage->delete(); $deletedPage = Versioned::get_one_by_stage( - 'SilverStripe\\CMS\\Model\\SiteTree', + SiteTree::class, 'Live', array('"SiteTree_Live"."ID"' => $deletedPageID) ); @@ -130,7 +127,7 @@ class CMSSiteTreeFilterTest extends SapphireTest { $draftPage = $this->objFromFixture('Page', 'page4'); $draftPage = Versioned::get_one_by_stage( - 'SilverStripe\\CMS\\Model\\SiteTree', + SiteTree::class, 'Stage', sprintf('"SiteTree"."ID" = %d', $draftPage->ID) ); @@ -168,7 +165,7 @@ class CMSSiteTreeFilterTest extends SapphireTest $removedDraftPage->publishRecursive(); $removedDraftPage->deleteFromStage('Stage'); $removedDraftPage = Versioned::get_one_by_stage( - 'SilverStripe\\CMS\\Model\\SiteTree', + SiteTree::class, 'Live', sprintf('"SiteTree"."ID" = %d', $removedDraftPage->ID) ); diff --git a/tests/php/Controllers/CMSTreeTest.php b/tests/php/Controllers/CMSTreeTest.php index 477e55f5..7462e82d 100644 --- a/tests/php/Controllers/CMSTreeTest.php +++ b/tests/php/Controllers/CMSTreeTest.php @@ -1,14 +1,11 @@ ParentID = $parentID; - $page->Title = "Page Level $i"; + $page->Title = "Page Level $i"; $page->URLSegment = "level-$i"; $page->write(); @@ -159,13 +152,11 @@ class ContentControllerTest extends FunctionalTest /** * Tests that {@link ContentController::getViewer()} chooses the correct templates. * - * @covers SilverStripe\CMS\Controllers\ContentController::getViewer() - **/ + * @covers \SilverStripe\CMS\Controllers\ContentController::getViewer() + **/ public function testGetViewer() { - - $self = $this; - $this->useTestTheme(dirname(__FILE__), 'controllertest', function () use ($self) { + $this->useTestTheme(__DIR__, 'controllertest', function () { // Test a page without a controller (ContentControllerTest_PageWithoutController.ss) $page = new ContentControllerTestPageWithoutController(); @@ -173,8 +164,8 @@ class ContentControllerTest extends FunctionalTest $page->write(); $page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); - $response = $self->get($page->RelativeLink()); - $self->assertEquals("ContentControllerTestPageWithoutController", trim($response->getBody())); + $response = $this->get($page->RelativeLink()); + $this->assertEquals("ContentControllerTestPageWithoutController", trim($response->getBody())); // // This should fall over to user Page.ss $page = new ContentControllerTestPage(); @@ -182,8 +173,8 @@ class ContentControllerTest extends FunctionalTest $page->write(); $page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); - $response = $self->get($page->RelativeLink()); - $self->assertEquals("Page", trim($response->getBody())); + $response = $this->get($page->RelativeLink()); + $this->assertEquals("Page", trim($response->getBody())); // Test that the action template is rendered. @@ -192,20 +183,24 @@ class ContentControllerTest extends FunctionalTest $page->write(); $page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); - $response = $self->get($page->RelativeLink("test")); - $self->assertEquals("ContentControllerTestPage_test", trim($response->getBody())); + $response = $this->get($page->RelativeLink("test")); + $this->assertEquals("ContentControllerTestPage_test", trim($response->getBody())); // Test that an action without a template will default to the index template, which is // to say the default Page.ss template - $response = $self->get($page->RelativeLink("testwithouttemplate")); - $self->assertEquals("Page", trim($response->getBody())); + $response = $this->get($page->RelativeLink("testwithouttemplate")); + $this->assertEquals("Page", trim($response->getBody())); // Test that an action with a template will render the both action template *and* the // correct parent template $controller = new ContentController($page); $viewer = $controller->getViewer('test'); - $templateList = array('ContentControllerTestPage_test', 'Page'); - $self->assertEquals(dirname(__FILE__).'/themes/controllertest/templates/ContentControllerTestPage_test.ss', $viewer->templates()['main']); + $this->assertEquals( + __DIR__ + . '/themes/controllertest/templates/SilverStripe/CMS/Tests/Controllers/' + . 'ContentControllerTestPage_test.ss', + $viewer->templates()['main'] + ); }); } } diff --git a/tests/php/Controllers/ContentControllerTest.yml b/tests/php/Controllers/ContentControllerTest.yml index dd65c4c3..d317dc76 100644 --- a/tests/php/Controllers/ContentControllerTest.yml +++ b/tests/php/Controllers/ContentControllerTest.yml @@ -21,22 +21,22 @@ SilverStripe\Security\Member: Surname: Administrator Groups: =>SilverStripe\Security\Group.admins -ContentControllerTest_Page: +SilverStripe\CMS\Tests\Controllers\ContentControllerTest_Page: root_page: Title: Home Page URLSegment: home second_level_page: Title: Second Level Page URLSegment: second-level - Parent: =>ContentControllerTest_Page.root_page + Parent: =>SilverStripe\CMS\Tests\Controllers\ContentControllerTest_Page.root_page third_level_page: Title: Third Level Page URLSegment: third-level - Parent: =>ContentControllerTest_Page.second_level_page + Parent: =>SilverStripe\CMS\Tests\Controllers\ContentControllerTest_Page.second_level_page third_level_page_2: Title: Third Level Page Two URLSegment: third-level-2 - Parent: =>ContentControllerTest_Page.second_level_page + Parent: =>SilverStripe\CMS\Tests\Controllers\ContentControllerTest_Page.second_level_page contact_page: Title: Contact Page URLSegment: contact diff --git a/tests/php/Controllers/ContentControllerTestPage.php b/tests/php/Controllers/ContentControllerTestPage.php index 70b28c75..0c67a3b7 100644 --- a/tests/php/Controllers/ContentControllerTestPage.php +++ b/tests/php/Controllers/ContentControllerTestPage.php @@ -1,13 +1,11 @@ assertContains( - 'SilverStripeNavigatorTest_TestItem', + SilverStripeNavigatorTest_TestItem::class, $classes, 'Autodiscovers new classes' ); @@ -54,11 +41,11 @@ class SilverStripeNavigatorTest extends SapphireTest $this->logInWithPermission('CMS_ACCESS_CMSMain'); $items = $navigator->getItems(); $classes = array_map('get_class', $items->toArray()); - $this->assertNotContains('SilverStripeNavigatorTest_ProtectedTestItem', $classes); + $this->assertNotContains(SilverStripeNavigatorTest_ProtectedTestItem::class, $classes); $this->logInWithPermission('ADMIN'); $items = $navigator->getItems(); $classes = array_map('get_class', $items->toArray()); - $this->assertContains('SilverStripeNavigatorTest_ProtectedTestItem', $classes); + $this->assertContains(SilverStripeNavigatorTest_ProtectedTestItem::class, $classes); } } diff --git a/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php b/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php index a95d407a..0343a101 100644 --- a/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php +++ b/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php @@ -1,14 +1,12 @@ objFromFixture(RedirectorPage::class, 'goodinternal'); - RedirectorPageController::add_extension('RedirectorPageTest_RedirectExtension'); + RedirectorPageController::add_extension(RedirectorPageTest_RedirectExtension::class); $response = $this->get($page->regularLink()); $this->assertEquals(302, $response->getStatusCode()); $this->assertEquals('http://www.mysite.com/foo', $response->getHeader('Location')); - RedirectorPageController::remove_extension('RedirectorPageTest_RedirectExtension'); + RedirectorPageController::remove_extension(RedirectorPageTest_RedirectExtension::class); } public function testNoJSLinksAllowed() diff --git a/tests/php/Model/RedirectorPageTest_RedirectExtension.php b/tests/php/Model/RedirectorPageTest_RedirectExtension.php index c2bb79ce..6af5e2af 100644 --- a/tests/php/Model/RedirectorPageTest_RedirectExtension.php +++ b/tests/php/Model/RedirectorPageTest_RedirectExtension.php @@ -1,16 +1,12 @@ owner->redirect('/foo'); diff --git a/tests/php/Model/SiteTreeActionsTest.php b/tests/php/Model/SiteTreeActionsTest.php index 8484f251..08aa185c 100644 --- a/tests/php/Model/SiteTreeActionsTest.php +++ b/tests/php/Model/SiteTreeActionsTest.php @@ -1,18 +1,14 @@ objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home'); + $sitetree = $this->objFromFixture(SiteTree::class, 'home'); $editor = new HTMLEditorField('Content'); - $aboutID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'about'); - $contactID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'contact'); + $aboutID = $this->idFromFixture(SiteTree::class, 'about'); + $contactID = $this->idFromFixture(SiteTree::class, 'contact'); $editor->setValue("Example Link"); $editor->saveInto($sitetree); @@ -82,7 +79,7 @@ class SiteTreeHTMLEditorFieldTest extends FunctionalTest public function testFileLinkTracking() { - $sitetree = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home'); + $sitetree = $this->objFromFixture(SiteTree::class, 'home'); $editor = new HTMLEditorField('Content'); $fileID = $this->idFromFixture('SilverStripe\\Assets\\File', 'example_file'); @@ -143,7 +140,7 @@ class SiteTreeHTMLEditorFieldTest extends FunctionalTest public function testImageTracking() { - $sitetree = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home'); + $sitetree = $this->objFromFixture(SiteTree::class, 'home'); $editor = new HTMLEditorField('Content'); $file = $this->objFromFixture('SilverStripe\\Assets\\Image', 'example_image'); @@ -180,7 +177,7 @@ class SiteTreeHTMLEditorFieldTest extends FunctionalTest $editor->setValue(sprintf( '

Working Link

', - $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home') + $this->idFromFixture(SiteTree::class, 'home') )); $sitetree->HasBrokenLink = false; $editor->saveInto($sitetree); diff --git a/tests/php/Model/SiteTreeLinkTrackingTest.php b/tests/php/Model/SiteTreeLinkTrackingTest.php index 5eeb34c0..8363af52 100644 --- a/tests/php/Model/SiteTreeLinkTrackingTest.php +++ b/tests/php/Model/SiteTreeLinkTrackingTest.php @@ -1,7 +1,6 @@ setParent($parent); - $this->assertInstanceOf('SiteTreeTest_PageNode', $child->Parent); + $this->assertInstanceOf(SiteTreeTest_PageNode::class, $child->Parent); } /** @@ -641,7 +628,7 @@ class SiteTreeTest extends SapphireTest $this->assertTrue(singleton(SiteTree::class)->canCreate(null, array('Parent' => singleton(SiteTree::class)))); //Test we don't check for allowedChildren on parent context if it's not SiteTree instance - $this->assertTrue(singleton(SiteTree::class)->canCreate(null, ['Parent' => $this->objFromFixture('SiteTreeTest_DataObject', 'relations')])); + $this->assertTrue(singleton(SiteTree::class)->canCreate(null, ['Parent' => $this->objFromFixture(SiteTreeTest_DataObject::class, 'relations')])); } public function testEditPermissionsOnDraftVsLive() @@ -696,7 +683,7 @@ class SiteTreeTest extends SapphireTest { // Necessary to avoid $oldCleanerClass = Diff::$html_cleaner_class; - Diff::$html_cleaner_class = 'SiteTreeTest_NullHtmlCleaner'; + Diff::$html_cleaner_class = SiteTreeTest_NullHtmlCleaner::class; $page = new Page(); $page->write(); @@ -953,7 +940,7 @@ class SiteTreeTest extends SapphireTest Config::modify()->set(SiteTree::class, 'nested_urls', true); $sitetree = new SiteTree(); - $sitetree->ParentID = $this->idFromFixture('SiteTreeTest_Conflicted', 'parent'); + $sitetree->ParentID = $this->idFromFixture(SiteTreeTest_Conflicted::class, 'parent'); $sitetree->URLSegment = 'index'; $this->assertFalse($sitetree->validURLSegment(), 'index is not a valid URLSegment'); @@ -974,11 +961,11 @@ class SiteTreeTest extends SapphireTest $sitetree->URLSegment = 'unique-segment'; $this->assertTrue($sitetree->validURLSegment()); - SiteTree::add_extension('SiteTreeTest_Extension'); + SiteTree::add_extension(SiteTreeTest_Extension::class); $sitetree = new SiteTree(); $sitetree->URLSegment = 'unique-segment'; $this->assertFalse($sitetree->validURLSegment()); - SiteTree::remove_extension('SiteTreeTest_Extension'); + SiteTree::remove_extension(SiteTreeTest_Extension::class); } public function testURLSegmentMultiByte() @@ -1430,6 +1417,6 @@ class SiteTreeTest extends SapphireTest public function testGetControllerNameWithUnderscoresIsSupported() { $class = new SiteTreeTest_LegacyControllerName; - $this->assertSame('SiteTreeTest_LegacyControllerName_Controller', $class->getControllerName()); + $this->assertEquals(SiteTreeTest_LegacyControllerName_Controller::class, $class->getControllerName()); } } diff --git a/tests/php/Model/SiteTreeTest.yml b/tests/php/Model/SiteTreeTest.yml index 68a4fff6..3b570f3b 100755 --- a/tests/php/Model/SiteTreeTest.yml +++ b/tests/php/Model/SiteTreeTest.yml @@ -113,7 +113,7 @@ Page: Title: 'Breadcrumbs 5' Parent: =>Page.breadcrumbs4 -SiteTreeTest_Conflicted: +SilverStripe\CMS\Tests\Model\SiteTreeTest_Conflicted: parent: Title: Parent @@ -124,7 +124,7 @@ SilverStripe\CMS\Model\RedirectorPage: RedirectionType: External ExternalURL: "http://www.google.com?a&b" -SiteTreeTest_DataObject: +SilverStripe\CMS\Tests\Model\SiteTreeTest_DataObject: relations: Title: 'Linked DataObject' - Pages: =>Page.home,=>Page.about,=>Page.staff \ No newline at end of file + Pages: =>Page.home,=>Page.about,=>Page.staff diff --git a/tests/php/Model/SiteTreeTest_AdminDenied.php b/tests/php/Model/SiteTreeTest_AdminDenied.php index 450cb470..7b50ccf1 100644 --- a/tests/php/Model/SiteTreeTest_AdminDenied.php +++ b/tests/php/Model/SiteTreeTest_AdminDenied.php @@ -1,15 +1,15 @@ array('SiteTreeSubsites', 'Translatable'), + SiteTree::class => [ + 'SiteTreeSubsites', + 'Translatable' + ], ); protected static $required_extensions = array( - SiteTree::class => array('VirtualPageTest_PageExtension') + SiteTree::class => [ + VirtualPageTest_PageExtension::class + ] ); public function setUp() @@ -47,7 +53,11 @@ class VirtualPageTest extends FunctionalTest // Add extra fields Config::modify()->merge(VirtualPage::class, 'initially_copied_fields', array('MyInitiallyCopiedField')); - Config::modify()->merge(VirtualPage::class, 'non_virtual_fields', array('MyNonVirtualField', 'MySharedNonVirtualField')); + Config::modify()->merge( + VirtualPage::class, + 'non_virtual_fields', + array('MyNonVirtualField', 'MySharedNonVirtualField') + ); } /** @@ -81,6 +91,7 @@ class VirtualPageTest extends FunctionalTest { $this->logInWithPermission('ADMIN'); + /** @var Page $master */ $master = $this->objFromFixture('Page', 'master'); $master->publishRecursive(); @@ -89,7 +100,9 @@ class VirtualPageTest extends FunctionalTest $master->Content = "

New content

"; $master->write(); + /** @var VirtualPage $vp1 */ $vp1 = DataObject::get_by_id(VirtualPage::class, $this->idFromFixture(VirtualPage::class, 'vp1')); + /** @var VirtualPage $vp2 */ $vp2 = DataObject::get_by_id(VirtualPage::class, $this->idFromFixture(VirtualPage::class, 'vp2')); $this->assertTrue($vp1->publishRecursive()); $this->assertTrue($vp2->publishRecursive()); @@ -222,6 +235,7 @@ class VirtualPageTest extends FunctionalTest /** @var Page $parentPage */ $parentPage = $this->objFromFixture('Page', 'master3'); $parentPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); + /** @var VirtualPage $virtualPage */ $virtualPage = $this->objFromFixture(VirtualPage::class, 'vp3'); $virtualPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); $cindy = $this->objFromFixture(Member::class, 'cindy'); @@ -310,10 +324,8 @@ class VirtualPageTest extends FunctionalTest $vp->flushCache(); $vp = DataObject::get_by_id(SiteTree::class, $vpID); $this->assertEquals($p->ID, $vp->CopyContentFromID); - - $vpLive = Versioned::get_one_by_stage(SiteTree::class, Versioned::LIVE, '"SiteTree"."ID" = ' . $vpID); + $vpLive = Versioned::get_by_stage(SiteTree::class, Versioned::LIVE)->byID($vpID); $this->assertNull($vpLive); - // Delete from draft, ensure virtual page deletion cascades $p->delete(); $vp->flushCache(); @@ -336,7 +348,6 @@ class VirtualPageTest extends FunctionalTest // All is fine, the virtual page doesn't have a broken link $this->assertFalse($vp->HasBrokenLink); - // Delete the source page from draft, cascades to virtual page $pID = $p->ID; $p->delete(); @@ -344,8 +355,8 @@ class VirtualPageTest extends FunctionalTest $vpDraft = Versioned::get_by_stage(SiteTree::class, Versioned::DRAFT) ->byID($pID); $this->assertNull($vpDraft); - // Delete the source page form live, confirm that the virtual page has also been unpublished + /** @var Page $pLive */ $pLive = Versioned::get_by_stage(SiteTree::class, Versioned::LIVE) ->byID($pID); $this->assertTrue($pLive->doUnpublish()); @@ -485,14 +496,19 @@ class VirtualPageTest extends FunctionalTest $nonVirtual = $virtual; - $nonVirtual->ClassName = 'VirtualPageTest_ClassA'; + $nonVirtual->ClassName = VirtualPageTest_ClassA::class; $nonVirtual->MySharedNonVirtualField = 'changed on new type'; $nonVirtual->write(); // not publishing the page type change here // Stage record is changed to the new type and no longer acts as a virtual page - $nonVirtualStage = Versioned::get_one_by_stage(SiteTree::class, 'Stage', '"SiteTree"."ID" = ' . $nonVirtual->ID, false); + $nonVirtualStage = Versioned::get_one_by_stage( + SiteTree::class, + 'Stage', + '"SiteTree"."ID" = ' . $nonVirtual->ID, + false + ); $this->assertNotNull($nonVirtualStage); - $this->assertEquals('VirtualPageTest_ClassA', $nonVirtualStage->ClassName); + $this->assertEquals(VirtualPageTest_ClassA::class, $nonVirtualStage->ClassName); $this->assertEquals('changed on new type', $nonVirtualStage->MySharedNonVirtualField); $this->assertEquals( 'original', @@ -501,9 +517,14 @@ class VirtualPageTest extends FunctionalTest ); // Virtual page on live keeps working as it should - $virtualLive = Versioned::get_one_by_stage(SiteTree::class, Versioned::LIVE, '"SiteTree_Live"."ID" = ' . $virtual->ID, false); + $virtualLive = Versioned::get_one_by_stage( + SiteTree::class, + Versioned::LIVE, + '"SiteTree_Live"."ID" = ' . $virtual->ID, + false + ); $this->assertNotNull($virtualLive); - $this->assertEquals('VirtualPageTest_VirtualPageSub', $virtualLive->ClassName); + $this->assertEquals(VirtualPageTest_VirtualPageSub::class, $virtualLive->ClassName); $this->assertEquals('virtual published field', $virtualLive->MySharedNonVirtualField); $this->assertEquals('published title', $virtualLive->Title); @@ -514,7 +535,12 @@ class VirtualPageTest extends FunctionalTest $page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); // Virtual page only notices changes to virtualised fields (Title) - $virtualLive = Versioned::get_one_by_stage(SiteTree::class, Versioned::LIVE, '"SiteTree_Live"."ID" = ' . $virtual->ID, false); + $virtualLive = Versioned::get_one_by_stage( + SiteTree::class, + Versioned::LIVE, + '"SiteTree_Live"."ID" = ' . $virtual->ID, + false + ); $this->assertEquals('virtual published field', $virtualLive->MySharedNonVirtualField); $this->assertEquals('title changed on original', $virtualLive->Title); } @@ -528,7 +554,7 @@ class VirtualPageTest extends FunctionalTest $virtual->CopyContentFromID = $page->ID; $virtual->write(); - $this->assertEquals('VirtualPageTest_TestDBField', $virtual->castingHelper('CastingTest')); + $this->assertEquals(VirtualPageTest_TestDBField::class, $virtual->castingHelper('CastingTest')); $this->assertEquals('SOME CONTENT', $virtual->obj('CastingTest')->forTemplate()); } @@ -611,10 +637,11 @@ class VirtualPageTest extends FunctionalTest public function testMethod() { + /** @var VirtualPage $virtualPage */ $virtualPage = $this->objFromFixture(VirtualPage::class, 'vp4'); + /** @var VirtualPageTest_ClassAController $controller */ $controller = ModelAsController::controller_for($virtualPage); - - $this->assertInstanceOf('VirtualPageTest_ClassAController', $controller); + $this->assertInstanceOf(VirtualPageTest_ClassAController::class, $controller); $this->assertTrue($controller->hasMethod('testMethod')); $this->assertEquals('hello', $controller->testMethod()); $this->assertTrue($controller->hasMethod('modelMethod')); @@ -623,6 +650,7 @@ class VirtualPageTest extends FunctionalTest public function testAllowedActions() { + /** @var VirtualPage $virtualPage */ $virtualPage = $this->objFromFixture(VirtualPage::class, 'vp4'); $controller = ModelAsController::controller_for($virtualPage); $this->assertContains('testaction', $controller->allowedActions()); diff --git a/tests/php/Model/VirtualPageTest.yml b/tests/php/Model/VirtualPageTest.yml index 75a82946..59571e47 100644 --- a/tests/php/Model/VirtualPageTest.yml +++ b/tests/php/Model/VirtualPageTest.yml @@ -45,7 +45,7 @@ Page: CanEditType: OnlyTheseUsers CanViewType: Inherit EditorGroups: =>SilverStripe\Security\Group.bobgroup -VirtualPageTest_ClassA: +SilverStripe\CMS\Tests\Model\VirtualPageTest_ClassA: pagea: Title: 'Page A' Content: '

Content

' @@ -66,5 +66,5 @@ SilverStripe\CMS\Model\VirtualPage: EditorGroups: =>SilverStripe\Security\Group.andrewgroup ViewerGroups: =>SilverStripe\Security\Group.cindygroup vp4: - CopyContentFrom: =>VirtualPageTest_ClassA.pagea + CopyContentFrom: =>SilverStripe\CMS\Tests\Model\VirtualPageTest_ClassA.pagea Title: 'vp4' diff --git a/tests/php/Model/VirtualPageTest_ClassA.php b/tests/php/Model/VirtualPageTest_ClassA.php index 6b20e998..3c11298e 100644 --- a/tests/php/Model/VirtualPageTest_ClassA.php +++ b/tests/php/Model/VirtualPageTest_ClassA.php @@ -1,22 +1,24 @@ 'Text', 'MyVirtualField' => 'Text', 'MyNonVirtualField' => 'Text', - 'CastingTest' => 'VirtualPageTest_TestDBField' + 'CastingTest' => VirtualPageTest_TestDBField::class, ); - private static $allowed_children = array('VirtualPageTest_ClassB'); + private static $allowed_children = [ + VirtualPageTest_ClassB::class, + ]; public function modelMethod() { diff --git a/tests/php/Model/VirtualPageTest_ClassAController.php b/tests/php/Model/VirtualPageTest_ClassAController.php index 3a386e9a..578d9db3 100644 --- a/tests/php/Model/VirtualPageTest_ClassAController.php +++ b/tests/php/Model/VirtualPageTest_ClassAController.php @@ -1,12 +1,10 @@ 'Varchar', ); diff --git a/tests/php/Model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss b/tests/php/Model/themes/virtualpagetest/templates/SilverStripe/CMS/Tests/Model/VirtualPageTest_ClassA.ss similarity index 100% rename from tests/php/Model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss rename to tests/php/Model/themes/virtualpagetest/templates/SilverStripe/CMS/Tests/Model/VirtualPageTest_ClassA.ss diff --git a/tests/php/Reports/CmsReportsTest.php b/tests/php/Reports/CmsReportsTest.php index 7ff83d92..03a8437d 100644 --- a/tests/php/Reports/CmsReportsTest.php +++ b/tests/php/Reports/CmsReportsTest.php @@ -1,7 +1,6 @@ session()->set('loggedInAs', $this->idFromFixture('SilverStripe\\Security\\Member', 'admin')); + $this->session()->set('loggedInAs', $this->idFromFixture(Member::class, 'admin')); $response = $this->get( 'admin/pages/SearchForm/?' . diff --git a/tests/php/Search/SearchFormTest.php b/tests/php/Search/SearchFormTest.php index 756ef471..617860af 100644 --- a/tests/php/Search/SearchFormTest.php +++ b/tests/php/Search/SearchFormTest.php @@ -1,30 +1,25 @@ idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home'); - $aboutID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'about'); - $staffID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'staff'); - $actionID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'action'); - $hashID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'hash_link'); + $homeID = $this->idFromFixture(SiteTree::class, 'home'); + $aboutID = $this->idFromFixture(SiteTree::class, 'about'); + $staffID = $this->idFromFixture(SiteTree::class, 'staff'); + $actionID = $this->idFromFixture(SiteTree::class, 'action'); + $hashID = $this->idFromFixture(SiteTree::class, 'hash_link'); $homeContent = sprintf( 'AboutStaffExternal Link', @@ -67,25 +60,25 @@ class MigrateSiteTreeLinkingTaskTest extends SapphireTest $this->assertEquals( $homeContent, - DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $homeID)->Content, + DataObject::get_by_id(SiteTree::class, $homeID)->Content, 'HTML URLSegment links are rewritten.' ); $this->assertEquals( $aboutContent, - DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $aboutID)->Content + DataObject::get_by_id(SiteTree::class, $aboutID)->Content ); $this->assertEquals( $staffContent, - DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $staffID)->Content + DataObject::get_by_id(SiteTree::class, $staffID)->Content ); $this->assertEquals( $actionContent, - DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $actionID)->Content, + DataObject::get_by_id(SiteTree::class, $actionID)->Content, 'Links to actions on pages are rewritten correctly.' ); $this->assertEquals( $hashLinkContent, - DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $hashID)->Content, + DataObject::get_by_id(SiteTree::class, $hashID)->Content, 'Hash/anchor links are correctly handled.' ); } diff --git a/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php b/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php index ba935e43..22577d71 100644 --- a/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php +++ b/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php @@ -1,13 +1,10 @@ Fixture tree * @@ -35,13 +32,9 @@ use SilverStripe\Dev\FunctionalTest; * * * @author Ingo Schommer (@silverstripe.com), SilverStripe Ltd. - * - * @package cms - * @subpackage tests */ class RemoveOrphanedPagesTaskTest extends FunctionalTest { - protected static $fixture_file = 'RemoveOrphanedPagesTaskTest.yml'; protected static $use_draft_site = false;