Remove BC breaking Webmozart asserts

simplesamlphp · May 29, 2019 · 244d365 · 244d365
1 parent 4e98678
commit 244d365
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -29,8 +29,7 @@
     "require": {
         "php": ">=5.6",
 
-        "simplesamlphp/composer-module-installer": "~1.1",
-        "webmozart/assert": "~1.4"
+        "simplesamlphp/composer-module-installer": "~1.1"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp": "^1.17",

diff --git a/lib/Auth/Process/SmartID.php b/lib/Auth/Process/SmartID.php
@@ -2,8 +2,6 @@
 
 namespace SimpleSAML\Module\smartattributes\Auth\Process;
 
-use Webmozart\Assert\Assert;
-
 class SmartID extends \SimpleSAML\Auth\ProcessingFilter
 {
     /**
@@ -55,7 +53,7 @@ public function __construct($config, $reserved)
     {
         parent::__construct($config, $reserved);
 
-        Assert::isArray($config);
+        assert(is_array($config));
 
         if (array_key_exists('candidates', $config)) {
             $this->candidates = $config['candidates'];
@@ -126,8 +124,8 @@ private function addID($attributes, $request)
      */
     public function process(&$request)
     {
-        Assert::isArray($request);
-        Assert::keyExists($request, 'Attributes');
+        assert(is_array($request));
+        assert(array_key_exists('Attributes', $request));
 
         $id = $this->addID($request['Attributes'], $request);
 

diff --git a/lib/Auth/Process/SmartName.php b/lib/Auth/Process/SmartName.php
@@ -2,8 +2,6 @@
 
 namespace SimpleSAML\Module\smartattributes\Auth\Process;
 
-use Webmozart\Assert\Assert;
-
 /**
  * Filter to set name in a smart way, based on available name attributes.
  *
@@ -82,8 +80,8 @@ private function getLocalUser($userid)
      */
     public function process(&$request)
     {
-        Assert::isArray($request);
-        Assert::keyExists($request, 'Attributes');
+        assert(is_array($request));
+        assert(array_key_exists('Attributes', $request));
 
         $attributes = &$request['Attributes'];