Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Phpstan Level6 for View.php #5269

Merged
merged 14 commits into from
Apr 7, 2023
Merged

Phpstan Level6 for View.php #5269

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4499b3d
Remarque's from Alkarex
Apr 6, 2023
ab46a28
indentation
Apr 6, 2023
54a11e1
indentation
Apr 6, 2023
a37df52
Apply suggestions from code review
ColonelMoutarde Apr 6, 2023
2d493ed
Remarque's from Alkarex
Apr 6, 2023
c0ec012
A few improvements
Alkarex Apr 6, 2023
a1b614f
Remarque's from Alkarex
Apr 6, 2023
ef27d7d
Merge remote-tracking branch 'origin/feature/phpstan-view-file' into …
Apr 6, 2023
79e3434
Remarque's from Alkarex
Apr 6, 2023
c4a0350
Remarque's from Alkarex
Apr 6, 2023
0466f0c
Remarque's from Alkarex
Apr 6, 2023
5fce2aa
Fixes and improvments
Alkarex Apr 6, 2023
0565372
Merge branch 'edge' into pr/ColonelMoutarde/5269
Alkarex Apr 6, 2023
f7ffe59
Fix getTagsForEntry
Alkarex Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/Models/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Main views
/** @var callable */
public $callbackBeforeEntries;
/** @var callable */
/** @var callable|null */
public $callbackBeforeFeeds;
/** @var callable */
public $callbackBeforePagination;
Expand All @@ -25,7 +25,7 @@
public $feeds;
/** @var int */
public $nbUnreadTags;
/** @var array<string, array<int, mixed>> */
/** @var array<string, array<int, mixed>>|array<FreshRSS_Tag> */
public $tags;
/** @var array<string,string> */
public $notification;
Expand All @@ -45,15 +45,15 @@
public $signalError;

// Manage users
/** @var array<string> */
/** @var array<string|float|int> */
public $details;
/** @var bool */
public $disable_aside;
/** @var bool */
public $show_email_field;
/** @var string */
public $username;
/** @var array<string> */
/** @var array<array{'last_user_activity':int, 'language':string,'enabled':bool,'is_admin':bool, 'enabled':bool, 'article_count':int, 'database_size':int, 'last_user_activity', 'mail_login':string, 'feed_count':int, 'is_default':bool}> */
public $users;

// Updates
Expand All @@ -77,8 +77,8 @@
public $size_user;

// Display
/** @var string */
/** @var array */
public $themes;

Check failure on line 81 in app/Models/View.php

View workflow job for this annotation

GitHub Actions / tests 

Property FreshRSS_View::$themes type has no value type specified in iterable type array.

// Shortcuts
/** @var array<string> */
Expand All @@ -91,7 +91,7 @@
public $query;

// Export / Import
/** @var array<string,array<string,string>> */
/** @var string */
public $content;
/** @var array<string> */
public $entryIdsTagNames;
Expand Down Expand Up @@ -197,11 +197,11 @@
public $last30DaysLabels;
/** @var array<string,string> */
public $months;
/** @var array<string, array<string, int>> */
/** @var array<string, array<string, int>>|array<string, int> */
public $repartition;
/** @var array<int,int> */
public $repartitionDayOfWeek;
/** @var array<string, int> */
/** @var array<string, int>|array<int, int> */
public $repartitionHour;
/** @var array<int,int> */
public $repartitionMonth;
Expand Down
4 changes: 2 additions & 2 deletions app/views/index/logs.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
?>

<?php if (!empty($items)) { ?>
<?php $this->logsPaginator->render('logs_pagination.phtml', 'page'); ?>
<?php $this->logsPaginator->render('logs_pagination.phtml', 0); ?>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was wrong, breaking the pagination. Fixed in #5403

<div id="loglist-wrapper" class="table-wrapper">
<table id="loglist">
<thead>
Expand All @@ -41,7 +41,7 @@
</tbody>
</table>
</div>
<?php $this->logsPaginator->render('logs_pagination.phtml', 'page'); ?>
<?php $this->logsPaginator->render('logs_pagination.phtml', 0); ?>



Expand Down