diff options
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/EntryDAO.php | 6 | ||||
| -rw-r--r-- | app/Models/Factory.php | 35 |
2 files changed, 31 insertions, 10 deletions
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 3b7c1ac3f..aab17d01e 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -1197,11 +1197,11 @@ SQL; /** * For API - * @return array<string> + * @return array<string>|false */ public function listIdsWhere($type = 'a', $id = '', $state = FreshRSS_Entry::STATE_ALL, - $order = 'DESC', $limit = 1, $firstId = '', $filters = null): array { - list($values, $sql) = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filters); + $order = 'DESC', $limit = 1, $firstId = '', $filters = null) { + [$values, $sql] = $this->sqlListWhere($type, $id, $state, $order, $limit, $firstId, $filters); $stm = $this->pdo->prepare($sql); $stm->execute($values); 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); |