diff --git a/.upgrade.yml b/.upgrade.yml index eb8ba58b0..fe5e536a8 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -1010,7 +1010,52 @@ mappings: TableListField_PageControls_ss: SilverStripe\Forms\GridField\GridField UploadField: SilverStripe\AssetAdmin\Forms\UploadField Pagination: SilverStripe\Forms\GridField\GridField +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 +1067,8 @@ skipConfigs: - owns - searchable_fields - summary_fields + - many_many_extraFields - default_search_filter_class - 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/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