Skip to content

Commit 485ac3b

Browse files
gziologziolo
committed
Improve code quality
1 parent 9f0cbe4 commit 485ac3b

File tree

3 files changed

+24
-27
lines changed

3 files changed

+24
-27
lines changed

‎includes/abilities-api.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
* @package WordPress
88
* @subpackage Abilities_API
99
* @since 0.1.0
10-
*
11-
* phpcs:disable WordPress.NamingConventions.PrefixAllGlobals
1210
*/
1311

1412
declare( strict_types = 1 );

‎phpcs.xml.dist‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,10 @@
193193

194194
<!-- Plugin-specific rule configs -->
195195
<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
196+
<exclude-pattern>includes/abilities-api.php</exclude-pattern>
197+
<exclude-pattern>includes/abilities-api/*</exclude-pattern>
196198
<properties>
197199
<property name="prefixes" type="array">
198-
<element value="abilities_api_" /><!-- Hook prefix -->
199-
<element value="WP_Ability" />
200-
<element value="WP_Abilities" />
201200
<element value="WP_REST_Abilities" />
202201
<element value="WP_ABILITIES_API" /><!-- Constant -->
203202
</property>

‎tests/unit/abilities-api/wpAbility.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public function test_execute_no_input() {
186186
*/
187187
public function test_before_execute_ability_action() {
188188
$action_ability_name = null;
189-
$action_input = null;
189+
$action_input = null;
190190

191191
$args = array_merge(
192192
self::$test_ability_properties,
@@ -204,13 +204,13 @@ public function test_before_execute_ability_action() {
204204

205205
$callback = static function ( $ability_name, $input ) use ( &$action_ability_name, &$action_input ) {
206206
$action_ability_name = $ability_name;
207-
$action_input = $input;
207+
$action_input = $input;
208208
};
209209

210210
add_action( 'before_execute_ability', $callback, 10, 2 );
211211

212212
$ability = new WP_Ability( self::$test_ability_name, $args );
213-
$result = $ability->execute( 5 );
213+
$result = $ability->execute( 5 );
214214

215215
remove_action( 'before_execute_ability', $callback );
216216

@@ -224,7 +224,7 @@ public function test_before_execute_ability_action() {
224224
*/
225225
public function test_before_execute_ability_action_no_input() {
226226
$action_ability_name = null;
227-
$action_input = null;
227+
$action_input = null;
228228

229229
$args = array_merge(
230230
self::$test_ability_properties,
@@ -237,13 +237,13 @@ public function test_before_execute_ability_action_no_input() {
237237

238238
$callback = static function ( $ability_name, $input ) use ( &$action_ability_name, &$action_input ) {
239239
$action_ability_name = $ability_name;
240-
$action_input = $input;
240+
$action_input = $input;
241241
};
242242

243243
add_action( 'before_execute_ability', $callback, 10, 2 );
244244

245245
$ability = new WP_Ability( self::$test_ability_name, $args );
246-
$result = $ability->execute();
246+
$result = $ability->execute();
247247

248248
remove_action( 'before_execute_ability', $callback );
249249

@@ -257,8 +257,8 @@ public function test_before_execute_ability_action_no_input() {
257257
*/
258258
public function test_after_execute_ability_action() {
259259
$action_ability_name = null;
260-
$action_input = null;
261-
$action_result = null;
260+
$action_input = null;
261+
$action_result = null;
262262

263263
$args = array_merge(
264264
self::$test_ability_properties,
@@ -276,14 +276,14 @@ public function test_after_execute_ability_action() {
276276

277277
$callback = static function ( $ability_name, $input, $result ) use ( &$action_ability_name, &$action_input, &$action_result ) {
278278
$action_ability_name = $ability_name;
279-
$action_input = $input;
280-
$action_result = $result;
279+
$action_input = $input;
280+
$action_result = $result;
281281
};
282282

283283
add_action( 'after_execute_ability', $callback, 10, 3 );
284284

285285
$ability = new WP_Ability( self::$test_ability_name, $args );
286-
$result = $ability->execute( 7 );
286+
$result = $ability->execute( 7 );
287287

288288
remove_action( 'after_execute_ability', $callback );
289289

@@ -298,8 +298,8 @@ public function test_after_execute_ability_action() {
298298
*/
299299
public function test_after_execute_ability_action_no_input() {
300300
$action_ability_name = null;
301-
$action_input = null;
302-
$action_result = null;
301+
$action_input = null;
302+
$action_result = null;
303303

304304
$args = array_merge(
305305
self::$test_ability_properties,
@@ -313,14 +313,14 @@ public function test_after_execute_ability_action_no_input() {
313313

314314
$callback = static function ( $ability_name, $input, $result ) use ( &$action_ability_name, &$action_input, &$action_result ) {
315315
$action_ability_name = $ability_name;
316-
$action_input = $input;
317-
$action_result = $result;
316+
$action_input = $input;
317+
$action_result = $result;
318318
};
319319

320320
add_action( 'after_execute_ability', $callback, 10, 3 );
321321

322322
$ability = new WP_Ability( self::$test_ability_name, $args );
323-
$result = $ability->execute();
323+
$result = $ability->execute();
324324

325325
remove_action( 'after_execute_ability', $callback );
326326

@@ -335,7 +335,7 @@ public function test_after_execute_ability_action_no_input() {
335335
*/
336336
public function test_actions_not_fired_on_permission_failure() {
337337
$before_action_fired = false;
338-
$after_action_fired = false;
338+
$after_action_fired = false;
339339

340340
$args = array_merge(
341341
self::$test_ability_properties,
@@ -361,7 +361,7 @@ public function test_actions_not_fired_on_permission_failure() {
361361
add_action( 'after_execute_ability', $after_callback );
362362

363363
$ability = new WP_Ability( self::$test_ability_name, $args );
364-
$result = $ability->execute();
364+
$result = $ability->execute();
365365

366366
remove_action( 'before_execute_ability', $before_callback );
367367
remove_action( 'after_execute_ability', $after_callback );
@@ -376,7 +376,7 @@ public function test_actions_not_fired_on_permission_failure() {
376376
*/
377377
public function test_after_action_not_fired_on_execution_error() {
378378
$before_action_fired = false;
379-
$after_action_fired = false;
379+
$after_action_fired = false;
380380

381381
$args = array_merge(
382382
self::$test_ability_properties,
@@ -399,7 +399,7 @@ public function test_after_action_not_fired_on_execution_error() {
399399
add_action( 'after_execute_ability', $after_callback );
400400

401401
$ability = new WP_Ability( self::$test_ability_name, $args );
402-
$result = $ability->execute();
402+
$result = $ability->execute();
403403

404404
remove_action( 'before_execute_ability', $before_callback );
405405
remove_action( 'after_execute_ability', $after_callback );
@@ -414,7 +414,7 @@ public function test_after_action_not_fired_on_execution_error() {
414414
*/
415415
public function test_after_action_not_fired_on_output_validation_error() {
416416
$before_action_fired = false;
417-
$after_action_fired = false;
417+
$after_action_fired = false;
418418

419419
$args = array_merge(
420420
self::$test_ability_properties,
@@ -442,7 +442,7 @@ public function test_after_action_not_fired_on_output_validation_error() {
442442
add_action( 'after_execute_ability', $after_callback );
443443

444444
$ability = new WP_Ability( self::$test_ability_name, $args );
445-
$result = $ability->execute();
445+
$result = $ability->execute();
446446

447447
remove_action( 'before_execute_ability', $before_callback );
448448
remove_action( 'after_execute_ability', $after_callback );

0 commit comments

Comments
 (0)