gravityview / GravityView

includes/class-gravityview-bulk-actions.php

Spacing +20 added lines, -20 removed lines

@@ -54,7 +54,7 @@ 
 
 		$gv_bulk_action = false;
 
-		if( version_compare( GFForms::$version, '2.0', '>=' ) ) {
+		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) {
 			$bulk_action = ( '-1' !== \GV\Utils::_POST( 'action' ) ) ? \GV\Utils::_POST( 'action' ) : \GV\Utils::_POST( 'action2' );
 		} else {
 			// GF 1.9.x - Bulk action 2 is the bottom bulk action select form.
@@ -62,7 +62,7 @@ 
 		}
 
 		// Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().
-		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', self::$bulk_action_prefixes ) .')/ism', $bulk_action ) ) {
+		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', self::$bulk_action_prefixes ) . ')/ism', $bulk_action ) ) {
 			$gv_bulk_action = $bulk_action;
 		}
 
@@ -86,7 +86,7 @@ 
 
 		// gforms_entry_list is the nonce that confirms we're on the right page
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
-		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST['gforms_update_note'] ) ) {
+		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
 
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
 
@@ -104,13 +104,13 @@ 
 			}
 
 			// All entries are set to be updated, not just the visible ones
-			if ( ! empty( $_POST['all_entries'] ) ) {
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
 
 				// Convert the current entry search into GF-formatted search criteria
 				$search = array(
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
 				);
 
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -121,7 +121,7 @@ 
 			} else {
 
 				// Changed from 'lead' to 'entry' in 2.0
-				$entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];
+				$entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];
 
 			}
 
@@ -133,15 +133,15 @@ 
 			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
 
 			switch ( $approved_status ) {
-				case self::$bulk_action_prefixes['approve']:
+				case self::$bulk_action_prefixes[ 'approve' ]:
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id );
 					self::$bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
 					break;
-				case self::$bulk_action_prefixes['unapprove']:
+				case self::$bulk_action_prefixes[ 'unapprove' ]:
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id );
 					self::$bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count );
 					break;
-				case self::$bulk_action_prefixes['disapprove']:
+				case self::$bulk_action_prefixes[ 'disapprove' ]:
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id );
 					self::$bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
 					break;
@@ -164,16 +164,16 @@ 
 		$bulk_actions = array(
 			'GravityView' => array(
 				array(
-					'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'),
-					'value' => sprintf( '%s-%d', self::$bulk_action_prefixes['approve'], $form_id ),
+					'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ),
+					'value' => sprintf( '%s-%d', self::$bulk_action_prefixes[ 'approve' ], $form_id ),
 				),
 				array(
-					'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'),
-					'value' => sprintf( '%s-%d', self::$bulk_action_prefixes['disapprove'], $form_id ),
+					'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ),
+					'value' => sprintf( '%s-%d', self::$bulk_action_prefixes[ 'disapprove' ], $form_id ),
 				),
 				array(
-					'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'),
-					'value' => sprintf( '%s-%d', self::$bulk_action_prefixes['unapprove'], $form_id ),
+					'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ),
+					'value' => sprintf( '%s-%d', self::$bulk_action_prefixes[ 'unapprove' ], $form_id ),
 				),
 			),
 		);
@@ -190,13 +190,13 @@ 
 		// Sanitize the values, just to be sure.
 		foreach ( $bulk_actions as $key => $group ) {
 
-			if( empty( $group ) ) {
+			if ( empty( $group ) ) {
 				continue;
 			}
 
 			foreach ( $group as $i => $action ) {
-				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
-				$bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );
+				$bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );
+				$bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );
 			}
 		}
 

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/fields/class-gravityview-field.php

Spacing +22 added lines, -22 removed lines

@@ -143,17 +143,17 @@ 
 
 		add_filter( 'gravityview/sortable/field_blocklist', array( $this, '_filter_sortable_fields' ), 1 );
 
-		if( $this->entry_meta_key ) {
+		if ( $this->entry_meta_key ) {
 			add_filter( 'gform_entry_meta', array( $this, 'add_entry_meta' ) );
 			add_filter( 'gravityview/common/sortable_fields', array( $this, 'add_sortable_field' ), 10, 2 );
 		}
 
-		if( $this->_custom_merge_tag ) {
+		if ( $this->_custom_merge_tag ) {
 			add_filter( 'gform_custom_merge_tags', array( $this, '_filter_gform_custom_merge_tags' ), 10, 4 );
 			add_filter( 'gform_replace_merge_tags', array( $this, '_filter_gform_replace_merge_tags' ), 10, 7 );
 		}
 
-		if( 'meta' === $this->group || '' !== $this->default_search_label ) {
+		if ( 'meta' === $this->group || '' !== $this->default_search_label ) {
 			add_filter( 'gravityview_search_field_label', array( $this, 'set_default_search_label' ), 10, 3 );
 		}
 
@@ -161,7 +161,7 @@ 
 		 * Auto-assign label from Gravity Forms label, if exists
 		 * @since 1.20
 		 */
-		if( empty( $this->label ) && ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
+		if ( empty( $this->label ) && ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
 			$this->label = ucfirst( GF_Fields::get( $this->name )->get_form_editor_field_title() );
 		}
 
@@ -207,7 +207,7 @@ 
 			'type'  => $this->name
 		);
 
-		$fields["{$this->entry_meta_key}"] = $added_field;
+		$fields[ "{$this->entry_meta_key}" ] = $added_field;
 
 		return $fields;
 	}
@@ -227,7 +227,7 @@ 
 	 */
 	function set_default_search_label( $label = '', $gf_field = null, $field = array() ) {
 
-		if( $this->name === $field['field'] && '' === $label ) {
+		if ( $this->name === $field[ 'field' ] && '' === $label ) {
 			$label = esc_html( $this->default_search_label );
 		}
 
@@ -248,7 +248,7 @@ 
 	 *
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
 	 */
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
 		// Is there is field merge tag? Strip whitespace off the ned, too.
 		preg_match_all( '/{' . preg_quote( $this->_custom_merge_tag ) . ':?(.*?)(?:\s)?}/ism', $text, $matches, PREG_SET_ORDER );
@@ -281,19 +281,19 @@ 
 	 */
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
-		foreach( $matches as $match ) {
+		foreach ( $matches as $match ) {
 
-			$full_tag = $match[0];
+			$full_tag = $match[ 0 ];
 
 			// Strip the Merge Tags
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
 
 			// Replace the value from the entry, if exists
-			if( isset( $entry[ $tag ] ) ) {
+			if ( isset( $entry[ $tag ] ) ) {
 
 				$value = $entry[ $tag ];
 
-				if( is_callable( array( $this, 'get_content') ) ) {
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
 					$value = $this->get_content( $value );
 				}
 
@@ -366,8 +366,8 @@ 
 	 */
 	public function _filter_sortable_fields( $not_sortable ) {
 
-		if( ! $this->is_sortable ) {
-			$not_sortable[] = $this->name;
+		if ( ! $this->is_sortable ) {
+			$not_sortable[ ] = $this->name;
 		}
 
 		return $not_sortable;
@@ -384,7 +384,7 @@ 
 	 */
 	function add_entry_meta( $entry_meta ) {
 
-		if( ! isset( $entry_meta["{$this->entry_meta_key}"] ) ) {
+		if ( ! isset( $entry_meta[ "{$this->entry_meta_key}" ] ) ) {
 
 			$added_meta = array(
 				'label'             => $this->label,
@@ -393,13 +393,13 @@ 
 			);
 
 			if ( $this->entry_meta_update_callback && is_callable( $this->entry_meta_update_callback ) ) {
-				$added_meta['update_entry_meta_callback'] = $this->entry_meta_update_callback;
+				$added_meta[ 'update_entry_meta_callback' ] = $this->entry_meta_update_callback;
 			}
 
-			$entry_meta["{$this->entry_meta_key}"] = $added_meta;
+			$entry_meta[ "{$this->entry_meta_key}" ] = $added_meta;
 
 		} else {
-			gravityview()->log->error( 'Entry meta already set: {meta_key}', array( 'meta_key' => $this->entry_meta_key, 'data' =>  $entry_meta["{$this->entry_meta_key}"] ) );
+			gravityview()->log->error( 'Entry meta already set: {meta_key}', array( 'meta_key' => $this->entry_meta_key, 'data' =>  $entry_meta[ "{$this->entry_meta_key}" ] ) );
 		}
 
 		return $entry_meta;
@@ -434,7 +434,7 @@ 
 			'date_display' => array(
 				'type' => 'text',
 				'label' => __( 'Override Date Format', 'gravityview' ),
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://wordpress.org/support/article/formatting-date-and-time/" rel="external">', '</a>' ),
+				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview' ), '<a href="https://wordpress.org/support/article/formatting-date-and-time/" rel="external">', '</a>' ),
 				/**
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -464,7 +464,7 @@ 
 
 		$options = $this->field_support_options();
 
-		if( isset( $options[ $key ] ) ) {
+		if ( isset( $options[ $key ] ) ) {
 			$field_options[ $key ] = $options[ $key ];
 		}
 
@@ -528,11 +528,11 @@ 
 		$connected_form = \GV\Utils::_POST( 'form_id' );
 
 		// Otherwise, get the Form ID from the Post page
-		if( empty( $connected_form ) ) {
+		if ( empty( $connected_form ) ) {
 			$connected_form = gravityview_get_form_id( get_the_ID() );
 		}
 
-		if( empty( $connected_form ) ) {
+		if ( empty( $connected_form ) ) {
 			gravityview()->log->error( 'Form not found for form ID "{form_id}"', array( 'form_id' => $connected_form ) );
 			return false;
 		}