Merge pull request #901 from simplesamlphp/master

Merge in master

docs/simplesamlphp-authsource.md

@@ -42,7 +42,7 @@ The only function you need to implement is the `login($username, $password)`-fun
 This function receives the username and password the user entered, and is expected to return the attributes of that user.
 If the username or password is incorrect, it should throw an error saying so:
 
-    throw new \impleSAML\Error\Error('WRONGUSERPASS');
+    throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
 
 "[Implementing custom username/password authentication](./simplesamlphp-customauth)" describes how to implement username/password authentication using that base class.
 

lib/SimpleSAML/Locale/Language.php

@@ -230,7 +230,7 @@ class Language
         }
 
         // language is provided in a stored cookie
-        $languageCookie = Language::getLanguageCookie();
+        $languageCookie = self::getLanguageCookie();
         if ($languageCookie !== null) {
             $this->language = $languageCookie;
             return $languageCookie;

lib/SimpleSAML/XHTML/Template.php

@@ -305,7 +305,7 @@ class Template
     /**
      * Get the template directory of a module, if it exists.
      *
-     * @return string The templates directory of a module.
+     * @return string The templates directory of a module
      *
      * @throws \InvalidArgumentException If the module is not enabled or it has no templates directory.
      */