Skip to content

Enforce exact scope identation phpcs rules in all files that do not h… #2881

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 2 commits into from
Jan 26, 2026
Merged

Enforce exact scope identation phpcs rules in all files that do not h… #2881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
373f8e6
Enforce exact scope identation phpcs rules in all files that do not h…
Crabcyborg Jan 26, 2026
4647f27
Fix another indentation issue
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
2 changes: 1 addition & 1 deletion classes/helpers/FrmAppHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2515,7 +2515,7 @@ public static function array_flatten( $array, $keys = 'keep' ) {
if ( is_array( $value ) ) {
$return = array_merge( $return, self::array_flatten( $value, $keys ) );
} elseif ( $keys === 'keep' ) {
$return[ $key ] = $value;
$return[ $key ] = $value;
} else {
$return[] = $value;
}
Expand Down
6 changes: 3 additions & 3 deletions classes/models/FrmDb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,9 +649,9 @@ public static function prepend_and_or_where( $starts_with = ' WHERE ', $where =
if ( ! $where ) {
$where = '';
} elseif ( is_array( $where ) ) {
global $wpdb;
self::get_where_clause_and_values( $where, $starts_with );
$where = $wpdb->prepare( $where['where'], $where['values'] ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
global $wpdb;
self::get_where_clause_and_values( $where, $starts_with );
$where = $wpdb->prepare( $where['where'], $where['values'] ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
} else {
$where = $starts_with . $where;
}
Expand Down
60 changes: 59 additions & 1 deletion phpcs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,65 @@
<rule ref="Universal.Operators.StrictComparisons">
<severity>8</severity>
<type>error</type>
</rule>
</rule>

<rule ref="Generic.WhiteSpace.ScopeIndent">
<properties>
<property name="exact" value="true" />
<property name="ignoreIndentationTokens" type="array">
<element value="T_COMMENT" />
<element value="T_DOC_COMMENT_OPEN_TAG" />
</property>
</properties>
<exclude-pattern>views/*</exclude-pattern>
<!-- Most of these files include inline HTML. Ideally we would move this code to view files. -->
<exclude-pattern>helpers/FrmEntriesHelper.php</exclude-pattern>
<exclude-pattern>stripe/models/FrmTransLiteAction.php</exclude-pattern>
<exclude-pattern>classes/controllers/FrmAddonsController.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmAddonsHelper.php</exclude-pattern>
<exclude-pattern>classes/models/FrmDb.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmTipsHelper.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmOnSubmitHelper.php</exclude-pattern>
<exclude-pattern>classes/models/FrmSalesApi.php</exclude-pattern>
<exclude-pattern>stripe/controllers/FrmTransLitePaymentsController.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmStylesCardHelper.php</exclude-pattern>
<exclude-pattern>classes/controllers/FrmAppController.php</exclude-pattern>
<exclude-pattern>classes/models/FrmEntryValidate.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmEntriesListHelper.php</exclude-pattern>
<exclude-pattern>classes/controllers/FrmWelcomeTourController.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmDashboardHelper.php</exclude-pattern>
<exclude-pattern>stripe/helpers/FrmStrpLiteAppHelper.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmFormsListHelper.php</exclude-pattern>
<exclude-pattern>classes/models/FrmField.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmFormsHelper.php</exclude-pattern>
<exclude-pattern>classes/controllers/FrmSMTPController.php</exclude-pattern>
<exclude-pattern>stripe/helpers/FrmStrpLiteConnectHelper.php</exclude-pattern>
<exclude-pattern>classes/models/FrmHoneypot.php</exclude-pattern>
<exclude-pattern>stripe/helpers/FrmTransLiteAppHelper.php</exclude-pattern>
<exclude-pattern>classes/models/fields/FrmFieldType.php</exclude-pattern>
<exclude-pattern>classes/controllers/FrmStylesController.php</exclude-pattern>
<exclude-pattern>stripe/helpers/FrmTransLiteListHelper.php</exclude-pattern>
<exclude-pattern>classes/models/FrmSolution.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmFieldsHelper.php</exclude-pattern>
<exclude-pattern>classes/models/fields/FrmFieldTextarea.php</exclude-pattern>
<exclude-pattern>classes/models/FrmPluginSearch.php</exclude-pattern>
<exclude-pattern>classes/models/fields/FrmFieldPhone.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmStylesHelper.php</exclude-pattern>
<exclude-pattern>classes/models/fields/FrmFieldName.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmListHelper.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmFormTemplatesHelper.php</exclude-pattern>
<exclude-pattern>classes/models/FrmFormAction.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmHtmlHelper.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmFormMigratorsHelper.php</exclude-pattern>
<exclude-pattern>classes/controllers/FrmFormsController.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmCssScopeHelper.php</exclude-pattern>
<exclude-pattern>classes/models/FrmFormMigrator.php</exclude-pattern>
<exclude-pattern>classes/controllers/FrmFieldsController.php</exclude-pattern>
<exclude-pattern>classes/models/FrmEntryMeta.php</exclude-pattern>
<exclude-pattern>classes/helpers/FrmAppHelper.php</exclude-pattern>
<exclude-pattern>classes/widgets/FrmShowForm.php</exclude-pattern>
<exclude-pattern>square/helpers/FrmSquareLiteConnectHelper.php</exclude-pattern>
</rule>

<!-- Custom Formidable sniffs (defined in phpcs-sniffs/Formidable/ruleset.xml) -->
<rule ref="Formidable" />
Expand Down
Loading