Update dependencies.

metsma · mrts · commit f5d08bff40f7 · 2024-03-12T18:33:08.000+02:00
WE2-879

Signed-off-by: Raul Metsma &lt;raul@metsma.ee&gt;
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require-dev": {
-		"phpunit/phpunit": "^9.6.14"
+		"phpunit/phpunit": "^11.0.4"
 	},    
     "autoload": {
         "psr-4": {
@@ -32,13 +32,13 @@
         }
     ],
     "require": {
-        "phpseclib/phpseclib": "3.0.34",
-        "guzzlehttp/psr7": "2.4.5",
-        "web-eid/ocsp-php": "1.0.1",
+        "phpseclib/phpseclib": "3.0.*",
+        "guzzlehttp/psr7": "2.6.2",
+        "web-eid/ocsp-php": "dev-main",
         "psr/log": "^3.0"
     },
     "scripts": {
         "fix-php": ["prettier src/**/* --write", "prettier examples/src/* --write"],
-        "test": "phpunit"
+        "test": "phpunit --no-coverage"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-	<coverage>
-		<include>
-			<directory suffix=".php">src/</directory>
-		</include>
-		<report>
-			<clover outputFile="build/logs/clover.xml" />
-			<html outputDirectory="build/coverage" />
-			<text outputFile="build/coverage.txt" />
-		</report>		
-	</coverage>
-	<testsuites>
-		<testsuite name="Web-eID PHP Test Suite">
-			<directory>tests</directory>
-		</testsuite>
-	</testsuites>
-</phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Web-eID PHP Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
+</phpunit>
diff --git a/tests/testutil/OcspServiceMaker.php b/tests/testutil/OcspServiceMaker.php
@@ -52,7 +52,7 @@ private static function getAiaOcspServiceConfiguration(): AiaOcspServiceConfigur
     {
         return new AiaOcspServiceConfiguration(
             new UriCollection(new Uri(self::TEST_ESTEID_2015)),
-            CertificateValidator::buildTrustFromCertificates([Certificates::getTestEsteid2018CA(), Certificates::getTestEsteid2018CAGov(), Certificates::getTestEsteid2015CA()])
+            CertificateValidator::buildTrustFromCertificates([Certificates::getTestEsteid2018CA(), Certificates::getTestEsteid2018CAGov()])
         );
     }
 
diff --git a/tests/validator/certvalidators/SubjectCertificateNotRevokedValidatorTest.php b/tests/validator/certvalidators/SubjectCertificateNotRevokedValidatorTest.php
@@ -158,7 +158,7 @@ public function testWhenOcspResponseHasInvalidResponderCertThenThrows(): void
     public function testWhenOcspResponseHasInvalidTagThenThrows(): void
     {
         $this->expectException(UserCertificateOCSPCheckFailedException::class);
-        $this->expectExceptionMessage("User certificate revocation check has failed: Exception: Trying to access array offset on null");
+        $this->expectExceptionMessage("User certificate revocation check has failed: Exception: Could not decode OCSP response");
         $validator = self::getSubjectCertificateNotRevokedValidatorWithAiaOcspUsingResponse(
             pack("c*", ...self::buildOcspResponseBodyWithInvalidTag())
         );

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private static function getAiaOcspServiceConfiguration(): AiaOcspServiceConfigur`
`52`	`52`	`{`
`53`	`53`	`return new AiaOcspServiceConfiguration(`
`54`	`54`	`new UriCollection(new Uri(self::TEST_ESTEID_2015)),`
`55`		`- CertificateValidator::buildTrustFromCertificates([Certificates::getTestEsteid2018CA(), Certificates::getTestEsteid2018CAGov(), Certificates::getTestEsteid2015CA()])`
	`55`	`+ CertificateValidator::buildTrustFromCertificates([Certificates::getTestEsteid2018CA(), Certificates::getTestEsteid2018CAGov()])`
`56`	`56`	`);`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public function testWhenOcspResponseHasInvalidResponderCertThenThrows(): void`
`158`	`158`	`public function testWhenOcspResponseHasInvalidTagThenThrows(): void`
`159`	`159`	`{`
`160`	`160`	`$this->expectException(UserCertificateOCSPCheckFailedException::class);`
`161`		`- $this->expectExceptionMessage("User certificate revocation check has failed: Exception: Trying to access array offset on null");`
	`161`	`+ $this->expectExceptionMessage("User certificate revocation check has failed: Exception: Could not decode OCSP response");`
`162`	`162`	`$validator = self::getSubjectCertificateNotRevokedValidatorWithAiaOcspUsingResponse(`
`163`	`163`	`pack("c*", ...self::buildOcspResponseBodyWithInvalidTag())`
`164`	`164`	`);`