API phpunit9 support

.travis.yml

@@ -1,49 +1,4 @@
-language: php
+version: ~> 1.0
 
-dist: xenial
-
-services:
-  - mysql
-  - postgresql
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-env:
-  global:
-    - COMPOSER_ROOT_VERSION=3.x-dev
-
-matrix:
-  include:
-    - php: 5.6
-      env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
-    - php: 7.1
-      env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_COVERAGE_TEST=1 PDO=1
-    - php: 7.2
-      env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
-    - php: 7.3
-      env: DB=MYSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1 
-    - php: 7.4
-      env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
-
-before_script:
-  # Init PHP
-  - phpenv rehash
-  - phpenv config-rm xdebug.ini
-
-  # Install composer dependencies
-  - composer validate
-  - composer require silverstripe/recipe-cms:$RECIPE_VERSION --no-update
-  # Fix for running phpunit 5 on php 7.4+
-  - composer require --no-update sminnee/phpunit-mock-objects:^3
-  - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:^2 --no-update; fi
-  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
-
-script:
-  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests/; fi
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
-  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ ; fi
-
-after_success:
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
+import:
+  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml

composer.json

@@ -19,19 +19,16 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
+        "php": "^7.3 || ^8.0",
+        "silverstripe/framework": "^4.10",
         "dnadesign/silverstripe-elemental": "^4.0@dev",
         "silverstripe/userforms": "^5.0",
         "silverstripe/vendor-plugin": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.0"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        }
-    },
     "autoload": {
         "psr-4": {
             "DNADesign\\ElementalUserForms\\": "src/",

phpunit.xml.dist

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

tests/php/ElementFormControllerTest.php

@@ -38,7 +38,7 @@ public function testElementFormRendering()
         $response = $this->get($page->URLSegment);
         $formAction = sprintf('%s/element/%d/Form', $page->URLSegment, $element->ID);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             $formAction,
             $response->getBody(),
             'Element forms are rendered through ElementalArea templates'
@@ -55,7 +55,7 @@ public function testElementFormSubmission()
         $response = $this->get($page->URLSegment);
 
         $response = $this->submitForm('UserForm_Form_2', 'action_process', ['TestValue' => 'Updated']);
-        $this->assertContains(
+        $this->assertStringContainsString(
             'received your submission',
             $response->getBody(),
             'Form values are submitted to correct element form'