Completed
Pull Request — master (#1387)
by Zack
22:48 queued 20:06
created
includes/class-gravityview-merge-tags.php 3 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	 * @param GF_Field|false $field
185 185
 	 * @param string $value
186 186
 	 *
187
-	 * @return mixed|string
187
+	 * @return string
188 188
 	 */
189 189
 	private static function maybe_urlencode( $field = false, $value = '' ) {
190 190
 
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 	 * @param bool $url_encode Whether to URL-encode output
350 350
 	 * @param bool $esc_html Whether to apply `esc_html()` to output
351 351
 	 *
352
-	 * @return mixed
352
+	 * @return string
353 353
 	 */
354 354
 	public static function replace_gv_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
355 355
 
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,14 +52,14 @@  discard block
 block discarded – undo
52 52
 		// matching regex => the value is the method to call to replace the value.
53 53
 		$gv_modifiers = array(
54 54
 			'maxwords:(\d+)' => 'modifier_maxwords', /** @see modifier_maxwords */
55
-		    'timestamp' => 'modifier_timestamp', /** @see modifier_timestamp */
55
+			'timestamp' => 'modifier_timestamp', /** @see modifier_timestamp */
56 56
 			'explode' => 'modifier_explode', /** @see modifier_explode */
57 57
 
58 58
 			/** @see modifier_strings */
59 59
 			'urlencode' => 'modifier_strings',
60 60
 			'wpautop' => 'modifier_strings',
61
-		    'esc_html' => 'modifier_strings',
62
-		    'sanitize_html_class' => 'modifier_strings',
61
+			'esc_html' => 'modifier_strings',
62
+			'sanitize_html_class' => 'modifier_strings',
63 63
 			'sanitize_title' => 'modifier_strings',
64 64
 			'strtolower' => 'modifier_strings',
65 65
 			'strtoupper' => 'modifier_strings',
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
 
458 458
 		$atts = array(
459 459
 			'format' => self::get_format_from_modifiers( $exploded, false ),
460
-		    'human' => in_array( 'human', $exploded ), // {date_created:human}
460
+			'human' => in_array( 'human', $exploded ), // {date_created:human}
461 461
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
462 462
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
463 463
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
Please login to merge, or discard this patch.
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
 
79 79
 			$non_gv_modifiers = array_diff( $modifiers, array_keys( $gv_modifiers ) );
80 80
 
81
-			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false);
81
+			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false );
82 82
 		}
83 83
 
84 84
 		foreach ( $modifiers as $passed_modifier ) {
85 85
 
86
-			foreach( $gv_modifiers as $gv_modifier => $method ) {
86
+			foreach ( $gv_modifiers as $gv_modifier => $method ) {
87 87
 
88 88
 				// Uses ^ to only match the first modifier, to enforce same order as passed by GF
89 89
 				preg_match( '/^' . $gv_modifier . '/ism', $passed_modifier, $matches );
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	 */
133 133
 	private static function modifier_timestamp( $raw_value, $matches ) {
134 134
 
135
-		if( empty( $matches[0] ) ) {
135
+		if ( empty( $matches[ 0 ] ) ) {
136 136
 			return $raw_value;
137 137
 		}
138 138
 
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
 	 */
162 162
 	private static function modifier_maxwords( $raw_value, $matches, $field = null ) {
163 163
 
164
-		if( ! is_string( $raw_value ) || empty( $matches[1] ) || ! function_exists( 'wp_trim_words' ) ) {
164
+		if ( ! is_string( $raw_value ) || empty( $matches[ 1 ] ) || ! function_exists( 'wp_trim_words' ) ) {
165 165
 			return $raw_value;
166 166
 		}
167 167
 
168
-		$max = intval( $matches[1] );
168
+		$max = intval( $matches[ 1 ] );
169 169
 
170 170
 		$more_placeholder = '[GVMORE]';
171 171
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	private static function modifier_explode( $raw_value, $matches, $value, $field = null ) {
235 235
 
236 236
 		// For JSON-encoded arrays
237
-		if( $json_array = json_decode( $raw_value, true ) ) {
237
+		if ( $json_array = json_decode( $raw_value, true ) ) {
238 238
 			return implode( ' ', $json_array );
239 239
 		}
240 240
 
@@ -255,13 +255,13 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	private static function modifier_strings( $raw_value, $matches, $value = '', $field = null ) {
257 257
 
258
-		if( empty( $matches[0] ) ) {
258
+		if ( empty( $matches[ 0 ] ) ) {
259 259
 			return $raw_value;
260 260
 		}
261 261
 
262 262
 		$return = $raw_value;
263 263
 
264
-		switch( $matches[0] ) {
264
+		switch ( $matches[ 0 ] ) {
265 265
 			case 'urlencode':
266 266
 				$return = urlencode( $raw_value );
267 267
 				break;
@@ -343,9 +343,9 @@  discard block
 block discarded – undo
343 343
 		 * @internal Fixed $form['title'] in Gravity Forms
344 344
 		 * @see      https://github.com/gravityforms/gravityforms/pull/27/files
345 345
 		 */
346
-		$form['title']  = isset( $form['title'] ) ? $form['title'] : '';
347
-		$form['id']     = isset( $form['id'] ) ? $form['id'] : '';
348
-		$form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array();
346
+		$form[ 'title' ]  = isset( $form[ 'title' ] ) ? $form[ 'title' ] : '';
347
+		$form[ 'id' ]     = isset( $form[ 'id' ] ) ? $form[ 'id' ] : '';
348
+		$form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array();
349 349
 
350 350
 		return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html, $nl2br, $format, $aux_data );
351 351
 	}
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 		// Is there is {gv_entry_link} or {gv_entry_link:[post id]} or {gv_entry_link:[post id]:[action]} merge tag?
407 407
 		preg_match_all( "/{gv_entry_link(?:\:(\d+)\:?(.*?))?}/ism", $original_text, $matches, PREG_SET_ORDER );
408 408
 
409
-		if( empty( $matches ) ) {
409
+		if ( empty( $matches ) ) {
410 410
 			return $original_text;
411 411
 		}
412 412
 
@@ -427,18 +427,18 @@  discard block
 block discarded – undo
427 427
 		 * }
428 428
 		 */
429 429
 		foreach ( $matches as $match ) {
430
-			$full_tag = $match[0];
430
+			$full_tag = $match[ 0 ];
431 431
 
432 432
 			$link_args = array(
433 433
 				'return' => 'url',
434
-				'entry_id' => $entry['id'],
434
+				'entry_id' => $entry[ 'id' ],
435 435
 				'post_id' => \GV\Utils::get( $match, 1, null ),
436 436
 				'action' => \GV\Utils::get( $match, 2, 'read' ),
437 437
 			);
438 438
 
439 439
 			$entry_link = $Shortcode->read_shortcode( $link_args, null, 'gv_entry_link_merge_tag' );
440 440
 
441
-			if( $url_encode ) {
441
+			if ( $url_encode ) {
442 442
 				$entry_link = urlencode( $entry_link );
443 443
 			}
444 444
 
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
476 476
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
477 477
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
478
-			'time' => in_array( 'time', $exploded ),  // {date_created:time}
478
+			'time' => in_array( 'time', $exploded ), // {date_created:time}
479 479
 		);
480 480
 
481 481
 		$formatted_date = GVCommon::format_date( $date_created, $atts );
@@ -552,8 +552,8 @@  discard block
 block discarded – undo
552 552
 			return $original_text;
553 553
 		}
554 554
 
555
-		foreach ( (array) $matches as $match ) {
556
-			$full_tag = $match[0];
555
+		foreach ( (array)$matches as $match ) {
556
+			$full_tag = $match[ 0 ];
557 557
 			$modifier = \GV\Utils::get( $match, 2, 'permalink' );
558 558
 
559 559
 			$replacement = false;
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
 					$replacement = esc_html( $replacement );
572 572
 				}
573 573
 
574
-				if( $url_encode ) {
574
+				if ( $url_encode ) {
575 575
 					$replacement = urlencode( $replacement );
576 576
 				}
577 577
 
@@ -611,14 +611,14 @@  discard block
 block discarded – undo
611 611
 		preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER );
612 612
 
613 613
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
614
-		if( empty( $matches ) ) {
614
+		if ( empty( $matches ) ) {
615 615
 			return $text;
616 616
 		}
617 617
 
618 618
 		foreach ( $matches as $match ) {
619 619
 
620
-			$full_tag = $match[0];
621
-			$property = $match[1];
620
+			$full_tag = $match[ 0 ];
621
+			$property = $match[ 1 ];
622 622
 
623 623
 			$value = stripslashes_deep( \GV\Utils::_GET( $property ) );
624 624
 
@@ -642,7 +642,7 @@  discard block
 block discarded – undo
642 642
 			 * @since 1.15
643 643
 			 * @param bool $esc_html Whether to esc_html() the value. Default: `true`
644 644
 			 */
645
-			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true );
645
+			$esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true );
646 646
 
647 647
 			$value = $esc_html ? esc_html( $value ) : $value;
648 648
 
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
653 653
 			 * @param[in] array $form Gravity Forms form array
654 654
 			 * @param[in] array $entry Entry array
655 655
 			 */
656
-			$value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
656
+			$value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
657 657
 
658 658
 			$text = str_replace( $full_tag, $value, $text );
659 659
 		}
Please login to merge, or discard this patch.
includes/class-gv-license-handler.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,6 @@
 block discarded – undo
9 9
  */
10 10
 class GV_License_Handler extends \GV\License_Handler {
11 11
 	/**
12
-	 * @param \GV\Addon_Settings $GFAddOn
13 12
 	 *
14 13
 	 * @deprecated Use \GV\License_Handler::get instead
15 14
 	 *
Please login to merge, or discard this patch.
includes/class-template.php 3 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -219,6 +219,9 @@  discard block
 block discarded – undo
219 219
 
220 220
 	}
221 221
 
222
+	/**
223
+	 * @param string $key
224
+	 */
222 225
 	public function getCurrentFieldSetting( $key ) {
223 226
 		$settings = $this->getCurrentField('field_settings');
224 227
 
@@ -725,6 +728,7 @@  discard block
 block discarded – undo
725 728
 	 *
726 729
 	 * @inheritdoc
727 730
 	 * @see Gamajo_Template_Loader::locate_template()
731
+	 * @param string $template_names
728 732
 	 * @return null|string NULL: Template not found; String: path to template
729 733
 	 */
730 734
 	function locate_template( $template_names, $load = false, $require_once = true ) {
Please login to merge, or discard this patch.
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -328,34 +328,34 @@  discard block
 block discarded – undo
328 328
 	}
329 329
 
330 330
 	/**
331
-     * Get the fields for a specific context
332
-     *
333
-     * @since 1.19.2
334
-     *
331
+	 * Get the fields for a specific context
332
+	 *
333
+	 * @since 1.19.2
334
+	 *
335 335
 	 * @param string $context [Optional] "directory", "single", or "edit"
336 336
 	 *
337 337
 	 * @return array Array of GravityView field layout configurations
338 338
 	 */
339 339
 	public function getContextFields( $context = '' ) {
340 340
 
341
-	    if( '' === $context ) {
342
-	        $context = $this->getContext();
343
-        }
341
+		if( '' === $context ) {
342
+			$context = $this->getContext();
343
+		}
344 344
 
345 345
 		$fields = $this->getFields();
346 346
 
347
-        foreach ( (array) $fields as $key => $context_fields ) {
347
+		foreach ( (array) $fields as $key => $context_fields ) {
348 348
 
349
-            // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
350
-            $matches = explode( '_', $key );
349
+			// Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
350
+			$matches = explode( '_', $key );
351 351
 
352
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
353
-                return $context_fields;
354
-            }
355
-        }
352
+			if( isset( $matches[0] ) && $matches[0] === $context ) {
353
+				return $context_fields;
354
+			}
355
+		}
356 356
 
357 357
 		return array();
358
-    }
358
+	}
359 359
 
360 360
 	/**
361 361
 	 * @param array $fields
@@ -448,10 +448,10 @@  discard block
 block discarded – undo
448 448
 	 */
449 449
 	public function getPaging() {
450 450
 
451
-	    $default_params = array(
452
-            'offset' => 0,
453
-            'page_size' => 20,
454
-        );
451
+		$default_params = array(
452
+			'offset' => 0,
453
+			'page_size' => 20,
454
+		);
455 455
 
456 456
 		return wp_parse_args( $this->paging, $default_params );
457 457
 	}
@@ -508,10 +508,10 @@  discard block
 block discarded – undo
508 508
 	public function getSorting() {
509 509
 
510 510
 		$defaults_params = array(
511
-            'sort_field' => 'date_created',
512
-            'sort_direction' => 'ASC',
513
-            'is_numeric' => false,
514
-        );
511
+			'sort_field' => 'date_created',
512
+			'sort_direction' => 'ASC',
513
+			'is_numeric' => false,
514
+		);
515 515
 
516 516
 		return wp_parse_args( $this->sorting, $defaults_params );
517 517
 	}
@@ -837,7 +837,7 @@  discard block
 block discarded – undo
837 837
 	 */
838 838
 	public function render_widget_hooks( $view_id_or_context ) {
839 839
 
840
-	    /**
840
+		/**
841 841
 		 * @deprecated Numeric argument is deprecated. Pass a \GV\Template_Context instead.
842 842
 		 */
843 843
 		if ( is_numeric( $view_id_or_context ) ) {
Please login to merge, or discard this patch.
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	die;
17 17
 }
18 18
 
19
-if( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
19
+if ( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
20 20
 	require( GRAVITYVIEW_DIR . 'future/lib/class-gamajo-template-loader.php' );
21 21
 }
22 22
 
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 			'atts'	  => NULL,
158 158
 		) );
159 159
 
160
-		foreach ($atts as $key => $value) {
161
-			if( is_null( $value ) ) {
160
+		foreach ( $atts as $key => $value ) {
161
+			if ( is_null( $value ) ) {
162 162
 				continue;
163 163
 			}
164 164
 			$this->{$key} = $value;
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	 */
189 189
 	static function getInstance( $passed_post = NULL ) {
190 190
 
191
-		if( empty( self::$instance ) ) {
191
+		if ( empty( self::$instance ) ) {
192 192
 			self::$instance = new self( $passed_post );
193 193
 		}
194 194
 
@@ -201,8 +201,8 @@  discard block
 block discarded – undo
201 201
 	 */
202 202
 	public function getCurrentField( $key = NULL ) {
203 203
 
204
-		if( !empty( $key ) ) {
205
-			if( isset( $this->_current_field[ $key ] ) ) {
204
+		if ( ! empty( $key ) ) {
205
+			if ( isset( $this->_current_field[ $key ] ) ) {
206 206
 				return $this->_current_field[ $key ];
207 207
 			}
208 208
 			return NULL;
@@ -213,16 +213,16 @@  discard block
 block discarded – undo
213 213
 
214 214
 	public function setCurrentFieldSetting( $key, $value ) {
215 215
 
216
-		if( !empty( $this->_current_field ) ) {
217
-			$this->_current_field['field_settings'][ $key ] = $value;
216
+		if ( ! empty( $this->_current_field ) ) {
217
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
218 218
 		}
219 219
 
220 220
 	}
221 221
 
222 222
 	public function getCurrentFieldSetting( $key ) {
223
-		$settings = $this->getCurrentField('field_settings');
223
+		$settings = $this->getCurrentField( 'field_settings' );
224 224
 
225
-		if( $settings && !empty( $settings[ $key ] ) ) {
225
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
226 226
 			return $settings[ $key ];
227 227
 		}
228 228
 
@@ -253,8 +253,8 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function getAtts( $key = NULL ) {
255 255
 
256
-		if( !empty( $key ) ) {
257
-			if( isset( $this->atts[ $key ] ) ) {
256
+		if ( ! empty( $key ) ) {
257
+			if ( isset( $this->atts[ $key ] ) ) {
258 258
 				return $this->atts[ $key ];
259 259
 			}
260 260
 			return NULL;
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 
321 321
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
322 322
 
323
-		if( $fields && !empty( $key ) ) {
323
+		if ( $fields && ! empty( $key ) ) {
324 324
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
325 325
 		}
326 326
 
@@ -338,18 +338,18 @@  discard block
 block discarded – undo
338 338
 	 */
339 339
 	public function getContextFields( $context = '' ) {
340 340
 
341
-	    if( '' === $context ) {
341
+	    if ( '' === $context ) {
342 342
 	        $context = $this->getContext();
343 343
         }
344 344
 
345 345
 		$fields = $this->getFields();
346 346
 
347
-        foreach ( (array) $fields as $key => $context_fields ) {
347
+        foreach ( (array)$fields as $key => $context_fields ) {
348 348
 
349 349
             // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
350 350
             $matches = explode( '_', $key );
351 351
 
352
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
352
+            if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) {
353 353
                 return $context_fields;
354 354
             }
355 355
         }
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
 	 */
371 371
 	public function getField( $key ) {
372 372
 
373
-		if( !empty( $key ) ) {
374
-			if( isset( $this->fields[ $key ] ) ) {
373
+		if ( ! empty( $key ) ) {
374
+			if ( isset( $this->fields[ $key ] ) ) {
375 375
 				return $this->fields[ $key ];
376 376
 			}
377 377
 		}
@@ -477,8 +477,8 @@  discard block
 block discarded – undo
477 477
 	public function getPaginationCounts() {
478 478
 
479 479
 		$paging = $this->getPaging();
480
-		$offset = $paging['offset'];
481
-		$page_size = $paging['page_size'];
480
+		$offset = $paging[ 'offset' ];
481
+		$page_size = $paging[ 'page_size' ];
482 482
 		$total = $this->getTotalEntries();
483 483
 
484 484
 		if ( empty( $total ) ) {
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 		 */
500 500
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
501 501
 
502
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
502
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
503 503
 	}
504 504
 
505 505
 	/**
@@ -595,16 +595,16 @@  discard block
 block discarded – undo
595 595
 	 */
596 596
 	public function getCurrentEntry() {
597 597
 
598
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
598
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
599 599
 			$entries = $this->getEntries();
600
-			$entry = $entries[0];
600
+			$entry = $entries[ 0 ];
601 601
 		} else {
602 602
 			$entry = $this->_current_entry;
603 603
 		}
604 604
 
605 605
 		/** @since 1.16 Fixes DataTables empty entry issue */
606
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
607
-			$entry = $this->_current_field['entry'];
606
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
607
+			$entry = $this->_current_field[ 'entry' ];
608 608
 		}
609 609
 
610 610
 		return $entry;
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
 	public function renderZone( $zone = '', $atts = array(), $echo = true ) {
645 645
 
646 646
 		if ( empty( $zone ) ) {
647
-			gravityview()->log->error( 'No zone defined.');
647
+			gravityview()->log->error( 'No zone defined.' );
648 648
 			return NULL;
649 649
 		}
650 650
 
@@ -653,16 +653,16 @@  discard block
 block discarded – undo
653 653
 			'context' => $this->getContext(),
654 654
 			'entry' => $this->getCurrentEntry(),
655 655
 			'form' => $this->getForm(),
656
-			'hide_empty' => $this->getAtts('hide_empty'),
656
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
657 657
 		);
658 658
 
659 659
 		$final_atts = wp_parse_args( $atts, $defaults );
660 660
 
661 661
 		$output = '';
662 662
 
663
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
663
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
664 664
 
665
-		$fields = $this->getField( $final_atts['zone_id'] );
665
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
666 666
 
667 667
 		// Backward compatibility
668 668
 		if ( 'table' === $this->getTemplatePartSlug() ) {
@@ -672,19 +672,19 @@  discard block
 block discarded – undo
672 672
 			 * @param \GravityView_View $this
673 673
 			 * @deprecated Use `gravityview/template/table/fields`
674 674
 			 */
675
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
675
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
676 676
 		}
677 677
 
678 678
 		if ( empty( $fields ) ) {
679 679
 
680
-			gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts['zone_id'] ) );
680
+			gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts[ 'zone_id' ] ) );
681 681
 
682 682
 			return NULL;
683 683
 		}
684 684
 
685 685
 		$field_output = '';
686 686
 		foreach ( $fields as $field ) {
687
-			$final_atts['field'] = $field;
687
+			$final_atts[ 'field' ] = $field;
688 688
 
689 689
 			$field_output .= gravityview_field_output( $final_atts );
690 690
 		}
@@ -701,17 +701,17 @@  discard block
 block discarded – undo
701 701
 			return NULL;
702 702
 		}
703 703
 
704
-		if( !empty( $final_atts['wrapper_class'] ) ) {
705
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
704
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
705
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
706 706
 		}
707 707
 
708 708
 		$output .= $field_output;
709 709
 
710
-		if( !empty( $final_atts['wrapper_class'] ) ) {
710
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
711 711
 			$output .= '</div>';
712 712
 		}
713 713
 
714
-		if( $echo ) {
714
+		if ( $echo ) {
715 715
 			echo $output;
716 716
 		}
717 717
 
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 	 */
730 730
 	function locate_template( $template_names, $load = false, $require_once = true ) {
731 731
 
732
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
732
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
733 733
 
734 734
 			$located = $this->located_templates[ $template_names ];
735 735
 
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 			// Set $load to always false so we handle it here.
739 739
 			$located = parent::locate_template( $template_names, false, $require_once );
740 740
 
741
-			if( is_string( $template_names ) ) {
741
+			if ( is_string( $template_names ) ) {
742 742
 				$this->located_templates[ $template_names ] = $located;
743 743
 			}
744 744
 		}
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 	 * @return mixed|null    The stored data.
757 757
 	 */
758 758
 	public function __get( $name ) {
759
-		if( isset( $this->{$name} ) ) {
759
+		if ( isset( $this->{$name} ) ) {
760 760
 			return $this->{$name};
761 761
 		} else {
762 762
 			return NULL;
@@ -785,17 +785,17 @@  discard block
 block discarded – undo
785 785
 		$additional = array();
786 786
 
787 787
 		// form-19-table-body.php
788
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
788
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
789 789
 
790
-		if( $view_id = $this->getViewId() ) {
790
+		if ( $view_id = $this->getViewId() ) {
791 791
 			// view-3-table-body.php
792
-			$additional[] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
792
+			$additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
793 793
 		}
794 794
 
795
-		if( $this->getPostId() ) {
795
+		if ( $this->getPostId() ) {
796 796
 
797 797
 			// page-19-table-body.php
798
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
798
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
799 799
 		}
800 800
 
801 801
 		// Combine with existing table-body.php and table.php
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
 
818 818
 		gravityview()->log->debug( 'Rendering Template File: {path}', array( 'path' => $template_file ) );
819 819
 
820
-		if( !empty( $template_file) ) {
820
+		if ( ! empty( $template_file ) ) {
821 821
 
822 822
 			if ( $require_once ) {
823 823
 				require_once( $template_file );
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
 
893 893
 		// Prevent being called twice
894 894
 		if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) {
895
-			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) );
895
+			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) );
896 896
 			return;
897 897
 		}
898 898
 
@@ -914,7 +914,7 @@  discard block
 block discarded – undo
914 914
 		 * @param string $zone Current widget zone, either `header` or `footer`
915 915
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
916 916
 		 */
917
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
917
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
918 918
 
919 919
 		$css_class = gravityview_sanitize_html_class( $css_class );
920 920
 
@@ -922,15 +922,15 @@  discard block
 block discarded – undo
922 922
 		?>
923 923
 		<div class="<?php echo $css_class; ?>">
924 924
 			<?php
925
-			foreach( $rows as $row ) {
926
-				foreach( $row as $col => $areas ) {
925
+			foreach ( $rows as $row ) {
926
+				foreach ( $row as $col => $areas ) {
927 927
 					$column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left";
928 928
 				?>
929 929
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
930 930
 						<?php
931 931
 						if ( ! empty( $areas ) ) {
932 932
 							foreach ( $areas as $area ) {
933
-								foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) {
933
+								foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) {
934 934
 									do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context );
935 935
 								}
936 936
 							}
Please login to merge, or discard this patch.
includes/connector-functions.php 2 patches
Doc Comments   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
  *
59 59
  * @see GVCommon::get_form_fields()
60 60
  * @access public
61
- * @param string|array $form_id (default: '') or $form object
61
+ * @param string|array $form (default: '') or $form object
62 62
  * @return array
63 63
  */
64 64
 function gravityview_get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {
@@ -108,7 +108,6 @@  discard block
 block discarded – undo
108 108
  * Since 1.4, supports custom entry slugs. The way that GravityView fetches an entry based on the custom slug is by searching `gravityview_unique_id` meta. The `$entry_slug` is fetched by getting the current query var set by `is_single_entry()`
109 109
  *
110 110
  * @access public
111
- * @param mixed $entry_id
112 111
  * @param boolean $force_allow_ids Force the get_entry() method to allow passed entry IDs, even if the `gravityview_custom_entry_slug_allow_id` filter returns false.
113 112
  * @param boolean $check_entry_display Check whether the entry is visible for the current View configuration. Default: true {@since 1.14}
114 113
  * @return array|boolean
@@ -202,7 +201,6 @@  discard block
 block discarded – undo
202 201
  *
203 202
  * @see GravityView_Template::template_id
204 203
  *
205
- * @param int $view_id The ID of the View to get the layout of
206 204
  *
207 205
  * @return string GravityView_Template::template_id value. Empty string if not.
208 206
  */
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -333,8 +333,8 @@  discard block
 block discarded – undo
333 333
  * @param  mixed $field_id Field ID or Field array
334 334
  * @return string field type
335 335
  */
336
-function gravityview_get_field_type(  $form = null , $field_id = '' ) {
337
-	return GVCommon::get_field_type(  $form, $field_id );
336
+function gravityview_get_field_type( $form = null, $field_id = '' ) {
337
+	return GVCommon::get_field_type( $form, $field_id );
338 338
 }
339 339
 
340 340
 
@@ -347,8 +347,8 @@  discard block
 block discarded – undo
347 347
  * @return string HTML of the output. Empty string if $view_id is empty.
348 348
  */
349 349
 function get_gravityview( $view_id = '', $atts = array() ) {
350
-	if( !empty( $view_id ) ) {
351
-		$atts['id'] = $view_id;
350
+	if ( ! empty( $view_id ) ) {
351
+		$atts[ 'id' ] = $view_id;
352 352
 		$args = wp_parse_args( $atts, \GV\View_Settings::defaults() );
353 353
 		$GravityView_frontend = GravityView_frontend::getInstance();
354 354
 		$GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) );
@@ -391,19 +391,19 @@  discard block
 block discarded – undo
391 391
  */
392 392
 function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) {
393 393
 
394
-	if( class_exists('GFFormsModel') && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
394
+	if ( class_exists( 'GFFormsModel' ) && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
395 395
 
396 396
 		/** @var GF_Field_Radio|GF_Field_Checkbox $form_field */
397
-		foreach( $form_fields as $form_field ) {
397
+		foreach ( $form_fields as $form_field ) {
398 398
 			$field_id = $form_field->id;
399
-			foreach( $view_fields as $zone ) {
399
+			foreach ( $view_fields as $zone ) {
400 400
 
401 401
 				// ACF compatibility; ACF-added fields aren't arrays
402 402
 				if ( ! is_array( $zone ) ) { continue; }
403 403
 
404
-				foreach( $zone as $field ) {
404
+				foreach ( $zone as $field ) {
405 405
 					// If it's an input, not the parent and the parent ID matches a checkbox or radio
406
-					if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) {
406
+					if ( ( strpos( $field[ 'id' ], '.' ) > 0 ) && floor( $field[ 'id' ] ) === floor( $field_id ) ) {
407 407
 						return true;
408 408
 					}
409 409
 				}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,6 @@  discard block
 block discarded – undo
45 45
 	 * Trick the GF fileupload field to render with the proper HTML ID to enable the plupload JS to work properly
46 46
 	 *
47 47
 	 * @param array               $form  The Form Object currently being processed.
48
-	 * @param string|array        $value The field value. From default/dynamic population, $_POST, or a resumed incomplete submission.
49 48
 	 * @param null|array          $entry Null or the Entry Object currently being edited.
50 49
 	 * @param GF_Field_FileUpload $field Gravity Forms field
51 50
 	 *
@@ -74,6 +73,7 @@  discard block
 block discarded – undo
74 73
 	 *
75 74
 	 * @since 2.0
76 75
 	 * @param \GV\Template_Context The context.
76
+	 * @param GV\Template_Context $context
77 77
 	 *
78 78
 	 * @return array           Array of file output, with `file_path` and `html` keys (see comments above)
79 79
 	 */
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -24,21 +24,21 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
26 26
 
27
-		unset( $field_options['search_filter'] );
27
+		unset( $field_options[ 'search_filter' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$add_options['link_to_file'] = array(
33
+		$add_options[ 'link_to_file' ] = array(
34 34
 			'type' => 'checkbox',
35 35
 			'label' => __( 'Display as a Link:', 'gravityview' ),
36
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
36
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
37 37
 			'value' => false,
38 38
 			'merge_tags' => false,
39 39
 		);
40 40
 
41
-		$add_options['image_width'] = array(
41
+		$add_options[ 'image_width' ] = array(
42 42
 			'type' => 'text',
43 43
 			'label' => __( 'Custom Width:', 'gravityview' ),
44 44
 			'desc' => __( 'Override the default image width (250).', 'gravityview' ),
@@ -127,14 +127,14 @@  discard block
 block discarded – undo
127 127
 			$base_id = null;
128 128
 
129 129
 			$is_single = gravityview_get_context() === 'single';
130
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
130
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
131 131
 			$field_compat = $gravityview_view->getCurrentField();
132 132
 		}
133 133
 
134 134
 		$output_arr = array();
135 135
 
136 136
 		// Get an array of file paths for the field.
137
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
137
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
138 138
 
139 139
 		// The $value JSON was probably truncated; let's check lead_detail_long.
140 140
 		if ( ! is_array( $file_paths ) ) {
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 			$rendered = null;
154 154
 
155 155
 			// If the site is HTTPS, use HTTPS
156
-			if ( function_exists('set_url_scheme') ) {
156
+			if ( function_exists( 'set_url_scheme' ) ) {
157 157
 				$file_path = set_url_scheme( $file_path );
158 158
 			}
159 159
 
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 			$file_path_info = pathinfo( $file_path );
165 165
 
166 166
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
167
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
168
-			$basename = $file_path_info['basename'];
167
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
168
+			$basename = $file_path_info[ 'basename' ];
169 169
 
170 170
 			// Get the secure download URL
171 171
 			$is_secure = false;
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 					 */
203 203
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
204 204
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
205
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
205
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
206 206
 					), $context );
207 207
 
208 208
 					/**
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 					 */
239 239
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
240 240
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
241
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
241
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
242 242
 					), $context );
243 243
 
244 244
 					/**
@@ -271,13 +271,13 @@  discard block
 block discarded – undo
271 271
 				$width = \GV\Utils::get( $field_settings, 'image_width', 250 );
272 272
 				$image_atts = array(
273 273
 					'src'   => $file_path,
274
-					'class' => 'gv-image gv-field-id-' . $field_settings['id'],
275
-					'alt'   => $field_settings['label'],
276
-					'width' => ( $is_single ? null : ( $width ? $width: 250 ) )
274
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
275
+					'alt'   => $field_settings[ 'label' ],
276
+					'width' => ( $is_single ? null : ( $width ? $width : 250 ) )
277 277
 				);
278 278
 				
279 279
 				if ( $is_secure ) {
280
-					$image_atts['validate_src'] = false;
280
+					$image_atts[ 'validate_src' ] = false;
281 281
 				}
282 282
 
283 283
 				/**
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 
293 293
 				$image = new GravityView_Image( $image_atts );
294 294
 
295
-				$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
295
+				$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
296 296
 
297 297
 				/**
298 298
 				 * @filter `gravityview/fields/fileupload/allow_insecure_lightbox` Allow insecure links to be shown for the lighbox.
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 				 */
304 304
 				$override_security = apply_filters( 'gravityview/fields/fileupload/allow_insecure_lightbox', false, $file_path, $field_settings, $context );
305 305
 
306
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) && ( ! $is_secure || $override_security ) ) {
306
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) && ( ! $is_secure || $override_security ) ) {
307 307
 					$lightbox_link_atts = array(
308 308
 						'rel'   => sprintf( "%s-%s", $gv_class, $entry_slug ),
309 309
 						'class' => 'thickbox',
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 					$lightbox_link_atts = apply_filters( 'gravityview/fields/fileupload/link_atts', $lightbox_link_atts, $field_compat, $context );
313 313
 
314 314
 					if ( $override_security ) {
315
-						$image_atts['src'] = $insecure_file_path;
315
+						$image_atts[ 'src' ] = $insecure_file_path;
316 316
 						$image = new GravityView_Image( $image_atts );
317 317
 						$file_path = $insecure_file_path;
318 318
 						// :( a kitten died somewhere
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 				}
325 325
 
326 326
 				// Show as link should render the image regardless.
327
-				if ( ! empty( $field_settings['show_as_link'] ) ) {
327
+				if ( ! empty( $field_settings[ 'show_as_link' ] ) ) {
328 328
 					$text = $rendered;
329 329
 				}
330 330
 			}
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
342 342
 
343 343
 			// Output textualized content where 
344
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) {
344
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) {
345 345
 				/**
346 346
 				 * Modify the link text (defaults to the file name)
347 347
 				 *
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 				 */
355 355
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context );
356 356
 
357
-				if ( empty( $field_settings['show_as_link'] ) ) {
357
+				if ( empty( $field_settings[ 'show_as_link' ] ) ) {
358 358
 					/**
359 359
 					 * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field
360 360
 					 * @param array|string $link_atts Array or attributes string
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 				$content = empty( $rendered ) ? $text : $rendered;
371 371
 			}
372 372
 
373
-			$output_arr[] = array(
373
+			$output_arr[ ] = array(
374 374
 				'file_path' => $file_path,
375 375
 				'content' => $content
376 376
 			);
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-is-fulfilled.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 	 *
73 73
 	 * @param mixed $value The value in.
74 74
 	 *
75
-	 * @return mixed The value out.
75
+	 * @return string The value out.
76 76
 	 */
77 77
 	public function get_value( $value ) {
78 78
 		return $this->get_string_from_value( $value );
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	public function get_content( $output, $entry = array(), $field_settings = array(), $field = array() ) {
61 61
 
62 62
 		/** Overridden by a template. */
63
-		if( ! empty( $field['field_path'] ) ) { return $output; }
63
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
64 64
 
65 65
 		return $this->get_string_from_value( $output );
66 66
 	}
@@ -92,11 +92,11 @@  discard block
 block discarded – undo
92 92
 		switch ( intval( $value ) ) {
93 93
 			case self::NOT_FULFILLED:
94 94
 			default:
95
-				$return = __('Not Fulfilled', 'gravityview');
95
+				$return = __( 'Not Fulfilled', 'gravityview' );
96 96
 				break;
97 97
 
98 98
 			case self::FULFILLED:
99
-				$return = __('Fulfilled', 'gravityview');
99
+				$return = __( 'Fulfilled', 'gravityview' );
100 100
 				break;
101 101
 		}
102 102
 
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 	 *
117 117
 	 * @return string Original text if {is_fulfilled} isn't found. Otherwise, "Not Fulfilled" or "Fulfilled"
118 118
 	 */
119
-	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
119
+	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
120 120
 
121 121
 		$return = $text;
122 122
 
123 123
 		foreach ( $matches as $match ) {
124 124
 
125
-			$full_tag = $match[0];
125
+			$full_tag = $match[ 0 ];
126 126
 
127 127
 			$fulfilled = \GV\Utils::get( $entry, 'is_fulfilled' );
128 128
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-payment-amount.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 	 * @param \GV\Entry		$entry	The entry.
70 70
 	 * @param \GV\Request	$request The request context.
71 71
 	 *
72
-	 * @return mixed $value The filtered value.
72
+	 * @return string $value The filtered value.
73 73
 	 */
74 74
 	public function get_value( $value, $field, $view, $source, $entry, $request ) {
75 75
 		return $this->get_content( $value, $entry->as_entry(), $field->as_configuration() );
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) {
50 50
 
51 51
 		/** Overridden by a template. */
52
-		if( ! empty( $field['field_path'] ) ) { return $output; }
52
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
53 53
 
54 54
 		$amount = \GV\Utils::get( $entry, 'payment_amount' );
55 55
 		$return = GFCommon::to_money( $amount, \GV\Utils::get( $entry, 'currency' ) );
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
 	 *
89 89
 	 * @return string Original text if {date_created} isn't found. Otherwise, replaced text.
90 90
 	 */
91
-	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
91
+	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
92 92
 
93 93
 		$return = $text;
94 94
 
95 95
 		foreach ( $matches as $match ) {
96 96
 
97
-			$full_tag = $match[0];
98
-			$modifier = isset( $match[1] ) ? $match[1] : false;
97
+			$full_tag = $match[ 0 ];
98
+			$modifier = isset( $match[ 1 ] ) ? $match[ 1 ] : false;
99 99
 
100 100
 			$amount = \GV\Utils::get( $entry, 'payment_amount' );
101 101
 
Please login to merge, or discard this patch.
future/lib/EDD_SL_Plugin_Updater.php 3 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,9 @@
 block discarded – undo
2 2
 namespace GV;
3 3
 
4 4
 // Exit if accessed directly
5
-if ( ! defined( 'ABSPATH' ) ) exit;
5
+if ( ! defined( 'ABSPATH' ) ) {
6
+	exit;
7
+}
6 8
 
7 9
 /**
8 10
  * Allows plugins to use their own update API.
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
 	 * @uses api_request()
79 79
 	 *
80 80
 	 * @param array   $_transient_data Update array build by WordPress.
81
-	 * @return array Modified update array with custom plugin data.
81
+	 * @return \stdClass Modified update array with custom plugin data.
82 82
 	 */
83 83
 	public function check_update( $_transient_data ) {
84 84
 
Please login to merge, or discard this patch.
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -40,10 +40,10 @@  discard block
 block discarded – undo
40 40
 		$this->api_data    = $_api_data;
41 41
 		$this->name        = plugin_basename( $_plugin_file );
42 42
 		$this->slug        = basename( $_plugin_file, '.php' );
43
-		$this->version     = $_api_data['version'];
44
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
45
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
46
-		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
43
+		$this->version     = $_api_data[ 'version' ];
44
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
45
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
46
+		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
47 47
 
48 48
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
49 49
 
@@ -147,11 +147,11 @@  discard block
 block discarded – undo
147 147
 			return;
148 148
 		}
149 149
 
150
-		if( ! current_user_can( 'update_plugins' ) ) {
150
+		if ( ! current_user_can( 'update_plugins' ) ) {
151 151
 			return;
152 152
 		}
153 153
 
154
-		if( ! is_multisite() ) {
154
+		if ( ! is_multisite() ) {
155 155
 			return;
156 156
 		}
157 157
 
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
248 248
 					esc_html( $version_info->new_version ),
249 249
 					'</a>',
250
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
250
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
251 251
 					'</a>'
252 252
 				);
253 253
 			}
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 			)
293 293
 		);
294 294
 
295
-		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
295
+		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
296 296
 
297 297
 		// Get the transient where we store the api request for this plugin for 24 hours
298 298
 		$edd_api_request_transient = $this->get_cached_version_info( $cache_key );
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 			$_data->contributors = $this->convert_object_to_array( $_data->contributors );
334 334
 		}
335 335
 
336
-		if( ! isset( $_data->plugin ) ) {
336
+		if ( ! isset( $_data->plugin ) ) {
337 337
 			$_data->plugin = $this->name;
338 338
 		}
339 339
 
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 
373 373
 		$verify_ssl = $this->verify_ssl();
374 374
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
375
-			$args['sslverify'] = $verify_ssl;
375
+			$args[ 'sslverify' ] = $verify_ssl;
376 376
 		}
377 377
 		return $args;
378 378
 
@@ -400,9 +400,9 @@  discard block
 block discarded – undo
400 400
 		if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) {
401 401
 			$test_url_parts = parse_url( $this->api_url );
402 402
 
403
-			$scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme']     : 'http';
404
-			$host   = ! empty( $test_url_parts['host'] )   ? $test_url_parts['host']       : '';
405
-			$port   = ! empty( $test_url_parts['port'] )   ? ':' . $test_url_parts['port'] : '';
403
+			$scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http';
404
+			$host   = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : '';
405
+			$port   = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : '';
406 406
 
407 407
 			if ( empty( $host ) ) {
408 408
 				$edd_plugin_url_available[ $store_hash ] = false;
@@ -419,27 +419,27 @@  discard block
 block discarded – undo
419 419
 
420 420
 		$data = array_merge( $this->api_data, $_data );
421 421
 
422
-		if ( $data['slug'] != $this->slug ) {
422
+		if ( $data[ 'slug' ] != $this->slug ) {
423 423
 			return;
424 424
 		}
425 425
 
426
-		if( $this->api_url == trailingslashit ( home_url() ) ) {
426
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
427 427
 			return false; // Don't allow a plugin to ping itself
428 428
 		}
429 429
 
430 430
 		$api_params = array(
431 431
 			'edd_action' => 'get_version',
432
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
433
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
434
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
435
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
436
-			'slug'       => $data['slug'],
437
-			'author'     => $data['author'],
432
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
433
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
434
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
435
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
436
+			'slug'       => $data[ 'slug' ],
437
+			'author'     => $data[ 'author' ],
438 438
 			'url'        => home_url(),
439
-			'beta'       => ! empty( $data['beta'] ),
439
+			'beta'       => ! empty( $data[ 'beta' ] ),
440 440
 		);
441 441
 
442
-		$request    = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
442
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
443 443
 
444 444
 		if ( ! is_wp_error( $request ) ) {
445 445
 			$request = json_decode( wp_remote_retrieve_body( $request ) );
@@ -459,9 +459,9 @@  discard block
 block discarded – undo
459 459
 			$request->icons = maybe_unserialize( $request->icons );
460 460
 		}
461 461
 
462
-		if( ! empty( $request->sections ) ) {
463
-			foreach( $request->sections as $key => $section ) {
464
-				$request->$key = (array) $section;
462
+		if ( ! empty( $request->sections ) ) {
463
+			foreach ( $request->sections as $key => $section ) {
464
+				$request->$key = (array)$section;
465 465
 			}
466 466
 		}
467 467
 
@@ -472,37 +472,37 @@  discard block
 block discarded – undo
472 472
 
473 473
 		global $edd_plugin_data;
474 474
 
475
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
475
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
476 476
 			return;
477 477
 		}
478 478
 
479
-		if( empty( $_REQUEST['plugin'] ) ) {
479
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
480 480
 			return;
481 481
 		}
482 482
 
483
-		if( empty( $_REQUEST['slug'] ) ) {
483
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
484 484
 			return;
485 485
 		}
486 486
 
487
-		if( ! current_user_can( 'update_plugins' ) ) {
487
+		if ( ! current_user_can( 'update_plugins' ) ) {
488 488
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
489 489
 		}
490 490
 
491
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
492
-		$beta         = ! empty( $data['beta'] ) ? true : false;
493
-		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' );
491
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
492
+		$beta         = ! empty( $data[ 'beta' ] ) ? true : false;
493
+		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' );
494 494
 		$version_info = $this->get_cached_version_info( $cache_key );
495 495
 
496
-		if( false === $version_info ) {
496
+		if ( false === $version_info ) {
497 497
 
498 498
 			$api_params = array(
499 499
 				'edd_action' => 'get_version',
500
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
501
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
502
-				'slug'       => $_REQUEST['slug'],
503
-				'author'     => $data['author'],
500
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
501
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
502
+				'slug'       => $_REQUEST[ 'slug' ],
503
+				'author'     => $data[ 'author' ],
504 504
 				'url'        => home_url(),
505
-				'beta'       => ! empty( $data['beta'] )
505
+				'beta'       => ! empty( $data[ 'beta' ] )
506 506
 			);
507 507
 
508 508
 			$verify_ssl = $this->verify_ssl();
@@ -519,9 +519,9 @@  discard block
 block discarded – undo
519 519
 				$version_info = false;
520 520
 			}
521 521
 
522
-			if( ! empty( $version_info ) ) {
523
-				foreach( $version_info->sections as $key => $section ) {
524
-					$version_info->$key = (array) $section;
522
+			if ( ! empty( $version_info ) ) {
523
+				foreach ( $version_info->sections as $key => $section ) {
524
+					$version_info->$key = (array)$section;
525 525
 				}
526 526
 			}
527 527
 
@@ -529,8 +529,8 @@  discard block
 block discarded – undo
529 529
 
530 530
 		}
531 531
 
532
-		if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
533
-			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>';
532
+		if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) {
533
+			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>';
534 534
 		}
535 535
 
536 536
 		exit;
@@ -538,29 +538,29 @@  discard block
 block discarded – undo
538 538
 
539 539
 	public function get_cached_version_info( $cache_key = '' ) {
540 540
 
541
-		if( empty( $cache_key ) ) {
541
+		if ( empty( $cache_key ) ) {
542 542
 			$cache_key = $this->cache_key;
543 543
 		}
544 544
 
545 545
 		$cache = get_option( $cache_key );
546 546
 
547
-		if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
547
+		if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) {
548 548
 			return false; // Cache is expired
549 549
 		}
550 550
 
551 551
 		// We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point.
552
-		$cache['value'] = json_decode( $cache['value'] );
553
-		if ( ! empty( $cache['value']->icons ) ) {
554
-			$cache['value']->icons = (array) $cache['value']->icons;
552
+		$cache[ 'value' ] = json_decode( $cache[ 'value' ] );
553
+		if ( ! empty( $cache[ 'value' ]->icons ) ) {
554
+			$cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons;
555 555
 		}
556 556
 
557
-		return $cache['value'];
557
+		return $cache[ 'value' ];
558 558
 
559 559
 	}
560 560
 
561 561
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
562 562
 
563
-		if( empty( $cache_key ) ) {
563
+		if ( empty( $cache_key ) ) {
564 564
 			$cache_key = $this->cache_key;
565 565
 		}
566 566
 
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 	 * @return bool
581 581
 	 */
582 582
 	private function verify_ssl() {
583
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
583
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
584 584
 	}
585 585
 
586 586
 }
Please login to merge, or discard this patch.
future/loader.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -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. */
Please login to merge, or discard this patch.