Inspection of "We can rely on array_intersect_key() being availab..." - gravityview/GravityView - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( 7c9a08...3f17fe )

by Zack

created 2018-05-30 22:03 UTC

Status

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-renderer.php 1 patch

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

@@ -61,7 +61,7 @@
 block discarded – undo
 		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
 
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
 
 		echo \GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $gravityview->view->ID );

Please login to merge, or discard this patch.

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

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

@@ -105,14 +105,14 @@  discard block
 block discarded – undo
 	 * @return \GV\Entry|null An instance of this entry or null if not found.
 	 */
 	public static function from_entry( $entry ) {
-		if ( empty( $entry['id'] ) ) {
+		if ( empty( $entry[ 'id' ] ) ) {
 			return null;
 		}
 
 		$self = new self();
 		$self->entry = $entry;
 
-		$self->ID = $self->entry['id'];
+		$self->ID = $self->entry[ 'id' ];
 		$self->slug = \GravityView_API::get_entry_slug( $self->ID, $self->as_entry() );
 
 		return $self;
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
 	 * @return bool Whether the offset exists or not.
 	 */
 	public function offsetExists( $offset ) {
-		return isset( $this->entry[$offset] );
+		return isset( $this->entry[ $offset ] );
 	}
 
 	/**
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
 	 * @return mixed The value of the requested entry data.
 	 */
 	public function offsetGet( $offset ) {
-		return $this->entry[$offset];
+		return $this->entry[ $offset ];
 	}
 
 	/**

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-extension.php 1 patch

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

@@ -180,13 +180,13 @@  discard block
 block discarded – undo
 		$tab = wp_parse_args( $tab_settings, $tab_defaults );
 
 		// Force the screen to be GravityView
-		$tab['screen'] = 'gravityview';
+		$tab[ 'screen' ] = 'gravityview';
 
 		if ( class_exists( 'GravityView_Metabox_Tab' ) ) {
-			$metabox = new \GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] );
+			$metabox = new \GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] );
 			\GravityView_Metabox_Tabs::add( $metabox );
 		} else {
-			add_meta_box( 'gravityview_' . $tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] );
+			add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] );
 		}
 	}
 
@@ -211,14 +211,14 @@  discard block
 block discarded – undo
 	 */
 	protected function is_extension_supported() {
 
-		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool) self::$is_compatible );
+		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool)self::$is_compatible );
 
 		if ( ! function_exists( 'gravityview' ) ) {
 			$message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), esc_html( $this->_title ) );
-		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version , ">=" ) ) {
-			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_gravityview_version.'</tt>' );
-		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=" ) ) {
-			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_php_version.'</tt>' );
+		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version, ">=" ) ) {
+			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_gravityview_version . '</tt>' );
+		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, ">=" ) ) {
+			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_php_version . '</tt>' );
 		} else if ( ! empty( $this->_max_gravityview_version ) && false === version_compare( $this->_max_gravityview_version, Plugin::$version, ">" ) ) {
 			$message = sprintf( __( 'The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview' ), esc_html( $this->_title ) );
 		} else {
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
 		$lang_dir = dirname( plugin_basename( $path ) ) . '/languages/';
 
 		// Traditional WordPress plugin locale filter
-		$locale = apply_filters( 'plugin_locale',  get_locale(), $this->_text_domain );
+		$locale = apply_filters( 'plugin_locale', get_locale(), $this->_text_domain );
 
 		$mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
 
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
 	 */
 	public function settings() {
 		// If doing ajax, get outta here
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )  {
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
 			return;
 		}
 
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
 		}
 
 		// Don't update if invalid license.
-		if ( false === $license || empty( $license['status'] ) || strtolower( $license['status'] ) !== 'valid' ) {
+		if ( false === $license || empty( $license[ 'status' ] ) || strtolower( $license[ 'status' ] ) !== 'valid' ) {
 			return;
 		}
 
@@ -304,9 +304,9 @@  discard block
 block discarded – undo
 			$this->_path,
 			array(
             	'version'	=> $this->_version, // current version number
-            	'license'	=> $license['license'],
+            	'license'	=> $license[ 'license' ],
 	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
+            	'item_name' => $this->_title, // name of this plugin
             	'author' 	=> strip_tags( $this->_author )  // author of this plugin
           	)
         );
@@ -335,16 +335,16 @@  discard block
 block discarded – undo
 	 */
 	public static function add_notice( $notice = array() ) {
 
-		if ( is_array( $notice ) && empty( $notice['message'] ) ) {
+		if ( is_array( $notice ) && empty( $notice[ 'message' ] ) ) {
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
 			return;
 		} else if ( is_string( $notice ) ) {
 			$notice = array( 'message' => $notice );
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
 
-		self::$admin_notices []= $notice;
+		self::$admin_notices [ ] = $notice;
 	}
 
 	/**
@@ -358,8 +358,8 @@  discard block
 block discarded – undo
 		}
 
 		foreach ( self::$admin_notices as $key => $notice ) {
-			echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">';
-			echo wpautop( $notice['message'] );
+			echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">';
+			echo wpautop( $notice[ 'message' ] );
 			echo '<div class="clear"></div>';
 			echo '</div>';
 		}

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-template-view-list.php 1 patch

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

@@ -64,9 +64,9 @@
 block discarded – undo
 		 */
 		$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
 
-		$extras['hide_empty'] = $hide_empty;
-		$extras['label'] = $label;
-		$extras['value'] = $value;
+		$extras[ 'hide_empty' ] = $hide_empty;
+		$extras[ 'label' ] = $label;
+		$extras[ 'value' ] = $value;
 
 		return \gravityview_field_output( $extras, $context );
 	}

Please login to merge, or discard this patch.

		@@ -105,14 +105,14 @@ discard block
		block discarded – undo
105	105	* @return \GV\Entry\|null An instance of this entry or null if not found.
106	106	*/
107	107	public static function from_entry( $entry ) {
108		- if ( empty( $entry['id'] ) ) {
	108	+ if ( empty( $entry[ 'id' ] ) ) {
109	109	return null;
110	110	}
111	111
112	112	$self = new self();
113	113	$self->entry = $entry;
114	114
115		- $self->ID = $self->entry['id'];
	115	+ $self->ID = $self->entry[ 'id' ];
116	116	$self->slug = \GravityView_API::get_entry_slug( $self->ID, $self->as_entry() );
117	117
118	118	return $self;
		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127	* @return bool Whether the offset exists or not.
128	128	*/
129	129	public function offsetExists( $offset ) {
130		- return isset( $this->entry[$offset] );
	130	+ return isset( $this->entry[ $offset ] );
131	131	}
132	132
133	133	/**
		@@ -142,7 +142,7 @@ discard block
		block discarded – undo
142	142	* @return mixed The value of the requested entry data.
143	143	*/
144	144	public function offsetGet( $offset ) {
145		- return $this->entry[$offset];
	145	+ return $this->entry[ $offset ];
146	146	}
147	147
148	148	/**

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

		@@ -180,13 +180,13 @@ discard block
		block discarded – undo
180	180	$tab = wp_parse_args( $tab_settings, $tab_defaults );
181	181
182	182	// Force the screen to be GravityView
183		- $tab['screen'] = 'gravityview';
	183	+ $tab[ 'screen' ] = 'gravityview';
184	184
185	185	if ( class_exists( 'GravityView_Metabox_Tab' ) ) {
186		- $metabox = new \GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] );
	186	+ $metabox = new \GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] );
187	187	\GravityView_Metabox_Tabs::add( $metabox );
188	188	} else {
189		- add_meta_box( 'gravityview_' . $tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] );
	189	+ add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] );
190	190	}
191	191	}
192	192
		@@ -211,14 +211,14 @@ discard block
		block discarded – undo
211	211	*/
212	212	protected function is_extension_supported() {
213	213
214		- self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool) self::$is_compatible );
	214	+ self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool)self::$is_compatible );
215	215
216	216	if ( ! function_exists( 'gravityview' ) ) {
217	217	$message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), esc_html( $this->_title ) );
218		- } else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version , ">=" ) ) {
219		- $message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_gravityview_version.'</tt>' );
220		- } else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=" ) ) {
221		- $message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_php_version.'</tt>' );
	218	+ } else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version, ">=" ) ) {
	219	+ $message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_gravityview_version . '</tt>' );
	220	+ } else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, ">=" ) ) {
	221	+ $message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_php_version . '</tt>' );
222	222	} else if ( ! empty( $this->_max_gravityview_version ) && false === version_compare( $this->_max_gravityview_version, Plugin::$version, ">" ) ) {
223	223	$message = sprintf( __( 'The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview' ), esc_html( $this->_title ) );
224	224	} else {
		@@ -257,7 +257,7 @@ discard block
		block discarded – undo
257	257	$lang_dir = dirname( plugin_basename( $path ) ) . '/languages/';
258	258
259	259	// Traditional WordPress plugin locale filter
260		- $locale = apply_filters( 'plugin_locale', get_locale(), $this->_text_domain );
	260	+ $locale = apply_filters( 'plugin_locale', get_locale(), $this->_text_domain );
261	261
262	262	$mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
263	263
		@@ -284,7 +284,7 @@ discard block
		block discarded – undo
284	284	*/
285	285	public function settings() {
286	286	// If doing ajax, get outta here
287		- if ( ! is_admin() \|\| ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
	287	+ if ( ! is_admin() \|\| ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
288	288	return;
289	289	}
290	290
		@@ -295,7 +295,7 @@ discard block
		block discarded – undo
295	295	}
296	296
297	297	// Don't update if invalid license.
298		- if ( false === $license \|\| empty( $license['status'] ) \|\| strtolower( $license['status'] ) !== 'valid' ) {
	298	+ if ( false === $license \|\| empty( $license[ 'status' ] ) \|\| strtolower( $license[ 'status' ] ) !== 'valid' ) {
299	299	return;
300	300	}
301	301
		@@ -304,9 +304,9 @@ discard block
		block discarded – undo
304	304	$this->_path,
305	305	array(
306	306	'version' => $this->_version, // current version number
307		- 'license' => $license['license'],
	307	+ 'license' => $license[ 'license' ],
308	308	'item_id' => $this->_item_id, // The ID of the download on _remote_update_url
309		- 'item_name' => $this->_title, // name of this plugin
	309	+ 'item_name' => $this->_title, // name of this plugin
310	310	'author' => strip_tags( $this->_author ) // author of this plugin
311	311	)
312	312	);
		@@ -335,16 +335,16 @@ discard block
		block discarded – undo
335	335	*/
336	336	public static function add_notice( $notice = array() ) {
337	337
338		- if ( is_array( $notice ) && empty( $notice['message'] ) ) {
	338	+ if ( is_array( $notice ) && empty( $notice[ 'message' ] ) ) {
339	339	gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
340	340	return;
341	341	} else if ( is_string( $notice ) ) {
342	342	$notice = array( 'message' => $notice );
343	343	}
344	344
345		- $notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
	345	+ $notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
346	346
347		- self::$admin_notices []= $notice;
	347	+ self::$admin_notices [ ] = $notice;
348	348	}
349	349
350	350	/**
		@@ -358,8 +358,8 @@ discard block
		block discarded – undo
358	358	}
359	359
360	360	foreach ( self::$admin_notices as $key => $notice ) {
361		- echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">';
362		- echo wpautop( $notice['message'] );
	361	+ echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">';
	362	+ echo wpautop( $notice[ 'message' ] );
363	363	echo '<div class="clear"></div>';
364	364	echo '</div>';
365	365	}

		@@ -64,9 +64,9 @@
		block discarded – undo
64	64	*/
65	65	$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
66	66
67		- $extras['hide_empty'] = $hide_empty;
68		- $extras['label'] = $label;
69		- $extras['value'] = $value;
	67	+ $extras[ 'hide_empty' ] = $hide_empty;
	68	+ $extras[ 'label' ] = $label;
	69	+ $extras[ 'value' ] = $value;
70	70
71	71	return \gravityview_field_output( $extras, $context );
72	72	}

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

		@@ -61,7 +61,7 @@
		block discarded – undo
61	61	$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
62	62	$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
63	63
64		- $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
	64	+ $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
65	65	$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
66	66
67	67	echo \GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $gravityview->view->ID );

		@@ -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

Push — develop ( 7c9a08...3f17fe )

Status

Category

Spacing +2 added lines, -2 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 +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 +18 added lines, -18 removed lines patch added patch discarded remove patch

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

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