Add composer.json and use Webmozart assertions

Author: tvdijen

composer.json

@@ -0,0 +1,43 @@
+{
+    "name": "simplesamlphp/simplesamlphp-module-adfs",
+    "description": "A module that implements the WS-federation IDP",
+    "type": "simplesamlphp-module",
+    "keywords": ["simplesamlphp", "adfs"],
+    "license": "LGPL-3.0-or-later",
+    "authors": [
+        {
+            "name": "Tim van Dijen",
+            "email": "tvdijen@gmail.com"
+        }
+    ],
+    "config": {
+        "preferred-install": {
+            "simplesamlphp/simplesamlphp": "source",
+            "*": "dist"
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "SimpleSAML\\modules\\adfs\\": "lib/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\SimpleSAML\\modules\\riak\\TestFiles\\": "tests/files",
+            "SimpleSAML\\Test\\Utils\\": "vendor/simplesamlphp/simplesamlphp/tests/Utils"
+        }
+    },
+    "require": {
+        "php": ">=5.5",
+        "simplesamlphp/composer-module-installer": "~1.1",
+        "webmozart/assert": "~1.4",
+    },
+    "require-dev": {
+        "simplesamlphp/simplesamlphp": "^1.17",
+        "phpunit/phpunit": "~4.8.36"
+    },
+    "support": {
+        "issues": "https://github.com/tvdijen/simplesamlphp-module-adfs/issues",
+        "source": "https://github.com/tvdijen/simplesamlphp-module-adfs"
+    }
+}

lib/IdP/ADFS.php

@@ -338,7 +338,7 @@ public static function receiveLogoutMessage(\SimpleSAML\IdP $idp)
         // this implies an override to normal sp notification
         if (isset($_GET['wreply']) && !empty($_GET['wreply'])) {
             $idp->doLogoutRedirect(\SimpleSAML\Utils\HTTP::checkURLAllowed($_GET['wreply']));
-            assert(false);
+            throw new \Exception("Code should never be reached");
         }
 
         $state = [

lib/SAML2/XML/fed/Endpoint.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\adfs\SAML2\XML\fed;
 
+use Webmozard\Assert\Assert;
+
 /**
  * Class representing fed Endpoint.
  *
@@ -18,8 +20,8 @@ class Endpoint
      */
     public static function appendXML(\DOMElement $parent, $name, $address)
     {
-        assert(is_string($name));
-        assert(is_string($address));
+        Assert::string($name);
+        Assert::string($address);
 
         $e = $parent->ownerDocument->createElement($name);
         $parent->appendChild($e);

lib/SAML2/XML/fed/SecurityTokenServiceType.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\adfs\SAML2\XML\fed;
 
+use Webmozart\Assert\Assert;
+
 /**
  * Class representing SecurityTokenServiceType RoleDescriptor.
  *
@@ -45,7 +47,7 @@ public function __construct(\DOMElement $xml = null)
      */
     public function toXML(\DOMElement $parent)
     {
-        assert(is_string($this->Location));
+        Assert::string($this->Location);
 
         $e = parent::toXML($parent);
         $e->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:fed', Constants::NS_FED);

www/idp/metadata.php

@@ -1,5 +1,7 @@
 <?php
 
+use Webmozart\Assert\Assert;
+
 // load configuration and metadata
 $config = \SimpleSAML\Configuration::getInstance();
 $metadata = \SimpleSAML\Metadata\MetaDataStorageHandler::getMetadataHandler();
@@ -46,7 +48,7 @@
 
     if ($idpmeta->hasValue('https.certificate')) {
         $httpsCert = \SimpleSAML\Utils\Crypto::loadPublicKey($idpmeta, true, 'https.');
-        assert(isset($httpsCert['certData']));
+        Assert::keyExists($httpsCert, 'certData');
         $availableCerts['https.crt'] = $httpsCert;
         $keys[] = [
             'type'            => 'X509Certificate',

www/idp/prp.php

@@ -19,7 +19,7 @@
     } elseif ($_GET['wa'] === 'wsignin1.0') {
         \SimpleSAML\Module\adfs\IdP\ADFS::receiveAuthnRequest($idp);
     }
-    assert(false);
+    throw new \Exception("Code should never be reached");
 } elseif (isset($_GET['assocId'])) {
     // logout response from ADFS SP
     $assocId = $_GET['assocId']; // Association ID of the SP that sent the logout response