Use Webmozart for assertions

Author: tvdijen

lib/Auth/Source/Hash.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\authcrypt\Auth\Source;
 
+use Webmozart\Assert\Assert;
+
 /**
  * Authentication source for username & hashed password.
  *
@@ -31,8 +33,8 @@ class Hash extends \SimpleSAML\Module\core\Auth\UserPassBase
      */
     public function __construct($info, $config)
     {
-        assert(is_array($info));
-        assert(is_array($config));
+        Assert::isArray($info);
+        Assert::isArray($config);
 
         // Call the parent constructor first, as required by the interface
         parent::__construct($info, $config);
@@ -85,8 +87,8 @@ public function __construct($info, $config)
      */
     protected function login($username, $password)
     {
-        assert(is_string($username));
-        assert(is_string($password));
+        Assert::string($username);
+        Assert::string($password);
 
         foreach ($this->users as $userpass => $attrs) {
             $matches = explode(':', $userpass, 2);

lib/Auth/Source/Htpasswd.php

@@ -9,6 +9,7 @@
  * @package SimpleSAMLphp
  */
 
+use Webmozart\Assert\Assert;
 use WhiteHat101\Crypt\APR1_MD5;
 
 class Htpasswd extends \SimpleSAML\Module\core\Auth\UserPassBase
@@ -38,8 +39,9 @@ class Htpasswd extends \SimpleSAML\Module\core\Auth\UserPassBase
      */
     public function __construct($info, $config)
     {
-        assert(is_array($info));
-        assert(is_array($config));
+
+        Assert::isArray($info);
+        Assert::isArray($config);
 
         // Call the parent constructor first, as required by the interface
         parent::__construct($info, $config);
@@ -79,8 +81,8 @@ public function __construct($info, $config)
      */
     protected function login($username, $password)
     {
-        assert(is_string($username));
-        assert(is_string($password));
+        Assert::string($username);
+        Assert::string($password);
 
         foreach ($this->users as $userpass) {
             $matches = explode(':', $userpass, 2);