Skip to content

Fix phpstan in empty is not falsey errors #2878

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

Merged
Crabcyborg merged 5 commits into from
Jan 26, 2026
Merged

Fix phpstan in empty is not falsey errors #2878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c135002
Fix phpstan in empty is not falsey errors
Crabcyborg Jan 26, 2026
9de6336
Remove empty line
Crabcyborg Jan 26, 2026
9767970
Move another phpstan rule down with exceptions for only 2 files
Crabcyborg Jan 26, 2026
d04781f
Use paths
Crabcyborg Jan 26, 2026
7a5a613
Ignore possibly null reference in Psalm for now
Crabcyborg Jan 26, 2026
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
4 changes: 2 additions & 2 deletions classes/helpers/FrmFieldGridHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ class FrmFieldGridHelper {
private $is_frm_first;

/**
* @var stdClass
* @var stdClass|null
*/
private $field;

/**
* @var FrmFieldGridHelper
* @var FrmFieldGridHelper|null
*/
private $section_helper;

Expand Down
2 changes: 1 addition & 1 deletion classes/models/FrmFormState.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class FrmFormState {

/**
* @var FrmFormState
* @var FrmFormState|null
*/
private static $instance;

Expand Down
4 changes: 2 additions & 2 deletions classes/models/FrmValidate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ abstract class FrmValidate {
protected $form_id;

/**
* @var object
* @var object|null
*/
protected $form;

Expand All @@ -30,7 +30,7 @@ public function __construct( $form_id ) {
}

/**
* @return object Form.
* @return object|null Form.
*/
protected function get_form() {
if ( empty( $this->form ) ) {
Expand Down
7 changes: 5 additions & 2 deletions phpstan.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ parameters:
- '#only iterables are supported#'
- '#will always evaluate to#'
- '#in isset\(\) does not exist.#'
- '#in empty\(\) is not falsy.#'
- '#always exists and is not falsy.#'
- '#get_gateway_for_action\(\) never returns array so it can be removed from the return type#'
-
message: '#has an unused parameter#'
Expand Down Expand Up @@ -373,3 +371,8 @@ parameters:
paths:
- classes/helpers/FrmXMLHelper.php
- '#Method FrmShortcodeHelper::get_shortcode_tag\(\) should return string but returns array<string>\|string#'
-
message: '#always exists and is not falsy.#'
paths:
- classes/models/FrmAddon.php
- classes/views/frm-entries/errors.php
1 change: 1 addition & 0 deletions psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@
<file name="classes/models/FrmEntryShortcodeFormatter.php" />
<file name="classes/helpers/FrmAppHelper.php" />
<file name="classes/controllers/FrmFormActionsController.php" />
<file name="classes/models/FrmFormState.php" />
</errorLevel>
</PossiblyNullReference>
<DeprecatedMethod>
Expand Down