gravityview / GravityView

future/lib/class-gamajo-template-loader.php

Spacing +7 added lines, -7 removed lines

@@ -131,11 +131,11 @@ 
 		public function set_template_data( $data, $var_name = 'data' ) {
 			global $wp_query;
 
-			$wp_query->query_vars[ $var_name ] = (object) $data;
+			$wp_query->query_vars[ $var_name ] = (object)$data;
 
 			// Add $var_name to custom variable store if not default value.
 			if ( 'data' !== $var_name ) {
-				$this->template_data_var_names[] = $var_name;
+				$this->template_data_var_names[ ] = $var_name;
 			}
 
 			return $this;
@@ -178,9 +178,9 @@ 
 		protected function get_template_file_names( $slug, $name ) {
 			$templates = array();
 			if ( isset( $name ) ) {
-				$templates[] = $slug . '-' . $name . '.php';
+				$templates[ ] = $slug . '-' . $name . '.php';
 			}
-			$templates[] = $slug . '.php';
+			$templates[ ] = $slug . '.php';
 
 			/**
 			 * Allow template choices to be filtered.
@@ -226,7 +226,7 @@ 
 				$located = false;
 
 				// Remove empty entries.
-				$template_names = array_filter( (array) $template_names );
+				$template_names = array_filter( (array)$template_names );
 				$template_paths = $this->get_template_paths();
 
 				// Try to find a template file.
@@ -246,7 +246,7 @@ 
 				}
 
 				// The templates weren't found; don't look this up again.
-				if( ! $located ) {
+				if ( ! $located ) {
 					$template_path_cache[ $this->filter_prefix ][ $cache_key ] = false;
 				}
 			}
@@ -285,7 +285,7 @@ 
 
 			// Only add this conditionally, so non-child themes don't redundantly check active theme twice.
 			if ( get_stylesheet_directory() !== get_template_directory() ) {
-				$file_paths[1] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
+				$file_paths[ 1 ] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
 			}
 
 			/**

includes/class-admin-approve-entries.php

Indentation +20 added lines, -20 removed lines

@@ -250,14 +250,14 @@ 
 	/**
 	 * update_approved function.
 	 *
-     * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
+	 * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
 	 * @see GravityView_Entry_Approval::update_approved
-     *
+	 *
 	 * @param int $entry_id (default: 0)
 	 * @param int $approved (default: 0)
 	 * @param int $form_id (default: 0)
 	 * @param int $approvedcolumn (default: 0)
-     *
+	 *
 	 * @return boolean True: It worked; False: it failed
 	 */
 	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
@@ -267,9 +267,9 @@ 
 	/**
 	 * Calculate the approve field.input id
 	 *
-     * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
-     * @see GravityView_Entry_Approval::get_approved_column
-     *
+	 * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
+	 * @see GravityView_Entry_Approval::get_approved_column
+	 *
 	 * @param mixed $form GF Form or Form ID
 	 * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
 	 */
@@ -394,37 +394,37 @@ 
 			'bulk_actions' => GravityView_Bulk_Actions::get_bulk_actions( $form_id ),
 			'bulk_message' => $this->bulk_update_message,
 			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
+			'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
 			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
 			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
 			'column_link' => esc_url( $this->get_sort_link() ),
-            'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
+			'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
 		) );
 
 	}
 
 	/**
-     * Generate a link to sort by approval status
-     *
-     * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
-     * numeric, but it does group the approved entries together.
-     *
-     * @since 2.0.14 Remove need for approval field for sorting by approval status
-     *
+	 * Generate a link to sort by approval status
+	 *
+	 * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
+	 * numeric, but it does group the approved entries together.
+	 *
+	 * @since 2.0.14 Remove need for approval field for sorting by approval status
+	 *
 	 * @param int $form_id [NO LONGER USED]
 	 *
 	 * @return string Sorting link
 	 */
 	private function get_sort_link( $form_id = 0 ) {
 
-	    $args = array(
-		    'orderby' => 'is_approved',
-            'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
-        );
+		$args = array(
+			'orderby' => 'is_approved',
+			'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
+		);
 
 		return add_query_arg( $args );
-    }
+	}
 
 	/**
 	 * Should the Approve/Reject Entry column be shown in the GF Entries page?

Spacing +44 added lines, -44 removed lines

@@ -49,7 +49,7 @@ 
 		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
 		// bypass Gravity Forms no-conflict mode
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -78,7 +78,7 @@ 
 		 * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
 		 * @param array $form GF Form object of current form
 		 */
-		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
+		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
 			return $filter_links;
 		}
 
@@ -106,27 +106,27 @@ 
 		$approved_count = $disapproved_count = $unapproved_count = 0;
 
 		// Only count if necessary
-		if( $include_counts ) {
-			$approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
-			$disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
-			$unapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );
+		if ( $include_counts ) {
+			$approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
+			$disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
+			$unapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );
 		}
 
-		$filter_links[] = array(
+		$filter_links[ ] = array(
 			'id'            => 'gv_approved',
 			'field_filters' => $field_filters_approved,
 			'count'         => $approved_count,
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),
 		);
 
-		$filter_links[] = array(
+		$filter_links[ ] = array(
 			'id'            => 'gv_disapproved',
 			'field_filters' => $field_filters_disapproved,
 			'count'         => $disapproved_count,
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::DISAPPROVED ),
 		);
 
-		$filter_links[] = array(
+		$filter_links[ ] = array(
 			'id'            => 'gv_unapproved',
 			'field_filters' => $field_filters_unapproved,
 			'count'         => $unapproved_count,
@@ -145,9 +145,9 @@ 
 	 */
 	function tooltips( $tooltips ) {
 
-		$tooltips['form_gravityview_fields'] = array(
-			'title' => __('GravityView Fields', 'gravityview'),
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
+		$tooltips[ 'form_gravityview_fields' ] = array(
+			'title' => __( 'GravityView Fields', 'gravityview' ),
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
 		);
 
 		return $tooltips;
@@ -260,7 +260,7 @@ 
      *
 	 * @return boolean True: It worked; False: it failed
 	 */
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
 		return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );
 	}
 
@@ -290,20 +290,20 @@ 
 	 *
 	 * @return void
 	 */
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
 
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
 			return;
 		}
 
-		if( empty( $entry['id'] ) ) {
+		if ( empty( $entry[ 'id' ] ) ) {
 			return;
 		}
 
 		$status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );
 
-		if( $status_value ) {
-			echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />';
+		if ( $status_value ) {
+			echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';
 		}
 	}
 
@@ -316,10 +316,10 @@ 
 	 */
 	private function get_form_id() {
 
-		$form_id = GFForms::get('id');
+		$form_id = GFForms::get( 'id' );
 
 		// If there are no forms identified, use the first form. That's how GF does it.
-		if( empty( $form_id ) && class_exists('RGFormsModel') ) {
+		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
 			$form_id = $this->get_first_form_id();
 		}
 
@@ -339,14 +339,14 @@ 
 
 		$forms = RGFormsModel::get_forms( null, 'title' );
 
-		if( ! isset( $forms[0] ) ) {
+		if ( ! isset( $forms[ 0 ] ) ) {
 			gravityview()->log->error( 'No forms were found' );
 			return 0;
 		}
 
-		$first_form = $forms[0];
+		$first_form = $forms[ 0 ];
 
-		$form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];
+		$form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
 
 		return intval( $form_id );
 	}
@@ -354,37 +354,37 @@ 
 
 	function add_scripts_and_styles( $hook ) {
 
-		if( ! class_exists( 'GFForms' ) ) {
+		if ( ! class_exists( 'GFForms' ) ) {
 			gravityview()->log->error( 'GFForms does not exist.' );
 			return;
 		}
 
 		// enqueue styles & scripts gf_entries
 		// But only if we're on the main Entries page, not on reports pages
-		if( GFForms::get_page() !== 'entry_list' ) {
+		if ( GFForms::get_page() !== 'entry_list' ) {
 			return;
 		}
 
 		$form_id = $this->get_form_id();
 
 		// Things are broken; no forms were found
-		if( empty( $form_id ) ) {
+		if ( empty( $form_id ) ) {
 			return;
 		}
 
-		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+		wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
+		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
 
 		wp_enqueue_script( 'gravityview_entries_list-popper', plugins_url( 'assets/lib/tippy/popper.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 		wp_enqueue_script( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 		wp_enqueue_style( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 
 		wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
-			'nonce' => wp_create_nonce( 'gravityview_entry_approval'),
-			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'),
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
+			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ),
 			'form_id' => $form_id,
 			'show_column' => (int)$this->show_approve_entry_column( $form_id ),
 			'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
@@ -393,10 +393,10 @@ 
 			'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED,
 			'bulk_actions' => GravityView_Bulk_Actions::get_bulk_actions( $form_id ),
 			'bulk_message' => $this->bulk_update_message,
-			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
-			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
-			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
+			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),
+            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),
+			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),
+			'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
 			'column_link' => esc_url( $this->get_sort_link() ),
             'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
@@ -444,13 +444,13 @@ 
 		 * @since 1.7.2
 		 * @param boolean $hide_if_no_connections
 		 */
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
 
-		if( $hide_if_no_connections ) {
+		if ( $hide_if_no_connections ) {
 
 			$connected_views = gravityview_get_connected_views( $form_id );
 
-			if( empty( $connected_views ) ) {
+			if ( empty( $connected_views ) ) {
 				$show_approve_column = false;
 			}
 		}
@@ -460,21 +460,21 @@ 
 		 * @param boolean $show_approve_column Whether the column will be shown
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
 		 */
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
 
 		return $show_approve_column;
 	}
 
 	function register_gform_noconflict_script( $scripts ) {
-		$scripts[] = 'gravityview_gf_entries_scripts';
-		$scripts[] = 'gravityview_entries_list-popper';
-		$scripts[] = 'gravityview_entries_list-tippy';
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
+		$scripts[ ] = 'gravityview_entries_list-popper';
+		$scripts[ ] = 'gravityview_entries_list-tippy';
 		return $scripts;
 	}
 
 	function register_gform_noconflict_style( $styles ) {
-		$styles[] = 'gravityview_entries_list';
-		$styles[] = 'gravityview_entries_list-tippy';
+		$styles[ ] = 'gravityview_entries_list';
+		$styles[ ] = 'gravityview_entries_list-tippy';
 		return $styles;
 	}
 

includes/extensions/lightbox/fancybox/class-gravityview-lightbox-provider-fancybox.php

Spacing +17 added lines, -17 removed lines

@@ -108,17 +108,17 @@ 
 	 */
 	public function allowed_atts( $atts = array() ) {
 
-		$atts['data-fancybox']         = null;
-		$atts['data-fancybox-trigger'] = null;
-		$atts['data-fancybox-index']   = null;
-		$atts['data-src']              = null;
-		$atts['data-type']             = null;
-		$atts['data-width']            = null;
-		$atts['data-height']           = null;
-		$atts['data-srcset']           = null;
-		$atts['data-caption']          = null;
-		$atts['data-options']          = null;
-		$atts['data-filter']           = null;
+		$atts[ 'data-fancybox' ]         = null;
+		$atts[ 'data-fancybox-trigger' ] = null;
+		$atts[ 'data-fancybox-index' ]   = null;
+		$atts[ 'data-src' ]              = null;
+		$atts[ 'data-type' ]             = null;
+		$atts[ 'data-width' ]            = null;
+		$atts[ 'data-height' ]           = null;
+		$atts[ 'data-srcset' ]           = null;
+		$atts[ 'data-caption' ]          = null;
+		$atts[ 'data-options' ]          = null;
+		$atts[ 'data-filter' ]           = null;
 
 		return $atts;
 	}
@@ -133,23 +133,23 @@ 
 		}
 
 		// Prevent empty content from getting added to the lightbox gallery
-		if ( is_array( $additional_details ) && empty( $additional_details['file_path'] ) ) {
+		if ( is_array( $additional_details ) && empty( $additional_details[ 'file_path' ] ) ) {
 			return $link_atts;
 		}
 
 		// Prevent empty content from getting added to the lightbox gallery
-		if ( is_array( $additional_details ) && ! empty( $additional_details['disable_lightbox'] ) ) {
+		if ( is_array( $additional_details ) && ! empty( $additional_details[ 'disable_lightbox' ] ) ) {
 			return $link_atts;
 		}
 
-		$link_atts['class'] = \GV\Utils::get( $link_atts, 'class' ) . ' gravityview-fancybox';
+		$link_atts[ 'class' ] = \GV\Utils::get( $link_atts, 'class' ) . ' gravityview-fancybox';
 
-		$link_atts['class'] = gravityview_sanitize_html_class( $link_atts['class'] );
+		$link_atts[ 'class' ] = gravityview_sanitize_html_class( $link_atts[ 'class' ] );
 
 		if ( $context && ! empty( $context->field->field ) ) {
 			if ( $context->field->field->multipleFiles ) {
 				$entry = $context->entry->as_entry();
-				$link_atts['data-fancybox'] = 'gallery-' . sprintf( "%s-%s-%s", $entry['form_id'], $context->field->ID, $context->entry->get_slug() );
+				$link_atts[ 'data-fancybox' ] = 'gallery-' . sprintf( "%s-%s-%s", $entry[ 'form_id' ], $context->field->ID, $context->entry->get_slug() );
 			}
 		}
 
@@ -160,7 +160,7 @@ 
 		 * @see https://fancyapps.com/docs/ui/fancybox#media-types
 		 */
 		if ( false !== strpos( $file_path, 'gv-iframe' ) ) {
-			$link_atts['data-type'] = 'pdf';
+			$link_atts[ 'data-type' ] = 'pdf';
 		}
 
 		return $link_atts;

trustedlogin/trustedlogin/client/src/Cron.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 namespace GravityView\TrustedLogin;
 
 // Exit if accessed directly
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
@@ -90,7 +90,7 @@ 
 
 		$unschedule_expiration = wp_clear_scheduled_hook( $this->hook_name, array( $site_identifier_hash ) );
 
-		if ( false === $unschedule_expiration ){
+		if ( false === $unschedule_expiration ) {
 			$this->logging->log( sprintf( 'Could not unschedule event for %s', $this->hook_name ), __METHOD__, 'error' );
 			return false;
 		}

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
 		$unschedule_expiration = wp_clear_scheduled_hook( $this->hook_name, array( $site_identifier_hash ) );
 
-		if ( false === $unschedule_expiration ){
+		if ( false === $unschedule_expiration ) {
 			$this->logging->log( sprintf( 'Could not unschedule event for %s', $this->hook_name ), __METHOD__, 'error' );
 			return false;
 		}

vendor/composer/ClassLoader.php

Spacing +107 added lines, -107 removed lines

@@ -103,7 +103,7 @@ 
     /**
      * @param ?string $vendorDir
      */
-    public function __construct($vendorDir = null)
+    public function __construct( $vendorDir = null )
     {
         $this->vendorDir = $vendorDir;
     }
@@ -113,8 +113,8 @@ 
      */
     public function getPrefixes()
     {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+        if ( ! empty( $this->prefixesPsr0 ) ) {
+            return call_user_func_array( 'array_merge', array_values( $this->prefixesPsr0 ) );
         }
 
         return array();
@@ -162,10 +162,10 @@ 
      *
      * @return void
      */
-    public function addClassMap(array $classMap)
+    public function addClassMap( array $classMap )
     {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
+        if ( $this->classMap ) {
+            $this->classMap = array_merge( $this->classMap, $classMap );
         } else {
             $this->classMap = $classMap;
         }
@@ -181,39 +181,39 @@ 
      *
      * @return void
      */
-    public function add($prefix, $paths, $prepend = false)
+    public function add( $prefix, $paths, $prepend = false )
     {
-        if (!$prefix) {
-            if ($prepend) {
+        if ( ! $prefix ) {
+            if ( $prepend ) {
                 $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
+                    (array)$paths,
                     $this->fallbackDirsPsr0
                 );
             } else {
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
-                    (array) $paths
+                    (array)$paths
                 );
             }
 
             return;
         }
 
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+        $first = $prefix[ 0 ];
+        if ( ! isset( $this->prefixesPsr0[ $first ][ $prefix ] ) ) {
+            $this->prefixesPsr0[ $first ][ $prefix ] = (array)$paths;
 
             return;
         }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
+        if ( $prepend ) {
+            $this->prefixesPsr0[ $first ][ $prefix ] = array_merge(
+                (array)$paths,
+                $this->prefixesPsr0[ $first ][ $prefix ]
             );
         } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
+            $this->prefixesPsr0[ $first ][ $prefix ] = array_merge(
+                $this->prefixesPsr0[ $first ][ $prefix ],
+                (array)$paths
             );
         }
     }
@@ -230,40 +230,40 @@ 
      *
      * @return void
      */
-    public function addPsr4($prefix, $paths, $prepend = false)
+    public function addPsr4( $prefix, $paths, $prepend = false )
     {
-        if (!$prefix) {
+        if ( ! $prefix ) {
             // Register directories for the root namespace.
-            if ($prepend) {
+            if ( $prepend ) {
                 $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
+                    (array)$paths,
                     $this->fallbackDirsPsr4
                 );
             } else {
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
-                    (array) $paths
+                    (array)$paths
                 );
             }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+        } elseif ( ! isset( $this->prefixDirsPsr4[ $prefix ] ) ) {
             // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            $length = strlen( $prefix );
+            if ( '\\' !== $prefix[ $length - 1 ] ) {
+                throw new \InvalidArgumentException( "A non-empty PSR-4 prefix must end with a namespace separator." );
             }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
+            $this->prefixLengthsPsr4[ $prefix[ 0 ] ][ $prefix ] = $length;
+            $this->prefixDirsPsr4[ $prefix ] = (array)$paths;
+        } elseif ( $prepend ) {
             // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
+            $this->prefixDirsPsr4[ $prefix ] = array_merge(
+                (array)$paths,
+                $this->prefixDirsPsr4[ $prefix ]
             );
         } else {
             // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
+            $this->prefixDirsPsr4[ $prefix ] = array_merge(
+                $this->prefixDirsPsr4[ $prefix ],
+                (array)$paths
             );
         }
     }
@@ -277,12 +277,12 @@ 
      *
      * @return void
      */
-    public function set($prefix, $paths)
+    public function set( $prefix, $paths )
     {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
+        if ( ! $prefix ) {
+            $this->fallbackDirsPsr0 = (array)$paths;
         } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+            $this->prefixesPsr0[ $prefix[ 0 ] ][ $prefix ] = (array)$paths;
         }
     }
 
@@ -297,17 +297,17 @@ 
      *
      * @return void
      */
-    public function setPsr4($prefix, $paths)
+    public function setPsr4( $prefix, $paths )
     {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
+        if ( ! $prefix ) {
+            $this->fallbackDirsPsr4 = (array)$paths;
         } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            $length = strlen( $prefix );
+            if ( '\\' !== $prefix[ $length - 1 ] ) {
+                throw new \InvalidArgumentException( "A non-empty PSR-4 prefix must end with a namespace separator." );
             }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+            $this->prefixLengthsPsr4[ $prefix[ 0 ] ][ $prefix ] = $length;
+            $this->prefixDirsPsr4[ $prefix ] = (array)$paths;
         }
     }
 
@@ -318,7 +318,7 @@ 
      *
      * @return void
      */
-    public function setUseIncludePath($useIncludePath)
+    public function setUseIncludePath( $useIncludePath )
     {
         $this->useIncludePath = $useIncludePath;
     }
@@ -342,7 +342,7 @@ 
      *
      * @return void
      */
-    public function setClassMapAuthoritative($classMapAuthoritative)
+    public function setClassMapAuthoritative( $classMapAuthoritative )
     {
         $this->classMapAuthoritative = $classMapAuthoritative;
     }
@@ -364,9 +364,9 @@ 
      *
      * @return void
      */
-    public function setApcuPrefix($apcuPrefix)
+    public function setApcuPrefix( $apcuPrefix )
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists( 'apcu_fetch' ) && filter_var( ini_get( 'apc.enabled' ), FILTER_VALIDATE_BOOLEAN ) ? $apcuPrefix : null;
     }
 
     /**
@@ -386,19 +386,19 @@ 
      *
      * @return void
      */
-    public function register($prepend = false)
+    public function register( $prepend = false )
     {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+        spl_autoload_register( array( $this, 'loadClass' ), true, $prepend );
 
-        if (null === $this->vendorDir) {
+        if ( null === $this->vendorDir ) {
             return;
         }
 
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        if ( $prepend ) {
+            self::$registeredLoaders = array( $this->vendorDir => $this ) + self::$registeredLoaders;
         } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
+            unset( self::$registeredLoaders[ $this->vendorDir ] );
+            self::$registeredLoaders[ $this->vendorDir ] = $this;
         }
     }
 
@@ -409,10 +409,10 @@ 
      */
     public function unregister()
     {
-        spl_autoload_unregister(array($this, 'loadClass'));
+        spl_autoload_unregister( array( $this, 'loadClass' ) );
 
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
+        if ( null !== $this->vendorDir ) {
+            unset( self::$registeredLoaders[ $this->vendorDir ] );
         }
     }
 
@@ -422,10 +422,10 @@ 
      * @param  string    $class The name of the class
      * @return true|null True if loaded, null otherwise
      */
-    public function loadClass($class)
+    public function loadClass( $class )
     {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
+        if ( $file = $this->findFile( $class ) ) {
+            includeFile( $file );
 
             return true;
         }
@@ -440,36 +440,36 @@ 
      *
      * @return string|false The path if found, false otherwise
      */
-    public function findFile($class)
+    public function findFile( $class )
     {
         // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
+        if ( isset( $this->classMap[ $class ] ) ) {
+            return $this->classMap[ $class ];
         }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+        if ( $this->classMapAuthoritative || isset( $this->missingClasses[ $class ] ) ) {
             return false;
         }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
+        if ( null !== $this->apcuPrefix ) {
+            $file = apcu_fetch( $this->apcuPrefix . $class, $hit );
+            if ( $hit ) {
                 return $file;
             }
         }
 
-        $file = $this->findFileWithExtension($class, '.php');
+        $file = $this->findFileWithExtension( $class, '.php' );
 
         // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
+        if ( false === $file && defined( 'HHVM_VERSION' ) ) {
+            $file = $this->findFileWithExtension( $class, '.hh' );
         }
 
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
+        if ( null !== $this->apcuPrefix ) {
+            apcu_add( $this->apcuPrefix . $class, $file );
         }
 
-        if (false === $file) {
+        if ( false === $file ) {
             // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
+            $this->missingClasses[ $class ] = true;
         }
 
         return $file;
@@ -490,21 +490,21 @@ 
      * @param  string       $ext
      * @return string|false
      */
-    private function findFileWithExtension($class, $ext)
+    private function findFileWithExtension( $class, $ext )
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr( $class, '\\', DIRECTORY_SEPARATOR ) . $ext;
 
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
+        $first = $class[ 0 ];
+        if ( isset( $this->prefixLengthsPsr4[ $first ] ) ) {
             $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
+            while ( false !== $lastPos = strrpos( $subPath, '\\' ) ) {
+                $subPath = substr( $subPath, 0, $lastPos );
                 $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                if ( isset( $this->prefixDirsPsr4[ $search ] ) ) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr( $logicalPathPsr4, $lastPos + 1 );
+                    foreach ( $this->prefixDirsPsr4[ $search ] as $dir ) {
+                        if ( file_exists( $file = $dir . $pathEnd ) ) {
                             return $file;
                         }
                     }
@@ -513,27 +513,27 @@ 
         }
 
         // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+        foreach ( $this->fallbackDirsPsr4 as $dir ) {
+            if ( file_exists( $file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4 ) ) {
                 return $file;
             }
         }
 
         // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
+        if ( false !== $pos = strrpos( $class, '\\' ) ) {
             // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+            $logicalPathPsr0 = substr( $logicalPathPsr4, 0, $pos + 1 )
+                . strtr( substr( $logicalPathPsr4, $pos + 1 ), '_', DIRECTORY_SEPARATOR );
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr( $class, '_', DIRECTORY_SEPARATOR ) . $ext;
         }
 
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+        if ( isset( $this->prefixesPsr0[ $first ] ) ) {
+            foreach ( $this->prefixesPsr0[ $first ] as $prefix => $dirs ) {
+                if ( 0 === strpos( $class, $prefix ) ) {
+                    foreach ( $dirs as $dir ) {
+                        if ( file_exists( $file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0 ) ) {
                             return $file;
                         }
                     }
@@ -542,14 +542,14 @@ 
         }
 
         // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+        foreach ( $this->fallbackDirsPsr0 as $dir ) {
+            if ( file_exists( $file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0 ) ) {
                 return $file;
             }
         }
 
         // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+        if ( $this->useIncludePath && $file = stream_resolve_include_path( $logicalPathPsr0 ) ) {
             return $file;
         }
 
@@ -566,7 +566,7 @@ 
  * @return void
  * @private
  */
-function includeFile($file)
+function includeFile( $file )
 {
     include $file;
 }

Indentation +514 added lines, -514 removed lines

@@ -42,519 +42,519 @@ 
  */
 class ClassLoader
 {
-    /** @var ?string */
-    private $vendorDir;
-
-    // PSR-4
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, int>>
-     */
-    private $prefixLengthsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<int, string>>
-     */
-    private $prefixDirsPsr4 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    /**
-     * @var array[]
-     * @psalm-var array<string, array<string, string[]>>
-     */
-    private $prefixesPsr0 = array();
-    /**
-     * @var array[]
-     * @psalm-var array<string, string>
-     */
-    private $fallbackDirsPsr0 = array();
-
-    /** @var bool */
-    private $useIncludePath = false;
-
-    /**
-     * @var string[]
-     * @psalm-var array<string, string>
-     */
-    private $classMap = array();
-
-    /** @var bool */
-    private $classMapAuthoritative = false;
-
-    /**
-     * @var bool[]
-     * @psalm-var array<string, bool>
-     */
-    private $missingClasses = array();
-
-    /** @var ?string */
-    private $apcuPrefix;
-
-    /**
-     * @var self[]
-     */
-    private static $registeredLoaders = array();
-
-    /**
-     * @param ?string $vendorDir
-     */
-    public function __construct($vendorDir = null)
-    {
-        $this->vendorDir = $vendorDir;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
-        }
-
-        return array();
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return array<string, array<int, string>>
-     */
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return array<string, string>
-     */
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    /**
-     * @return string[] Array of classname => path
-     * @psalm-return array<string, string>
-     */
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param string[] $classMap Class to filename map
-     * @psalm-param array<string, string> $classMap
-     *
-     * @return void
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string          $prefix  The prefix
-     * @param string[]|string $paths   The PSR-0 root directories
-     * @param bool            $prepend Whether to prepend the directories
-     *
-     * @return void
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string          $prefix  The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths   The PSR-4 base directories
-     * @param bool            $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string          $prefix The prefix
-     * @param string[]|string $paths  The PSR-0 base directories
-     *
-     * @return void
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string          $prefix The prefix/namespace, with trailing '\\'
-     * @param string[]|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return void
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     *
-     * @return void
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     *
-     * @return void
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     *
-     * @return void
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     *
-     * @return void
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-
-        if (null === $this->vendorDir) {
-            return;
-        }
-
-        if ($prepend) {
-            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
-        } else {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-            self::$registeredLoaders[$this->vendorDir] = $this;
-        }
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     *
-     * @return void
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-
-        if (null !== $this->vendorDir) {
-            unset(self::$registeredLoaders[$this->vendorDir]);
-        }
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return true|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-
-        return null;
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    /**
-     * Returns the currently registered loaders indexed by their corresponding vendor directories.
-     *
-     * @return self[]
-     */
-    public static function getRegisteredLoaders()
-    {
-        return self::$registeredLoaders;
-    }
-
-    /**
-     * @param  string       $class
-     * @param  string       $ext
-     * @return string|false
-     */
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
+	/** @var ?string */
+	private $vendorDir;
+
+	// PSR-4
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, array<string, int>>
+	 */
+	private $prefixLengthsPsr4 = array();
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, array<int, string>>
+	 */
+	private $prefixDirsPsr4 = array();
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, string>
+	 */
+	private $fallbackDirsPsr4 = array();
+
+	// PSR-0
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, array<string, string[]>>
+	 */
+	private $prefixesPsr0 = array();
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, string>
+	 */
+	private $fallbackDirsPsr0 = array();
+
+	/** @var bool */
+	private $useIncludePath = false;
+
+	/**
+	 * @var string[]
+	 * @psalm-var array<string, string>
+	 */
+	private $classMap = array();
+
+	/** @var bool */
+	private $classMapAuthoritative = false;
+
+	/**
+	 * @var bool[]
+	 * @psalm-var array<string, bool>
+	 */
+	private $missingClasses = array();
+
+	/** @var ?string */
+	private $apcuPrefix;
+
+	/**
+	 * @var self[]
+	 */
+	private static $registeredLoaders = array();
+
+	/**
+	 * @param ?string $vendorDir
+	 */
+	public function __construct($vendorDir = null)
+	{
+		$this->vendorDir = $vendorDir;
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public function getPrefixes()
+	{
+		if (!empty($this->prefixesPsr0)) {
+			return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+		}
+
+		return array();
+	}
+
+	/**
+	 * @return array[]
+	 * @psalm-return array<string, array<int, string>>
+	 */
+	public function getPrefixesPsr4()
+	{
+		return $this->prefixDirsPsr4;
+	}
+
+	/**
+	 * @return array[]
+	 * @psalm-return array<string, string>
+	 */
+	public function getFallbackDirs()
+	{
+		return $this->fallbackDirsPsr0;
+	}
+
+	/**
+	 * @return array[]
+	 * @psalm-return array<string, string>
+	 */
+	public function getFallbackDirsPsr4()
+	{
+		return $this->fallbackDirsPsr4;
+	}
+
+	/**
+	 * @return string[] Array of classname => path
+	 * @psalm-return array<string, string>
+	 */
+	public function getClassMap()
+	{
+		return $this->classMap;
+	}
+
+	/**
+	 * @param string[] $classMap Class to filename map
+	 * @psalm-param array<string, string> $classMap
+	 *
+	 * @return void
+	 */
+	public function addClassMap(array $classMap)
+	{
+		if ($this->classMap) {
+			$this->classMap = array_merge($this->classMap, $classMap);
+		} else {
+			$this->classMap = $classMap;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix, either
+	 * appending or prepending to the ones previously set for this prefix.
+	 *
+	 * @param string          $prefix  The prefix
+	 * @param string[]|string $paths   The PSR-0 root directories
+	 * @param bool            $prepend Whether to prepend the directories
+	 *
+	 * @return void
+	 */
+	public function add($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			if ($prepend) {
+				$this->fallbackDirsPsr0 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr0
+				);
+			} else {
+				$this->fallbackDirsPsr0 = array_merge(
+					$this->fallbackDirsPsr0,
+					(array) $paths
+				);
+			}
+
+			return;
+		}
+
+		$first = $prefix[0];
+		if (!isset($this->prefixesPsr0[$first][$prefix])) {
+			$this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+			return;
+		}
+		if ($prepend) {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixesPsr0[$first][$prefix]
+			);
+		} else {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				$this->prefixesPsr0[$first][$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace, either
+	 * appending or prepending to the ones previously set for this namespace.
+	 *
+	 * @param string          $prefix  The prefix/namespace, with trailing '\\'
+	 * @param string[]|string $paths   The PSR-4 base directories
+	 * @param bool            $prepend Whether to prepend the directories
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return void
+	 */
+	public function addPsr4($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			// Register directories for the root namespace.
+			if ($prepend) {
+				$this->fallbackDirsPsr4 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr4
+				);
+			} else {
+				$this->fallbackDirsPsr4 = array_merge(
+					$this->fallbackDirsPsr4,
+					(array) $paths
+				);
+			}
+		} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+			// Register directories for a new namespace.
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		} elseif ($prepend) {
+			// Prepend directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixDirsPsr4[$prefix]
+			);
+		} else {
+			// Append directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				$this->prefixDirsPsr4[$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix,
+	 * replacing any others previously set for this prefix.
+	 *
+	 * @param string          $prefix The prefix
+	 * @param string[]|string $paths  The PSR-0 base directories
+	 *
+	 * @return void
+	 */
+	public function set($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr0 = (array) $paths;
+		} else {
+			$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace,
+	 * replacing any others previously set for this namespace.
+	 *
+	 * @param string          $prefix The prefix/namespace, with trailing '\\'
+	 * @param string[]|string $paths  The PSR-4 base directories
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return void
+	 */
+	public function setPsr4($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr4 = (array) $paths;
+		} else {
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Turns on searching the include path for class files.
+	 *
+	 * @param bool $useIncludePath
+	 *
+	 * @return void
+	 */
+	public function setUseIncludePath($useIncludePath)
+	{
+		$this->useIncludePath = $useIncludePath;
+	}
+
+	/**
+	 * Can be used to check if the autoloader uses the include path to check
+	 * for classes.
+	 *
+	 * @return bool
+	 */
+	public function getUseIncludePath()
+	{
+		return $this->useIncludePath;
+	}
+
+	/**
+	 * Turns off searching the prefix and fallback directories for classes
+	 * that have not been registered with the class map.
+	 *
+	 * @param bool $classMapAuthoritative
+	 *
+	 * @return void
+	 */
+	public function setClassMapAuthoritative($classMapAuthoritative)
+	{
+		$this->classMapAuthoritative = $classMapAuthoritative;
+	}
+
+	/**
+	 * Should class lookup fail if not found in the current class map?
+	 *
+	 * @return bool
+	 */
+	public function isClassMapAuthoritative()
+	{
+		return $this->classMapAuthoritative;
+	}
+
+	/**
+	 * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+	 *
+	 * @param string|null $apcuPrefix
+	 *
+	 * @return void
+	 */
+	public function setApcuPrefix($apcuPrefix)
+	{
+		$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+	}
+
+	/**
+	 * The APCu prefix in use, or null if APCu caching is not enabled.
+	 *
+	 * @return string|null
+	 */
+	public function getApcuPrefix()
+	{
+		return $this->apcuPrefix;
+	}
+
+	/**
+	 * Registers this instance as an autoloader.
+	 *
+	 * @param bool $prepend Whether to prepend the autoloader or not
+	 *
+	 * @return void
+	 */
+	public function register($prepend = false)
+	{
+		spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+		if (null === $this->vendorDir) {
+			return;
+		}
+
+		if ($prepend) {
+			self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+		} else {
+			unset(self::$registeredLoaders[$this->vendorDir]);
+			self::$registeredLoaders[$this->vendorDir] = $this;
+		}
+	}
+
+	/**
+	 * Unregisters this instance as an autoloader.
+	 *
+	 * @return void
+	 */
+	public function unregister()
+	{
+		spl_autoload_unregister(array($this, 'loadClass'));
+
+		if (null !== $this->vendorDir) {
+			unset(self::$registeredLoaders[$this->vendorDir]);
+		}
+	}
+
+	/**
+	 * Loads the given class or interface.
+	 *
+	 * @param  string    $class The name of the class
+	 * @return true|null True if loaded, null otherwise
+	 */
+	public function loadClass($class)
+	{
+		if ($file = $this->findFile($class)) {
+			includeFile($file);
+
+			return true;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Finds the path to the file where the class is defined.
+	 *
+	 * @param string $class The name of the class
+	 *
+	 * @return string|false The path if found, false otherwise
+	 */
+	public function findFile($class)
+	{
+		// class map lookup
+		if (isset($this->classMap[$class])) {
+			return $this->classMap[$class];
+		}
+		if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+			return false;
+		}
+		if (null !== $this->apcuPrefix) {
+			$file = apcu_fetch($this->apcuPrefix.$class, $hit);
+			if ($hit) {
+				return $file;
+			}
+		}
+
+		$file = $this->findFileWithExtension($class, '.php');
+
+		// Search for Hack files if we are running on HHVM
+		if (false === $file && defined('HHVM_VERSION')) {
+			$file = $this->findFileWithExtension($class, '.hh');
+		}
+
+		if (null !== $this->apcuPrefix) {
+			apcu_add($this->apcuPrefix.$class, $file);
+		}
+
+		if (false === $file) {
+			// Remember that this class does not exist.
+			$this->missingClasses[$class] = true;
+		}
+
+		return $file;
+	}
+
+	/**
+	 * Returns the currently registered loaders indexed by their corresponding vendor directories.
+	 *
+	 * @return self[]
+	 */
+	public static function getRegisteredLoaders()
+	{
+		return self::$registeredLoaders;
+	}
+
+	/**
+	 * @param  string       $class
+	 * @param  string       $ext
+	 * @return string|false
+	 */
+	private function findFileWithExtension($class, $ext)
+	{
+		// PSR-4 lookup
+		$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+		$first = $class[0];
+		if (isset($this->prefixLengthsPsr4[$first])) {
+			$subPath = $class;
+			while (false !== $lastPos = strrpos($subPath, '\\')) {
+				$subPath = substr($subPath, 0, $lastPos);
+				$search = $subPath . '\\';
+				if (isset($this->prefixDirsPsr4[$search])) {
+					$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+					foreach ($this->prefixDirsPsr4[$search] as $dir) {
+						if (file_exists($file = $dir . $pathEnd)) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-4 fallback dirs
+		foreach ($this->fallbackDirsPsr4 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 lookup
+		if (false !== $pos = strrpos($class, '\\')) {
+			// namespaced class name
+			$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+				. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+		} else {
+			// PEAR-like class name
+			$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+		}
+
+		if (isset($this->prefixesPsr0[$first])) {
+			foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+				if (0 === strpos($class, $prefix)) {
+					foreach ($dirs as $dir) {
+						if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-0 fallback dirs
+		foreach ($this->fallbackDirsPsr0 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 include paths.
+		if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+			return $file;
+		}
+
+		return false;
+	}
 }
 
 /**
@@ -568,5 +568,5 @@ 
  */
 function includeFile($file)
 {
-    include $file;
+	include $file;
 }

Braces +25 added lines, -50 removed lines

@@ -40,8 +40,7 @@ 
  * @see    https://www.php-fig.org/psr/psr-0/
  * @see    https://www.php-fig.org/psr/psr-4/
  */
-class ClassLoader
-{
+class ClassLoader {
     /** @var ?string */
     private $vendorDir;
 
@@ -103,16 +102,14 @@ 
     /**
      * @param ?string $vendorDir
      */
-    public function __construct($vendorDir = null)
-    {
+    public function __construct($vendorDir = null) {
         $this->vendorDir = $vendorDir;
     }
 
     /**
      * @return string[]
      */
-    public function getPrefixes()
-    {
+    public function getPrefixes() {
         if (!empty($this->prefixesPsr0)) {
             return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
@@ -124,8 +121,7 @@ 
      * @return array[]
      * @psalm-return array<string, array<int, string>>
      */
-    public function getPrefixesPsr4()
-    {
+    public function getPrefixesPsr4() {
         return $this->prefixDirsPsr4;
     }
 
@@ -133,8 +129,7 @@ 
      * @return array[]
      * @psalm-return array<string, string>
      */
-    public function getFallbackDirs()
-    {
+    public function getFallbackDirs() {
         return $this->fallbackDirsPsr0;
     }
 
@@ -142,8 +137,7 @@ 
      * @return array[]
      * @psalm-return array<string, string>
      */
-    public function getFallbackDirsPsr4()
-    {
+    public function getFallbackDirsPsr4() {
         return $this->fallbackDirsPsr4;
     }
 
@@ -151,8 +145,7 @@ 
      * @return string[] Array of classname => path
      * @psalm-return array<string, string>
      */
-    public function getClassMap()
-    {
+    public function getClassMap() {
         return $this->classMap;
     }
 
@@ -162,8 +155,7 @@ 
      *
      * @return void
      */
-    public function addClassMap(array $classMap)
-    {
+    public function addClassMap(array $classMap) {
         if ($this->classMap) {
             $this->classMap = array_merge($this->classMap, $classMap);
         } else {
@@ -181,8 +173,7 @@ 
      *
      * @return void
      */
-    public function add($prefix, $paths, $prepend = false)
-    {
+    public function add($prefix, $paths, $prepend = false) {
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
@@ -230,8 +221,7 @@ 
      *
      * @return void
      */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
+    public function addPsr4($prefix, $paths, $prepend = false) {
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
@@ -277,8 +267,7 @@ 
      *
      * @return void
      */
-    public function set($prefix, $paths)
-    {
+    public function set($prefix, $paths) {
         if (!$prefix) {
             $this->fallbackDirsPsr0 = (array) $paths;
         } else {
@@ -297,8 +286,7 @@ 
      *
      * @return void
      */
-    public function setPsr4($prefix, $paths)
-    {
+    public function setPsr4($prefix, $paths) {
         if (!$prefix) {
             $this->fallbackDirsPsr4 = (array) $paths;
         } else {
@@ -318,8 +306,7 @@ 
      *
      * @return void
      */
-    public function setUseIncludePath($useIncludePath)
-    {
+    public function setUseIncludePath($useIncludePath) {
         $this->useIncludePath = $useIncludePath;
     }
 
@@ -329,8 +316,7 @@ 
      *
      * @return bool
      */
-    public function getUseIncludePath()
-    {
+    public function getUseIncludePath() {
         return $this->useIncludePath;
     }
 
@@ -342,8 +328,7 @@ 
      *
      * @return void
      */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
+    public function setClassMapAuthoritative($classMapAuthoritative) {
         $this->classMapAuthoritative = $classMapAuthoritative;
     }
 
@@ -352,8 +337,7 @@ 
      *
      * @return bool
      */
-    public function isClassMapAuthoritative()
-    {
+    public function isClassMapAuthoritative() {
         return $this->classMapAuthoritative;
     }
 
@@ -364,8 +348,7 @@ 
      *
      * @return void
      */
-    public function setApcuPrefix($apcuPrefix)
-    {
+    public function setApcuPrefix($apcuPrefix) {
         $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
     }
 
@@ -374,8 +357,7 @@ 
      *
      * @return string|null
      */
-    public function getApcuPrefix()
-    {
+    public function getApcuPrefix() {
         return $this->apcuPrefix;
     }
 
@@ -386,8 +368,7 @@ 
      *
      * @return void
      */
-    public function register($prepend = false)
-    {
+    public function register($prepend = false) {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
 
         if (null === $this->vendorDir) {
@@ -407,8 +388,7 @@ 
      *
      * @return void
      */
-    public function unregister()
-    {
+    public function unregister() {
         spl_autoload_unregister(array($this, 'loadClass'));
 
         if (null !== $this->vendorDir) {
@@ -422,8 +402,7 @@ 
      * @param  string    $class The name of the class
      * @return true|null True if loaded, null otherwise
      */
-    public function loadClass($class)
-    {
+    public function loadClass($class) {
         if ($file = $this->findFile($class)) {
             includeFile($file);
 
@@ -440,8 +419,7 @@ 
      *
      * @return string|false The path if found, false otherwise
      */
-    public function findFile($class)
-    {
+    public function findFile($class) {
         // class map lookup
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
@@ -480,8 +458,7 @@ 
      *
      * @return self[]
      */
-    public static function getRegisteredLoaders()
-    {
+    public static function getRegisteredLoaders() {
         return self::$registeredLoaders;
     }
 
@@ -490,8 +467,7 @@ 
      * @param  string       $ext
      * @return string|false
      */
-    private function findFileWithExtension($class, $ext)
-    {
+    private function findFileWithExtension($class, $ext) {
         // PSR-4 lookup
         $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
 
@@ -566,7 +542,6 @@ 
  * @return void
  * @private
  */
-function includeFile($file)
-{
+function includeFile($file) {
     include $file;
 }

vendor/composer/InstalledVersions.php

Spacing +72 added lines, -72 removed lines

@@ -37,15 +37,15 @@ 
     public static function getInstalledPackages()
     {
         $packages = array();
-        foreach (self::getInstalled() as $installed) {
-            $packages[] = array_keys($installed['versions']);
+        foreach ( self::getInstalled() as $installed ) {
+            $packages[ ] = array_keys( $installed[ 'versions' ] );
         }
 
-        if (1 === \count($packages)) {
-            return $packages[0];
+        if ( 1 === \count( $packages ) ) {
+            return $packages[ 0 ];
         }
 
-        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+        return array_keys( array_flip( \call_user_func_array( 'array_merge', $packages ) ) );
     }
 
     /**
@@ -55,14 +55,14 @@ 
      * @return string[]
      * @psalm-return list<string>
      */
-    public static function getInstalledPackagesByType($type)
+    public static function getInstalledPackagesByType( $type )
     {
         $packagesByType = array();
 
-        foreach (self::getInstalled() as $installed) {
-            foreach ($installed['versions'] as $name => $package) {
-                if (isset($package['type']) && $package['type'] === $type) {
-                    $packagesByType[] = $name;
+        foreach ( self::getInstalled() as $installed ) {
+            foreach ( $installed[ 'versions' ] as $name => $package ) {
+                if ( isset( $package[ 'type' ] ) && $package[ 'type' ] === $type ) {
+                    $packagesByType[ ] = $name;
                 }
             }
         }
@@ -79,11 +79,11 @@ 
      * @param  bool   $includeDevRequirements
      * @return bool
      */
-    public static function isInstalled($packageName, $includeDevRequirements = true)
+    public static function isInstalled( $packageName, $includeDevRequirements = true )
     {
-        foreach (self::getInstalled() as $installed) {
-            if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+        foreach ( self::getInstalled() as $installed ) {
+            if ( isset( $installed[ 'versions' ][ $packageName ] ) ) {
+                return $includeDevRequirements || empty( $installed[ 'versions' ][ $packageName ][ 'dev_requirement' ] );
             }
         }
 
@@ -102,12 +102,12 @@ 
      * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
      * @return bool
      */
-    public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    public static function satisfies( VersionParser $parser, $packageName, $constraint )
     {
-        $constraint = $parser->parseConstraints($constraint);
-        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+        $constraint = $parser->parseConstraints( $constraint );
+        $provided = $parser->parseConstraints( self::getVersionRanges( $packageName ) );
 
-        return $provided->matches($constraint);
+        return $provided->matches( $constraint );
     }
 
     /**
@@ -119,111 +119,111 @@ 
      * @param  string $packageName
      * @return string Version constraint usable with composer/semver
      */
-    public static function getVersionRanges($packageName)
+    public static function getVersionRanges( $packageName )
     {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
+        foreach ( self::getInstalled() as $installed ) {
+            if ( ! isset( $installed[ 'versions' ][ $packageName ] ) ) {
                 continue;
             }
 
             $ranges = array();
-            if (isset($installed['versions'][$packageName]['pretty_version'])) {
-                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
+            if ( isset( $installed[ 'versions' ][ $packageName ][ 'pretty_version' ] ) ) {
+                $ranges[ ] = $installed[ 'versions' ][ $packageName ][ 'pretty_version' ];
             }
-            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+            if ( array_key_exists( 'aliases', $installed[ 'versions' ][ $packageName ] ) ) {
+                $ranges = array_merge( $ranges, $installed[ 'versions' ][ $packageName ][ 'aliases' ] );
             }
-            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+            if ( array_key_exists( 'replaced', $installed[ 'versions' ][ $packageName ] ) ) {
+                $ranges = array_merge( $ranges, $installed[ 'versions' ][ $packageName ][ 'replaced' ] );
             }
-            if (array_key_exists('provided', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+            if ( array_key_exists( 'provided', $installed[ 'versions' ][ $packageName ] ) ) {
+                $ranges = array_merge( $ranges, $installed[ 'versions' ][ $packageName ][ 'provided' ] );
             }
 
-            return implode(' || ', $ranges);
+            return implode( ' || ', $ranges );
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException( 'Package "' . $packageName . '" is not installed' );
     }
 
     /**
      * @param  string      $packageName
      * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
      */
-    public static function getVersion($packageName)
+    public static function getVersion( $packageName )
     {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
+        foreach ( self::getInstalled() as $installed ) {
+            if ( ! isset( $installed[ 'versions' ][ $packageName ] ) ) {
                 continue;
             }
 
-            if (!isset($installed['versions'][$packageName]['version'])) {
+            if ( ! isset( $installed[ 'versions' ][ $packageName ][ 'version' ] ) ) {
                 return null;
             }
 
-            return $installed['versions'][$packageName]['version'];
+            return $installed[ 'versions' ][ $packageName ][ 'version' ];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException( 'Package "' . $packageName . '" is not installed' );
     }
 
     /**
      * @param  string      $packageName
      * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
      */
-    public static function getPrettyVersion($packageName)
+    public static function getPrettyVersion( $packageName )
     {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
+        foreach ( self::getInstalled() as $installed ) {
+            if ( ! isset( $installed[ 'versions' ][ $packageName ] ) ) {
                 continue;
             }
 
-            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+            if ( ! isset( $installed[ 'versions' ][ $packageName ][ 'pretty_version' ] ) ) {
                 return null;
             }
 
-            return $installed['versions'][$packageName]['pretty_version'];
+            return $installed[ 'versions' ][ $packageName ][ 'pretty_version' ];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException( 'Package "' . $packageName . '" is not installed' );
     }
 
     /**
      * @param  string      $packageName
      * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
      */
-    public static function getReference($packageName)
+    public static function getReference( $packageName )
     {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
+        foreach ( self::getInstalled() as $installed ) {
+            if ( ! isset( $installed[ 'versions' ][ $packageName ] ) ) {
                 continue;
             }
 
-            if (!isset($installed['versions'][$packageName]['reference'])) {
+            if ( ! isset( $installed[ 'versions' ][ $packageName ][ 'reference' ] ) ) {
                 return null;
             }
 
-            return $installed['versions'][$packageName]['reference'];
+            return $installed[ 'versions' ][ $packageName ][ 'reference' ];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException( 'Package "' . $packageName . '" is not installed' );
     }
 
     /**
      * @param  string      $packageName
      * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
      */
-    public static function getInstallPath($packageName)
+    public static function getInstallPath( $packageName )
     {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
+        foreach ( self::getInstalled() as $installed ) {
+            if ( ! isset( $installed[ 'versions' ][ $packageName ] ) ) {
                 continue;
             }
 
-            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+            return isset( $installed[ 'versions' ][ $packageName ][ 'install_path' ] ) ? $installed[ 'versions' ][ $packageName ][ 'install_path' ] : null;
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException( 'Package "' . $packageName . '" is not installed' );
     }
 
     /**
@@ -234,7 +234,7 @@ 
     {
         $installed = self::getInstalled();
 
-        return $installed[0]['root'];
+        return $installed[ 0 ][ 'root' ];
     }
 
     /**
@@ -246,12 +246,12 @@ 
      */
     public static function getRawData()
     {
-        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+        @trigger_error( 'getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED );
 
-        if (null === self::$installed) {
+        if ( null === self::$installed ) {
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
+            if ( substr( __DIR__, -8, 1 ) !== 'C' ) {
                 self::$installed = include __DIR__ . '/installed.php';
             } else {
                 self::$installed = array();
@@ -290,7 +290,7 @@ 
      *
      * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
      */
-    public static function reload($data)
+    public static function reload( $data )
     {
         self::$installed = $data;
         self::$installedByVendor = array();
@@ -302,35 +302,35 @@ 
      */
     private static function getInstalled()
     {
-        if (null === self::$canGetVendors) {
-            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+        if ( null === self::$canGetVendors ) {
+            self::$canGetVendors = method_exists( 'Composer\Autoload\ClassLoader', 'getRegisteredLoaders' );
         }
 
         $installed = array();
 
-        if (self::$canGetVendors) {
-            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                if (isset(self::$installedByVendor[$vendorDir])) {
-                    $installed[] = self::$installedByVendor[$vendorDir];
-                } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
+        if ( self::$canGetVendors ) {
+            foreach ( ClassLoader::getRegisteredLoaders() as $vendorDir => $loader ) {
+                if ( isset( self::$installedByVendor[ $vendorDir ] ) ) {
+                    $installed[ ] = self::$installedByVendor[ $vendorDir ];
+                } elseif ( is_file( $vendorDir . '/composer/installed.php' ) ) {
+                    $installed[ ] = self::$installedByVendor[ $vendorDir ] = require $vendorDir . '/composer/installed.php';
+                    if ( null === self::$installed && strtr( $vendorDir . '/composer', '\\', '/' ) === strtr( __DIR__, '\\', '/' ) ) {
+                        self::$installed = $installed[ count( $installed ) - 1 ];
                     }
                 }
             }
         }
 
-        if (null === self::$installed) {
+        if ( null === self::$installed ) {
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
+            if ( substr( __DIR__, -8, 1 ) !== 'C' ) {
                 self::$installed = require __DIR__ . '/installed.php';
             } else {
                 self::$installed = array();
             }
         }
-        $installed[] = self::$installed;
+        $installed[ ] = self::$installed;
 
         return $installed;
     }

Indentation +323 added lines, -323 removed lines

@@ -24,327 +24,327 @@
  */
 class InstalledVersions
 {
-    /**
-     * @var mixed[]|null
-     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
-     */
-    private static $installed;
-
-    /**
-     * @var bool|null
-     */
-    private static $canGetVendors;
-
-    /**
-     * @var array[]
-     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
-     */
-    private static $installedByVendor = array();
-
-    /**
-     * Returns a list of all package names which are present, either by being installed, replaced or provided
-     *
-     * @return string[]
-     * @psalm-return list<string>
-     */
-    public static function getInstalledPackages()
-    {
-        $packages = array();
-        foreach (self::getInstalled() as $installed) {
-            $packages[] = array_keys($installed['versions']);
-        }
-
-        if (1 === \count($packages)) {
-            return $packages[0];
-        }
-
-        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
-    }
-
-    /**
-     * Returns a list of all package names with a specific type e.g. 'library'
-     *
-     * @param  string   $type
-     * @return string[]
-     * @psalm-return list<string>
-     */
-    public static function getInstalledPackagesByType($type)
-    {
-        $packagesByType = array();
-
-        foreach (self::getInstalled() as $installed) {
-            foreach ($installed['versions'] as $name => $package) {
-                if (isset($package['type']) && $package['type'] === $type) {
-                    $packagesByType[] = $name;
-                }
-            }
-        }
-
-        return $packagesByType;
-    }
-
-    /**
-     * Checks whether the given package is installed
-     *
-     * This also returns true if the package name is provided or replaced by another package
-     *
-     * @param  string $packageName
-     * @param  bool   $includeDevRequirements
-     * @return bool
-     */
-    public static function isInstalled($packageName, $includeDevRequirements = true)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks whether the given package satisfies a version constraint
-     *
-     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
-     *
-     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
-     *
-     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
-     * @param  string        $packageName
-     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
-     * @return bool
-     */
-    public static function satisfies(VersionParser $parser, $packageName, $constraint)
-    {
-        $constraint = $parser->parseConstraints($constraint);
-        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
-
-        return $provided->matches($constraint);
-    }
-
-    /**
-     * Returns a version constraint representing all the range(s) which are installed for a given package
-     *
-     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
-     * whether a given version of a package is installed, and not just whether it exists
-     *
-     * @param  string $packageName
-     * @return string Version constraint usable with composer/semver
-     */
-    public static function getVersionRanges($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            $ranges = array();
-            if (isset($installed['versions'][$packageName]['pretty_version'])) {
-                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
-            }
-            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
-            }
-            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
-            }
-            if (array_key_exists('provided', $installed['versions'][$packageName])) {
-                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
-            }
-
-            return implode(' || ', $ranges);
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
-     */
-    public static function getVersion($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['version'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['version'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
-     */
-    public static function getPrettyVersion($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['pretty_version'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
-     */
-    public static function getReference($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            if (!isset($installed['versions'][$packageName]['reference'])) {
-                return null;
-            }
-
-            return $installed['versions'][$packageName]['reference'];
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @param  string      $packageName
-     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
-     */
-    public static function getInstallPath($packageName)
-    {
-        foreach (self::getInstalled() as $installed) {
-            if (!isset($installed['versions'][$packageName])) {
-                continue;
-            }
-
-            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
-        }
-
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-    }
-
-    /**
-     * @return array
-     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
-     */
-    public static function getRootPackage()
-    {
-        $installed = self::getInstalled();
-
-        return $installed[0]['root'];
-    }
-
-    /**
-     * Returns the raw installed.php data for custom implementations
-     *
-     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
-     * @return array[]
-     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
-     */
-    public static function getRawData()
-    {
-        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
-
-        if (null === self::$installed) {
-            // only require the installed.php file if this file is loaded from its dumped location,
-            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = include __DIR__ . '/installed.php';
-            } else {
-                self::$installed = array();
-            }
-        }
-
-        return self::$installed;
-    }
-
-    /**
-     * Returns the raw data of all installed.php which are currently loaded for custom implementations
-     *
-     * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
-     */
-    public static function getAllRawData()
-    {
-        return self::getInstalled();
-    }
-
-    /**
-     * Lets you reload the static array from another file
-     *
-     * This is only useful for complex integrations in which a project needs to use
-     * this class but then also needs to execute another project's autoloader in process,
-     * and wants to ensure both projects have access to their version of installed.php.
-     *
-     * A typical case would be PHPUnit, where it would need to make sure it reads all
-     * the data it needs from this class, then call reload() with
-     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
-     * the project in which it runs can then also use this class safely, without
-     * interference between PHPUnit's dependencies and the project's dependencies.
-     *
-     * @param  array[] $data A vendor/composer/installed.php data set
-     * @return void
-     *
-     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
-     */
-    public static function reload($data)
-    {
-        self::$installed = $data;
-        self::$installedByVendor = array();
-    }
-
-    /**
-     * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
-     */
-    private static function getInstalled()
-    {
-        if (null === self::$canGetVendors) {
-            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
-        }
-
-        $installed = array();
-
-        if (self::$canGetVendors) {
-            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                if (isset(self::$installedByVendor[$vendorDir])) {
-                    $installed[] = self::$installedByVendor[$vendorDir];
-                } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
-                    }
-                }
-            }
-        }
-
-        if (null === self::$installed) {
-            // only require the installed.php file if this file is loaded from its dumped location,
-            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
-            } else {
-                self::$installed = array();
-            }
-        }
-        $installed[] = self::$installed;
-
-        return $installed;
-    }
+	/**
+	 * @var mixed[]|null
+	 * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
+	 */
+	private static $installed;
+
+	/**
+	 * @var bool|null
+	 */
+	private static $canGetVendors;
+
+	/**
+	 * @var array[]
+	 * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+	 */
+	private static $installedByVendor = array();
+
+	/**
+	 * Returns a list of all package names which are present, either by being installed, replaced or provided
+	 *
+	 * @return string[]
+	 * @psalm-return list<string>
+	 */
+	public static function getInstalledPackages()
+	{
+		$packages = array();
+		foreach (self::getInstalled() as $installed) {
+			$packages[] = array_keys($installed['versions']);
+		}
+
+		if (1 === \count($packages)) {
+			return $packages[0];
+		}
+
+		return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+	}
+
+	/**
+	 * Returns a list of all package names with a specific type e.g. 'library'
+	 *
+	 * @param  string   $type
+	 * @return string[]
+	 * @psalm-return list<string>
+	 */
+	public static function getInstalledPackagesByType($type)
+	{
+		$packagesByType = array();
+
+		foreach (self::getInstalled() as $installed) {
+			foreach ($installed['versions'] as $name => $package) {
+				if (isset($package['type']) && $package['type'] === $type) {
+					$packagesByType[] = $name;
+				}
+			}
+		}
+
+		return $packagesByType;
+	}
+
+	/**
+	 * Checks whether the given package is installed
+	 *
+	 * This also returns true if the package name is provided or replaced by another package
+	 *
+	 * @param  string $packageName
+	 * @param  bool   $includeDevRequirements
+	 * @return bool
+	 */
+	public static function isInstalled($packageName, $includeDevRequirements = true)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (isset($installed['versions'][$packageName])) {
+				return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks whether the given package satisfies a version constraint
+	 *
+	 * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+	 *
+	 *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+	 *
+	 * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
+	 * @param  string        $packageName
+	 * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+	 * @return bool
+	 */
+	public static function satisfies(VersionParser $parser, $packageName, $constraint)
+	{
+		$constraint = $parser->parseConstraints($constraint);
+		$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+		return $provided->matches($constraint);
+	}
+
+	/**
+	 * Returns a version constraint representing all the range(s) which are installed for a given package
+	 *
+	 * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+	 * whether a given version of a package is installed, and not just whether it exists
+	 *
+	 * @param  string $packageName
+	 * @return string Version constraint usable with composer/semver
+	 */
+	public static function getVersionRanges($packageName)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (!isset($installed['versions'][$packageName])) {
+				continue;
+			}
+
+			$ranges = array();
+			if (isset($installed['versions'][$packageName]['pretty_version'])) {
+				$ranges[] = $installed['versions'][$packageName]['pretty_version'];
+			}
+			if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+				$ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+			}
+			if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+				$ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+			}
+			if (array_key_exists('provided', $installed['versions'][$packageName])) {
+				$ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+			}
+
+			return implode(' || ', $ranges);
+		}
+
+		throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+	}
+
+	/**
+	 * @param  string      $packageName
+	 * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+	 */
+	public static function getVersion($packageName)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (!isset($installed['versions'][$packageName])) {
+				continue;
+			}
+
+			if (!isset($installed['versions'][$packageName]['version'])) {
+				return null;
+			}
+
+			return $installed['versions'][$packageName]['version'];
+		}
+
+		throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+	}
+
+	/**
+	 * @param  string      $packageName
+	 * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+	 */
+	public static function getPrettyVersion($packageName)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (!isset($installed['versions'][$packageName])) {
+				continue;
+			}
+
+			if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+				return null;
+			}
+
+			return $installed['versions'][$packageName]['pretty_version'];
+		}
+
+		throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+	}
+
+	/**
+	 * @param  string      $packageName
+	 * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+	 */
+	public static function getReference($packageName)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (!isset($installed['versions'][$packageName])) {
+				continue;
+			}
+
+			if (!isset($installed['versions'][$packageName]['reference'])) {
+				return null;
+			}
+
+			return $installed['versions'][$packageName]['reference'];
+		}
+
+		throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+	}
+
+	/**
+	 * @param  string      $packageName
+	 * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+	 */
+	public static function getInstallPath($packageName)
+	{
+		foreach (self::getInstalled() as $installed) {
+			if (!isset($installed['versions'][$packageName])) {
+				continue;
+			}
+
+			return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+		}
+
+		throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+	}
+
+	/**
+	 * @return array
+	 * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+	 */
+	public static function getRootPackage()
+	{
+		$installed = self::getInstalled();
+
+		return $installed[0]['root'];
+	}
+
+	/**
+	 * Returns the raw installed.php data for custom implementations
+	 *
+	 * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+	 * @return array[]
+	 * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
+	 */
+	public static function getRawData()
+	{
+		@trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+		if (null === self::$installed) {
+			// only require the installed.php file if this file is loaded from its dumped location,
+			// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+			if (substr(__DIR__, -8, 1) !== 'C') {
+				self::$installed = include __DIR__ . '/installed.php';
+			} else {
+				self::$installed = array();
+			}
+		}
+
+		return self::$installed;
+	}
+
+	/**
+	 * Returns the raw data of all installed.php which are currently loaded for custom implementations
+	 *
+	 * @return array[]
+	 * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+	 */
+	public static function getAllRawData()
+	{
+		return self::getInstalled();
+	}
+
+	/**
+	 * Lets you reload the static array from another file
+	 *
+	 * This is only useful for complex integrations in which a project needs to use
+	 * this class but then also needs to execute another project's autoloader in process,
+	 * and wants to ensure both projects have access to their version of installed.php.
+	 *
+	 * A typical case would be PHPUnit, where it would need to make sure it reads all
+	 * the data it needs from this class, then call reload() with
+	 * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+	 * the project in which it runs can then also use this class safely, without
+	 * interference between PHPUnit's dependencies and the project's dependencies.
+	 *
+	 * @param  array[] $data A vendor/composer/installed.php data set
+	 * @return void
+	 *
+	 * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
+	 */
+	public static function reload($data)
+	{
+		self::$installed = $data;
+		self::$installedByVendor = array();
+	}
+
+	/**
+	 * @return array[]
+	 * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+	 */
+	private static function getInstalled()
+	{
+		if (null === self::$canGetVendors) {
+			self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+		}
+
+		$installed = array();
+
+		if (self::$canGetVendors) {
+			foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+				if (isset(self::$installedByVendor[$vendorDir])) {
+					$installed[] = self::$installedByVendor[$vendorDir];
+				} elseif (is_file($vendorDir.'/composer/installed.php')) {
+					$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+					if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+						self::$installed = $installed[count($installed) - 1];
+					}
+				}
+			}
+		}
+
+		if (null === self::$installed) {
+			// only require the installed.php file if this file is loaded from its dumped location,
+			// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+			if (substr(__DIR__, -8, 1) !== 'C') {
+				self::$installed = require __DIR__ . '/installed.php';
+			} else {
+				self::$installed = array();
+			}
+		}
+		$installed[] = self::$installed;
+
+		return $installed;
+	}
 }

Braces +15 added lines, -30 removed lines

@@ -22,8 +22,7 @@ 
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
  */
-class InstalledVersions
-{
+class InstalledVersions {
     /**
      * @var mixed[]|null
      * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
@@ -47,8 +46,7 @@ 
      * @return string[]
      * @psalm-return list<string>
      */
-    public static function getInstalledPackages()
-    {
+    public static function getInstalledPackages() {
         $packages = array();
         foreach (self::getInstalled() as $installed) {
             $packages[] = array_keys($installed['versions']);
@@ -68,8 +66,7 @@ 
      * @return string[]
      * @psalm-return list<string>
      */
-    public static function getInstalledPackagesByType($type)
-    {
+    public static function getInstalledPackagesByType($type) {
         $packagesByType = array();
 
         foreach (self::getInstalled() as $installed) {
@@ -92,8 +89,7 @@ 
      * @param  bool   $includeDevRequirements
      * @return bool
      */
-    public static function isInstalled($packageName, $includeDevRequirements = true)
-    {
+    public static function isInstalled($packageName, $includeDevRequirements = true) {
         foreach (self::getInstalled() as $installed) {
             if (isset($installed['versions'][$packageName])) {
                 return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
@@ -115,8 +111,7 @@ 
      * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
      * @return bool
      */
-    public static function satisfies(VersionParser $parser, $packageName, $constraint)
-    {
+    public static function satisfies(VersionParser $parser, $packageName, $constraint) {
         $constraint = $parser->parseConstraints($constraint);
         $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
 
@@ -132,8 +127,7 @@ 
      * @param  string $packageName
      * @return string Version constraint usable with composer/semver
      */
-    public static function getVersionRanges($packageName)
-    {
+    public static function getVersionRanges($packageName) {
         foreach (self::getInstalled() as $installed) {
             if (!isset($installed['versions'][$packageName])) {
                 continue;
@@ -163,8 +157,7 @@ 
      * @param  string      $packageName
      * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
      */
-    public static function getVersion($packageName)
-    {
+    public static function getVersion($packageName) {
         foreach (self::getInstalled() as $installed) {
             if (!isset($installed['versions'][$packageName])) {
                 continue;
@@ -184,8 +177,7 @@ 
      * @param  string      $packageName
      * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
      */
-    public static function getPrettyVersion($packageName)
-    {
+    public static function getPrettyVersion($packageName) {
         foreach (self::getInstalled() as $installed) {
             if (!isset($installed['versions'][$packageName])) {
                 continue;
@@ -205,8 +197,7 @@ 
      * @param  string      $packageName
      * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
      */
-    public static function getReference($packageName)
-    {
+    public static function getReference($packageName) {
         foreach (self::getInstalled() as $installed) {
             if (!isset($installed['versions'][$packageName])) {
                 continue;
@@ -226,8 +217,7 @@ 
      * @param  string      $packageName
      * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
      */
-    public static function getInstallPath($packageName)
-    {
+    public static function getInstallPath($packageName) {
         foreach (self::getInstalled() as $installed) {
             if (!isset($installed['versions'][$packageName])) {
                 continue;
@@ -243,8 +233,7 @@ 
      * @return array
      * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
      */
-    public static function getRootPackage()
-    {
+    public static function getRootPackage() {
         $installed = self::getInstalled();
 
         return $installed[0]['root'];
@@ -257,8 +246,7 @@ 
      * @return array[]
      * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
      */
-    public static function getRawData()
-    {
+    public static function getRawData() {
         @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
 
         if (null === self::$installed) {
@@ -280,8 +268,7 @@ 
      * @return array[]
      * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
      */
-    public static function getAllRawData()
-    {
+    public static function getAllRawData() {
         return self::getInstalled();
     }
 
@@ -303,8 +290,7 @@ 
      *
      * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
      */
-    public static function reload($data)
-    {
+    public static function reload($data) {
         self::$installed = $data;
         self::$installedByVendor = array();
     }
@@ -313,8 +299,7 @@ 
      * @return array[]
      * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
      */
-    private static function getInstalled()
-    {
+    private static function getInstalled() {
         if (null === self::$canGetVendors) {
             self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
         }

includes/fields/class-gravityview-field-total.php

Spacing +6 added lines, -6 removed lines

@@ -52,13 +52,13 @@ 
 	 *
 	 * @return array Blocklist, with "total" added. If not edit context, original field blocklist. Otherwise, blocklist including total.
 	 */
-	public function add_to_blocklist( $blocklist = array(), $context = NULL  ){
+	public function add_to_blocklist( $blocklist = array(), $context = NULL ) {
 
-		if( empty( $context ) || $context !== 'edit' ) {
+		if ( empty( $context ) || $context !== 'edit' ) {
 			return $blocklist;
 		}
 
-		$blocklist[] = 'total';
+		$blocklist[ ] = 'total';
 
 		return $blocklist;
 	}
@@ -76,7 +76,7 @@ 
 	 */
 	function edit_entry_recalculate_totals( $form = array(), $entry_id = 0, $Edit_Entry_Render = null ) {
 
-		$original_form = GFAPI::get_form( $form['id'] );
+		$original_form = GFAPI::get_form( $form[ 'id' ] );
 
 		$total_fields = GFCommon::get_fields_by_type( $original_form, 'total' );
 
@@ -87,12 +87,12 @@ 
 
 			/** @type GF_Field_Total $total_field */
 			foreach ( $total_fields as $total_field ) {
-				$entry["{$total_field->id}"] = GFCommon::get_order_total( $original_form, $entry );
+				$entry[ "{$total_field->id}" ] = GFCommon::get_order_total( $original_form, $entry );
 			}
 
 			$return_entry = GFAPI::update_entry( $entry );
 
-			if( is_wp_error( $return_entry ) ) {
+			if ( is_wp_error( $return_entry ) ) {
 				gravityview()->log->error( 'Updating the entry total fields failed', array( 'data' => $return_entry ) );
 			} else {
 				gravityview()->log->debug( 'Updating the entry total fields succeeded' );

Braces +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	 *
 	 * @return array Blocklist, with "total" added. If not edit context, original field blocklist. Otherwise, blocklist including total.
 	 */
-	public function add_to_blocklist( $blocklist = array(), $context = NULL  ){
+	public function add_to_blocklist( $blocklist = array(), $context = NULL  ) {
 
 		if( empty( $context ) || $context !== 'edit' ) {
 			return $blocklist;

includes/fields/class-gravityview-field-calculation.php

Spacing +2 added lines, -2 removed lines

@@ -49,8 +49,8 @@
 	public function blocklist_field_types( $field_types = array(), $context = '' ) {
 
 		// Allow Calculation field in Edit Entry
-		if( 'edit' !== $context ) {
-			$field_types[] = $this->name;
+		if ( 'edit' !== $context ) {
+			$field_types[ ] = $this->name;
 		}
 
 		return $field_types;

includes/class-admin-views.php

Indentation +73 added lines, -73 removed lines

@@ -62,28 +62,28 @@ 
 	}
 
 	/**
-     * When on the Add/Edit View screen, suggest most popular articles related to that
-     *
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
+	 *
 	 * @param array $localization_data Data to be passed to the Support Port JS
 	 *
 	 * @return array
 	 */
 	function suggest_support_articles( $localization_data = array() ) {
 
-	    if( ! gravityview()->request->is_view() ) {
-	        return $localization_data;
-        }
+		if( ! gravityview()->request->is_view() ) {
+			return $localization_data;
+		}
 
 		$localization_data['suggest'] = array(
-            '57ef23539033602e61d4a560',
-            '54c67bb9e4b0512429885513',
-            '54c67bb9e4b0512429885512',
-            '54c67bbbe4b07997ea3f3f6b',
-            '54d1a33ae4b086c0c0964ce9',
-            '57ef253c9033602e61d4a563',
-            '552355bfe4b0221aadf2572b',
-            '54c67bcde4b051242988553e',
-        );
+			'57ef23539033602e61d4a560',
+			'54c67bb9e4b0512429885513',
+			'54c67bb9e4b0512429885512',
+			'54c67bbbe4b07997ea3f3f6b',
+			'54d1a33ae4b086c0c0964ce9',
+			'57ef253c9033602e61d4a563',
+			'552355bfe4b0221aadf2572b',
+			'54c67bcde4b051242988553e',
+		);
 
 		return $localization_data;
 	}
@@ -229,11 +229,11 @@ 
 
 		if( 'form_list' === GFForms::get_page() ) {
 			$priority = 790;
-        }
+		}
 
 		if( empty( $connected_views ) ) {
 
-		    $menu_items['gravityview'] = array(
+			$menu_items['gravityview'] = array(
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', // Only appears in GF pre-2.5
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -265,13 +265,13 @@ 
 		// If there were no items added, then let's create the parent menu
 		if( $sub_menu_items ) {
 
-		    $sub_menu_items[] = array(
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
-			    'icon' => '<span class="dashicons dashicons-plus"></span>',
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
-			    'capabilities'   => array( 'edit_gravityviews' ),
-            );
+			$sub_menu_items[] = array(
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
+				'icon' => '<span class="dashicons dashicons-plus"></span>',
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
+				'capabilities'   => array( 'edit_gravityviews' ),
+			);
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
 			$sub_menu_items[] = array(
@@ -668,16 +668,16 @@ 
 	/**
 	 * Render html for displaying available fields based on a Form ID
 	 *
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
 	 *
 	 * @param int $form Gravity Forms Form ID (default: '')
 	 * @param string $context (default: 'single')
-     *
+	 *
 	 * @return void
 	 */
 	function render_available_fields( $form = 0, $context = 'single' ) {
 
-	    // Determine if form is a preset and convert it to an array with fields
+		// Determine if form is a preset and convert it to an array with fields
 		$form = ( is_string( $form ) && preg_match( '/^preset_/', $form ) ) ? GravityView_Ajax::pre_get_form_fields( $form ) : $form;
 
 		/**
@@ -695,7 +695,7 @@ 
 
 		if ( ! is_array( $blocklist_field_types ) ) {
 
-		    gravityview()->log->error( '$blocklist_field_types is not an array', array( 'data' => print_r( $blocklist_field_types, true ) ) );
+			gravityview()->log->error( '$blocklist_field_types is not an array', array( 'data' => print_r( $blocklist_field_types, true ) ) );
 
 			$blocklist_field_types = array();
 		}
@@ -953,9 +953,9 @@ 
 
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
 
-                foreach ( $joined_forms as $form ) {
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
-                }
+				foreach ( $joined_forms as $form ) {
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
+				}
 			} else {
 				$available_items[ $form ] = \GV\Widget::registered();
 			}
@@ -994,9 +994,9 @@ 
 
 										if ( $form_id ) {
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
-                                        } else {
+										} else {
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
-                                        }
+										}
 
 										if ( !$original_item ) {
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -1246,7 +1246,7 @@ 
 		}
 
 		// Add the GV font (with the Astronaut)
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
 
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1254,46 +1254,46 @@ 
 		if( GFForms::get_page() === 'form_list' ) {
 			wp_enqueue_style( 'gravityview_views_styles' );
 			return;
-        }
+		}
 
 		// Don't process any scripts below here if it's not a GravityView page.
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
-		    return;
+			return;
 		}
 
 		wp_enqueue_code_editor( array( 'type' => 'text/html' ) );
 
-        wp_enqueue_script( 'jquery-ui-datepicker' );
-
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
-
-        // Enqueue scripts
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
-
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
-            'cookiepath' => COOKIEPATH,
-            'admin_cookiepath' => ADMIN_COOKIE_PATH,
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
-            'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
-            'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
-            'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
-            'label_close' => __( 'Close', 'gravityview' ),
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
-            'label_continue' => __( 'Continue', 'gravityview' ),
-            'label_ok' => __( 'Ok', 'gravityview' ),
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
-        ));
+		wp_enqueue_script( 'jquery-ui-datepicker' );
+
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
+
+		// Enqueue scripts
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
+
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+			'cookiepath' => COOKIEPATH,
+			'admin_cookiepath' => ADMIN_COOKIE_PATH,
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
+			'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
+			'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
+			'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
+			'label_close' => __( 'Close', 'gravityview' ),
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
+			'label_continue' => __( 'Continue', 'gravityview' ),
+			'label_ok' => __( 'Ok', 'gravityview' ),
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
+		));
 
 		wp_enqueue_style( 'gravityview_views_styles' );
 
-        // Enqueue scripts needed for merge tags
-        self::enqueue_gravity_forms_scripts();
+		// Enqueue scripts needed for merge tags
+		self::enqueue_gravity_forms_scripts();
 
 		// 2.5 changed how Merge Tags are enqueued
 		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
@@ -1303,24 +1303,24 @@ 
 
 	/**
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
-     *
-     * @since 1.0.5-beta
-     *
-     * @return void
+	 *
+	 * @since 1.0.5-beta
+	 *
+	 * @return void
 	 */
 	static function enqueue_gravity_forms_scripts() {
 		GFForms::register_scripts();
 
 		$scripts = array(
-		    'sack',
-		    'gform_gravityforms',
-		    'gform_forms',
-		    'gform_form_admin',
-		    'jquery-ui-autocomplete'
+			'sack',
+			'gform_gravityforms',
+			'gform_forms',
+			'gform_form_admin',
+			'jquery-ui-autocomplete'
 		);
 
 		if ( wp_is_mobile() ) {
-		    $scripts[] = 'jquery-touch-punch';
+			$scripts[] = 'jquery-touch-punch';
 		}
 
 		wp_enqueue_script( $scripts );

Spacing +172 added lines, -172 removed lines

@@ -27,34 +27,34 @@ 
 		add_filter( 'gravityview_blocklist_field_types', array( $this, 'default_field_blocklist' ), 10, 2 );
 
 		// Tooltips
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
 
 		add_filter( 'admin_body_class', array( $this, 'add_gf_version_css_class' ) );
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
-
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers'), 10, 2 );
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ), 10, 2 );
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
 
 		// @todo check if this hook is needed..
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
 
 		// Add Connected Form column
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
 
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
 
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
 
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
 
@@ -86,7 +86,7 @@ 
 		$major_version = explode( '.', GFForms::$version );
 
 		if ( 2 <= sizeof( $major_version ) ) {
-			$class .= ' gf-minor-version-' . esc_attr( $major_version[0] . '-' . $major_version[1] );
+			$class .= ' gf-minor-version-' . esc_attr( $major_version[ 0 ] . '-' . $major_version[ 1 ] );
 		}
 
 		return $class;
@@ -101,11 +101,11 @@ 
 	 */
 	function suggest_support_articles( $localization_data = array() ) {
 
-	    if( ! gravityview()->request->is_view() ) {
+	    if ( ! gravityview()->request->is_view() ) {
 	        return $localization_data;
         }
 
-		$localization_data['suggest'] = array(
+		$localization_data[ 'suggest' ] = array(
             '57ef23539033602e61d4a560',
             '54c67bb9e4b0512429885513',
             '54c67bb9e4b0512429885512',
@@ -134,20 +134,20 @@ 
 			return;
 		}
 
-		if ( ! isset( $query->query_vars['post_type'] ) ) {
+		if ( ! isset( $query->query_vars[ 'post_type' ] ) ) {
 			return;
 		}
 
-		if ( 'gravityview' !== $query->query_vars['post_type'] ) {
+		if ( 'gravityview' !== $query->query_vars[ 'post_type' ] ) {
 			return;
 		}
 
-		$form_id = (int) \GV\Utils::_GET( 'gravityview_form_id' );
+		$form_id = (int)\GV\Utils::_GET( 'gravityview_form_id' );
 
 		$meta_query = array();
 
 		if ( $form_id ) {
-			$meta_query[] = array(
+			$meta_query[ ] = array(
 					'key'   => '_gravityview_form_id',
 					'value' => $form_id,
 			);
@@ -156,7 +156,7 @@ 
 		$layout_id = \GV\Utils::_GET( 'gravityview_layout' );
 
 		if ( $layout_id ) {
-			$meta_query[] = array(
+			$meta_query[ ] = array(
 					'key'   => '_gravityview_directory_template',
 					'value' => esc_attr( $layout_id ),
 			);
@@ -173,7 +173,7 @@ 
 	public function add_view_dropdown() {
 		$current_screen = get_current_screen();
 
-		if( 'gravityview' !== $current_screen->post_type ) {
+		if ( 'gravityview' !== $current_screen->post_type ) {
 			return;
 		}
 
@@ -181,12 +181,12 @@ 
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
 
 		// If there are no forms to select, show no forms.
-		if( ! empty( $forms ) ) { ?>
+		if ( ! empty( $forms ) ) { ?>
 			<label for="gravityview_form_id" class="screen-reader-text"><?php esc_html_e( 'Filter Views by form', 'gravityview' ); ?></label>
 			<select name="gravityview_form_id" id="gravityview_form_id">
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
-				<?php foreach( $forms as $form ) { ?>
-					<option value="<?php echo esc_attr( $form['id'] ); ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+				<?php foreach ( $forms as $form ) { ?>
+					<option value="<?php echo esc_attr( $form[ 'id' ] ); ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 				<?php } ?>
 			</select>
 		<?php }
@@ -195,26 +195,26 @@ 
 		$current_layout = \GV\Utils::_GET( 'gravityview_layout' );
 
 		// If there are no forms to select, show no forms.
-		if( ! empty( $layouts ) ) { ?>
+		if ( ! empty( $layouts ) ) { ?>
 			<label for="gravityview_layout_name" class="screen-reader-text"><?php esc_html_e( 'Filter Views by layout', 'gravityview' ); ?></label>
 			<select name="gravityview_layout" id="gravityview_layout_name">
 				<option value="" <?php selected( '', $current_layout, true ); ?>><?php esc_html_e( 'All layouts', 'gravityview' ); ?></option>
 				<optgroup label="<?php esc_html_e( 'Layouts', 'gravityview' ); ?>">
-				<?php foreach( $layouts as $layout_id => $layout ) {
-					if ( in_array( $layout['type'], array( 'preset', 'internal' ), true ) ) {
+				<?php foreach ( $layouts as $layout_id => $layout ) {
+					if ( in_array( $layout[ 'type' ], array( 'preset', 'internal' ), true ) ) {
 						continue;
 					}
 					?>
-					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout['label'] ); ?></option>
+					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout[ 'label' ] ); ?></option>
 				<?php } ?>
 				</optgroup>
 				<optgroup label="<?php esc_html_e( 'Form Presets', 'gravityview' ); ?>">
-				<?php foreach( $layouts as $layout_id => $layout ) {
-					if ( ! in_array( $layout['type'], array( 'preset' ), true ) ) {
+				<?php foreach ( $layouts as $layout_id => $layout ) {
+					if ( ! in_array( $layout[ 'type' ], array( 'preset' ), true ) ) {
 						continue;
 					}
 					?>
-					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout['label'] ); ?></option>
+					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout[ 'label' ] ); ?></option>
 				<?php } ?>
 				</optgroup>
 			</select>
@@ -228,7 +228,7 @@ 
 	 */
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
 	}
 
 	/**
@@ -258,13 +258,13 @@ 
 
 		$priority = 0;
 
-		if( 'form_list' === GFForms::get_page() ) {
+		if ( 'form_list' === GFForms::get_page() ) {
 			$priority = 790;
         }
 
-		if( empty( $connected_views ) ) {
+		if ( empty( $connected_views ) ) {
 
-		    $menu_items['gravityview'] = array(
+		    $menu_items[ 'gravityview' ] = array(
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', // Only appears in GF pre-2.5
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -280,23 +280,23 @@ 
 		$sub_menu_items = array();
 		foreach ( (array)$connected_views as $view ) {
 
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
 				continue;
 			}
 
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
 
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'label' => esc_attr( $label ),
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
 				'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 			);
 		}
 
 		// If there were no items added, then let's create the parent menu
-		if( $sub_menu_items ) {
+		if ( $sub_menu_items ) {
 
-		    $sub_menu_items[] = array(
+		    $sub_menu_items[ ] = array(
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
 			    'icon' => '<span class="dashicons dashicons-plus"></span>',
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -305,14 +305,14 @@ 
             );
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'url' => '#',
 				'label' => '',
 				'menu_class' => 'hidden',
 				'capabilities' => '',
 			);
 
-			$menu_items['gravityview'] = array(
+			$menu_items[ 'gravityview' ] = array(
 				'label'          => __( 'Connected Views', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -343,8 +343,8 @@ 
 		$add = array( 'captcha', 'page' );
 
 		// Don't allowing editing the following values:
-		if( $context === 'edit' ) {
-			$add[] = 'post_id';
+		if ( $context === 'edit' ) {
+			$add[ ] = 'post_id';
 		}
 
 		$return = array_merge( $array, $add );
@@ -375,27 +375,27 @@ 
 		foreach ( $default_args as $key => $arg ) {
 
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
 
 			// By default, use `tooltip` if defined.
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
 
 			// If there's no tooltip set, continue
-			if( empty( $tooltip ) ) {
+			if ( empty( $tooltip ) ) {
 				continue;
 			}
 
 			// Add the tooltip
-			$gv_tooltips[ 'gv_'.$key ] = array(
-				'title'	=> $arg['label'],
+			$gv_tooltips[ 'gv_' . $key ] = array(
+				'title'	=> $arg[ 'label' ],
 				'value'	=> $tooltip,
 			);
 
 		}
 
-		$gv_tooltips['gv_css_merge_tags'] = array(
-			'title' => __('CSS Merge Tags', 'gravityview'),
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
 		);
 
 		/**
@@ -413,9 +413,9 @@ 
 
 		foreach ( $gv_tooltips as $key => $tooltip ) {
 
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
 
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
 		}
 
 		return $tooltips;
@@ -429,7 +429,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function add_custom_column_content( $column_name = null, $post_id = 0 )	{
+	public function add_custom_column_content( $column_name = null, $post_id = 0 ) {
 
 		$output = '';
 
@@ -451,7 +451,7 @@ 
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
 
-				$output = $template ? $template['label'] : $template_id_pretty;
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
 
 				break;
 
@@ -492,12 +492,12 @@ 
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
 
 		// Either the form is empty or the form ID is 0, not yet set.
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			return '';
 		}
 
 		// The $form is passed as the form ID
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$form = gravityview_get_form( $form );
 		}
 
@@ -505,35 +505,35 @@ 
 			return '';
 		}
 
-		$form_id = $form['id'];
+		$form_id = $form[ 'id' ];
 		$links = array();
 
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
 		} else {
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
 		}
 
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
 		}
 
 		$output = '';
 
-		if( !empty( $include_form_link ) ) {
+		if ( ! empty( $include_form_link ) ) {
 			$output .= $form_link;
 		}
 
@@ -548,11 +548,11 @@ 
 		$css_class = 'row-actions';
 
 		// Is Screen Options > View mode set to "Extended view"? If so, keep actions visible.
-		if( 'excerpt' === get_user_setting( 'posts_list_mode', 'list' ) ) {
+		if ( 'excerpt' === get_user_setting( 'posts_list_mode', 'list' ) ) {
 			$css_class = 'row-actions visible';
 		}
 
-		$output .= '<div class="' . $css_class . '">'. implode( ' | ', $links ) .'</div>';
+		$output .= '<div class="' . $css_class . '">' . implode( ' | ', $links ) . '</div>';
 
 		return $output;
 	}
@@ -566,8 +566,8 @@ 
 		// Get the date column and save it for later to add back in.
 		// This adds it after the Data Source column.
 		// This way, we don't need to do array_slice, array_merge, etc.
-		$date = $columns['date'];
-		unset( $columns['date'] );
+		$date = $columns[ 'date' ];
+		unset( $columns[ 'date' ] );
 
 		$data_source_required_caps = array(
 			'gravityforms_edit_forms',
@@ -578,14 +578,14 @@ 
 			'gravityforms_preview_forms',
 		);
 
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
 		}
 
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
 
 		// Add the date back in.
-		$columns['date'] = $date;
+		$columns[ 'date' ] = $date;
 
 		return $columns;
 	}
@@ -598,12 +598,12 @@ 
 	 */
 	function save_postdata( $post_id ) {
 
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return;
 		}
 
 		// validate post_type
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
 			return;
 		}
 
@@ -618,63 +618,63 @@ 
 		$statii = array();
 
 		// check if this is a start fresh View
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
 
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
 			// save form id
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
 
 		}
 
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
 			return;
 		}
 
 		// Was this a start fresh?
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
 		} else {
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
 		}
 
 		// Check if we have a template id
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
 
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
 
 			// now save template id
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
 		}
 
 
 		// save View Configuration metabox
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
 
 			// template settings
-			if( empty( $_POST['template_settings'] ) ) {
-				$_POST['template_settings'] = array();
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
+				$_POST[ 'template_settings' ] = array();
 			}
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
 
 			// guard against unloaded View configuration page
-			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) {
+			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) {
 				$fields = array();
 
-				if ( ! empty( $_POST['gv_fields'] ) ) {
+				if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
 					$fields = _gravityview_process_posted_fields();
 				}
 
 				$fields = wp_slash( $fields );
 
-				$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
+				$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
 			}
 
 			// Directory Visible Widgets
-			if( empty( $_POST['widgets'] ) ) {
-				$_POST['widgets'] = array();
+			if ( empty( $_POST[ 'widgets' ] ) ) {
+				$_POST[ 'widgets' ] = array();
 			}
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
 
 		} // end save view configuration
 
@@ -684,7 +684,7 @@ 
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
 		 * @since 1.17.2
 		 */
-		do_action('gravityview_view_saved', $post_id, $statii );
+		do_action( 'gravityview_view_saved', $post_id, $statii );
 
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
 	}
@@ -735,20 +735,20 @@ 
 
 		$output = '';
 
-		if( !empty( $fields ) ) {
+		if ( ! empty( $fields ) ) {
 
-			foreach( $fields as $id => $details ) {
+			foreach ( $fields as $id => $details ) {
 
-				if( in_array( $details['type'], (array) $blocklist_field_types ) ) {
+				if ( in_array( $details[ 'type' ], (array)$blocklist_field_types ) ) {
 					continue;
 				}
 
 				// Edit mode only allows editing the parent fields, not single inputs.
-				if( $context === 'edit' && ! empty( $details['parent'] ) ) {
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
 					continue;
 				}
 
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, array(), $form );
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, array(), $form );
 
 			} // End foreach
 		}
@@ -756,7 +756,7 @@ 
 		echo $output;
 
 		// For the EDIT view we only want to allow the form fields.
-		if( $context === 'edit' ) {
+		if ( $context === 'edit' ) {
 			return;
 		}
 
@@ -775,7 +775,7 @@ 
 		$additional_fields = array(
 			array(
 				'label_text' => __( 'Add All Form Fields', 'gravityview' ),
-				'desc' => __('Insert all the form fields at once.', 'gravityview'),
+				'desc' => __( 'Insert all the form fields at once.', 'gravityview' ),
 				'field_id' => 'all-fields',
 				'label_type' => 'field',
 				'input_type' => null,
@@ -791,7 +791,7 @@ 
 		 */
 		$additional_fields = apply_filters( 'gravityview_additional_fields', $additional_fields );
 
-		foreach ( (array) $additional_fields as $item ) {
+		foreach ( (array)$additional_fields as $item ) {
 
 			// Prevent items from not having index set
 			$item = wp_parse_args( $item, array(
@@ -802,16 +802,16 @@ 
 				'field_options' => null,
 				'settings_html'	=> null,
 				'icon' => null,
-			));
+			) );
 
 			// Backward compat.
-			if( !empty( $item['field_options'] ) ) {
+			if ( ! empty( $item[ 'field_options' ] ) ) {
 				// Use settings_html from now on.
-				$item['settings_html'] = $item['field_options'];
+				$item[ 'settings_html' ] = $item[ 'field_options' ];
 			}
 
 			// Render a label for each of them
-			echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
+			echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
 
 		}
 
@@ -823,12 +823,12 @@ 
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 	 * @return array
 	 */
-	function get_entry_default_fields($form, $zone) {
+	function get_entry_default_fields( $form, $zone ) {
 
 		$entry_default_fields = array();
 
 		// if in zone directory or single
-		if( in_array( $zone, array( 'directory', 'single' ), true ) ) {
+		if ( in_array( $zone, array( 'directory', 'single' ), true ) ) {
 
 			$meta_fields = GravityView_Fields::get_all( array( 'meta', 'gravityview', 'add-ons' ) );
 
@@ -845,7 +845,7 @@ 
 		 * @param  string|array $form form_ID or form object
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 		 */
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
 	}
 
 	/**
@@ -856,7 +856,7 @@ 
 	 */
 	function get_available_fields( $form = '', $zone = NULL ) {
 
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			gravityview()->log->error( '$form is empty' );
 			return array();
 		}
@@ -865,7 +865,7 @@ 
 		$fields = gravityview_get_form_fields( $form, true );
 
 		// get meta fields ( only if form was already created )
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$meta_fields = gravityview_get_entry_meta( $form );
 		} else {
 			$meta_fields = array();
@@ -878,8 +878,8 @@ 
 		$fields = $fields + $meta_fields + $default_fields;
 
 		// Move Custom Content to top
-		if ( isset( $fields['custom'] ) ) {
-			$fields = array( 'custom' => $fields['custom'] ) + $fields;
+		if ( isset( $fields[ 'custom' ] ) ) {
+			$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
 		}
 
 		$gv_fields = GravityView_Fields::get_all();
@@ -887,7 +887,7 @@ 
 		foreach ( $fields as &$field ) {
 			foreach ( $gv_fields as $gv_field ) {
 				if ( \GV\Utils::get( $field, 'type' ) === $gv_field->name ) {
-					$field['icon'] = \GV\Utils::get( $gv_field, 'icon' );
+					$field[ 'icon' ] = \GV\Utils::get( $gv_field, 'icon' );
 				}
 			}
 		}
@@ -915,7 +915,7 @@ 
 		}
 
 		foreach ( $widgets as $id => $details ) {
-			echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
+			echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
 		}
 
 	}
@@ -945,7 +945,7 @@ 
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
 		global $post;
 
-		if( $type === 'widget' ) {
+		if ( $type === 'widget' ) {
 			$button_label = __( 'Add Widget', 'gravityview' );
 		} else {
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -971,10 +971,10 @@ 
 		$form_id = null;
 
 		// if saved values, get available fields to label everyone
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
 
-			if( !empty( $_POST['template_id'] ) ) {
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 			} else {
 				$form_id = $form = gravityview_get_form_id( $post->ID );
 			}
@@ -992,53 +992,53 @@ 
 			}
 		}
 
-		foreach( $rows as $row ) :
-			foreach( $row as $col => $areas ) :
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
+		foreach ( $rows as $row ) :
+			foreach ( $row as $col => $areas ) :
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
 
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 
-					<?php foreach( $areas as $area ) : 	?>
+					<?php foreach ( $areas as $area ) : 	?>
 
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
-                            <p class="gv-droppable-area-title" <?php if ( 'widget' === $type && empty( $area['subtitle'] ) ) { echo ' style="margin: 0; padding: 0;"'; } ?>>
-								<strong <?php if ( 'widget' === $type ) { echo 'class="screen-reader-text"'; } ?>><?php echo esc_html( $area['title'] ); ?></strong>
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
+                            <p class="gv-droppable-area-title" <?php if ( 'widget' === $type && empty( $area[ 'subtitle' ] ) ) { echo ' style="margin: 0; padding: 0;"'; } ?>>
+								<strong <?php if ( 'widget' === $type ) { echo 'class="screen-reader-text"'; } ?>><?php echo esc_html( $area[ 'title' ] ); ?></strong>
 
 								<?php if ( 'widget' !== $type ) { ?>
-									<a class="clear-all-fields alignright" role="button" href="#" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>"><?php esc_html_e( 'Clear all fields', 'gravityview' ); ?></a>
+									<a class="clear-all-fields alignright" role="button" href="#" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"><?php esc_html_e( 'Clear all fields', 'gravityview' ); ?></a>
 								<?php } ?>
 
-                                <?php if ( ! empty( $area['subtitle'] ) ) { ?>
-									<span class="gv-droppable-area-subtitle"><span class="gf_tooltip gv_tooltip tooltip" title="<?php echo esc_attr( $area['subtitle'] ); ?>"></span></span>
+                                <?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?>
+									<span class="gv-droppable-area-subtitle"><span class="gf_tooltip gv_tooltip tooltip" title="<?php echo esc_attr( $area[ 'subtitle' ] ); ?>"></span></span>
 								<?php } ?>
 							</p>
 							<div class="active-drop-container active-drop-container-<?php echo esc_attr( $type ); ?>">
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>"><?php // render saved fields
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"><?php // render saved fields
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
 
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
 
 										// Maybe has a form ID
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
 
 										$input_type = NULL;
 
 										if ( $form_id ) {
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
                                         } else {
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
                                         }
 
-										if ( !$original_item ) {
-											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
+										if ( ! $original_item ) {
+											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( ' data' => array( 'available_items' => $available_items, 'field' => $field ) ) );
 
 											$original_item = $field;
 										} else {
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
 										}
 
 										// Field options dialog box
-										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
+										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
 
 										$item = array(
 											'input_type' => $input_type,
@@ -1051,12 +1051,12 @@ 
 											$item = wp_parse_args( $item, $original_item );
 										}
 
-										switch( $type ) {
+										switch ( $type ) {
 											case 'widget':
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
 												break;
 											default:
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
 										}
 									}
 
@@ -1064,7 +1064,7 @@ 
 								<div class="gv-droppable-area-action">
 									<a href="#" class="gv-add-field button button-link button-hero" title=""
 									   data-objecttype="<?php echo esc_attr( $type ); ?>"
-									   data-areaid="<?php echo esc_attr( $zone . '_' . $area['areaid'] ); ?>"
+									   data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"
 									   data-context="<?php echo esc_attr( $zone ); ?>"
 									   data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '<span class="dashicons dashicons-plus-alt"></span>' . esc_html( $button_label ); ?></a>
 								</div>
@@ -1097,7 +1097,7 @@ 
 				// This is a new View, prefill the widgets
 				$widgets = array(
 					'header_top' => array(
-						substr( md5( microtime( true ) ), 0, 13 ) => array (
+						substr( md5( microtime( true ) ), 0, 13 ) => array(
 							'id' => 'search_bar',
 							'label' => __( 'Search Bar', 'gravityview' ),
 							'search_layout' => 'horizontal',
@@ -1172,12 +1172,12 @@ 
 		if ( $post ) {
 			$source_form_id = gravityview_get_form_id( $post->ID );
 			if ( $source_form_id ) {
-				$form_ids[] = $source_form_id;
+				$form_ids[ ] = $source_form_id;
 			}
 
 			$joined_forms = \GV\View::get_joined_forms( $post->ID );
 			foreach ( $joined_forms as $joined_form ) {
-				$form_ids[] = $joined_form->ID;
+				$form_ids[ ] = $joined_form->ID;
 			}
 		}
 		foreach ( array_unique( $form_ids ) as $form_id ) {
@@ -1215,7 +1215,7 @@ 
 	 * @return string HTML of the active areas
 	 */
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
-		if( empty( $template_id ) ) {
+		if ( empty( $template_id ) ) {
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
 			return '';
 		}
@@ -1229,12 +1229,12 @@ 
 		 */
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
 
-		if( empty( $template_areas ) ) {
+		if ( empty( $template_areas ) ) {
 
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
 			$output = '<div>';
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
 			$output .= '</div>';
 		} else {
 
@@ -1249,7 +1249,7 @@ 
 
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -1277,18 +1277,18 @@ 
 		}
 
 		// Add the GV font (with the Astronaut)
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
 
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
 
-		if( GFForms::get_page() === 'form_list' ) {
+		if ( GFForms::get_page() === 'form_list' ) {
 			wp_enqueue_style( 'gravityview_views_styles' );
 			return;
         }
 
 		// Don't process any scripts below here if it's not a GravityView page.
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
 		    return;
 		}
 
@@ -1296,15 +1296,15 @@ 
 
         wp_enqueue_script( 'jquery-ui-datepicker' );
 
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
 
         // Enqueue scripts
         wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
 
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
             'cookiepath' => COOKIEPATH,
             'admin_cookiepath' => ADMIN_COOKIE_PATH,
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
             'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
@@ -1319,7 +1319,7 @@ 
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
             'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
-        ));
+        ) );
 
 		wp_enqueue_style( 'gravityview_views_styles' );
 
@@ -1327,7 +1327,7 @@ 
         self::enqueue_gravity_forms_scripts();
 
 		// 2.5 changed how Merge Tags are enqueued
-		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
+		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript' ) ) ) {
 			GFCommon::output_hooks_javascript();
 		}
 	}
@@ -1351,7 +1351,7 @@ 
 		);
 
 		if ( wp_is_mobile() ) {
-		    $scripts[] = 'jquery-touch-punch';
+		    $scripts[ ] = 'jquery-touch-punch';
 		}
 
 		wp_enqueue_script( $scripts );

Braces +2 added lines, -2 removed lines

@@ -429,7 +429,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function add_custom_column_content( $column_name = null, $post_id = 0 )	{
+	public function add_custom_column_content( $column_name = null, $post_id = 0 ) {
 
 		$output = '';
 
@@ -598,7 +598,7 @@ 
 	 */
 	function save_postdata( $post_id ) {
 
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
+		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return;
 		}