From 39dcce3eeb0ea9ac39206bc407f5ce67fac6010a Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sun, 17 Mar 2019 16:50:50 +0100 Subject: [PATCH] Harmonize helper funcitons to snake_case --- inc/class-statifyblacklist-admin.php | 10 +++++----- test/statifyblacklist-test.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/inc/class-statifyblacklist-admin.php b/inc/class-statifyblacklist-admin.php index 35f78d8..1920157 100644 --- a/inc/class-statifyblacklist-admin.php +++ b/inc/class-statifyblacklist-admin.php @@ -66,7 +66,7 @@ class StatifyBlacklist_Admin extends StatifyBlacklist { $given_referer = $options['referer']['blacklist']; if ( self::MODE_NORMAL === $options['referer']['regexp'] ) { // Sanitize URLs and remove empty inputs. - $sanitized_referer = self::sanitizeURLs( $given_referer ); + $sanitized_referer = self::sanitize_urls( $given_referer ); } elseif ( self::MODE_REGEX === $options['referer']['regexp'] || self::MODE_REGEX_CI === $options['referer']['regexp'] ) { // TODO Check regular expressions. $sanitized_referer = $given_referer; @@ -85,7 +85,7 @@ class StatifyBlacklist_Admin extends StatifyBlacklist { // Sanitize IPs and subnets and remove empty inputs. $given_ip = $options['ip']['blacklist']; - $sanitized_ip = self::sanitizeIPs( $given_ip ); + $sanitized_ip = self::sanitize_ips( $given_ip ); // Abort on errors. $errors = [ @@ -234,7 +234,7 @@ class StatifyBlacklist_Admin extends StatifyBlacklist { $referer_regexp = implode( '|', array_keys( self::$_options['referer']['blacklist'] ) ); } else { // Sanitize URLs. - $referer = self::sanitizeURLs( self::$_options['referer']['blacklist'] ); + $referer = self::sanitize_urls( self::$_options['referer']['blacklist'] ); // Build filter regexp. $referer_regexp = str_replace( '.', '\.', implode( '|', array_flip( $referer ) ) ); @@ -294,7 +294,7 @@ class StatifyBlacklist_Admin extends StatifyBlacklist { * * @return array sanitized array. */ - private static function sanitizeURLs( $urls ) { + private static function sanitize_urls( $urls ) { return array_flip( array_filter( array_map( @@ -316,7 +316,7 @@ class StatifyBlacklist_Admin extends StatifyBlacklist { * * @return array sanitized array. */ - private static function sanitizeIPs( $ips ) { + private static function sanitize_ips( $ips ) { return array_filter( $ips, function ( $ip ) { diff --git a/test/statifyblacklist-test.php b/test/statifyblacklist-test.php index e91d378..b741062 100644 --- a/test/statifyblacklist-test.php +++ b/test/statifyblacklist-test.php @@ -371,7 +371,7 @@ class StatifyBlacklist_Test extends PHPUnit\Framework\TestCase { // IPv4 tests. $valid = array( '192.0.2.123', '192.0.2.123/32', '192.0.2.0/24', '192.0.2.128/25' ); $invalid = array( '12.34.56.789', '192.0.2.123/33', '192.0.2.123/-1' ); - $result = invoke_static( StatifyBlacklist_Admin::class, 'sanitizeIPs', array( array_merge( $valid, $invalid ) ) ); + $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 @@ -398,7 +398,7 @@ class StatifyBlacklist_Test extends PHPUnit\Framework\TestCase { '2001:db8:a0b:12f0::/129', '1:2:3:4:5:6:7:8:9', ); - $result = invoke_static( StatifyBlacklist_Admin::class, 'sanitizeIPs', array( array_merge( $valid, $invalid ) ) ); + $result = invoke_static( StatifyBlacklist_Admin::class, 'sanitize_ips', array( array_merge( $valid, $invalid ) ) ); $this->assertNotFalse( $result ); if ( method_exists( $this, 'assertIsArray' ) ) { $this->assertIsArray( $result );