Completed
Push — develop ( b415b2...468050 )
by Zack
27:26 queued 11:00
created
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
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 );
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
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();
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 		$slug = apply_filters( 'gravityview_slug', 'view' );
210 210
 		$rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );
211 211
 
212
-		add_filter( 'query_vars', function( $query_vars ) { 
212
+		add_filter( 'query_vars', function( $query_vars ) {
213 213
 			$query_vars[] = 'csv';
214 214
 			return $query_vars;
215 215
 		} );
@@ -254,8 +254,9 @@  discard block
 block discarded – undo
254 254
 		 * Check permissions.
255 255
 		 */
256 256
 		while ( $error = $view->can_render( null, $request ) ) {
257
-			if ( ! is_wp_error( $error ) )
258
-				break;
257
+			if ( ! is_wp_error( $error ) ) {
258
+							break;
259
+			}
259 260
 
260 261
 			switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
261 262
 				case 'post_password_required':
Please login to merge, or discard this patch.
Spacing   +25 added lines, -26 removed lines patch added patch discarded remove patch
@@ -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
 		/**
@@ -210,11 +210,11 @@  discard block
 block discarded – undo
210 210
 		$rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );
211 211
 
212 212
 		add_filter( 'query_vars', function( $query_vars ) { 
213
-			$query_vars[] = 'csv';
213
+			$query_vars[ ] = 'csv';
214 214
 			return $query_vars;
215 215
 		} );
216 216
 
217
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) {
217
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) {
218 218
 			call_user_func_array( 'add_rewrite_rule', $rule );
219 219
 		}
220 220
 	}
@@ -282,13 +282,13 @@  discard block
 block discarded – undo
282 282
 			return $content;
283 283
 		}
284 284
 
285
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
285
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
286 286
 
287 287
 		/**
288 288
 		 * Editing a single entry.
289 289
 		 */
290 290
 		if ( $entry = $request->is_edit_entry() ) {
291
-			if ( $entry['status'] != 'active' ) {
291
+			if ( $entry[ 'status' ] != 'active' ) {
292 292
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
293 293
 				return __( 'You are not allowed to view this content.', 'gravityview' );
294 294
 			}
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 			}
300 300
 
301 301
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
302
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
302
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
303 303
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
304 304
 					return __( 'You are not allowed to view this content.', 'gravityview' );
305 305
 				}
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 		 * Viewing a single entry.
313 313
 		 */
314 314
 		} else if ( $entry = $request->is_entry() ) {
315
-			if ( $entry['status'] != 'active' ) {
315
+			if ( $entry[ 'status' ] != 'active' ) {
316 316
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
317 317
 				return __( 'You are not allowed to view this content.', 'gravityview' );
318 318
 			}
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 			}
324 324
 
325 325
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
326
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
326
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
327 327
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
328 328
 					return __( 'You are not allowed to view this content.', 'gravityview' );
329 329
 				}
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 
332 332
 			$error = \GVCommon::check_entry_display( $entry->as_entry(), $view );
333 333
 
334
-			if( is_wp_error( $error ) ) {
334
+			if ( is_wp_error( $error ) ) {
335 335
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing: {message}', array( 'entry_id' => $entry->ID, 'message' => $error->get_error_message() ) );
336 336
 				return __( 'You are not allowed to view this content.', 'gravityview' );
337 337
 			}
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field( $join_column );
490 490
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field( $join_on_column );
491 491
 
492
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
492
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
493 493
 		}
494 494
 
495 495
 		return $joins;
@@ -531,10 +531,10 @@  discard block
 block discarded – undo
531 531
 
532 532
 			list( $join, $join_column, $join_on, $join_on_column ) = $meta;
533 533
 
534
-			$forms_ids [] = GF_Form::by_id( $join_on );
534
+			$forms_ids [ ] = GF_Form::by_id( $join_on );
535 535
 		}
536 536
 
537
-		return ( !empty( $forms_ids) ) ? $forms_ids : null;
537
+		return ( ! empty( $forms_ids ) ) ? $forms_ids : null;
538 538
 	}
539 539
 
540 540
 	/**
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
 		if ( ! $view->form ) {
566 566
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
567 567
 				'view_id' => $view->ID,
568
-				'form_id' => $view->_gravityview_form_id ? : 0,
568
+				'form_id' => $view->_gravityview_form_id ?: 0,
569 569
 			) );
570 570
 		}
571 571
 
@@ -791,28 +791,27 @@  discard block
 block discarded – undo
791 791
 			 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
792 792
 			 */
793 793
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $this->settings->as_atts(), $this->form->ID );
794
-			$parameters['context_view_id'] = $this->ID;
794
+			$parameters[ 'context_view_id' ] = $this->ID;
795 795
 			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
796 796
 
797 797
 			if ( $request instanceof REST\Request ) {
798 798
 				$atts = $this->settings->as_atts();
799 799
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
800
-						'paging' => array( 'page_size' => $atts['page_size'] ),
800
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
801 801
 					) );
802
-				$parameters['paging'] = $paging_parameters['paging'];
802
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
803 803
 			}
804 804
 
805
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
806
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
805
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
807 806
 
808 807
 			if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) {
809 808
 				/**
810 809
 				 * New \GF_Query stuff :)
811 810
 				 */
812
-				$query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
811
+				$query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
813 812
 
814
-				$query->limit( $parameters['paging']['page_size'] )
815
-					->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
813
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
814
+					->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
816 815
 
817 816
 				/**
818 817
 				 * Any joins?
@@ -852,15 +851,15 @@  discard block
 block discarded – undo
852 851
 				} );
853 852
 			} else {
854 853
 				$entries = $this->form->entries
855
-					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
854
+					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
856 855
 					->offset( $this->settings->get( 'offset' ) )
857
-					->limit( $parameters['paging']['page_size'] )
856
+					->limit( $parameters[ 'paging' ][ 'page_size' ] )
858 857
 					->page( $page );
859 858
 
860
-				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
859
+				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
861 860
 					$field = new \GV\Field();
862
-					$field->ID = $parameters['sorting']['key'];
863
-					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
861
+					$field->ID = $parameters[ 'sorting' ][ 'key' ];
862
+					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
864 863
 					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
865 864
 				}
866 865
 			}
Please login to merge, or discard this patch.
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -795,6 +795,7 @@
 block discarded – undo
795 795
 	 * Retrieve the entries for the current view and request.
796 796
 	 *
797 797
 	 * @param \GV\Request The request. Unused for now.
798
+	 * @param Request $request
798 799
 	 *
799 800
 	 * @return \GV\Entry_Collection The entries.
800 801
 	 */
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
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 );
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
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.
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
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
 		}
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
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
 			}
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
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
 		}
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
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
 
Please login to merge, or discard this patch.
future/includes/class-gv-wrappers.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,8 +50,8 @@
 block discarded – undo
50 50
 		/**
51 51
 		 * By array.
52 52
 		 */
53
-		if ( is_array( $view ) && ! empty( $view['id'] ) ) {
54
-			return $this->get( $view['id'] );
53
+		if ( is_array( $view ) && ! empty( $view[ 'id' ] ) ) {
54
+			return $this->get( $view[ 'id' ] );
55 55
 		}
56 56
 
57 57
 		/**
Please login to merge, or discard this patch.
future/includes/class-gv-settings-view.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 		) );
267 267
 
268 268
 		if ( version_compare( \GFCommon::$version, '2.3-beta-4', '>=' ) ) {
269
-			$default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' );
269
+			$default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' );
270 270
 		}
271 271
 
272 272
 		/**
@@ -286,8 +286,8 @@  discard block
 block discarded – undo
286 286
 		// By default, we only want the key => value pairing, not the whole array.
287 287
 		if ( ! $detailed ) {
288 288
 			$defaults = array();
289
-			foreach( $default_settings as $key => $value ) {
290
-				$defaults[ $key ] = $value['value'];
289
+			foreach ( $default_settings as $key => $value ) {
290
+				$defaults[ $key ] = $value[ 'value' ];
291 291
 			}
292 292
 			return $defaults;
293 293
 
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 				// If the $group argument is set for the method,
299 299
 				// ignore any settings that aren't in that group.
300 300
 				if ( ! empty( $group ) && is_string( $group ) ) {
301
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
301
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
302 302
 						unset( $default_settings[ $key ] );
303 303
 					}
304 304
 				}
Please login to merge, or discard this patch.