diff --git a/.upgrade.yml b/.upgrade.yml index eb8ba58b0..ed2595e89 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -5,7 +5,6 @@ mappings: DatabaseAdmin: SilverStripe\ORM\DatabaseAdmin DataExtension: SilverStripe\ORM\DataExtension DataList: SilverStripe\ORM\DataList - DataModel: SilverStripe\ORM\DataModel DataObject: SilverStripe\ORM\DataObject DataObjectInterface: SilverStripe\ORM\DataObjectInterface DataObjectSchema: SilverStripe\ORM\DataObjectSchema @@ -118,8 +117,8 @@ mappings: Hierarchy: SilverStripe\ORM\Hierarchy\Hierarchy Authenticator: SilverStripe\Security\Authenticator BasicAuth: SilverStripe\Security\BasicAuth - ChangePasswordForm: SilverStripe\Security\ChangePasswordForm - CMSMemberLoginForm: SilverStripe\Security\CMSMemberLoginForm + ChangePasswordForm: SilverStripe\Security\MemberAuthenticator\ChangePasswordForm + CMSMemberLoginForm: SilverStripe\Security\MemberAuthenticator\CMSMemberLoginForm CMSSecurity: SilverStripe\Security\CMSSecurity Group: SilverStripe\Security\Group GroupCsvBulkLoader: SilverStripe\Security\GroupCsvBulkLoader @@ -128,9 +127,9 @@ mappings: Member: SilverStripe\Security\Member Member_GroupSet: SilverStripe\Security\Member_GroupSet Member_Validator: SilverStripe\Security\Member_Validator - MemberAuthenticator: SilverStripe\Security\MemberAuthenticator + MemberAuthenticator: SilverStripe\Security\MemberAuthenticator\MemberAuthenticator MemberCsvBulkLoader: SilverStripe\Security\MemberCsvBulkLoader - MemberLoginForm: SilverStripe\Security\MemberLoginForm + MemberLoginForm: SilverStripe\Security\MemberAuthenticator\MemberLoginForm MemberPassword: SilverStripe\Security\MemberPassword PasswordEncryptor: SilverStripe\Security\PasswordEncryptor PasswordEncryptor_Blowfish: SilverStripe\Security\PasswordEncryptor_Blowfish @@ -155,43 +154,18 @@ mappings: Security: SilverStripe\Security\Security SecurityToken: SilverStripe\Security\SecurityToken NullSecurityToken: SilverStripe\Security\NullSecurityToken - AdminRootController: SilverStripe\Admin\AdminRootController - CMSBatchAction: SilverStripe\Admin\CMSBatchAction - CMSBatchActionHandler: SilverStripe\Admin\CMSBatchActionHandler - CMSMenu: SilverStripe\Admin\CMSMenu - CMSMenuItem: SilverStripe\Admin\CMSMenuItem - CMSPreviewable: SilverStripe\ORM\CMSPreviewable - CMSProfileController: SilverStripe\Admin\CMSProfileController - GroupImportForm: SilverStripe\Admin\GroupImportForm - LeftAndMain: SilverStripe\Admin\LeftAndMain - LeftAndMain_HTTPResponse: SilverStripe\Admin\LeftAndMain_HTTPResponse - LeftAndMain_SearchFilter: SilverStripe\Admin\LeftAndMain_SearchFilter - LeftAndMainExtension: SilverStripe\Admin\LeftAndMainExtension - MemberImportForm: SilverStripe\Admin\MemberImportForm - ModelAdmin: SilverStripe\Admin\ModelAdmin - SecurityAdmin: SilverStripe\Admin\SecurityAdmin SilverStripe\Framework\Core\Configurable: SilverStripe\Core\Config\Configurable PaginatedList: SilverStripe\ORM\PaginatedList ArrayLib: SilverStripe\ORM\ArrayLib - SS_DAG: SilverStripe\Core\Config\Dag - SilverStripe\Core\Config\SS_DAG: SilverStripe\Core\Config\Dag - SS_DAG_CyclicException: SilverStripe\Core\Config\SS_DAG_CyclicException - SilverStripe\Core\Config\SS_DAG_CyclicException: SilverStripe\Core\Config\DAG_CyclicException - SS_DAG_Iterator: SilverStripe\Core\Config\Dag_Iterator - SilverStripe\Core\Config\SS_DAG_Iterator: SilverStripe\Core\Config\Dag_Iterator SilverStripe\Framework\Injector\Factory: SilverStripe\Core\Injector\Factory SilverStripe\Framework\Core\Extensible: SilverStripe\Core\Extensible SilverStripe\Framework\Core\Injectable: SilverStripe\Core\Injector\Injectable - SS_Cache: SilverStripe\Core\Cache - SilverStripe\Core\SS_Cache: SilverStripe\Core\Cache ClassInfo: SilverStripe\Core\ClassInfo Convert: SilverStripe\Core\Convert Extension: SilverStripe\Core\Extension Flushable: SilverStripe\Core\Flushable - Object: SilverStripe\Core\Object Config: SilverStripe\Core\Config\Config Config_ForClass: SilverStripe\Core\Config\Config_ForClass - Config_MemCache: SilverStripe\Core\Config\Config_MemCache AfterCallAspect: SilverStripe\Core\Injector\AfterCallAspect AopProxyService: SilverStripe\Core\Injector\AopProxyService BeforeCallAspect: SilverStripe\Core\Injector\BeforeCallAspect @@ -199,20 +173,11 @@ mappings: Injector: SilverStripe\Core\Injector\Injector ServiceConfigurationLocator: SilverStripe\Core\Injector\ServiceConfigurationLocator SilverStripeServiceConfigurationLocator: SilverStripe\Core\Injector\SilverStripeServiceConfigurationLocator - SS_ClassLoader: SilverStripe\Core\Manifest\SS_ClassLoader + SS_ClassLoader: SilverStripe\Core\Manifest\ClassLoader SilverStripe\Core\Manifest\SS_ClassLoader: SilverStripe\Core\Manifest\ClassLoader SS_ClassManifest: SilverStripe\Core\Manifest\ClassManifest SilverStripe\Core\Manifest\SS_ClassManifest: SilverStripe\Core\Manifest\ClassManifest - SS_ConfigManifest: SilverStripe\Core\Manifest\ConfigManifest - SilverStripe\Core\Manifest\SS_ConfigManifest: SilverStripe\Core\Manifest\ConfigManifest - SS_ConfigStaticManifest: SilverStripe\Core\Manifest\ConfigStaticManifest - SilverStripe\Core\Manifest\SS_ConfigStaticManifest: SilverStripe\Core\Manifest\ConfigStaticManifest - ManifestCache: SilverStripe\Core\Manifest\ManifestCache - ManifestCache_File: SilverStripe\Core\Manifest\ManifestCache_File - ManifestCache_File_PHP: SilverStripe\Core\Manifest\ManifestCache_File_PHP - ManifestCache_APC: SilverStripe\Core\Manifest\ManifestCache_APC ManifestFileFinder: SilverStripe\Core\Manifest\ManifestFileFinder - TokenisedRegularExpression: SilverStripe\Core\Manifest\TokenisedRegularExpression ErrorControlChain: SilverStripe\Core\Startup\ErrorControlChain ParameterConfirmationToken: SilverStripe\Core\Startup\ParameterConfirmationToken DatabaseAdapterRegistry: SilverStripe\Dev\Install\DatabaseAdapterRegistry @@ -227,7 +192,6 @@ mappings: SS_Cli: SilverStripe\Dev\CLI SilverStripe\Dev\SS_Cli: SilverStripe\Dev\CLI CliDebugView: SilverStripe\Dev\CliDebugView - CliTestReporter: SilverStripe\Dev\CliTestReporter CSSContentParser: SilverStripe\Dev\CSSContentParser CsvBulkLoader: SilverStripe\Dev\CsvBulkLoader CSVParser: SilverStripe\Dev\CSVParser @@ -244,11 +208,7 @@ mappings: SapphireInfo: SilverStripe\Dev\SapphireInfo SapphireREPL: SilverStripe\Dev\SapphireREPL SapphireTest: SilverStripe\Dev\SapphireTest - SapphireTestReporter: SilverStripe\Dev\SapphireTestReporter - SilverStripeListener: SilverStripe\Dev\SilverStripeListener TaskRunner: SilverStripe\Dev\TaskRunner - TeamCityListener: SilverStripe\Dev\TeamCityListener - SS_TestListener: SilverStripe\Dev\SS_TestListener TestMailer: SilverStripe\Dev\TestMailer TestOnly: SilverStripe\Dev\TestOnly TestSession: SilverStripe\Dev\TestSession @@ -276,13 +236,11 @@ mappings: RequestHandler: SilverStripe\Control\RequestHandler RequestProcessor: SilverStripe\Control\RequestProcessor Session: SilverStripe\Control\Session - VersionedRequestFilter: SilverStripe\Versioned\VersionedRequestFilter Email: SilverStripe\Control\Email\Email Mailer: SilverStripe\Control\Email\Mailer RSSFeed: SilverStripe\Control\RSS\RSSFeed RSSFeed_Entry: SilverStripe\Control\RSS\RSSFeed_Entry CleanupTestDatabasesTask: SilverStripe\Dev\Tasks\CleanupTestDatabasesTask - EncryptAllPasswordsTask: SilverStripe\Dev\Tasks\EncryptAllPasswordsTask i18nTextCollectorTask: SilverStripe\Dev\Tasks\i18nTextCollectorTask MigrateFileTask: SilverStripe\Dev\Tasks\MigrateFileTask CheckboxField: SilverStripe\Forms\CheckboxField @@ -296,7 +254,6 @@ mappings: DatalessField: SilverStripe\Forms\DatalessField DateField: SilverStripe\Forms\DateField DateField_Disabled: SilverStripe\Forms\DateField_Disabled - DateField_View_JQuery: SilverStripe\Forms\DateField_View_JQuery DatetimeField: SilverStripe\Forms\DatetimeField DisabledTransformation: SilverStripe\Forms\DisabledTransformation DropdownField: SilverStripe\Forms\DropdownField @@ -310,7 +267,7 @@ mappings: FormField: SilverStripe\Forms\FormField FormScaffolder: SilverStripe\Forms\FormScaffolder FormTemplateHelper: SilverStripe\Forms\FormTemplateHelper - FormTemplateHelper_Pre32: SilverStripe\Forms\FormTemplateHelper_Pre32 + FormTemplateHelper_Pre32: SilverStripe\Forms\FormTemplateHelper FormTransformation: SilverStripe\Forms\FormTransformation GroupedDropdownField: SilverStripe\Forms\GroupedDropdownField HeaderField: SilverStripe\Forms\HeaderField @@ -323,7 +280,6 @@ mappings: MultiSelectField: SilverStripe\Forms\MultiSelectField NullableField: SilverStripe\Forms\NullableField NumericField: SilverStripe\Forms\NumericField - NumericField_Readonly: SilverStripe\Forms\NumericField_Readonly OptionsetField: SilverStripe\Forms\OptionsetField PasswordField: SilverStripe\Forms\PasswordField PopoverField: SilverStripe\Forms\PopoverField @@ -332,7 +288,6 @@ mappings: ReadonlyField: SilverStripe\Forms\ReadonlyField ReadonlyTransformation: SilverStripe\Forms\ReadonlyTransformation RequiredFields: SilverStripe\Forms\RequiredFields - ResetFormAction: SilverStripe\Forms\ResetFormAction SelectField: SilverStripe\Forms\SelectField SelectionGroup: SilverStripe\Forms\SelectionGroup SelectionGroup_Item: SilverStripe\Forms\SelectionGroup_Item @@ -352,11 +307,6 @@ mappings: HTMLEditorConfig: SilverStripe\Forms\HTMLEditor\HTMLEditorConfig HTMLEditorField: SilverStripe\Forms\HTMLEditor\HTMLEditorField HTMLEditorField_Readonly: SilverStripe\Forms\HTMLEditor\HTMLEditorField_Readonly - HTMLEditorField_Toolbar: SilverStripe\Admin\ModalController\HTMLEditorField_Toolbar - HTMLEditorField_Embed: SilverStripe\Forms\HTMLEditor\HTMLEditorField_Embed - HTMLEditorField_File: SilverStripe\Forms\HTMLEditor\HTMLEditorField_File - HTMLEditorField_Flash: SilverStripe\Forms\HTMLEditor\HTMLEditorField_Flash - HTMLEditorField_Image: SilverStripe\Forms\HTMLEditor\HTMLEditorField_Image HTMLEditorSanitiser: SilverStripe\Forms\HTMLEditor\HTMLEditorSanitiser HTMLReadonlyField: SilverStripe\Forms\HTMLReadonlyField TinyMCEConfig: SilverStripe\Forms\HTMLEditor\TinyMCEConfig @@ -397,24 +347,16 @@ mappings: GridState_Component: SilverStripe\Forms\GridField\GridState_Component i18n: SilverStripe\i18n\i18n i18nEntityProvider: SilverStripe\i18n\i18nEntityProvider - i18nRailsYamlAdapter: SilverStripe\i18n\i18nRailsYamlAdapter - i18nSSLegacyAdapter: SilverStripe\i18n\i18nSSLegacyAdapter - i18nSSLegacyAdapter_Iterator: SilverStripe\i18n\i18nSSLegacyAdapter_Iterator i18nTextCollector: SilverStripe\i18n\TextCollection\i18nTextCollector i18nTextCollector_Writer: SilverStripe\i18n\Messages\Writer i18nTextCollector_Writer_RailsYaml: SilverStripe\i18n\Messages\YamlWriter i18nTextCollector_Parser: SilverStripe\i18n\TextCollection\Parser - i18nTranslateAdapterInterface: SilverStripe\i18n\i18nTranslateAdapterInterface SilverStripe\Framework\Logging\DebugViewFriendlyErrorFormatter: SilverStripe\Logging\DebugViewFriendlyErrorFormatter SilverStripe\Framework\Logging\DetailedErrorFormatter: SilverStripe\Logging\DetailedErrorFormatter SilverStripe\Framework\Logging\HTTPOutputHandler: SilverStripe\Logging\HTTPOutputHandler SilverStripe\Framework\Logging\MonologErrorHandler: SilverStripe\Logging\MonologErrorHandler - DebugViewFriendlyErrorFormatter: Monolog\Formatter\FormatterInterface.friendly - DetailedErrorFormatter: Monolog\Formatter\FormatterInterface.detailed DisplayErrorHandler: Monolog\Handler\HandlerInterface - ErrorHandler: SilverStripe\Logging\ErrorHandler; - SS_Log: SilverStripe\Logging\Log - SilverStripe\Logging\SS_Log: SilverStripe\Logging\Log + ErrorHandler: SilverStripe\Logging\ErrorHandler ComparisonFilter: SilverStripe\ORM\Filters\ComparisonFilter EndsWithFilter: SilverStripe\ORM\Filters\EndsWithFilter ExactMatchFilter: SilverStripe\ORM\Filters\ExactMatchFilter @@ -460,23 +402,6 @@ mappings: SS_Transliterator: SilverStripe\View\Parsers\Transliterator SilverStripe\View\Parsers\SS_Transliterator: SilverStripe\View\Parsers\Transliterator URLSegmentFilter: SilverStripe\View\Parsers\URLSegmentFilter - CampaignAdminTest: SilverStripe\Admin\Tests\CampaignAdminTest - CampaignAdminTest_InvalidChangeSet: SilverStripe\Admin\Tests\CampaignAdminTest\InvalidChangeSet - CMSMenuItemTest: SilverStripe\Admin\Tests\CMSMenuItemTest - CMSMenuTest: SilverStripe\Admin\Tests\CMSMenuTest - CMSMenuTest_LeftAndMainController: SilverStripe\Admin\Tests\CMSMenuTest\LeftAndMainController - CMSMenuTest_CustomTitle: SilverStripe\Admin\Tests\CMSMenuTest\CustomTitle - CMSProfileControllerTest: SilverStripe\Admin\Tests\CMSProfileControllerTest - CMSProfileControllerTestExtension: SilverStripe\Admin\Tests\CMSProfileControllerTest\TestExtension - LeftAndMainTest: SilverStripe\Admin\Tests\LeftAndMainTest - LeftAndMainTest_Controller: SilverStripe\Admin\Tests\LeftAndMainTest\LeftAndMainTest\TestController - LeftAndMainTest_Object: SilverStripe\Admin\Tests\LeftAndMainTest\TestObject - ModelAdminTest: SilverStripe\Admin\Tests\ModelAdminTest - ModelAdminTest_Admin: SilverStripe\Admin\Tests\ModelAdminTest\ContactAdmin - ModelAdminTest_PlayerAdmin: SilverStripe\Admin\Tests\ModelAdminTest\PlayerAdmin - ModelAdminTest_Contact: SilverStripe\Admin\Tests\ModelAdminTest\Contact - ModelAdminTest_Player: SilverStripe\Admin\Tests\ModelAdminTest\Player - SecurityAdminTest: SilverStripe\Admin\Tests\SecurityAdminTest ControllerTest: SilverStripe\Control\Tests\ControllerTest ControllerTest_Controller: SilverStripe\Control\Tests\ControllerTest\TestController ControllerTest_UnsecuredController: SilverStripe\Control\Tests\ControllerTest\UnsecuredController @@ -495,7 +420,6 @@ mappings: DirectorTest: SilverStripe\Control\Tests\DirectorTest TestRequestFilter: SilverStripe\Control\Tests\DirectorTest\TestRequestFilter DirectorTestRequest_Controller: SilverStripe\Control\Tests\DirectorTest\TestController - FakeController: SilverStripe\Control\Tests\FakeController FlushRequestFilterTest: SilverStripe\Control\Tests\FlushMiddlewareTest FlushRequestFilterTest_Flushable: SilverStripe\Control\Tests\FlushMiddlewareTest\TestFlushable HTTPRequestTest: SilverStripe\Control\Tests\HTTPRequestTest @@ -519,7 +443,7 @@ mappings: RequestHandlingFieldTest_Controller: SilverStripe\Control\Tests\RequestHandlingTest\FieldController RequestHandlingTest_HandlingField: SilverStripe\Control\Tests\RequestHandlingTest\HandlingField SessionTest: SilverStripe\Control\Tests\SessionTest - CacheTest: SilverStripe\Core\Tests\CacheTest + CacheTest: SilverStripe\Core\Tests\Cache\CacheTest ClassInfoTest: SilverStripe\Core\Tests\ClassInfoTest ClassInfoTest_BaseClass: SilverStripe\Core\Tests\ClassInfoTest\BaseClass ClassInfoTest_ChildClass: SilverStripe\Core\Tests\ClassInfoTest\ChildClass @@ -559,7 +483,7 @@ mappings: PhpSyntaxTest: SilverStripe\Core\Tests\PhpSyntaxTest BacktraceTest: SilverStripe\Dev\Tests\BacktraceTest BulkLoaderResultTest: SilverStripe\Dev\Tests\BulkLoaderResultTest - BulkLoaderTestPlayer: SilverStripe\Dev\Tests\BulkLoaderResultTest\BulkLoaderTestPlayer + BulkLoaderTestPlayer: SilverStripe\Dev\Tests\BulkLoaderResultTest\Player CSSContentParserTest: SilverStripe\Dev\Tests\CSSContentParserTest CsvBulkLoaderTest: SilverStripe\Dev\Tests\CsvBulkLoaderTest CsvBulkLoaderTest_CustomLoader: SilverStripe\Dev\Tests\CsvBulkLoaderTest\CustomLoader @@ -574,7 +498,7 @@ mappings: FixtureBlueprintTest: SilverStripe\Dev\Tests\FixtureBlueprintTest FixtureBlueprintTest_SiteTree: SilverStripe\Dev\Tests\FixtureBlueprintTest\TestSiteTree FixtureBlueprintTest_Page: SilverStripe\Dev\Tests\FixtureBlueprintTest\TestPage - FixtureBlueprintTest_Article: SilverStripe\Dev\Tests\FixtureBlueprintTest\TestArticle + FixtureBlueprintTest_Article: SilverStripe\Dev\Tests\FixtureBlueprintTest\Article FixtureFactoryTest: SilverStripe\Dev\Tests\FixtureFactoryTest FixtureFactoryTest_DataObject: SilverStripe\Dev\Tests\FixtureFactoryTest\TestDataObject FixtureFactoryTest_DataObjectRelation: SilverStripe\Dev\Tests\FixtureFactoryTest\DataObjectRelation @@ -597,14 +521,13 @@ mappings: ConfirmedPasswordFieldTest: SilverStripe\Forms\Tests\ConfirmedPasswordFieldTest CurrencyFieldTest: SilverStripe\Forms\Tests\CurrencyFieldTest DateFieldTest: SilverStripe\Forms\Tests\DateFieldTest - DateFieldViewJQueryTest: SilverStripe\Forms\Tests\DateFieldViewJQueryTest DatetimeFieldTest: SilverStripe\Forms\Tests\DatetimeFieldTest DatetimeFieldTest_Model: SilverStripe\Forms\Tests\DatetimeFieldTest\Model DropdownFieldTest: SilverStripe\Forms\Tests\DropdownFieldTest EmailFieldTest: SilverStripe\Forms\Tests\EmailFieldTest EmailFieldTest_Validator: SilverStripe\Forms\Tests\EmailFieldTest\TestValidator EmailFieldTest_Controller: SilverStripe\Forms\Tests\EmailFieldTest\TestController - EmbedShortcodeProviderTest: SilverStripe\Forms\Tests\EmbedShortcodeProviderTest + EmbedShortcodeProviderTest: SilverStripe\View\Tests\Shortcodes\EmbedShortcodeProviderTest EnumFieldTest: SilverStripe\Forms\Tests\EnumFieldTest FieldGroupTest: SilverStripe\Forms\Tests\FieldGroupTest FieldListTest: SilverStripe\Forms\Tests\FieldListTest @@ -639,8 +562,6 @@ mappings: ListboxFieldTest_Article: SilverStripe\Forms\Tests\ListboxFieldTest\Article ListboxFieldTest_Tag: SilverStripe\Forms\Tests\ListboxFieldTest\Tag LookupFieldTest: SilverStripe\Forms\Tests\LookupFieldTest - MemberDatetimeOptionsetFieldTest: SilverStripe\Forms\Tests\MemberDatetimeOptionsetFieldTest - MemberDatetimeOptionsetFieldTest_Controller: SilverStripe\Forms\Tests\MemberDatetimeOptionsetFieldTest_Controller MoneyFieldTest: SilverStripe\Forms\Tests\MoneyFieldTest MoneyFieldTest_Object: SilverStripe\Forms\Tests\MoneyFieldTest\TestObject MoneyFieldTest_CustomSetter_Object: SilverStripe\Forms\Tests\MoneyFieldTest\CustomSetter_Object @@ -656,31 +577,18 @@ mappings: TimeFieldTest: SilverStripe\Forms\Tests\TimeFieldTest TreeDropdownFieldTest: SilverStripe\Forms\Tests\TreeDropdownFieldTest i18nTest: SilverStripe\i18n\Tests\i18nTest - i18nTest_DataObject: SilverStripe\i18n\Tests\i18Test\TestDataObject - i18nTest_Object: SilverStripe\i18n\Tests\i18Test\TestObject - i18nTest_CustomTranslatorAdapter: SilverStripe\i18n\Tests\i18nTest\CustomTranslatorAdapter - i18nTest_OtherCustomTranslatorAdapter: SilverStripe\i18n\Tests\i18Test\OtherCustomTranslatorAdapter + i18nTest_DataObject: SilverStripe\i18n\Tests\i18nTest\TestDataObject + i18nTest_Object: SilverStripe\i18n\Tests\i18nTest\TestObject i18nTextCollectorTest: SilverStripe\i18n\Tests\i18nTextCollectorTest i18nTextCollectorTest_Collector: SilverStripe\i18n\Tests\i18nTextCollectorTest\Collector ArrayLibTest: SilverStripe\ORM\Tests\ArrayLibTest ArrayListTest: SilverStripe\ORM\Tests\ArrayListTest ArrayListTest_Object: SilverStripe\ORM\Tests\ArrayListTest\TestObject - ChangeSetItemTest_Versioned: SilverStripe\Versioned\Tests\ChangeSetItemTest\VersionedObject - ChangeSetItemTest: SilverStripe\Versioned\Tests\ChangeSetItemTest - ChangeSetTest_Permissions: SilverStripe\Versioned\Tests\ChangeSetTest\Permissions - ChangeSetTest_Base: SilverStripe\Versioned\Tests\ChangeSetTest\BaseObject - ChangeSetTest_Mid: SilverStripe\Versioned\Tests\ChangeSetTest\MidObject - ChangeSetTest_End: SilverStripe\Versioned\Tests\ChangeSetTest\EndObject - ChangeSetTest_EndChild: SilverStripe\Versioned\Tests\ChangeSetTest\EndObjectChild - ChangeSetTest: SilverStripe\Versioned\Tests\ChangeSetTest ComponentSetTest: SilverStripe\ORM\Tests\ComponentSetTest ComponentSetTest_Player: SilverStripe\ORM\Tests\ComponentSetTest\Player ComponentSetTest_Team: SilverStripe\ORM\Tests\ComponentSetTest\Team DatabaseTest: SilverStripe\ORM\Tests\DatabaseTest DatabaseTest_MyObject: SilverStripe\ORM\Tests\DatabaseTest\MyObject - DataDifferencerTest: SilverStripe\Versioned\Tests\DataDifferencerTest - DataDifferencerTest_Object: SilverStripe\Versioned\Tests\DataDifferencerTest\TestObject - DataDifferencerTest_HasOneRelationObject: SilverStripe\Versioned\Tests\DataDifferencerTest\HasOneRelationObject DataExtensionTest: SilverStripe\ORM\Tests\DataExtensionTest DataExtensionTest_Member: SilverStripe\ORM\Tests\DataExtensionTest\TestMember DataExtensionTest_Player: SilverStripe\ORM\Tests\DataExtensionTest\Player @@ -703,8 +611,6 @@ mappings: DataObjectDuplicateTestClass2: SilverStripe\ORM\Tests\DataObjectDuplicationTest\Class2 DataObjectDuplicateTestClass3: SilverStripe\ORM\Tests\DataObjectDuplicationTest\Class3 DataObjectLazyLoadingTest: SilverStripe\ORM\Tests\DataObjectLazyLoadingTest - VersionedLazy_DataObject: SilverStripe\Versioned\Tests\VersionedDataObjectLazyLoadingTest\VersionedObject - VersionedLazySub_DataObject: SilverStripe\Versioned\Tests\VersionedDataObjectLazyLoadingTest\VersionedSubObject DataObjectSchemaGenerationTest: SilverStripe\ORM\Tests\DataObjectSchemaGenerationTest DataObjectSchemaGenerationTest_DO: SilverStripe\ORM\Tests\DataObjectSchemaGenerationTest\TestObject DataObjectSchemaGenerationTest_IndexDO: SilverStripe\ORM\Tests\DataObjectSchemaGenerationTest\TestIndexObject @@ -761,11 +667,11 @@ mappings: DBDatetimeTest: SilverStripe\ORM\Tests\DBDatetimeTest DBFieldTest: SilverStripe\ORM\Tests\DBFieldTest DBHTMLTextTest: SilverStripe\ORM\Tests\DBHTMLTextTest - DBHTMLTextTest_Shortcode: SilverStripe\ORM\Tests\DBHTMLTextTest\Shortcode + DBHTMLTextTest_Shortcode: SilverStripe\ORM\Tests\DBHTMLTextTest\TestShortcode DBLocaleTest: SilverStripe\ORM\Tests\DBLocaleTest DBMoneyTest: SilverStripe\ORM\Tests\DBMoneyTest - MoneyTest_DataObject: SilverStripe\ORM\Tests\MoneyTest\TestObject - MoneyTest_SubClass: SilverStripe\ORM\Tests\MoneyTest\TestObjectSubclass + MoneyTest_DataObject: SilverStripe\ORM\Tests\DBMoneyTest\TestObject + MoneyTest_SubClass: SilverStripe\ORM\Tests\DBMoneyTest\TestObjectSubclass DBPercentageTest: SilverStripe\ORM\Tests\DBPercentageTest DBStringTest: SilverStripe\ORM\Tests\DBStringTest StringFieldTest_MyStringField: SilverStripe\ORM\Tests\DBStringTest\MyStringField @@ -779,7 +685,7 @@ mappings: HierarchyTest: SilverStripe\ORM\Tests\HierarchyTest HierarchyTest_Object: SilverStripe\ORM\Tests\HierarchyTest\TestObject HierarchyHideTest_Object: SilverStripe\ORM\Tests\HierarchyTest\HideTestObject - HierarchyHideTest_SubObject: SilverStripe\ORM\Tests\HierarchyHideTest\HideTestSubObject + HierarchyHideTest_SubObject: SilverStripe\ORM\Tests\HierarchyTest\HideTestSubObject LabelFieldTest: SilverStripe\ORM\Tests\LabelFieldTest ManyManyListExtensionTest: SilverStripe\ORM\Tests\ManyManyListExtensionTest ManyManyListTest_IndirectPrimary: SilverStripe\ORM\Tests\ManyManyListTest\IndirectPrimary @@ -794,9 +700,6 @@ mappings: ManyManyThroughListTest_Object: SilverStripe\ORM\Tests\ManyManyThroughListTest\TestObject ManyManyThroughListTest_JoinObject: SilverStripe\ORM\Tests\ManyManyThroughListTest\JoinObject ManyManyThroughListTest_Item: SilverStripe\ORM\Tests\ManyManyThroughListTest\Item - ManyManyThroughListTest_VersionedObject: SilverStripe\Versioned\Tests\VersionedManyManyThroughListTest\VersionedObject - ManyManyThroughListTest_VersionedJoinObject: SilverStripe\Versioned\Tests\VersionedManyManyThroughListTest\VersionedJoinObject - ManyManyThroughListTest_VersionedItem: SilverStripe\Versioned\Tests\VersionedManyManyThroughListTest\VersionedItem MapTest: SilverStripe\ORM\Tests\MapTest MySQLDatabaseTest: SilverStripe\ORM\Tests\MySQLDatabaseTest MySQLDatabaseTest_Data: SilverStripe\ORM\Tests\MySQLDatabaseTest\Data @@ -812,38 +715,13 @@ mappings: SQLUpdateTest: SilverStripe\ORM\Tests\SQLUpdateTest SQLUpdateTestBase: SilverStripe\ORM\Tests\SQLUpdateTest\TestBase SQLUpdateChild: SilverStripe\ORM\Tests\SQLUpdateTest\TestChild - TimeTest: SilverStripe\ORM\Tests\TimeTest + TimeTest: SilverStripe\ORM\Tests\DBTimeTest TransactionTest: SilverStripe\ORM\Tests\TransactionTest TransactionTest_Object: SilverStripe\ORM\Tests\TransactionTest\TestObject UnsavedRelationListTest: SilverStripe\ORM\Tests\UnsavedRelationListTest UnsavedRelationListTest_DataObject: SilverStripe\ORM\Tests\UnsavedRelationListTest\TestObject URLSegmentFilterTest: SilverStripe\ORM\Tests\URLSegmentFilterTest ValidationExceptionTest: SilverStripe\ORM\Tests\ValidationExceptionTest - VersionableExtensionsTest: SilverStripe\Versioned\Tests\VersionableExtensionsTest - VersionableExtensionsTest_DataObject: SilverStripe\Versioned\Tests\VersionableExtensionsTest\TestObject - VersionableExtensionsTest_Extension: SilverStripe\Versioned\Tests\VersionableExtensionsTest\TestExtension - VersionedOwnershipTest: SilverStripe\Versioned\Tests\VersionedOwnershipTest - VersionedOwnershipTest_Object: SilverStripe\Versioned\Tests\VersionedOwnershipTest\TestObject - VersionedOwnershipTest_Subclass: SilverStripe\Versioned\Tests\VersionedOwnershipTest\Subclass - VersionedOwnershipTest_Related: SilverStripe\Versioned\Tests\VersionedOwnershipTest\Related - VersionedOwnershipTest_RelatedMany: SilverStripe\Versioned\Tests\VersionedOwnershipTest\RelatedMany - VersionedOwnershipTest_Attachment: SilverStripe\Versioned\Tests\VersionedOwnershipTest\Attachment - VersionedOwnershipTest_Page: SilverStripe\Versioned\Tests\VersionedOwnershipTest\TestPage - VersionedOwnershipTest_Banner: SilverStripe\Versioned\Tests\VersionedOwnershipTest\Banner - VersionedOwnershipTest_CustomRelation: SilverStripe\Versioned\Tests\VersionedOwnershipTest\CustomRelation - VersionedOwnershipTest_Image: SilverStripe\Versioned\Tests\VersionedOwnershipTest\Image - VersionedTest: SilverStripe\Versioned\Tests\VersionedTest - VersionedTest_DataObject: SilverStripe\Versioned\Tests\VersionedTest\TestObject - VersionedTest_WithIndexes: SilverStripe\Versioned\Tests\VersionedTest\WithIndexes - VersionedTest_RelatedWithoutVersion: SilverStripe\Versioned\Tests\VersionedTest\RelatedWithoutversion - VersionedTest_Subclass: SilverStripe\Versioned\Tests\VersionedTest\Subclass - VersionedTest_AnotherSubclass: SilverStripe\Versioned\Tests\VersionedTest\AnotherSubclass - VersionedTest_UnversionedWithField: SilverStripe\Versioned\Tests\VersionedTest\UnversionedWithField - VersionedTest_SingleStage: SilverStripe\Versioned\Tests\VersionedTest\SingleStage - VersionedTest_PublicStage: SilverStripe\Versioned\Tests\VersionedTest\PublicStage - VersionedTest_PublicViaExtension: SilverStripe\Versioned\Tests\VersionedTest\PublicViaExtension - VersionedTest_PublicExtension: SilverStripe\Versioned\Tests\VersionedTest\PublicExtension - VersionedTest_CustomTable: SilverStripe\Versioned\Tests\VersionedTest\CustomTable BasicAuthTest: SilverStripe\Security\Tests\BasicAuthTest BasicAuthTest_ControllerSecuredWithPermission: SilverStripe\Security\Tests\BasicAuthTest\ControllerSecuredWithPermission BasicAuthTest_ControllerSecuredWithoutPermission: SilverStripe\Security\Tests\BasicAuthTest\ControllerSecuredWithoutPermission @@ -892,7 +770,7 @@ mappings: ViewableDataTest: SilverStripe\View\Tests\ViewableDataTest ViewableDataTest_Castable: SilverStripe\View\Tests\ViewableDataTest\Castable ViewableDataTest_RequiresCasting: SilverStripe\View\Tests\ViewableDataTest\RequiresCasting - ViewableData_UnescaptedCaster: SilverStripe\View\Tests\ViewableDataTest\UnescaptedCaster + ViewableData_UnescaptedCaster: SilverStripe\View\Tests\ViewableDataTest\UnescapedCaster ViewableData_Caster: SilverStripe\View\Tests\ViewableDataTest\Caster ViewableDataTest_Container: SilverStripe\View\Tests\ViewableDataTest\Container ViewableDataTest_CastingClass: SilverStripe\View\Tests\ViewableDataTest\CastingClass @@ -911,7 +789,7 @@ mappings: GridFieldConfigTest_MyOtherComponent: SilverStripe\Forms\Tests\GridField\GridFieldConfigTest\MyOtherComponent GridFieldDataColumnsTest: SilverStripe\Forms\Tests\GridField\GridFieldDataColumnsTest GridFieldDeleteActionTest: SilverStripe\Forms\Tests\GridField\GridFieldDeleteActionTest - GridFieldAction_Delete_Team: SilverStripe\Forms\Tests\GridField\GridFieldDeleteActionTest\GridFieldAction_Delete_Team + GridFieldAction_Delete_Team: SilverStripe\Forms\Tests\GridField\GridFieldTest\Team GridFieldDetailFormTest: SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest GridFieldDetailFormTest_Person: SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\Person GridFieldDetailFormTest_PeopleGroup: SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\PeopleGroup @@ -921,7 +799,7 @@ mappings: GridFieldDetailFormTest_CategoryController: SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\CategoryController GridFieldDetailFormTest_ItemRequest: SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\ItemRequest GridFieldEditButtonTest: SilverStripe\Forms\Tests\GridField\GridFieldEditButtonTest - GridFieldAction_Edit_Team: SilverStripe\Forms\Tests\GridField\GridFieldAction_Edit_Team + GridFieldAction_Edit_Team: SilverStripe\Forms\Tests\GridField\GridFieldTest\Team GridFieldExportButtonTest: SilverStripe\Forms\Tests\GridField\GridFieldExportButtonTest GridFieldExportButtonTest_Team: SilverStripe\Forms\Tests\GridField\GridFieldExportButtonTest\Team GridFieldExportButtonTest_NoView: SilverStripe\Forms\Tests\GridField\GridFieldExportButtonTest\NoView @@ -953,13 +831,13 @@ mappings: SearchFilterApplyRelationTest_DO: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\TestObject SearchFilterApplyRelationTest_HasOneParent: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\HasOneParent SearchFilterApplyRelationTest_HasOneChild: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\HasOneChild - SearchFilterApplyRelationTest_HasOneGrantChild: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\HasOneGrantChild + SearchFilterApplyRelationTest_HasOneGrantChild: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\HasOneGrandChild SearchFilterApplyRelationTest_HasManyParent: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\HasManyParent SearchFilterApplyRelationTest_HasManyChild: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\HasManyChild - SearchFilterApplyRelationTest_HasManyGrantChild: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\HasManyGrantChild + SearchFilterApplyRelationTest_HasManyGrantChild: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\HasManyGrandChild SearchFilterApplyRelationTest_ManyManyParent: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\ManyManyParent SearchFilterApplyRelationTest_ManyManyChild: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\ManyManyChild - SearchFilterApplyRelationTest_ManyManyGrantChild: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\ManyManyGrantChild + SearchFilterApplyRelationTest_ManyManyGrantChild: SilverStripe\ORM\Tests\Filters\SearchFilterApplyRelationTest\ManyManyGrandChild RSSFeedTest: SilverStripe\Control\Tests\RSS\RSSFeedTest RSSFeedTest_ItemA: SilverStripe\Control\Tests\RSS\RSSFeedTest\ItemA RSSFeedTest_ItemB: SilverStripe\Control\Tests\RSS\RSSFeedTest\ItemB @@ -967,16 +845,12 @@ mappings: RSSFeedTest_ItemD: SilverStripe\Control\Tests\RSS\RSSFeedTest\ItemD ClassLoaderTest: SilverStripe\Core\Tests\Manifest\ClassLoaderTest ClassManifestTest: SilverStripe\Core\Tests\Manifest\ClassManifestTest - ConfigManifestTest_ConfigManifestAccess: SilverStripe\Core\Tests\Manifest\ConfigManifestTest\ConfigManifestAccess ConfigManifestTest: SilverStripe\Core\Tests\Manifest\ConfigManifestTest - ConfigStaticManifestTest: SilverStripe\Core\Tests\Manifest\ConfigStaticManifestTest ManifestFileFinderTest: SilverStripe\Core\Tests\Manifest\ManifestFileFinderTest NamespacedClassManifestTest: SilverStripe\Core\Tests\Manifest\NamespacedClassManifestTest ThemeResourceLoaderTest: SilverStripe\Core\Tests\Manifest\ThemeResourceLoaderTest - TokenisedRegularExpressionTest: SilverStripe\Core\Tests\Manifest\TokenisedRegularExpressionTest EmailTest: SilverStripe\Control\Tests\Email\EmailTest - EmailTest_Mailer: SilverStripe\Control\Tests\Email\EmailTest\TestMailer - MailerTest: SilverStripe\Control\Tests\Email\MailerTest + MailerTest: SilverStripe\Control\Tests\Email\SwiftMailerTest ErrorControlChainTest_Chain: SilverStripe\Core\Tests\Startup\ErrorControlChainTest\ErrorControlChainTest_Chain ErrorControlChainTest: SilverStripe\Core\Tests\Startup\ErrorControlChainTest ParameterConfirmationTokenTest_Token: SilverStripe\Core\Tests\Startup\ParameterConfirmationTokenTest\ParameterConfirmationTokenTest_Token @@ -995,22 +869,70 @@ mappings: ConfigStaticTest_Combined3: SilverStripe\Core\Tests\Config\ConfigTest\Combined3 ConfigTest_TestNest: SilverStripe\Core\Tests\Config\ConfigTest\TestNest ConfigTest: SilverStripe\Core\Tests\Config\ConfigTest - ConfigTest_Config_MemCache: SilverStripe\Core\Tests\Config\ConfigTest\ConfigTestMemCache Page_Controller: PageController Boolean: SilverStripe\ORM\FieldType\DBBoolean - ChangePasswordEmail_ss: SilverStripe\Control\Email\ChangePasswordEmail_ss - CheckboxSetField_ss: SilverStripe\Forms\CheckboxSetField_ss Date: SilverStripe\ORM\FieldType\DBDate Enum: SilverStripe\ORM\FieldType\DBEnum - ForgotPasswordEmail_ss: SilverStripe\Control\Email\ChangePasswordEmail_ss GridAction: SilverStripe\Forms\GridField\GridFieldDeleteAction GridFieldAction_Delete: SilverStripe\Forms\GridField\GridFieldDeleteAction - GridFieldEditButton_ss: SilverStripe\Forms\GridField\GridFieldEditButton_ss TableListField: SilverStripe\Forms\GridField\GridField TableListField_PageControls_ss: SilverStripe\Forms\GridField\GridField - UploadField: SilverStripe\AssetAdmin\Forms\UploadField Pagination: SilverStripe\Forms\GridField\GridField + CMSPreviewable: SilverStripe\ORM\CMSPreviewable + # Note: These should be substituted with the given service aliases in injector yml config + DebugViewFriendlyErrorFormatter: SilverStripe\Logging\DebugViewFriendlyErrorFormatter # Monolog\Formatter\FormatterInterface.friendly + DetailedErrorFormatter: SilverStripe\Logging\DetailedErrorFormatter # Monolog\Formatter\FormatterInterface.detailed + # Template-only i18n substitutions (non-class) + ChangePasswordEmail_ss: SilverStripe\Control\Email\ChangePasswordEmail_ss + CheckboxSetField_ss: SilverStripe\Forms\CheckboxSetField_ss + ForgotPasswordEmail_ss: SilverStripe\Control\Email\ChangePasswordEmail_ss + GridFieldEditButton_ss: SilverStripe\Forms\GridField\GridFieldEditButton_ss +skipYML: + - MySQLPDODatabase + - MySQLDatabase + - MySQLiConnector + - PDOConnector + - MySQLSchemaManager + - MySQLQueryBuilder + - EndsWithFilter + - ExactMatchFilter + - FulltextFilter + - GreaterThanFilter + - GreaterThanOrEqualFilter + - LessThanFilter + - LessThanOrEqualFilter + - PartialMatchFilter + - StartsWithFilter + - WithinRangeFilter + - Boolean + - Currency + - DBClassName + - Date + - Datetime + - DBDatetime + - Decimal + - Double + - Enum + - Float + - ForeignKey + - HTMLText + - HTMLFragment + - HTMLVarchar + - Int + - BigInt + - Locale + - DBLocale + - Money + - MultiEnum + - Percentage + - PolymorphicForeignKey + - PrimaryKey + - Text + - Time + - Varchar + - Year skipConfigs: + - required_fields - db - casting - table_name @@ -1022,5 +944,9 @@ skipConfigs: - owns - searchable_fields - summary_fields + - many_many_extraFields - default_search_filter_class - segment + - url_segment +excludedPaths: + - '*fixtures*' diff --git a/_config/config.yml b/_config/config.yml index f7b296cf8..882167840 100644 --- a/_config/config.yml +++ b/_config/config.yml @@ -2,10 +2,6 @@ Name: coreconfig --- SilverStripe\Core\Injector\Injector: - FormSchema: - class: SilverStripe\Forms\Schema\FormSchema - FixtureFactory: - class: SilverStripe\Dev\FixtureFactory SilverStripe\Core\Manifest\ResourceURLGenerator: class: SilverStripe\Control\SimpleResourceURLGenerator properties: diff --git a/_config/logging.yml b/_config/logging.yml index f2f0de2ed..f966135ca 100644 --- a/_config/logging.yml +++ b/_config/logging.yml @@ -17,7 +17,7 @@ SilverStripe\Core\Injector\Injector: constructor: - "error-log" calls: - DisplayErrorHandler: [ pushHandler, [ %$Monolog\Handler\HandlerInterface ] ] + pushDisplayErrorHandler: [ pushHandler, [ %$Monolog\Handler\HandlerInterface ] ] --- Name: loggingformatters --- diff --git a/_config/requestprocessors.yml b/_config/requestprocessors.yml index 59cce470a..ff6464568 100644 --- a/_config/requestprocessors.yml +++ b/_config/requestprocessors.yml @@ -8,7 +8,7 @@ SilverStripe\Core\Injector\Injector: TrustedProxyMiddleware: %$SilverStripe\Control\Middleware\TrustedProxyMiddleware AllowedHostsMiddleware: %$SilverStripe\Control\Middleware\AllowedHostsMiddleware SessionMiddleware: %$SilverStripe\Control\Middleware\SessionMiddleware - RequestProcessor: %$SilverStripe\Control\RequestProcessor + RequestProcessorMiddleware: %$SilverStripe\Control\RequestProcessor FlushMiddleware: %$SilverStripe\Control\Middleware\FlushMiddleware SilverStripe\Control\AllowedHostsMiddleware: properties: diff --git a/src/Control/Director.php b/src/Control/Director.php index 1977cffa6..9c9b29642 100644 --- a/src/Control/Director.php +++ b/src/Control/Director.php @@ -27,6 +27,7 @@ use SilverStripe\View\TemplateGlobalProvider; * @see Director::handleRequest() * @see Director::$rules * @see Director::$environment_type + * @skipUpgrade */ class Director implements TemplateGlobalProvider { diff --git a/src/Dev/FixtureBlueprint.php b/src/Dev/FixtureBlueprint.php index bb753a8c0..99592a4d0 100644 --- a/src/Dev/FixtureBlueprint.php +++ b/src/Dev/FixtureBlueprint.php @@ -44,7 +44,7 @@ class FixtureBlueprint /** @config */ private static $dependencies = array( - 'factory' => '%$FixtureFactory' + 'factory' => '%$'.FixtureFactory::class, ); /** diff --git a/src/Dev/Install/install5.php b/src/Dev/Install/install5.php index 8e92bcf89..cce0726ea 100755 --- a/src/Dev/Install/install5.php +++ b/src/Dev/Install/install5.php @@ -113,6 +113,7 @@ foreach ($databaseClasses as $class => $details) { } // Load database config +/** @skipUpgrade */ if (isset($_REQUEST['db'])) { if (isset($_REQUEST['db']['type'])) { $type = $_REQUEST['db']['type']; diff --git a/src/Forms/CompositeField.php b/src/Forms/CompositeField.php index 87553c87e..4860a7e3a 100644 --- a/src/Forms/CompositeField.php +++ b/src/Forms/CompositeField.php @@ -48,6 +48,7 @@ class CompositeField extends FormField protected $schemaDataType = FormField::SCHEMA_DATA_TYPE_STRUCTURAL; + /** @skipUpgrade */ protected $schemaComponent = 'CompositeField'; public function __construct($children = null) diff --git a/src/Forms/FieldGroup.php b/src/Forms/FieldGroup.php index 9c40c3f12..c767ae2b6 100644 --- a/src/Forms/FieldGroup.php +++ b/src/Forms/FieldGroup.php @@ -60,7 +60,7 @@ use SilverStripe\ORM\ValidationResult; */ class FieldGroup extends CompositeField { - + /** @skipUpgrade */ protected $schemaComponent = 'FieldGroup'; protected $zebra; diff --git a/src/Forms/GroupedDropdownField.php b/src/Forms/GroupedDropdownField.php index 8518861e0..0d839df8b 100644 --- a/src/Forms/GroupedDropdownField.php +++ b/src/Forms/GroupedDropdownField.php @@ -55,6 +55,8 @@ class GroupedDropdownField extends DropdownField { // TODO remove this when GroupedDropdownField is implemented + // This should be one of SCHEMA_DATA_TYPE_* constants instead + /** @skipUpgrade */ protected $schemaDataType = 'GroupedDropdownField'; /** diff --git a/src/Forms/LabelField.php b/src/Forms/LabelField.php index 5b963f8c4..6415e5b61 100644 --- a/src/Forms/LabelField.php +++ b/src/Forms/LabelField.php @@ -10,9 +10,10 @@ namespace SilverStripe\Forms; class LabelField extends DatalessField { protected $schemaDataType = FormField::SCHEMA_DATA_TYPE_STRUCTURAL; - + + /** @skipUpgrade */ protected $schemaComponent = 'LabelField'; - + /** * @param string $name * @param null|string $title diff --git a/src/Forms/LookupField.php b/src/Forms/LookupField.php index fbd2b479f..ae444a85b 100644 --- a/src/Forms/LookupField.php +++ b/src/Forms/LookupField.php @@ -15,7 +15,7 @@ use SilverStripe\Core\Convert; */ class LookupField extends MultiSelectField { - + /** @skipUpgrade */ protected $schemaComponent = 'LookupField'; /** diff --git a/src/Forms/MoneyField.php b/src/Forms/MoneyField.php index cd643a961..4e392b63f 100644 --- a/src/Forms/MoneyField.php +++ b/src/Forms/MoneyField.php @@ -18,6 +18,7 @@ class MoneyField extends FormField { // TODO replace with `FormField::SCHEMA_DATA_TYPE_TEXT` when MoneyField is implemented + /** @skipUpgrade */ protected $schemaDataType = 'MoneyField'; /** diff --git a/src/Forms/OptionsetField.php b/src/Forms/OptionsetField.php index 3587a6b64..7054b0759 100644 --- a/src/Forms/OptionsetField.php +++ b/src/Forms/OptionsetField.php @@ -56,7 +56,7 @@ use SilverStripe\View\ArrayData; */ class OptionsetField extends SingleSelectField { - + /** @skipUpgrade */ protected $schemaComponent = 'OptionsetField'; /** diff --git a/src/Forms/TreeDropdownField.php b/src/Forms/TreeDropdownField.php index 8a28b618e..5b3ee1a31 100644 --- a/src/Forms/TreeDropdownField.php +++ b/src/Forms/TreeDropdownField.php @@ -58,6 +58,7 @@ class TreeDropdownField extends FormField { protected $schemaDataType = self::SCHEMA_DATA_TYPE_SINGLESELECT; + /** @skipUpgrade */ protected $schemaComponent = 'TreeDropdownField'; private static $url_handlers = array( diff --git a/src/ORM/DataObjectSchema.php b/src/ORM/DataObjectSchema.php index 49be58e5f..236630fae 100644 --- a/src/ORM/DataObjectSchema.php +++ b/src/ORM/DataObjectSchema.php @@ -500,6 +500,7 @@ class DataObjectSchema // look for indexable field types foreach ($this->databaseFields($class, false) as $field => $type) { + /** @skipUpgrade */ if ($type === 'ForeignKey' || $type === 'DBClassName') { $indexes[$field] = [ 'type' => 'index', diff --git a/src/ORM/FieldType/DBDatetime.php b/src/ORM/FieldType/DBDatetime.php index 6e03a6f0c..cf6c3c3b7 100644 --- a/src/ORM/FieldType/DBDatetime.php +++ b/src/ORM/FieldType/DBDatetime.php @@ -32,6 +32,7 @@ use InvalidArgumentException; * * * @todo Add localization support, see http://open.silverstripe.com/ticket/2931 + * @skipUpgrade */ class DBDatetime extends DBDate implements TemplateGlobalProvider { diff --git a/src/Security/Group.php b/src/Security/Group.php index ea61018d1..f579ba13b 100755 --- a/src/Security/Group.php +++ b/src/Security/Group.php @@ -107,6 +107,7 @@ class Group extends DataObject * Caution: Only call on instances, not through a singleton. * The "root group" fields will be created through {@link SecurityAdmin->EditForm()}. * + * @skipUpgrade * @return FieldList */ public function getCMSFields() @@ -150,7 +151,7 @@ class Group extends DataObject $config->addComponents(new GridFieldExportButton('buttons-after-left')); $config->addComponents(new GridFieldPrintButton('buttons-after-left')); /** @var GridFieldAddExistingAutocompleter $autocompleter */ - $autocompleter = $config->getComponentByType('SilverStripe\\Forms\\GridField\\GridFieldAddExistingAutocompleter'); + $autocompleter = $config->getComponentByType(GridFieldAddExistingAutocompleter::class); /** @skipUpgrade */ $autocompleter ->setResultsFormat('$Title ($Email)') @@ -274,6 +275,7 @@ class Group extends DataObject /** * @param bool $includerelations Indicate if the labels returned include relation fields * @return array + * @skipUpgrade */ public function fieldLabels($includerelations = true) { diff --git a/src/Security/LoginAttempt.php b/src/Security/LoginAttempt.php index d6e84fff8..9d73cc1cc 100644 --- a/src/Security/LoginAttempt.php +++ b/src/Security/LoginAttempt.php @@ -47,6 +47,7 @@ class LoginAttempt extends DataObject private static $table_name = "LoginAttempt"; /** + * @skipUpgrade * @param bool $includerelations Indicate if the labels returned include relation fields * @return array */ diff --git a/src/Security/Member.php b/src/Security/Member.php index 4fc4b633a..6816b573b 100644 --- a/src/Security/Member.php +++ b/src/Security/Member.php @@ -346,6 +346,7 @@ class Member extends DataObject /** * Returns true if this user is locked out * + * @skipUpgrade * @return bool */ public function isLockedOut() @@ -1413,6 +1414,7 @@ class Member extends DataObject * Return a {@link FieldList} of fields that would appropriate for editing * this member. * + * @skipUpgrade * @return FieldList Return a FieldList of fields that would appropriate for * editing this member. */ diff --git a/src/Security/MemberAuthenticator/CMSLoginHandler.php b/src/Security/MemberAuthenticator/CMSLoginHandler.php index e976d1e5d..ff85f8b0a 100644 --- a/src/Security/MemberAuthenticator/CMSLoginHandler.php +++ b/src/Security/MemberAuthenticator/CMSLoginHandler.php @@ -16,6 +16,9 @@ class CMSLoginHandler extends LoginHandler /** * Return the CMSMemberLoginForm form + * + * @skipUpgrade + * @return CMSMemberLoginForm */ public function loginForm() { @@ -26,6 +29,9 @@ class CMSLoginHandler extends LoginHandler ); } + /** + * @return HTTPResponse + */ public function redirectBackToForm() { // Redirect back to form diff --git a/src/Security/MemberAuthenticator/CMSMemberAuthenticator.php b/src/Security/MemberAuthenticator/CMSMemberAuthenticator.php index 467823b4d..8cd76acae 100644 --- a/src/Security/MemberAuthenticator/CMSMemberAuthenticator.php +++ b/src/Security/MemberAuthenticator/CMSMemberAuthenticator.php @@ -18,6 +18,7 @@ class CMSMemberAuthenticator extends MemberAuthenticator } /** + * @skipUpgrade * @param array $data * @param ValidationResult|null $result * @param Member|null $member diff --git a/src/Security/MemberAuthenticator/LoginHandler.php b/src/Security/MemberAuthenticator/LoginHandler.php index 424322d93..2058c7864 100644 --- a/src/Security/MemberAuthenticator/LoginHandler.php +++ b/src/Security/MemberAuthenticator/LoginHandler.php @@ -86,6 +86,7 @@ class LoginHandler extends RequestHandler /** * Return the MemberLoginForm form * + * @skipUpgrade * @return MemberLoginForm */ public function loginForm() diff --git a/src/Security/MemberAuthenticator/LostPasswordForm.php b/src/Security/MemberAuthenticator/LostPasswordForm.php index 395f93b73..1d288300d 100644 --- a/src/Security/MemberAuthenticator/LostPasswordForm.php +++ b/src/Security/MemberAuthenticator/LostPasswordForm.php @@ -19,6 +19,7 @@ class LostPasswordForm extends MemberLoginForm * Create a single EmailField form that has the capability * of using the MemberLoginForm Authenticator * + * @skipUpgrade * @return FieldList */ public function getFormFields() diff --git a/src/Security/MemberAuthenticator/MemberAuthenticator.php b/src/Security/MemberAuthenticator/MemberAuthenticator.php index b60401a50..91dbd50a9 100644 --- a/src/Security/MemberAuthenticator/MemberAuthenticator.php +++ b/src/Security/MemberAuthenticator/MemberAuthenticator.php @@ -5,7 +5,6 @@ namespace SilverStripe\Security\MemberAuthenticator; use InvalidArgumentException; use SilverStripe\Control\HTTPRequest; use SilverStripe\Core\Extensible; -use SilverStripe\Dev\Debug; use SilverStripe\ORM\ValidationResult; use SilverStripe\Security\Authenticator; use SilverStripe\Security\DefaultAdminService; @@ -49,6 +48,7 @@ class MemberAuthenticator implements Authenticator /** * Attempt to find and authenticate member if possible from the given data * + * @skipUpgrade * @param array $data Form submitted data * @param ValidationResult $result * @param Member $member This third parameter is used in the CMSAuthenticator(s) diff --git a/src/Security/MemberAuthenticator/MemberLoginForm.php b/src/Security/MemberAuthenticator/MemberLoginForm.php index 23e83acfa..114126c6b 100644 --- a/src/Security/MemberAuthenticator/MemberLoginForm.php +++ b/src/Security/MemberAuthenticator/MemberLoginForm.php @@ -119,6 +119,7 @@ class MemberLoginForm extends BaseLoginForm /** * Build the FieldList for the login form * + * @skipUpgrade * @return FieldList */ protected function getFormFields() diff --git a/src/Security/Security.php b/src/Security/Security.php index febb67287..4c03eed47 100644 --- a/src/Security/Security.php +++ b/src/Security/Security.php @@ -777,6 +777,7 @@ class Security extends Controller implements TemplateGlobalProvider /** * Aggregate tabbed forms from each handler to fragments ready to be rendered. * + * @skipUpgrade * @param array $results * @return array */ diff --git a/tests/bootstrap/environment.php b/tests/bootstrap/environment.php index eb6abdb60..372566dcb 100644 --- a/tests/bootstrap/environment.php +++ b/tests/bootstrap/environment.php @@ -9,6 +9,7 @@ if (!getenv('SS_ENVIRONMENT_TYPE')) { $loader->setEnvironmentVariable('SS_ENVIRONMENT_TYPE', 'dev'); } +/** @skipUpgrade */ if (!getenv('SS_DATABASE_CLASS') && !getenv('SS_DATABASE_USERNAME')) { // The default settings let us define the database config via environment vars // Database connection, including PDO and legacy ORM support diff --git a/tests/php/Control/RSS/RSSFeedTest.php b/tests/php/Control/RSS/RSSFeedTest.php index d1a76cce1..9e41abca0 100644 --- a/tests/php/Control/RSS/RSSFeedTest.php +++ b/tests/php/Control/RSS/RSSFeedTest.php @@ -83,6 +83,9 @@ class RSSFeedTest extends SapphireTest ); } + /** + * @skipUpgrade + */ public function testRenderWithTemplate() { $rssFeed = new RSSFeed(new ArrayList(), "", "", ""); @@ -99,7 +102,7 @@ class RSSFeedTest extends SapphireTest protected function setUp() { parent::setUp(); - Config::inst()->update(Director::class, 'alternate_base_url', '/'); + Config::modify()->set(Director::class, 'alternate_base_url', '/'); if (!self::$original_host) { self::$original_host = $_SERVER['HTTP_HOST']; } diff --git a/tests/php/Core/ObjectTest.php b/tests/php/Core/ObjectTest.php index 2008f2653..17805a118 100644 --- a/tests/php/Core/ObjectTest.php +++ b/tests/php/Core/ObjectTest.php @@ -27,6 +27,7 @@ use SilverStripe\Versioned\Versioned; * @todo tests for addStaticVars() * @todo tests for setting statics which are not defined on the object as built-in PHP statics * @todo tests for setting statics through extensions (#2387) + * @skipUpgrade */ class ObjectTest extends SapphireTest { diff --git a/tests/php/Dev/BulkLoaderResultTest/BulkLoaderTestPlayer.php b/tests/php/Dev/BulkLoaderResultTest/Player.php similarity index 100% rename from tests/php/Dev/BulkLoaderResultTest/BulkLoaderTestPlayer.php rename to tests/php/Dev/BulkLoaderResultTest/Player.php diff --git a/tests/php/Forms/DateFieldTest.php b/tests/php/Forms/DateFieldTest.php index 7843a02c0..5ea4d9a03 100644 --- a/tests/php/Forms/DateFieldTest.php +++ b/tests/php/Forms/DateFieldTest.php @@ -9,6 +9,9 @@ use SilverStripe\Forms\RequiredFields; use SilverStripe\i18n\i18n; use SilverStripe\ORM\FieldType\DBDatetime; +/** + * @skipUpgrade + */ class DateFieldTest extends SapphireTest { protected function setUp() diff --git a/tests/php/Forms/FormFactoryTest/TestController.php b/tests/php/Forms/FormFactoryTest/TestController.php index 603ec56d3..9ddf3b725 100644 --- a/tests/php/Forms/FormFactoryTest/TestController.php +++ b/tests/php/Forms/FormFactoryTest/TestController.php @@ -9,6 +9,7 @@ use SilverStripe\Versioned\Versioned; /** * Edit controller for this form + * @skipUpgrade */ class TestController extends Controller { diff --git a/tests/php/Forms/FormRequestHandlerTest.php b/tests/php/Forms/FormRequestHandlerTest.php index 7d273d16a..09eb8b6a1 100644 --- a/tests/php/Forms/FormRequestHandlerTest.php +++ b/tests/php/Forms/FormRequestHandlerTest.php @@ -12,6 +12,9 @@ use SilverStripe\Forms\FormRequestHandler; use SilverStripe\Forms\Tests\FormRequestHandlerTest\TestForm; use SilverStripe\Forms\Tests\FormRequestHandlerTest\TestFormRequestHandler; +/** + * @skipUpgrade + */ class FormRequestHandlerTest extends SapphireTest { public function testCallsActionOnFormHandler() diff --git a/tests/php/Forms/FormSchemaTest.php b/tests/php/Forms/FormSchemaTest.php index a3b4ffaf6..1416a4ac1 100644 --- a/tests/php/Forms/FormSchemaTest.php +++ b/tests/php/Forms/FormSchemaTest.php @@ -15,6 +15,9 @@ use SilverStripe\Forms\RequiredFields; use SilverStripe\Forms\FormAction; use SilverStripe\Forms\PopoverField; +/** + * @skipUpgrade + */ class FormSchemaTest extends SapphireTest { protected function setUp() diff --git a/tests/php/Forms/GridField/GridFieldAddExistingAutocompleterTest.php b/tests/php/Forms/GridField/GridFieldAddExistingAutocompleterTest.php index 13b50b9f2..923bd00f4 100644 --- a/tests/php/Forms/GridField/GridFieldAddExistingAutocompleterTest.php +++ b/tests/php/Forms/GridField/GridFieldAddExistingAutocompleterTest.php @@ -13,6 +13,9 @@ use SilverStripe\Forms\Tests\GridField\GridFieldTest\Player; use SilverStripe\Forms\Tests\GridField\GridFieldTest\Team; use SilverStripe\ORM\ArrayList; +/** + * @skipUpgrade + */ class GridFieldAddExistingAutocompleterTest extends FunctionalTest { diff --git a/tests/php/Forms/GridField/GridFieldDetailFormTest.php b/tests/php/Forms/GridField/GridFieldDetailFormTest.php index 133b9e8e4..7b430d429 100644 --- a/tests/php/Forms/GridField/GridFieldDetailFormTest.php +++ b/tests/php/Forms/GridField/GridFieldDetailFormTest.php @@ -17,9 +17,11 @@ use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\GroupController; use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\PeopleGroup; use SilverStripe\Forms\Tests\GridField\GridFieldDetailFormTest\Person; +/** + * @skipUpgrade + */ class GridFieldDetailFormTest extends FunctionalTest { - protected static $fixture_file = 'GridFieldDetailFormTest.yml'; protected static $extra_dataobjects = array( diff --git a/tests/php/Forms/GridField/GridFieldDetailFormTest/CategoryController.php b/tests/php/Forms/GridField/GridFieldDetailFormTest/CategoryController.php index 82e8e10fa..d9495b0c6 100644 --- a/tests/php/Forms/GridField/GridFieldDetailFormTest/CategoryController.php +++ b/tests/php/Forms/GridField/GridFieldDetailFormTest/CategoryController.php @@ -14,6 +14,9 @@ use SilverStripe\Forms\GridField\GridFieldEditButton; use SilverStripe\Forms\GridField\GridFieldToolbarHeader; use SilverStripe\Forms\TextField; +/** + * @skipUpgrade + */ class CategoryController extends Controller implements TestOnly { private static $allowed_actions = array('Form'); diff --git a/tests/php/Forms/GridField/GridFieldDetailFormTest/GroupController.php b/tests/php/Forms/GridField/GridFieldDetailFormTest/GroupController.php index 87b4a29f1..d2cb67628 100644 --- a/tests/php/Forms/GridField/GridFieldDetailFormTest/GroupController.php +++ b/tests/php/Forms/GridField/GridFieldDetailFormTest/GroupController.php @@ -12,6 +12,9 @@ use SilverStripe\Forms\GridField\GridFieldDetailForm; use SilverStripe\Forms\GridField\GridFieldEditButton; use SilverStripe\Forms\GridField\GridFieldToolbarHeader; +/** + * @skipUpgrade + */ class GroupController extends Controller implements TestOnly { diff --git a/tests/php/Forms/GridField/GridFieldDetailFormTest/TestController.php b/tests/php/Forms/GridField/GridFieldDetailFormTest/TestController.php index 873412b8a..da764b8ee 100644 --- a/tests/php/Forms/GridField/GridFieldDetailFormTest/TestController.php +++ b/tests/php/Forms/GridField/GridFieldDetailFormTest/TestController.php @@ -13,6 +13,9 @@ use SilverStripe\Forms\GridField\GridFieldEditButton; use SilverStripe\Forms\GridField\GridFieldToolbarHeader; use SilverStripe\Forms\GridField\GridFieldViewButton; +/** + * @skipUpgrade + */ class TestController extends Controller implements TestOnly { public function __construct() diff --git a/tests/php/ORM/DBClassNameTest.php b/tests/php/ORM/DBClassNameTest.php index c054e5328..3b8c77f05 100644 --- a/tests/php/ORM/DBClassNameTest.php +++ b/tests/php/ORM/DBClassNameTest.php @@ -6,6 +6,9 @@ use SilverStripe\ORM\FieldType\DBClassName; use SilverStripe\ORM\DataObject; use SilverStripe\Dev\SapphireTest; +/** + * @skipUpgrade + */ class DBClassNameTest extends SapphireTest { diff --git a/tests/php/ORM/DBCompositeTest.php b/tests/php/ORM/DBCompositeTest.php index ba79f6bec..e72a8f1f7 100644 --- a/tests/php/ORM/DBCompositeTest.php +++ b/tests/php/ORM/DBCompositeTest.php @@ -6,6 +6,9 @@ use SilverStripe\ORM\FieldType\DBMoney; use SilverStripe\ORM\DataObject; use SilverStripe\Dev\SapphireTest; +/** + * @skipUpgrade + */ class DBCompositeTest extends SapphireTest { diff --git a/tests/php/ORM/DBDateTest.php b/tests/php/ORM/DBDateTest.php index 30040a159..18aa37a74 100644 --- a/tests/php/ORM/DBDateTest.php +++ b/tests/php/ORM/DBDateTest.php @@ -2,15 +2,15 @@ namespace SilverStripe\ORM\Tests; -use PHPUnit_Framework_Error_Notice; +use SilverStripe\Dev\SapphireTest; use SilverStripe\i18n\i18n; use SilverStripe\ORM\FieldType\DBDate; -use SilverStripe\ORM\FieldType\DBField; use SilverStripe\ORM\FieldType\DBDatetime; -use SilverStripe\ORM\DataObject; -use SilverStripe\Dev\SapphireTest; -use SilverStripe\Security\Member; +use SilverStripe\ORM\FieldType\DBField; +/** + * @skipUpgrade + */ class DBDateTest extends SapphireTest { protected $oldError = null; diff --git a/tests/php/ORM/DataExtensionTest/PlayerExtension.php b/tests/php/ORM/DataExtensionTest/PlayerExtension.php index a78134ec3..914d7a16d 100644 --- a/tests/php/ORM/DataExtensionTest/PlayerExtension.php +++ b/tests/php/ORM/DataExtensionTest/PlayerExtension.php @@ -5,6 +5,9 @@ namespace SilverStripe\ORM\Tests\DataExtensionTest; use SilverStripe\Dev\TestOnly; use SilverStripe\ORM\DataExtension; +/** + * @skipUpgrade + */ class PlayerExtension extends DataExtension implements TestOnly { diff --git a/tests/php/ORM/DataListTest.php b/tests/php/ORM/DataListTest.php index eeb21fdd4..82057ae1f 100755 --- a/tests/php/ORM/DataListTest.php +++ b/tests/php/ORM/DataListTest.php @@ -21,6 +21,9 @@ use SilverStripe\ORM\Tests\DataObjectTest\TeamComment; use SilverStripe\ORM\Tests\DataObjectTest\ValidatedObject; use SilverStripe\ORM\Tests\DataObjectTest\Staff; +/** + * @skipUpgrade + */ class DataListTest extends SapphireTest { diff --git a/tests/php/ORM/MySQLDatabaseTest.php b/tests/php/ORM/MySQLDatabaseTest.php index 5975c37b2..1d03ce361 100644 --- a/tests/php/ORM/MySQLDatabaseTest.php +++ b/tests/php/ORM/MySQLDatabaseTest.php @@ -9,6 +9,9 @@ use SilverStripe\ORM\Connect\MySQLiConnector; use SilverStripe\ORM\Queries\SQLUpdate; use SilverStripe\Dev\SapphireTest; +/** + * @skipUpgrade + */ class MySQLDatabaseTest extends SapphireTest { diff --git a/tests/php/ORM/PDODatabaseTest.php b/tests/php/ORM/PDODatabaseTest.php index 9b5ff3695..d7025cbf9 100644 --- a/tests/php/ORM/PDODatabaseTest.php +++ b/tests/php/ORM/PDODatabaseTest.php @@ -8,9 +8,11 @@ use SilverStripe\ORM\Connect\PDOConnector; use SilverStripe\ORM\Queries\SQLUpdate; use SilverStripe\Dev\SapphireTest; +/** + * @skipUpgrade + */ class PDODatabaseTest extends SapphireTest { - protected static $fixture_file = 'MySQLDatabaseTest.yml'; protected static $extra_dataobjects = array( diff --git a/tests/php/Security/BasicAuthTest/ControllerSecuredWithPermission.php b/tests/php/Security/BasicAuthTest/ControllerSecuredWithPermission.php index 0bc99381e..822773694 100644 --- a/tests/php/Security/BasicAuthTest/ControllerSecuredWithPermission.php +++ b/tests/php/Security/BasicAuthTest/ControllerSecuredWithPermission.php @@ -6,6 +6,9 @@ use SilverStripe\Control\Controller; use SilverStripe\Dev\TestOnly; use SilverStripe\Security\BasicAuth; +/** + * @skipUpgrade + */ class ControllerSecuredWithPermission extends Controller implements TestOnly { diff --git a/tests/php/Security/BasicAuthTest/ControllerSecuredWithoutPermission.php b/tests/php/Security/BasicAuthTest/ControllerSecuredWithoutPermission.php index b15a37960..535f595f1 100644 --- a/tests/php/Security/BasicAuthTest/ControllerSecuredWithoutPermission.php +++ b/tests/php/Security/BasicAuthTest/ControllerSecuredWithoutPermission.php @@ -6,6 +6,9 @@ use SilverStripe\Control\Controller; use SilverStripe\Dev\TestOnly; use SilverStripe\Security\BasicAuth; +/** + * @skipUpgrade + */ class ControllerSecuredWithoutPermission extends Controller implements TestOnly { diff --git a/tests/php/Security/MemberAuthenticatorTest.php b/tests/php/Security/MemberAuthenticatorTest.php index 3b638f169..d8e4c2f05 100644 --- a/tests/php/Security/MemberAuthenticatorTest.php +++ b/tests/php/Security/MemberAuthenticatorTest.php @@ -19,6 +19,9 @@ use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator; use SilverStripe\Security\MemberAuthenticator\MemberLoginForm; use SilverStripe\Security\Security; +/** + * @skipUpgrade + */ class MemberAuthenticatorTest extends SapphireTest { diff --git a/tests/php/Security/PermissionCheckboxSetFieldTest.php b/tests/php/Security/PermissionCheckboxSetFieldTest.php index b9a7a680b..2da3b4c60 100644 --- a/tests/php/Security/PermissionCheckboxSetFieldTest.php +++ b/tests/php/Security/PermissionCheckboxSetFieldTest.php @@ -8,6 +8,9 @@ use SilverStripe\Security\Permission; use SilverStripe\Security\PermissionCheckboxSetField; use SilverStripe\Dev\SapphireTest; +/** + * @skipUpgrade + */ class PermissionCheckboxSetFieldTest extends SapphireTest { protected static $fixture_file = 'PermissionCheckboxSetFieldTest.yml'; diff --git a/tests/php/Security/PermissionTest.php b/tests/php/Security/PermissionTest.php index 9493ec293..37318957f 100644 --- a/tests/php/Security/PermissionTest.php +++ b/tests/php/Security/PermissionTest.php @@ -8,6 +8,9 @@ use SilverStripe\Security\PermissionCheckboxSetField; use SilverStripe\Core\Config\Config; use SilverStripe\Dev\SapphireTest; +/** + * @skipUpgrade + */ class PermissionTest extends SapphireTest { diff --git a/tests/php/Security/SecurityTest.php b/tests/php/Security/SecurityTest.php index ea1f77b83..d2c89f729 100644 --- a/tests/php/Security/SecurityTest.php +++ b/tests/php/Security/SecurityTest.php @@ -22,6 +22,8 @@ use SilverStripe\Security\SecurityToken; /** * Test the security class, including log-in form, change password form, etc + * + * @skipUpgrade */ class SecurityTest extends FunctionalTest { diff --git a/tests/php/Security/SecurityTest/NullController.php b/tests/php/Security/SecurityTest/NullController.php index 9af3be9be..503a9fe73 100644 --- a/tests/php/Security/SecurityTest/NullController.php +++ b/tests/php/Security/SecurityTest/NullController.php @@ -5,6 +5,9 @@ namespace SilverStripe\Security\Tests\SecurityTest; use SilverStripe\Control\Controller; use SilverStripe\Dev\TestOnly; +/** + * @skipUpgrade + */ class NullController extends Controller implements TestOnly { diff --git a/tests/php/Security/SecurityTest/SecuredController.php b/tests/php/Security/SecurityTest/SecuredController.php index 9d5585a5d..975d0c45c 100644 --- a/tests/php/Security/SecurityTest/SecuredController.php +++ b/tests/php/Security/SecurityTest/SecuredController.php @@ -7,6 +7,9 @@ use SilverStripe\Dev\TestOnly; use SilverStripe\Security\Permission; use SilverStripe\Security\Security; +/** + * @skipUpgrade + */ class SecuredController extends Controller implements TestOnly { private static $allowed_actions = array('index'); diff --git a/tests/php/View/RequirementsTest.php b/tests/php/View/RequirementsTest.php index 1a43e9353..ebcb71cb4 100644 --- a/tests/php/View/RequirementsTest.php +++ b/tests/php/View/RequirementsTest.php @@ -17,6 +17,7 @@ use SilverStripe\Control\SimpleResourceURLGenerator; /** * @todo Test that order of combine_files() is correct * @todo Figure out how to clear the modified state of Requirements class - might affect other tests. + * @skipUpgrade */ class RequirementsTest extends SapphireTest { diff --git a/tests/php/View/SSViewerTest.php b/tests/php/View/SSViewerTest.php index b8b6394b6..196a5584d 100644 --- a/tests/php/View/SSViewerTest.php +++ b/tests/php/View/SSViewerTest.php @@ -32,6 +32,9 @@ use SilverStripe\View\Tests\SSViewerTest\SSViewerTestModel; use SilverStripe\View\Tests\SSViewerTest\SSViewerTestModelController; use SilverStripe\View\ViewableData; +/** + * @skipUpgrade + */ class SSViewerTest extends SapphireTest { diff --git a/tests/php/i18n/i18nTestManifest.php b/tests/php/i18n/i18nTestManifest.php index 9e363f3c2..3a06f06ce 100644 --- a/tests/php/i18n/i18nTestManifest.php +++ b/tests/php/i18n/i18nTestManifest.php @@ -69,6 +69,9 @@ trait i18nTestManifest */ protected $originalLocale = null; + /** + * @skipUpgrade + */ public function setupManifest() { // force SSViewer_DataPresenter to cache global template vars before we switch to the