From f53196f85980cd37b7a430fe924331fb3bdfed08 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Tue, 6 Jan 2026 13:48:24 -0400 Subject: [PATCH 1/2] Stop ignoring SimplifyEmptyArrayCheckRector --- classes/helpers/FrmAppHelper.php | 2 +- classes/models/FrmEntryMeta.php | 2 +- rector.php | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php index 6141dfae36..36817a98bb 100644 --- a/classes/helpers/FrmAppHelper.php +++ b/classes/helpers/FrmAppHelper.php @@ -605,7 +605,7 @@ public static function is_admin() { * @return bool */ public static function is_empty_value( $value, $empty = '' ) { - return ( is_array( $value ) && empty( $value ) ) || $value === $empty; + return $value === array() || $value === $empty; } /** diff --git a/classes/models/FrmEntryMeta.php b/classes/models/FrmEntryMeta.php index f2096a02b0..b970cc1852 100644 --- a/classes/models/FrmEntryMeta.php +++ b/classes/models/FrmEntryMeta.php @@ -156,7 +156,7 @@ public static function update_entry_metas( $entry_id, $values ) { if ( $previous_field_ids && in_array( $field_id, $previous_field_ids ) ) { - if ( ( is_array( $meta_value ) && empty( $meta_value ) ) || ( ! is_array( $meta_value ) && trim( $meta_value ) === '' ) ) { + if ( ( $meta_value === array() ) || ( ! is_array( $meta_value ) && trim( $meta_value ) === '' ) ) { // Remove blank fields. unset( $values_indexed_by_field_id[ $field_id ] ); } else { diff --git a/rector.php b/rector.php index 47c61ed75f..c5f964dd69 100644 --- a/rector.php +++ b/rector.php @@ -4,7 +4,6 @@ // CodeQuality use Rector\CodeQuality\Rector\Assign\CombinedAssignRector; -use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector; use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector; use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector; use Rector\CodeQuality\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector; @@ -149,8 +148,6 @@ JoinStringConcatRector::class, LocallyCalledStaticMethodToNonStaticRector::class, ShortenElseIfRector::class, - // This changes if is_array() && empty() to if === []. - SimplifyEmptyArrayCheckRector::class, SimplifyEmptyCheckOnEmptyArrayRector::class, SimplifyRegexPatternRector::class, SingleInArrayToCompareRector::class, From 16fbb8745b08e3dfc44f575e78b245bef7248d3e Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Tue, 6 Jan 2026 13:49:33 -0400 Subject: [PATCH 2/2] Drop redundant braces --- classes/models/FrmEntryMeta.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/models/FrmEntryMeta.php b/classes/models/FrmEntryMeta.php index b970cc1852..be9e4495eb 100644 --- a/classes/models/FrmEntryMeta.php +++ b/classes/models/FrmEntryMeta.php @@ -156,7 +156,7 @@ public static function update_entry_metas( $entry_id, $values ) { if ( $previous_field_ids && in_array( $field_id, $previous_field_ids ) ) { - if ( ( $meta_value === array() ) || ( ! is_array( $meta_value ) && trim( $meta_value ) === '' ) ) { + if ( $meta_value === array() || ( ! is_array( $meta_value ) && trim( $meta_value ) === '' ) ) { // Remove blank fields. unset( $values_indexed_by_field_id[ $field_id ] ); } else {