Resolve Psalm-issues

Author: tvdijen

composer.json

@@ -29,6 +29,7 @@
     "require": {
         "php": ">=5.6",
         "simplesamlphp/composer-module-installer": "~1.1",
+        "simplesamlphp/simplesamlphp-module-ldap": "~1.1",
         "webmozart/assert": "~1.4"
     },
     "require-dev": {

lib/Auth/Source/CAS.php

@@ -102,6 +102,8 @@ private function casValidate($ticket, $service)
             'service' => $service,
         ]);
         $result = \SimpleSAML\Utils\HTTP::fetch($url);
+
+        /** @var string $result */
         $res = preg_split("/\r?\n/", $result);
 
         if (strcmp($res[0], "yes") == 0) {
@@ -131,6 +133,7 @@ private function casServiceValidate($ticket, $service)
         );
         $result = \SimpleSAML\Utils\HTTP::fetch($url);
 
+        /** @var string $result */
         $dom = \SAML2\DOMDocumentFactory::fromString($result);
         $xPath = new \DOMXpath($dom);
         $xPath->registerNamespace("cas", 'http://www.yale.edu/tp/cas');
@@ -149,7 +152,12 @@ private function casServiceValidate($ticket, $service)
                     }
                 }
             }
-            $casusername = $success->item(0)->textContent;
+
+            $item = $success->item(0);
+            if (is_null($item)) {
+                throw new \Exception("Error parsing serviceResponse.");
+            }
+            $casusername = $item->textContent;
 
             return [$casusername, $attributes];
         }
@@ -195,7 +203,7 @@ public function finalStep(&$state)
             'Authentication source '.var_export($this->authId, true)
         );
         if ($this->ldapConfig['servers']) {
-            $ldap = new \SimpleSAML\Auth\LDAP(
+            $ldap = new \SimpleSAML\Module\ldap\Auth\Ldap(
                 $config->getString('servers'),
                 $config->getBoolean('enable_tls', false),
                 $config->getBoolean('debug', false),
@@ -204,6 +212,9 @@ public function finalStep(&$state)
                 $config->getBoolean('referrals', true)
             );
             $ldapattributes = $ldap->validate($this->ldapConfig, $username);
+            if ($ldapattributes === false) {
+                throw new \Exception("Failed to authenticate against LDAP-server.");
+            }
         }
         $attributes = array_merge_recursive($casattributes, $ldapattributes);
         $state['Attributes'] = $attributes;