DEP Use PHPUnit 11

silverstripe · Sep 10, 2024 · d070de7 · d070de7
1 parent cdda9bc
commit d070de7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "silverstripe/framework": "^6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^11.3",
         "squizlabs/php_codesniffer": "^3",
         "silverstripe/versioned": "^3",
         "silverstripe/standards": "^1",

diff --git a/tests/CookieStoreTest.php b/tests/CookieStoreTest.php
@@ -6,9 +6,14 @@
 use SilverStripe\Core\TempFolder;
 use SilverStripe\HybridSessions\Store\CookieStore;
 use SilverStripe\HybridSessions\Tests\Store\TestCookieStore;
+use SilverStripe\Dev\SapphireTest;
 
-class CookieStoreTest extends AbstractTest
+class CookieStoreTest extends SapphireTest
 {
+    use HybridSessionsTestTrait;
+
+    protected $usesDatabase = true;
+
     protected function getStore()
     {
         $store = Injector::inst()->get(CookieStore::class);

diff --git a/tests/DatabaseStoreTest.php b/tests/DatabaseStoreTest.php
@@ -6,9 +6,14 @@
 use SilverStripe\ORM\Connect\MySQLDatabase;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\HybridSessions\Store\DatabaseStore;
+use SilverStripe\Dev\SapphireTest;
 
-class DatabaseStoreTest extends AbstractTest
+class DatabaseStoreTest extends SapphireTest
 {
+    use HybridSessionsTestTrait;
+
+    protected $usesDatabase = true;
+
     protected function setUp(): void
     {
         parent::setUp();

diff --git a/tests/AbstractTest.php → tests/HybridSessionsTestTrait.php b/tests/AbstractTest.php → tests/HybridSessionsTestTrait.php
@@ -8,10 +8,8 @@
 use SilverStripe\HybridSessions\Store\CookieStore;
 use SilverStripe\HybridSessions\Tests\Store\TestCookieStore;
 
-abstract class AbstractTest extends SapphireTest
+trait HybridSessionsTestTrait
 {
-    protected $usesDatabase = true;
-
     protected function setUp(): void
     {
         parent::setUp();

diff --git a/tests/OpenSSLCryptoTest.php b/tests/OpenSSLCryptoTest.php
@@ -4,10 +4,9 @@
 
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\HybridSessions\Crypto\OpenSSLCrypto;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 
-/**
- * @requires extension openssl
- */
+#[RequiresPhpExtension('openssl')]
 class OpenSSLCryptoTest extends SapphireTest
 {
     public function testIntegrity()