Completed
Pull Request — develop (#1687)
by
unknown
16:12
created
includes/fields/class-gravityview-field-email.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@
 block discarded – undo
28 28
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
29 29
 
30 30
 		// It makes no sense to use this as the link.
31
-		unset( $field_options['show_as_link'] );
31
+		unset( $field_options[ 'show_as_link' ] );
32 32
 
33
-		if( 'edit' === $context ) {
33
+		if ( 'edit' === $context ) {
34 34
 			return $field_options;
35 35
 		}
36 36
 
Please login to merge, or discard this patch.
fields/class-gravityview-field-workflow_current_status_timestamp.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 	 * @return string If Gravity Flow not found, or entry not processed yet, returns initial value. Otherwise, returns name of workflow step.
42 42
 	 */
43 43
 	function modify_entry_value_workflow_current_status_timestamp( $output, $entry, $field_settings, $field ) {
44
-		$timestamp = gform_get_meta( $entry['id'], 'workflow_current_status_timestamp' );
44
+		$timestamp = gform_get_meta( $entry[ 'id' ], 'workflow_current_status_timestamp' );
45 45
 
46 46
 		if ( ! $timestamp ) {
47 47
 			return $timestamp;
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-pdf.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -47,16 +47,16 @@
 block discarded – undo
47 47
 
48 48
 		foreach ( $shortcodes->get_shortcode_information( 'gravitypdf', $content ) as $shortcode ) {
49 49
 			// Let's make sure this entry ID is correct for the supplied form
50
-			$form_id = $wpdb->get_var( $wpdb->prepare( "SELECT form_id FROM $table WHERE display_meta LIKE %s", '%"' . $wpdb->esc_like( $shortcode['attr']['id'] ) . '"%' ) );
50
+			$form_id = $wpdb->get_var( $wpdb->prepare( "SELECT form_id FROM $table WHERE display_meta LIKE %s", '%"' . $wpdb->esc_like( $shortcode[ 'attr' ][ 'id' ] ) . '"%' ) );
51 51
 
52 52
 			// Inject the needed entry ID
53 53
 			$replace = str_replace(
54
-				sprintf( 'entry="%d"', $shortcode['attr']['entry'] ),
55
-				sprintf( 'entry="%d"', $context->entry[ $form_id ]['id'] ),
56
-				$shortcode['shortcode']
54
+				sprintf( 'entry="%d"', $shortcode[ 'attr' ][ 'entry' ] ),
55
+				sprintf( 'entry="%d"', $context->entry[ $form_id ][ 'id' ] ),
56
+				$shortcode[ 'shortcode' ]
57 57
 			);
58 58
 
59
-			$content = str_replace( $shortcode['shortcode'], $replace, $content );
59
+			$content = str_replace( $shortcode[ 'shortcode' ], $replace, $content );
60 60
 		}
61 61
 
62 62
 		return $content;
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-multiselect.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	 * @see GFCommon::get_field_filter_settings Gravity Forms suggests checkboxes should just be "contains"
14 14
 	 * @var array
15 15
 	 */
16
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
16
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
17 17
 
18 18
 	var $is_searchable = true;
19 19
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 		// Set the $_field_id var
46 46
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
47 47
 
48
-		if( $this->is_choice_value_enabled() ) {
49
-			$field_options['choice_display'] = array(
48
+		if ( $this->is_choice_value_enabled() ) {
49
+			$field_options[ 'choice_display' ] = array(
50 50
 				'type'    => 'radio',
51 51
 				'value'   => 'value',
52 52
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-radio.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 	var $is_searchable = true;
13 13
 
14
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
14
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
15 15
 
16 16
 	var $_gf_field_class_name = 'GF_Field_Radio';
17 17
 
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 		// Set the $_field_id var
41 41
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
42 42
 		
43
-		if( $this->is_choice_value_enabled() ) {
44
-			$field_options['choice_display'] = array(
43
+		if ( $this->is_choice_value_enabled() ) {
44
+			$field_options[ 'choice_display' ] = array(
45 45
 				'type'    => 'radio',
46 46
 				'value'   => 'value',
47 47
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-select.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,8 +44,8 @@
 block discarded – undo
44 44
 		// Set the $_field_id var
45 45
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
46 46
 
47
-		if( $this->is_choice_value_enabled() ) {
48
-			$field_options['choice_display'] = array(
47
+		if ( $this->is_choice_value_enabled() ) {
48
+			$field_options[ 'choice_display' ] = array(
49 49
 				'type'    => 'radio',
50 50
 				'value'   => 'value',
51 51
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gventry.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -47,16 +47,16 @@  discard block
 block discarded – undo
47 47
 		 */
48 48
 		$atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
49 49
 
50
-		$view = \GV\View::by_id( $atts['view_id'] );
50
+		$view = \GV\View::by_id( $atts[ 'view_id' ] );
51 51
 
52 52
 		if ( ! $view ) {
53
-			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) );
53
+			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) );
54 54
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
55 55
 		}
56 56
 
57
-		$entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id'];
57
+		$entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
58 58
 
59
-		switch( $entry_id ):
59
+		switch ( $entry_id ):
60 60
 			case 'last':
61 61
 				if ( class_exists( '\GF_Query' ) ) {
62 62
 					/**
@@ -65,17 +65,17 @@  discard block
 block discarded – undo
65 65
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
66 66
 					 */
67 67
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
68
-						if ( ! empty( $parameters['sorting'] ) ) {
68
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
69 69
 							/**
70 70
 							 * Reverse existing sorts.
71 71
 							 */
72
-							$sort = &$parameters['sorting'];
73
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
72
+							$sort = &$parameters[ 'sorting' ];
73
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
74 74
 						} else {
75 75
 							/**
76 76
 							 * Otherwise, sort by date_created.
77 77
 							 */
78
-							$parameters['sorting'] = array(
78
+							$parameters[ 'sorting' ] = array(
79 79
 								'key' => 'id',
80 80
 								'direction' => 'ASC',
81 81
 								'is_numeric' => true
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 
91 91
 					/** If a sort already exists, reverse it. */
92 92
 					if ( $sort = end( $entries->sorts ) ) {
93
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
93
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
94 94
 					} else {
95 95
 						/** Otherwise, sort by date_created */
96 96
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -108,12 +108,12 @@  discard block
 block discarded – undo
108 108
 				break;
109 109
 			default:
110 110
 				if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
111
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
111
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
112 112
 					return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
113 113
 				}
114 114
 		endswitch;
115 115
 
116
-		if ( $view->form->ID != $entry['form_id'] ) {
116
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
117 117
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
118 118
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
119 119
 		}
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
124 124
 		}
125 125
 
126
-		if ( ! $view->form  ) {
126
+		if ( ! $view->form ) {
127 127
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
128 128
 
129 129
 			/**
@@ -146,43 +146,43 @@  discard block
 block discarded – undo
146 146
 		}
147 147
 
148 148
 		/** Unapproved entries. */
149
-		if ( $entry['status'] != 'active' ) {
149
+		if ( $entry[ 'status' ] != 'active' ) {
150 150
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
151 151
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
152 152
 		}
153 153
 
154
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
154
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
155 155
 
156 156
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
157
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
157
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
158 158
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
159 159
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
160 160
 			}
161 161
 		}
162 162
 
163
-		if ( $atts['edit'] ) {
163
+		if ( $atts[ 'edit' ] ) {
164 164
 			/**
165 165
 			 * Based on code in our unit-tests.
166 166
 			 * Mocks old context, etc.
167 167
 			 */
168 168
 			$loader = \GravityView_Edit_Entry::getInstance();
169
-			$render = $loader->instances['render'];
169
+			$render = $loader->instances[ 'render' ];
170 170
 
171 171
 			add_filter( 'gravityview/is_single_entry', '__return_true' );
172 172
 
173
-			$form = \GFAPI::get_form( $entry['form_id'] );
173
+			$form = \GFAPI::get_form( $entry[ 'form_id' ] );
174 174
 
175 175
 			$data = \GravityView_View_Data::getInstance( $view );
176 176
 			$template = \GravityView_View::getInstance( array(
177 177
 				'form' => $form,
178
-				'form_id' => $form['id'],
178
+				'form_id' => $form[ 'id' ],
179 179
 				'view_id' => $view->ID,
180 180
 				'entries' => array( $entry ),
181 181
 				'atts' => \GVCommon::get_template_settings( $view->ID ),
182 182
 			) );
183 183
 
184
-			$_GET['edit'] = wp_create_nonce(
185
-				\GravityView_Edit_Entry::get_nonce_key( $view->ID, $form['id'], $entry['id'] )
184
+			$_GET[ 'edit' ] = wp_create_nonce(
185
+				\GravityView_Edit_Entry::get_nonce_key( $view->ID, $form[ 'id' ], $entry[ 'id' ] )
186 186
 			);
187 187
 
188 188
 			add_filter( 'gravityview/edit_entry/success', $callback = function( $message ) use ( $view, $entry, $atts ) {
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 				return apply_filters( 'gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts );
200 200
 			} );
201 201
 
202
-			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry['id'] ), $view );
202
+			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view );
203 203
 			$output = ob_get_clean(); // Render :)
204 204
 
205 205
 			remove_filter( 'gravityview/is_single_entry', '__return_true' );
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 			$renderer = new \GV\Entry_Renderer();
212 212
 
213 213
 			$request = new \GV\Mock_Request();
214
-			$request->returns['is_entry'] = $entry;
214
+			$request->returns[ 'is_entry' ] = $entry;
215 215
 
216 216
 			$output = $renderer->render( $entry, $view, $request );
217 217
 
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-pageviews.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
 		parent::add_hooks();
44 44
 
45
-		add_shortcode( 'gv_pageviews', array( $this, 'pageviews') );
45
+		add_shortcode( 'gv_pageviews', array( $this, 'pageviews' ) );
46 46
 
47 47
 		add_filter( 'gravityview/fields/custom/decode_shortcodes', array( $this, 'inject_entry_id' ), 10, 3 );
48 48
 
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 	 * Used as sort of an action via the gravityview/fields/custom/decode_shortcodes filter.
69 69
 	 */
70 70
 	public function inject_entry_id( $r, $content, $context ) {
71
-		if ( ! empty( $context->entry['id'] ) ) {
72
-			$this->next_id = $context->entry['id'];
71
+		if ( ! empty( $context->entry[ 'id' ] ) ) {
72
+			$this->next_id = $context->entry[ 'id' ];
73 73
 		} else {
74 74
 			$this->next_id = false; // Nothing to look at, move along
75 75
 		}
@@ -97,13 +97,13 @@  discard block
 block discarded – undo
97 97
 			'id'        => $this->next_id,
98 98
 		), $atts );
99 99
 
100
-		if ( ! $this->atts['id'] ) {
100
+		if ( ! $this->atts[ 'id' ] ) {
101 101
 			return; // The ID was not set
102 102
 		}
103 103
 
104 104
 		add_filter( 'pageviews_placeholder_preload', array( $this, 'preload_callback' ) );
105 105
 
106
-		$output = Pageviews::placeholder( 'GV' . $this->atts['id'] ); // Prefix the ID to avoid collissions with default post IDs
106
+		$output = Pageviews::placeholder( 'GV' . $this->atts[ 'id' ] ); // Prefix the ID to avoid collissions with default post IDs
107 107
 
108 108
 		remove_filter( 'pageviews_placeholder_preload', array( $this, 'preload_callback' ) );
109 109
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * Set the preload text.
115 115
 	 */
116 116
 	public function preload_callback( $preload ) {
117
-		return $this->atts['preload'];
117
+		return $this->atts[ 'preload' ];
118 118
 	}
119 119
 
120 120
 	/**
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	 */
123 123
 	public function increment_callback() {
124 124
 		if ( $entry = gravityview()->request->is_entry() ) {
125
-			$increment = 'GV' . $entry['id'];
125
+			$increment = 'GV' . $entry[ 'id' ];
126 126
 			?>
127 127
 				_pv_config.incr = <?php echo json_encode( $increment ); ?>;
128 128
 			<?php
Please login to merge, or discard this patch.
includes/class-gvlogic-shortcode.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 		return self::$instance;
18 18
 	}
19 19
 
20
-	public function shortcode( $atts, $content = '', $tag = '') {
20
+	public function shortcode( $atts, $content = '', $tag = '' ) {
21 21
 		$shortcode = new \GV\Shortcodes\gvlogic();
22 22
 		return $shortcode->callback( $atts, $content, $tag );
23 23
 	}
Please login to merge, or discard this patch.