Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"require": {
"php": ">=7.2",
"php": ">=8.0",
"composer/installers": "^1.0 || ^2.0"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion console/command/repair_tags.php
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ protected function ask_replacements(SymfonyStyle $io, string $source_name): arra
* @param array $catalog Tag catalog
* @return int|null Selected target identifier, or null when cancelled
*/
protected function ask_merge_target(SymfonyStyle $io, int $source_id, array $catalog): ?int
protected function ask_merge_target(SymfonyStyle $io, int $source_id, array $catalog): int|null
{
$target_ids = [];
$choices = [];
Expand Down
2 changes: 1 addition & 1 deletion tags/manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class manager
* @param string $forums_table Forums table
* @param cache|null $cache Cache driver
*/
public function __construct(driver_interface $db, string $tags_table, string $forums_map_table, string $topic_map_table, string $forums_table, ?cache $cache = null)
public function __construct(driver_interface $db, string $tags_table, string $forums_map_table, string $topic_map_table, string $forums_table, cache|null $cache = null)
{
$this->db = $db;
$this->tags_table = $tags_table;
Expand Down
2 changes: 1 addition & 1 deletion tags/reply_repairer.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ protected function reply_plan_from_row(
array $tag_ids,
array $posts,
array $forum_caches
): ?array
): array|null
{
$post_id = (int) $row['post_id'];
$topic_id = (int) $row['topic_id'];
Expand Down
4 changes: 2 additions & 2 deletions tags/title_repairer.php
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ protected function load_forum_caches(array $topics): array
* @return array|null Repair snapshot, or null when the topic is unmatched
* @throws \InvalidArgumentException When the prefix is invalid
*/
protected function plan_from_row(array $row, string $prefix, array $posts, array $forum_caches): ?array
protected function plan_from_row(array $row, string $prefix, array $posts, array $forum_caches): array|null
{
$topic_id = (int) $row['topic_id'];
$forum_id = (int) $row['forum_id'];
Expand Down Expand Up @@ -857,7 +857,7 @@ protected function literal(string $text): string
* @param string $sql SQL query
* @return array|null First row, or null when no row exists
*/
protected function fetch(string $sql): ?array
protected function fetch(string $sql): array|null
{
$result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result);
Expand Down
2 changes: 1 addition & 1 deletion tags/topic_repairer.php
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ protected function get_forum_tags(int $forum_id): array
* @param array $tags Tag rows available in the topic's forum
* @return array|null Matched prefix and tags, or null when no prefix matches
*/
protected function match_prefix(string $title, array $tags): ?array
protected function match_prefix(string $title, array $tags): array|null
{
$states = [0 => ['' => []]];
$matches = [];
Expand Down
Loading