Completed
Push — develop ( 0eab66...c30d8d )
by Zack
11:05 queued 03:39
created
future/includes/class-gv-settings-view.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 		 */
40 40
 		$default_settings = apply_filters( 'gravityview_default_args', array(
41 41
 			'id' => array(
42
-				'label' => __('View ID', 'gravityview'),
42
+				'label' => __( 'View ID', 'gravityview' ),
43 43
 				'type' => 'number',
44 44
 				'group'	=> 'default',
45 45
 				'value' => NULL,
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 				'show_in_shortcode' => false,
48 48
 			),
49 49
 			'page_size' => array(
50
-				'label' 	=> __('Number of entries per page', 'gravityview'),
50
+				'label' 	=> __( 'Number of entries per page', 'gravityview' ),
51 51
 				'type' => 'number',
52 52
 				'class'	=> 'small-text',
53 53
 				'group'	=> 'default',
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 				'show_in_shortcode' => true,
56 56
 			),
57 57
 			'offset' => array(
58
-				'label' 	=> __('Offset entries starting from', 'gravityview'),
58
+				'label' 	=> __( 'Offset entries starting from', 'gravityview' ),
59 59
 				'type' => 'number',
60 60
 				'class'	=> 'small-text',
61 61
 				'group'	=> 'default',
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 			),
80 80
 			'admin_show_all_statuses' => array(
81 81
 				'label' => __( 'Show all entries to administrators', 'gravityview' ),
82
-				'desc'	=> __('Administrators will be able to see entries with any approval status.', 'gravityview'),
83
-				'tooltip' => __('Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview'),
82
+				'desc'	=> __( 'Administrators will be able to see entries with any approval status.', 'gravityview' ),
83
+				'tooltip' => __( 'Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview' ),
84 84
 				'requires' => 'show_only_approved',
85 85
 				'type' => 'checkbox',
86 86
 				'group'	=> 'default',
@@ -105,40 +105,40 @@  discard block
 block discarded – undo
105 105
 			'user_edit' => array(
106 106
 				'label'	=> __( 'Allow User Edit', 'gravityview' ),
107 107
 				'group'	=> 'default',
108
-				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
108
+				'desc'	=> __( 'Allow logged-in users to edit entries they created.', 'gravityview' ),
109 109
 				'value'	=> 0,
110
-				'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'),
110
+				'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ),
111 111
 				'type'	=> 'checkbox',
112 112
 				'show_in_shortcode' => true,
113 113
 			),
114 114
 			'user_delete' => array(
115 115
 				'label'	=> __( 'Allow User Delete', 'gravityview' ),
116 116
 				'group'	=> 'default',
117
-				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
117
+				'desc'	=> __( 'Allow logged-in users to delete entries they created.', 'gravityview' ),
118 118
 				'value'	=> 0,
119
-				'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'),
119
+				'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ),
120 120
 				'type'	=> 'checkbox',
121 121
 				'show_in_shortcode' => true,
122 122
 			),
123 123
 			'sort_field' => array(
124
-				'label'	=> __('Sort by field', 'gravityview'),
124
+				'label'	=> __( 'Sort by field', 'gravityview' ),
125 125
 				'type' => 'select',
126 126
 				'value' => '',
127 127
 				'group'	=> 'sort',
128 128
 				'options' => array(
129
-					'' => __( 'Default', 'gravityview'),
130
-					'date_created' => __( 'Date Created', 'gravityview'),
129
+					'' => __( 'Default', 'gravityview' ),
130
+					'date_created' => __( 'Date Created', 'gravityview' ),
131 131
 				),
132 132
 				'show_in_shortcode' => true,
133 133
 			),
134 134
 			'sort_direction' => array(
135
-				'label' 	=> __('Sort direction', 'gravityview'),
135
+				'label' 	=> __( 'Sort direction', 'gravityview' ),
136 136
 				'type' => 'select',
137 137
 				'value' => 'ASC',
138 138
 				'group'	=> 'sort',
139 139
 				'options' => array(
140
-					'ASC' => __('ASC', 'gravityview'),
141
-					'DESC' => __('DESC', 'gravityview'),
140
+					'ASC' => __( 'ASC', 'gravityview' ),
141
+					'DESC' => __( 'DESC', 'gravityview' ),
142 142
 					//'RAND' => __('Random', 'gravityview'),
143 143
 				),
144 144
 				'show_in_shortcode' => true,
@@ -154,69 +154,69 @@  discard block
 block discarded – undo
154 154
 				'show_in_template' => array( 'default_table' ),
155 155
 			),
156 156
 			'start_date' => array(
157
-				'label' 	=> __('Filter by Start Date', 'gravityview'),
157
+				'label' 	=> __( 'Filter by Start Date', 'gravityview' ),
158 158
 				'class'	=> 'gv-datepicker',
159
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
159
+				'desc'	=> __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
160 160
 				'type' => 'text',
161 161
 				'value' => '',
162 162
 				'group'	=> 'filter',
163 163
 				'show_in_shortcode' => true,
164 164
 			),
165 165
 			'end_date' => array(
166
-				'label' 	=> __('Filter by End Date', 'gravityview'),
166
+				'label' 	=> __( 'Filter by End Date', 'gravityview' ),
167 167
 				'class'	=> 'gv-datepicker',
168
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
168
+				'desc'	=> __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
169 169
 				'type' => 'text',
170 170
 				'value' => '',
171 171
 				'group'	=> 'filter',
172 172
 				'show_in_shortcode' => true,
173 173
 			),
174 174
 			'class' => array(
175
-				'label' 	=> __('CSS Class', 'gravityview'),
176
-				'desc'	=> __('CSS class to add to the wrapping HTML container.', 'gravityview'),
175
+				'label' 	=> __( 'CSS Class', 'gravityview' ),
176
+				'desc'	=> __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ),
177 177
 				'group'	=> 'default',
178 178
 				'type' => 'text',
179 179
 				'value' => '',
180 180
 				'show_in_shortcode' => false,
181 181
 			),
182 182
 			'search_value' => array(
183
-				'label' 	=> __('Search Value', 'gravityview'),
184
-				'desc'	=> __('Define a default search value for the View', 'gravityview'),
183
+				'label' 	=> __( 'Search Value', 'gravityview' ),
184
+				'desc'	=> __( 'Define a default search value for the View', 'gravityview' ),
185 185
 				'type' => 'text',
186 186
 				'value' => '',
187 187
 				'group'	=> 'filter',
188 188
 				'show_in_shortcode' => false,
189 189
 			),
190 190
 			'search_field' => array(
191
-				'label' 	=> __('Search Field', 'gravityview'),
192
-				'desc'	=> __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'),
191
+				'label' 	=> __( 'Search Field', 'gravityview' ),
192
+				'desc'	=> __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ),
193 193
 				'type' => 'number',
194 194
 				'value' => '',
195 195
 				'group'	=> 'filter',
196 196
 				'show_in_shortcode' => false,
197 197
 			),
198 198
 			'single_title' => array(
199
-				'label'	=> __('Single Entry Title', 'gravityview'),
199
+				'label'	=> __( 'Single Entry Title', 'gravityview' ),
200 200
 				'type'	=> 'text',
201
-				'desc'	=> __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'),
201
+				'desc'	=> __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ),
202 202
 				'group'	=> 'default',
203 203
 				'value'	=> '',
204 204
 				'show_in_shortcode' => false,
205 205
 				'full_width' => true,
206 206
 			),
207 207
 			'back_link_label' => array(
208
-				'label'	=> __('Back Link Label', 'gravityview'),
208
+				'label'	=> __( 'Back Link Label', 'gravityview' ),
209 209
 				'group'	=> 'default',
210
-				'desc'	=> __('The text of the link that returns to the multiple entries view.', 'gravityview'),
210
+				'desc'	=> __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ),
211 211
 				'type'	=> 'text',
212 212
 				'value'	=> '',
213 213
 				'show_in_shortcode' => false,
214 214
 				'full_width' => true,
215 215
 			),
216 216
 			'embed_only' => array(
217
-				'label'	=> __('Prevent Direct Access', 'gravityview'),
217
+				'label'	=> __( 'Prevent Direct Access', 'gravityview' ),
218 218
 				'group'	=> 'default',
219
-				'desc'	=> __('Only allow access to this View when embedded using the shortcode.', 'gravityview'),
219
+				'desc'	=> __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ),
220 220
 				'type'	=> 'checkbox',
221 221
 				'value'	=> '',
222 222
 				'show_in_shortcode' => false,
@@ -238,19 +238,19 @@  discard block
 block discarded – undo
238 238
 		// By default, we only want the key => value pairing, not the whole array.
239 239
 		if ( ! $detailed ) {
240 240
 			$defaults = array();
241
-			foreach( $default_settings as $key => $value ) {
242
-				$defaults[ $key ] = $value['value'];
241
+			foreach ( $default_settings as $key => $value ) {
242
+				$defaults[ $key ] = $value[ 'value' ];
243 243
 			}
244 244
 			return $defaults;
245 245
 
246 246
 		// But sometimes, we want all the details.
247 247
 		} else {
248
-			foreach ($default_settings as $key => $value) {
248
+			foreach ( $default_settings as $key => $value ) {
249 249
 
250 250
 				// If the $group argument is set for the method,
251 251
 				// ignore any settings that aren't in that group.
252 252
 				if ( ! empty( $group ) && is_string( $group ) ) {
253
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
253
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
254 254
 						unset( $default_settings[ $key ] );
255 255
 					}
256 256
 				}
Please login to merge, or discard this patch.
future/includes/class-gv-settings.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	 * @return void
27 27
 	 */
28 28
 	public function set( $key, $value ) {
29
-		$this->settings[$key] = $value;
29
+		$this->settings[ $key ] = $value;
30 30
 	}
31 31
 
32 32
 	/**
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @return mixed|null
41 41
 	 */
42 42
 	public function get( $key, $default = null ) {
43
-		return isset( $this->settings[$key] ) ? $this->settings[$key] : $default;
43
+		return isset( $this->settings[ $key ] ) ? $this->settings[ $key ] : $default;
44 44
 	}
45 45
 
46 46
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-field.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -144,19 +144,19 @@
 block discarded – undo
144 144
 	public function from_configuration( $configuration ) {
145 145
 		$configuration = wp_parse_args( $configuration, $this->as_configuration() );
146 146
 
147
-		$this->ID = $configuration['id'];
148
-		$this->label = $configuration['label'];
149
-		$this->show_label = $configuration['show_label'] == '1';
150
-		$this->custom_label = $configuration['custom_label'];
151
-		$this->custom_class = $configuration['custom_class'];
152
-		$this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
153
-		$this->search_filter = $configuration['search_filter'] == '1';
154
-		$this->show_as_link = $configuration['show_as_link'] == '1';
147
+		$this->ID = $configuration[ 'id' ];
148
+		$this->label = $configuration[ 'label' ];
149
+		$this->show_label = $configuration[ 'show_label' ] == '1';
150
+		$this->custom_label = $configuration[ 'custom_label' ];
151
+		$this->custom_class = $configuration[ 'custom_class' ];
152
+		$this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : '';
153
+		$this->search_filter = $configuration[ 'search_filter' ] == '1';
154
+		$this->show_as_link = $configuration[ 'show_as_link' ] == '1';
155 155
 
156 156
 		/** Shared among all field types (sort of). */
157 157
 		$shared_configuration_keys = array(
158 158
 			'id', 'label', 'show_label', 'custom_label', 'custom_class',
159
-			'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link',
159
+			'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
160 160
 		);
161 161
 
162 162
 		/** Everything else goes into the properties for now. @todo subclasses! */
Please login to merge, or discard this patch.
future/_mocks.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
 /** Add some global fix for field capability discrepancies. */
61 61
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
62
-	if ( empty( $fields  ) ) {
62
+	if ( empty( $fields ) ) {
63 63
 		return $fields;
64 64
 	}
65 65
 
@@ -81,11 +81,11 @@  discard block
 block discarded – undo
81 81
 
82 82
 	foreach ( $fields as $position => &$_fields ) {
83 83
 		foreach ( $_fields as $uid => &$_field ) {
84
-			if ( ! isset( $_field['only_loggedin'] ) ) {
84
+			if ( ! isset( $_field[ 'only_loggedin' ] ) ) {
85 85
 				continue;
86 86
 			}
87 87
 			/** If we do not require login, we don't require a cap. */
88
-			$_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' );
88
+			$_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' );
89 89
 		}
90 90
 	}
91 91
 	return $fields;
Please login to merge, or discard this patch.
future/lib/class-gamajo-template-loader.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 		public function set_template_data( array $data, $var_name = 'data' ) {
118 118
 			global $wp_query;
119 119
 
120
-			$wp_query->query_vars[ $var_name ] = (object) $data;
120
+			$wp_query->query_vars[ $var_name ] = (object)$data;
121 121
 		}
122 122
 
123 123
 		/**
@@ -130,8 +130,8 @@  discard block
 block discarded – undo
130 130
 		public function unset_template_data() {
131 131
 			global $wp_query;
132 132
 
133
-			if ( isset( $wp_query->query_vars['data'] ) ) {
134
-				unset( $wp_query->query_vars['data'] );
133
+			if ( isset( $wp_query->query_vars[ 'data' ] ) ) {
134
+				unset( $wp_query->query_vars[ 'data' ] );
135 135
 			}
136 136
 		}
137 137
 
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
 		protected function get_template_file_names( $slug, $name ) {
149 149
 			$templates = array();
150 150
 			if ( isset( $name ) ) {
151
-				$templates[] = $slug . '-' . $name . '.php';
151
+				$templates[ ] = $slug . '-' . $name . '.php';
152 152
 			}
153
-			$templates[] = $slug . '.php';
153
+			$templates[ ] = $slug . '.php';
154 154
 
155 155
 			/**
156 156
 			 * Allow template choices to be filtered.
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 			$located = false;
189 189
 
190 190
 			// Remove empty entries.
191
-			$template_names = array_filter( (array) $template_names );
191
+			$template_names = array_filter( (array)$template_names );
192 192
 			$template_paths = $this->get_template_paths();
193 193
 
194 194
 			// Try to find a template file.
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 
234 234
 			// Only add this conditionally, so non-child themes don't redundantly check active theme twice.
235 235
 			if ( is_child_theme() ) {
236
-				$file_paths[1] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
236
+				$file_paths[ 1 ] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
237 237
 			}
238 238
 
239 239
 			/**
Please login to merge, or discard this patch.
future/gravityview.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 }
6 6
 
7 7
 /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
8
-if ( version_compare( phpversion(), '5.3' , '<' ) ) {
8
+if ( version_compare( phpversion(), '5.3', '<' ) ) {
9 9
 	return false;
10 10
 
11 11
 /** Tests with a suppressed future. */
Please login to merge, or discard this patch.