Bump xml-security & fix tests

tvdijen · tvdijen · commit fbc0ac9f2a62 · 2023-03-11T23:06:36.000+01:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -158,7 +158,7 @@ jobs:
           extensions: ctype, date, dom, hash, intl, json, mbstring, mysql, openssl, pcre, pdo, pdo_sqlite, spl, xml
           tools: composer:v2
           ini-values: error_reporting=E_ALL
-          coverage: xdebug
+          coverage: pcov
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
diff --git a/composer.json b/composer.json
@@ -87,8 +87,8 @@
 
         "mikey179/vfsstream": "~1.6",
         "simplesamlphp/simplesamlphp-module-adfs": "dev-master",
-        "simplesamlphp/simplesamlphp-test-framework": "^1.4.0",
-        "simplesamlphp/xml-security": "^1.5.0"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.4.1",
+        "simplesamlphp/xml-security": "^1.6.0"
     },
     "suggest": {
         "predis/predis": "Needed if a Redis server is used to store session information",
diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml b/phpunit.xml
@@ -15,8 +15,6 @@
     </exclude>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
-      <html outputDirectory="build/coverage" lowUpperBound="35" highLowerBound="70"/>
-      <text outputFile="php://stdout" showUncoveredFiles="true"/>
     </report>
   </coverage>
   <testsuites>
diff --git a/tests/modules/admin/src/Controller/FederationTest.php b/tests/modules/admin/src/Controller/FederationTest.php
@@ -27,7 +27,7 @@
 class FederationTest extends TestCase
 {
     /** @var string */
-    private const SECURITY = 'vendor/simplesamlphp/xml-security/tests/resources';
+    private const SECURITY = 'vendor/simplesamlphp/xml-security/resources';
 
     /** @var string */
     private const FRAMEWORK = 'vendor/simplesamlphp/simplesamlphp-test-framework';
diff --git a/tests/modules/saml/src/Auth/Source/SPTest.php b/tests/modules/saml/src/Auth/Source/SPTest.php
@@ -31,7 +31,7 @@
 class SPTest extends ClearStateTestCase
 {
     /** @var string */
-    private const SECURITY = 'vendor/simplesamlphp/xml-security/tests/resources';
+    private const SECURITY = 'vendor/simplesamlphp/xml-security/resources';
 
     /** @var string */
     public const CERT_KEY = '../' . self::SECURITY . '/certificates/selfsigned.simplesamlphp.org.key';
diff --git a/tests/modules/saml/src/Controller/MetadataTest.php b/tests/modules/saml/src/Controller/MetadataTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
 
         $this->mdh = new class () extends MetaDataStorageHandler {
             /** @var string */
-            private const XMLSEC = '../vendor/simplesamlphp/xml-security/tests/resources';
+            private const XMLSEC = '../vendor/simplesamlphp/xml-security/resources';
 
             /** @var string */
             public const CERT_KEY = self::XMLSEC . '/certificates/selfsigned.simplesamlphp.org.key';
diff --git a/tests/modules/saml/src/IdP/SAML2Test.php b/tests/modules/saml/src/IdP/SAML2Test.php
@@ -20,7 +20,7 @@
 class SAML2Test extends ClearStateTestCase
 {
     /** @var string */
-    private const SECURITY = 'vendor/simplesamlphp/xml-security/tests/resources';
+    private const SECURITY = 'vendor/simplesamlphp/xml-security/resources';
 
     /** @var string */
     public const CERT_KEY = '../' . self::SECURITY . '/certificates/selfsigned.simplesamlphp.org.key';
diff --git a/tests/src/SimpleSAML/Metadata/SAMLBuilderTest.php b/tests/src/SimpleSAML/Metadata/SAMLBuilderTest.php
@@ -16,7 +16,7 @@
  */
 class SAMLBuilderTest extends TestCase
 {
-    private const SECURITY = 'vendor/simplesamlphp/xml-security/tests/resources';
+    private const SECURITY = 'vendor/simplesamlphp/xml-security/resources';
 
     /**
      */

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`class FederationTest extends TestCase`
`28`	`28`	`{`
`29`	`29`	`/** @var string */`
`30`		`- private const SECURITY = 'vendor/simplesamlphp/xml-security/tests/resources';`
	`30`	`+ private const SECURITY = 'vendor/simplesamlphp/xml-security/resources';`
`31`	`31`
`32`	`32`	`/** @var string */`
`33`	`33`	`private const FRAMEWORK = 'vendor/simplesamlphp/simplesamlphp-test-framework';`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`class SPTest extends ClearStateTestCase`
`32`	`32`	`{`
`33`	`33`	`/** @var string */`
`34`		`- private const SECURITY = 'vendor/simplesamlphp/xml-security/tests/resources';`
	`34`	`+ private const SECURITY = 'vendor/simplesamlphp/xml-security/resources';`
`35`	`35`
`36`	`36`	`/** @var string */`
`37`	`37`	`public const CERT_KEY = '../' . self::SECURITY . '/certificates/selfsigned.simplesamlphp.org.key';`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`class SAML2Test extends ClearStateTestCase`
`21`	`21`	`{`
`22`	`22`	`/** @var string */`
`23`		`- private const SECURITY = 'vendor/simplesamlphp/xml-security/tests/resources';`
	`23`	`+ private const SECURITY = 'vendor/simplesamlphp/xml-security/resources';`
`24`	`24`
`25`	`25`	`/** @var string */`
`26`	`26`	`public const CERT_KEY = '../' . self::SECURITY . '/certificates/selfsigned.simplesamlphp.org.key';`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`class SAMLBuilderTest extends TestCase`
`18`	`18`	`{`
`19`		`- private const SECURITY = 'vendor/simplesamlphp/xml-security/tests/resources';`
	`19`	`+ private const SECURITY = 'vendor/simplesamlphp/xml-security/resources';`
`20`	`20`
`21`	`21`	`/**`
`22`	`22`	`*/`