badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[dev] bump phpstan strictness

Browse source 
no more null surprises
This commit is contained in:
Shish 2024-08-31 21:22:54 +01:00 committed by Shish
parent 845c8b3d85
commit 399a56ac79
23 changed files with 83 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/basepage.php
View file

@ -245,14 +245,14 @@ class BasePage
* Find a block which contains the given text
* (Useful for unit tests)
*/
public function find_block(string $text): ?Block
public function find_block(string $text): Block
{
foreach ($this->blocks as $block) {
if ($block->header == $text) {
return $block;
}
}
return null;
throw new \Exception("Block not found: $text");
}
// ==============================================

1
core/block.php
View file

@ -56,7 +56,6 @@ class Block
$id = (empty($header) ? md5($this->body ?? '') : $header) . $section;
}
$str_id = preg_replace_ex('/[^\w-]/', '', str_replace(' ', '_', $id));
assert(is_string($str_id));
$this->id = $str_id;
}

2
ext/graphql/test.php
View file

@ -30,7 +30,7 @@ class GraphQLTest extends ShimmiePHPUnitTestCase
{
$this->log_in_as_user();
$image_id = $this->post_image("tests/pbx_screenshot.jpg", "test");
$image = Image::by_id($image_id);
$image = Image::by_id_ex($image_id);
$result = $this->graphql('{
posts(limit: 3, offset: 0) {

4
ext/image_hash_ban/main.php
View file

@ -91,8 +91,8 @@ class ImageBan extends Extension
if ($event->page_matches("image_hash_ban/add", method: "POST", permission: Permissions::BAN_IMAGE)) {
$input = validate_input(["c_hash" => "optional,string", "c_reason" => "string", "c_image_id" => "optional,int"]);
$image = isset($input['c_image_id']) ? Image::by_id($input['c_image_id']) : null;
$hash = isset($input["c_hash"]) ? $input["c_hash"] : $image->hash;
$image = isset($input['c_image_id']) ? Image::by_id_ex($input['c_image_id']) : null;
$hash = isset($input["c_hash"]) ? $input["c_hash"] : ($image ? $image->hash : null);
$reason = isset($input['c_reason']) ? $input['c_reason'] : "DNP";
if ($hash) {

1
ext/index/main.php
View file

@ -243,6 +243,7 @@ class Index extends Extension
// If we've reached this far, and nobody else has done anything with this term, then treat it as a tag
if ($event->order === null && $event->img_conditions == [] && $event->tag_conditions == []) {
assert(is_string($event->term));
$event->add_tag_condition(new TagCondition($event->term, $event->positive));
}
}

4
ext/ipban/test.php
View file

@ -37,7 +37,7 @@ class IPBanTest extends ShimmiePHPUnitTestCase
$page = $this->get_page('ip_ban/list');
$this->assertStringContainsString(
"42.42.42.42",
$page->find_block("Edit IP Bans")->body
$page->find_block("Edit IP Bans")->body ?? ""
);
// Delete ban
@ -48,7 +48,7 @@ class IPBanTest extends ShimmiePHPUnitTestCase
$page = $this->get_page('ip_ban/list');
$this->assertStringNotContainsString(
"42.42.42.42",
$page->find_block("Edit IP Bans")->body
$page->find_block("Edit IP Bans")->body ?? ""
);
}

2
ext/link_image/theme.php
View file

@ -61,7 +61,7 @@ class LinkImageTheme extends Themelet
));
}
protected function url(string $url, string $content, string $type): string
protected function url(string $url, ?string $content, string $type): string
{
if (empty($content)) {
$content = $url;

3
ext/log_db/main.php
View file

@ -200,8 +200,11 @@ class MessageColumn extends Column
protected function scan_entities(string $line): string
{
$line = preg_replace_callback("/Image #(\d+)/s", [$this, "link_image"], $line);
assert(is_string($line));
$line = preg_replace_callback("/Post #(\d+)/s", [$this, "link_image"], $line);
assert(is_string($line));
$line = preg_replace_callback("/>>(\d+)/s", [$this, "link_image"], $line);
assert(is_string($line));
return $line;
}

40
ext/ouroboros_api/main.php
View file

@ -201,7 +201,6 @@ class _SafeOuroborosTag
class OuroborosAPI extends Extension
{
private ?PageRequestEvent $event;
private ?string $type;
public const HEADER_HTTP_200 = 'OK';
@ -246,7 +245,6 @@ class OuroborosAPI extends Extension
global $page, $user;
if (preg_match("%\.(xml|json)$%", implode('/', $event->args), $matches) === 1) {
$this->event = $event;
$this->type = $matches[1];
if ($this->type == 'json') {
$page->set_mime('application/json; charset=utf-8');
@ -257,7 +255,7 @@ class OuroborosAPI extends Extension
$this->tryAuth();
if ($event->page_matches('post')) {
if ($this->match('create')) {
if ($this->match($event, 'create')) {
// Create
if ($user->can(Permissions::CREATE_IMAGE)) {
$md5 = !empty($_REQUEST['md5']) ? filter_var_ex($_REQUEST['md5'], FILTER_SANITIZE_STRING) : null;
@ -265,13 +263,13 @@ class OuroborosAPI extends Extension
} else {
$this->sendResponse(403, 'You cannot create new posts');
}
} elseif ($this->match('update')) {
} elseif ($this->match($event, 'update')) {
throw new ServerError("update not implemented");
} elseif ($this->match('show')) {
} elseif ($this->match($event, 'show')) {
// Show
$id = !empty($_REQUEST['id']) ? (int)filter_var_ex($_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT) : null;
$this->postShow($id);
} elseif ($this->match('index') || $this->match('list')) {
} elseif ($this->match($event, 'index') || $this->match($event, 'list')) {
// List
$limit = !empty($_REQUEST['limit']) ? intval(
filter_var_ex($_REQUEST['limit'], FILTER_SANITIZE_NUMBER_INT)
@ -286,7 +284,7 @@ class OuroborosAPI extends Extension
$this->postIndex($limit, $p, $tags);
}
} elseif ($event->page_matches('tag')) {
if ($this->match('index') || $this->match('list')) {
if ($this->match($event, 'index') || $this->match($event, 'list')) {
$limit = !empty($_REQUEST['limit']) ? intval(
filter_var_ex($_REQUEST['limit'], FILTER_SANITIZE_NUMBER_INT)
) : 50;
@ -297,18 +295,12 @@ class OuroborosAPI extends Extension
$_REQUEST['order'],
FILTER_SANITIZE_STRING
) : 'date';
$id = !empty($_REQUEST['id']) ? intval(
filter_var_ex($_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT)
) : null;
$after_id = !empty($_REQUEST['after_id']) ? intval(
filter_var_ex($_REQUEST['after_id'], FILTER_SANITIZE_NUMBER_INT)
) : null;
$name = !empty($_REQUEST['name']) ? filter_var_ex($_REQUEST['name'], FILTER_SANITIZE_STRING) : '';
$name_pattern = !empty($_REQUEST['name_pattern']) ? filter_var_ex(
$_REQUEST['name_pattern'],
FILTER_SANITIZE_STRING
) : '';
$this->tagIndex($limit, $p, $order, $id, $after_id, $name, $name_pattern);
$this->tagIndex($limit, $p, $order, $name, $name_pattern);
}
}
} elseif ($event->page_matches('post/show')) {
@ -337,17 +329,18 @@ class OuroborosAPI extends Extension
return;
}
}
/** @var array<string, string> $meta */
$meta = [];
$meta['tags'] = $post->tags;
$meta['source'] = $post->source;
$meta['source'] = $post->source ?? '';
if (Extension::is_enabled(RatingsInfo::KEY) !== false) {
$meta['rating'] = $post->rating;
}
// Check where we should try for the file
if (empty($post->file) && !empty($post->file_url) && filter_var_ex(
$post->file_url,
FILTER_VALIDATE_URL
) !== false
if (
empty($post->file) &&
!empty($post->file_url) &&
filter_var_ex($post->file_url, FILTER_VALIDATE_URL) !== false
) {
// Transload from source
$meta['file'] = shm_tempnam('transload_' . $config->get_string(UploadConfig::TRANSLOAD_ENGINE));
@ -361,6 +354,7 @@ class OuroborosAPI extends Extension
$meta['hash'] = \Safe\md5_file($meta['file']);
} else {
// Use file
assert(!is_null($post->file));
$meta['file'] = $post->file['tmp_name'];
$meta['filename'] = $post->file['name'];
$meta['hash'] = \Safe\md5_file($meta['file']);
@ -379,7 +373,7 @@ class OuroborosAPI extends Extension
send_event(new TagSetEvent($img, $merged));
// This is really the only thing besides tags we should care
if (isset($meta['source'])) {
if (!empty($meta['source'])) {
send_event(new SourceSetEvent($img, $meta['source']));
}
$this->sendResponse(200, self::OK_POST_CREATE_UPDATE . ' ID: ' . $img->id);
@ -437,7 +431,7 @@ class OuroborosAPI extends Extension
* Tag
*/
protected function tagIndex(int $limit, int $page, string $order, int $id, int $after_id, string $name, string $name_pattern): void
protected function tagIndex(int $limit, int $page, string $order, string $name, string $name_pattern): void
{
global $database, $config;
$start = ($page - 1) * $limit;
@ -624,8 +618,8 @@ class OuroborosAPI extends Extension
/**
* Helper for matching API methods from event
*/
private function match(string $page): bool
private function match(PageRequestEvent $event, string $page): bool
{
return (preg_match("%{$page}\.(xml|json)$%", implode('/', $this->event->args), $matches) === 1);
return (preg_match("%{$page}\.(xml|json)$%", implode('/', $event->args), $matches) === 1);
}
}

4
ext/pools/main.php
View file

@ -304,7 +304,9 @@ class Pools extends Extension
WHERE pool_id=:pid AND i.id=:iid",
["pid" => $pool_id, "iid" => (int) $row['image_id']]
);
$images[] = ($image ? new Image($image) : null);
if ($image) {
$images[] = new Image($image);
}
}
$this->theme->edit_order($page, $pool, $images);

4
ext/pools/theme.php
View file

@ -58,7 +58,7 @@ class PoolsTheme extends Themelet
$pool_rows = [];
foreach ($pools as $pool) {
$pool_link = SHM_A("pool/view/" . $pool->id, $pool->title);
$user_link = SHM_A("user/" . url_escape($pool->user_name), $pool->user_name);
$user_link = SHM_A("user/" . url_escape($pool->user_name), $pool->user_name ?? "No Name");
$pool_rows[] = TR(
TD(["class" => "left"], $pool_link),
@ -75,7 +75,7 @@ class PoolsTheme extends Themelet
);
$order_arr = ['created' => 'Recently created', 'updated' => 'Last updated', 'name' => 'Name', 'count' => 'Post Count'];
$order_selected = $page->get_cookie('ui-order-pool');
$order_selected = $page->get_cookie('ui-order-pool') ?? "";
$order_sel = SHM_SELECT("order_pool", $order_arr, selected_options: [$order_selected], attrs: ["id" => "order_pool"]);
$this->display_top(null, "Pools");

6
ext/post_source/main.php
View file

@ -7,9 +7,9 @@ namespace Shimmie2;
class SourceSetEvent extends Event
{
public Image $image;
public ?string $source;
public string $source;
public function __construct(Image $image, string $source = null)
public function __construct(Image $image, string $source)
{
parent::__construct();
$this->image = $image;
@ -93,7 +93,7 @@ class PostSource extends Extension
public function onTagTermParse(TagTermParseEvent $event): void
{
if (preg_match("/^source[=|:](.*)$/i", $event->term, $matches)) {
$source = ($matches[1] !== "none" ? $matches[1] : null);
$source = ($matches[1] !== "none" ? $matches[1] : "");
send_event(new SourceSetEvent(Image::by_id_ex($event->image_id), $source));
}
}

6
ext/random_image/test.php
View file

@ -32,7 +32,7 @@ class RandomImageTest extends ShimmiePHPUnitTestCase
# enabled, no image = no text
$config->set_bool("show_random_block", true);
$page = $this->get_page("post/list");
$this->assertNull($page->find_block("Random Post"));
$this->assertException(\Exception::class, function () use ($page) {$page->find_block("Random Post");});
# enabled, image = text
$image_id = $this->post_image("tests/pbx_screenshot.jpg", "test");
@ -42,11 +42,11 @@ class RandomImageTest extends ShimmiePHPUnitTestCase
# disabled, image = no text
$config->set_bool("show_random_block", false);
$page = $this->get_page("post/list");
$this->assertNull($page->find_block("Random Post"));
$this->assertException(\Exception::class, function () use ($page) {$page->find_block("Random Post");});
# disabled, no image = no image
$this->delete_image($image_id);
$page = $this->get_page("post/list");
$this->assertNull($page->find_block("Random Post"));
$this->assertException(\Exception::class, function () use ($page) {$page->find_block("Random Post");});
}
}

4
ext/rating/test.php
View file

@ -68,7 +68,9 @@ class RatingsTest extends ShimmiePHPUnitTestCase
// If user prefers to see all images, going to the safe image
// and clicking next should show the explicit image
$user_config->set_array(RatingsConfig::USER_DEFAULTS, ["s", "q", "e"]);
$this->assertEquals($image_s->get_next()->id, $image_id_e);
$next = $image_s->get_next();
$this->assertNotNull($next);
$this->assertEquals($next->id, $image_id_e);
// If the user prefers to see only safe images by default, then
// going to the safe image and clicking next should not show

2
ext/ratings_blur/test.php
View file

@ -102,7 +102,7 @@ class RatingsBlurTest extends ShimmiePHPUnitTestCase
private function create_test_user(string $username): void
{
$uce = send_event(new UserCreationEvent($username, $username, $username, "$username@test.com", false));
send_event(new UserLoginEvent($uce->user));
send_event(new UserLoginEvent($uce->get_user()));
}
private function delete_test_user(string $username): void

10
ext/s3/main.php
View file

@ -63,7 +63,9 @@ class S3 extends Extension
) as $row) {
if ($row['action'] == "S") {
$image = Image::by_hash($row['hash']);
$this->sync_post($image);
if ($image) {
$this->sync_post($image);
}
} elseif ($row['action'] == "D") {
$this->remove_file($row['hash']);
}
@ -87,8 +89,10 @@ class S3 extends Extension
) as $row) {
if ($row['action'] == "S") {
$image = Image::by_hash($row['hash']);
$output->writeln("SYN {$row['hash']} ($image->id)");
$this->sync_post($image);
if ($image) {
$output->writeln("SYN {$row['hash']} ($image->id)");
$this->sync_post($image);
}
} elseif ($row['action'] == "D") {
$output->writeln("DEL {$row['hash']}");
$this->remove_file($row['hash']);

15
ext/user/events.php
View file

@ -44,7 +44,7 @@ class UserPageBuildingEvent extends PartListBuildingEvent
class UserCreationEvent extends Event
{
public ?User $user;
private ?User $user;
public function __construct(
public string $username,
@ -55,6 +55,19 @@ class UserCreationEvent extends Event
) {
parent::__construct();
}
public function set_user(User $user): void
{
$this->user = $user;
}
public function get_user(): User
{
if (is_null($this->user)) {
throw new \Exception("User not created");
}
return $this->user;
}
}
class UserLoginEvent extends Event

28
ext/user/main.php
View file

@ -113,8 +113,8 @@ class LoginResult
try {
$uce = send_event(new UserCreationEvent($username, $password1, $password2, $email, true));
return new LoginResult(
$uce->user,
$uce->user->get_session_id(),
$uce->get_user(),
$uce->get_user()->get_session_id(),
null
);
} catch (UserCreationException $ex) {
@ -196,7 +196,7 @@ class UserPage extends Extension
true
)
);
$uce->user->set_login_cookie();
$uce->get_user()->set_login_cookie();
$page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("user"));
} catch (UserCreationException $ex) {
@ -334,27 +334,27 @@ class UserPage extends Extension
{
global $user, $config;
$h_join_date = autodate($event->display_user->join_date);
if ($event->display_user->can(Permissions::HELLBANNED)) {
$h_class = $event->display_user->class->parent->name;
$duser = $event->display_user;
$h_join_date = autodate($duser->join_date);
$class = $duser->class;
if ($duser->can(Permissions::HELLBANNED) && $class->parent) {
$h_class = $class->parent->name;
} else {
$h_class = $event->display_user->class->name;
$h_class = $class->name;
}
$event->add_part("Joined: $h_join_date", 10);
if ($user->name == $event->display_user->name) {
if ($user->name == $duser->name) {
$event->add_part("Current IP: " . get_real_ip(), 80);
}
$event->add_part("Class: $h_class", 90);
$av = $event->display_user->get_avatar_html();
$av = $duser->get_avatar_html();
if ($av) {
$event->add_part($av, 0);
} elseif (
(
$config->get_string("avatar_host") == "gravatar"
) &&
($user->id == $event->display_user->id)
($config->get_string("avatar_host") == "gravatar") &&
($user->id == $duser->id)
) {
$event->add_part(
"No avatar? This gallery uses <a href='https://gravatar.com'>Gravatar</a> for avatar hosting, use the" .
@ -560,7 +560,7 @@ class UserPage extends Extension
send_event(new UserLoginEvent($new_user));
}
$event->user = $new_user;
$event->set_user($new_user);
}
public const USER_SEARCH_REGEX = "/^(?:poster|user)(!?)[=|:](.*)$/i";

1
ext/user_config/main.php
View file

@ -64,7 +64,6 @@ class UserConfig extends Extension
public static function get_for_user(int $id): Config
{
global $database;
$user = User::by_id($id);
$user_config = new DatabaseConfig($database, "user_config", "user_id", "$id");
send_event(new InitUserConfigEvent($user, $user_config));

2
ext/user_config/theme.php
View file

@ -75,7 +75,7 @@ class UserConfigTheme extends Themelet
{
$h = $block->header;
$b = $block->body;
$i = preg_replace_ex('/[^a-zA-Z0-9]/', '_', $h) . "-setup";
$i = preg_replace_ex('/[^a-zA-Z0-9]/', '_', $h ?? "") . "-setup";
$html = "
<section class='setupblock'>
<b class='shm-toggler' data-toggle-sel='#$i'>$h</b>

1
ext/word_filter/main.php
View file

@ -37,6 +37,7 @@ class WordFilter extends Extension
$search = "/\\b" . str_replace("/", "\\/", $search) . "\\b/i";
$text = preg_replace_ex($search, $replace, $text);
}
assert(is_string($text));
}
return $text;
}

2
tests/phpstan.neon
View file

@ -1,6 +1,6 @@
parameters:
errorFormat: raw
level: 7
level: 8
paths:
- ../core
- ../ext

2
themes/lite/page.class.php
View file

@ -114,7 +114,7 @@ EOD;
}
$html .= "</section>";
}
return $html;
return $html ?? "";
}
public function navlinks(Link $link, HTMLElement|string $desc, bool $active): ?string