gravityview / GravityView

trustedlogin/autoload-classmap.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 // autoload-classmap.php @generated by Strauss
 
-$trustedlogin = dirname(__FILE__);
+$trustedlogin = dirname( __FILE__ );
 
 return array(
    'GravityView\Katzgrau\KLogger\Logger' => $trustedlogin . '/katzgrau/klogger/src/Logger.php',

trustedlogin/trustedlogin/client/src/SiteAccess.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 			return $response_json;
 		}
 
-		if ( empty( $response_json['success'] ) ) {
+		if ( empty( $response_json[ 'success' ] ) ) {
 			return new WP_Error( 'sync_error', __( 'Could not sync to TrustedLogin server', 'trustedlogin' ) );
 		}
 

trustedlogin/trustedlogin/client/src/Remote.php

Spacing +7 added lines, -7 removed lines

@@ -13,7 +13,7 @@ 
 namespace GravityView\TrustedLogin;
 
 // Exit if accessed directly
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
@@ -149,7 +149,7 @@ 
 		);
 
 		if ( ! empty( $data ) && ! in_array( $method, array( 'GET', 'HEAD' ), true ) ) {
-			$request_options['body'] = wp_json_encode( $data );
+			$request_options[ 'body' ] = wp_json_encode( $data );
 		}
 
 		try {
@@ -261,7 +261,7 @@ 
 				return new WP_Error( 'invalid_response', esc_html__( 'Invalid response.', 'trustedlogin' ), $api_response );
 
 			default:
-				return (int) $response_code;
+				return (int)$response_code;
 		}
 	}
 
@@ -304,20 +304,20 @@ 
 			return new WP_Error( 'invalid_response', esc_html__( 'Invalid response.', 'trustedlogin' ), $response_body );
 		}
 
-		if ( isset( $response_json['errors'] ) ) {
+		if ( isset( $response_json[ 'errors' ] ) ) {
 
 			$errors = '';
 
 			// Multi-dimensional; we flatten.
-			foreach ( $response_json['errors'] as $key => $error ) {
-				$error  = is_array( $error ) ? reset( $error ) : $error;
+			foreach ( $response_json[ 'errors' ] as $key => $error ) {
+				$error = is_array( $error ) ? reset( $error ) : $error;
 				$errors .= $error;
 			}
 
 			return new WP_Error( 'errors_in_response', esc_html( $errors ), $response_body );
 		}
 
-		foreach ( (array) $required_keys as $required_key ) {
+		foreach ( (array)$required_keys as $required_key ) {
 			if ( ! isset( $response_json[ $required_key ] ) ) {
 				return new WP_Error( 'missing_required_key', sprintf( esc_html__( 'Invalid response. Missing key: %s', 'trustedlogin' ), $required_key ), $response_body );
 			}

trustedlogin/trustedlogin/client/src/Encryption.php

Spacing +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
 namespace GravityView\TrustedLogin;
 
 // Exit if accessed directly
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
@@ -143,7 +143,7 @@ 
 		}
 
 		try {
-			$hash_bin = sodium_crypto_generichash( $string, '', (int) $length );
+			$hash_bin = sodium_crypto_generichash( $string, '', (int)$length );
 			$hash     = sodium_bin2hex( $hash_bin );
 		} catch ( \TypeError $e ) {
 			return new WP_Error(
@@ -251,14 +251,14 @@ 
 
 		if ( is_wp_error( $response_json ) ) {
 
-			if ( 'not_found' == $response_json->get_error_code() ){
+			if ( 'not_found' == $response_json->get_error_code() ) {
 				return new WP_Error( 'not_found', __( 'Encryption key could not be fetched, Vendor site returned 404.', 'trustedlogin' ) );
 			}
 
 			return $response_json;
 		}
 
-		return $response_json['publicKey'];
+		return $response_json[ 'publicKey' ];
 	}
 
 	/**
@@ -366,6 +366,6 @@ 
 			'privateKey' => sodium_crypto_box_secretkey( $aliceKeypair )
 		);
 
-		return (object) $alice_keys;
+		return (object)$alice_keys;
 	}
 }

Braces +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 
 		if ( is_wp_error( $response_json ) ) {
 
-			if ( 'not_found' == $response_json->get_error_code() ){
+			if ( 'not_found' == $response_json->get_error_code() ) {
 				return new WP_Error( 'not_found', __( 'Encryption key could not be fetched, Vendor site returned 404.', 'trustedlogin' ) );
 			}
 

trustedlogin/trustedlogin/client/src/SecurityChecks.php

Spacing +15 added lines, -15 removed lines

@@ -83,11 +83,11 @@ 
 
 		$user_identifier = $passed_user_identifier;
 
-		if ( $this->in_lockdown() ){
+		if ( $this->in_lockdown() ) {
 
 			$this->logging->log( 'Site is in lockdown mode, aborting login.', __METHOD__, 'error' );
 
-			return new WP_Error( 'in_lockdown', __( 'TrustedLogin temporarily disabled.' , 'trustedlogin') );
+			return new WP_Error( 'in_lockdown', __( 'TrustedLogin temporarily disabled.', 'trustedlogin' ) );
 		}
 
 		// When passed in the endpoint URL, the unique ID will be the raw value, not the hash.
@@ -111,7 +111,7 @@ 
 		$approved = $this->check_approved_identifier( $secret_id );
 
 		// Don't lock-down the site, since there could have been errors related to remote validation
-		if ( is_wp_error( $approved ) ){
+		if ( is_wp_error( $approved ) ) {
 
 			$this->logging->log(
 				sprintf(
@@ -152,7 +152,7 @@ 
 				'notice'
 			);
 
-			return new WP_Error( 'brute_force_detected', 'Login aborted due to potential brute force detection.');
+			return new WP_Error( 'brute_force_detected', 'Login aborted due to potential brute force detection.' );
 		}
 
 		return true;
@@ -165,12 +165,12 @@ 
 	 */
 	private function maybe_add_used_accesskey( $user_identifier = '' ) {
 
-		$used_accesskeys = (array) get_site_transient( $this->used_accesskey_transient );
+		$used_accesskeys = (array)get_site_transient( $this->used_accesskey_transient );
 
 		// This is a new access key
 		if ( ! in_array( $user_identifier, $used_accesskeys, true ) ) {
 
-			$used_accesskeys[] = $user_identifier;
+			$used_accesskeys[ ] = $user_identifier;
 
 			$transient_set = set_site_transient( $this->used_accesskey_transient, $used_accesskeys, self::ACCESSKEY_LIMIT_EXPIRY );
 
@@ -190,19 +190,19 @@ 
 	 */
 	private function get_ip() {
 
-		if ( ! isset( $_SERVER['REMOTE_ADDR'] ) ) {
+		if ( ! isset( $_SERVER[ 'REMOTE_ADDR' ] ) ) {
 			return null;
 		}
 
-		$ip = wp_unslash( $_SERVER['REMOTE_ADDR'] );
+		$ip = wp_unslash( $_SERVER[ 'REMOTE_ADDR' ] );
 
 		$ip = trim( $ip );
 
-		if ( ! defined('TL_DOING_TESTS') ) {
+		if ( ! defined( 'TL_DOING_TESTS' ) ) {
 			$ip = filter_var( $ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE | FILTER_FLAG_NO_PRIV_RANGE );
 		}
 
-		return (string) $ip;
+		return (string)$ip;
 	}
 
 	/**
@@ -226,7 +226,7 @@ 
 		 */
 		$body = array(
 			'timestamp'  => time(),
-			'user_agent' => isset( $_SERVER['HTTP_USER_AGENT'] ) ? substr( $_SERVER['HTTP_USER_AGENT'], 0, 255 ) : '',
+			'user_agent' => isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) ? substr( $_SERVER[ 'HTTP_USER_AGENT' ], 0, 255 ) : '',
 			'user_ip'    => $this->get_ip(),
 			'site_url'   => get_site_url(),
 		);
@@ -265,13 +265,13 @@ 
 		 */
 		$body = array(
 			'timestamp'  => time(),
-			'user_agent' => isset( $_SERVER['HTTP_USER_AGENT'] ) ? substr( $_SERVER['HTTP_USER_AGENT'], 0, 255 ) : '',
+			'user_agent' => isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) ? substr( $_SERVER[ 'HTTP_USER_AGENT' ], 0, 255 ) : '',
 			'user_ip'	 => $this->get_ip(),
 			'site_url'	 => get_site_url(),
 		);
 
 		$remote = new Remote( $this->config, $this->logging );
-		$api_response = $remote->send( self::BRUTE_FORCE_ENDPOINT , $body, 'POST' );
+		$api_response = $remote->send( self::BRUTE_FORCE_ENDPOINT, $body, 'POST' );
 
 		if ( is_wp_error( $api_response ) ) {
 			return $api_response;
@@ -302,7 +302,7 @@ 
 
 		$notified = $this->report_lockdown();
 
-		if ( is_wp_error( $notified ) ){
+		if ( is_wp_error( $notified ) ) {
 			$this->logging->log( sprintf( 'Could not notify TrustedLogin (%s)', $notified->get_error_message() ), __METHOD__, 'error' );
 		}
 
@@ -355,7 +355,7 @@ 
 	 *
 	 * @return int|false Int: in lockdown. The value returned is the timestamp when lockdown ends. False: not in lockdown, or overridden by a constant.
 	 */
-	public function in_lockdown(){
+	public function in_lockdown() {
 
 		if ( $this->in_local_development() ) {
 			return false;

trustedlogin/trustedlogin/client/src/Config.php

Spacing +28 added lines, -28 removed lines

@@ -13,7 +13,7 @@ 
 namespace GravityView\TrustedLogin;
 
 // Exit if accessed directly
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
@@ -113,51 +113,51 @@ 
 	 */
 	public function validate() {
 
-		if ( in_array( __NAMESPACE__, array( 'ReplaceMe', 'ReplaceMe\GravityView\GravityView\TrustedLogin' ) ) && ! defined('TL_DOING_TESTS') ) {
+		if ( in_array( __NAMESPACE__, array( 'ReplaceMe', 'ReplaceMe\GravityView\GravityView\TrustedLogin' ) ) && ! defined( 'TL_DOING_TESTS' ) ) {
 			throw new Exception( 'Developer: make sure to change the namespace for the TrustedLogin class. See https://trustedlogin.com/configuration/ for more information.', 501 );
 		}
 
 		$errors = array();
 
-		if ( ! isset( $this->settings['auth']['api_key'] ) ) {
-			$errors[] = new WP_Error( 'missing_configuration', 'You need to set an API key. Get yours at https://app.trustedlogin.com' );
+		if ( ! isset( $this->settings[ 'auth' ][ 'api_key' ] ) ) {
+			$errors[ ] = new WP_Error( 'missing_configuration', 'You need to set an API key. Get yours at https://app.trustedlogin.com' );
 		}
 
-		if ( isset( $this->settings['vendor']['website'] ) && 'https://www.example.com' === $this->settings['vendor']['website'] && ! defined('TL_DOING_TESTS') ) {
-			$errors[] = new WP_Error( 'missing_configuration', 'You need to configure the "website" URL to point to the URL where the Vendor plugin is installed.' );
+		if ( isset( $this->settings[ 'vendor' ][ 'website' ] ) && 'https://www.example.com' === $this->settings[ 'vendor' ][ 'website' ] && ! defined( 'TL_DOING_TESTS' ) ) {
+			$errors[ ] = new WP_Error( 'missing_configuration', 'You need to configure the "website" URL to point to the URL where the Vendor plugin is installed.' );
 		}
 
 		foreach ( array( 'namespace', 'title', 'website', 'support_url', 'email' ) as $required_vendor_field ) {
-			if ( ! isset( $this->settings['vendor'][ $required_vendor_field ] ) ) {
-				$errors[] = new WP_Error( 'missing_configuration', sprintf( 'Missing required configuration: `vendor/%s`', $required_vendor_field ) );
+			if ( ! isset( $this->settings[ 'vendor' ][ $required_vendor_field ] ) ) {
+				$errors[ ] = new WP_Error( 'missing_configuration', sprintf( 'Missing required configuration: `vendor/%s`', $required_vendor_field ) );
 			}
 		}
 
-		if ( isset( $this->settings['decay'] ) ) {
-			if ( ! is_int( $this->settings['decay'] ) ) {
-				$errors[] = new WP_Error( 'invalid_configuration', 'Decay must be an integer (number of seconds).' );
-			} elseif ( $this->settings['decay'] > MONTH_IN_SECONDS ) {
-				$errors[] = new WP_Error( 'invalid_configuration', 'Decay must be less than or equal to 30 days.' );
-			} elseif ( $this->settings['decay'] < DAY_IN_SECONDS ) {
-				$errors[] = new WP_Error( 'invalid_configuration', 'Decay must be greater than 1 day.' );
+		if ( isset( $this->settings[ 'decay' ] ) ) {
+			if ( ! is_int( $this->settings[ 'decay' ] ) ) {
+				$errors[ ] = new WP_Error( 'invalid_configuration', 'Decay must be an integer (number of seconds).' );
+			} elseif ( $this->settings[ 'decay' ] > MONTH_IN_SECONDS ) {
+				$errors[ ] = new WP_Error( 'invalid_configuration', 'Decay must be less than or equal to 30 days.' );
+			} elseif ( $this->settings[ 'decay' ] < DAY_IN_SECONDS ) {
+				$errors[ ] = new WP_Error( 'invalid_configuration', 'Decay must be greater than 1 day.' );
 			}
 		}
 
-		if ( isset( $this->settings['vendor']['namespace'] ) ) {
+		if ( isset( $this->settings[ 'vendor' ][ 'namespace' ] ) ) {
 
 			// This seems like a reasonable max limit on namespace length.
 			// @see https://developer.wordpress.org/reference/functions/set_transient/#more-information
-			if ( strlen( $this->settings['vendor']['namespace'] ) > 96 ) {
-				$errors[] = new WP_Error( 'invalid_configuration', 'Namespace length must be shorter than 96 characters.' );
+			if ( strlen( $this->settings[ 'vendor' ][ 'namespace' ] ) > 96 ) {
+				$errors[ ] = new WP_Error( 'invalid_configuration', 'Namespace length must be shorter than 96 characters.' );
 			}
 
-			if ( in_array( strtolower( $this->settings['vendor']['namespace'] ), self::$reserved_namespaces, true ) ) {
-				$errors[] = new WP_Error( 'invalid_configuration', 'The defined namespace is reserved.' );
+			if ( in_array( strtolower( $this->settings[ 'vendor' ][ 'namespace' ] ), self::$reserved_namespaces, true ) ) {
+				$errors[ ] = new WP_Error( 'invalid_configuration', 'The defined namespace is reserved.' );
 			}
 		}
 
-		if ( isset( $this->settings['vendor'][ 'email' ] ) && ! filter_var( $this->settings['vendor'][ 'email' ], FILTER_VALIDATE_EMAIL ) ) {
-			$errors[] = new WP_Error( 'invalid_configuration', 'An invalid `vendor/email` setting was passed to the TrustedLogin Client.' );
+		if ( isset( $this->settings[ 'vendor' ][ 'email' ] ) && ! filter_var( $this->settings[ 'vendor' ][ 'email' ], FILTER_VALIDATE_EMAIL ) ) {
+			$errors[ ] = new WP_Error( 'invalid_configuration', 'An invalid `vendor/email` setting was passed to the TrustedLogin Client.' );
 		}
 
 		// TODO: Add namespace collision check?
@@ -165,7 +165,7 @@ 
 			$value = $this->get_setting( $settings_key, '', $this->settings );
 			$url   = wp_kses_bad_protocol( $value, array( 'http', 'https' ) );
 			if ( $value && ! filter_var( $url, FILTER_VALIDATE_URL ) ) {
-				$errors[] = new WP_Error(
+				$errors[ ] = new WP_Error(
 					'invalid_configuration',
 					sprintf( 'An invalid `%s` setting was passed to the TrustedLogin Client: %s',
 						$settings_key,
@@ -179,7 +179,7 @@ 
 
 		foreach ( SupportRole::$prevented_caps as $invalid_cap ) {
 			if ( array_key_exists( $invalid_cap, $added_caps ) ) {
-				$errors[] = new WP_Error( 'invalid_configuration', 'TrustedLogin users cannot be allowed to: ' . $invalid_cap );
+				$errors[ ] = new WP_Error( 'invalid_configuration', 'TrustedLogin users cannot be allowed to: ' . $invalid_cap );
 			}
 		}
 
@@ -187,7 +187,7 @@ 
 			$error_text = array();
 			foreach ( $errors as $error ) {
 				if ( is_wp_error( $error ) ) {
-					$error_text[] = $error->get_error_message();
+					$error_text[ ] = $error->get_error_message();
 				}
 			}
 
@@ -222,7 +222,7 @@ 
 
 		$time = current_time( 'timestamp', $gmt );
 
-		return $time + (int) $decay_time;
+		return $time + (int)$decay_time;
 	}
 
 	/**
@@ -282,8 +282,8 @@ 
 
 		$default_settings = $this->default_settings;
 
-		$default_settings['paths']['css'] = plugin_dir_url( __FILE__ ) . 'assets/trustedlogin.css';
-		$default_settings['paths']['js']  = plugin_dir_url( __FILE__ ) . 'assets/trustedlogin.js';
+		$default_settings[ 'paths' ][ 'css' ] = plugin_dir_url( __FILE__ ) . 'assets/trustedlogin.css';
+		$default_settings[ 'paths' ][ 'js' ]  = plugin_dir_url( __FILE__ ) . 'assets/trustedlogin.js';
 
 		return $default_settings;
 	}

trustedlogin/trustedlogin/client/src/Admin.php

Spacing +33 added lines, -33 removed lines

@@ -124,7 +124,7 @@ 
 
 		$registered = array();
 
-		$registered['trustedlogin-js'] = wp_register_script(
+		$registered[ 'trustedlogin-js' ] = wp_register_script(
 			'trustedlogin-' . $this->config->ns(),
 			$this->config->get_setting( 'paths/js' ),
 			array( 'jquery', 'wp-a11y' ),
@@ -132,7 +132,7 @@ 
 			true
 		);
 
-		$registered['trustedlogin-css'] = wp_register_style(
+		$registered[ 'trustedlogin-css' ] = wp_register_style(
 			'trustedlogin-' . $this->config->ns(),
 			$this->config->get_setting( 'paths/css' ),
 			array(),
@@ -248,7 +248,7 @@ 
 	 * @return bool
 	 */
 	private function is_login_screen() {
-		return did_action( 'login_init' ) && isset( $_GET['ns'] ) && $_GET['ns'] === $this->config->ns();
+		return did_action( 'login_init' ) && isset( $_GET[ 'ns' ] ) && $_GET[ 'ns' ] === $this->config->ns();
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 
 		// Once logged-in, take user back to auth request screen.
 		if ( ! is_user_logged_in() ) {
-			$_REQUEST['redirect_to'] = site_url( add_query_arg( array() ) );
+			$_REQUEST[ 'redirect_to' ] = site_url( add_query_arg( array() ) );
 			return;
 		}
 
@@ -282,19 +282,19 @@ 
 		$interim_login = true;
 
 		// The login_headertitle filter was deprecated in WP 5.2.0 for login_headertext
-		if( version_compare( $wp_version, '5.2.0', '<' ) ) {
+		if ( version_compare( $wp_version, '5.2.0', '<' ) ) {
 			add_filter( 'login_headertitle', '__return_empty_string' );
 		} else {
 			add_filter( 'login_headertext', '__return_empty_string' );
 		}
 
-		add_filter( 'login_headerurl', function () {
+		add_filter( 'login_headerurl', function() {
 			return $this->config->get_setting( 'vendor/website' );
 		});
 
 		login_header();
 
-		wp_enqueue_style( 'common');
+		wp_enqueue_style( 'common' );
 
 		wp_add_inline_style( 'common', $this->get_login_inline_css() );
 
@@ -324,7 +324,7 @@ 
 	margin-top: 36px;
 }
 .login h1 a {
-	background-image: url("' . $this->config->get_setting( 'vendor/logo_url' ). '")!important;
+	background-image: url("' . $this->config->get_setting( 'vendor/logo_url' ) . '")!important;
 	background-size: contain!important;
 }
 ';
@@ -348,7 +348,7 @@ 
 			return '';
 		}
 
-		$support_user = $support_users[0];
+		$support_user = $support_users[ 0 ];
 
 		$_user_creator_id = get_user_option( $this->support_user->created_by_meta_key, $support_user->ID );
 		$_user_creator    = $_user_creator_id ? get_user_by( 'id', $_user_creator_id ) : false;
@@ -485,7 +485,7 @@ 
 			return '';
 		}
 
-		$template =  '<div class="tl-{{ns}}-auth__ref"><p><span class="tl-{{ns}}-auth_ref__id">{{reference_text}}</span></p></div>';
+		$template = '<div class="tl-{{ns}}-auth__ref"><p><span class="tl-{{ns}}-auth_ref__id">{{reference_text}}</span></p></div>';
 
 		$content = array(
 			'reference_text' => sprintf( esc_html__( 'Reference #%s', 'trustedlogin' ), $reference_id ),
@@ -503,7 +503,7 @@ 
 		if ( $has_access ) {
 			foreach ( $has_access as $access ) {
 				// translators: %1$s is replaced with the name of the software developer (e.g. "Acme Widgets"). %2$s is the amount of time remaining for access ("1 week")
-				$intro = sprintf( esc_html__( '%1$s has site access that expires in %2$s.', 'trustedlogin' ), '<a href="' . esc_url( $this->config->get_setting('vendor/website') ) . '" target="_blank" rel="noopener noreferrer">' . $this->config->get_setting( 'vendor/title' ) . '</a>', str_replace( ' ', '&nbsp;', $this->support_user->get_expiration( $access, true, false ) ) );
+				$intro = sprintf( esc_html__( '%1$s has site access that expires in %2$s.', 'trustedlogin' ), '<a href="' . esc_url( $this->config->get_setting( 'vendor/website' ) ) . '" target="_blank" rel="noopener noreferrer">' . $this->config->get_setting( 'vendor/title' ) . '</a>', str_replace( ' ', '&nbsp;', $this->support_user->get_expiration( $access, true, false ) ) );
 			}
 
 			return $intro;
@@ -511,7 +511,7 @@ 
 
 		if ( $this->is_login_screen() ) {
 			// translators: %1$s is replaced with the name of the software developer (e.g. "Acme Widgets")
-			$intro = sprintf( esc_html__( '%1$s would like support access to this site.', 'trustedlogin' ), '<a href="'. esc_url( $this->config->get_setting( 'vendor/website' ) ) . '">' . $this->config->get_display_name() . '</a>' );
+			$intro = sprintf( esc_html__( '%1$s would like support access to this site.', 'trustedlogin' ), '<a href="' . esc_url( $this->config->get_setting( 'vendor/website' ) ) . '">' . $this->config->get_display_name() . '</a>' );
 		} else {
 			// translators: %1$s is replaced with the name of the software developer (e.g. "Acme Widgets")
 			$intro = sprintf( esc_html__( 'Grant %1$s access to this site.', 'trustedlogin' ), '<a href="' . esc_url( $this->config->get_setting( 'vendor/website' ) ) . '">' . $this->config->get_display_name() . '</a>' );
@@ -604,7 +604,7 @@ 
 	 */
 	private function get_caps_section( $caps_array, $heading = '', $dashicon = '' ) {
 
-		$caps_array = array_filter( (array) $caps_array, array( $this->config, 'is_not_null' ) );
+		$caps_array = array_filter( (array)$caps_array, array( $this->config, 'is_not_null' ) );
 
 		if ( empty( $caps_array ) ) {
 			return '';
@@ -615,10 +615,10 @@ 
 		$output .= '<h3>' . esc_html( $heading ) . '</h3>';
 		$output .= '<ul>';
 
-		foreach ( (array) $caps_array as $cap => $reason ) {
+		foreach ( (array)$caps_array as $cap => $reason ) {
 			$dashicon = '<span class="dashicons ' . esc_attr( $dashicon ) . ' dashicons--small"></span>';
 			$reason   = empty( $reason ) ? '' : '<small>' . esc_html( $reason ) . '</small>';
-			$output   .= sprintf( '<li>%s<span class="code">%s</span>%s</li>', $dashicon, esc_html( $cap ), $reason );
+			$output .= sprintf( '<li>%s<span class="code">%s</span>%s</li>', $dashicon, esc_html( $cap ), $reason );
 		}
 
 		$output .= '</ul>';
@@ -748,7 +748,7 @@ 
 
 			// Allow SVGs for logos
 			$allowed_protocols   = wp_allowed_protocols();
-			$allowed_protocols[] = 'data';
+			$allowed_protocols[ ] = 'data';
 
 			$output_html = wp_kses( $output_html, array(
 				'a'       => array(
@@ -790,10 +790,10 @@ 
 				'p'       => array( 'class' => array(), 'id' => array() ),
 				'h1'      => array( 'class' => array(), 'id' => array() ),
 				'h2'      => array( 'class' => array(), 'id' => array() ),
-				'h3'      => array( 'class' => array(), 'id' => array(), 'style'       => array(), ),
+				'h3'      => array( 'class' => array(), 'id' => array(), 'style'       => array(),),
 				'h4'      => array( 'class' => array(), 'id' => array() ),
 				'h5'      => array( 'class' => array(), 'id' => array() ),
-				'div'     => array( 'class' => array(), 'id' => array(), 'aria-live' => array(), 'style' => array(), ),
+				'div'     => array( 'class' => array(), 'id' => array(), 'aria-live' => array(), 'style' => array(),),
 				'small'   => array( 'class' => array(), 'id' => array(), 'data-toggle' => array() ),
 				'header'  => array( 'class' => array(), 'id' => array() ),
 				'footer'  => array( 'class' => array(), 'id' => array() ),
@@ -914,7 +914,7 @@ 
 
 		$atts = wp_parse_args( $atts, $defaults );
 
-		switch ( $atts['size'] ) {
+		switch ( $atts[ 'size' ] ) {
 			case '':
 				$css_class = '';
 				break;
@@ -922,17 +922,17 @@ 
 				$css_class = 'button';
 				break;
 			default:
-				if ( ! in_array( $atts['size'], $sizes ) ) {
-					$atts['size'] = 'hero';
+				if ( ! in_array( $atts[ 'size' ], $sizes ) ) {
+					$atts[ 'size' ] = 'hero';
 				}
 
-				$css_class = 'button button-' . $atts['size'];
+				$css_class = 'button button-' . $atts[ 'size' ];
 		}
 
 		$_valid_tags = array( 'a', 'button', 'span' );
 
-		if ( ! empty( $atts['tag'] ) && in_array( strtolower( $atts['tag'] ), $_valid_tags, true ) ) {
-			$tag = $atts['tag'];
+		if ( ! empty( $atts[ 'tag' ] ) && in_array( strtolower( $atts[ 'tag' ] ), $_valid_tags, true ) ) {
+			$tag = $atts[ 'tag' ];
 		} else {
 			$tag = 'a';
 		}
@@ -940,16 +940,16 @@ 
 		$data_atts = array();
 
 		if ( $this->support_user->get_all() ) {
-			$text                = '<span class="dashicons dashicons-update-alt"></span>' . esc_html( $atts['exists_text'] );
+			$text                = '<span class="dashicons dashicons-update-alt"></span>' . esc_html( $atts[ 'exists_text' ] );
 			$href                = admin_url( 'users.php?role=' . $this->support_user->role->get_name() );
-			$data_atts['access'] = 'extend';
+			$data_atts[ 'access' ] = 'extend';
 		} else {
-			$text                = esc_html( $atts['text'] );
-			$href                = $atts['support_url'];
-			$data_atts['access'] = 'grant';
+			$text                = esc_html( $atts[ 'text' ] );
+			$href                = $atts[ 'support_url' ];
+			$data_atts[ 'access' ] = 'grant';
 		}
 
-		$css_class = implode( ' ', array( $css_class, $atts['class'] ) );
+		$css_class = implode( ' ', array( $css_class, $atts[ 'class' ] ) );
 		$css_class = trim( $css_class );
 
 		$data_string = '';
@@ -958,7 +958,7 @@ 
 		}
 
 		$powered_by = '';
-		if ( $atts['powered_by'] ) {
+		if ( $atts[ 'powered_by' ] ) {
 			$powered_by = sprintf( '<small><span class="trustedlogin-logo"></span>%s</small>',
 				esc_html__( 'Secured by TrustedLogin', 'trustedlogin' )
 			);
@@ -1159,7 +1159,7 @@ 
 	<p>%4\$s <samp>%5\$s</samp></p>
 </%3\$s>
 EOD;
-			$access_key_output   = sprintf(
+			$access_key_output = sprintf(
 				$access_key_template,
 				/* %1$s */ sanitize_title( $this->config->ns() ),
 				/* %2$s */ esc_html__( 'Error', 'trustedlogin' ),
@@ -1181,7 +1181,7 @@ 
 	</div>
 </%6\$s>
 EOD;
-			$access_key_output   = sprintf(
+			$access_key_output = sprintf(
 				$access_key_template,
 				/* %1$s */ sanitize_title( $this->config->ns() ),
 				/* %2$s */ esc_html__( 'Site access key:', 'trustedlogin' ),

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -1158,7 +1158,7 @@ 
 	<h3>%2\$s</h3>
 	<p>%4\$s <samp>%5\$s</samp></p>
 </%3\$s>
-EOD;
+eod;
 			$access_key_output   = sprintf(
 				$access_key_template,
 				/* %1$s */ sanitize_title( $this->config->ns() ),
@@ -1180,7 +1180,7 @@ 
 		<button id="tl-%1\$s-copy" class="tl-%1\$s-auth__accesskey_copy button" aria-live="off" title="%7\$s"><span class="screen-reader-text">%5\$s</span></button>
 	</div>
 </%6\$s>
-EOD;
+eod;
 			$access_key_output   = sprintf(
 				$access_key_template,
 				/* %1$s */ sanitize_title( $this->config->ns() ),

trustedlogin/katzgrau/klogger/src/Logger.php

Indentation +318 added lines, -318 removed lines

@@ -34,322 +34,322 @@
  */

 class Logger extends AbstractLogger

 {

-    /**

-     * KLogger options

-     *  Anything options not considered 'core' to the logging library should be

-     *  settable view the third parameter in the constructor

-     *

-     *  Core options include the log file path and the log threshold

-     *

-     * @var array

-     */

-    protected $options = array (

-        'extension'      => 'txt',

-        'dateFormat'     => 'Y-m-d G:i:s.u',

-        'filename'       => false,

-        'flushFrequency' => false,

-        'prefix'         => 'log_',

-        'logFormat'      => false,

-        'appendContext'  => true,

-    );

-

-    /**

-     * Path to the log file

-     * @var string

-     */

-    private $logFilePath;

-

-    /**

-     * Current minimum logging threshold

-     * @var integer

-     */

-    protected $logLevelThreshold = LogLevel::DEBUG;

-

-    /**

-     * The number of lines logged in this instance's lifetime

-     * @var int

-     */

-    private $logLineCount = 0;

-

-    /**

-     * Log Levels

-     * @var array

-     */

-    protected $logLevels = array(

-        LogLevel::EMERGENCY => 0,

-        LogLevel::ALERT     => 1,

-        LogLevel::CRITICAL  => 2,

-        LogLevel::ERROR     => 3,

-        LogLevel::WARNING   => 4,

-        LogLevel::NOTICE    => 5,

-        LogLevel::INFO      => 6,

-        LogLevel::DEBUG     => 7

-    );

-

-    /**

-     * This holds the file handle for this instance's log file

-     * @var resource

-     */

-    private $fileHandle;

-

-    /**

-     * This holds the last line logged to the logger

-     *  Used for unit tests

-     * @var string

-     */

-    private $lastLine = '';

-

-    /**

-     * Octal notation for default permissions of the log file

-     * @var integer

-     */

-    private $defaultPermissions = 0777;

-

-    /**

-     * Class constructor

-     *

-     * @param string $logDirectory      File path to the logging directory

-     * @param string $logLevelThreshold The LogLevel Threshold

-     * @param array  $options

-     *

-     * @internal param string $logFilePrefix The prefix for the log file name

-     * @internal param string $logFileExt The extension for the log file

-     */

-    public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())

-    {

-        $this->logLevelThreshold = $logLevelThreshold;

-        $this->options = array_merge($this->options, $options);

-

-        $logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);

-        if ( ! file_exists($logDirectory)) {

-            mkdir($logDirectory, $this->defaultPermissions, true);

-        }

-

-        if(strpos($logDirectory, 'php://') === 0) {

-            $this->setLogToStdOut($logDirectory);

-            $this->setFileHandle('w+');

-        } else {

-            $this->setLogFilePath($logDirectory);

-            if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {

-                throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

-            }

-            $this->setFileHandle('a');

-        }

-

-        if ( ! $this->fileHandle) {

-            throw new RuntimeException('The file could not be opened. Check permissions.');

-        }

-    }

-

-    /**

-     * @param string $stdOutPath

-     */

-    public function setLogToStdOut($stdOutPath) {

-        $this->logFilePath = $stdOutPath;

-    }

-

-    /**

-     * @param string $logDirectory

-     */

-    public function setLogFilePath($logDirectory) {

-        if ($this->options['filename']) {

-            if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {

-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];

-            }

-            else {

-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];

-            }

-        } else {

-            $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];

-        }

-    }

-

-    /**

-     * @param $writeMode

-     *

-     * @internal param resource $fileHandle

-     */

-    public function setFileHandle($writeMode) {

-        $this->fileHandle = fopen($this->logFilePath, $writeMode);

-    }

-

-

-    /**

-     * Class destructor

-     */

-    public function __destruct()

-    {

-        if ($this->fileHandle) {

-            fclose($this->fileHandle);

-        }

-    }

-

-    /**

-     * Sets the date format used by all instances of KLogger

-     *

-     * @param string $dateFormat Valid format string for date()

-     */

-    public function setDateFormat($dateFormat)

-    {

-        $this->options['dateFormat'] = $dateFormat;

-    }

-

-    /**

-     * Sets the Log Level Threshold

-     *

-     * @param string $logLevelThreshold The log level threshold

-     */

-    public function setLogLevelThreshold($logLevelThreshold)

-    {

-        $this->logLevelThreshold = $logLevelThreshold;

-    }

-

-    /**

-     * Logs with an arbitrary level.

-     *

-     * @param mixed $level

-     * @param string $message

-     * @param array $context

-     * @return null

-     */

-    public function log($level, $message, array $context = array())

-    {

-        if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {

-            return;

-        }

-        $message = $this->formatMessage($level, $message, $context);

-        $this->write($message);

-    }

-

-    /**

-     * Writes a line to the log without prepending a status or timestamp

-     *

-     * @param string $message Line to write to the log

-     * @return void

-     */

-    public function write($message)

-    {

-        if (null !== $this->fileHandle) {

-            if (fwrite($this->fileHandle, $message) === false) {

-                throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

-            } else {

-                $this->lastLine = trim($message);

-                $this->logLineCount++;

-

-                if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {

-                    fflush($this->fileHandle);

-                }

-            }

-        }

-    }

-

-    /**

-     * Get the file path that the log is currently writing to

-     *

-     * @return string

-     */

-    public function getLogFilePath()

-    {

-        return $this->logFilePath;

-    }

-

-    /**

-     * Get the last line logged to the log file

-     *

-     * @return string

-     */

-    public function getLastLogLine()

-    {

-        return $this->lastLine;

-    }

-

-    /**

-     * Formats the message for logging.

-     *

-     * @param  string $level   The Log Level of the message

-     * @param  string $message The message to log

-     * @param  array  $context The context

-     * @return string

-     */

-    protected function formatMessage($level, $message, $context)

-    {

-        if ($this->options['logFormat']) {

-            $parts = array(

-                'date'          => $this->getTimestamp(),

-                'level'         => strtoupper($level),

-                'level-padding' => str_repeat(' ', 9 - strlen($level)),

-                'priority'      => $this->logLevels[$level],

-                'message'       => $message,

-                'context'       => json_encode($context),

-            );

-            $message = $this->options['logFormat'];

-            foreach ($parts as $part => $value) {

-                $message = str_replace('{'.$part.'}', $value, $message);

-            }

-

-        } else {

-            $message = "[{$this->getTimestamp()}] [{$level}] {$message}";

-        }

-

-        if ($this->options['appendContext'] && ! empty($context)) {

-            $message .= PHP_EOL.$this->indent($this->contextToString($context));

-        }

-

-        return $message.PHP_EOL;

-

-    }

-

-    /**

-     * Gets the correctly formatted Date/Time for the log entry.

-     *

-     * PHP DateTime is dump, and you have to resort to trickery to get microseconds

-     * to work correctly, so here it is.

-     *

-     * @return string

-     */

-    private function getTimestamp()

-    {

-        $originalTime = microtime(true);

-        $micro = sprintf("%06d", ($originalTime - floor($originalTime)) * 1000000);

-        $date = new DateTime(date('Y-m-d H:i:s.'.$micro, (int)$originalTime));

-

-        return $date->format($this->options['dateFormat']);

-    }

-

-    /**

-     * Takes the given context and coverts it to a string.

-     *

-     * @param  array $context The Context

-     * @return string

-     */

-    protected function contextToString($context)

-    {

-        $export = '';

-        foreach ($context as $key => $value) {

-            $export .= "{$key}: ";

-            $export .= preg_replace(array(

-                '/=>\s+([a-zA-Z])/im',

-                '/array\(\s+\)/im',

-                '/^  |\G  /m'

-            ), array(

-                '=> $1',

-                'array()',

-                '    '

-            ), str_replace('array (', 'array(', var_export($value, true)));

-            $export .= PHP_EOL;

-        }

-        return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));

-    }

-

-    /**

-     * Indents the given string with the given indent.

-     *

-     * @param  string $string The string to indent

-     * @param  string $indent What to use as the indent.

-     * @return string

-     */

-    protected function indent($string, $indent = '    ')

-    {

-        return $indent.str_replace("\n", "\n".$indent, $string);

-    }

+	/**

+	 * KLogger options

+	 *  Anything options not considered 'core' to the logging library should be

+	 *  settable view the third parameter in the constructor

+	 *

+	 *  Core options include the log file path and the log threshold

+	 *

+	 * @var array

+	 */

+	protected $options = array (

+		'extension'      => 'txt',

+		'dateFormat'     => 'Y-m-d G:i:s.u',

+		'filename'       => false,

+		'flushFrequency' => false,

+		'prefix'         => 'log_',

+		'logFormat'      => false,

+		'appendContext'  => true,

+	);

+

+	/**

+	 * Path to the log file

+	 * @var string

+	 */

+	private $logFilePath;

+

+	/**

+	 * Current minimum logging threshold

+	 * @var integer

+	 */

+	protected $logLevelThreshold = LogLevel::DEBUG;

+

+	/**

+	 * The number of lines logged in this instance's lifetime

+	 * @var int

+	 */

+	private $logLineCount = 0;

+

+	/**

+	 * Log Levels

+	 * @var array

+	 */

+	protected $logLevels = array(

+		LogLevel::EMERGENCY => 0,

+		LogLevel::ALERT     => 1,

+		LogLevel::CRITICAL  => 2,

+		LogLevel::ERROR     => 3,

+		LogLevel::WARNING   => 4,

+		LogLevel::NOTICE    => 5,

+		LogLevel::INFO      => 6,

+		LogLevel::DEBUG     => 7

+	);

+

+	/**

+	 * This holds the file handle for this instance's log file

+	 * @var resource

+	 */

+	private $fileHandle;

+

+	/**

+	 * This holds the last line logged to the logger

+	 *  Used for unit tests

+	 * @var string

+	 */

+	private $lastLine = '';

+

+	/**

+	 * Octal notation for default permissions of the log file

+	 * @var integer

+	 */

+	private $defaultPermissions = 0777;

+

+	/**

+	 * Class constructor

+	 *

+	 * @param string $logDirectory      File path to the logging directory

+	 * @param string $logLevelThreshold The LogLevel Threshold

+	 * @param array  $options

+	 *

+	 * @internal param string $logFilePrefix The prefix for the log file name

+	 * @internal param string $logFileExt The extension for the log file

+	 */

+	public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())

+	{

+		$this->logLevelThreshold = $logLevelThreshold;

+		$this->options = array_merge($this->options, $options);

+

+		$logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);

+		if ( ! file_exists($logDirectory)) {

+			mkdir($logDirectory, $this->defaultPermissions, true);

+		}

+

+		if(strpos($logDirectory, 'php://') === 0) {

+			$this->setLogToStdOut($logDirectory);

+			$this->setFileHandle('w+');

+		} else {

+			$this->setLogFilePath($logDirectory);

+			if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {

+				throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

+			}

+			$this->setFileHandle('a');

+		}

+

+		if ( ! $this->fileHandle) {

+			throw new RuntimeException('The file could not be opened. Check permissions.');

+		}

+	}

+

+	/**

+	 * @param string $stdOutPath

+	 */

+	public function setLogToStdOut($stdOutPath) {

+		$this->logFilePath = $stdOutPath;

+	}

+

+	/**

+	 * @param string $logDirectory

+	 */

+	public function setLogFilePath($logDirectory) {

+		if ($this->options['filename']) {

+			if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {

+				$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];

+			}

+			else {

+				$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];

+			}

+		} else {

+			$this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];

+		}

+	}

+

+	/**

+	 * @param $writeMode

+	 *

+	 * @internal param resource $fileHandle

+	 */

+	public function setFileHandle($writeMode) {

+		$this->fileHandle = fopen($this->logFilePath, $writeMode);

+	}

+

+

+	/**

+	 * Class destructor

+	 */

+	public function __destruct()

+	{

+		if ($this->fileHandle) {

+			fclose($this->fileHandle);

+		}

+	}

+

+	/**

+	 * Sets the date format used by all instances of KLogger

+	 *

+	 * @param string $dateFormat Valid format string for date()

+	 */

+	public function setDateFormat($dateFormat)

+	{

+		$this->options['dateFormat'] = $dateFormat;

+	}

+

+	/**

+	 * Sets the Log Level Threshold

+	 *

+	 * @param string $logLevelThreshold The log level threshold

+	 */

+	public function setLogLevelThreshold($logLevelThreshold)

+	{

+		$this->logLevelThreshold = $logLevelThreshold;

+	}

+

+	/**

+	 * Logs with an arbitrary level.

+	 *

+	 * @param mixed $level

+	 * @param string $message

+	 * @param array $context

+	 * @return null

+	 */

+	public function log($level, $message, array $context = array())

+	{

+		if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {

+			return;

+		}

+		$message = $this->formatMessage($level, $message, $context);

+		$this->write($message);

+	}

+

+	/**

+	 * Writes a line to the log without prepending a status or timestamp

+	 *

+	 * @param string $message Line to write to the log

+	 * @return void

+	 */

+	public function write($message)

+	{

+		if (null !== $this->fileHandle) {

+			if (fwrite($this->fileHandle, $message) === false) {

+				throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

+			} else {

+				$this->lastLine = trim($message);

+				$this->logLineCount++;

+

+				if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {

+					fflush($this->fileHandle);

+				}

+			}

+		}

+	}

+

+	/**

+	 * Get the file path that the log is currently writing to

+	 *

+	 * @return string

+	 */

+	public function getLogFilePath()

+	{

+		return $this->logFilePath;

+	}

+

+	/**

+	 * Get the last line logged to the log file

+	 *

+	 * @return string

+	 */

+	public function getLastLogLine()

+	{

+		return $this->lastLine;

+	}

+

+	/**

+	 * Formats the message for logging.

+	 *

+	 * @param  string $level   The Log Level of the message

+	 * @param  string $message The message to log

+	 * @param  array  $context The context

+	 * @return string

+	 */

+	protected function formatMessage($level, $message, $context)

+	{

+		if ($this->options['logFormat']) {

+			$parts = array(

+				'date'          => $this->getTimestamp(),

+				'level'         => strtoupper($level),

+				'level-padding' => str_repeat(' ', 9 - strlen($level)),

+				'priority'      => $this->logLevels[$level],

+				'message'       => $message,

+				'context'       => json_encode($context),

+			);

+			$message = $this->options['logFormat'];

+			foreach ($parts as $part => $value) {

+				$message = str_replace('{'.$part.'}', $value, $message);

+			}

+

+		} else {

+			$message = "[{$this->getTimestamp()}] [{$level}] {$message}";

+		}

+

+		if ($this->options['appendContext'] && ! empty($context)) {

+			$message .= PHP_EOL.$this->indent($this->contextToString($context));

+		}

+

+		return $message.PHP_EOL;

+

+	}

+

+	/**

+	 * Gets the correctly formatted Date/Time for the log entry.

+	 *

+	 * PHP DateTime is dump, and you have to resort to trickery to get microseconds

+	 * to work correctly, so here it is.

+	 *

+	 * @return string

+	 */

+	private function getTimestamp()

+	{

+		$originalTime = microtime(true);

+		$micro = sprintf("%06d", ($originalTime - floor($originalTime)) * 1000000);

+		$date = new DateTime(date('Y-m-d H:i:s.'.$micro, (int)$originalTime));

+

+		return $date->format($this->options['dateFormat']);

+	}

+

+	/**

+	 * Takes the given context and coverts it to a string.

+	 *

+	 * @param  array $context The Context

+	 * @return string

+	 */

+	protected function contextToString($context)

+	{

+		$export = '';

+		foreach ($context as $key => $value) {

+			$export .= "{$key}: ";

+			$export .= preg_replace(array(

+				'/=>\s+([a-zA-Z])/im',

+				'/array\(\s+\)/im',

+				'/^  |\G  /m'

+			), array(

+				'=> $1',

+				'array()',

+				'    '

+			), str_replace('array (', 'array(', var_export($value, true)));

+			$export .= PHP_EOL;

+		}

+		return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));

+	}

+

+	/**

+	 * Indents the given string with the given indent.

+	 *

+	 * @param  string $string The string to indent

+	 * @param  string $indent What to use as the indent.

+	 * @return string

+	 */

+	protected function indent($string, $indent = '    ')

+	{

+		return $indent.str_replace("\n", "\n".$indent, $string);

+	}

 }

Spacing +63 added lines, -63 removed lines

@@ -43,7 +43,7 @@ 
      *

      * @var array

      */

-    protected $options = array (

+    protected $options = array(

         'extension'      => 'txt',

         'dateFormat'     => 'Y-m-d G:i:s.u',

         'filename'       => false,

@@ -115,52 +115,52 @@ 
      * @internal param string $logFilePrefix The prefix for the log file name

      * @internal param string $logFileExt The extension for the log file

      */

-    public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())

+    public function __construct( $logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array() )

     {

         $this->logLevelThreshold = $logLevelThreshold;

-        $this->options = array_merge($this->options, $options);

+        $this->options = array_merge( $this->options, $options );

 

-        $logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);

-        if ( ! file_exists($logDirectory)) {

-            mkdir($logDirectory, $this->defaultPermissions, true);

+        $logDirectory = rtrim( $logDirectory, DIRECTORY_SEPARATOR );

+        if ( ! file_exists( $logDirectory ) ) {

+            mkdir( $logDirectory, $this->defaultPermissions, true );

         }

 

-        if(strpos($logDirectory, 'php://') === 0) {

-            $this->setLogToStdOut($logDirectory);

-            $this->setFileHandle('w+');

+        if ( strpos( $logDirectory, 'php://' ) === 0 ) {

+            $this->setLogToStdOut( $logDirectory );

+            $this->setFileHandle( 'w+' );

         } else {

-            $this->setLogFilePath($logDirectory);

-            if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {

-                throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

+            $this->setLogFilePath( $logDirectory );

+            if ( file_exists( $this->logFilePath ) && ! is_writable( $this->logFilePath ) ) {

+                throw new RuntimeException( 'The file could not be written to. Check that appropriate permissions have been set.' );

             }

-            $this->setFileHandle('a');

+            $this->setFileHandle( 'a' );

         }

 

-        if ( ! $this->fileHandle) {

-            throw new RuntimeException('The file could not be opened. Check permissions.');

+        if ( ! $this->fileHandle ) {

+            throw new RuntimeException( 'The file could not be opened. Check permissions.' );

         }

     }

 

     /**

      * @param string $stdOutPath

      */

-    public function setLogToStdOut($stdOutPath) {

+    public function setLogToStdOut( $stdOutPath ) {

         $this->logFilePath = $stdOutPath;

     }

 

     /**

      * @param string $logDirectory

      */

-    public function setLogFilePath($logDirectory) {

-        if ($this->options['filename']) {

-            if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {

-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];

+    public function setLogFilePath( $logDirectory ) {

+        if ( $this->options[ 'filename' ] ) {

+            if ( strpos( $this->options[ 'filename' ], '.log' ) !== false || strpos( $this->options[ 'filename' ], '.txt' ) !== false ) {

+                $this->logFilePath = $logDirectory . DIRECTORY_SEPARATOR . $this->options[ 'filename' ];

             }

             else {

-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];

+                $this->logFilePath = $logDirectory . DIRECTORY_SEPARATOR . $this->options[ 'filename' ] . '.' . $this->options[ 'extension' ];

             }

         } else {

-            $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];

+            $this->logFilePath = $logDirectory . DIRECTORY_SEPARATOR . $this->options[ 'prefix' ] . date( 'Y-m-d' ) . '.' . $this->options[ 'extension' ];

         }

     }

 

@@ -169,8 +169,8 @@ 
      *

      * @internal param resource $fileHandle

      */

-    public function setFileHandle($writeMode) {

-        $this->fileHandle = fopen($this->logFilePath, $writeMode);

+    public function setFileHandle( $writeMode ) {

+        $this->fileHandle = fopen( $this->logFilePath, $writeMode );

     }

 

 

@@ -179,8 +179,8 @@ 
      */

     public function __destruct()

     {

-        if ($this->fileHandle) {

-            fclose($this->fileHandle);

+        if ( $this->fileHandle ) {

+            fclose( $this->fileHandle );

         }

     }

 

@@ -189,9 +189,9 @@ 
      *

      * @param string $dateFormat Valid format string for date()

      */

-    public function setDateFormat($dateFormat)

+    public function setDateFormat( $dateFormat )

     {

-        $this->options['dateFormat'] = $dateFormat;

+        $this->options[ 'dateFormat' ] = $dateFormat;

     }

 

     /**

@@ -199,7 +199,7 @@ 
      *

      * @param string $logLevelThreshold The log level threshold

      */

-    public function setLogLevelThreshold($logLevelThreshold)

+    public function setLogLevelThreshold( $logLevelThreshold )

     {

         $this->logLevelThreshold = $logLevelThreshold;

     }

@@ -212,13 +212,13 @@ 
      * @param array $context

      * @return null

      */

-    public function log($level, $message, array $context = array())

+    public function log( $level, $message, array $context = array() )

     {

-        if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {

+        if ( $this->logLevels[ $this->logLevelThreshold ] < $this->logLevels[ $level ] ) {

             return;

         }

-        $message = $this->formatMessage($level, $message, $context);

-        $this->write($message);

+        $message = $this->formatMessage( $level, $message, $context );

+        $this->write( $message );

     }

 

     /**

@@ -227,17 +227,17 @@ 
      * @param string $message Line to write to the log

      * @return void

      */

-    public function write($message)

+    public function write( $message )

     {

-        if (null !== $this->fileHandle) {

-            if (fwrite($this->fileHandle, $message) === false) {

-                throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

+        if ( null !== $this->fileHandle ) {

+            if ( fwrite( $this->fileHandle, $message ) === false ) {

+                throw new RuntimeException( 'The file could not be written to. Check that appropriate permissions have been set.' );

             } else {

-                $this->lastLine = trim($message);

+                $this->lastLine = trim( $message );

                 $this->logLineCount++;

 

-                if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {

-                    fflush($this->fileHandle);

+                if ( $this->options[ 'flushFrequency' ] && $this->logLineCount % $this->options[ 'flushFrequency' ] === 0 ) {

+                    fflush( $this->fileHandle );

                 }

             }

         }

@@ -271,31 +271,31 @@ 
      * @param  array  $context The context

      * @return string

      */

-    protected function formatMessage($level, $message, $context)

+    protected function formatMessage( $level, $message, $context )

     {

-        if ($this->options['logFormat']) {

+        if ( $this->options[ 'logFormat' ] ) {

             $parts = array(

                 'date'          => $this->getTimestamp(),

-                'level'         => strtoupper($level),

-                'level-padding' => str_repeat(' ', 9 - strlen($level)),

-                'priority'      => $this->logLevels[$level],

+                'level'         => strtoupper( $level ),

+                'level-padding' => str_repeat( ' ', 9 - strlen( $level ) ),

+                'priority'      => $this->logLevels[ $level ],

                 'message'       => $message,

-                'context'       => json_encode($context),

+                'context'       => json_encode( $context ),

             );

-            $message = $this->options['logFormat'];

-            foreach ($parts as $part => $value) {

-                $message = str_replace('{'.$part.'}', $value, $message);

+            $message = $this->options[ 'logFormat' ];

+            foreach ( $parts as $part => $value ) {

+                $message = str_replace( '{' . $part . '}', $value, $message );

             }

 

         } else {

             $message = "[{$this->getTimestamp()}] [{$level}] {$message}";

         }

 

-        if ($this->options['appendContext'] && ! empty($context)) {

-            $message .= PHP_EOL.$this->indent($this->contextToString($context));

+        if ( $this->options[ 'appendContext' ] && ! empty( $context ) ) {

+            $message .= PHP_EOL . $this->indent( $this->contextToString( $context ) );

         }

 

-        return $message.PHP_EOL;

+        return $message . PHP_EOL;

 

     }

 

@@ -309,11 +309,11 @@ 
      */

     private function getTimestamp()

     {

-        $originalTime = microtime(true);

-        $micro = sprintf("%06d", ($originalTime - floor($originalTime)) * 1000000);

-        $date = new DateTime(date('Y-m-d H:i:s.'.$micro, (int)$originalTime));

+        $originalTime = microtime( true );

+        $micro = sprintf( "%06d", ( $originalTime - floor( $originalTime ) ) * 1000000 );

+        $date = new DateTime( date( 'Y-m-d H:i:s.' . $micro, (int)$originalTime ) );

 

-        return $date->format($this->options['dateFormat']);

+        return $date->format( $this->options[ 'dateFormat' ] );

     }

 

     /**

@@ -322,12 +322,12 @@ 
      * @param  array $context The Context

      * @return string

      */

-    protected function contextToString($context)

+    protected function contextToString( $context )

     {

         $export = '';

-        foreach ($context as $key => $value) {

+        foreach ( $context as $key => $value ) {

             $export .= "{$key}: ";

-            $export .= preg_replace(array(

+            $export .= preg_replace( array(

                 '/=>\s+([a-zA-Z])/im',

                 '/array\(\s+\)/im',

                 '/^  |\G  /m'

@@ -335,10 +335,10 @@ 
                 '=> $1',

                 'array()',

                 '    '

-            ), str_replace('array (', 'array(', var_export($value, true)));

+            ), str_replace( 'array (', 'array(', var_export( $value, true ) ) );

             $export .= PHP_EOL;

         }

-        return str_replace(array('\\\\', '\\\''), array('\\', '\''), rtrim($export));

+        return str_replace( array( '\\\\', '\\\'' ), array( '\\', '\'' ), rtrim( $export ) );

     }

 

     /**

@@ -348,8 +348,8 @@ 
      * @param  string $indent What to use as the indent.

      * @return string

      */

-    protected function indent($string, $indent = '    ')

+    protected function indent( $string, $indent = '    ' )

     {

-        return $indent.str_replace("\n", "\n".$indent, $string);

+        return $indent . str_replace( "\n", "\n" . $indent, $string );

     }

 }

Braces +36 added lines, -50 removed lines

@@ -32,8 +32,7 @@ 
 /**

  * Class documentation

  */

-class Logger extends AbstractLogger

-{

+class Logger extends AbstractLogger {
     /**

      * KLogger options

      *  Anything options not considered 'core' to the logging library should be

@@ -115,28 +114,27 @@ 
      * @internal param string $logFilePrefix The prefix for the log file name

      * @internal param string $logFileExt The extension for the log file

      */

-    public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array())

-    {

+    public function __construct($logDirectory, $logLevelThreshold = LogLevel::DEBUG, array $options = array()) {
         $this->logLevelThreshold = $logLevelThreshold;

         $this->options = array_merge($this->options, $options);

 

         $logDirectory = rtrim($logDirectory, DIRECTORY_SEPARATOR);

-        if ( ! file_exists($logDirectory)) {

+        if ( ! file_exists($logDirectory)) {
             mkdir($logDirectory, $this->defaultPermissions, true);

         }

 

-        if(strpos($logDirectory, 'php://') === 0) {

+        if(strpos($logDirectory, 'php://') === 0) {
             $this->setLogToStdOut($logDirectory);

             $this->setFileHandle('w+');

-        } else {

+        } else {
             $this->setLogFilePath($logDirectory);

-            if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {

+            if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {
                 throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

             }

             $this->setFileHandle('a');

         }

 

-        if ( ! $this->fileHandle) {

+        if ( ! $this->fileHandle) {
             throw new RuntimeException('The file could not be opened. Check permissions.');

         }

     }

@@ -144,22 +142,21 @@ 
     /**

      * @param string $stdOutPath

      */

-    public function setLogToStdOut($stdOutPath) {

+    public function setLogToStdOut($stdOutPath) {
         $this->logFilePath = $stdOutPath;

     }

 

     /**

      * @param string $logDirectory

      */

-    public function setLogFilePath($logDirectory) {

-        if ($this->options['filename']) {

-            if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {

+    public function setLogFilePath($logDirectory) {
+        if ($this->options['filename']) {
+            if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {
                 $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];

-            }

-            else {

+            } else {
                 $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];

             }

-        } else {

+        } else {
             $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];

         }

     }

@@ -169,7 +166,7 @@ 
      *

      * @internal param resource $fileHandle

      */

-    public function setFileHandle($writeMode) {

+    public function setFileHandle($writeMode) {
         $this->fileHandle = fopen($this->logFilePath, $writeMode);

     }

 

@@ -177,9 +174,8 @@ 
     /**

      * Class destructor

      */

-    public function __destruct()

-    {

-        if ($this->fileHandle) {

+    public function __destruct() {
+        if ($this->fileHandle) {
             fclose($this->fileHandle);

         }

     }

@@ -189,8 +185,7 @@ 
      *

      * @param string $dateFormat Valid format string for date()

      */

-    public function setDateFormat($dateFormat)

-    {

+    public function setDateFormat($dateFormat) {
         $this->options['dateFormat'] = $dateFormat;

     }

 

@@ -199,8 +194,7 @@ 
      *

      * @param string $logLevelThreshold The log level threshold

      */

-    public function setLogLevelThreshold($logLevelThreshold)

-    {

+    public function setLogLevelThreshold($logLevelThreshold) {
         $this->logLevelThreshold = $logLevelThreshold;

     }

 

@@ -212,9 +206,8 @@ 
      * @param array $context

      * @return null

      */

-    public function log($level, $message, array $context = array())

-    {

-        if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {

+    public function log($level, $message, array $context = array()) {
+        if ($this->logLevels[$this->logLevelThreshold] < $this->logLevels[$level]) {
             return;

         }

         $message = $this->formatMessage($level, $message, $context);

@@ -227,16 +220,15 @@ 
      * @param string $message Line to write to the log

      * @return void

      */

-    public function write($message)

-    {

-        if (null !== $this->fileHandle) {

-            if (fwrite($this->fileHandle, $message) === false) {

+    public function write($message) {
+        if (null !== $this->fileHandle) {
+            if (fwrite($this->fileHandle, $message) === false) {
                 throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

-            } else {

+            } else {
                 $this->lastLine = trim($message);

                 $this->logLineCount++;

 

-                if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {

+                if ($this->options['flushFrequency'] && $this->logLineCount % $this->options['flushFrequency'] === 0) {
                     fflush($this->fileHandle);

                 }

             }

@@ -248,8 +240,7 @@ 
      *

      * @return string

      */

-    public function getLogFilePath()

-    {

+    public function getLogFilePath() {
         return $this->logFilePath;

     }

 

@@ -258,8 +249,7 @@ 
      *

      * @return string

      */

-    public function getLastLogLine()

-    {

+    public function getLastLogLine() {
         return $this->lastLine;

     }

 

@@ -271,9 +261,8 @@ 
      * @param  array  $context The context

      * @return string

      */

-    protected function formatMessage($level, $message, $context)

-    {

-        if ($this->options['logFormat']) {

+    protected function formatMessage($level, $message, $context) {
+        if ($this->options['logFormat']) {
             $parts = array(

                 'date'          => $this->getTimestamp(),

                 'level'         => strtoupper($level),

@@ -283,15 +272,15 @@ 
                 'context'       => json_encode($context),

             );

             $message = $this->options['logFormat'];

-            foreach ($parts as $part => $value) {

+            foreach ($parts as $part => $value) {
                 $message = str_replace('{'.$part.'}', $value, $message);

             }

 

-        } else {

+        } else {
             $message = "[{$this->getTimestamp()}] [{$level}] {$message}";

         }

 

-        if ($this->options['appendContext'] && ! empty($context)) {

+        if ($this->options['appendContext'] && ! empty($context)) {
             $message .= PHP_EOL.$this->indent($this->contextToString($context));

         }

 

@@ -307,8 +296,7 @@ 
      *

      * @return string

      */

-    private function getTimestamp()

-    {

+    private function getTimestamp() {
         $originalTime = microtime(true);

         $micro = sprintf("%06d", ($originalTime - floor($originalTime)) * 1000000);

         $date = new DateTime(date('Y-m-d H:i:s.'.$micro, (int)$originalTime));

@@ -322,10 +310,9 @@ 
      * @param  array $context The Context

      * @return string

      */

-    protected function contextToString($context)

-    {

+    protected function contextToString($context) {
         $export = '';

-        foreach ($context as $key => $value) {

+        foreach ($context as $key => $value) {
             $export .= "{$key}: ";

             $export .= preg_replace(array(

                 '/=>\s+([a-zA-Z])/im',

@@ -348,8 +335,7 @@ 
      * @param  string $indent What to use as the indent.

      * @return string

      */

-    protected function indent($string, $indent = '    ')

-    {

+    protected function indent($string, $indent = '    ') {
         return $indent.str_replace("\n", "\n".$indent, $string);

     }

 }