aboutsummaryrefslogtreecommitdiff
path: root/app/Models/Factory.php
diff options
context:
space:
mode:
authorGravatar Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com> 2024-11-28 17:11:04 +0100
committerGravatar GitHub <noreply@github.com> 2024-11-28 17:11:04 +0100
commit15745d42b779ad14efde2932ab116f45eee39246 (patch)
tree2528a36184d8152d4f2d90dc73df680f84bbe1d1 /app/Models/Factory.php
parent604b186638276203c8495a3ee86da0cc240ab4d0 (diff)
Upgrade code to php 8.1 (#6748)
* revert Fix code indentation Fix code Upgrade code to php 8.1 * fix remarques * code review * code review * code review * Apply suggestions from code review * code review * Fixes * Many remainging updates of array syntax * Lost case 'reading-list' * Uneeded PHPDoc --------- Co-authored-by: Luc Sanchez <l.sanchez-prestataire@alptis.fr> Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Diffstat (limited to 'app/Models/Factory.php')
-rw-r--r--app/Models/Factory.php72
1 files changed, 28 insertions, 44 deletions
diff --git a/app/Models/Factory.php b/app/Models/Factory.php
index be96c0e58..6c140475e 100644
--- a/app/Models/Factory.php
+++ b/app/Models/Factory.php
@@ -14,79 +14,63 @@ class FreshRSS_Factory {
* @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException
*/
public static function createCategoryDao(?string $username = null): FreshRSS_CategoryDAO {
- switch (FreshRSS_Context::systemConf()->db['type'] ?? '') {
- case 'sqlite':
- return new FreshRSS_CategoryDAOSQLite($username);
- default:
- return new FreshRSS_CategoryDAO($username);
- }
+ return match (FreshRSS_Context::systemConf()->db['type'] ?? '') {
+ 'sqlite' => new FreshRSS_CategoryDAOSQLite($username),
+ default => new FreshRSS_CategoryDAO($username),
+ };
}
/**
* @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException
*/
public static function createFeedDao(?string $username = null): FreshRSS_FeedDAO {
- switch (FreshRSS_Context::systemConf()->db['type'] ?? '') {
- case 'sqlite':
- return new FreshRSS_FeedDAOSQLite($username);
- default:
- return new FreshRSS_FeedDAO($username);
- }
+ return match (FreshRSS_Context::systemConf()->db['type'] ?? '') {
+ 'sqlite' => new FreshRSS_FeedDAOSQLite($username),
+ default => new FreshRSS_FeedDAO($username),
+ };
}
/**
* @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException
*/
public static function createEntryDao(?string $username = null): FreshRSS_EntryDAO {
- switch (FreshRSS_Context::systemConf()->db['type'] ?? '') {
- case 'sqlite':
- return new FreshRSS_EntryDAOSQLite($username);
- case 'pgsql':
- return new FreshRSS_EntryDAOPGSQL($username);
- default:
- return new FreshRSS_EntryDAO($username);
- }
+ return match (FreshRSS_Context::systemConf()->db['type'] ?? '') {
+ 'sqlite' => new FreshRSS_EntryDAOSQLite($username),
+ 'pgsql' => new FreshRSS_EntryDAOPGSQL($username),
+ default => new FreshRSS_EntryDAO($username),
+ };
}
/**
* @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException
*/
public static function createTagDao(?string $username = null): FreshRSS_TagDAO {
- switch (FreshRSS_Context::systemConf()->db['type'] ?? '') {
- case 'sqlite':
- return new FreshRSS_TagDAOSQLite($username);
- case 'pgsql':
- return new FreshRSS_TagDAOPGSQL($username);
- default:
- return new FreshRSS_TagDAO($username);
- }
+ return match (FreshRSS_Context::systemConf()->db['type'] ?? '') {
+ 'sqlite' => new FreshRSS_TagDAOSQLite($username),
+ 'pgsql' => new FreshRSS_TagDAOPGSQL($username),
+ default => new FreshRSS_TagDAO($username),
+ };
}
/**
* @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException
*/
public static function createStatsDAO(?string $username = null): FreshRSS_StatsDAO {
- switch (FreshRSS_Context::systemConf()->db['type'] ?? '') {
- case 'sqlite':
- return new FreshRSS_StatsDAOSQLite($username);
- case 'pgsql':
- return new FreshRSS_StatsDAOPGSQL($username);
- default:
- return new FreshRSS_StatsDAO($username);
- }
+ return match (FreshRSS_Context::systemConf()->db['type'] ?? '') {
+ 'sqlite' => new FreshRSS_StatsDAOSQLite($username),
+ 'pgsql' => new FreshRSS_StatsDAOPGSQL($username),
+ default => new FreshRSS_StatsDAO($username),
+ };
}
/**
* @throws Minz_ConfigurationNamespaceException|Minz_PDOConnectionException
*/
public static function createDatabaseDAO(?string $username = null): FreshRSS_DatabaseDAO {
- switch (FreshRSS_Context::systemConf()->db['type'] ?? '') {
- case 'sqlite':
- return new FreshRSS_DatabaseDAOSQLite($username);
- case 'pgsql':
- return new FreshRSS_DatabaseDAOPGSQL($username);
- default:
- return new FreshRSS_DatabaseDAO($username);
- }
+ return match (FreshRSS_Context::systemConf()->db['type'] ?? '') {
+ 'sqlite' => new FreshRSS_DatabaseDAOSQLite($username),
+ 'pgsql' => new FreshRSS_DatabaseDAOPGSQL($username),
+ default => new FreshRSS_DatabaseDAO($username),
+ };
}
}