Completed
Push — develop ( dbeb5a...fc5fc1 )
by Zack
19:43
created
includes/class-gravityview-merge-tags.php 1 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-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.