Skip to content

Commit 095cbba

Browse files
committed
Upgrade coding standards
1 parent bc81d5b commit 095cbba

File tree

4 files changed

+54
-76
lines changed

4 files changed

+54
-76
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"require-dev": {
3535
"10up/wp_mock": "^0.4.2",
3636
"codeception/base": "^3.1",
37-
"itinerisltd/itineris-wp-coding-standards": "^0.2.3",
37+
"itinerisltd/itineris-wp-coding-standards": "^0.3.0",
3838
"roave/security-advisories": "dev-master"
3939
},
4040
"suggest": {

composer.lock

+20-64
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpcs.xml

+27-6
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,44 @@
44
<exclude-pattern>/tests/*</exclude-pattern>
55
<exclude-pattern>/vendor/*</exclude-pattern>
66

7-
<arg value="s"/>
8-
<config name="installed_paths" value="vendor/wp-coding-standards/wpcs,vendor/automattic/vipwpcs,vendor/itinerisltd/itineris-wp-coding-standards"/>
9-
<config name="minimum_supported_wp_version" value="4.9"/>
7+
<!-- Show colors in console -->
8+
<arg value="-colors"/>
9+
10+
<!-- Show progress and sniff codes in all reports; Show progress of the run -->
11+
<arg value="sp"/>
12+
13+
<!-- Scan only PHP files -->
14+
<arg name="extensions" value="php"/>
15+
16+
<!-- Install custom rulesets -->
17+
<config name="installed_paths" value="vendor/wp-coding-standards/wpcs,vendor/itinerisltd/itineris-wp-coding-standards"/>
18+
19+
<config name="minimum_supported_wp_version" value="5.2"/>
20+
21+
<rule ref="Itineris"/>
1022

1123
<rule ref="WordPress.WP.I18n">
1224
<properties>
1325
<property name="text_domain" type="array" value="image-optimize-command"/>
1426
</properties>
1527
</rule>
1628

17-
<!-- Use Itineris WP Coding Standards -->
18-
<rule ref="Itineris"/>
19-
2029
<rule ref="Squiz.Commenting.FunctionComment.MissingParamTag">
2130
<exclude-pattern>/src/*Command.php</exclude-pattern>
2231
</rule>
2332

33+
<rule ref="WordPress.NamingConventions.ValidVariableName.PropertyNotSnakeCase">
34+
<exclude-pattern>/src/*.php</exclude-pattern>
35+
</rule>
36+
37+
<rule ref="WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase">
38+
<exclude-pattern>/src/*.php</exclude-pattern>
39+
</rule>
40+
41+
<rule ref="WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase">
42+
<exclude-pattern>/src/*.php</exclude-pattern>
43+
</rule>
44+
2445
<rule ref="WordPress.WhiteSpace.ControlStructureSpacing">
2546
<!--This is because this rule gives internal error Undefined index: parenthesis_owner-->
2647
<exclude-pattern>/src/Repositories/AttachmentRepository.php</exclude-pattern>

src/Repositories/AttachmentRepository.php

+6-5
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ public function takeNonOptimized(int $num): array
2727
'post_status' => 'any',
2828
'fields' => 'ids',
2929
'posts_per_page' => $num,
30-
'meta_query' =>
30+
'meta_query' => // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
3131
[
3232
[
3333
'key' => static::OPTIMIZED_META_KEY,
3434
'compare' => 'NOT EXISTS',
3535
],
3636
],
3737
]
38-
); // WPCS: slow query ok.
38+
);
3939

4040
return $query->posts;
4141
}
@@ -56,15 +56,15 @@ public function takeOptimized(int $num): array
5656
'post_status' => 'any',
5757
'fields' => 'ids',
5858
'posts_per_page' => $num,
59-
'meta_query' =>
59+
'meta_query' => // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
6060
[
6161
[
6262
'key' => static::OPTIMIZED_META_KEY,
6363
'compare' => 'EXISTS',
6464
],
6565
],
6666
]
67-
); // WPCS: slow query ok.
67+
);
6868

6969
return $query->posts;
7070
}
@@ -108,12 +108,13 @@ public function markAllAsUnoptimized(): void
108108
{
109109
global $wpdb;
110110

111+
// phpcs:ignore WordPress.DB.DirectDatabaseQuery
111112
$wpdb->query(
112113
$wpdb->prepare(
113114
"DELETE FROM $wpdb->postmeta WHERE meta_key = %s;",
114115
static::OPTIMIZED_META_KEY
115116
)
116-
); // WPCS: cache ok, db call ok.
117+
);
117118
}
118119

119120
/**

0 commit comments

Comments
 (0)