Inspection of "Add an installer for extensions & plugins" - gravityview/GravityView - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#1130)

by Zack

created 2018-08-13 18:45 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 			printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' );
 			printf( '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" alt="The GravityView Astronaut Says:" style="float: left; height: 60px; margin-right : 10px;" />' );
 			printf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ),
-				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION , "</h3>\n\n", $version );
+				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION, "</h3>\n\n", $version );
 			printf( '</body>' );
 		}
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 }
 
 /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
-if ( version_compare( phpversion(), '5.3.0' , '<' ) ) {
+if ( version_compare( phpversion(), '5.3.0', '<' ) ) {
 	require GRAVITYVIEW_DIR . 'future/_stubs.php';
 
 /** All looks fine. */

Please login to merge, or discard this patch.

future/includes/class-gv-renderer.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -61,7 +61,7 @@
 block discarded – undo
 		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
 
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
 
 		echo \GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $gravityview->view->ID );

Please login to merge, or discard this patch.

future/includes/class-gv-view.php 4 patches

Indentation -1 removed lines patch added patch discarded remove patch

@@ -62,7 +62,6 @@
 block discarded – undo
 	 *
 	 * Internal static cache for gets, and whatnot.
 	 * This is not persistent, resets across requests.
-
 	 * @internal
 	 */
 	private static $cache = array();

Please login to merge, or discard this patch.

Doc Comments +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -335,7 +335,7 @@  discard block
 block discarded – undo
 	 *                                 rest      A REST call.
 	 * @param \GV\Request $request The request
 	 *
-	 * @return bool|\WP_Error An error if this View shouldn't be rendered here.
+	 * @return \WP_Error|null An error if this View shouldn't be rendered here.
 	 */
 	public function can_render( $context = null, $request = null ) {
 		if ( ! $request ) {
@@ -745,6 +745,7 @@  discard block
 block discarded – undo
 	 * Retrieve the entries for the current view and request.
 	 *
 	 * @param \GV\Request The request. Usued for now.
+	 * @param Request $request
 	 *
 	 * @return \GV\Entry_Collection The entries.
 	 */

Please login to merge, or discard this patch.

Spacing +23 added lines, -24 removed lines patch added patch discarded remove patch

@@ -108,7 +108,7 @@  discard block
 block discarded – undo
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -254,13 +254,13 @@  discard block
 block discarded – undo
 			return $content;
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		/**
 		 * Editing a single entry.
 		 */
 		if ( $entry = $request->is_edit_entry() ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
 		 * Viewing a single entry.
 		 */
 		} else if ( $entry = $request->is_entry() ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
 
 			$error = \GVCommon::check_entry_display( $entry->as_entry() );
 
-			if( is_wp_error( $error ) ) {
+			if ( is_wp_error( $error ) ) {
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing: {message}', array( 'entry_id' => $entry->ID, 'message' => $error->get_error_message() ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field( $join_column );
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field( $join_on_column );
 
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
 		}
 
 		return $joins;
@@ -495,10 +495,10 @@  discard block
 block discarded – undo
 
 			list( $join, $join_column, $join_on, $join_on_column ) = $meta;
 
-			$forms_ids [] = GF_Form::by_id( $join_on );
+			$forms_ids [ ] = GF_Form::by_id( $join_on );
 		}
 
-		return ( !empty( $forms_ids) ) ? $forms_ids : null;
+		return ( ! empty( $forms_ids ) ) ? $forms_ids : null;
 	}
 
 	/**
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
 		if ( ! $view->form ) {
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
 				'view_id' => $view->ID,
-				'form_id' => $view->_gravityview_form_id ? : 0,
+				'form_id' => $view->_gravityview_form_id ?: 0,
 			) );
 		}
 
@@ -755,28 +755,27 @@  discard block
 block discarded – undo
 			 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
 			 */
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $this->settings->as_atts(), $this->form->ID );
-			$parameters['context_view_id'] = $this->ID;
+			$parameters[ 'context_view_id' ] = $this->ID;
 			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
 
 			if ( $request instanceof REST\Request ) {
 				$atts = $this->settings->as_atts();
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
-						'paging' => array( 'page_size' => $atts['page_size'] ),
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
 					) );
-				$parameters['paging'] = $paging_parameters['paging'];
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
 			}
 
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
 
 			if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) {
 				/**
 				 * New \GF_Query stuff :)
 				 */
-				$query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
+				$query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
 
-				$query->limit( $parameters['paging']['page_size'] )
-					->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
+					->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
 
 				/**
 				 * Any joins?
@@ -816,15 +815,15 @@  discard block
 block discarded – undo
 				} );
 			} else {
 				$entries = $this->form->entries
-					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
+					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
 					->offset( $this->settings->get( 'offset' ) )
-					->limit( $parameters['paging']['page_size'] )
+					->limit( $parameters[ 'paging' ][ 'page_size' ] )
 					->page( $page );
 
-				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
+				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
 					$field = new \GV\Field();
-					$field->ID = $parameters['sorting']['key'];
-					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+					$field->ID = $parameters[ 'sorting' ][ 'key' ];
+					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
 					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
 				}
 			}

Please login to merge, or discard this patch.

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -230,8 +230,9 @@
 block discarded – undo
 		 * Check permissions.
 		 */
 		while ( $error = $view->can_render( null, $request ) ) {
-			if ( ! is_wp_error( $error ) )
-				break;
+			if ( ! is_wp_error( $error ) ) {
+							break;
+			}
 
 			switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
 				case 'post_password_required':

Please login to merge, or discard this patch.

future/includes/class-gv-template-entry-legacy.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -34,7 +34,7 @@
 block discarded – undo
 		global $post;
 
 		if ( $post ) {
-			$context['post'] = $post;
+			$context[ 'post' ] = $post;
 		}
 
 		\GV\Mocks\Legacy_Context::push( $context );

Please login to merge, or discard this patch.

future/includes/class-gv-template-view-list.php 2 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -64,9 +64,9 @@
 block discarded – undo
 		 */
 		$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
 
-		$extras['hide_empty'] = $hide_empty;
-		$extras['label'] = $label;
-		$extras['value'] = $value;
+		$extras[ 'hide_empty' ] = $hide_empty;
+		$extras[ 'label' ] = $label;
+		$extras[ 'value' ] = $value;
 
 		return \gravityview_field_output( $extras, $context );
 	}

Please login to merge, or discard this patch.

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -151,11 +151,11 @@  discard block
 block discarded – undo
 		do_action( 'gravityview/template/list/body/before', $context );
 
 		/**
-		* @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/list/body/before`
-		* @since 1.0.7
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/list/body/before`
+		 * @since 1.0.7
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( 'gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */ );
 	}
 
@@ -177,11 +177,11 @@  discard block
 block discarded – undo
 		do_action( 'gravityview/template/list/body/after', $context );
 
 		/**
-		* @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/list/body/after`
-		* @since 1.0.7
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/list/body/after`
+		 * @since 1.0.7
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( 'gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */ );
 	}
 
@@ -212,11 +212,11 @@  discard block
 block discarded – undo
 		$zone = str_replace( '/', '_', $zone );
 
 		/**
-		* @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/list/entry/$zone/before`
-		* @since 1.0.7
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/list/entry/$zone/before`
+		 * @since 1.0.7
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( sprintf( 'gravityview_list_entry%sbefore', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
 	}
 
@@ -247,11 +247,11 @@  discard block
 block discarded – undo
 		$zone = str_replace( '/', '_', $zone );
 
 		/**
-		* @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/list/entry/after`
-		* @since 1.0.7
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/list/entry/after`
+		 * @since 1.0.7
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( sprintf( 'gravityview_list_entry%safter', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
 	}
 }

Please login to merge, or discard this patch.

future/includes/class-gv-core.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -113,14 +113,14 @@
 block discarded – undo
 
 		/** Require critical legacy core files. @todo Deprecate */
 		require_once $this->plugin->dir( 'includes/helper-functions.php' );
-		require_once $this->plugin->dir( 'includes/class-common.php');
-		require_once $this->plugin->dir( 'includes/connector-functions.php');
+		require_once $this->plugin->dir( 'includes/class-common.php' );
+		require_once $this->plugin->dir( 'includes/connector-functions.php' );
 		require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' );
 		require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' );
 		require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' );
 		require_once $this->plugin->dir( 'includes/class-admin.php' );
-		require_once $this->plugin->dir( 'includes/class-post-types.php');
-		require_once $this->plugin->dir( 'includes/class-cache.php');
+		require_once $this->plugin->dir( 'includes/class-post-types.php' );
+		require_once $this->plugin->dir( 'includes/class-cache.php' );
 
 		/**
 		 * GravityView extensions and widgets.

Please login to merge, or discard this patch.

future/includes/class-gv-request.php 2 patches

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -112,10 +112,10 @@
 block discarded – undo
 	 */
 	public function is_edit_entry() {
 		/**
-		* @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
-		* The Edit Entry functionality overrides this value.
-		* @param boolean $is_edit_entry
-		*/
+		 * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
+		 * The Edit Entry functionality overrides this value.
+		 * @param boolean $is_edit_entry
+		 */
 		if ( ( $entry = $this->is_entry() ) && apply_filters( 'gravityview_is_edit_entry', false ) ) {
 			return $entry;
 		}

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -45,7 +45,7 @@  discard block
 block discarded – undo
 	 */
 	public static function is_add_oembed_preview() {
 		/** The preview request is a parse-embed AJAX call without a type set. */
-		return ( self::is_ajax() && ! empty( $_POST['action'] ) && $_POST['action'] == 'parse-embed' && ! isset( $_POST['type'] ) );
+		return ( self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
 	}
 
 	/**
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 	 * @return boolean
 	 */
 	public static function is_rest() {
-		return ! empty( $GLOBALS['wp']->query_vars['rest_route'] );
+		return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] );
 	}
 
 	/**
@@ -141,15 +141,15 @@  discard block
 block discarded – undo
 			$get = $_GET;
 		}
 
-		unset( $get['mode'] );
+		unset( $get[ 'mode' ] );
 
 		$get = array_filter( $get, 'gravityview_is_not_empty_string' );
 
-		if( $has_field_key = $this->_has_field_key( $get ) ) {
+		if ( $has_field_key = $this->_has_field_key( $get ) ) {
 			return true;
 		}
 
-		return isset( $get['gv_search'] ) || isset( $get['gv_start'] ) || isset( $get['gv_end'] ) || isset( $get['gv_by'] ) || isset( $get['gv_id'] );
+		return isset( $get[ 'gv_search' ] ) || isset( $get[ 'gv_start' ] ) || isset( $get[ 'gv_end' ] ) || isset( $get[ 'gv_by' ] ) || isset( $get[ 'gv_id' ] );
 	}
 
 	/**
@@ -172,13 +172,13 @@  discard block
 block discarded – undo
 
 		$meta = array();
 		foreach ( $fields as $field ) {
-			if( empty( $field->_gf_field_class_name ) ) {
-				$meta[] = preg_quote( $field->name );
+			if ( empty( $field->_gf_field_class_name ) ) {
+				$meta[ ] = preg_quote( $field->name );
 			}
 		}
 
 		foreach ( $get as $key => $value ) {
-			if ( preg_match('/^filter_(([0-9_]+)|'. implode( '|', $meta ) .')$/sm', $key ) ) {
+			if ( preg_match( '/^filter_(([0-9_]+)|' . implode( '|', $meta ) . ')$/sm', $key ) ) {
 				$has_field_key = true;
 				break;
 			}

Please login to merge, or discard this patch.

future/includes/class-gv-collection-entry-sort.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -78,7 +78,7 @@
 block discarded – undo
 		if ( $this->field ) {
 			return array(
 				'key' => $this->field->ID,
-				'direction' => $this->direction ? : self::ASC,
+				'direction' => $this->direction ?: self::ASC,
 				'is_numeric' => self::ALPHA ? true : false,
 			);
 		}

Please login to merge, or discard this patch.

future/includes/class-gv-entry-multi.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -44,7 +44,7 @@  discard block
 block discarded – undo
 			if ( ! $entry instanceof Entry ) {
 				continue;
 			}
-			$_entry->entries[ $entry['form_id'] ]  = &$entry;
+			$_entry->entries[ $entry[ 'form_id' ] ] = &$entry;
 		}
 		return $_entry;
 	}
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 
 			foreach ( $this->entries as $entry ) {
 				$entry = $entry->as_entry();
-				$_entry['_multi'][ $entry['form_id'] ] = $entry;
+				$_entry[ '_multi' ][ $entry[ 'form_id' ] ] = $entry;
 			}
 		}
 

Please login to merge, or discard this patch.

		@@ -335,7 +335,7 @@ discard block
		block discarded – undo
335	335	* rest A REST call.
336	336	* @param \GV\Request $request The request
337	337	*
338		- * @return bool\|\WP_Error An error if this View shouldn't be rendered here.
	338	+ * @return \WP_Error\|null An error if this View shouldn't be rendered here.
339	339	*/
340	340	public function can_render( $context = null, $request = null ) {
341	341	if ( ! $request ) {
		@@ -745,6 +745,7 @@ discard block
		block discarded – undo
745	745	* Retrieve the entries for the current view and request.
746	746	*
747	747	* @param \GV\Request The request. Usued for now.
	748	+ * @param Request $request
748	749	*
749	750	* @return \GV\Entry_Collection The entries.
750	751	*/

		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	$supports = array( 'title', 'revisions' );
109	109
110	110	if ( $is_hierarchical ) {
111		- $supports[] = 'page-attributes';
	111	+ $supports[ ] = 'page-attributes';
112	112	}
113	113
114	114	/**
		@@ -254,13 +254,13 @@ discard block
		block discarded – undo
254	254	return $content;
255	255	}
256	256
257		- $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
	257	+ $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
258	258
259	259	/**
260	260	* Editing a single entry.
261	261	*/
262	262	if ( $entry = $request->is_edit_entry() ) {
263		- if ( $entry['status'] != 'active' ) {
	263	+ if ( $entry[ 'status' ] != 'active' ) {
264	264	gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
265	265	return __( 'You are not allowed to view this content.', 'gravityview' );
266	266	}
		@@ -271,7 +271,7 @@ discard block
		block discarded – undo
271	271	}
272	272
273	273	if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
274		- if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
	274	+ if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
275	275	gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
276	276	return __( 'You are not allowed to view this content.', 'gravityview' );
277	277	}
		@@ -284,7 +284,7 @@ discard block
		block discarded – undo
284	284	* Viewing a single entry.
285	285	*/
286	286	} else if ( $entry = $request->is_entry() ) {
287		- if ( $entry['status'] != 'active' ) {
	287	+ if ( $entry[ 'status' ] != 'active' ) {
288	288	gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
289	289	return __( 'You are not allowed to view this content.', 'gravityview' );
290	290	}
		@@ -295,7 +295,7 @@ discard block
		block discarded – undo
295	295	}
296	296
297	297	if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
298		- if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
	298	+ if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
299	299	gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
300	300	return __( 'You are not allowed to view this content.', 'gravityview' );
301	301	}
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303
304	304	$error = \GVCommon::check_entry_display( $entry->as_entry() );
305	305
306		- if( is_wp_error( $error ) ) {
	306	+ if ( is_wp_error( $error ) ) {
307	307	gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing: {message}', array( 'entry_id' => $entry->ID, 'message' => $error->get_error_message() ) );
308	308	return __( 'You are not allowed to view this content.', 'gravityview' );
309	309	}
		@@ -453,7 +453,7 @@ discard block
		block discarded – undo
453	453	$join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field( $join_column );
454	454	$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field( $join_on_column );
455	455
456		- $joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
	456	+ $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
457	457	}
458	458
459	459	return $joins;
		@@ -495,10 +495,10 @@ discard block
		block discarded – undo
495	495
496	496	list( $join, $join_column, $join_on, $join_on_column ) = $meta;
497	497
498		- $forms_ids [] = GF_Form::by_id( $join_on );
	498	+ $forms_ids [ ] = GF_Form::by_id( $join_on );
499	499	}
500	500
501		- return ( !empty( $forms_ids) ) ? $forms_ids : null;
	501	+ return ( ! empty( $forms_ids ) ) ? $forms_ids : null;
502	502	}
503	503
504	504	/**
		@@ -529,7 +529,7 @@ discard block
		block discarded – undo
529	529	if ( ! $view->form ) {
530	530	gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
531	531	'view_id' => $view->ID,
532		- 'form_id' => $view->_gravityview_form_id ? : 0,
	532	+ 'form_id' => $view->_gravityview_form_id ?: 0,
533	533	) );
534	534	}
535	535
		@@ -755,28 +755,27 @@ discard block
		block discarded – undo
755	755	* @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
756	756	*/
757	757	$parameters = \GravityView_frontend::get_view_entries_parameters( $this->settings->as_atts(), $this->form->ID );
758		- $parameters['context_view_id'] = $this->ID;
	758	+ $parameters[ 'context_view_id' ] = $this->ID;
759	759	$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
760	760
761	761	if ( $request instanceof REST\Request ) {
762	762	$atts = $this->settings->as_atts();
763	763	$paging_parameters = wp_parse_args( $request->get_paging(), array(
764		- 'paging' => array( 'page_size' => $atts['page_size'] ),
	764	+ 'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
765	765	) );
766		- $parameters['paging'] = $paging_parameters['paging'];
	766	+ $parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
767	767	}
768	768
769		- $page = Utils::get( $parameters['paging'], 'current_page' ) ?
770		- : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
	769	+ $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
771	770
772	771	if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) {
773	772	/**
774	773	* New \GF_Query stuff :)
775	774	*/
776		- $query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
	775	+ $query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
777	776
778		- $query->limit( $parameters['paging']['page_size'] )
779		- ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
	777	+ $query->limit( $parameters[ 'paging' ][ 'page_size' ] )
	778	+ ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
780	779
781	780	/**
782	781	* Any joins?
		@@ -816,15 +815,15 @@ discard block
		block discarded – undo
816	815	} );
817	816	} else {
818	817	$entries = $this->form->entries
819		- ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
	818	+ ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
820	819	->offset( $this->settings->get( 'offset' ) )
821		- ->limit( $parameters['paging']['page_size'] )
	820	+ ->limit( $parameters[ 'paging' ][ 'page_size' ] )
822	821	->page( $page );
823	822
824		- if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
	823	+ if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
825	824	$field = new \GV\Field();
826		- $field->ID = $parameters['sorting']['key'];
827		- $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
	825	+ $field->ID = $parameters[ 'sorting' ][ 'key' ];
	826	+ $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
828	827	$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
829	828	}
830	829	}

		@@ -230,8 +230,9 @@
		block discarded – undo
230	230	* Check permissions.
231	231	*/
232	232	while ( $error = $view->can_render( null, $request ) ) {
233		- if ( ! is_wp_error( $error ) )
234		- break;
	233	+ if ( ! is_wp_error( $error ) ) {
	234	+ break;
	235	+ }
235	236
236	237	switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
237	238	case 'post_password_required':

		@@ -151,11 +151,11 @@ discard block
		block discarded – undo
151	151	do_action( 'gravityview/template/list/body/before', $context );
152	152
153	153	/**
154		- * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
155		- * @deprecated Use `gravityview/template/list/body/before`
156		- * @since 1.0.7
157		- * @param \GravityView_View $gravityview_view Current GravityView_View object.
158		- */
	154	+ * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
	155	+ * @deprecated Use `gravityview/template/list/body/before`
	156	+ * @since 1.0.7
	157	+ * @param \GravityView_View $gravityview_view Current GravityView_View object.
	158	+ */
159	159	do_action( 'gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */ );
160	160	}
161	161
		@@ -177,11 +177,11 @@ discard block
		block discarded – undo
177	177	do_action( 'gravityview/template/list/body/after', $context );
178	178
179	179	/**
180		- * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
181		- * @deprecated Use `gravityview/template/list/body/after`
182		- * @since 1.0.7
183		- * @param \GravityView_View $gravityview_view Current GravityView_View object.
184		- */
	180	+ * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
	181	+ * @deprecated Use `gravityview/template/list/body/after`
	182	+ * @since 1.0.7
	183	+ * @param \GravityView_View $gravityview_view Current GravityView_View object.
	184	+ */
185	185	do_action( 'gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */ );
186	186	}
187	187
		@@ -212,11 +212,11 @@ discard block
		block discarded – undo
212	212	$zone = str_replace( '/', '_', $zone );
213	213
214	214	/**
215		- * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
216		- * @deprecated Use `gravityview/template/list/entry/$zone/before`
217		- * @since 1.0.7
218		- * @param \GravityView_View $gravityview_view Current GravityView_View object.
219		- */
	215	+ * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
	216	+ * @deprecated Use `gravityview/template/list/entry/$zone/before`
	217	+ * @since 1.0.7
	218	+ * @param \GravityView_View $gravityview_view Current GravityView_View object.
	219	+ */
220	220	do_action( sprintf( 'gravityview_list_entry%sbefore', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
221	221	}
222	222
		@@ -247,11 +247,11 @@ discard block
		block discarded – undo
247	247	$zone = str_replace( '/', '_', $zone );
248	248
249	249	/**
250		- * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
251		- * @deprecated Use `gravityview/template/list/entry/after`
252		- * @since 1.0.7
253		- * @param \GravityView_View $gravityview_view Current GravityView_View object.
254		- */
	250	+ * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
	251	+ * @deprecated Use `gravityview/template/list/entry/after`
	252	+ * @since 1.0.7
	253	+ * @param \GravityView_View $gravityview_view Current GravityView_View object.
	254	+ */
255	255	do_action( sprintf( 'gravityview_list_entry%safter', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
256	256	}
257	257	}

		@@ -113,14 +113,14 @@
		block discarded – undo
113	113
114	114	/** Require critical legacy core files. @todo Deprecate */
115	115	require_once $this->plugin->dir( 'includes/helper-functions.php' );
116		- require_once $this->plugin->dir( 'includes/class-common.php');
117		- require_once $this->plugin->dir( 'includes/connector-functions.php');
	116	+ require_once $this->plugin->dir( 'includes/class-common.php' );
	117	+ require_once $this->plugin->dir( 'includes/connector-functions.php' );
118	118	require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' );
119	119	require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' );
120	120	require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' );
121	121	require_once $this->plugin->dir( 'includes/class-admin.php' );
122		- require_once $this->plugin->dir( 'includes/class-post-types.php');
123		- require_once $this->plugin->dir( 'includes/class-cache.php');
	122	+ require_once $this->plugin->dir( 'includes/class-post-types.php' );
	123	+ require_once $this->plugin->dir( 'includes/class-cache.php' );
124	124
125	125	/**
126	126	* GravityView extensions and widgets.

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' );
26	26	printf( '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" alt="The GravityView Astronaut Says:" style="float: left; height: 60px; margin-right : 10px;" />' );
27	27	printf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ),
28		- '<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION , "</h3>\n\n", $version );
	28	+ '<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION, "</h3>\n\n", $version );
29	29	printf( '</body>' );
30	30	}
31	31
		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	}
35	35
36	36	/** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
37		-if ( version_compare( phpversion(), '5.3.0' , '<' ) ) {
	37	+if ( version_compare( phpversion(), '5.3.0', '<' ) ) {
38	38	require GRAVITYVIEW_DIR . 'future/_stubs.php';
39	39
40	40	/** All looks fine. */

		@@ -61,7 +61,7 @@
		block discarded – undo
61	61	$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
62	62	$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
63	63
64		- $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
	64	+ $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
65	65	$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
66	66
67	67	echo \GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $gravityview->view->ID );

		@@ -62,7 +62,6 @@
		block discarded – undo
62	62	*
63	63	* Internal static cache for gets, and whatnot.
64	64	* This is not persistent, resets across requests.
65		-
66	65	* @internal
67	66	*/
68	67	private static $cache = array();

		@@ -34,7 +34,7 @@
		block discarded – undo
34	34	global $post;
35	35
36	36	if ( $post ) {
37		- $context['post'] = $post;
	37	+ $context[ 'post' ] = $post;
38	38	}
39	39
40	40	\GV\Mocks\Legacy_Context::push( $context );

		@@ -64,9 +64,9 @@
		block discarded – undo
64	64	*/
65	65	$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
66	66
67		- $extras['hide_empty'] = $hide_empty;
68		- $extras['label'] = $label;
69		- $extras['value'] = $value;
	67	+ $extras[ 'hide_empty' ] = $hide_empty;
	68	+ $extras[ 'label' ] = $label;
	69	+ $extras[ 'value' ] = $value;
70	70
71	71	return \gravityview_field_output( $extras, $context );
72	72	}

		@@ -112,10 +112,10 @@
		block discarded – undo
112	112	*/
113	113	public function is_edit_entry() {
114	114	/**
115		- * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
116		- * The Edit Entry functionality overrides this value.
117		- * @param boolean $is_edit_entry
118		- */
	115	+ * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
	116	+ * The Edit Entry functionality overrides this value.
	117	+ * @param boolean $is_edit_entry
	118	+ */
119	119	if ( ( $entry = $this->is_entry() ) && apply_filters( 'gravityview_is_edit_entry', false ) ) {
120	120	return $entry;
121	121	}

		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45	*/
46	46	public static function is_add_oembed_preview() {
47	47	/** The preview request is a parse-embed AJAX call without a type set. */
48		- return ( self::is_ajax() && ! empty( $_POST['action'] ) && $_POST['action'] == 'parse-embed' && ! isset( $_POST['type'] ) );
	48	+ return ( self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
49	49	}
50	50
51	51	/**
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	* @return boolean
64	64	*/
65	65	public static function is_rest() {
66		- return ! empty( $GLOBALS['wp']->query_vars['rest_route'] );
	66	+ return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] );
67	67	}
68	68
69	69	/**
		@@ -141,15 +141,15 @@ discard block
		block discarded – undo
141	141	$get = $_GET;
142	142	}
143	143
144		- unset( $get['mode'] );
	144	+ unset( $get[ 'mode' ] );
145	145
146	146	$get = array_filter( $get, 'gravityview_is_not_empty_string' );
147	147
148		- if( $has_field_key = $this->_has_field_key( $get ) ) {
	148	+ if ( $has_field_key = $this->_has_field_key( $get ) ) {
149	149	return true;
150	150	}
151	151
152		- return isset( $get['gv_search'] ) \|\| isset( $get['gv_start'] ) \|\| isset( $get['gv_end'] ) \|\| isset( $get['gv_by'] ) \|\| isset( $get['gv_id'] );
	152	+ return isset( $get[ 'gv_search' ] ) \|\| isset( $get[ 'gv_start' ] ) \|\| isset( $get[ 'gv_end' ] ) \|\| isset( $get[ 'gv_by' ] ) \|\| isset( $get[ 'gv_id' ] );
153	153	}
154	154
155	155	/**
		@@ -172,13 +172,13 @@ discard block
		block discarded – undo
172	172
173	173	$meta = array();
174	174	foreach ( $fields as $field ) {
175		- if( empty( $field->_gf_field_class_name ) ) {
176		- $meta[] = preg_quote( $field->name );
	175	+ if ( empty( $field->_gf_field_class_name ) ) {
	176	+ $meta[ ] = preg_quote( $field->name );
177	177	}
178	178	}
179	179
180	180	foreach ( $get as $key => $value ) {
181		- if ( preg_match('/^filter_(([0-9_]+)\|'. implode( '\|', $meta ) .')$/sm', $key ) ) {
	181	+ if ( preg_match( '/^filter_(([0-9_]+)\|' . implode( '\|', $meta ) . ')$/sm', $key ) ) {
182	182	$has_field_key = true;
183	183	break;
184	184	}

		@@ -78,7 +78,7 @@
		block discarded – undo
78	78	if ( $this->field ) {
79	79	return array(
80	80	'key' => $this->field->ID,
81		- 'direction' => $this->direction ? : self::ASC,
	81	+ 'direction' => $this->direction ?: self::ASC,
82	82	'is_numeric' => self::ALPHA ? true : false,
83	83	);
84	84	}

		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	if ( ! $entry instanceof Entry ) {
45	45	continue;
46	46	}
47		- $_entry->entries[ $entry['form_id'] ] = &$entry;
	47	+ $_entry->entries[ $entry[ 'form_id' ] ] = &$entry;
48	48	}
49	49	return $_entry;
50	50	}
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65
66	66	foreach ( $this->entries as $entry ) {
67	67	$entry = $entry->as_entry();
68		- $_entry['_multi'][ $entry['form_id'] ] = $entry;
	68	+ $_entry[ '_multi' ][ $entry[ 'form_id' ] ] = $entry;
69	69	}
70	70	}
71	71

gravityview / GravityView

Pull Request — develop (#1130)

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation -1 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -24 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch