Fix types for extensions (#5901)

* Fix types for extensions
To accompany https://github.com/FreshRSS/Extensions/pull/185

* Avoid bug redeclared function

6 files changed, 12 insertions, 16 deletions

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 73a640748..06eca7d9e 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -246,4 +246,15 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {
 		$this->view->preferred_language = Minz_Translate::getLanguage(null, Minz_Request::getPreferredLanguages(), FreshRSS_Context::$system_conf->language);
 		FreshRSS_View::prependTitle(_t('gen.auth.registration.title') . ' · ');
 	}
+
+	public static function getLogoutUrl(): string {
+		if (($_SERVER['AUTH_TYPE'] ?? '') === 'openid-connect') {
+			$url_string = urlencode(Minz_Request::guessBaseUrl());
+			return './oidc/?logout=' . $url_string . '/';
+			# The trailing slash is necessary so that we don’t redirect to http://.
+			# https://bz.apache.org/bugzilla/show_bug.cgi?id=61355#c13
+		} else {
+			return _url('auth', 'logout') ?: '';
+		}
+	}
 }
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index 5d402fa67..6dd36dd72 100644
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -5,7 +5,6 @@ class FreshRSS_javascript_Controller extends FreshRSS_ActionController {
 
 	/**
 	 * @var FreshRSS_ViewJavascript
-	 * @phpstan-ignore-next-line
 	 */
 	protected $view;
 
diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
index 6e6a2720f..6be9040e9 100644
--- a/app/Controllers/statsController.php
+++ b/app/Controllers/statsController.php
@@ -8,7 +8,6 @@ class FreshRSS_stats_Controller extends FreshRSS_ActionController {
 
 	/**
 	 * @var FreshRSS_ViewStats
-	 * @phpstan-ignore-next-line
 	 */
 	protected $view;
 
diff --git a/app/Mailers/UserMailer.php b/app/Mailers/UserMailer.php
index 6e54caa4b..a78ab9b32 100644
--- a/app/Mailers/UserMailer.php
+++ b/app/Mailers/UserMailer.php
@@ -8,7 +8,6 @@ class FreshRSS_User_Mailer extends Minz_Mailer {
 
 	/**
 	 * @var FreshRSS_View
-	 * @phpstan-ignore-next-line
 	 */
 	protected $view;
 
diff --git a/app/Models/ActionController.php b/app/Models/ActionController.php
index a840ccc6d..69ee72b52 100644
--- a/app/Models/ActionController.php
+++ b/app/Models/ActionController.php
@@ -5,7 +5,6 @@ class FreshRSS_ActionController extends Minz_ActionController {
 
 	/**
 	 * @var FreshRSS_View
-	 * @phpstan-ignore-next-line
 	 */
 	protected $view;
 }
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 1b2f0076e..b59293f21 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,16 +1,5 @@
 <?php
 	declare(strict_types=1);
-
-	function get_logout_url(): string {
-		if (($_SERVER['AUTH_TYPE'] ?? '') === 'openid-connect') {
-			$url_string = urlencode(Minz_Request::guessBaseUrl());
-			return './oidc/?logout=' . $url_string . '/';
-			# The trailing slash is necessary so that we don’t redirect to http://.
-			# https://bz.apache.org/bugzilla/show_bug.cgi?id=61355#c13
-		} else {
-			return _url('auth', 'logout') ?: '';
-		}
-	}
 ?>
 <nav class="nav nav-list aside" id="aside_feed">
 	<a class="toggle_aside" href="#close"><?= _i('close') ?></a>
@@ -23,7 +12,7 @@
 					<a href="<?= _url('user', 'profile') ?>"><?= _t('gen.menu.user_profile') ?></a>
 				</li>
 				<li class="item">
-					<a class="signout" href="<?= get_logout_url() ?>">
+					<a class="signout" href="<?= FreshRSS_auth_Controller::getLogoutUrl() ?>">
 						<?php
 						echo _t('gen.auth.logout'); ?> <?= _i('logout') ?></a>
 				</li>