diff options
| author | 2024-11-28 17:11:04 +0100 | |
|---|---|---|
| committer | 2024-11-28 17:11:04 +0100 | |
| commit | 15745d42b779ad14efde2932ab116f45eee39246 (patch) | |
| tree | 2528a36184d8152d4f2d90dc73df680f84bbe1d1 /lib/Minz | |
| parent | 604b186638276203c8495a3ee86da0cc240ab4d0 (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 'lib/Minz')
| -rw-r--r-- | lib/Minz/Configuration.php | 4 | ||||
| -rw-r--r-- | lib/Minz/ExtensionManager.php | 98 | ||||
| -rw-r--r-- | lib/Minz/ModelArray.php | 2 | ||||
| -rw-r--r-- | lib/Minz/PdoPgsql.php | 2 | ||||
| -rw-r--r-- | lib/Minz/Request.php | 2 | ||||
| -rw-r--r-- | lib/Minz/Session.php | 2 | ||||
| -rw-r--r-- | lib/Minz/Translate.php | 16 |
7 files changed, 63 insertions, 63 deletions
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php index 40a5851a9..b2742e249 100644 --- a/lib/Minz/Configuration.php +++ b/lib/Minz/Configuration.php @@ -18,7 +18,7 @@ class Minz_Configuration { * The list of configurations. * @var array<string,static> */ - private static array $config_list = array(); + private static array $config_list = []; /** * Add a new configuration to the list of configuration. @@ -132,7 +132,7 @@ class Minz_Configuration { * @param Minz_ConfigurationSetterInterface|null $configuration_setter the setter to call when modifying data. */ public function _configurationSetter(?Minz_ConfigurationSetterInterface $configuration_setter): void { - if (is_callable(array($configuration_setter, 'handle'))) { + if (is_callable([$configuration_setter, 'handle'])) { $this->configuration_setter = $configuration_setter; } } diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php index 976dddb82..90f005d29 100644 --- a/lib/Minz/ExtensionManager.php +++ b/lib/Minz/ExtensionManager.php @@ -22,74 +22,74 @@ final class Minz_ExtensionManager { * @var array<string,array{'list':array<callable>,'signature':'NoneToNone'|'NoneToString'|'OneToOne'|'PassArguments'}> */ private static array $hook_list = [ - 'check_url_before_add' => array( // function($url) -> Url | null - 'list' => array(), + 'check_url_before_add' => [ // function($url) -> Url | null + 'list' => [], 'signature' => 'OneToOne', - ), + ], 'entries_favorite' => [ // function(array $ids, bool $is_favorite): void 'list' => [], 'signature' => 'PassArguments', ], - 'entry_auto_read' => array( // function(FreshRSS_Entry $entry, string $why): void - 'list' => array(), + 'entry_auto_read' => [ // function(FreshRSS_Entry $entry, string $why): void + 'list' => [], 'signature' => 'PassArguments', - ), - 'entry_auto_unread' => array( // function(FreshRSS_Entry $entry, string $why): void - 'list' => array(), + ], + 'entry_auto_unread' => [ // function(FreshRSS_Entry $entry, string $why): void + 'list' => [], 'signature' => 'PassArguments', - ), - 'entry_before_display' => array( // function($entry) -> Entry | null - 'list' => array(), + ], + 'entry_before_display' => [ // function($entry) -> Entry | null + 'list' => [], 'signature' => 'OneToOne', - ), - 'entry_before_insert' => array( // function($entry) -> Entry | null - 'list' => array(), + ], + 'entry_before_insert' => [ // function($entry) -> Entry | null + 'list' => [], 'signature' => 'OneToOne', - ), - 'feed_before_actualize' => array( // function($feed) -> Feed | null - 'list' => array(), + ], + 'feed_before_actualize' => [ // function($feed) -> Feed | null + 'list' => [], 'signature' => 'OneToOne', - ), - 'feed_before_insert' => array( // function($feed) -> Feed | null - 'list' => array(), + ], + 'feed_before_insert' => [ // function($feed) -> Feed | null + 'list' => [], 'signature' => 'OneToOne', - ), - 'freshrss_init' => array( // function() -> none - 'list' => array(), + ], + 'freshrss_init' => [ // function() -> none + 'list' => [], 'signature' => 'NoneToNone', - ), - 'freshrss_user_maintenance' => array( // function() -> none - 'list' => array(), + ], + 'freshrss_user_maintenance' => [ // function() -> none + 'list' => [], 'signature' => 'NoneToNone', - ), - 'js_vars' => array( // function($vars = array) -> array | null - 'list' => array(), + ], + 'js_vars' => [ // function($vars = array) -> array | null + 'list' => [], 'signature' => 'OneToOne', - ), - 'menu_admin_entry' => array( // function() -> string - 'list' => array(), + ], + 'menu_admin_entry' => [ // function() -> string + 'list' => [], 'signature' => 'NoneToString', - ), - 'menu_configuration_entry' => array( // function() -> string - 'list' => array(), + ], + 'menu_configuration_entry' => [ // function() -> string + 'list' => [], 'signature' => 'NoneToString', - ), - 'menu_other_entry' => array( // function() -> string - 'list' => array(), + ], + 'menu_other_entry' => [ // function() -> string + 'list' => [], 'signature' => 'NoneToString', - ), - 'nav_menu' => array( // function() -> string - 'list' => array(), + ], + 'nav_menu' => [ // function() -> string + 'list' => [], 'signature' => 'NoneToString', - ), - 'nav_reading_modes' => array( // function($readingModes = array) -> array | null - 'list' => array(), + ], + 'nav_reading_modes' => [ // function($readingModes = array) -> array | null + 'list' => [], 'signature' => 'OneToOne', - ), - 'post_update' => array( // function(none) -> none - 'list' => array(), + ], + 'post_update' => [ // function(none) -> none + 'list' => [], 'signature' => 'NoneToNone', - ), + ], 'simplepie_after_init' => [ // function(\SimplePie\SimplePie $simplePie, FreshRSS_Feed $feed, bool $result): void 'list' => [], 'signature' => 'PassArguments', @@ -187,7 +187,7 @@ final class Minz_ExtensionManager { * @return bool true if the array is valid, false else. */ private static function isValidMetadata(array $meta): bool { - $valid_chars = array('_'); + $valid_chars = ['_']; return !(empty($meta['name']) || empty($meta['entrypoint']) || !ctype_alnum(str_replace($valid_chars, '', $meta['entrypoint']))); } diff --git a/lib/Minz/ModelArray.php b/lib/Minz/ModelArray.php index f12e23567..5a1d286cd 100644 --- a/lib/Minz/ModelArray.php +++ b/lib/Minz/ModelArray.php @@ -41,7 +41,7 @@ class Minz_ModelArray { if ($data === false) { throw new Minz_PermissionDeniedException($this->filename); } elseif (!is_array($data)) { - $data = array(); + $data = []; } return $data; } diff --git a/lib/Minz/PdoPgsql.php b/lib/Minz/PdoPgsql.php index d075c396f..a43d7addf 100644 --- a/lib/Minz/PdoPgsql.php +++ b/lib/Minz/PdoPgsql.php @@ -24,6 +24,6 @@ class Minz_PdoPgsql extends Minz_Pdo { #[\Override] protected function preSql(string $statement): string { $statement = parent::preSql($statement); - return str_replace(array('`', ' LIKE '), array('"', ' ILIKE '), $statement); + return str_replace(['`', ' LIKE '], ['"', ' ILIKE '], $statement); } } diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php index b4d4549a9..bddb5a276 100644 --- a/lib/Minz/Request.php +++ b/lib/Minz/Request.php @@ -490,6 +490,6 @@ class Minz_Request { if (preg_match_all('/(^|,)\s*(?P<lang>[^;,]+)/', $_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? '', $matches) > 0) { return $matches['lang']; } - return array('en'); + return ['en']; } } diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php index c08ad688b..9977e62f6 100644 --- a/lib/Minz/Session.php +++ b/lib/Minz/Session.php @@ -164,7 +164,7 @@ class Minz_Session { if (!self::$volatile) { session_destroy(); } - $_SESSION = array(); + $_SESSION = []; if (!$force) { self::_param('language', $language); diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php index a8dc889ee..08b3c91e8 100644 --- a/lib/Minz/Translate.php +++ b/lib/Minz/Translate.php @@ -40,8 +40,8 @@ class Minz_Translate { */ public static function init(string $lang_name = ''): void { self::$lang_name = $lang_name; - self::$lang_files = array(); - self::$translates = array(); + self::$lang_files = []; + self::$translates = []; self::registerPath(APP_PATH . '/i18n'); foreach (self::$path_list as $path) { self::loadLang($path); @@ -54,8 +54,8 @@ class Minz_Translate { */ public static function reset(string $lang_name): void { self::$lang_name = $lang_name; - self::$lang_files = array(); - self::$translates = array(); + self::$lang_files = []; + self::$translates = []; foreach (self::$path_list as $path) { self::loadLang($path); } @@ -66,7 +66,7 @@ class Minz_Translate { * @return array<string> containing langs found in different registered paths. */ public static function availableLanguages(): array { - $list_langs = array(); + $list_langs = []; self::registerPath(APP_PATH . '/i18n'); @@ -75,7 +75,7 @@ class Minz_Translate { if (is_array($scan)) { $path_langs = array_values(array_diff( $scan, - array('..', '.') + ['..', '.'] )); $list_langs = array_merge($list_langs, $path_langs); } @@ -146,7 +146,7 @@ class Minz_Translate { foreach ($list_i18n_files as $i18n_filename) { $i18n_key = basename($i18n_filename, '.php'); if (!isset(self::$lang_files[$i18n_key])) { - self::$lang_files[$i18n_key] = array(); + self::$lang_files[$i18n_key] = []; } self::$lang_files[$i18n_key][] = $lang_path . '/' . $i18n_filename; self::$translates[$i18n_key] = null; @@ -164,7 +164,7 @@ class Minz_Translate { return false; } - self::$translates[$key] = array(); + self::$translates[$key] = []; foreach (self::$lang_files[$key] as $lang_pathname) { $i18n_array = include($lang_pathname); |
