Inspection of "[WIP] Admin Views requisites (Part 2)" - gravityview/GravityView - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#1404)

by Gennady

created 2020-01-08 18:03 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -49,7 +49,7 @@  discard block
 block discarded – undo
 	function edit_entry_fix_hidden_fields( $fields ) {
 
 		/** @var GF_Field $field */
-		foreach( $fields as &$field ) {
+		foreach ( $fields as &$field ) {
 			if ( 'hidden' === $field->type ) {
 
 				/**
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 				 */
 				$reveal_hidden_field = apply_filters( 'gravityview/edit_entry/reveal_hidden_field', true, $field );
 
-				if( ! $reveal_hidden_field ) {
+				if ( ! $reveal_hidden_field ) {
 					continue;
 				}
 

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
 			printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' );
 			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;" />' );
 			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' ),
-				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION , "</h3>\n\n", $version );
+				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION, "</h3>\n\n", $version );
 			printf( '</body>' );
 		}
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 }
 
 /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
-if ( version_compare( phpversion(), '5.3.0' , '<' ) ) {
+if ( version_compare( phpversion(), '5.3.0', '<' ) ) {
 	require GRAVITYVIEW_DIR . 'future/_stubs.php';
 
 /** All looks fine. */

Please login to merge, or discard this patch.

future/includes/class-gv-shortcode.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 	 */
 	public static function remove() {
 		$shortcode = new static();
-		unset( self::$shortcodes[$shortcode->name] );
+		unset( self::$shortcodes[ $shortcode->name ] );
 		remove_shortcode( $shortcode->name );
 	}
 
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
 		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
 
 		foreach ( $matches as $shortcode ) {
-			$shortcode_name = $shortcode[2];
+			$shortcode_name = $shortcode[ 2 ];
 
-			$shortcode_atts = shortcode_parse_atts( $shortcode[3] );
-			$shortcode_content = $shortcode[5];
+			$shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] );
+			$shortcode_content = $shortcode[ 5 ];
 
 			/** This is a registered GravityView shortcode. */
-			if ( !empty( self::$shortcodes[$shortcode_name] ) ) {
-				$shortcode = clone self::$shortcodes[$shortcode_name];
+			if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) {
+				$shortcode = clone self::$shortcodes[ $shortcode_name ];
 			} else {
 				/** This is some generic shortcode. */
 				$shortcode = new self;

Please login to merge, or discard this patch.

future/includes/class-gv-field-gravityforms.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -27,17 +27,17 @@  discard block
 block discarded – undo
 	 * @return \GV\GF_Field|null The field implementation or null on error.
 	 */
 	public static function from_configuration( $configuration ) {
-		if ( empty( $configuration['id'] ) || ! is_numeric( $configuration['id'] ) ) {
+		if ( empty( $configuration[ 'id' ] ) || ! is_numeric( $configuration[ 'id' ] ) ) {
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
 			return null;
 		}
 
-		if ( empty( $configuration['form_id'] ) || ! $form = \GV\GF_Form::by_id( $configuration['form_id'] )  ) {
+		if ( empty( $configuration[ 'form_id' ] ) || ! $form = \GV\GF_Form::by_id( $configuration[ 'form_id' ] ) ) {
 			gravityview()->log->error( 'Invalid configuration[form_id] supplied.' );
 			return null;
 		}
 
-		$field = self::by_id( $form, $configuration['id'] );
+		$field = self::by_id( $form, $configuration[ 'id' ] );
 
 		if ( ! $field ) {
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
 
 		/** This is a complex Gravity Forms input. */
 		if ( $input = \GFFormsModel::get_input( $this->field, $this->ID ) ) {
-			$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
+			$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
 		} else {
 			/** This is a field with one label. */
 			$label = $this->field->get_field_label( true, $this->label );

Please login to merge, or discard this patch.

future/includes/class-gv-widget.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -151,7 +151,7 @@  discard block
 block discarded – undo
 		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
 
 		if ( $enable_custom_class ) {
-			$settings['custom_class'] = array(
+			$settings[ 'custom_class' ] = array(
 				'type' => 'text',
 				'label' => __( 'Custom CSS Class:', 'gravityview' ),
 				'desc' => __( 'This class will be added to the widget container', 'gravityview' ),
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
 	 */
 	public static function get_default_widget_areas() {
 		$default_areas = array(
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ) , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ) , 'subtitle' => '' ) ) ),
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
 		);
 
 		/**
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
 		}
 
 		$widgets[ $this->get_widget_id() ] = array(
-			'label' => $this->widget_label ,
+			'label' => $this->widget_label,
 			'description' => $this->widget_description,
 			'subtitle' => $this->widget_subtitle,
 			'class' => get_called_class(),
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
 	 */
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
 		if ( $this->get_widget_id() === $widget ) {
-			if( $settings = $this->get_settings() ) {
+			if ( $settings = $this->get_settings() ) {
 				$options = array_merge( $options, $settings );
 			}
 		}
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
 			return;
 		}
 
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
 	}
 
 	/**

Please login to merge, or discard this patch.

future/includes/class-gv-template-entry-legacy.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -34,7 +34,7 @@
 block discarded – undo
 		global $post;
 
 		if ( $post ) {
-			$context['post'] = $post;
+			$context[ 'post' ] = $post;
 		}
 
 		\GV\Mocks\Legacy_Context::push( $context );

Please login to merge, or discard this patch.

future/includes/class-gv-core.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -113,14 +113,14 @@
 block discarded – undo
 
 		/** Require critical legacy core files. @todo Deprecate */
 		require_once $this->plugin->dir( 'includes/helper-functions.php' );
-		require_once $this->plugin->dir( 'includes/class-common.php');
-		require_once $this->plugin->dir( 'includes/connector-functions.php');
+		require_once $this->plugin->dir( 'includes/class-common.php' );
+		require_once $this->plugin->dir( 'includes/connector-functions.php' );
 		require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' );
 		require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' );
 		require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' );
 		require_once $this->plugin->dir( 'includes/class-admin.php' );
-		require_once $this->plugin->dir( 'includes/class-post-types.php');
-		require_once $this->plugin->dir( 'includes/class-cache.php');
+		require_once $this->plugin->dir( 'includes/class-post-types.php' );
+		require_once $this->plugin->dir( 'includes/class-cache.php' );
 
 		/**
 		 * GravityView extensions and widgets.

Please login to merge, or discard this patch.

future/includes/class-gv-template-entry.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -113,18 +113,18 @@
 block discarded – undo
 		global $post;
 
 		if ( ! $this->request->is_view() && $post ) {
-			$specifics []= sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
-			$specifics []= sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
-			$specifics []= sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
-			$specifics []= sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
 		}
 
-		$specifics []= sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
-		$specifics []= sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
-		$specifics []= sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
-		$specifics []= sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
 
-		$specifics []= sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
 
 		return array_merge( $specifics, $templates );
 	}

Please login to merge, or discard this patch.

future/includes/class-gv-collection-entry-sort.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -78,7 +78,7 @@
 block discarded – undo
 		if ( $this->field ) {
 			return array(
 				'key' => $this->field->ID,
-				'direction' => $this->direction ? : self::ASC,
+				'direction' => $this->direction ?: self::ASC,
 				'is_numeric' => self::ALPHA ? true : false,
 			);
 		}

Please login to merge, or discard this patch.

		@@ -151,7 +151,7 @@ discard block
		block discarded – undo
151	151	$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
152	152
153	153	if ( $enable_custom_class ) {
154		- $settings['custom_class'] = array(
	154	+ $settings[ 'custom_class' ] = array(
155	155	'type' => 'text',
156	156	'label' => __( 'Custom CSS Class:', 'gravityview' ),
157	157	'desc' => __( 'This class will be added to the widget container', 'gravityview' ),
		@@ -203,8 +203,8 @@ discard block
		block discarded – undo
203	203	*/
204	204	public static function get_default_widget_areas() {
205	205	$default_areas = array(
206		- array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
207		- array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ) , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ) , 'subtitle' => '' ) ) ),
	206	+ array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
	207	+ array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
208	208	);
209	209
210	210	/**
		@@ -234,7 +234,7 @@ discard block
		block discarded – undo
234	234	}
235	235
236	236	$widgets[ $this->get_widget_id() ] = array(
237		- 'label' => $this->widget_label ,
	237	+ 'label' => $this->widget_label,
238	238	'description' => $this->widget_description,
239	239	'subtitle' => $this->widget_subtitle,
240	240	'class' => get_called_class(),
		@@ -255,7 +255,7 @@ discard block
		block discarded – undo
255	255	*/
256	256	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
257	257	if ( $this->get_widget_id() === $widget ) {
258		- if( $settings = $this->get_settings() ) {
	258	+ if ( $settings = $this->get_settings() ) {
259	259	$options = array_merge( $options, $settings );
260	260	}
261	261	}
		@@ -306,7 +306,7 @@ discard block
		block discarded – undo
306	306	return;
307	307	}
308	308
309		- add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
	309	+ add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
310	310	}
311	311
312	312	/**

		@@ -113,14 +113,14 @@
		block discarded – undo
113	113
114	114	/** Require critical legacy core files. @todo Deprecate */
115	115	require_once $this->plugin->dir( 'includes/helper-functions.php' );
116		- require_once $this->plugin->dir( 'includes/class-common.php');
117		- require_once $this->plugin->dir( 'includes/connector-functions.php');
	116	+ require_once $this->plugin->dir( 'includes/class-common.php' );
	117	+ require_once $this->plugin->dir( 'includes/connector-functions.php' );
118	118	require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' );
119	119	require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' );
120	120	require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' );
121	121	require_once $this->plugin->dir( 'includes/class-admin.php' );
122		- require_once $this->plugin->dir( 'includes/class-post-types.php');
123		- require_once $this->plugin->dir( 'includes/class-cache.php');
	122	+ require_once $this->plugin->dir( 'includes/class-post-types.php' );
	123	+ require_once $this->plugin->dir( 'includes/class-cache.php' );
124	124
125	125	/**
126	126	* GravityView extensions and widgets.

		@@ -113,18 +113,18 @@
		block discarded – undo
113	113	global $post;
114	114
115	115	if ( ! $this->request->is_view() && $post ) {
116		- $specifics []= sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
117		- $specifics []= sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
118		- $specifics []= sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
119		- $specifics []= sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
	116	+ $specifics [ ] = sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
	117	+ $specifics [ ] = sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
	118	+ $specifics [ ] = sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
	119	+ $specifics [ ] = sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
120	120	}
121	121
122		- $specifics []= sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
123		- $specifics []= sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
124		- $specifics []= sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
125		- $specifics []= sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
	122	+ $specifics [ ] = sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
	123	+ $specifics [ ] = sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
	124	+ $specifics [ ] = sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
	125	+ $specifics [ ] = sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
126	126
127		- $specifics []= sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
	127	+ $specifics [ ] = sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
128	128
129	129	return array_merge( $specifics, $templates );
130	130	}

		@@ -78,7 +78,7 @@
		block discarded – undo
78	78	if ( $this->field ) {
79	79	return array(
80	80	'key' => $this->field->ID,
81		- 'direction' => $this->direction ? : self::ASC,
	81	+ 'direction' => $this->direction ?: self::ASC,
82	82	'is_numeric' => self::ALPHA ? true : false,
83	83	);
84	84	}

		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	function edit_entry_fix_hidden_fields( $fields ) {
50	50
51	51	/** @var GF_Field $field */
52		- foreach( $fields as &$field ) {
	52	+ foreach ( $fields as &$field ) {
53	53	if ( 'hidden' === $field->type ) {
54	54
55	55	/**
		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	*/
61	61	$reveal_hidden_field = apply_filters( 'gravityview/edit_entry/reveal_hidden_field', true, $field );
62	62
63		- if( ! $reveal_hidden_field ) {
	63	+ if ( ! $reveal_hidden_field ) {
64	64	continue;
65	65	}
66	66

		@@ -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. */

		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	*/
77	77	public static function remove() {
78	78	$shortcode = new static();
79		- unset( self::$shortcodes[$shortcode->name] );
	79	+ unset( self::$shortcodes[ $shortcode->name ] );
80	80	remove_shortcode( $shortcode->name );
81	81	}
82	82
		@@ -108,14 +108,14 @@ discard block
		block discarded – undo
108	108	preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
109	109
110	110	foreach ( $matches as $shortcode ) {
111		- $shortcode_name = $shortcode[2];
	111	+ $shortcode_name = $shortcode[ 2 ];
112	112
113		- $shortcode_atts = shortcode_parse_atts( $shortcode[3] );
114		- $shortcode_content = $shortcode[5];
	113	+ $shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] );
	114	+ $shortcode_content = $shortcode[ 5 ];
115	115
116	116	/** This is a registered GravityView shortcode. */
117		- if ( !empty( self::$shortcodes[$shortcode_name] ) ) {
118		- $shortcode = clone self::$shortcodes[$shortcode_name];
	117	+ if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) {
	118	+ $shortcode = clone self::$shortcodes[ $shortcode_name ];
119	119	} else {
120	120	/** This is some generic shortcode. */
121	121	$shortcode = new self;

		@@ -27,17 +27,17 @@ discard block
		block discarded – undo
27	27	* @return \GV\GF_Field\|null The field implementation or null on error.
28	28	*/
29	29	public static function from_configuration( $configuration ) {
30		- if ( empty( $configuration['id'] ) \|\| ! is_numeric( $configuration['id'] ) ) {
	30	+ if ( empty( $configuration[ 'id' ] ) \|\| ! is_numeric( $configuration[ 'id' ] ) ) {
31	31	gravityview()->log->error( 'Invalid configuration[id] supplied.' );
32	32	return null;
33	33	}
34	34
35		- if ( empty( $configuration['form_id'] ) \|\| ! $form = \GV\GF_Form::by_id( $configuration['form_id'] ) ) {
	35	+ if ( empty( $configuration[ 'form_id' ] ) \|\| ! $form = \GV\GF_Form::by_id( $configuration[ 'form_id' ] ) ) {
36	36	gravityview()->log->error( 'Invalid configuration[form_id] supplied.' );
37	37	return null;
38	38	}
39	39
40		- $field = self::by_id( $form, $configuration['id'] );
	40	+ $field = self::by_id( $form, $configuration[ 'id' ] );
41	41
42	42	if ( ! $field ) {
43	43	gravityview()->log->error( 'Invalid configuration[id] supplied.' );
		@@ -111,7 +111,7 @@ discard block
		block discarded – undo
111	111
112	112	/** This is a complex Gravity Forms input. */
113	113	if ( $input = \GFFormsModel::get_input( $this->field, $this->ID ) ) {
114		- $label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
	114	+ $label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
115	115	} else {
116	116	/** This is a field with one label. */
117	117	$label = $this->field->get_field_label( true, $this->label );

		@@ -34,7 +34,7 @@
		block discarded – undo
34	34	global $post;
35	35
36	36	if ( $post ) {
37		- $context['post'] = $post;
	37	+ $context[ 'post' ] = $post;
38	38	}
39	39
40	40	\GV\Mocks\Legacy_Context::push( $context );

gravityview / GravityView

Pull Request — develop (#1404)

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch