Convert assert() arguments from strings to expressions; each is boole…

…an. (This is also what SimpleSAMLphp 1.6 does.)
drupalauth · Sep 27, 2019 · e46ed0f · e46ed0f
1 parent 7c2eb26
commit e46ed0f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/Auth/Source/External.php b/lib/Auth/Source/External.php
@@ -92,8 +92,8 @@ class External extends Source
      */
     public function __construct($info, $config)
     {
-        assert('is_array($info)');
-        assert('is_array($config)');
+        assert(is_array($info));
+        assert(is_array($config));
 
         /* Call the parent constructor first, as required by the interface. */
         parent::__construct($info, $config);

diff --git a/lib/Auth/Source/UserPass.php b/lib/Auth/Source/UserPass.php
@@ -72,8 +72,8 @@ class UserPass extends UserPassBase
      */
     public function __construct($info, $config)
     {
-        assert('is_array($info)');
-        assert('is_array($config)');
+        assert(is_array($info));
+        assert(is_array($config));
 
         /* Call the parent constructor first, as required by the interface. */
         parent::__construct($info, $config);
@@ -103,8 +103,8 @@ public function __construct($info, $config)
      */
     protected function login($username, $password)
     {
-        assert('is_string($username)');
-        assert('is_string($password)');
+        assert(is_string($username));
+        assert(is_string($password));
 
         $drupalHelper = new DrupalHelper();
         $drupalHelper->bootDrupal($this->config->getDrupalroot());

diff --git a/lib/ConfigHelper.php b/lib/ConfigHelper.php
@@ -77,8 +77,8 @@ class ConfigHelper
      */
     public function __construct($config, $location)
     {
-        assert('is_array($config)');
-        assert('is_string($location)');
+        assert(is_array($config));
+        assert(is_string($location));
 
         $this->location = $location;
 
@@ -95,7 +95,7 @@ public function __construct($config, $location)
         $this->cookie_path = Configuration::getInstance()->getBasePath();
         $this->cookie_salt = Config::getSecretSalt();
     }
-    
+
 
     /**
      * Returns debug mode.