FreshRSS · Alkarex · Nov 16, 2023 · Nov 8, 2023 · Nov 9, 2023 · Nov 13, 2023
diff --git a/app/Controllers/apiController.php b/app/Controllers/apiController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This controller manage API-related features.

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This controller handles action about authentication.

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Controller to handle actions relative to categories.

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Controller to handle every configuration options.

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Controller to handle every entry actions.

diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Controller to handle error page.

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * The controller to manage extensions.

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Controller to handle every feed actions.

diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Controller to handle every import and export actions.

diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This class handles main actions of FreshRSS.

diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_javascript_Controller extends FreshRSS_ActionController {
 

diff --git a/app/Controllers/statsController.php b/app/Controllers/statsController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Controller to handle application statistics.

diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Controller to handle subscription actions.

diff --git a/app/Controllers/tagController.php b/app/Controllers/tagController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Controller to handle every tag actions.

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_update_Controller extends FreshRSS_ActionController {
 

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Controller to handle user actions.

diff --git a/app/Exceptions/AlreadySubscribedException.php b/app/Exceptions/AlreadySubscribedException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_AlreadySubscribed_Exception extends Exception {
 

diff --git a/app/Exceptions/BadUrlException.php b/app/Exceptions/BadUrlException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_BadUrl_Exception extends FreshRSS_Feed_Exception {
 

diff --git a/app/Exceptions/ContextException.php b/app/Exceptions/ContextException.php
@@ -1,6 +1,6 @@
 <?php
-
 declare(strict_types=1);
+
 /**
  * An exception raised when a context is invalid
  */

diff --git a/app/Exceptions/DAOException.php b/app/Exceptions/DAOException.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 class FreshRSS_DAO_Exception extends Exception {

diff --git a/app/Exceptions/EntriesGetterException.php b/app/Exceptions/EntriesGetterException.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 class FreshRSS_EntriesGetter_Exception extends Exception {

diff --git a/app/Exceptions/FeedException.php b/app/Exceptions/FeedException.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 class FreshRSS_Feed_Exception extends Exception {

diff --git a/app/Exceptions/FeedNotAddedException.php b/app/Exceptions/FeedNotAddedException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_FeedNotAdded_Exception extends Exception {
 

diff --git a/app/Exceptions/ZipException.php b/app/Exceptions/ZipException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_Zip_Exception extends Exception {
 

diff --git a/app/Exceptions/ZipMissingException.php b/app/Exceptions/ZipMissingException.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 class FreshRSS_ZipMissing_Exception extends Exception {

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS extends Minz_FrontController {
 	/**

diff --git a/app/Mailers/UserMailer.php b/app/Mailers/UserMailer.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Manage the emails sent to the users.

diff --git a/app/Models/ActionController.php b/app/Models/ActionController.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 class FreshRSS_ActionController extends Minz_ActionController {

diff --git a/app/Models/Auth.php b/app/Models/Auth.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This class handles all authentication process.

diff --git a/app/Models/BooleanSearch.php b/app/Models/BooleanSearch.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Contains Boolean search from the search form.
@@ -67,7 +68,7 @@ private function parseUserQueryNames(string $input): string {
 					$name = trim($matches['search'][$i]);
 					if (!empty($queries[$name])) {
 						$fromS[] = $matches[0][$i];
-						$toS[] = '(' . trim($queries[$name]->getSearch()) . ')';
+						$toS[] = '(' . trim($queries[$name]->getSearch()->getRawInput()) . ')';
 					}
 				}
 			}
@@ -110,7 +111,7 @@ private function parseUserQueryIds(string $input): string {
 					$id = (int)(trim($matches['search'][$i])) - 1;
 					if (!empty($queries[$id])) {
 						$fromS[] = $matches[0][$i];
-						$toS[] = '(' . trim($queries[$id]->getSearch()) . ')';
+						$toS[] = '(' . trim($queries[$id]->getSearch()->getRawInput()) . ')';
 					}
 				}
 			}

diff --git a/app/Models/Category.php b/app/Models/Category.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_Category extends Minz_Model {
 

diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_CategoryDAO extends Minz_ModelPdo {
 

diff --git a/app/Models/CategoryDAOSQLite.php b/app/Models/CategoryDAOSQLite.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_CategoryDAOSQLite extends FreshRSS_CategoryDAO {
 

diff --git a/app/Models/Context.php b/app/Models/Context.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * The context object handles the current configuration file and different

diff --git a/app/Models/DatabaseDAO.php b/app/Models/DatabaseDAO.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This class is used to test database is well-constructed.

diff --git a/app/Models/DatabaseDAOPGSQL.php b/app/Models/DatabaseDAOPGSQL.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This class is used to test database is well-constructed.

diff --git a/app/Models/DatabaseDAOSQLite.php b/app/Models/DatabaseDAOSQLite.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This class is used to test database is well-constructed (SQLite).

diff --git a/app/Models/Days.php b/app/Models/Days.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 class FreshRSS_Days {

diff --git a/app/Models/Entry.php b/app/Models/Entry.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_Entry extends Minz_Model {
 	public const STATE_READ = 1;
@@ -741,11 +742,11 @@ public static function getContentByParsing(string $url, string $path, array $att
 			}
 
 			$content = '';
-			$nodes = $xpath->query(new Gt\CssXPath\Translator($path));
+			$nodes = $xpath->query((new Gt\CssXPath\Translator($path))->asXPath());
 			if ($nodes != false) {
 				foreach ($nodes as $node) {
 					if (!empty($attributes['path_entries_filter'])) {
-						$filterednodes = $xpath->query(new Gt\CssXPath\Translator($attributes['path_entries_filter']), $node) ?: [];
+						$filterednodes = $xpath->query((new Gt\CssXPath\Translator($attributes['path_entries_filter']))->asXPath(), $node) ?: [];
 						foreach ($filterednodes as $filterednode) {
 							$filterednode->parentNode->removeChild($filterednode);
 						}

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_EntryDAO extends Minz_ModelPdo {
 

diff --git a/app/Models/EntryDAOPGSQL.php b/app/Models/EntryDAOPGSQL.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_EntryDAOPGSQL extends FreshRSS_EntryDAOSQLite {
 

diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 

diff --git a/app/Models/Factory.php b/app/Models/Factory.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_Factory {
 

diff --git a/app/Models/Feed.php b/app/Models/Feed.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_Feed extends Minz_Model {
 

diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_FeedDAO extends Minz_ModelPdo {
 

diff --git a/app/Models/FeedDAOSQLite.php b/app/Models/FeedDAOSQLite.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_FeedDAOSQLite extends FreshRSS_FeedDAO {
 

diff --git a/app/Models/FilterAction.php b/app/Models/FilterAction.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_FilterAction {
 

diff --git a/app/Models/FormAuth.php b/app/Models/FormAuth.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_FormAuth {
 	public static function checkCredentials(string $username, string $hash, string $nonce, string $challenge): bool {

diff --git a/app/Models/Log.php b/app/Models/Log.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 class FreshRSS_Log extends Minz_Model {

diff --git a/app/Models/LogDAO.php b/app/Models/LogDAO.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 final class FreshRSS_LogDAO {
 	public static function logPath(?string $logFileName = null): string {

diff --git a/app/Models/ReadingMode.php b/app/Models/ReadingMode.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Manage the reading modes in FreshRSS.

diff --git a/app/Models/Search.php b/app/Models/Search.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 require_once(LIB_PATH . '/lib_date.php');
 

diff --git a/app/Models/Share.php b/app/Models/Share.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Manage the sharing options in FreshRSS.

diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_StatsDAO extends Minz_ModelPdo {
 

diff --git a/app/Models/StatsDAOPGSQL.php b/app/Models/StatsDAOPGSQL.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_StatsDAOPGSQL extends FreshRSS_StatsDAO {
 

diff --git a/app/Models/StatsDAOSQLite.php b/app/Models/StatsDAOSQLite.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_StatsDAOSQLite extends FreshRSS_StatsDAO {
 

diff --git a/app/Models/SystemConfiguration.php b/app/Models/SystemConfiguration.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 /**

diff --git a/app/Models/Tag.php b/app/Models/Tag.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_Tag extends Minz_Model {
 

diff --git a/app/Models/TagDAO.php b/app/Models/TagDAO.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_TagDAO extends Minz_ModelPdo {
 

diff --git a/app/Models/TagDAOPGSQL.php b/app/Models/TagDAOPGSQL.php
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 class FreshRSS_TagDAOPGSQL extends FreshRSS_TagDAO {

diff --git a/app/Models/TagDAOSQLite.php b/app/Models/TagDAOSQLite.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 class FreshRSS_TagDAOSQLite extends FreshRSS_TagDAO {