From 36aa0122e15b6c5a4bf923467b63a577cac5a539 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 4 Apr 2023 10:23:26 +0200
Subject: Fix extensions in actualize_script (#5243)

* Fix extension freshrss_user_maintenance in actualize_script
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/3440

The hook was called before registering all the extensions for the current user

* PHPStan Level 6 for extensions
And remove 5-year old legacy format of enabled extensions < FreshRSS 1.11.1

* Fix multiple bugs in extensions

* Minor typing

* Don't change signature of methods supposed to be overridden

* PHPStan Level 9 and compatibility Intelliphense

* Set as final the methods not supposed to be overriden
---
 lib/core-extensions/Google-Groups/extension.php | 3 ++-
 lib/core-extensions/Tumblr-GDPR/extension.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/core-extensions')

diff --git a/lib/core-extensions/Google-Groups/extension.php b/lib/core-extensions/Google-Groups/extension.php
index 656bf9b8f..cdd605cd9 100644
--- a/lib/core-extensions/Google-Groups/extension.php
+++ b/lib/core-extensions/Google-Groups/extension.php
@@ -1,10 +1,11 @@
 <?php
 class GoogleGroupsExtension extends Minz_Extension {
+	/** @return void */
 	public function init() {
 		$this->registerHook('check_url_before_add', array('GoogleGroupsExtension', 'findFeed'));
 	}
 
-	public static function findFeed($url) {
+	public static function findFeed(string $url): string {
 		return preg_replace('%^(https?://groups.google.com/forum)/#!forum/(.+)$%i', '$1/feed/$2/msgs/rss.xml', $url);
 	}
 }
diff --git a/lib/core-extensions/Tumblr-GDPR/extension.php b/lib/core-extensions/Tumblr-GDPR/extension.php
index 83bdf2189..825bb97df 100644
--- a/lib/core-extensions/Tumblr-GDPR/extension.php
+++ b/lib/core-extensions/Tumblr-GDPR/extension.php
@@ -1,11 +1,12 @@
 <?php
 
 class TumblrGdprExtension extends Minz_Extension {
+	/** @return void */
 	public function init() {
 		$this->registerHook('simplepie_before_init', array('TumblrGdprExtension', 'curlHook'));
 	}
 
-	public static function curlHook($simplePie, $feed) {
+	public static function curlHook(SimplePie $simplePie, FreshRSS_Feed $feed): void {
 		if (preg_match('#^https?://[a-zA-Z_0-9-]+.tumblr.com/#i', $feed->url())) {
 			$simplePie->set_useragent(FRESHRSS_USERAGENT . ' like Baiduspider');
 		}
-- 
cgit v1.2.3