Merge branch 'dev' into dev-12.0

Author: demiankatz

module/VuFind/src/VuFind/Auth/Manager.php

@@ -174,7 +174,7 @@ protected function getAuth(?string $name = null): AuthInterface
             // need to be replaced by "getLogoutRedirectUrl" and "clearLoginState".
             if (is_callable([$this->auth[$name], 'logout']) || is_callable([$this->auth[$name], 'resetState'])) {
                 throw new \Exception(
-                    'Deprecated methods "logout" and "resetState" need'
+                    'Deprecated methods "logout" and "resetState" need '
                     . 'to be replaced by "getLogoutRedirectUrl" and "clearLoginState"'
                 );
             }

module/VuFind/src/VuFind/Auth/OpenIDConnect.php

@@ -365,13 +365,13 @@ public function getSessionInitiator(string $target): ?string
     }
 
     /**
-     * Perform cleanup at logout time.
+     * Get URL users should be redirected to for logout in external services if necessary.
      *
-     * @param string $url URL to redirect user to after logging out.
+     * @param string $url Internal URL to redirect user to after logging out.
      *
-     * @return string Redirect URL (modified for OpenIDConnect logout).
+     * @return string Redirect URL (usually same as $url, but modified in some authentication modules).
      */
-    public function logout($url)
+    public function getLogoutRedirectUrl(string $url): string
     {
         $redirectUrl = $url;
         $endSessionEndpoint = false;