diff --git a/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md b/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md index a9ccfa755..526416197 100644 --- a/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md +++ b/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md @@ -143,8 +143,9 @@ end of each test. } } -`tearDownOnce` and `setUpOnce` can be used to run code just once for the file rather than before and after each -individual test case. +`tearDownAfterClass` and `setUpBeforeClass` can be used to run code just once for the file rather than before and after +each individual test case. Remember to class the parent method in each method to ensure the core boot-strapping of tests +takes place. :::php update('ClassName', 'var_name', 'var_value'); } diff --git a/docs/en/04_Changelogs/4.0.0.md b/docs/en/04_Changelogs/4.0.0.md index 7fcb5a5d6..22ba691f3 100644 --- a/docs/en/04_Changelogs/4.0.0.md +++ b/docs/en/04_Changelogs/4.0.0.md @@ -18,6 +18,7 @@ guide developers in preparing existing 3.x code for compatibility with 4.0 * [i18n](#overview-i18n) * [Cache](#overview-cache) * [Email and Mailer](#overview-mailer) + * [SapphireTest](#overview-testing) * [Commit History](#commit-history) ## Highlights of major changes @@ -1703,3 +1704,12 @@ After (`mysite/_config/config.yml`): * `$email->setTemplate()` renamed to `$email->setHTMLTemplate()` * Added `$email->setPlainTemplate` for rendering plain versions of email * `$email->populateTemplate()` has been replaced with `$email->setData()` + +### SapphireTest + +* `setUpOnce` removed. Please use `setUpBeforeClass` +* `tearDownOnce` removed. Please use `tearDownAfterClass` +* `TestListener` class removed +* `SapphireTest::$requiredExtensions` renamed to `SapphireTest::$required_extensions` and made static +* `SapphireTest::$extraDataObjects` renamed to `SapphireTest::$extra_dataobjects` and made static +* `SapphireTest::$extraControllers` renamed to `SapphireTest::$extra_controllers` and made static diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1e039c18b..251efe61d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -25,10 +25,6 @@ versioned/tests/php - - - - sanitychecks diff --git a/src/Dev/SapphireTest.php b/src/Dev/SapphireTest.php index 37d18247b..f14bea095 100644 --- a/src/Dev/SapphireTest.php +++ b/src/Dev/SapphireTest.php @@ -117,8 +117,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase * The keys of the are the classes that the extensions can't be applied the extensions to, and * the values are an array of illegal extensions on that class. */ - protected $illegalExtensions = array( - ); + protected static $illegal_extensions = []; /** * A list of extensions that must be applied during the execution of this run. If they are @@ -132,15 +131,14 @@ class SapphireTest extends PHPUnit_Framework_TestCase * array("MyTreeDataObject" => array("Versioned", "Hierarchy")) * */ - protected $requiredExtensions = array( - ); + protected static $required_extensions = []; /** * By default, the test database won't contain any DataObjects that have the interface TestOnly. * This variable lets you define additional TestOnly DataObjects to set up for this test. * Set it to an array of DataObject subclass names. */ - protected $extraDataObjects = array(); + protected static $extra_dataobjects = []; /** * List of class names of {@see Controller} objects to register routes for @@ -148,7 +146,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase * * @var array */ - protected $extraControllers = []; + protected static $extra_controllers = []; /** * We need to disabling backing up of globals to avoid overriding @@ -159,12 +157,14 @@ class SapphireTest extends PHPUnit_Framework_TestCase protected $backupGlobals = false; /** - * Helper arrays for illegalExtensions/requiredExtensions code + * Helper arrays for illegal_extensions/required_extensions code */ - private $extensionsToReapply = array(), $extensionsToRemove = array(); + private static $extensions_to_reapply = []; + + private static $extensions_to_remove = []; /** - * Check flushables on setupOnce() + * Check flushables on setupBeforeClass() * * @var bool */ @@ -334,10 +334,10 @@ class SapphireTest extends PHPUnit_Framework_TestCase * This is different to {@link setUp()}, which gets called once * per method. Useful to initialize expensive operations which * don't change state for any called method inside the test, - * e.g. dynamically adding an extension. See {@link tearDownOnce()} + * e.g. dynamically adding an extension. See {@link teardownAfterClass()} * for tearing down the state again. */ - public function setUpOnce() + public static function setUpBeforeClass() { static::start(); @@ -351,40 +351,40 @@ class SapphireTest extends PHPUnit_Framework_TestCase } // Remove any illegal extensions that are present - foreach ($this->illegalExtensions as $class => $extensions) { + foreach (static::$illegal_extensions as $class => $extensions) { if (!class_exists($class)) { continue; } foreach ($extensions as $extension) { - if (!class_exists($extension) || $class::has_extension($extension)) { + if (!class_exists($extension) ||$class::has_extension($extension)) { continue; - } - if (!isset($this->extensionsToReapply[$class])) { - $this->extensionsToReapply[$class] = array(); - } - $this->extensionsToReapply[$class][] = $extension; - $class::remove_extension($extension); - $isAltered = true; + }if (!isset(static::$extensions_to_reapply[$class])) { + static::$extensions_to_reapply[$class] = array(); + } + static::$extensions_to_reapply[$class][] = $extension; + $class::remove_extension($extension); + $isAltered = true; + } } // Add any required extensions that aren't present - foreach ($this->requiredExtensions as $class => $extensions) { + foreach (static::$required_extensions as $class => $extensions) { if (!class_exists($class)) { $self = static::class; throw new LogicException("Test {$self} requires class {$class} which doesn't exist"); } - $this->extensionsToRemove[$class] = array(); + static::$extensions_to_remove[$class] = array(); foreach ($extensions as $extension) { if (!class_exists($extension)) { $self = static::class; throw new LogicException("Test {$self} requires extension {$extension} which doesn't exist"); } if (!$class::has_extension($extension)) { - if (!isset($this->extensionsToRemove[$class])) { - $this->extensionsToReapply[$class] = array(); + if (!isset(static::$extensions_to_remove[$class])) { + static::$extensions_to_reapply[$class] = array(); } - $this->extensionsToRemove[$class][] = $extension; + static::$extensions_to_remove[$class][] = $extension; $class::add_extension($extension); $isAltered = true; } @@ -392,12 +392,12 @@ class SapphireTest extends PHPUnit_Framework_TestCase } // If we have made changes to the extensions present, then migrate the database schema. - if ($isAltered || $this->extensionsToReapply || $this->extensionsToRemove || $this->getExtraDataObjects()) { + if ($isAltered || static::$extensions_to_reapply || static::$extensions_to_remove || static::getExtraDataObjects()) { DataObject::reset(); if (!self::using_temp_db()) { self::create_temp_db(); } - $this->resetDBSchema(true); + static::resetDBSchema(true); } // clear singletons, they're caching old extension info // which is used in DatabaseAdmin->doBuild() @@ -419,23 +419,23 @@ class SapphireTest extends PHPUnit_Framework_TestCase /** * tearDown method that's called once per test class rather once per test method. */ - public function tearDownOnce() + public static function tearDownAfterClass() { // If we have made changes to the extensions present, then migrate the database schema. - if ($this->extensionsToReapply || $this->extensionsToRemove) { + if (static::$extensions_to_reapply || static::$extensions_to_remove) { // @todo: This isn't strictly necessary to restore extensions, but only to ensure that // Object::$extra_methods is properly flushed. This should be replaced with a simple // flush mechanism for each $class. // // Remove extensions added for testing - foreach ($this->extensionsToRemove as $class => $extensions) { + foreach (static::$extensions_to_remove as $class => $extensions) { foreach ($extensions as $extension) { $class::remove_extension($extension); } } // Reapply ones removed - foreach ($this->extensionsToReapply as $class => $extensions) { + foreach (static::$extensions_to_reapply as $class => $extensions) { foreach ($extensions as $extension) { $class::add_extension($extension); } @@ -443,13 +443,13 @@ class SapphireTest extends PHPUnit_Framework_TestCase } //unnest injector / config now that the test suite is over - // this will reset all the extensions on the object too (see setUpOnce) + // this will reset all the extensions on the object too (see setUpBeforeClass) Injector::unnest(); Config::unnest(); - $extraDataObjects = $this->getExtraDataObjects(); - if (!empty($this->extensionsToReapply) || !empty($this->extensionsToRemove) || !empty($extraDataObjects)) { - $this->resetDBSchema(); + $extraDataObjects = static::getExtraDataObjects(); + if (!empty(static::$extensions_to_reapply) || !empty(static::$extensions_to_remove) || !empty($extraDataObjects)) { + static::resetDBSchema(); } } @@ -1034,7 +1034,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase ); ClassLoader::instance()->pushManifest($classManifest, false); - SapphireTest::set_test_class_manifest($classManifest); + static::set_test_class_manifest($classManifest); ThemeResourceLoader::instance()->addSet('$default', new ThemeManifest( BASE_PATH, @@ -1123,9 +1123,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase $dbConn->selectDatabase($dbname, true); - /** @var static $st */ - $st = Injector::inst()->create(__CLASS__); - $st->resetDBSchema(); + static::resetDBSchema(); // Reinstate PHPUnit error handling set_error_handler(array('PHPUnit_Util_ErrorHandler', 'handleError')); @@ -1153,7 +1151,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase * Reset the testing database's schema. * @param bool $includeExtraDataObjects If true, the extraDataObjects tables will also be included */ - public function resetDBSchema($includeExtraDataObjects = false) + public static function resetDBSchema($includeExtraDataObjects = false) { if (self::using_temp_db()) { DataObject::reset(); @@ -1161,12 +1159,12 @@ class SapphireTest extends PHPUnit_Framework_TestCase // clear singletons, they're caching old extension info which is used in DatabaseAdmin->doBuild() Injector::inst()->unregisterAllObjects(); - $dataClasses = ClassInfo::subclassesFor('SilverStripe\\ORM\\DataObject'); + $dataClasses = ClassInfo::subclassesFor(DataObject::class); array_shift($dataClasses); DB::quiet(); $schema = DB::get_schema(); - $extraDataObjects = $includeExtraDataObjects ? $this->getExtraDataObjects() : null; + $extraDataObjects = $includeExtraDataObjects ? static::getExtraDataObjects() : null; $schema->schemaUpdate(function () use ($dataClasses, $extraDataObjects) { foreach ($dataClasses as $dataClass) { // Check if class exists before trying to instantiate - this sidesteps any manifest weirdness @@ -1306,12 +1304,11 @@ class SapphireTest extends PHPUnit_Framework_TestCase /** * Return all extra objects to scaffold for this test - * * @return array */ - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { - return $this->extraDataObjects; + return static::$extra_dataobjects; } /** @@ -1319,9 +1316,9 @@ class SapphireTest extends PHPUnit_Framework_TestCase * * @return array */ - protected function getExtraControllers() + protected static function getExtraControllers() { - return $this->extraControllers; + return static::$extra_controllers; } /** diff --git a/src/Dev/SilverStripeListener.php b/src/Dev/SilverStripeListener.php deleted file mode 100644 index 8a2a732ac..000000000 --- a/src/Dev/SilverStripeListener.php +++ /dev/null @@ -1,84 +0,0 @@ -getName(); - if (!$this->isValidClass($name)) { - return; - } - - /** @var SapphireTest $class */ - $class = new $name(); - $class->setUpOnce(); - } - - public function endTestSuite(PHPUnit_Framework_TestSuite $suite) - { - $name = $suite->getName(); - if (!$this->isValidClass($name)) { - return; - } - - /** @var SapphireTest $class */ - $class = new $name(); - $class->tearDownOnce(); - } - - public function startTest(PHPUnit_Framework_Test $test) - { - } - - public function endTest(PHPUnit_Framework_Test $test, $time) - { - } - - public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) - { - } - - public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) - { - } - - public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) - { - } - - public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) - { - } - - /** - * Risky test. - * - * @param PHPUnit_Framework_Test $test - * @param Exception $e - * @param float $time - * @since Method available since Release 3.8.0 - */ - public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) - { - // Stub out to support PHPUnit 3.8 - } -} diff --git a/src/Dev/TestListener.php b/src/Dev/TestListener.php deleted file mode 100644 index 902bdd379..000000000 --- a/src/Dev/TestListener.php +++ /dev/null @@ -1,92 +0,0 @@ -getName(); - if (!$this->isValidClass($name)) { - return; - } - - $this->class = new $name(); - $this->class->setUpOnce(); - } - - public function endTestSuite(PHPUnit_Framework_TestSuite $suite) - { - $name = $suite->getName(); - if (!$this->isValidClass($name)) { - return; - } - - $this->class->tearDownOnce(); - } - - /** - * Risky test. - * - * @param PHPUnit_Framework_Test $test - * @param Exception $e - * @param float $time - * @since Method available since Release 3.8.0 - */ - public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) - { - // Stub out to support PHPUnit 3.8 - } - - /** - * @param string $name Class Name - * @return boolean - */ - protected function isValidClass($name) - { - return (class_exists($name) && is_subclass_of($name, 'SilverStripe\\Dev\\SapphireTest')); - } -} diff --git a/tests/php/Control/ControllerTest.php b/tests/php/Control/ControllerTest.php index a2f9ba6d1..dd5000725 100644 --- a/tests/php/Control/ControllerTest.php +++ b/tests/php/Control/ControllerTest.php @@ -34,7 +34,7 @@ class ControllerTest extends FunctionalTest protected $depSettings = null; - protected $extraControllers = [ + protected static $extra_controllers = [ AccessBaseController::class, AccessSecuredController::class, AccessWildcardSecuredController::class, diff --git a/tests/php/Control/ControllerTest/AccessBaseController.php b/tests/php/Control/ControllerTest/AccessBaseController.php index ebff5b53a..d99c5c17c 100644 --- a/tests/php/Control/ControllerTest/AccessBaseController.php +++ b/tests/php/Control/ControllerTest/AccessBaseController.php @@ -7,12 +7,12 @@ use SilverStripe\Dev\TestOnly; class AccessBaseController extends Controller implements TestOnly { - private static $allowed_actions = array(); + private static $allowed_actions = []; private static $url_segment = 'AccessBaseController'; private static $extensions = [ - AccessBaseControllerExtension::class + AccessBaseControllerExtension::class, ]; // Denied for all diff --git a/tests/php/Control/DirectorTest.php b/tests/php/Control/DirectorTest.php index 218d0e698..22840e9e4 100644 --- a/tests/php/Control/DirectorTest.php +++ b/tests/php/Control/DirectorTest.php @@ -28,8 +28,8 @@ class DirectorTest extends SapphireTest protected $originalSession = array(); - protected $extraControllers = [ - TestController::class + protected static $extra_controllers = [ + TestController::class, ]; protected function setUp() @@ -306,12 +306,14 @@ class DirectorTest extends SapphireTest */ public function testQueryIsEnvironment() { + if (!isset($_SESSION)) { + $_SESSION = []; + } // Reset unset($_SESSION['isDev']); unset($_SESSION['isLive']); unset($_GET['isTest']); unset($_GET['isDev']); - $_SESSION = $_SESSION ?: array(); // Test isDev=1 $_GET['isDev'] = '1'; diff --git a/tests/php/Control/RequestHandlingTest.php b/tests/php/Control/RequestHandlingTest.php index 90060d1d1..1433ca4c2 100644 --- a/tests/php/Control/RequestHandlingTest.php +++ b/tests/php/Control/RequestHandlingTest.php @@ -24,7 +24,7 @@ class RequestHandlingTest extends FunctionalTest { protected static $fixture_file = null; - protected $illegalExtensions = array( + protected static $illegal_extensions = array( // Suppress CMS error page handling Controller::class => array( ErrorPageControllerExtension::class, @@ -37,7 +37,7 @@ class RequestHandlingTest extends FunctionalTest ), ); - protected $extraControllers = [ + protected static $extra_controllers = [ TestController::class, AllowedController::class, ControllerFormWithAllowedActions::class, diff --git a/tests/php/Core/ClassInfoTest.php b/tests/php/Core/ClassInfoTest.php index 329f8b442..5a9d12d55 100644 --- a/tests/php/Core/ClassInfoTest.php +++ b/tests/php/Core/ClassInfoTest.php @@ -20,7 +20,7 @@ use SilverStripe\View\ViewableData; class ClassInfoTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( BaseClass::class, BaseDataClass::class, ChildClass::class, diff --git a/tests/php/Dev/BulkLoaderResultTest.php b/tests/php/Dev/BulkLoaderResultTest.php index c4a8c8d5d..9c60db0ad 100644 --- a/tests/php/Dev/BulkLoaderResultTest.php +++ b/tests/php/Dev/BulkLoaderResultTest.php @@ -8,7 +8,10 @@ use SilverStripe\Dev\Tests\BulkLoaderResultTest\Player; class BulkLoaderResultTest extends SapphireTest { - protected $extraDataObjects = array(Player::class); + + protected static $extra_dataobjects = [ + Player::class, + ]; protected function setUp() { diff --git a/tests/php/Dev/CsvBulkLoaderTest.php b/tests/php/Dev/CsvBulkLoaderTest.php index 20966a7d2..c7d11446f 100644 --- a/tests/php/Dev/CsvBulkLoaderTest.php +++ b/tests/php/Dev/CsvBulkLoaderTest.php @@ -17,7 +17,7 @@ class CsvBulkLoaderTest extends SapphireTest protected static $fixture_file = 'CsvBulkLoaderTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( Team::class, Player::class, PlayerContract::class, diff --git a/tests/php/Dev/FixtureBlueprintTest.php b/tests/php/Dev/FixtureBlueprintTest.php index ced157b66..0495dfbe6 100644 --- a/tests/php/Dev/FixtureBlueprintTest.php +++ b/tests/php/Dev/FixtureBlueprintTest.php @@ -17,7 +17,7 @@ class FixtureBlueprintTest extends SapphireTest protected $usesDatabase = true; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( TestDataObject::class, DataObjectRelation::class, TestSiteTree::class, diff --git a/tests/php/Dev/FixtureFactoryTest.php b/tests/php/Dev/FixtureFactoryTest.php index 71e45d40b..ebff462da 100644 --- a/tests/php/Dev/FixtureFactoryTest.php +++ b/tests/php/Dev/FixtureFactoryTest.php @@ -13,7 +13,7 @@ class FixtureFactoryTest extends SapphireTest protected $usesDatabase = true; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( TestDataObject::class, DataObjectRelation::class ); diff --git a/tests/php/Dev/YamlFixtureTest.php b/tests/php/Dev/YamlFixtureTest.php index 65280dd3b..722ebcb47 100644 --- a/tests/php/Dev/YamlFixtureTest.php +++ b/tests/php/Dev/YamlFixtureTest.php @@ -15,7 +15,7 @@ use SilverStripe\Control\Director; class YamlFixtureTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( TestDataObject::class, DataObjectRelation::class, ); diff --git a/tests/php/Forms/CheckboxFieldTest.php b/tests/php/Forms/CheckboxFieldTest.php index 0c10a822b..c16f90090 100644 --- a/tests/php/Forms/CheckboxFieldTest.php +++ b/tests/php/Forms/CheckboxFieldTest.php @@ -13,7 +13,7 @@ class CheckboxFieldTest extends SapphireTest protected $usesDatabase = true; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( Article::class, ); diff --git a/tests/php/Forms/CheckboxSetFieldTest.php b/tests/php/Forms/CheckboxSetFieldTest.php index f4a91b677..dc6ed1687 100644 --- a/tests/php/Forms/CheckboxSetFieldTest.php +++ b/tests/php/Forms/CheckboxSetFieldTest.php @@ -23,7 +23,7 @@ class CheckboxSetFieldTest extends SapphireTest protected static $fixture_file = 'CheckboxSetFieldTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( Article::class, Tag::class, ); diff --git a/tests/php/Forms/EmailFieldTest.php b/tests/php/Forms/EmailFieldTest.php index b881c4d93..9eeaa4915 100644 --- a/tests/php/Forms/EmailFieldTest.php +++ b/tests/php/Forms/EmailFieldTest.php @@ -14,7 +14,7 @@ use SilverStripe\Forms\Tests\EmailFieldTest\TestValidator; class EmailFieldTest extends FunctionalTest { - protected $extraControllers = [ + protected static $extra_controllers = [ EmailFieldTest\TestController::class, ]; diff --git a/tests/php/Forms/FormFactoryTest.php b/tests/php/Forms/FormFactoryTest.php index 228e4639c..52ac9e0d8 100644 --- a/tests/php/Forms/FormFactoryTest.php +++ b/tests/php/Forms/FormFactoryTest.php @@ -13,13 +13,13 @@ use SilverStripe\Versioned\Versioned; class FormFactoryTest extends SapphireTest { - protected $extraDataObjects = [ + protected static $extra_dataobjects = [ TestObject::class, ]; protected static $fixture_file = 'FormFactoryTest.yml'; - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { // Prevent setup breaking if versioned module absent if (class_exists(Versioned::class)) { diff --git a/tests/php/Forms/FormFieldTest.php b/tests/php/Forms/FormFieldTest.php index 4641750e1..f5e48b5d9 100644 --- a/tests/php/Forms/FormFieldTest.php +++ b/tests/php/Forms/FormFieldTest.php @@ -17,7 +17,7 @@ use ReflectionClass; class FormFieldTest extends SapphireTest { - protected $requiredExtensions = array( + protected static $required_extensions = array( FormField::class => array( TestExtension::class ) diff --git a/tests/php/Forms/FormScaffolderTest.php b/tests/php/Forms/FormScaffolderTest.php index 3cbc2489a..ae61a871b 100644 --- a/tests/php/Forms/FormScaffolderTest.php +++ b/tests/php/Forms/FormScaffolderTest.php @@ -20,13 +20,13 @@ class FormScaffolderTest extends SapphireTest protected static $fixture_file = 'FormScaffolderTest.yml'; - protected $requiredExtensions = [ + protected static $required_extensions = [ Article::class => [ ArticleExtension::class ] ]; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( Article::class, Tag::class, Author::class, diff --git a/tests/php/Forms/FormTest.php b/tests/php/Forms/FormTest.php index d1c1b1b0b..4881be02a 100644 --- a/tests/php/Forms/FormTest.php +++ b/tests/php/Forms/FormTest.php @@ -35,12 +35,12 @@ class FormTest extends FunctionalTest protected static $fixture_file = 'FormTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( Player::class, Team::class, ); - protected $extraControllers = [ + protected static $extra_controllers = [ TestController::class, ControllerWithSecurityToken::class, ControllerWithStrictPostCheck::class, diff --git a/tests/php/Forms/GridField/GridFieldAddExistingAutocompleterTest.php b/tests/php/Forms/GridField/GridFieldAddExistingAutocompleterTest.php index b09470055..c9fd434f0 100644 --- a/tests/php/Forms/GridField/GridFieldAddExistingAutocompleterTest.php +++ b/tests/php/Forms/GridField/GridFieldAddExistingAutocompleterTest.php @@ -19,15 +19,15 @@ class GridFieldAddExistingAutocompleterTest extends FunctionalTest protected static $fixture_file = 'GridFieldTest.yml'; - protected $extraDataObjects = [ + protected static $extra_dataobjects = [ Team::class, Cheerleader::class, Player::class, Permissions::class ]; - protected $extraControllers = [ - TestController::class + protected static $extra_controllers = [ + TestController::class, ]; public function testScaffoldSearchFields() diff --git a/tests/php/Forms/GridField/GridFieldDeleteActionTest.php b/tests/php/Forms/GridField/GridFieldDeleteActionTest.php index c6d200c39..e559da4b3 100644 --- a/tests/php/Forms/GridField/GridFieldDeleteActionTest.php +++ b/tests/php/Forms/GridField/GridFieldDeleteActionTest.php @@ -27,33 +27,33 @@ class GridFieldDeleteActionTest extends SapphireTest { /** - * @var ArrayList -*/ + * @var ArrayList + */ protected $list; /** - * @var GridField -*/ + * @var GridField + */ protected $gridField; /** - * @var Form -*/ + * @var Form + */ protected $form; /** - * @var string -*/ + * @var string + */ protected static $fixture_file = 'GridFieldActionTest.yml'; /** - * @var array -*/ - protected $extraDataObjects = [ + * @var array + */ + protected static $extra_dataobjects = [ Team::class, Cheerleader::class, Player::class, - Permissions::class + Permissions::class, ]; protected function setUp() diff --git a/tests/php/Forms/GridField/GridFieldDetailFormTest.php b/tests/php/Forms/GridField/GridFieldDetailFormTest.php index 374b19983..0ddcd3117 100644 --- a/tests/php/Forms/GridField/GridFieldDetailFormTest.php +++ b/tests/php/Forms/GridField/GridFieldDetailFormTest.php @@ -21,13 +21,13 @@ class GridFieldDetailFormTest extends FunctionalTest protected static $fixture_file = 'GridFieldDetailFormTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( Person::class, PeopleGroup::class, Category::class, ); - protected $extraControllers = [ + protected static $extra_controllers = [ CategoryController::class, TestController::class, GroupController::class, diff --git a/tests/php/Forms/GridField/GridFieldEditButtonTest.php b/tests/php/Forms/GridField/GridFieldEditButtonTest.php index c3eaeced1..bb7875b94 100644 --- a/tests/php/Forms/GridField/GridFieldEditButtonTest.php +++ b/tests/php/Forms/GridField/GridFieldEditButtonTest.php @@ -22,33 +22,33 @@ class GridFieldEditButtonTest extends SapphireTest { /** - * @var ArrayList -*/ + * @var ArrayList + */ protected $list; /** - * @var GridField -*/ + * @var GridField + */ protected $gridField; /** - * @var Form -*/ + * @var Form + */ protected $form; /** - * @var string -*/ + * @var string + */ protected static $fixture_file = 'GridFieldActionTest.yml'; /** - * @var array -*/ - protected $extraDataObjects = array( + * @var array + */ + protected static $extra_dataobjects = array( Team::class, Cheerleader::class, Player::class, - Permissions::class + Permissions::class, ); protected function setUp() diff --git a/tests/php/Forms/GridField/GridFieldExportButtonTest.php b/tests/php/Forms/GridField/GridFieldExportButtonTest.php index 08b7b1b94..be46e1702 100644 --- a/tests/php/Forms/GridField/GridFieldExportButtonTest.php +++ b/tests/php/Forms/GridField/GridFieldExportButtonTest.php @@ -24,9 +24,9 @@ class GridFieldExportButtonTest extends SapphireTest protected static $fixture_file = 'GridFieldExportButtonTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( Team::class, - NoView::class + NoView::class, ); protected function setUp() diff --git a/tests/php/Forms/GridField/GridFieldPaginatorTest.php b/tests/php/Forms/GridField/GridFieldPaginatorTest.php index 47c436e1f..3b56ff0db 100644 --- a/tests/php/Forms/GridField/GridFieldPaginatorTest.php +++ b/tests/php/Forms/GridField/GridFieldPaginatorTest.php @@ -43,7 +43,7 @@ class GridFieldPaginatorTest extends FunctionalTest /** * @var array */ - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( Team::class, Player::class, Cheerleader::class, diff --git a/tests/php/Forms/GridField/GridFieldPrintButtonTest.php b/tests/php/Forms/GridField/GridFieldPrintButtonTest.php index 26a1119ec..402f257fe 100644 --- a/tests/php/Forms/GridField/GridFieldPrintButtonTest.php +++ b/tests/php/Forms/GridField/GridFieldPrintButtonTest.php @@ -15,8 +15,8 @@ use SilverStripe\Forms\Tests\GridField\GridFieldPrintButtonTest\TestObject; class GridFieldPrintButtonTest extends SapphireTest { - protected $extraDataObjects = array( - TestObject::class + protected static $extra_dataobjects = array( + TestObject::class, ); protected function setUp() diff --git a/tests/php/Forms/GridField/GridFieldSortableHeaderTest.php b/tests/php/Forms/GridField/GridFieldSortableHeaderTest.php index 0c4da52db..255ed269c 100644 --- a/tests/php/Forms/GridField/GridFieldSortableHeaderTest.php +++ b/tests/php/Forms/GridField/GridFieldSortableHeaderTest.php @@ -21,12 +21,12 @@ class GridFieldSortableHeaderTest extends SapphireTest protected static $fixture_file = 'GridFieldSortableHeaderTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( Team::class, TeamGroup::class, Cheerleader::class, CheerleaderHat::class, - Mom::class + Mom::class, ); /** diff --git a/tests/php/Forms/GridField/GridFieldTest.php b/tests/php/Forms/GridField/GridFieldTest.php index 24e6ec44f..302bad239 100644 --- a/tests/php/Forms/GridField/GridFieldTest.php +++ b/tests/php/Forms/GridField/GridFieldTest.php @@ -29,7 +29,7 @@ use SilverStripe\Security\Member; class GridFieldTest extends SapphireTest { - protected $extraDataObjects = [ + protected static $extra_dataobjects = [ Permissions::class, Cheerleader::class, Player::class, diff --git a/tests/php/Forms/GridField/GridField_URLHandlerTest.php b/tests/php/Forms/GridField/GridField_URLHandlerTest.php index 635cc0fd0..96f13628b 100644 --- a/tests/php/Forms/GridField/GridField_URLHandlerTest.php +++ b/tests/php/Forms/GridField/GridField_URLHandlerTest.php @@ -11,8 +11,8 @@ use SilverStripe\Forms\Tests\GridField\GridField_URLHandlerTest\TestController; class GridField_URLHandlerTest extends FunctionalTest { - protected $extraControllers = [ - TestController::class + protected static $extra_controllers = [ + TestController::class, ]; public function testFormSubmission() diff --git a/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php index 72f0cd058..7135be6d5 100644 --- a/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php +++ b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php @@ -29,13 +29,15 @@ class HTMLEditorFieldTest extends FunctionalTest protected static $use_draft_site = true; - protected $requiredExtensions = array( + protected static $required_extensions= array( HTMLEditorField_Toolbar::class => array( - DummyMediaFormFieldExtension::class - ) + DummyMediaFormFieldExtension::class, + ), ); - protected $extraDataObjects = array(TestObject::class); + protected static $extra_dataobjects = [ + TestObject::class, + ]; protected function setUp() { diff --git a/tests/php/Forms/ListboxFieldTest.php b/tests/php/Forms/ListboxFieldTest.php index 10e7d604e..66bccc81f 100644 --- a/tests/php/Forms/ListboxFieldTest.php +++ b/tests/php/Forms/ListboxFieldTest.php @@ -17,10 +17,10 @@ class ListboxFieldTest extends SapphireTest protected static $fixture_file = 'ListboxFieldTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( TestObject::class, Article::class, - Tag::class + Tag::class, ); public function testFieldWithManyManyRelationship() diff --git a/tests/php/Forms/MoneyFieldTest.php b/tests/php/Forms/MoneyFieldTest.php index 5e67f46f1..6e1082629 100644 --- a/tests/php/Forms/MoneyFieldTest.php +++ b/tests/php/Forms/MoneyFieldTest.php @@ -12,7 +12,7 @@ use SilverStripe\Forms\MoneyField; class MoneyFieldTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( TestObject::class, CustomSetter_Object::class, ); diff --git a/tests/php/ORM/ComponentSetTest.php b/tests/php/ORM/ComponentSetTest.php index 04e43149e..6078fa865 100644 --- a/tests/php/ORM/ComponentSetTest.php +++ b/tests/php/ORM/ComponentSetTest.php @@ -9,7 +9,7 @@ class ComponentSetTest extends SapphireTest protected static $fixture_file = 'ComponentSetTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( ComponentSetTest\Player::class, ComponentSetTest\Team::class, ); diff --git a/tests/php/ORM/DBClassNameTest.php b/tests/php/ORM/DBClassNameTest.php index 238d93b54..c054e5328 100644 --- a/tests/php/ORM/DBClassNameTest.php +++ b/tests/php/ORM/DBClassNameTest.php @@ -9,7 +9,7 @@ use SilverStripe\Dev\SapphireTest; class DBClassNameTest extends SapphireTest { - protected $extraDataObjects = [ + protected static $extra_dataobjects = [ DBClassNameTest\TestObject::class, DBClassNameTest\ObjectSubClass::class, DBClassNameTest\ObjectSubSubClass::class, diff --git a/tests/php/ORM/DBCompositeTest.php b/tests/php/ORM/DBCompositeTest.php index 4c5f96604..ba79f6bec 100644 --- a/tests/php/ORM/DBCompositeTest.php +++ b/tests/php/ORM/DBCompositeTest.php @@ -9,7 +9,7 @@ use SilverStripe\Dev\SapphireTest; class DBCompositeTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( DBCompositeTest\TestObject::class, DBCompositeTest\SubclassedDBFieldObject::class, ); diff --git a/tests/php/ORM/DBMoneyTest.php b/tests/php/ORM/DBMoneyTest.php index 5a99e4b8e..f5be11c94 100644 --- a/tests/php/ORM/DBMoneyTest.php +++ b/tests/php/ORM/DBMoneyTest.php @@ -13,7 +13,7 @@ class DBMoneyTest extends SapphireTest protected static $fixture_file = 'DBMoneyTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( DBMoneyTest\TestObject::class, DBMoneyTest\TestObjectSubclass::class, ); diff --git a/tests/php/ORM/DataExtensionTest.php b/tests/php/ORM/DataExtensionTest.php index 8c3ccfd71..7d95aa0fd 100644 --- a/tests/php/ORM/DataExtensionTest.php +++ b/tests/php/ORM/DataExtensionTest.php @@ -15,7 +15,7 @@ class DataExtensionTest extends SapphireTest { protected static $fixture_file = 'DataExtensionTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( DataExtensionTest\TestMember::class, DataExtensionTest\Player::class, DataExtensionTest\RelatedObject::class, @@ -25,7 +25,7 @@ class DataExtensionTest extends SapphireTest DataExtensionTest\CMSFieldsGrandChild::class ); - protected $requiredExtensions = [ + protected static $required_extensions = [ DataObject::class => [ DataExtensionTest\AppliedToDO::class, ] @@ -116,7 +116,7 @@ class DataExtensionTest extends SapphireTest ); // Now that we've just added the extension, we need to rebuild the database - $this->resetDBSchema(true); + static::resetDBSchema(true); // Create a test record with extended fields, writing to the DB $player = new DataExtensionTest\Player(); diff --git a/tests/php/ORM/DataListTest.php b/tests/php/ORM/DataListTest.php index e827a8194..fecca2fd9 100755 --- a/tests/php/ORM/DataListTest.php +++ b/tests/php/ORM/DataListTest.php @@ -24,7 +24,7 @@ class DataListTest extends SapphireTest // Borrow the model from DataObjectTest protected static $fixture_file = 'DataObjectTest.yml'; - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { return array_merge( DataObjectTest::$extra_data_objects, @@ -1265,7 +1265,7 @@ class DataListTest extends SapphireTest public function testAggregateFilters() { $teams = Team::get()->filter('Comments.Count()', 2); - + $team1 = $this->objFromFixture(Team::class, 'team1'); $team2 = $this->objFromFixture(Team::class, 'team2'); $team3 = $this->objFromFixture(Team::class, 'team3'); @@ -1284,7 +1284,7 @@ class DataListTest extends SapphireTest $this->assertEquals($team1->ID, $teams->first()->ID); $teams = Team::get()->filter('Comments.Count()', [1,2]); - + $this->assertCount(2, $teams); foreach ([$team1, $team2] as $expectedTeam) { $this->assertContains($expectedTeam->ID, $teams->column('ID')); diff --git a/tests/php/ORM/DataObjectDuplicationTest.php b/tests/php/ORM/DataObjectDuplicationTest.php index 5b8ba2bba..c19b52c23 100644 --- a/tests/php/ORM/DataObjectDuplicationTest.php +++ b/tests/php/ORM/DataObjectDuplicationTest.php @@ -11,7 +11,7 @@ class DataObjectDuplicationTest extends SapphireTest protected $usesDatabase = true; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( DataObjectDuplicationTest\Class1::class, DataObjectDuplicationTest\Class2::class, DataObjectDuplicationTest\Class3::class diff --git a/tests/php/ORM/DataObjectLazyLoadingTest.php b/tests/php/ORM/DataObjectLazyLoadingTest.php index 4410961e5..7f0429b31 100644 --- a/tests/php/ORM/DataObjectLazyLoadingTest.php +++ b/tests/php/ORM/DataObjectLazyLoadingTest.php @@ -15,7 +15,7 @@ class DataObjectLazyLoadingTest extends SapphireTest 'DataObjectTest.yml', ); - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { return array_merge( DataObjectTest::$extra_data_objects, diff --git a/tests/php/ORM/DataObjectSchemaGenerationTest.php b/tests/php/ORM/DataObjectSchemaGenerationTest.php index 008f17b5a..ffd2be3b7 100644 --- a/tests/php/ORM/DataObjectSchemaGenerationTest.php +++ b/tests/php/ORM/DataObjectSchemaGenerationTest.php @@ -13,12 +13,12 @@ use SilverStripe\ORM\Tests\DataObjectSchemaGenerationTest\TestObject; class DataObjectSchemaGenerationTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( TestObject::class, TestIndexObject::class ); - public function setUpOnce() + public static function setUpBeforeClass() { // enable fulltext option on this table @@ -27,7 +27,7 @@ class DataObjectSchemaGenerationTest extends SapphireTest array(MySQLSchemaManager::ID => 'ENGINE=MyISAM') ); - parent::setUpOnce(); + parent::setUpBeforeClass(); } /** diff --git a/tests/php/ORM/DataObjectSchemaTest.php b/tests/php/ORM/DataObjectSchemaTest.php index 531b77f9d..5c09c8350 100644 --- a/tests/php/ORM/DataObjectSchemaTest.php +++ b/tests/php/ORM/DataObjectSchemaTest.php @@ -23,7 +23,7 @@ use SilverStripe\ORM\Tests\DataObjectSchemaTest\WithRelation; */ class DataObjectSchemaTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( // Classes in base namespace BaseClass::class, BaseDataClass::class, diff --git a/tests/php/ORM/DataObjectTest.php b/tests/php/ORM/DataObjectTest.php index 4bd9d150b..01ea5c0b9 100644 --- a/tests/php/ORM/DataObjectTest.php +++ b/tests/php/ORM/DataObjectTest.php @@ -53,7 +53,7 @@ class DataObjectTest extends SapphireTest DataObjectTest\Sortable::class, ); - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { return array_merge( DataObjectTest::$extra_data_objects, diff --git a/tests/php/ORM/DataQueryTest.php b/tests/php/ORM/DataQueryTest.php index a29d02e98..398f39c25 100644 --- a/tests/php/ORM/DataQueryTest.php +++ b/tests/php/ORM/DataQueryTest.php @@ -16,7 +16,7 @@ class DataQueryTest extends SapphireTest protected static $fixture_file = 'DataQueryTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( DataQueryTest\ObjectA::class, DataQueryTest\ObjectB::class, DataQueryTest\ObjectC::class, @@ -284,7 +284,7 @@ class DataQueryTest extends SapphireTest $query = new DataQuery(DataQueryTest\ObjectF::class); $query->where(DB::get_conn()->comparisonClause('"SortOrder"', '2')); $this->assertGreaterThan(0, $query->count(), "Couldn't find SortOrder"); - $this->resetDBSchema(true); + static::resetDBSchema(true); } public function testComparisonClauseDateFull() @@ -293,7 +293,7 @@ class DataQueryTest extends SapphireTest $query = new DataQuery(DataQueryTest\ObjectF::class); $query->where(DB::get_conn()->comparisonClause('"MyDate"', '1988-03-04%')); $this->assertGreaterThan(0, $query->count(), "Couldn't find MyDate"); - $this->resetDBSchema(true); + static::resetDBSchema(true); } public function testComparisonClauseDateStartsWith() @@ -302,7 +302,7 @@ class DataQueryTest extends SapphireTest $query = new DataQuery(DataQueryTest\ObjectF::class); $query->where(DB::get_conn()->comparisonClause('"MyDate"', '1988%')); $this->assertGreaterThan(0, $query->count(), "Couldn't find MyDate"); - $this->resetDBSchema(true); + static::resetDBSchema(true); } public function testComparisonClauseDateStartsPartial() @@ -311,7 +311,7 @@ class DataQueryTest extends SapphireTest $query = new DataQuery(DataQueryTest\ObjectF::class); $query->where(DB::get_conn()->comparisonClause('"MyDate"', '%03-04%')); $this->assertGreaterThan(0, $query->count(), "Couldn't find MyDate"); - $this->resetDBSchema(true); + static::resetDBSchema(true); } public function testComparisonClauseTextCaseInsensitive() @@ -320,7 +320,7 @@ class DataQueryTest extends SapphireTest $query = new DataQuery(DataQueryTest\ObjectF::class); $query->where(DB::get_conn()->comparisonClause('"MyString"', 'helloworld')); $this->assertGreaterThan(0, $query->count(), "Couldn't find MyString"); - $this->resetDBSchema(true); + static::resetDBSchema(true); } public function testComparisonClauseTextCaseSensitive() @@ -333,7 +333,7 @@ class DataQueryTest extends SapphireTest $query2 = new DataQuery(DataQueryTest\ObjectF::class); $query2->where(DB::get_conn()->comparisonClause('"MyString"', 'helloworld', false, false, true)); $this->assertEquals(0, $query2->count(), "Found mystring. Shouldn't be able too."); - $this->resetDBSchema(true); + static::resetDBSchema(true); } /** diff --git a/tests/php/ORM/DatabaseTest.php b/tests/php/ORM/DatabaseTest.php index 93644fd6e..b9a6fca31 100644 --- a/tests/php/ORM/DatabaseTest.php +++ b/tests/php/ORM/DatabaseTest.php @@ -15,7 +15,7 @@ use SilverStripe\ORM\Tests\DatabaseTest\MyObject; class DatabaseTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( MyObject::class, ); @@ -37,7 +37,7 @@ class DatabaseTest extends SapphireTest 'Field is renamed to _obsolete_ through dontRequireField()' ); - $this->resetDBSchema(true); + static::resetDBSchema(true); } public function testRenameField() @@ -59,7 +59,7 @@ class DatabaseTest extends SapphireTest 'Old fieldname isnt preserved through renameField()' ); - $this->resetDBSchema(true); + static::resetDBSchema(true); } public function testMySQLCreateTableOptions() diff --git a/tests/php/ORM/DecimalTest.php b/tests/php/ORM/DecimalTest.php index c402a6ccd..6e07f9898 100644 --- a/tests/php/ORM/DecimalTest.php +++ b/tests/php/ORM/DecimalTest.php @@ -11,7 +11,7 @@ class DecimalTest extends SapphireTest protected $testDataObject; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( DecimalTest\TestObject::class ); diff --git a/tests/php/ORM/Filters/FulltextFilterTest.php b/tests/php/ORM/Filters/FulltextFilterTest.php index 7ac9fbf62..6e2721ac3 100755 --- a/tests/php/ORM/Filters/FulltextFilterTest.php +++ b/tests/php/ORM/Filters/FulltextFilterTest.php @@ -11,7 +11,7 @@ use SilverStripe\ORM\Tests\Filters\FulltextFilterTest\TestObject; class FulltextFilterTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( TestObject::class ); diff --git a/tests/php/ORM/Filters/SearchFilterApplyRelationTest.php b/tests/php/ORM/Filters/SearchFilterApplyRelationTest.php index 7837aa6d3..f2256a859 100644 --- a/tests/php/ORM/Filters/SearchFilterApplyRelationTest.php +++ b/tests/php/ORM/Filters/SearchFilterApplyRelationTest.php @@ -17,7 +17,7 @@ class SearchFilterApplyRelationTest extends SapphireTest protected static $fixture_file = 'SearchFilterApplyRelationTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( SearchFilterApplyRelationTest\TestObject::class, SearchFilterApplyRelationTest\HasOneParent::class, SearchFilterApplyRelationTest\HasOneChild::class, diff --git a/tests/php/ORM/HasManyListTest.php b/tests/php/ORM/HasManyListTest.php index e210b5fe2..93216e0e1 100644 --- a/tests/php/ORM/HasManyListTest.php +++ b/tests/php/ORM/HasManyListTest.php @@ -11,7 +11,7 @@ class HasManyListTest extends SapphireTest // Borrow the model from DataObjectTest protected static $fixture_file = 'DataObjectTest.yml'; - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { return array_merge( DataObjectTest::$extra_data_objects, diff --git a/tests/php/ORM/HierarchyTest.php b/tests/php/ORM/HierarchyTest.php index 16886e046..e9790c48b 100644 --- a/tests/php/ORM/HierarchyTest.php +++ b/tests/php/ORM/HierarchyTest.php @@ -12,13 +12,13 @@ class HierarchyTest extends SapphireTest { protected static $fixture_file = 'HierarchyTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( HierarchyTest\TestObject::class, HierarchyTest\HideTestObject::class, HierarchyTest\HideTestSubObject::class, ); - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { // Prevent setup breaking if versioned module absent if (class_exists(Versioned::class)) { diff --git a/tests/php/ORM/ManyManyListExtensionTest.php b/tests/php/ORM/ManyManyListExtensionTest.php index 303e27819..4985ba117 100644 --- a/tests/php/ORM/ManyManyListExtensionTest.php +++ b/tests/php/ORM/ManyManyListExtensionTest.php @@ -13,7 +13,7 @@ class ManyManyListExtensionTest extends SapphireTest protected static $fixture_file = 'ManyManyListExtensionTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( ManyManyListTest\IndirectPrimary::class, ManyManyListTest\Secondary::class, ManyManyListTest\SecondarySub::class diff --git a/tests/php/ORM/ManyManyListTest.php b/tests/php/ORM/ManyManyListTest.php index 7e389a61d..eecbdc1d2 100644 --- a/tests/php/ORM/ManyManyListTest.php +++ b/tests/php/ORM/ManyManyListTest.php @@ -20,7 +20,7 @@ class ManyManyListTest extends SapphireTest ManyManyListTest\Product::class, ]; - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { return array_merge( DataObjectTest::$extra_data_objects, diff --git a/tests/php/ORM/ManyManyThroughListTest.php b/tests/php/ORM/ManyManyThroughListTest.php index a7d9a2611..f81315239 100644 --- a/tests/php/ORM/ManyManyThroughListTest.php +++ b/tests/php/ORM/ManyManyThroughListTest.php @@ -11,7 +11,7 @@ class ManyManyThroughListTest extends SapphireTest { protected static $fixture_file = 'ManyManyThroughListTest.yml'; - protected $extraDataObjects = [ + protected static $extra_dataobjects = [ ManyManyThroughListTest\Item::class, ManyManyThroughListTest\JoinObject::class, ManyManyThroughListTest\TestObject::class diff --git a/tests/php/ORM/MapTest.php b/tests/php/ORM/MapTest.php index 7318783fc..94345f954 100755 --- a/tests/php/ORM/MapTest.php +++ b/tests/php/ORM/MapTest.php @@ -14,7 +14,7 @@ class MapTest extends SapphireTest // Borrow the model from DataObjectTest protected static $fixture_file = 'DataObjectTest.yml'; - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { return array_merge( DataObjectTest::$extra_data_objects, diff --git a/tests/php/ORM/MySQLDatabaseTest.php b/tests/php/ORM/MySQLDatabaseTest.php index 92e897e84..5975c37b2 100644 --- a/tests/php/ORM/MySQLDatabaseTest.php +++ b/tests/php/ORM/MySQLDatabaseTest.php @@ -14,7 +14,7 @@ class MySQLDatabaseTest extends SapphireTest protected static $fixture_file = 'MySQLDatabaseTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( MySQLDatabaseTest\Data::class ); diff --git a/tests/php/ORM/PDODatabaseTest.php b/tests/php/ORM/PDODatabaseTest.php index 21ea6b436..9b5ff3695 100644 --- a/tests/php/ORM/PDODatabaseTest.php +++ b/tests/php/ORM/PDODatabaseTest.php @@ -13,7 +13,7 @@ class PDODatabaseTest extends SapphireTest protected static $fixture_file = 'MySQLDatabaseTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( MySQLDatabaseTest\Data::class ); diff --git a/tests/php/ORM/PaginatedListTest.php b/tests/php/ORM/PaginatedListTest.php index 401335b4a..dafebcfc5 100644 --- a/tests/php/ORM/PaginatedListTest.php +++ b/tests/php/ORM/PaginatedListTest.php @@ -18,7 +18,7 @@ class PaginatedListTest extends SapphireTest protected static $fixture_file = 'DataObjectTest.yml'; - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { return array_merge( DataObjectTest::$extra_data_objects, diff --git a/tests/php/ORM/PolymorphicHasManyListTest.php b/tests/php/ORM/PolymorphicHasManyListTest.php index 1aa392fe4..61a00ca3f 100644 --- a/tests/php/ORM/PolymorphicHasManyListTest.php +++ b/tests/php/ORM/PolymorphicHasManyListTest.php @@ -19,7 +19,7 @@ class PolymorphicHasManyListTest extends SapphireTest // Borrow the model from DataObjectTest protected static $fixture_file = 'DataObjectTest.yml'; - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { return array_merge( DataObjectTest::$extra_data_objects, diff --git a/tests/php/ORM/SQLInsertTest.php b/tests/php/ORM/SQLInsertTest.php index e1af65fef..4718cd98b 100644 --- a/tests/php/ORM/SQLInsertTest.php +++ b/tests/php/ORM/SQLInsertTest.php @@ -15,7 +15,7 @@ use SilverStripe\ORM\Tests\SQLInsertTest\SQLInsertTestBase; class SQLInsertTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( SQLInsertTestBase::class ); diff --git a/tests/php/ORM/SQLSelectTest.php b/tests/php/ORM/SQLSelectTest.php index b2cfd14bc..fd2de1feb 100755 --- a/tests/php/ORM/SQLSelectTest.php +++ b/tests/php/ORM/SQLSelectTest.php @@ -15,7 +15,7 @@ class SQLSelectTest extends SapphireTest protected static $fixture_file = 'SQLSelectTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( SQLSelectTest\TestObject::class, SQLSelectTest\TestBase::class, SQLSelectTest\TestChild::class diff --git a/tests/php/ORM/SQLUpdateTest.php b/tests/php/ORM/SQLUpdateTest.php index c248cb70d..04f0d4fb2 100644 --- a/tests/php/ORM/SQLUpdateTest.php +++ b/tests/php/ORM/SQLUpdateTest.php @@ -15,7 +15,7 @@ class SQLUpdateTest extends SapphireTest public static $fixture_file = 'SQLUpdateTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( SQLUpdateTest\TestBase::class, SQLUpdateTest\TestChild::class ); diff --git a/tests/php/ORM/Search/SearchContextTest.php b/tests/php/ORM/Search/SearchContextTest.php index f167c73b6..ced8c07d1 100644 --- a/tests/php/ORM/Search/SearchContextTest.php +++ b/tests/php/ORM/Search/SearchContextTest.php @@ -14,7 +14,7 @@ class SearchContextTest extends SapphireTest protected static $fixture_file = 'SearchContextTest.yml'; - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( SearchContextTest\Person::class, SearchContextTest\Book::class, SearchContextTest\Company::class, diff --git a/tests/php/ORM/TransactionTest.php b/tests/php/ORM/TransactionTest.php index a9a27a16e..9c4bc5541 100644 --- a/tests/php/ORM/TransactionTest.php +++ b/tests/php/ORM/TransactionTest.php @@ -9,7 +9,7 @@ use SilverStripe\Dev\SapphireTest; class TransactionTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( TransactionTest\TestObject::class ); diff --git a/tests/php/ORM/UnsavedRelationListTest.php b/tests/php/ORM/UnsavedRelationListTest.php index 859ef55f3..cfa134980 100644 --- a/tests/php/ORM/UnsavedRelationListTest.php +++ b/tests/php/ORM/UnsavedRelationListTest.php @@ -9,7 +9,7 @@ class UnsavedRelationListTest extends SapphireTest { protected static $fixture_file = 'UnsavedRelationListTest.yml'; - protected $extraDataObjects = [ + protected static $extra_dataobjects = [ UnsavedRelationListTest\TestObject::class ]; diff --git a/tests/php/Security/BasicAuthTest.php b/tests/php/Security/BasicAuthTest.php index f80019e6f..4d2f37c33 100644 --- a/tests/php/Security/BasicAuthTest.php +++ b/tests/php/Security/BasicAuthTest.php @@ -19,7 +19,7 @@ class BasicAuthTest extends FunctionalTest protected static $fixture_file = 'BasicAuthTest.yml'; - protected $extraControllers = [ + protected static $extra_controllers = [ ControllerSecuredWithPermission::class, ControllerSecuredWithoutPermission::class, ]; diff --git a/tests/php/Security/GroupTest.php b/tests/php/Security/GroupTest.php index 8bc8fe77e..6ba93e4f3 100644 --- a/tests/php/Security/GroupTest.php +++ b/tests/php/Security/GroupTest.php @@ -16,7 +16,7 @@ class GroupTest extends FunctionalTest protected static $fixture_file = 'GroupTest.yml'; - protected $extraDataObjects = [ + protected static $extra_dataobjects = [ TestMember::class ]; diff --git a/tests/php/Security/MemberTest.php b/tests/php/Security/MemberTest.php index 157f69f7c..153eab2dc 100644 --- a/tests/php/Security/MemberTest.php +++ b/tests/php/Security/MemberTest.php @@ -27,7 +27,7 @@ class MemberTest extends FunctionalTest protected $orig = array(); - protected $illegalExtensions = array( + protected static $illegal_extensions = array( Member::class => array( // TODO Coupling with modules, this should be resolved by automatically // removing all applied extensions before a unit test diff --git a/tests/php/Security/SecurityTest.php b/tests/php/Security/SecurityTest.php index 15455085b..6de6e42d1 100644 --- a/tests/php/Security/SecurityTest.php +++ b/tests/php/Security/SecurityTest.php @@ -40,7 +40,7 @@ class SecurityTest extends FunctionalTest protected $priorRememberUsername = null; - protected $extraControllers = [ + protected static $extra_controllers = [ SecurityTest\NullController::class, SecurityTest\SecuredController::class, ]; @@ -662,15 +662,15 @@ class SecurityTest extends FunctionalTest // Assumption: The database has been built correctly by the test runner, // and has all columns present in the ORM /** - * @skipUpgrade -*/ + * @skipUpgrade + */ DB::get_schema()->renameField('Member', 'Email', 'Email_renamed'); // Email column is now missing, which means we're not ready to do permission checks $this->assertFalse(Security::database_is_ready()); // Rebuild the database (which re-adds the Email column), and try again - $this->resetDBSchema(true); + static::resetDBSchema(true); $this->assertTrue(Security::database_is_ready()); Security::$force_database_is_ready = $old; diff --git a/tests/php/View/SSViewerCacheBlockTest.php b/tests/php/View/SSViewerCacheBlockTest.php index ac899791c..3c8d394a5 100644 --- a/tests/php/View/SSViewerCacheBlockTest.php +++ b/tests/php/View/SSViewerCacheBlockTest.php @@ -15,11 +15,11 @@ use Symfony\Component\Cache\Simple\NullCache; class SSViewerCacheBlockTest extends SapphireTest { - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( SSViewerCacheBlockTest\TestModel::class ); - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { $classes = parent::getExtraDataObjects(); diff --git a/tests/php/View/SSViewerTest.php b/tests/php/View/SSViewerTest.php index 856e86512..ab83cd0d9 100644 --- a/tests/php/View/SSViewerTest.php +++ b/tests/php/View/SSViewerTest.php @@ -41,7 +41,7 @@ class SSViewerTest extends SapphireTest */ protected $oldServer = array(); - protected $extraDataObjects = array( + protected static $extra_dataobjects = array( SSViewerTest\TestObject::class, ); diff --git a/tests/php/i18n/i18nTestManifest.php b/tests/php/i18n/i18nTestManifest.php index 40da6235e..081347ad4 100644 --- a/tests/php/i18n/i18nTestManifest.php +++ b/tests/php/i18n/i18nTestManifest.php @@ -50,7 +50,7 @@ trait i18nTestManifest */ protected $moduleManifests = 0; - protected function getExtraDataObjects() + protected static function getExtraDataObjects() { return [ TestDataObject::class,