Replace assertions

Author: tvdijen

lib/Cas/Ticket/DelegatingTicketStore.php

@@ -6,6 +6,7 @@
 
 use Exception;
 use InvalidArgumentException;
+use SimpleSAML\Assert\Assert;
 use SimpleSAML\Configuration;
 use SimpleSAML\Logger;
 use SimpleSAML\Module;
@@ -55,7 +56,7 @@ public function __construct(Configuration $casConfig)
                 Logger::error("Unable to create ticket store '$name'. Error " . $e->getMessage());
             }
         }
-        assert(!empty($this->ticketStores), "'ticketStores' must be defined.");
+        Assert::notEmpty($this->ticketStores, "'ticketStores' must be defined.");
         $this->ticketStores = $this->ticketStores;
 
         if ($this->delegateTo === 'first') {

lib/Shib13/AuthnResponse.php

@@ -16,6 +16,7 @@
 use DOMXpath;
 use Exception;
 use SAML2\DOMDocumentFactory;
+use SimpleSAML\Assert\Assert;
 use SimpleSAML\Configuration;
 use SimpleSAML\Error;
 use SimpleSAML\Metadata\MetaDataStorageHandler;
@@ -100,7 +101,7 @@ public function getRelayState(): ?string
      */
     public function validate(): bool
     {
-        assert($this->dom instanceof DOMDocument);
+        Assert::isInstanceOf($this->dom, DOMDocument::class);
 
         if ($this->messageValidated) {
             // This message was validated externally
@@ -167,7 +168,7 @@ private function isNodeValidated($node): bool
             $node = dom_import_simplexml($node);
         }
 
-        assert($node instanceof DOMNode);
+        Assert::isInstanceOf($node, DOMNode::class);
 
         return $this->validator->isNodeValidated($node);
     }
@@ -183,13 +184,13 @@ private function isNodeValidated($node): bool
      */
     private function doXPathQuery(string $query, DOMNode $node = null): DOMNodeList
     {
-        assert($this->dom instanceof DOMDocument);
+        Assert::isInstanceOf($node, DOMNode::class);
 
         if ($node === null) {
             $node = $this->dom->documentElement;
         }
 
-        assert($node instanceof DOMNode);
+        Assert::isInstanceOf($node, DOMNode::class);
 
         $xPath = new DOMXpath($this->dom);
         $xPath->registerNamespace('shibp', self::SHIB_PROTOCOL_NS);
@@ -206,7 +207,7 @@ private function doXPathQuery(string $query, DOMNode $node = null): DOMNodeList
      */
     public function getSessionIndex(): ?string
     {
-        assert($this->dom instanceof DOMDocument);
+        Assert::isInstanceOf($node, DOMNode::class);
 
         $query = '/shibp:Response/shib:Assertion/shib:AuthnStatement';
         $nodelist = $this->doXPathQuery($query);