mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-19 22:04:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Type hinting for Factory.php up to PHPStan 9 (#5090)

Browse Source 
* 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 <alexandre@alapetite.fr>

* Remarque's from Alkarex

* Remarque's from Alkarex

* Remarque's from Alkarex

---------

Co-authored-by: Luc <sanchezluc+freshrss@gmail.com>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
This commit is contained in:
Luc SANCHEZ
2023-03-08 12:39:04 +01:00
committed by GitHub
parent 6c01d05171
commit 23447f1221
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/entryController.php
View File

@@ -75,7 +75,7 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController {
$entryDAO->markReadEntries($id_max, false, 0, null, 0, $is_read);
} else {
$type_get = $get[0];
$get = substr($get, 2);
$get = (int)substr($get, 2);
switch($type_get) {
case 'c':
$entryDAO->markReadCat($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
@@ -93,7 +93,7 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController {
$entryDAO->markReadTag($get, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
break;
case 'T':
$entryDAO->markReadTag('', $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
$entryDAO->markReadTag(0, $id_max, FreshRSS_Context::$search, FreshRSS_Context::$state, $is_read);
break;
}

6
app/Models/EntryDAO.php
View File

@@ -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);

35
app/Models/Factory.php
View File

@@ -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);