Update PHPCS

10up · Jun 15, 2024 · a50ab99 · a50ab99
1 parent 2f3b74e
commit a50ab99
Show file tree

Hide file tree

Showing 7 changed files with 343 additions and 108 deletions.
diff --git a/10up-experience.php b/10up-experience.php
@@ -31,10 +31,10 @@
 
 require_once __DIR__ . '/includes/utils.php';
 
-add_filter('https_ssl_verify', '__return_false');
+add_filter( 'https_ssl_verify', '__return_false' );
 
 spl_autoload_register(
-	function( $class_name ) {
+	function ( $class_name ) {
 		$path_parts = explode( '\\', $class_name );
 
 		if ( ! empty( $path_parts ) ) {
@@ -87,7 +87,7 @@ function( $class_name ) {
  */
 add_action(
 	'plugins_loaded',
-	function() {
+	function () {
 		Authentication\Passwords::instance();
 		SSO\SSO::instance();
 	}

diff --git a/composer.json b/composer.json
@@ -31,8 +31,7 @@
     "bjeavons/zxcvbn-php": "^1.0"
   },
   "require-dev": {
-    "10up/phpcs-composer": "dev-master",
-    "squizlabs/php_codesniffer": "3.*"
+    "10up/phpcs-composer": "dev-trunk"
   },
   "scripts": {
     "lint": "phpcs --extensions=php --warning-severity=8 -s .",

diff --git a/composer.lock b/composer.lock
diff --git a/includes/classes/AdminCustomizations/Customizations.php b/includes/classes/AdminCustomizations/Customizations.php
@@ -160,7 +160,6 @@ public function add_about_menu( $wp_admin_bar ) {
 				)
 			);
 		}
-
 	}
 
 	/**

diff --git a/includes/classes/Authentication/Passwords.php b/includes/classes/Authentication/Passwords.php
@@ -16,6 +16,7 @@
 class Passwords {
 
 	use Singleton;
+
 	/**
 	 * Setup hooks
 	 *
@@ -312,12 +313,8 @@ public function validate_strong_password( $errors, $user_data ) {
 			// User ID specified.
 			$enforce = $this->enforce_for_user( $user_id );
 
-		} else {
-
-			// No ID yet, adding new user - omit check for "weaker" roles.
-			if ( $role && in_array( $role, apply_filters( 'tenup_experience_weak_roles', array( 'subscriber' ) ), true ) ) {
-				$enforce = false;
-			}
+		} elseif ( $role && in_array( $role, apply_filters( 'tenup_experience_weak_roles', array( 'subscriber' ) ), true ) ) {
+			$enforce = false;
 		}
 
 		// Enforce?

diff --git a/includes/classes/Authors/Authors.php b/includes/classes/Authors/Authors.php
@@ -48,7 +48,7 @@ public function maybe_disable_author_archive() {
 		// Perform partial match on domains to catch subdomains or variation of domain name
 		$filtered_domains = array_filter(
 			$whitelisted_domains,
-			function( $domain ) use ( $current_domain ) {
+			function ( $domain ) use ( $current_domain ) {
 				return false !== stripos( $current_domain, $domain );
 			}
 		);

diff --git a/includes/classes/SupportMonitor/Monitor.php b/includes/classes/SupportMonitor/Monitor.php
@@ -251,7 +251,6 @@ public function register_settings() {
 				'tenup_support_monitor'
 			);
 		}
-
 	}
 
 	/**
@@ -531,8 +530,8 @@ public function send_request( $messages ) {
 		}
 
 		$body = [
-			'message'    => wp_json_encode( $messages ),
-			'url'        => TENUP_EXPERIENCE_IS_NETWORK ? network_home_url() : home_url(),
+			'message' => wp_json_encode( $messages ),
+			'url'     => TENUP_EXPERIENCE_IS_NETWORK ? network_home_url() : home_url(),
 		];
 
 		$request_message = [
@@ -556,7 +555,6 @@ public function send_request( $messages ) {
 			$messages,
 			wp_remote_retrieve_response_code( $response )
 		);
-
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -160,7 +160,6 @@ public function add_about_menu( $wp_admin_bar ) { @@
     				)
     			);
     		}
     	}
     	/**
@@ Expand Down @@