Revert BC-breaking Webmozart-assertions

simplesamlphp · Jun 3, 2019 · 13f0d1e · 13f0d1e
1 parent 225665e
commit 13f0d1e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -28,8 +28,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/hooks/hook_cron.php b/hooks/hook_cron.php
@@ -1,7 +1,6 @@
 <?php
 
 use SimpleSAML\Logger;
-use Webmozart\Assert\Assert;
 
 /**
  * Hook to run a cron job.
@@ -11,9 +10,9 @@
  */
 function metarefresh_hook_cron(&$croninfo)
 {
-    Assert::isArray($croninfo);
-    Assert::keyExists($croninfo, 'summary');
-    Assert::keyExists($croninfo, 'tag');
+    assert(is_array($croninfo));
+    assert(array_key_exists('summary', $croninfo));
+    assert(array_key_exists('tag', $croninfo));
 
     Logger::info('cron [metarefresh]: Running cron in cron tag ['.$croninfo['tag'].'] ');
 

diff --git a/hooks/hook_frontpage.php b/hooks/hook_frontpage.php
@@ -1,7 +1,5 @@
 <?php
 
-use Webmozart\Assert\Assert;
-
 /**
  * Hook to add links to the frontpage.
  *
@@ -10,8 +8,8 @@
  */
 function metarefresh_hook_frontpage(&$links)
 {
-    Assert::isArray($links);
-    Assert::keyExists($links, 'links');
+    assert(is_array($links));
+    assert(array_key_exists('links', $links));
 
     $links['federation'][] = [
         'href' => SimpleSAML\Module::getModuleURL('metarefresh/fetch.php'),

diff --git a/lib/MetaLoader.php b/lib/MetaLoader.php
@@ -5,7 +5,6 @@
 use RobRichards\XMLSecLibs\XMLSecurityDSig;
 use SimpleSAML\Configuration;
 use SimpleSAML\Logger;
-use Webmozart\Assert\Assert;
 
 /**
  * @package SimpleSAMLphp
@@ -420,7 +419,7 @@ private function addMetadata($filename, $metadata, $type, array $template = null
      */
     public function writeARPfile(Configuration $config)
     {
-        Assert::isInstanceOf($config, Configuration::class);
+        assert($config instanceof Configuration::class);
 
         $arpfile = $config->getValue('arpfile');
         $types = ['saml20-sp-remote'];
@@ -507,7 +506,7 @@ public function writeMetadataFiles($outputDir)
      */
     public function writeMetadataSerialize($outputDir)
     {
-        Assert::string($outputDir);
+        assert(is_string($outputDir));
 
         $metaHandler = new \SimpleSAML\Metadata\MetaDataStorageHandlerSerialize(['directory' => $outputDir]);