Completed
Push — develop ( 1770cc...fc5d63 )
by Zack
20:40 queued 46s
created
includes/class-cache.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		/**
82 82
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
83 83
 		 */
84
-		foreach( $this->lead_db_columns as $column ) {
84
+		foreach ( $this->lead_db_columns as $column ) {
85 85
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
86 86
 		}
87 87
 
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 			return;
115 115
 		}
116 116
 
117
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry['form_id'], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) );
117
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) );
118 118
 
119
-		$this->blacklist_add( $entry['form_id'] );
119
+		$this->blacklist_add( $entry[ 'form_id' ] );
120 120
 	}
121 121
 
122 122
 	/**
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
 	 */
130 130
 	public function entry_updated( $form, $lead_id ) {
131 131
 
132
-		gravityview()->log->debug(' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form['id'], 'entry_id' => $lead_id ) );
132
+		gravityview()->log->debug( ' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form[ 'id' ], 'entry_id' => $lead_id ) );
133 133
 
134
-		$this->blacklist_add( $form['id'] );
134
+		$this->blacklist_add( $form[ 'id' ] );
135 135
 	}
136 136
 
137 137
 	/**
@@ -146,9 +146,9 @@  discard block
 block discarded – undo
146 146
 	 */
147 147
 	public function entry_created( $entry, $form ) {
148 148
 
149
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) );
149
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) );
150 150
 
151
-		$this->blacklist_add( $form['id'] );
151
+		$this->blacklist_add( $form[ 'id' ] );
152 152
 	}
153 153
 
154 154
 	/**
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 			return;
165 165
 		}
166 166
 
167
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) );
167
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) );
168 168
 
169
-		$this->blacklist_add( $form['id'] );
169
+		$this->blacklist_add( $form[ 'id' ] );
170 170
 	}
171 171
 
172 172
 	/**
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 		// Normally just one form, but supports multiple forms
186 186
 		//
187 187
 		// Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14`
188
-		$forms = 'f:' . implode( '-f:', (array) $form_ids );
188
+		$forms = 'f:' . implode( '-f:', (array)$form_ids );
189 189
 
190 190
 		// Prefix for transient keys
191 191
 		// Now the prefix would be: `gv-cache-f:12-f:5-f:14-`
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 		) ) );
243 243
 
244 244
 		// Add the passed form IDs
245
-		$blacklist = array_merge( (array) $blacklist, $form_ids );
245
+		$blacklist = array_merge( (array)$blacklist, $form_ids );
246 246
 
247 247
 		// Don't duplicate
248 248
 		$blacklist = array_unique( $blacklist );
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 
266 266
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
267 267
 
268
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
268
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
269 269
 
270 270
 		gravityview()->log->debug( 'Removing form IDs from cache blacklist', array( 'data' => array(
271 271
 			'$form_ids'     => $form_ids,
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 			return false;
299 299
 		}
300 300
 
301
-		foreach ( (array) $form_ids as $form_id ) {
301
+		foreach ( (array)$form_ids as $form_id ) {
302 302
 
303 303
 			if ( in_array( $form_id, $blacklist ) ) {
304 304
 
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
371 371
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
372 372
 			 */
373
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
373
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
374 374
 
375 375
 			gravityview()->log->debug( 'Setting cache with transient key {key} for {cache_time} seconds', array( 'key' => $this->key, 'cache_time' => $cache_time ) );
376 376
 
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 			return;
407 407
 		}
408 408
 
409
-		foreach ( (array) $form_ids as $form_id ) {
409
+		foreach ( (array)$form_ids as $form_id ) {
410 410
 
411 411
 			$key = '_transient_gv-cache-';
412 412
 
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
522 522
 	public function use_cache() {
523 523
 
524 524
 		// Exit early if debugging (unless running PHPUnit)
525
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined('DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
525
+		if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
526 526
 			return apply_filters( 'gravityview_use_cache', false, $this );
527 527
 		}
528 528
 
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
 
531 531
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
532 532
 
533
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
533
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
534 534
 
535 535
 				gravityview()->log->debug( 'Not using cache: ?cache or ?nocache is in the URL' );
536 536
 
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 		 */
558 558
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
559 559
 
560
-		return (boolean) $use_cache;
560
+		return (boolean)$use_cache;
561 561
 	}
562 562
 
563 563
 }
Please login to merge, or discard this patch.
plugin-and-theme-hooks/abstract-gravityview-plugin-and-theme-hooks.php 2 patches
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -195,7 +195,6 @@  discard block
 block discarded – undo
195 195
 	 *
196 196
 	 * @deprecated 2.0.7
197 197
 	 *
198
-	 * @param array $handles Array of meta keys to check for existence of shortcodes
199 198
 	 * @param int $post_id The ID being checked by GravityView
200 199
 	 *
201 200
 	 * @return array Meta key array, merged with existing meta keys
@@ -209,7 +208,6 @@  discard block
 block discarded – undo
209 208
 	 *
210 209
 	 * @since 2.0.7
211 210
 	 *
212
-	 * @param array $handles Array of meta keys to check for existence of shortcodes
213 211
 	 * @param \WP_Post $post The ID being checked by GravityView
214 212
 	 *
215 213
 	 * @return array Meta key array, merged with existing meta keys
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 	private function maybe_add_hooks() {
111 111
 		$class_exists = $this->class_name && class_exists( $this->class_name );
112 112
 		$function_exists = $this->function_name && function_exists( $this->function_name );
113
-		$constant_defined = $this->constant_name && defined("{$this->constant_name}");
113
+		$constant_defined = $this->constant_name && defined( "{$this->constant_name}" );
114 114
 
115
-		if( $class_exists || $function_exists || $constant_defined ) {
115
+		if ( $class_exists || $function_exists || $constant_defined ) {
116 116
 			$this->add_hooks();
117 117
 		}
118 118
 	}
@@ -124,23 +124,23 @@  discard block
 block discarded – undo
124 124
 	 */
125 125
 	protected function add_hooks() {
126 126
 
127
-		if( $this->meta_keys ) {
127
+		if ( $this->meta_keys ) {
128 128
 			add_filter( 'gravityview/data/parse/meta_keys', array( $this, 'merge_meta_keys' ), 10, 2 );
129 129
 		}
130 130
 
131
-		if( $this->content_meta_keys ) {
131
+		if ( $this->content_meta_keys ) {
132 132
 			add_filter( 'gravityview/view_collection/from_post/meta_keys', array( $this, 'merge_content_meta_keys' ), 10, 3 );
133 133
 		}
134 134
 
135
-		if( $this->script_handles ) {
135
+		if ( $this->script_handles ) {
136 136
 			add_filter( 'gravityview_noconflict_scripts', array( $this, 'merge_noconflict_scripts' ) );
137 137
 		}
138 138
 
139
-		if( $this->style_handles ) {
139
+		if ( $this->style_handles ) {
140 140
 			add_filter( 'gravityview_noconflict_styles', array( $this, 'merge_noconflict_styles' ) );
141 141
 		}
142 142
 
143
-		if( $this->post_type_support ) {
143
+		if ( $this->post_type_support ) {
144 144
 			add_filter( 'gravityview_post_type_support', array( $this, 'merge_post_type_support' ), 10, 2 );
145 145
 		}
146 146
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-collection-view.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 			$meta_keys = apply_filters_ref_array( 'gravityview/view_collection/from_post/meta_keys', array( array(), $post, &$views ) );
100 100
 
101 101
 			if ( function_exists( 'apply_filters_deprecated' ) ) {
102
-				$meta_keys = (array) apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
102
+				$meta_keys = (array)apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
103 103
 			} else {
104 104
 				/**
105 105
 				 * @filter `gravityview/data/parse/meta_keys`
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 				 * @todo Require WP 4.6.0 so that `apply_filters_deprecated` is always available
108 108
 				 * @see The `gravityview/view_collection/from_post/meta_keys` filter.
109 109
 				 */
110
-				$meta_keys = (array) apply_filters( 'gravityview/data/parse/meta_keys', $meta_keys, $post->ID );
110
+				$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', $meta_keys, $post->ID );
111 111
 			}
112 112
 
113 113
 			/** What about inside post meta values? */
@@ -137,12 +137,12 @@  discard block
 block discarded – undo
137 137
 
138 138
 		/** Let's find us some [gravityview] shortcodes perhaps. */
139 139
 		foreach ( Shortcode::parse( $content ) as $shortcode ) {
140
-			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts['id'] ) ) {
140
+			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts[ 'id' ] ) ) {
141 141
 				continue;
142 142
 			}
143 143
 
144
-			if ( is_numeric( $shortcode->atts['id'] ) ) {
145
-				$view = View::by_id( $shortcode->atts['id'] );
144
+			if ( is_numeric( $shortcode->atts[ 'id' ] ) ) {
145
+				$view = View::by_id( $shortcode->atts[ 'id' ] );
146 146
 				if ( ! $view ) {
147 147
 					continue;
148 148
 				}
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-theme-hooks-siteorigin.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -39,19 +39,19 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	function merge_content_meta_keys( $meta_keys = array(), $post = null, & $views = null ) {
41 41
 
42
-		if( empty( $post->panels_data ) || empty( $post->panels_data['widgets'] ) ) {
42
+		if ( empty( $post->panels_data ) || empty( $post->panels_data[ 'widgets' ] ) ) {
43 43
 			return $meta_keys;
44 44
 		}
45 45
 
46
-		foreach ( (array) $post->panels_data['widgets'] as $widget ) {
46
+		foreach ( (array)$post->panels_data[ 'widgets' ] as $widget ) {
47 47
 
48 48
 			$views->merge( \GV\View_Collection::from_content( \GV\Utils::get( $widget, 'text' ) ) );
49 49
 
50
-			if ( empty( $widget['tabs'] ) || ! is_array( $widget['tabs'] ) ) {
50
+			if ( empty( $widget[ 'tabs' ] ) || ! is_array( $widget[ 'tabs' ] ) ) {
51 51
 				continue;
52 52
 			}
53 53
 
54
-			foreach ( $widget['tabs'] as $tab ) {
54
+			foreach ( $widget[ 'tabs' ] as $tab ) {
55 55
 
56 56
 				// Livemesh Tabs
57 57
 				$backup = \GV\Utils::get( $tab, 'tab_content' );
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 				// SiteOrigin Tabs
60 60
 				$content = \GV\Utils::get( $tab, 'content_text', $backup );
61 61
 
62
-				if( $content ) {
62
+				if ( $content ) {
63 63
 					$views->merge( \GV\View_Collection::from_content( $content ) );
64 64
 				}
65 65
 			}
Please login to merge, or discard this patch.
future/includes/class-gv-entry.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		$args = array();
115 115
 
116
-		$view_id = is_null ( $view ) ? null : $view->ID;
116
+		$view_id = is_null( $view ) ? null : $view->ID;
117 117
 
118 118
 		$permalink = null;
119 119
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			/** Must be an embed of some sort. */
124 124
 			if ( is_object( $post ) && is_numeric( $post->ID ) ) {
125 125
 				$permalink = get_permalink( $post->ID );
126
-				$args['gvid'] = $view_id;
126
+				$args[ 'gvid' ] = $view_id;
127 127
 			}
128 128
 		}
129 129
 		
@@ -151,21 +151,21 @@  discard block
 block discarded – undo
151 151
 			 */
152 152
 			$link_parts = explode( '?', $permalink );
153 153
 
154
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
154
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
155 155
 
156
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
156
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
157 157
 		} else {
158 158
 			$args[ $entry_endpoint_name ] = $entry_slug;
159 159
 		}
160 160
 
161 161
 		if ( $track_directory ) {
162
-			if ( ! empty( $_GET['pagenum'] ) ) {
163
-				$args['pagenum'] = intval( $_GET['pagenum'] );
162
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
163
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
164 164
 			}
165 165
 
166 166
 			if ( $sort = Utils::_GET( 'sort' ) ) {
167
-				$args['sort'] = $sort;
168
-				$args['dir'] = Utils::_GET( 'dir' );
167
+				$args[ 'sort' ] = $sort;
168
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
169 169
 			}
170 170
 		}
171 171
 
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
 		$acf_keys = get_field_objects( $post->ID, array( 'load_value' => false ) );
57 57
 
58
-		if( $acf_keys ) {
58
+		if ( $acf_keys ) {
59 59
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
60 60
 		}
61 61
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 	 * @return void
71 71
 	 */
72 72
 	private function fix_posted_fields() {
73
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
74
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
75
-				$_POST['fields'] = _gravityview_process_posted_fields();
73
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
74
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
75
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
76 76
 			}
77 77
 		}
78 78
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-source-internal.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,9 +24,8 @@
 block discarded – undo
24 24
 	/**
25 25
 	 * Get a \GV\Field by Field ID for this data source.
26 26
 	 *
27
-	 * @param int $field_id The internal field ID (custom content, etc.)
28 27
 	 *
29
-	 * @return \GV\Field|null The requested field or null if not found.
28
+	 * @return null|Internal_Field The requested field or null if not found.
30 29
 	 */
31 30
 	public static function get_field( /** varargs */ ) {
32 31
 		$args = func_get_args();
Please login to merge, or discard this patch.
future/includes/rest/class-gv-rest-views-route.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 			'total' => wp_count_posts( 'gravityview' )->publish,
64 64
 		);
65 65
 		foreach ( $items as $item ) {
66
-			$data['views'][] = $this->prepare_view_for_response( $item, $request );
66
+			$data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request );
67 67
 		}
68 68
 
69 69
 		return new \WP_REST_Response( $data, 200 );
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 		$url = $request->get_url_params();
84 84
 
85
-		$view_id = intval( $url['id'] );
85
+		$view_id = intval( $url[ 'id' ] );
86 86
 
87 87
 		$item = get_post( $view_id );
88 88
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 		// Only output the fields that should be displayed.
112 112
 		$allowed = array();
113 113
 		foreach ( $view->fields->by_position( "{$context}_*" )->by_visible()->all() as $field ) {
114
-			$allowed[] = $field->ID;
114
+			$allowed[ ] = $field->ID;
115 115
 		}
116 116
 
117 117
 		/**
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 	public function get_sub_items( $request ) {
157 157
 
158 158
 		$url     = $request->get_url_params();
159
-		$view_id = intval( $url['id'] );
159
+		$view_id = intval( $url[ 'id' ] );
160 160
 		$format  = \GV\Utils::get( $url, 'format', 'json' );
161 161
 
162 162
 		$view = \GV\View::by_id( $view_id );
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 
200 200
 		$data = array( 'entries' => $entries->all(), 'total' => $entries->total() );
201 201
 
202
-		foreach ( $data['entries'] as &$entry ) {
202
+		foreach ( $data[ 'entries' ] as &$entry ) {
203 203
 			$entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' );
204 204
 		}
205 205
 
@@ -218,8 +218,8 @@  discard block
 block discarded – undo
218 218
 	 */
219 219
 	public function get_sub_item( $request ) {
220 220
 		$url      = $request->get_url_params();
221
-		$view_id  = intval( $url['id'] );
222
-		$entry_id = intval( $url['s_id'] );
221
+		$view_id  = intval( $url[ 'id' ] );
222
+		$entry_id = intval( $url[ 's_id' ] );
223 223
 		$format   = \GV\Utils::get( $url, 'format', 'json' );
224 224
 
225 225
 		$view  = \GV\View::by_id( $view_id );
@@ -254,32 +254,32 @@  discard block
 block discarded – undo
254 254
 		// Add all the WP_Post data
255 255
 		$view_post = $view_post->to_array();
256 256
 
257
-		unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] );
257
+		unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] );
258 258
 
259 259
 		$return = wp_parse_args( $item, $view_post );
260 260
 
261
-		$return['title'] = $return['post_title'];
261
+		$return[ 'title' ] = $return[ 'post_title' ];
262 262
 
263
-		$return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array();
264
-		unset( $return['atts'], $return['view_id'] );
263
+		$return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array();
264
+		unset( $return[ 'atts' ], $return[ 'view_id' ] );
265 265
 
266
-		$return['search_criteria'] = array(
266
+		$return[ 'search_criteria' ] = array(
267 267
 			'page_size' => rgars( $return, 'settings/page_size' ),
268 268
 			'sort_field' => rgars( $return, 'settings/sort_field' ),
269 269
 			'sort_direction' => rgars( $return, 'settings/sort_direction' ),
270 270
 			'offset' => rgars( $return, 'settings/offset' ),
271 271
 		);
272 272
 
273
-		unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] );
273
+		unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] );
274 274
 
275 275
 		// Redact for non-logged ins
276 276
 		if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) {
277
-			unset( $return['settings'] );
278
-			unset( $return['search_criteria'] );
277
+			unset( $return[ 'settings' ] );
278
+			unset( $return[ 'search_criteria' ] );
279 279
 		}
280 280
 		
281 281
 		if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) {
282
-			unset( $return['form'] );
282
+			unset( $return[ 'form' ] );
283 283
 		}
284 284
 
285 285
 		return $return;
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 			$view_id = func_get_arg( 1 ); // $view_id override
291 291
 		} else {
292 292
 			$url     = $request->get_url_params();
293
-			$view_id = intval( $url['id'] );
293
+			$view_id = intval( $url[ 'id' ] );
294 294
 		}
295 295
 
296 296
 		if ( ! $view = \GV\View::by_id( $view_id ) ) {
@@ -343,8 +343,8 @@  discard block
 block discarded – undo
343 343
 		}
344 344
 
345 345
 		$url     = $request->get_url_params();
346
-		$view_id = intval( $url['id'] );
347
-		$entry_id = intval( $url['s_id'] );
346
+		$view_id = intval( $url[ 'id' ] );
347
+		$entry_id = intval( $url[ 's_id' ] );
348 348
 
349 349
 		$view = \GV\View::by_id( $view_id );
350 350
 
@@ -352,11 +352,11 @@  discard block
 block discarded – undo
352 352
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
353 353
 		}
354 354
 
355
-		if ( $entry['form_id'] != $view->form->ID ) {
355
+		if ( $entry[ 'form_id' ] != $view->form->ID ) {
356 356
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
357 357
 		}
358 358
 
359
-		if ( $entry['status'] != 'active' ) {
359
+		if ( $entry[ 'status' ] != 'active' ) {
360 360
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
361 361
 		}
362 362
 
@@ -364,10 +364,10 @@  discard block
 block discarded – undo
364 364
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
365 365
 		}
366 366
 
367
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
367
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
368 368
 
369 369
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
370
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
370
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
371 371
 				return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
372 372
 			}
373 373
 		}
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gventry.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -44,16 +44,16 @@  discard block
 block discarded – undo
44 44
 		 */
45 45
 		$atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
46 46
 
47
-		$view = \GV\View::by_id( $atts['view_id'] );
47
+		$view = \GV\View::by_id( $atts[ 'view_id' ] );
48 48
 
49 49
 		if ( ! $view ) {
50
-			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) );
50
+			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) );
51 51
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
52 52
 		}
53 53
 
54
-		$entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id'];
54
+		$entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
55 55
 
56
-		switch( $entry_id ):
56
+		switch ( $entry_id ):
57 57
 			case 'last':
58 58
 				if ( class_exists( '\GF_Query' ) ) {
59 59
 					/**
@@ -62,17 +62,17 @@  discard block
 block discarded – undo
62 62
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
63 63
 					 */
64 64
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
65
-						if ( ! empty( $parameters['sorting'] ) ) {
65
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
66 66
 							/**
67 67
 							 * Reverse existing sorts.
68 68
 							 */
69
-							$sort = &$parameters['sorting'];
70
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
69
+							$sort = &$parameters[ 'sorting' ];
70
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
71 71
 						} else {
72 72
 							/**
73 73
 							 * Otherwise, sort by date_created.
74 74
 							 */
75
-							$parameters['sorting'] = array(
75
+							$parameters[ 'sorting' ] = array(
76 76
 								'key' => 'id',
77 77
 								'direction' => 'ASC',
78 78
 								'is_numeric' => true
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
 					/** If a sort already exists, reverse it. */
89 89
 					if ( $sort = end( $entries->sorts ) ) {
90
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
90
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
91 91
 					} else {
92 92
 						/** Otherwise, sort by date_created */
93 93
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -105,12 +105,12 @@  discard block
 block discarded – undo
105 105
 				break;
106 106
 			default:
107 107
 				if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
108
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
108
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
109 109
 					return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
110 110
 				}
111 111
 		endswitch;
112 112
 
113
-		if ( $view->form->ID != $entry['form_id'] ) {
113
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
114 114
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
115 115
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
116 116
 		}
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 			return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
121 121
 		}
122 122
 
123
-		if ( ! $view->form  ) {
123
+		if ( ! $view->form ) {
124 124
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
125 125
 
126 126
 			/**
@@ -143,15 +143,15 @@  discard block
 block discarded – undo
143 143
 		}
144 144
 
145 145
 		/** Unapproved entries. */
146
-		if ( $entry['status'] != 'active' ) {
146
+		if ( $entry[ 'status' ] != 'active' ) {
147 147
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
148 148
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
149 149
 		}
150 150
 
151
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
151
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
152 152
 
153 153
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
154
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
154
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
155 155
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
156 156
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
157 157
 			}
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 		$renderer = new \GV\Entry_Renderer();
164 164
 
165 165
 		$request = new \GV\Mock_Request();
166
-		$request->returns['is_entry'] = $entry;
166
+		$request->returns[ 'is_entry' ] = $entry;
167 167
 
168 168
 		$output = $renderer->render( $entry, $view, $request );
169 169
 
Please login to merge, or discard this patch.