API phpunit 9 support

This commit is contained in:
Steve Boyd 2021-11-09 11:43:41 +13:00
parent b52fd75f0e
commit 5e3037bd2f
5 changed files with 15 additions and 16 deletions

View File

@ -19,11 +19,12 @@
"issues": "http://github.com/symbiote/silverstripe-gridfieldextensions/issues"
},
"require": {
"php": "^7.3 || ^8.0",
"silverstripe/vendor-plugin": "^1.0",
"silverstripe/framework": "~4.0"
"silverstripe/framework": "^4.10"
},
"require-dev": {
"sminnee/phpunit": "^5.7",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.0",
"silverstripe/versioned": "^1"
},

View File

@ -16,7 +16,7 @@ class GridFieldConfigurablePaginatorTest extends SapphireTest
*/
protected $gridField;
public function setUp()
protected function setUp(): void
{
parent::setUp();
@ -172,12 +172,10 @@ class GridFieldConfigurablePaginatorTest extends SapphireTest
), $paginator->getPageSizesAsList());
}
/**
* @expectedException Exception
* @expectedExceptionMessage No GridField available yet for this request!
*/
public function testGetGridFieldThrowsExceptionWhenNotSet()
{
$this->expectException(\Exception::class);
$this->expectExceptionMessage('No GridField available yet for this request!');
$paginator = new GridFieldConfigurablePaginator;
$paginator->getGridField();
}

View File

@ -48,7 +48,7 @@ class GridFieldEditableColumnsTest extends SapphireTest
$column = $component->getColumnContent($grid, $record, 'Title');
$this->assertInstanceOf(DBHTMLText::class, $column);
$this->assertRegExp(
$this->assertMatchesRegularExpression(
'/<input type="text" name="TestGridField\[GridFieldEditableColumns\]\[100\]\[Title\]" value="foo"[^>]*>/',
$column->getValue()
);
@ -64,7 +64,7 @@ class GridFieldEditableColumnsTest extends SapphireTest
$column = $component->getColumnContent($grid, $record, 'Title');
$this->assertInstanceOf(DBHTMLText::class, $column);
$this->assertRegExp(
$this->assertMatchesRegularExpression(
'/<span[^>]*>\s*testval\s*<\/span>/',
$column->getValue()
);
@ -86,7 +86,7 @@ class GridFieldEditableColumnsTest extends SapphireTest
$column = $component->getColumnContent($grid, $record, 'Title');
$this->assertInstanceOf(DBHTMLText::class, $column);
$this->assertRegExp(
$this->assertMatchesRegularExpression(
'/<span[^>]*>\s*testval\s*<\/span>/',
$column->getValue()
);

View File

@ -118,12 +118,12 @@ class GridFieldOrderableRowsTest extends SapphireTest
$result = $orderable->getColumnContent($grid, $record, 'irrelevant');
$this->assertContains(
$this->assertStringContainsString(
'Belongings[GridFieldEditableColumns][' . $record->ID . '][Sort]',
$result,
'The field name is indexed under the record\'s ID'
);
$this->assertContains(
$this->assertStringContainsString(
'value="' . $intermediary->Sort . '"',
$result,
'The value comes from the MMTL intermediary Sort value'
@ -152,12 +152,12 @@ class GridFieldOrderableRowsTest extends SapphireTest
$result = $orderable->getColumnContent($grid, $record, 'irrelevant');
$this->assertContains(
$this->assertStringContainsString(
'Children[GridFieldEditableColumns][' . $record->ID . '][Sort]',
$result,
'The field name is indexed under the record\'s ID'
);
$this->assertContains(
$this->assertStringContainsString(
'value="' . $intermediary->Sort . '"',
$result,
'The value comes from the MMTL intermediary Sort value'

View File

@ -30,13 +30,13 @@ class OrderableRowsThroughVersionedTest extends SapphireTest
protected $originalReadingMode;
protected function setUp()
protected function setUp(): void
{
parent::setUp();
$this->orignalReadingMode = Versioned::get_reading_mode();
}
protected function tearDown()
protected function tearDown(): void
{
Versioned::set_reading_mode($this->originalReadingMode);
unset($this->originalReadingMode);