From 23447f1221713fca92824ac098469fa69efdad03 Mon Sep 17 00:00:00 2001 From: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com> Date: Wed, 8 Mar 2023 12:39:04 +0100 Subject: Type hinting for Factory.php up to PHPStan 9 (#5090) * Type hinting for Factory.php up to PHPStan 8 * Fix phpstan collateral * revert test * remarrk from Alkarex * remark from Alkarex * Update app/Controllers/entryController.php Co-authored-by: Alexandre Alapetite * Remarque's from Alkarex * Remarque's from Alkarex * Remarque's from Alkarex --------- Co-authored-by: Luc Co-authored-by: Alexandre Alapetite --- app/Models/Factory.php | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'app/Models/Factory.php') diff --git a/app/Models/Factory.php b/app/Models/Factory.php index 308ff2864..80c611db5 100644 --- a/app/Models/Factory.php +++ b/app/Models/Factory.php @@ -2,11 +2,17 @@ class FreshRSS_Factory { - public static function createUserDao($username = null) { + /** + * @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException + */ + public static function createUserDao(?string $username = null): FreshRSS_UserDAO { return new FreshRSS_UserDAO($username); } - public static function createCategoryDao($username = null) { + /** + * @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException + */ + public static function createCategoryDao(?string $username = null): FreshRSS_CategoryDAO { switch (FreshRSS_Context::$system_conf->db['type']) { case 'sqlite': return new FreshRSS_CategoryDAOSQLite($username); @@ -15,7 +21,10 @@ class FreshRSS_Factory { } } - public static function createFeedDao($username = null) { + /** + * @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException + */ + public static function createFeedDao(?string $username = null): FreshRSS_FeedDAO { switch (FreshRSS_Context::$system_conf->db['type']) { case 'sqlite': return new FreshRSS_FeedDAOSQLite($username); @@ -24,7 +33,10 @@ class FreshRSS_Factory { } } - public static function createEntryDao($username = null) { + /** + * @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException + */ + public static function createEntryDao(?string $username = null): FreshRSS_EntryDAO { switch (FreshRSS_Context::$system_conf->db['type']) { case 'sqlite': return new FreshRSS_EntryDAOSQLite($username); @@ -35,7 +47,10 @@ class FreshRSS_Factory { } } - public static function createTagDao($username = null) { + /** + * @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException + */ + public static function createTagDao(?string $username = null): FreshRSS_TagDAO { switch (FreshRSS_Context::$system_conf->db['type']) { case 'sqlite': return new FreshRSS_TagDAOSQLite($username); @@ -46,7 +61,10 @@ class FreshRSS_Factory { } } - public static function createStatsDAO($username = null) { + /** + * @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException + */ + public static function createStatsDAO(?string $username = null): FreshRSS_StatsDAO { switch (FreshRSS_Context::$system_conf->db['type']) { case 'sqlite': return new FreshRSS_StatsDAOSQLite($username); @@ -57,7 +75,10 @@ class FreshRSS_Factory { } } - public static function createDatabaseDAO($username = null) { + /** + * @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException + */ + public static function createDatabaseDAO(?string $username = null): FreshRSS_DatabaseDAO { switch (FreshRSS_Context::$system_conf->db['type']) { case 'sqlite': return new FreshRSS_DatabaseDAOSQLite($username); -- cgit v1.2.3