New rector rule PreparedValueToEarlyReturnRector

classes/controllers/FrmAppController.php

@@ -271,15 +271,14 @@ public static function get_form_nav( $form, $show_nav = false, $title = 'show' )
 	 * @return string
 	 */
 	private static function get_current_page() {
-		$page         = FrmAppHelper::simple_get( 'page', 'sanitize_title' );
-		$post_type    = FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' );
-		$current_page = isset( $_GET['page'] ) ? $page : $post_type;
+		$page      = FrmAppHelper::simple_get( 'page', 'sanitize_title' );
+		$post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' );
 
 		if ( FrmAppHelper::is_view_builder_page() ) {
-			$current_page = 'frm_display';
+			return 'frm_display';
 		}
 
-		return $current_page;
+		return isset( $_GET['page'] ) ? $page : $post_type;
 	}
 
 	/**

classes/helpers/FrmAppHelper.php

@@ -436,13 +436,12 @@ public static function is_form_builder_page( $check_for_settings = true ) {
 	 */
 	public static function is_formidable_admin() {
 		$page          = self::simple_get( 'page', 'sanitize_title' );
-		$is_formidable = strpos( $page, 'formidable' ) !== false;
 
 		if ( empty( $page ) ) {
-			$is_formidable = self::is_view_builder_page();
+			return self::is_view_builder_page();
 		}
 
-		return $is_formidable;
+		return strpos( $page, 'formidable' ) !== false;
 	}
 
 	/**
@@ -3207,13 +3206,12 @@ private static function add_time_to_date( $time_format, $date ) {
 		}
 
 		$trimmed_format = trim( $time_format );
-		$time           = '';
 
 		if ( $time_format && ! empty( $trimmed_format ) ) {
-			$time = ' ' . __( 'at', 'formidable' ) . ' ' . self::get_localized_date( $time_format, $date );
+			return ' ' . __( 'at', 'formidable' ) . ' ' . self::get_localized_date( $time_format, $date );
 		}
 
-		return $time;
+		return '';
 	}
 
 	/**

classes/helpers/FrmFieldsHelper.php

@@ -751,12 +751,10 @@ private static function hidden_field_option( $field ) {
 	 * @return string radio or checkbox
 	 */
 	private static function get_default_value_type( $field ) {
-		$default_type = $field['type'];
-
 		if ( $field['type'] === 'select' ) {
-			$default_type = FrmField::is_multiple_select( $field ) ? 'checkbox' : 'radio';
+			return FrmField::is_multiple_select( $field ) ? 'checkbox' : 'radio';
 		}
-		return $default_type;
+		return $field['type'];
 	}
 
 	/**
@@ -1126,7 +1124,7 @@ private static function trigger_shortcode_atts( $replace_with, $atts ) {
 			}
 
 			$function     = 'atts_' . $included_att;
-			$replace_with = self::$function( $replace_with, $atts );
+			$replace_with = self::$function( $replace_with );
 		}
 		return $replace_with;
 	}

classes/models/FrmAddon.php

@@ -151,13 +151,8 @@ public function insert_installed_addon( $plugins ) {
 	 */
 	public static function get_addon( $plugin_slug ) {
 		$plugins = apply_filters( 'frm_installed_addons', array() );
-		$plugin  = false;
 
-		if ( isset( $plugins[ $plugin_slug ] ) ) {
-			$plugin = $plugins[ $plugin_slug ];
-		}
-
-		return $plugin;
+		return $plugins[ $plugin_slug ] ?? false;
 	}
 
 	/**

classes/models/FrmCreateFile.php

@@ -141,13 +141,10 @@ public function combine_files( $file_names ) {
 	 * @return string
 	 */
 	public function get_file_contents() {
-		$content = '';
-
 		if ( $this->has_permission ) {
-			$content = $this->get_contents();
+			return $this->get_contents();
 		}
-
-		return $content;
+		return '';
 	}
 
 	/**

classes/models/FrmFormApi.php

@@ -369,12 +369,10 @@ protected function set_cached( $addons ) {
 	 * @return string
 	 */
 	protected function get_cache_timeout( $addons ) {
-		$timeout = $this->cache_timeout;
-
 		if ( isset( $addons['response_code'] ) && 429 === $addons['response_code'] ) {
-			$timeout = '+5 minutes';
+			return '+5 minutes';
 		}
-		return $timeout;
+		return $this->cache_timeout;
 	}
 
 	/**
@@ -397,13 +395,10 @@ public function reset_cached() {
 	 * @return array
 	 */
 	public function error_for_license() {
-		$errors = array();
-
 		if ( ! empty( $this->license ) ) {
-			$errors = $this->get_error_from_response();
+			return $this->get_error_from_response();
 		}
-
-		return $errors;
+		return array();
 	}
 
 	/**

classes/models/fields/FrmFieldType.php

@@ -120,13 +120,10 @@ public function __construct( $field = 0, $type = '' ) {
 	 * @return string
 	 */
 	public function __get( $key ) {
-		$value = '';
-
 		if ( property_exists( $this, $key ) ) {
-			$value = $this->{$key};
+			return $this->{$key};
 		}
-
-		return $value;
+		return '';
 	}
 
 	/**
@@ -433,13 +430,10 @@ protected function default_field_settings() {
 	 * @return array
 	 */
 	protected function field_settings_for_type() {
-		$settings = array();
-
 		if ( ! $this->has_input ) {
-			$settings = $this->no_input_settings();
+			return $this->no_input_settings();
 		}
-
-		return $settings;
+		return array();
 	}
 
 	/**

composer.json

@@ -35,12 +35,11 @@
 		"wp-coding-standards/wpcs": "^3.0",
 		"automattic/vipwpcs": "^3.0",
 		"squizlabs/php_codesniffer": "^3.10",
-		"phpstan/phpstan": "^1.4",
-		"phpstan/phpstan-strict-rules": "^1.5",
+		"phpstan/phpstan": "^2.1.33",
 		"phpstan/extension-installer": "^1.3",
 		"slevomat/coding-standard": "~8.0",
 		"friendsofphp/php-cs-fixer": "^3.54",
-		"rector/rector": "^1.0"
+		"rector/rector": "^2.2.14"
 	},
 	"config": {
 		"allow-plugins": {

phpstan.neon

@@ -15,12 +15,6 @@ parameters:
 		- */fonts/*
 		- */rector.php
 		- */phpcs-sniffs/*
-	strictRules:
-		disallowedLooseComparison: false
-		booleansInConditions: false
-		requireParentConstructorCall: false
-		strictCalls: false
-		noVariableVariables: false
 	ignoreErrors:
 		- '#Access to an undefined property#'
 		- '#Cannot access (offset|property)+#'
@@ -73,20 +67,6 @@ parameters:
 		-
 			message: '#Cannot use array destructuring on#'
 			path: classes/helpers/FrmStylesHelper.php
-		-
-			message: '#should be contravariant with#'
-			paths:
-				- classes/helpers/FrmFormsListHelper.php
-				- classes/models/FrmInstallerSkin.php
-		- '#Construct empty\(\) is not allowed. Use more strict comparison#'
-		-
-			message: '#Foreach overwrites \$ip with its value variable.#'
-			path: classes/helpers/FrmAppHelper.php
-		-
-			message: '#Only numeric types are allowed#'
-			paths:
-				- classes/helpers/FrmCSVExportHelper.php
-				- classes/models/FrmStyle.php
 		-
 			message: '#Call to an undefined method FrmFieldType::get_export_headings#'
 			path: classes/helpers/FrmCSVExportHelper.php
@@ -198,7 +178,6 @@ parameters:
 				- classes/helpers/FrmEntriesHelper.php
 				- classes/helpers/FrmEntriesListHelper.php
 				- classes/helpers/FrmFieldsHelper.php
-				- classes/helpers/FrmFormMigratorsHelper.php
 				- classes/helpers/FrmFormsHelper.php
 				- classes/helpers/FrmListHelper.php
 				- classes/helpers/FrmStylesHelper.php
@@ -261,33 +240,38 @@ parameters:
 				- classes/models/fields/FrmFieldUserID.php
 				- classes/views/frm-form-actions/email_action.php
 				- classes/views/styles/components/FrmSliderStyleComponent.php
-				- classes/views/styles/components/FrmStyleComponent.php
 				- square/controllers/FrmSquareLiteActionsController.php
 				- square/helpers/FrmSquareLiteConnectHelper.php
 				- square/models/FrmSquareLiteSettings.php
 				- stripe/controllers/FrmStrpLiteEventsController.php
 				- stripe/controllers/FrmTransLitePaymentsController.php
-				- stripe/controllers/FrmTransLiteSubscriptionsController.php
 				- stripe/helpers/FrmStrpLiteAppHelper.php
 				- stripe/helpers/FrmStrpLiteConnectApiAdapter.php
-				- stripe/helpers/FrmStrpLiteSubscriptionHelper.php
 				- stripe/helpers/FrmTransLiteListHelper.php
 				- stripe/models/FrmStrpLiteSettings.php
-		-
-			message: '#results in an error.#'
-			paths:
-				- classes/controllers/FrmAddonsController.php
-				- classes/controllers/FrmAppController.php
-				- classes/controllers/FrmFormsController.php
-				- classes/helpers/FrmCSVExportHelper.php
-				- classes/helpers/FrmFieldsHelper.php
-				- classes/helpers/FrmFormsHelper.php
-				- classes/helpers/FrmFormsListHelper.php
-				- classes/helpers/FrmStylesHelper.php
-				- classes/helpers/FrmXMLHelper.php
-				- classes/models/FrmFieldFormHtml.php
-				- classes/models/FrmHoneypot.php
-				- classes/models/FrmReviews.php
-				- classes/models/fields/FrmFieldType.php
-				- stripe/controllers/FrmStrpLiteAppController.php
-				- stripe/helpers/FrmStrpLiteSubscriptionHelper.php
+		- message: '#results in an error.#'
+		- message: '#Possibly invalid array key type mixed#'
+		- message: '#of encapsed string cannot be cast to string#'
+		- message: '#but returns mixed#'
+		- message: '#mixed given#'
+		- message: '#cannot be converted to string.#'
+		- message: '#Cannot access an offset on mixed#'
+		- message: '#might not exist on#'
+		- message: '#is not a file or it does not exist#'
+		- message: '#so it can be removed from the property type#'
+		- message: '#Cannot use \+\+ on mixed#'
+		- message: '#Cannot use -- on mixed#'
+		- message: '#Cannot use array destructuring on mixed#'
+		- message: '#always exists and is not nullable#'
+		- message: '#Possibly invalid array key#'
+		- message: '#should return string but returns float#'
+		- message: '#on a separate line has no effect#'
+		- message: '#but returns array#'
+		- message: '#Cannot clone non-object variable#'
+		- message: '#so it can be removed from the by-ref type#'
+		- message: '#function array_map expects#'
+		- message: '#expects resource#'
+		- message: '#might not be defined#'
+		- message: '#expects false, string given#'
+		- message: '#array given#'
+		- message: '#Cannot use \+\+ on int\|false#'