API phpunit 9 support

.travis.yml

@@ -5,17 +5,4 @@ import:
 
 env:
   global:
-    # Require at least recipe 4.7.x-dev to satisfy the silverstripe/admin:1.7@dev requirement
-    - REQUIRE_RECIPE="4.x-dev || "
     - BEHAT_SUITE="elemental-bannerblock"
-
-before_script:
-  # Allow the installation of 4.x-dev which is graphql 4 compatible for when running a job that requires graphql 4
-  # Also set the minimum version of elemental to 4.5.0 which is graphql 3 compatible only
-  # Otherwise elemental 4.4.1 will be installed which has no graphql contraint and is not graphql 4 compatible
-  # Doing this in before_script instead of REQUIRE_EXTRA above because the || would not work in conjuction with the
-  # unquoted $REQUIRE_EXTRA in travis-shared-config base.yml
-  - composer require --no-update "dnadesign/silverstripe-elemental:^4.5@dev || 4.x-dev"
-  # requiring via --no-update and the running update to bypass the php check on the php8 builds
-  # this can be reduced to a regular composer require once silverstripe-elemental supports php8 in composer.json
-  - composer update dnadesign/silverstripe-elemental

composer.json

@@ -11,20 +11,19 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.1.0",
+        "php": ">=7.3.0",
         "silverstripe/vendor-plugin": "^1.0",
+        "dnadesign/silverstripe-elemental": "^4.7",
         "silverstripe/elemental-fileblock": "^2@dev",
         "silverstripe/cms": "^4.3",
-        "silverstripe/admin": "^1.7@dev"
+        "silverstripe/admin": "^1.7@dev",
+        "silverstripe/framework": "^4.10"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        },
         "expose": [
             "client/dist"
         ]

phpunit.xml.dist

@@ -1,8 +1,10 @@
 <phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
 
-    <testsuite name="Default">
-        <directory>tests/</directory>
-    </testsuite>
+    <testsuites>
+        <testsuite name="Default">
+            <directory>tests/</directory>
+        </testsuite>
+    </testsuites>
 
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">

tests/Behat/Context/FeatureContext.php

@@ -3,6 +3,7 @@
 
 use Behat\Mink\Element\NodeElement;
 use DNADesign\Elemental\Tests\Behat\Context\FeatureContext as BaseFeatureContext;
+use PHPUnit\Framework\Assert;
 use SilverStripe\BehatExtension\Context\MainContextAwareTrait;
 
 if (!class_exists(BaseFeatureContext::class)) {
@@ -27,9 +28,9 @@ public function iShouldSeeTheThumbnailImageForBlock($negative, $position)
         $thumbnailImage = $this->findThumbnailImage($position);
 
         if ($iShouldNotSee) {
-            assertNull($thumbnailImage, 'Thumbnail image displayed (but shouldn\'t)');
+            Assert::assertNull($thumbnailImage, 'Thumbnail image displayed (but shouldn\'t)');
         } else {
-            assertNotNull($thumbnailImage, 'Thumbnail image not displayed (but should be)');
+            Assert::assertNotNull($thumbnailImage, 'Thumbnail image not displayed (but should be)');
         }
     }
 
@@ -43,7 +44,7 @@ public function iShouldSeeTheThumbnailImageForBlock($negative, $position)
     protected function findThumbnailImage($position)
     {
         $block = $this->getSpecificBlock($position);
-        assertNotNull($block, 'Block ' . $position . ' was not found in the page.');
+        Assert::assertNotNull($block, 'Block ' . $position . ' was not found in the page.');
 
         $thumbnail = $block->find(
             'css',
@@ -68,7 +69,7 @@ public function stepIPressTheButtonInTheActionMenuForCallToActionLink($buttonNam
 
         $button = $popover->find('xpath', sprintf('/button[contains(text(), \'%s\')]', $buttonName));
 
-        assertNotNull($button, sprintf('Could not find button labelled "%s"', $buttonName));
+        Assert::assertNotNull($button, sprintf('Could not find button labelled "%s"', $buttonName));
 
         $button->click();
     }
@@ -81,7 +82,7 @@ public function iShouldSeeAModalTitled($title)
     {
         $page = $this->getMainContext()->getSession()->getPage();
         $modalTitle = $page->find('css', '[role=dialog] .modal-header > .modal-title');
-        assertNotNull($modalTitle, 'No modal on the page');
-        assertTrue($modalTitle->getText() == $title);
+        Assert::assertNotNull($modalTitle, 'No modal on the page');
+        Assert::assertTrue($modalTitle->getText() == $title);
     }
 }

tests/Behat/Context/FixtureContext.php

@@ -3,6 +3,7 @@
 
 use Behat\Mink\Element\DocumentElement;
 use Behat\Mink\Element\NodeElement;
+use PHPUnit\Framework\Assert;
 use SilverStripe\Assets\Image;
 use SilverStripe\BehatExtension\Context\FixtureContext as BaseFixtureContext;
 use SilverStripe\ElementalBannerBlock\Block\BannerBlock;
@@ -92,7 +93,7 @@ public function contentBlocksAreNotInLineEditable()
     public function stepISelectGalleryItem($name)
     {
         $item = $this->getGalleryItem($name);
-        assertNotNull($item, "File named $name could not be found");
+        Assert::assertNotNull($item, "File named $name could not be found");
         $item->click();
     }
 

tests/Form/BlockLinkFieldTest.php

@@ -15,15 +15,15 @@ class BlockLinkFieldTest extends SapphireTest
      */
     protected $field;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->field = new BlockLinkField('test');
     }
 
     public function testHasUniqueFormFieldSelector()
     {
-        $this->assertContains('block-link-field', $this->field->Type());
+        $this->assertStringContainsString('block-link-field', $this->field->Type());
     }
 
     public function testGetParsedValue()

tests/Form/BlockLinkField_ReadonlyTest.php

@@ -16,7 +16,7 @@ class BlockLinkField_ReadonlyTest extends SapphireTest
      */
     protected $field;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();