Migrate assertions to Webmozart

Author: tvdijen

lib/Auth/Process/AttributeAddFromLDAP.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\ldap\Auth\Process;
 
+use Webmozart\Assert\Assert;
+
 /**
  * Filter to add attributes to the identity by executing a query against an LDAP directory
  *
@@ -140,8 +142,8 @@ public function __construct($config, $reserved)
      */
     public function process(&$request)
     {
-        assert(is_array($request));
-        assert(array_key_exists('Attributes', $request));
+        Assert::isArray($request);
+        Assert::keyExists($request, 'Attributes');
 
         $attributes = &$request['Attributes'];
 

lib/Auth/Process/AttributeAddUsersGroups.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\ldap\Auth\Process;
 
+use Webmozart\Assert\Assert;
+
 /**
  * Does a reverse membership lookup on the logged in user,
  * looking for groups it is a member of and adds them to
@@ -24,8 +26,8 @@ class AttributeAddUsersGroups extends BaseFilter
      */
     public function process(&$request)
     {
-        assert(is_array($request));
-        assert(array_key_exists('Attributes', $request));
+        Assert::isArray($request);
+        Assert::keyExists($request, 'Attributes');
 
         // Log the process
         \SimpleSAML\Logger::debug(
@@ -226,10 +228,8 @@ protected function getGroupsActiveDirectory($attributes)
      * @param array $memberof
      * @return array
      */
-    protected function search($memberof)
+    protected function search(array $memberof)
     {
-        assert(is_array($memberof));
-
         // Used to determine what DN's have already been searched
         static $searched = [];
 
@@ -306,7 +306,7 @@ protected function search($memberof)
      */
     protected function searchActiveDirectory($dn)
     {
-        assert(is_string($dn) && $dn != '');
+        Assert::stringNotEmpty($dn);
 
         // Shorten the variable name
         $map = &$this->attribute_map;

lib/Auth/Source/LDAP.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\ldap\Auth\Source;
 
+use Webmozart\Assert\Assert;
+
 /**
  * LDAP authentication source.
  *
@@ -29,8 +31,8 @@ class LDAP 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);
@@ -52,8 +54,8 @@ public function __construct($info, $config)
      */
     protected function login($username, $password, array $sasl_args = null)
     {
-        assert(is_string($username));
-        assert(is_string($password));
+        Assert::string($username);
+        Assert::string($password);
 
         return $this->ldapConfig->login($username, $password, $sasl_args);
     }

lib/Auth/Source/LDAPMulti.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\ldap\Auth\Source;
 
+use Webmozart\Assert\Assert;
+
 /**
  * LDAP authentication source.
  *
@@ -39,8 +41,8 @@ class LDAPMulti extends \SimpleSAML\Module\core\Auth\UserPassOrgBase
      */
     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);
@@ -99,9 +101,9 @@ public function __construct($info, $config)
      */
     protected function login($username, $password, $org, array $sasl_args = null)
     {
-        assert(is_string($username));
-        assert(is_string($password));
-        assert(is_string($org));
+        Assert::string($username);
+        Assert::string($password);
+        Assert::string($org);
 
         if (!array_key_exists($org, $this->ldapOrgs)) {
             // The user has selected an organization which doesn't exist anymore.

lib/ConfigHelper.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\ldap;
 
+use Webmozart\Assert\Assert;
+
 /**
  * LDAP authentication source configuration parser.
  *
@@ -122,10 +124,9 @@ class ConfigHelper
      * @param array $config  Configuration.
      * @param string $location  The location of this configuration. Used for error reporting.
      */
-    public function __construct($config, $location)
+    public function __construct(array $config, $location)
     {
-        assert(is_array($config));
-        assert(is_string($location));
+        Assert::string($location);
 
         $this->location = $location;
 
@@ -178,8 +179,8 @@ public function __construct($config, $location)
      */
     public function login($username, $password, array $sasl_args = null)
     {
-        assert(is_string($username));
-        assert(is_string($password));
+        Assert::string($username);
+        Assert::string($password);
 
         if (empty($password)) {
             \SimpleSAML\Logger::info($this->location.': Login with empty password disallowed.');