Support PHPUnit 10, Psalm 5

paragonie · May 24, 2023 · 4ccd346 · 4ccd346
1 parent 9619634
commit 4ccd346
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -41,9 +41,9 @@
         "psr/http-message": "^1|^2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7|^8|^9",
+        "phpunit/phpunit": "^7|^8|^9|^10",
         "squizlabs/php_codesniffer": "^3",
-        "vimeo/psalm": "^4"
+        "vimeo/psalm": "^4|^5"
     },
     "scripts": {
         "test": "phpunit && psalm"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      backupGlobals="true"
-     backupStaticAttributes="false"
      bootstrap="vendor/autoload.php"
      colors="true"
-     convertErrorsToExceptions="true"
-     convertNoticesToExceptions="true"
-     convertWarningsToExceptions="true"
      processIsolation="false"
      stopOnError="false"
      stopOnFailure="false"
+     xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+     cacheDirectory=".phpunit.cache"
+     backupStaticProperties="false"
 >
     <testsuites>
         <testsuite name="CSP Builder Test Suite">

diff --git a/test/BasicTest.php b/test/BasicTest.php
@@ -122,7 +122,7 @@ public function testPreHash()
     public function testSourceHttpsConversion()
     {
         /** @var CSPBuilder|MockObject $cspHttp */
-        $cspHttp = $this->getMockBuilder(CSPBuilder::class)->setMethods(['isHTTPSConnection'])
+        $cspHttp = $this->getMockBuilder(CSPBuilder::class)->onlyMethods(['isHTTPSConnection'])
             ->disableOriginalConstructor()->getMock();
         $cspHttp->method('isHTTPSConnection')->willReturn(false);
 
@@ -135,7 +135,7 @@ public function testSourceHttpsConversion()
         $this->assertStringContainsString('http://another.com', $compiledCspHttp);
 
         /** @var CSPBuilder|MockObject $cspHttps */
-        $cspHttps = $this->getMockBuilder(CSPBuilder::class)->setMethods(['isHTTPSConnection'])
+        $cspHttps = $this->getMockBuilder(CSPBuilder::class)->onlyMethods(['isHTTPSConnection'])
             ->disableOriginalConstructor()->getMock();
         $cspHttps->method('isHTTPSConnection')->willReturn(true);