Merge pull request #111 from creative-commoners/pulls/4/phpunit11

DEP Use PHPUnit 11
silverstripe · Sep 18, 2024 · 6c12c76 · 6c12c76
2 parents 8546766 + 5f81c40
commit 6c12c76
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "guzzlehttp/guzzle": "^7"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^11.3",
         "squizlabs/php_codesniffer": "^3",
         "silverstripe/standards": "^1",
         "phpstan/extension-installer": "^1.3"

diff --git a/tests/EnvironmentCheckerTest.php b/tests/EnvironmentCheckerTest.php
@@ -35,7 +35,7 @@ public function testOnlyLogsWithErrors()
 
         $logger = $this->getMockBuilder(Logger::class)
             ->disableOriginalConstructor()
-            ->setMethods(['log'])
+            ->onlyMethods(['log'])
             ->getMock();
 
         $logger->expects($this->never())->method('log');
@@ -55,15 +55,17 @@ public function testLogsWithWarnings()
 
         $logger = $this->getMockBuilder(Logger::class)
             ->disableOriginalConstructor()
-            ->setMethods(['log'])
+            ->onlyMethods(['log'])
             ->getMock();
 
-        $logger->expects($this->once())
+        $matcher = $this->once();
+        $logger->expects($matcher)
             ->method('log')
-            ->withConsecutive(
-                [$this->equalTo(LogLevel::WARNING)],
-                [$this->anything()]
-            );
+            ->willReturnCallback(function (mixed $level) use ($matcher) {
+                match ($matcher->numberOfInvocations()) {
+                    1 => $this->assertSame(LogLevel::WARNING, $level),
+                };
+            });
 
         Injector::inst()->registerService($logger, LoggerInterface::class);
 
@@ -80,15 +82,17 @@ public function testLogsWithErrors()
 
         $logger = $this->getMockBuilder(Logger::class)
             ->disableOriginalConstructor()
-            ->setMethods(['log'])
+            ->onlyMethods(['log'])
             ->getMock();
 
-        $logger->expects($this->once())
+        $matcher = $this->once();
+        $logger->expects($matcher)
             ->method('log')
-            ->withConsecutive(
-                [$this->equalTo(LogLevel::ALERT), $this->anything()],
-                [$this->equalTo(LogLevel::WARNING), $this->anything()]
-            );
+            ->willReturnCallback(function (mixed $level) use ($matcher) {
+                match ($matcher->numberOfInvocations()) {
+                    1 => $this->assertSame(LogLevel::ALERT, $level),
+                };
+            });
 
         Injector::inst()->registerService($logger, LoggerInterface::class);