Migrate to webmozart assertions

Author: tvdijen

lib/Auth/Process/CDC.php

@@ -2,12 +2,13 @@
 
 namespace SimpleSAML\module\cdc\Auth\Process;
 
+use Webmozart\Assert\Assert;
+
 /**
  * Filter for setting the SAML 2 common domain cookie.
  *
  * @package SimpleSAMLphp
  */
-
 class CDC extends \SimpleSAML\Auth\ProcessingFilter
 {
     /**
@@ -34,8 +35,8 @@ class CDC extends \SimpleSAML\Auth\ProcessingFilter
      */
     public function __construct($config, $reserved)
     {
+        Assert::isArray($config);
         parent::__construct($config, $reserved);
-        assert(is_array($config));
 
         if (!isset($config['domain'])) {
             throw new \SimpleSAML\Error\Exception('Missing domain option in cdc:CDC filter.');
@@ -54,7 +55,7 @@ public function __construct($config, $reserved)
      */
     public function process(&$state)
     {
-        assert(is_array($state));
+        Assert::isArray($state);
 
         if (!isset($state['Source']['entityid'])) {
             \SimpleSAML\Logger::warning('saml:CDC: Could not find IdP entityID.');

lib/Client.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\cdc;
 
+use Webmozart\Assert\Assert;
+
 /**
  * CDC client class.
  *
@@ -33,7 +35,7 @@ class Client
      */
     public function __construct($domain)
     {
-        assert(is_string($domain));
+        Assert::string($domain);
 
         $this->domain = $domain;
         $this->server = new Server($domain);
@@ -61,8 +63,8 @@ public function getResponse()
      */
     public function sendRequest($returnTo, $op, array $params = [])
     {
-        assert(is_string($returnTo));
-        assert(is_string($op));
+        Assert::string($returnTo);
+        Assert::string($op);
 
         $params['op'] = $op;
         $params['return'] = $returnTo;

lib/Server.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\cdc;
 
+use Webmozart\Assert\Assert;
+
 /**
  * CDC server class.
  *
@@ -52,7 +54,7 @@ class Server
      */
     public function __construct($domain)
     {
-        assert(is_string($domain));
+        Assert::string($domain);
 
         $cdcConfig = \SimpleSAML\Configuration::getConfig('module_cdc.php');
         $config = $cdcConfig->getConfigItem($domain, null);
@@ -82,8 +84,8 @@ public function __construct($domain)
      */
     public function sendRequest(array $request)
     {
-        assert(isset($request['return']));
-        assert(isset($request['op']));
+        Assert::keyExists($request, 'return');
+        Assert::keyExists($request, 'op');
 
         $request['domain'] = $this->domain;
         $this->send($this->server, 'CDCRequest', $request);
@@ -258,7 +260,7 @@ private function handleRead(array $request)
      */
     private static function get($parameter)
     {
-        assert(is_string($parameter));
+        Assert::string($parameter);
 
         if (!isset($_REQUEST[$parameter])) {
             return null;
@@ -306,8 +308,8 @@ private static function get($parameter)
      */
     private function validate($parameter)
     {
-        assert(is_string($parameter));
-        assert(isset($_REQUEST[$parameter]));
+        Assert::string($parameter);
+        Assert::keyExists($_REQUEST, $parameter);
 
         $message = (string) $_REQUEST[$parameter];
 
@@ -333,8 +335,8 @@ private function validate($parameter)
      */
     private function send($to, $parameter, array $message)
     {
-        assert(is_string($to));
-        assert(is_string($parameter));
+        Assert::string($to);
+        Assert::string($parameter);
 
         $message['timestamp'] = time();
         $message = json_encode($message);
@@ -364,8 +366,7 @@ private function send($to, $parameter, array $message)
      */
     private function calcSignature($rawMessage)
     {
-        assert(is_string($rawMessage));
-
+        Assert::string($rawMessage);
         return sha1($this->key.$rawMessage.$this->key);
     }