update PHPCS ruleset and re-enable warnings
This commit is contained in:
parent
84cf79fd04
commit
3f5990f1f3
@ -134,10 +134,12 @@ class RoboFile extends Tasks {
|
||||
*/
|
||||
private function bundle() {
|
||||
$this->say( 'Bundling resources...' );
|
||||
$this->taskCopyDir( [
|
||||
$this->taskCopyDir(
|
||||
[
|
||||
'inc' => $this->target_dir . '/' . $this->final_name . '/inc',
|
||||
'views' => $this->target_dir . '/' . $this->final_name . '/views',
|
||||
] )->run();
|
||||
]
|
||||
)->run();
|
||||
$this->_copy( 'statify-blacklist.php', $this->target_dir . '/' . $this->final_name . '/statify-blacklist.php' );
|
||||
$this->_copy( 'LICENSE.md', $this->target_dir . '/' . $this->final_name . '/LICENSE.md' );
|
||||
$this->_copy( 'README.md', $this->target_dir . '/' . $this->final_name . '/README.md' );
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
"type": "wordpress-plugin",
|
||||
"require": {
|
||||
"php": ">=5.5",
|
||||
"composer/installers": "~1.0"
|
||||
"composer/installers": "~1.7"
|
||||
},
|
||||
"require-dev": {
|
||||
"dealerdirect/phpcodesniffer-composer-installer": "^0.5",
|
||||
@ -27,8 +27,8 @@
|
||||
"phpunit/phpunit": "*",
|
||||
"phpunit/php-code-coverage": "*",
|
||||
"slowprog/composer-copy-file": "~0.2",
|
||||
"squizlabs/php_codesniffer": "^3.4",
|
||||
"phpcompatibility/php-compatibility": "^9.2",
|
||||
"squizlabs/php_codesniffer": "^3.5",
|
||||
"phpcompatibility/php-compatibility": "^9.3",
|
||||
"wp-coding-standards/wpcs": "^2.1"
|
||||
},
|
||||
"scripts": {
|
||||
|
||||
@ -354,6 +354,8 @@ class StatifyBlacklist_Admin extends StatifyBlacklist {
|
||||
array_flip( $expressions ),
|
||||
function ( $re ) {
|
||||
// Check of preg_match() fails (warnings suppressed).
|
||||
|
||||
// phpcs:disable WordPress.PHP.NoSilencedErrors.Discouraged
|
||||
return false === @preg_match( StatifyBlacklist::regex( $re, false ), null );
|
||||
}
|
||||
);
|
||||
|
||||
10
phpcs.xml
10
phpcs.xml
@ -2,7 +2,7 @@
|
||||
<ruleset name="StatifyBlacklist">
|
||||
<description>Derived from WordPress Coding Standard</description>
|
||||
|
||||
<arg value="psvn"/>
|
||||
<arg value="psv"/>
|
||||
<arg name="colors"/>
|
||||
|
||||
<!-- Files to sniff -->
|
||||
@ -13,13 +13,9 @@
|
||||
<!-- Compliance with WordPress Coding Standard -->
|
||||
<config name="minimum_supported_wp_version" value="4.7"/>
|
||||
<rule ref="WordPress">
|
||||
<!-- The plugin uses switch_to_blog for multisite handling. -->
|
||||
<exclude name="WordPress.VIP.RestrictedFunctions.switch_to_blog"/>
|
||||
<exclude name="WordPress.VIP.RestrictedFunctions.switch_to_blog_switch_to_blog"/>
|
||||
|
||||
<!-- Direct queries used to clean up statify table. -->
|
||||
<exclude name="WordPress.VIP.DirectDatabaseQuery.DirectQuery"/>
|
||||
<exclude name="WordPress.VIP.DirectDatabaseQuery.NoCaching"/>
|
||||
<exclude name="WordPress.DB.DirectDatabaseQuery.DirectQuery"/>
|
||||
<exclude name="WordPress.DB.DirectDatabaseQuery.NoCaching"/>
|
||||
</rule>
|
||||
|
||||
<!-- PHP compatibility level -->
|
||||
|
||||
@ -105,9 +105,11 @@ function statify_blacklist_disable() {
|
||||
if ( is_plugin_active( STATIFYBLACKLIST_BASE ) ) {
|
||||
deactivate_plugins( STATIFYBLACKLIST_BASE );
|
||||
add_action( 'admin_notices', 'statify_blacklist_disabled_notice' );
|
||||
// phpcs:disable WordPress.Security.NonceVerification.Recommended
|
||||
if ( isset( $_GET['activate'] ) ) {
|
||||
unset( $_GET['activate'] );
|
||||
}
|
||||
// phpcs:enable
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -275,59 +275,52 @@ class StatifyBlacklist_Test extends PHPUnit\Framework\TestCase {
|
||||
$this->assertTrue( invoke_static( StatifyBlacklist::class, 'cidr_match', array( '127.0.0.1', '127.0.0.1/32' ) ) );
|
||||
$this->assertFalse(
|
||||
invoke_static(
|
||||
StatifyBlacklist::class, 'cidr_match', array(
|
||||
'127.0.0.1',
|
||||
'127.0.0.1/33',
|
||||
)
|
||||
StatifyBlacklist::class,
|
||||
'cidr_match',
|
||||
array( '127.0.0.1', '127.0.0.1/33' )
|
||||
)
|
||||
);
|
||||
$this->assertFalse(
|
||||
invoke_static(
|
||||
StatifyBlacklist::class, 'cidr_match', array(
|
||||
'127.0.0.1',
|
||||
'127.0.0.1/-1',
|
||||
)
|
||||
StatifyBlacklist::class,
|
||||
'cidr_match',
|
||||
array( '127.0.0.1', '127.0.0.1/-1' )
|
||||
)
|
||||
);
|
||||
$this->assertTrue(
|
||||
invoke_static(
|
||||
StatifyBlacklist::class, 'cidr_match', array(
|
||||
'192.0.2.123',
|
||||
'192.0.2.0/24',
|
||||
)
|
||||
StatifyBlacklist::class,
|
||||
'cidr_match',
|
||||
array( '192.0.2.123', '192.0.2.0/24' )
|
||||
)
|
||||
);
|
||||
$this->assertFalse(
|
||||
invoke_static(
|
||||
StatifyBlacklist::class, 'cidr_match', array(
|
||||
'192.0.3.123',
|
||||
'192.0.2.0/24',
|
||||
)
|
||||
StatifyBlacklist::class,
|
||||
'cidr_match',
|
||||
array( '192.0.3.123', '192.0.2.0/24' )
|
||||
)
|
||||
);
|
||||
$this->assertTrue(
|
||||
invoke_static(
|
||||
StatifyBlacklist::class, 'cidr_match', array(
|
||||
'192.0.2.123',
|
||||
'192.0.2.120/29',
|
||||
)
|
||||
StatifyBlacklist::class,
|
||||
'cidr_match',
|
||||
array( '192.0.2.123', '192.0.2.120/29' )
|
||||
)
|
||||
);
|
||||
$this->assertFalse(
|
||||
invoke_static(
|
||||
StatifyBlacklist::class, 'cidr_match', array(
|
||||
'192.0.2.128',
|
||||
'192.0.2.120/29',
|
||||
)
|
||||
StatifyBlacklist::class,
|
||||
'cidr_match',
|
||||
array( '192.0.2.128', '192.0.2.120/29' )
|
||||
)
|
||||
);
|
||||
$this->assertTrue( invoke_static( StatifyBlacklist::class, 'cidr_match', array( '10.11.12.13', '10.0.0.0/8' ) ) );
|
||||
$this->assertFalse(
|
||||
invoke_static(
|
||||
StatifyBlacklist::class, 'cidr_match', array(
|
||||
'10.11.12.345',
|
||||
'10.0.0.0/8',
|
||||
)
|
||||
StatifyBlacklist::class,
|
||||
'cidr_match',
|
||||
array( '10.11.12.345', '10.0.0.0/8' )
|
||||
)
|
||||
);
|
||||
|
||||
@ -338,26 +331,23 @@ class StatifyBlacklist_Test extends PHPUnit\Framework\TestCase {
|
||||
$this->assertFalse( invoke_static( StatifyBlacklist::class, 'cidr_match', array( '::1', '::1/-1' ) ) );
|
||||
$this->assertTrue(
|
||||
invoke_static(
|
||||
StatifyBlacklist::class, 'cidr_match', array(
|
||||
'2001:db8:a0b:12f0:1:2:3:4',
|
||||
'2001:db8:a0b:12f0::1/64 ',
|
||||
)
|
||||
StatifyBlacklist::class,
|
||||
'cidr_match',
|
||||
array( '2001:db8:a0b:12f0:1:2:3:4', '2001:db8:a0b:12f0::1/64 ' )
|
||||
)
|
||||
);
|
||||
$this->assertTrue(
|
||||
invoke_static(
|
||||
StatifyBlacklist::class, 'cidr_match', array(
|
||||
'2001:db8:a0b:12f0::123:456',
|
||||
'2001:db8:a0b:12f0::1/96 ',
|
||||
)
|
||||
StatifyBlacklist::class,
|
||||
'cidr_match',
|
||||
array( '2001:db8:a0b:12f0::123:456', '2001:db8:a0b:12f0::1/96 ' )
|
||||
)
|
||||
);
|
||||
$this->assertFalse(
|
||||
invoke_static(
|
||||
StatifyBlacklist::class, 'cidr_match', array(
|
||||
'2001:db8:a0b:12f0::1:132:465',
|
||||
'2001:db8:a0b:12f0::1/96 ',
|
||||
)
|
||||
StatifyBlacklist::class,
|
||||
'cidr_match',
|
||||
array( '2001:db8:a0b:12f0::1:132:465', '2001:db8:a0b:12f0::1/96 ' )
|
||||
)
|
||||
);
|
||||
}
|
||||
@ -373,6 +363,7 @@ class StatifyBlacklist_Test extends PHPUnit\Framework\TestCase {
|
||||
$invalid = array( '12.34.56.789', '192.0.2.123/33', '192.0.2.123/-1' );
|
||||
$result = invoke_static( StatifyBlacklist_Admin::class, 'sanitize_ips', array( array_merge( $valid, $invalid ) ) );
|
||||
$this->assertNotFalse( $result );
|
||||
|
||||
/*
|
||||
* Unfortunately this is nencessary as long as we run PHP 5 tests, because "assertInternalType" is deprecated
|
||||
* as of PHPUnit 8, but "assertIsArray" has been introduces in PHPUnit 7.5 which requires PHP >= 7.1.
|
||||
@ -576,13 +567,13 @@ class StatifyBlacklist_Test extends PHPUnit\Framework\TestCase {
|
||||
'cron' => 0,
|
||||
'regexp' => StatifyBlacklist::MODE_NORMAL,
|
||||
'blacklist' => array(
|
||||
'/excluded/page/' => 0
|
||||
'/excluded/page/' => 0,
|
||||
),
|
||||
),
|
||||
'ip' => array(
|
||||
'active' => 1,
|
||||
'blacklist' => array(
|
||||
'192.0.2.123'
|
||||
'192.0.2.123',
|
||||
),
|
||||
),
|
||||
'version' => StatifyBlacklist::VERSION_MAIN,
|
||||
|
||||
@ -9,6 +9,8 @@
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
||||
// phpcs:disable WordPress.WhiteSpace.PrecisionAlignment.Found
|
||||
|
||||
// Quit.
|
||||
defined( 'ABSPATH' ) || exit;
|
||||
|
||||
@ -132,8 +134,8 @@ if ( ! empty( $_POST['statifyblacklist'] ) ) {
|
||||
} else {
|
||||
$statifyblacklist_post_success = __( 'Settings updated successfully.', 'statify-blacklist' );
|
||||
}
|
||||
} // End if().
|
||||
} // End if().
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Disable some code style rules that are impractical for textarea content:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user