Completed
Pull Request — develop (#1726)
by
unknown
19:16
created
future/includes/class-gv-collection-entry.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -104,11 +104,11 @@  discard block
 block discarded – undo
104 104
 
105 105
 		/** Call all lazy callbacks. */
106 106
 		foreach ( $this->callbacks as $callback ) {
107
-			if ( $callback[0] != 'count' ) {
107
+			if ( $callback[ 0 ] != 'count' ) {
108 108
 				continue;
109 109
 			}
110 110
 
111
-			$total += $callback[1]( $this->filters );
111
+			$total += $callback[ 1 ]( $this->filters );
112 112
 		}
113 113
 
114 114
 		if ( ! $total ) {
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 
149 149
 		foreach ( $this->all() as $entry ) {
150 150
 			$entry = $entry->as_entry();
151
-			$result[] = Utils::get( $entry, $key, null );
151
+			$result[ ] = Utils::get( $entry, $key, null );
152 152
 		}
153 153
 
154 154
 		return $result;
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
206 206
 
207 207
 		/** Call all lazy callbacks. */
208 208
 		foreach ( $this->callbacks as $i => $callback ) {
209
-			if ( $callback[0] != 'fetch' ) {
209
+			if ( $callback[ 0 ] != 'fetch' ) {
210 210
 				continue;
211 211
 			}
212 212
 
213
-			$this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) );
213
+			$this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) );
214 214
 		}
215 215
 
216 216
 		$this->fetched = parent::count();
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 			return;
367 367
 		}
368 368
 
369
-		$this->callbacks []= array( $type, $callback );
369
+		$this->callbacks [ ] = array( $type, $callback );
370 370
 	}
371 371
 
372 372
 	/**
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-page-size.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
 	/**
78 78
 	 * Render the page size widget
79
-     *
79
+	 *
80 80
 	 * @param array $widget_args The Widget shortcode args.
81 81
 	 * @param string $content The content.
82 82
 	 * @param string|\GV\Template_Context $context The context, if available.
@@ -117,10 +117,10 @@  discard block
 block discarded – undo
117 117
 						<?php } ?>
118 118
                     </select>
119 119
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
120
-                    if( ! empty( $_GET ) ) {
121
-                        $get = $_GET;
122
-                        unset( $get['page_size'] );
123
-	                    foreach ( $get as $key => $value ) {
120
+					if( ! empty( $_GET ) ) {
121
+						$get = $_GET;
122
+						unset( $get['page_size'] );
123
+						foreach ( $get as $key => $value ) {
124 124
 							if ( is_array( $value ) ) {
125 125
 								foreach ( $value as $_key => $_value ) {
126 126
 									printf( '<input type="hidden" name="%s[%s]" value="%s" />', esc_attr( $key ), esc_attr( $_key ), esc_attr( $_value ) );
@@ -128,9 +128,9 @@  discard block
 block discarded – undo
128 128
 							} else {
129 129
 								printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) );
130 130
 							}
131
-	                    }
132
-                    }
133
-                    ?>
131
+						}
132
+					}
133
+					?>
134 134
                 </div>
135 135
             </form>
136 136
         </div>
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		$default_size = 25;
48 48
 
49 49
 		if ( $context instanceof \GV\Template_Context ) {
50
-			$default_size = (int) $context->view->settings->get( 'page_size' );
50
+			$default_size = (int)$context->view->settings->get( 'page_size' );
51 51
 		}
52 52
 
53 53
 		$sizes = array( 10, 25, $default_size, 50, 100 );
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
 		$page_sizes = array();
60 60
 		foreach ( $sizes as $size ) {
61
-			$page_sizes [] = array(
61
+			$page_sizes [ ] = array(
62 62
 				'value' => $size,
63 63
 				'text'  => $size
64 64
 			);
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
 	 */
84 84
 	public function render_frontend( $widget_args, $content = '', $context = null ) {
85 85
 
86
-		if( ! $this->pre_render_frontend() ) {
86
+		if ( ! $this->pre_render_frontend() ) {
87 87
 			return;
88 88
 		}
89 89
 
90
-		$page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
90
+		$page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
91 91
 
92 92
 		$settings = shortcode_atts( array(
93 93
 			'label'   => __( 'Page Size', 'gravityview' ),
@@ -106,20 +106,20 @@  discard block
 block discarded – undo
106 106
         <div class="gv-widget-page-size">
107 107
             <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();">
108 108
                 <div>
109
-                    <?php if( ! empty( $settings['label'] ) ) { ?>
110
-                    <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label>
109
+                    <?php if ( ! empty( $settings[ 'label' ] ) ) { ?>
110
+                    <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label>
111 111
                     <?php } ?>
112 112
                     <select name="page_size" id="gv-page_size">
113
-                        <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option>
113
+                        <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option>
114 114
 						<?php
115
-						foreach ( $settings['choices'] as $choice ) { ?>
116
-                            <option value='<?php echo esc_attr( $choice['value'] ); ?>'<?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
115
+						foreach ( $settings[ 'choices' ] as $choice ) { ?>
116
+                            <option value='<?php echo esc_attr( $choice[ 'value' ] ); ?>'<?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
117 117
 						<?php } ?>
118 118
                     </select>
119 119
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
120
-                    if( ! empty( $_GET ) ) {
120
+                    if ( ! empty( $_GET ) ) {
121 121
                         $get = $_GET;
122
-                        unset( $get['page_size'] );
122
+                        unset( $get[ 'page_size' ] );
123 123
 	                    foreach ( $get as $key => $value ) {
124 124
 							if ( is_array( $value ) ) {
125 125
 								foreach ( $value as $_key => $_value ) {
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 		}
159 159
 
160 160
 		// Already overridden
161
-		if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) {
161
+		if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) {
162 162
 			return;
163 163
 		}
164 164
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 			'view' => $view,
167 167
 		) );
168 168
 
169
-		if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
169
+		if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
170 170
 			gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) );
171 171
 			return;
172 172
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-excerpt.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,13 +24,13 @@
 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['show_as_link'] );
27
+		unset( $field_options[ 'show_as_link' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$this->add_field_support('dynamic_data', $field_options );
33
+		$this->add_field_support( 'dynamic_data', $field_options );
34 34
 
35 35
 		return $field_options;
36 36
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-gquiz_score.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
24 24
 
25
-		if( 'edit' === $context ) {
25
+		if ( 'edit' === $context ) {
26 26
 			return $field_options;
27 27
 		}
28 28
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 			'quiz_use_max_score' => array(
31 31
 				'type' => 'checkbox',
32 32
 				'label' => __( 'Show Max Score?', 'gravityview' ),
33
-				'desc' => __('Display score as the a fraction: "[score]/[max score]". If unchecked, will display score.', 'gravityview'),
33
+				'desc' => __( 'Display score as the a fraction: "[score]/[max score]". If unchecked, will display score.', 'gravityview' ),
34 34
 				'value' => true,
35 35
 				'merge_tags' => false,
36 36
 			),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-is-approved.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 */
96 96
 	function add_default_field( $entry_default_fields, $form, $zone ) {
97 97
 
98
-		if( 'edit' !== $zone ) {
98
+		if ( 'edit' !== $zone ) {
99 99
 			$entry_default_fields[ $this->name ] = array(
100 100
 				'label' => $this->label,
101 101
 				'desc'  => $this->description,
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 
121 121
 		$merge_tags = array(
122 122
 			array(
123
-				'label' => __('Approval Status', 'gravityview'),
123
+				'label' => __( 'Approval Status', 'gravityview' ),
124 124
 				'tag' => '{approval_status}'
125 125
 			),
126 126
 		);
@@ -160,10 +160,10 @@  discard block
 block discarded – undo
160 160
 				gravityview()->log->error( 'No entry data available. Returning empty string.' );
161 161
 				$replacement = '';
162 162
 			} else {
163
-				$replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[1] );
163
+				$replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[ 1 ] );
164 164
 			}
165 165
 
166
-			$return = str_replace( $match[0], $replacement, $return );
166
+			$return = str_replace( $match[ 0 ], $replacement, $return );
167 167
 		}
168 168
 
169 169
 		return $return;
@@ -171,25 +171,25 @@  discard block
 block discarded – undo
171 171
 
172 172
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
173 173
 
174
-		$field_options['approved_label'] = array(
174
+		$field_options[ 'approved_label' ] = array(
175 175
 			'type' => 'text',
176 176
 			'label' => __( 'Approved Label', 'gravityview' ),
177 177
 			'desc' => __( 'If the entry is approved, display this value', 'gravityview' ),
178
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('approved'),
178
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'approved' ),
179 179
 		);
180 180
 
181
-		$field_options['disapproved_label'] = array(
181
+		$field_options[ 'disapproved_label' ] = array(
182 182
 			'type' => 'text',
183 183
 			'label' => __( 'Disapproved Label', 'gravityview' ),
184 184
 			'desc' => __( 'If the entry is not approved, display this value', 'gravityview' ),
185
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('disapproved'),
185
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'disapproved' ),
186 186
 		);
187 187
 
188
-		$field_options['unapproved_label'] = array(
188
+		$field_options[ 'unapproved_label' ] = array(
189 189
 			'type' => 'text',
190 190
 			'label' => __( 'Unapproved Label', 'gravityview' ),
191 191
 			'desc' => __( 'If the entry has not yet been approved or disapproved, display this value', 'gravityview' ),
192
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('unapproved'),
192
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'unapproved' ),
193 193
 		);
194 194
 
195 195
 		return $field_options;
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-title.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,13 +28,13 @@
 block discarded – undo
28 28
 
29 29
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
30 30
 
31
-		if( 'edit' === $context ) {
31
+		if ( 'edit' === $context ) {
32 32
 			return $field_options;
33 33
 		}
34 34
 
35
-		$this->add_field_support('link_to_post', $field_options );
35
+		$this->add_field_support( 'link_to_post', $field_options );
36 36
 
37
-		$this->add_field_support('dynamic_data', $field_options );
37
+		$this->add_field_support( 'dynamic_data', $field_options );
38 38
 
39 39
 		return $field_options;
40 40
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-date-created.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
 
36 36
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
37 37
 
38
-		if( 'edit' === $context ) {
38
+		if ( 'edit' === $context ) {
39 39
 			return $field_options;
40 40
 		}
41 41
 
42
-		$this->add_field_support('date_display', $field_options );
42
+		$this->add_field_support( 'date_display', $field_options );
43 43
 
44 44
 		return $field_options;
45 45
 	}
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
 	public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) {
62 62
 
63 63
 		/** Overridden by a template. */
64
-		if( ! empty( $field['field_path'] ) ) { return $output; }
64
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
65 65
 
66
-		return GVCommon::format_date( $field['value'], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) );
66
+		return GVCommon::format_date( $field[ 'value' ], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) );
67 67
 	}
68 68
 
69 69
 	/**
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 *
82 82
 	 * @return string Original text if {date_created} isn't found. Otherwise, replaced text.
83 83
 	 */
84
-	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
84
+	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
85 85
 
86 86
 		$return = $text;
87 87
 
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
 
91 91
 		foreach ( $matches as $match ) {
92 92
 
93
-			$full_tag          = $match[0];
94
-			$property          = $match[1];
93
+			$full_tag          = $match[ 0 ];
94
+			$property          = $match[ 1 ];
95 95
 
96 96
 			$formatted_date = GravityView_Merge_Tags::format_date( $date_created, $property );
97 97
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-section.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@
 block discarded – undo
41 41
 
42 42
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
43 43
 
44
-		unset ( $field_options['search_filter'], $field_options['show_as_link'] );
44
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] );
45 45
 
46 46
 		// Set the default CSS class to gv-section, which applies a border and top/bottom margin
47
-		$field_options['custom_class']['value'] = 'gv-section';
47
+		$field_options[ 'custom_class' ][ 'value' ] = 'gv-section';
48 48
 
49 49
 		return $field_options;
50 50
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-quiz.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
20 20
 
21
-		if( 'edit' === $context ) {
21
+		if ( 'edit' === $context ) {
22 22
 			return $field_options;
23 23
 		}
24 24
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			'quiz_show_explanation' => array(
27 27
 				'type' => 'checkbox',
28 28
 				'label' => __( 'Show Answer Explanation?', 'gravityview' ),
29
-				'desc' => __('If the field has an answer explanation, show it?', 'gravityview'),
29
+				'desc' => __( 'If the field has an answer explanation, show it?', 'gravityview' ),
30 30
 				'value' => false,
31 31
 				'merge_tags' => false,
32 32
 			),
Please login to merge, or discard this patch.