Review changes.

composer.json

@@ -39,7 +39,7 @@
         "simplesamlphp/composer-module-installer": "^1.3",
         "simplesamlphp/simplesamlphp": "^2.2",
         "simplesamlphp/xml-cas": "^v1.3",
-        "simplesamlphp/xml-common": "^v1.18",
+        "simplesamlphp/xml-common": "^v1.17",
         "simplesamlphp/xml-soap": "^v1.5"
     },
     "require-dev": {
@@ -54,5 +54,14 @@
     },
     "suggest": {
         "ext-pdo": "*"
+    },
+    "scripts": {
+        "validate": [
+            "vendor/bin/phpunit --no-coverage --testdox",
+            "vendor/bin/phpcs -p"
+        ],
+        "tests": [
+            "vendor/bin/phpunit --no-coverage"
+        ]
     }
 }

public/login.php

@@ -183,25 +183,16 @@
 // Get the state.
 // If we come from an authproc filter, we will load the state from the stateId.
 // If not, we will get the state from the AuthSource Data
-try {
-    $state = $authProcId !== null ?
-        $attributeExtractor->manageState($authProcId) :
-        $as->getAuthDataArray();
-} catch (\SimpleSAML\Error\NoState $e) {
-    var_export($e, true);
-    die();
-}
+$state = $authProcId !== null ?
+    $attributeExtractor->manageState($authProcId) :
+    $as->getAuthDataArray();
+
 // Attribute Handler
 $state['ReturnTo'] = $returnUrl;
 if ($authProcId !== null) {
     $state[ProcessingChain::AUTHPARAM] = $authProcId;
 }
-try {
-    $mappedAttributes = $attributeExtractor->extractUserAndAttributes($state);
-} catch (\SimpleSAML\Error\Exception $e) {
-    var_export($e, true);
-    die();
-}
+$mappedAttributes = $attributeExtractor->extractUserAndAttributes($state);
 
 $serviceTicket = $ticketFactory->createServiceTicket([
                                                          'service' => $serviceUrl,
@@ -245,10 +236,5 @@
     $httpUtils->redirectTrustedURL($httpUtils->addURLParameters($serviceUrl, $parameters));
 } else {
     // POST
-    try {
-        $httpUtils->submitPOSTData($serviceUrl, $parameters);
-    } catch (\SimpleSAML\Error\Exception $e) {
-        var_export($e, true);
-        die();
-    }
+    $httpUtils->submitPOSTData($serviceUrl, $parameters);
 }

src/Cas/AttributeExtractor.php

@@ -32,7 +32,7 @@ class AttributeExtractor
 
     public function __construct(
         Configuration $casconfig,
-        ProcessingChainFactory $processingChainFactory
+        ProcessingChainFactory $processingChainFactory,
     ) {
         $this->casconfig = $casconfig;
         $this->processingChainFactory = $processingChainFactory;

src/Cas/Factories/ProcessingChainFactory.php

@@ -31,18 +31,9 @@ public function __construct(
      */
     public function build(array $state): ProcessingChain
     {
-        $idpMetadata = [
-            'entityid' => $state['Source']['entityid'] ?? '',
-            // ProcessChain needs to know the list of authproc filters we defined in casserver configuration
-            'authproc' => $this->casconfig->getOptionalArray('authproc', []),
-        ];
-        $spMetadata = [
-            'entityid' => $state['Destination']['entityid'] ?? '',
-        ];
-
         return new ProcessingChain(
-            $idpMetadata,
-            $spMetadata,
+            $state['Source'],
+            $state['Destination'],
             'casserver',
         );
     }

src/Cas/Protocol/SamlValidateResponder.php

@@ -6,8 +6,8 @@
 
 use SimpleSAML\Configuration;
 use SimpleSAML\Module\casserver\Shib13\AuthnResponse;
-use SimpleSAML\SOAP\XML\env_200305\Body;
-use SimpleSAML\SOAP\XML\env_200305\Envelope;
+use SimpleSAML\SOAP\XML\env_200106\Body;
+use SimpleSAML\SOAP\XML\env_200106\Envelope;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\SerializableElementInterface;
@@ -64,11 +64,11 @@ public function convertToSaml(array $ticket): Chunk
 
     /**
      * @param \SimpleSAML\XML\SerializableElementInterface $samlResponse
-     * @return \SimpleSAML\SOAP\XML\env\Envelope
+     * @return \SimpleSAML\SOAP\XML\env_200106\Envelope
      */
     public function wrapInSoap(SerializableElementInterface $samlResponse): Envelope
     {
-        $body = new Body(null, [$samlResponse]);
+        $body = new Body([$samlResponse]);
         return new Envelope($body);
     }
 }

tests/src/Cas/Protocol/SamlValidateTest.php

@@ -6,7 +6,7 @@
 
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Module\casserver\Cas\Protocol\SamlValidateResponder;
-use SimpleSAML\SOAP\XML\env_200305\Envelope;
+use SimpleSAML\SOAP\XML\env_200106\Envelope;
 
 class SamlValidateTest extends TestCase
 {