Merge pull request #76 from creative-commoners/pulls/5/sapphire-test-…

…nine API phpunit 9 support
symbiote · Nov 9, 2021 · db5c304 · db5c304
2 parents 2a59d84 + 3a9466b
commit db5c304
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,24 +8,19 @@ import:
 jobs:
   fast_finish: true
   include:
-    - php: 7.1
-      env:
-        - DB=MYSQL
-        - REQUIRE_INSTALLER="4.5.x-dev"
-        - PHPUNIT_TEST=1
     - php: 7.3
       env:
         - DB=MYSQL
         - PDO=1
-        - REQUIRE_INSTALLER="4.7.x-dev"
+        - REQUIRE_INSTALLER="4.x-dev"
         - PHPUNIT_TEST=1
         - PHPCS_TEST=1
     - php: 7.4
       env:
         - DB=MYSQL
         - REQUIRE_INSTALLER="4.x-dev"
         - PHPUNIT_COVERAGE_TEST=1
-    - php: nightly
+    - php: 8.0
       env:
         - DB=MYSQL
         - REQUIRE_INSTALLER="4.x-dev"

diff --git a/composer.json b/composer.json
@@ -15,10 +15,11 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "~4.0"
+        "php": "^7.3 || ^8.0",
+        "silverstripe/framework": "^4.10"
     },
     "require-dev": {
-        "sminnee/phpunit": "^5.7",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3"
     },
     "extra": {

diff --git a/tests/KeyValueFieldTest.php b/tests/KeyValueFieldTest.php
@@ -29,7 +29,7 @@ public function testFieldContainsPlaceholder()
         $field->setKeyFieldPlaceholder('Key Placeholder');
         $field->setValueFieldPlaceholder('Value Placeholder');
         $html = $field->Field();
-        $this->assertContains('placeholder="Key Placeholder"', $html);
-        $this->assertContains('placeholder="Value Placeholder"', $html);
+        $this->assertStringContainsString('placeholder="Key Placeholder"', $html);
+        $this->assertStringContainsString('placeholder="Value Placeholder"', $html);
     }
 }