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-8 for category class #5434

Merged
merged 4 commits into from
Jun 8, 2023
Merged

phpstan-8 for category class #5434

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27f82f7
phpstan-8 for category class
May 30, 2023
8db4a38
Merge branch 'edge' into feature/phpstan-for-category-class
ColonelMoutarde May 30, 2023
b046ef5
Merge branch 'edge' into feature/phpstan-for-category-class
ColonelMoutarde Jun 5, 2023
2a0cbaa
Another approach to nullable
Alkarex Jun 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
9 changes: 7 additions & 2 deletions app/Models/Category.php
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ class FreshRSS_Category extends Minz_Model {
private $nbFeeds = -1;
/** @var int */
private $nbNotRead = -1;
/** @var array<FreshRSS_Feed>|null */
/** @var array<FreshRSS_Feed> */
Copy link
Member

Choose a reason for hiding this comment

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

I am not sure this is a good solution, as we need to test for nullability below: if ($this->feeds === null)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

got to matermost ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

$feedDAO->listByCategory($this->id()); return always a array() of FreshRSS_Feed

Copy link
Member

Choose a reason for hiding this comment

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

See below, line 109: if ($this->feeds === null)

Copy link
Member

Choose a reason for hiding this comment

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

2a0cbaa

private $feeds;
/** @var bool|int */
private $hasFeedsWithError = false;
Expand Down Expand Up @@ -99,7 +99,12 @@ public function nbNotRead(): int {
return $this->nbNotRead;
}

/** @return array<FreshRSS_Feed> */
/**
* @return array<FreshRSS_Feed>
* @throws Minz_ConfigurationNamespaceException
* @throws Minz_PDOConnectionException
*/

public function feeds(): array {
if ($this->feeds === null) {
Copy link
Member

Choose a reason for hiding this comment

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

This is the line testing for null

$feedDAO = FreshRSS_Factory::createFeedDao();
Expand Down
1 change: 0 additions & 1 deletion tests/phpstan-next.txt
View file
Open in desktop
Expand Up @@ -24,7 +24,6 @@
./app/Mailers/UserMailer.php
./app/Models/Auth.php
./app/Models/BooleanSearch.php
./app/Models/Category.php
./app/Models/Context.php
./app/Models/DatabaseDAO.php
./app/Models/DatabaseDAOPGSQL.php
Expand Down