diff --git a/classes/controllers/FrmAddonsController.php b/classes/controllers/FrmAddonsController.php index ef6354639b..ea9964ce74 100644 --- a/classes/controllers/FrmAddonsController.php +++ b/classes/controllers/FrmAddonsController.php @@ -1339,12 +1339,7 @@ public static function can_install_addon_api() { // Verify auth. $auth = get_option( 'frm_connect_token' ); - - if ( empty( $auth ) || ! hash_equals( $auth, $post_auth ) ) { - return false; - } - - return true; + return ! empty( $auth ) && hash_equals( $auth, $post_auth ); } /** diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php index 5a2cfed69b..7e7c650341 100644 --- a/classes/controllers/FrmAppController.php +++ b/classes/controllers/FrmAppController.php @@ -1443,12 +1443,7 @@ private static function in_our_pages() { if ( ! empty( $current_screen->post_type ) && 'frm_logs' === $current_screen->post_type ) { return true; } - - if ( in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && 'frm_application' === FrmAppHelper::simple_get( 'taxonomy' ) ) { - return true; - } - - return false; + return in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && 'frm_application' === FrmAppHelper::simple_get( 'taxonomy' ); } /** diff --git a/classes/controllers/FrmDashboardController.php b/classes/controllers/FrmDashboardController.php index 4e7d11eedd..0c7fd097a6 100644 --- a/classes/controllers/FrmDashboardController.php +++ b/classes/controllers/FrmDashboardController.php @@ -297,11 +297,7 @@ private static function view_args_entries_placeholder( $forms_count ) { * @return array */ public static function display_counter_cta( $counter_type, $counter_value, $latest_available_form = false ) { - if ( $counter_value > 0 || ( 'entries' === $counter_type && false === $latest_available_form ) ) { - return false; - } - - return true; + return $counter_value <= 0 && ! ( 'entries' === $counter_type && false === $latest_available_form ); } /** @@ -369,11 +365,7 @@ public static function entries_columns( $columns = array() ) { public static function welcome_banner_has_closed() { $user_id = get_current_user_id(); $banner_closed_by_users = self::get_closed_welcome_banner_user_ids(); - - if ( ! empty( $banner_closed_by_users ) && in_array( $user_id, $banner_closed_by_users, true ) ) { - return true; - } - return false; + return ! empty( $banner_closed_by_users ) && in_array( $user_id, $banner_closed_by_users, true ); } /** diff --git a/classes/helpers/FrmApiHelper.php b/classes/helpers/FrmApiHelper.php index e5cfdf292a..43f6737b90 100644 --- a/classes/helpers/FrmApiHelper.php +++ b/classes/helpers/FrmApiHelper.php @@ -39,11 +39,7 @@ public static function is_for_user( $item ) { if ( in_array( 'free_not_first_30', $who, true ) && self::is_free_not_first_30() ) { return true; } - - if ( self::check_free_segments( $who ) ) { - return true; - } - return false; + return self::check_free_segments( $who ); } /** diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php index 695faf4fb6..7d1576e477 100644 --- a/classes/helpers/FrmAppHelper.php +++ b/classes/helpers/FrmAppHelper.php @@ -4812,13 +4812,8 @@ public static function validate_url_is_in_s3_bucket( $url, $expected_extension ) $path = $parsed['path']; $ext = pathinfo( $path, PATHINFO_EXTENSION ); - - if ( $expected_extension !== $ext ) { - // The URL isn't to an XML file. - return false; - } - - return true; + // The URL isn't to an XML file. + return $expected_extension === $ext; } /** diff --git a/classes/helpers/FrmFormMigratorsHelper.php b/classes/helpers/FrmFormMigratorsHelper.php index b5cbe9b20c..daf400a9ae 100644 --- a/classes/helpers/FrmFormMigratorsHelper.php +++ b/classes/helpers/FrmFormMigratorsHelper.php @@ -15,12 +15,7 @@ private static function is_dismissed( $form, $dismissed = null ) { if ( $dismissed === null ) { $dismissed = get_option( 'frm_dismissed' ); } - - if ( ! empty( $dismissed ) && in_array( $form['class'], $dismissed ) ) { - return true; - } - - return false; + return ! empty( $dismissed ) && in_array( $form['class'], $dismissed ); } /** diff --git a/classes/helpers/FrmFormsHelper.php b/classes/helpers/FrmFormsHelper.php index 4e5e7dabb6..2c230e3c50 100644 --- a/classes/helpers/FrmFormsHelper.php +++ b/classes/helpers/FrmFormsHelper.php @@ -2118,12 +2118,7 @@ private static function is_gutenberg_editor() { } global $pagenow; - - if ( 'post.php' === $pagenow ) { - return true; - } - - return false; + return 'post.php' === $pagenow; } /** diff --git a/classes/models/FrmApplicationTemplate.php b/classes/models/FrmApplicationTemplate.php index b1abd9d993..8cb97ad48c 100644 --- a/classes/models/FrmApplicationTemplate.php +++ b/classes/models/FrmApplicationTemplate.php @@ -263,12 +263,7 @@ private function is_available_for_purchase() { 'license_type' => $license_type, 'plan_required' => $this->get_required_license(), ); - - if ( ! FrmFormsHelper::plan_is_allowed( $args ) ) { - return false; - } - - return true; + return FrmFormsHelper::plan_is_allowed( $args ); } /** diff --git a/classes/models/FrmEmail.php b/classes/models/FrmEmail.php index 4706084801..f5a5e3769f 100644 --- a/classes/models/FrmEmail.php +++ b/classes/models/FrmEmail.php @@ -516,10 +516,7 @@ public function should_send() { * @return bool */ private function has_recipients() { - if ( empty( $this->to ) && empty( $this->cc ) && empty( $this->bcc ) ) { - return false; - } - return true; + return ! ( empty( $this->to ) && empty( $this->cc ) && empty( $this->bcc ) ); } /** diff --git a/classes/models/FrmEntry.php b/classes/models/FrmEntry.php index b56077202c..309dbb0118 100644 --- a/classes/models/FrmEntry.php +++ b/classes/models/FrmEntry.php @@ -265,11 +265,7 @@ private static function is_duplicate_check_needed( $values, $duplicate_entry_tim } // If repeating field entries are getting created, don't check for duplicates - if ( isset( $values['parent_form_id'] ) && $values['parent_form_id'] ) { - return false; - } - - return true; + return empty( $values['parent_form_id'] ); } /** diff --git a/classes/models/FrmStyle.php b/classes/models/FrmStyle.php index 4705c417a4..d9e5e1c79a 100644 --- a/classes/models/FrmStyle.php +++ b/classes/models/FrmStyle.php @@ -368,12 +368,7 @@ private function should_remove_every_brace( $setting ) { // Matches size values but also checks for unexpected ( and ). // This is case insensitive so it will catch PX, PT, etc, as well. $looks_like_a_size = preg_match( '/\(?[+-]?\d*\.?\d+(?:px|%|em|rem|ex|pt|pc|mm|cm|in)\)?/i', $setting ); - - if ( $looks_like_a_size ) { - return true; - } - - return false; + return (bool) $looks_like_a_size; } /** diff --git a/classes/models/fields/FrmFieldType.php b/classes/models/fields/FrmFieldType.php index 97e3ac05cc..7cb76b6903 100644 --- a/classes/models/fields/FrmFieldType.php +++ b/classes/models/fields/FrmFieldType.php @@ -1782,11 +1782,7 @@ protected function should_strip_most_html( $entry ) { if ( ! empty( $entry->updated_by ) && $this->user_id_is_privileged( $entry->updated_by ) ) { return false; } - - if ( ! empty( $entry->user_id ) && $this->user_id_is_privileged( $entry->user_id ) ) { - return false; - } - return true; + return empty( $entry->user_id ) || ! $this->user_id_is_privileged( $entry->user_id ); } /** diff --git a/classes/views/styles/components/FrmStyleComponent.php b/classes/views/styles/components/FrmStyleComponent.php index 06c4fd5dd5..6b174dda99 100644 --- a/classes/views/styles/components/FrmStyleComponent.php +++ b/classes/views/styles/components/FrmStyleComponent.php @@ -231,12 +231,7 @@ protected function hide_component() { if ( empty( $this->data['not_show_in'] ) ) { return false; } - - if ( FrmAppHelper::get_param( 'section', '', 'get', 'sanitize_text_field' ) === $this->data['not_show_in'] ) { - return true; - } - - return false; + return FrmAppHelper::get_param( 'section', '', 'get', 'sanitize_text_field' ) === $this->data['not_show_in']; } /** diff --git a/rector.php b/rector.php index fc465e1465..d070d6b638 100644 --- a/rector.php +++ b/rector.php @@ -11,7 +11,6 @@ use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector; use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector; -use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector; use Rector\CodeQuality\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector; use Rector\CodeQuality\Rector\Concat\JoinStringConcatRector; use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector; @@ -84,7 +83,6 @@ SimplifyEmptyCheckOnEmptyArrayRector::class, CountArrayToEmptyArrayComparisonRector::class, DisallowedEmptyRuleFixerRector::class, - SimplifyIfReturnBoolRector::class, LocallyCalledStaticMethodToNonStaticRector::class, // This changes \t to an actual tab character. We don't want this rule. JoinStringConcatRector::class, diff --git a/stripe/models/FrmStrpLiteAuth.php b/stripe/models/FrmStrpLiteAuth.php index 7bfe80f19a..b03ee87490 100644 --- a/stripe/models/FrmStrpLiteAuth.php +++ b/stripe/models/FrmStrpLiteAuth.php @@ -656,12 +656,7 @@ private static function statement_descriptor_is_valid( &$name ) { if ( strlen( $name ) > 22 ) { $name = substr( $name, 0, 22 ); } - - if ( ! preg_match( '/^[a-zA-Z0-9\s\p{P}]+$/', $name ) ) { - return false; - } - - return true; + return (bool) preg_match( '/^[a-zA-Z0-9\s\p{P}]+$/', $name ); } /** @@ -865,12 +860,7 @@ public static function payment_failed( $payment, $intent ) { if ( self::intent_has_failed_status( $intent ) ) { return true; } - // The $intent will be "succeeded" with a failed payment when testing with the 4000000000000341 credit card. - if ( 'payment_failed' === FrmAppHelper::simple_get( 'frm_link_error' ) && 'failed' === $payment->status ) { - return true; - } - - return false; + return 'payment_failed' === FrmAppHelper::simple_get( 'frm_link_error' ) && 'failed' === $payment->status; } }