jazzsequence / games-collector

vendor/cmb2/includes/CMB2_Base.php

Doc Comments +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
 	 * Get object property and optionally set a fallback
 	 * @since  2.0.0
 	 * @param  string $property Metabox config property to retrieve
-	 * @param  mixed  $fallback Fallback value to set if no value found
+	 * @param  boolean|null  $fallback Fallback value to set if no value found
 	 * @return mixed            Metabox config property value or false
 	 */
 	public function prop( $property, $fallback = null ) {

Indentation +4 added lines, -4 removed lines

@@ -315,10 +315,10 @@
 	 * which is callable. If so, it registers the callback, and if not,
 	 * converts the maybe-modified $val to a boolean for return.
 	 *
- 	 * The registered handlers will have a parameter name which matches the filter, except:
- 	 * - The 'cmb2_api' prefix will be removed
- 	 * - A '_cb' suffix will be added (to stay inline with other '*_cb' parameters).
- 	 *
+	 * The registered handlers will have a parameter name which matches the filter, except:
+	 * - The 'cmb2_api' prefix will be removed
+	 * - A '_cb' suffix will be added (to stay inline with other '*_cb' parameters).
+	 *
 	 * @since  2.2.3
 	 *
 	 * @param  string $hook_name     The hook name.

Spacing +4 added lines, -4 removed lines

@@ -358,7 +358,7 @@ 
 		}
 
 		// Cast to bool.
-		return !! $val;
+		return ! ! $val;
 	}
 
 	/**
@@ -386,11 +386,11 @@ 
 			switch ( $message ) {
 
 				case self::DEPRECATED_PARAM:
-					$message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] );
+					$message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] );
 					break;
 
 				case self::DEPRECATED_CB_PARAM:
-					$message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] );
+					$message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] );
 					break;
 
 				default:
@@ -469,7 +469,7 @@ 
 	public function __call( $method, $args ) {
 		$object_class = strtolower( get_class( $this ) );
 
-		if ( ! has_filter(  "{$object_class}_inherit_{$method}" ) ) {
+		if ( ! has_filter( "{$object_class}_inherit_{$method}" ) ) {
 			throw new Exception( sprintf( esc_html__( 'Invalid %1$s method: %2$s', 'give' ), get_class( $this ), $method ) );
 		}
 

Braces +2 added lines, -4 removed lines

@@ -421,15 +421,13 @@
 			if ( function_exists( '__' ) ) {
 				if ( ! is_null( $message ) ) {
 					trigger_error( sprintf( __( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s! %3$s', 'cmb2' ), $function, $version, $message ) );
-				}
-				else {
+				} else {
 					trigger_error( sprintf( __( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s with no alternative available.', 'cmb2' ), $function, $version ) );
 				}
 			} else {
 				if ( ! is_null( $message ) ) {
 					trigger_error( sprintf( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
-				}
-				else {
+				} else {
 					trigger_error( sprintf( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
 				}
 			}

vendor/cmb2/includes/CMB2_Field.php

Doc Comments +2 added lines, -2 removed lines

@@ -723,7 +723,7 @@ 
 	 * Return a formatted timestamp for a field
 	 * @since  2.0.0
 	 * @param  string $format     Either date_format or time_format
-	 * @param  string $meta_value Optional meta value to check
+	 * @param  integer $meta_value Optional meta value to check
 	 * @return string             Formatted date
 	 */
 	public function get_timestamp_format( $format = 'date_format', $meta_value = 0 ) {
@@ -996,7 +996,7 @@ 
 	 * Retrieve options args. Calls options_cb if it exists.
 	 * @since  2.0.0
 	 * @param  string  $key Specific option to retrieve
-	 * @return array        Array of options
+	 * @return string        Array of options
 	 */
 	public function options( $key = '' ) {
 		if ( ! empty( $this->field_options ) ) {

Spacing +78 added lines, -78 removed lines

@@ -112,21 +112,21 @@ 
 	 */
 	public function __construct( $args ) {
 
-		if ( ! empty( $args['group_field'] ) ) {
-			$this->group       = $args['group_field'];
+		if ( ! empty( $args[ 'group_field' ] ) ) {
+			$this->group       = $args[ 'group_field' ];
 			$this->object_id   = $this->group->object_id;
 			$this->object_type = $this->group->object_type;
 			$this->cmb_id      = $this->group->cmb_id;
 		} else {
-			$this->object_id   = isset( $args['object_id'] ) && '_' !== $args['object_id'] ? $args['object_id'] : 0;
-			$this->object_type = isset( $args['object_type'] ) ? $args['object_type'] : 'post';
+			$this->object_id   = isset( $args[ 'object_id' ] ) && '_' !== $args[ 'object_id' ] ? $args[ 'object_id' ] : 0;
+			$this->object_type = isset( $args[ 'object_type' ] ) ? $args[ 'object_type' ] : 'post';
 
-			if ( isset( $args['cmb_id'] ) ) {
-				$this->cmb_id = $args['cmb_id'];
+			if ( isset( $args[ 'cmb_id' ] ) ) {
+				$this->cmb_id = $args[ 'cmb_id' ];
 			}
 		}
 
-		$this->args = $this->_set_field_defaults( $args['field_args'], $args );
+		$this->args = $this->_set_field_defaults( $args[ 'field_args' ], $args );
 
 		if ( $this->object_id ) {
 			$this->value = $this->get_data();
@@ -145,7 +145,7 @@ 
 			return call_user_func_array( array( $this, 'get_string' ), $arguments );
 		}
 
-		$key = isset( $arguments[0] ) ? $arguments[0] : false;
+		$key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false;
 		return $this->args( $name, $key );
 	}
 
@@ -216,9 +216,9 @@ 
 	 */
 	public function get_data( $field_id = '', $args = array() ) {
 		if ( $field_id ) {
-			$args['field_id'] = $field_id;
+			$args[ 'field_id' ] = $field_id;
 		} else if ( $this->group ) {
-			$args['field_id'] = $this->group->id();
+			$args[ 'field_id' ] = $this->group->id();
 		}
 
 		$a = $this->data_args( $args );
@@ -259,13 +259,13 @@ 
 		 *
 		 * @since 2.0.0
 		 */
-		$data = apply_filters( "cmb2_override_{$a['field_id']}_meta_value", $data, $this->object_id, $a, $this );
+		$data = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_value", $data, $this->object_id, $a, $this );
 
 		// If no override, get value normally
 		if ( 'cmb2_field_no_override_val' === $data ) {
-			$data = 'options-page' === $a['type']
-				? cmb2_options( $a['id'] )->get( $a['field_id'] )
-				: get_metadata( $a['type'], $a['id'], $a['field_id'], ( $a['single'] || $a['repeat'] ) );
+			$data = 'options-page' === $a[ 'type' ]
+				? cmb2_options( $a[ 'id' ] )->get( $a[ 'field_id' ] )
+				: get_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], ( $a[ 'single' ] || $a[ 'repeat' ] ) );
 		}
 
 		if ( $this->group ) {
@@ -287,7 +287,7 @@ 
 	public function update_data( $new_value, $single = true ) {
 		$a = $this->data_args( array( 'single' => $single ) );
 
-		$a['value'] = $a['repeat'] ? array_values( $new_value ) : $new_value;
+		$a[ 'value' ] = $a[ 'repeat' ] ? array_values( $new_value ) : $new_value;
 
 		/**
 		 * Filter whether to override saving of meta value.
@@ -323,7 +323,7 @@ 
 		 *
 		 * @since 2.0.0
 		 */
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_save", $override, $a, $this->args(), $this );
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_save", $override, $a, $this->args(), $this );
 
 		// If override, return that
 		if ( null !== $override ) {
@@ -331,22 +331,22 @@ 
 		}
 
 		// Options page handling (or temp data store)
-		if ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
-			return cmb2_options( $a['id'] )->update( $a['field_id'], $a['value'], false, $a['single'] );
+		if ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
+			return cmb2_options( $a[ 'id' ] )->update( $a[ 'field_id' ], $a[ 'value' ], false, $a[ 'single' ] );
 		}
 
 		// Add metadata if not single
-		if ( ! $a['single'] ) {
-			return add_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'], false );
+		if ( ! $a[ 'single' ] ) {
+			return add_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ], false );
 		}
 
 		// Delete meta if we have an empty array
-		if ( is_array( $a['value'] ) && empty( $a['value'] ) ) {
-			return delete_metadata( $a['type'], $a['id'], $a['field_id'], $this->value );
+		if ( is_array( $a[ 'value' ] ) && empty( $a[ 'value' ] ) ) {
+			return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $this->value );
 		}
 
 		// Update metadata
-		return update_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'] );
+		return update_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ] );
 	}
 
 	/**
@@ -396,19 +396,19 @@ 
 		 * @param array $field_args All field arguments
 		 * @param CMB2_Field object $field This field object
 		 */
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_remove", $override, $a, $this->args(), $this );
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_remove", $override, $a, $this->args(), $this );
 
 		// If no override, remove as usual
 		if ( null !== $override ) {
 			return $override;
 		}
 		// Option page handling
-		elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
-			return cmb2_options( $a['id'] )->remove( $a['field_id'] );
+		elseif ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
+			return cmb2_options( $a[ 'id' ] )->remove( $a[ 'field_id' ] );
 		}
 
 		// Remove metadata
-		return delete_metadata( $a['type'], $a['id'], $a['field_id'], $old );
+		return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $old );
 	}
 
 	/**
@@ -859,7 +859,7 @@ 
 
 		foreach ( $conditional_classes as $class => $condition ) {
 			if ( $condition ) {
-				$classes[] = $class;
+				$classes[ ] = $class;
 			}
 		}
 
@@ -870,7 +870,7 @@ 
 		}
 
 		if ( $added_classes ) {
-			$classes[] = esc_attr( $added_classes );
+			$classes[ ] = esc_attr( $added_classes );
 		}
 
 		/**
@@ -970,10 +970,10 @@ 
 	public function get_string( $text_key, $fallback ) {
 		// If null, populate with our field strings values.
 		if ( null === $this->strings ) {
-			$this->strings = (array) $this->args['text'];
+			$this->strings = (array) $this->args[ 'text' ];
 
-			if ( is_callable( $this->args['text_cb'] ) ) {
-				$strings = call_user_func( $this->args['text_cb'], $this );
+			if ( is_callable( $this->args[ 'text_cb' ] ) ) {
+				$strings = call_user_func( $this->args[ 'text_cb' ], $this );
 
 				if ( $strings && is_array( $strings ) ) {
 					$this->strings += $strings;
@@ -1007,10 +1007,10 @@ 
 			return $this->field_options;
 		}
 
-		$this->field_options = (array) $this->args['options'];
+		$this->field_options = (array) $this->args[ 'options' ];
 
-		if ( is_callable( $this->args['options_cb'] ) ) {
-			$options = call_user_func( $this->args['options_cb'], $this );
+		if ( is_callable( $this->args[ 'options_cb' ] ) ) {
+			$options = call_user_func( $this->args[ 'options_cb' ], $this );
 
 			if ( $options && is_array( $options ) ) {
 				$this->field_options = $options + $this->field_options;
@@ -1031,7 +1031,7 @@ 
 	 */
 	public function add_js_dependencies( $dependencies = array() ) {
 		foreach ( (array) $dependencies as $dependency ) {
-			$this->args['js_dependencies'][ $dependency ] = $dependency;
+			$this->args[ 'js_dependencies' ][ $dependency ] = $dependency;
 		}
 
 		CMB2_JS::add_dependencies( $dependencies );
@@ -1045,17 +1045,17 @@ 
 	 * @return mixed  Default field value
 	 */
 	public function get_default() {
-		if ( null !== $this->args['default'] ) {
-			return $this->args['default'];
+		if ( null !== $this->args[ 'default' ] ) {
+			return $this->args[ 'default' ];
 		}
 
-		$param = is_callable( $this->args['default_cb'] ) ? 'default_cb' : 'default';
+		$param = is_callable( $this->args[ 'default_cb' ] ) ? 'default_cb' : 'default';
 		$default = $this->get_param_callback_result( $param );
 
 		// Allow a filter override of the default value
-		$this->args['default'] = apply_filters( 'cmb2_default_filter', $default, $this );
+		$this->args[ 'default' ] = apply_filters( 'cmb2_default_filter', $default, $this );
 
-		return $this->args['default'];
+		return $this->args[ 'default' ];
 	}
 
 	/**
@@ -1085,18 +1085,18 @@ 
 			'classes_cb'        => '',
 			'select_all_button' => true,
 			'multiple'          => false,
-			'repeatable'        => isset( $args['type'] ) && 'group' == $args['type'],
+			'repeatable'        => isset( $args[ 'type' ] ) && 'group' == $args[ 'type' ],
 			'inline'            => false,
 			'on_front'          => true,
 			'show_names'        => true,
 			'save_field'        => true, // Will not save if false
 			'date_format'       => 'm\/d\/Y',
 			'time_format'       => 'h:i A',
-			'description'       => isset( $args['desc'] ) ? $args['desc'] : '',
-			'preview_size'      => 'file' == $args['type'] ? array( 350, 350 ) : array( 50, 50 ),
+			'description'       => isset( $args[ 'desc' ] ) ? $args[ 'desc' ] : '',
+			'preview_size'      => 'file' == $args[ 'type' ] ? array( 350, 350 ) : array( 50, 50 ),
 			'render_row_cb'     => array( $this, 'render_field_callback' ),
 			'display_cb'        => array( $this, 'display_value_callback' ),
-			'label_cb'          => 'title' != $args['type'] ? array( $this, 'label' ) : '',
+			'label_cb'          => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '',
 			'column'            => false,
 			'js_dependencies'   => array(),
 			'show_in_rest'      => null,
@@ -1111,44 +1111,44 @@ 
 		 */
 		$args = $this->convert_deprecated_params( $args );
 
-		$args['repeatable'] = $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
-		$args['inline']     = $args['inline'] || false !== stripos( $args['type'], '_inline' );
+		$args[ 'repeatable' ] = $args[ 'repeatable' ] && ! $this->repeatable_exception( $args[ 'type' ] );
+		$args[ 'inline' ]     = $args[ 'inline' ] || false !== stripos( $args[ 'type' ], '_inline' );
 
-		$args['options']    = 'group' == $args['type'] ? wp_parse_args( $args['options'], array(
+		$args[ 'options' ]    = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array(
 			'add_button'    => esc_html__( 'Add Group', 'cmb2' ),
 			'remove_button' => esc_html__( 'Remove Group', 'cmb2' ),
-		) ) : $args['options'];
+		) ) : $args[ 'options' ];
 
-		$args['_id']        = $args['id'];
-		$args['_name']      = $args['id'];
+		$args[ '_id' ]        = $args[ 'id' ];
+		$args[ '_name' ]      = $args[ 'id' ];
 
 		if ( $this->group ) {
 
-			$args['id']    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args['id'];
-			$args['_name'] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args['_name'] . ']';
+			$args[ 'id' ]    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args[ 'id' ];
+			$args[ '_name' ] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args[ '_name' ] . ']';
 		}
 
-		if ( 'wysiwyg' == $args['type'] ) {
-			$args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) );
-			$args['options']['textarea_name'] = $args['_name'];
+		if ( 'wysiwyg' == $args[ 'type' ] ) {
+			$args[ 'id' ] = strtolower( str_ireplace( '-', '_', $args[ 'id' ] ) );
+			$args[ 'options' ][ 'textarea_name' ] = $args[ '_name' ];
 		}
 
 		$option_types = apply_filters( 'cmb2_all_or_nothing_types', array( 'select', 'radio', 'radio_inline', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_radio_inline' ), $this );
 
-		if ( in_array( $args['type'], $option_types, true ) ) {
+		if ( in_array( $args[ 'type' ], $option_types, true ) ) {
 
-			$args['show_option_none'] = isset( $args['show_option_none'] ) ? $args['show_option_none'] : null;
-			$args['show_option_none'] = true === $args['show_option_none'] ? esc_html__( 'None', 'cmb2' ) : $args['show_option_none'];
+			$args[ 'show_option_none' ] = isset( $args[ 'show_option_none' ] ) ? $args[ 'show_option_none' ] : null;
+			$args[ 'show_option_none' ] = true === $args[ 'show_option_none' ] ? esc_html__( 'None', 'cmb2' ) : $args[ 'show_option_none' ];
 
-			if ( null === $args['show_option_none'] ) {
-				$off_by_default = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true );
-				$args['show_option_none'] = $off_by_default ? false : esc_html__( 'None', 'cmb2' );
+			if ( null === $args[ 'show_option_none' ] ) {
+				$off_by_default = in_array( $args[ 'type' ], array( 'select', 'radio', 'radio_inline' ), true );
+				$args[ 'show_option_none' ] = $off_by_default ? false : esc_html__( 'None', 'cmb2' );
 			}
 
 		}
 
-		$args['has_supporting_data'] = in_array(
-			$args['type'],
+		$args[ 'has_supporting_data' ] = in_array(
+			$args[ 'type' ],
 			array(
 				// CMB2_Sanitize::_save_file_id_value()/CMB2_Sanitize::_get_group_file_value_array()
 				'file',
@@ -1171,10 +1171,10 @@ 
 	protected function get_default_args( $field_args, $field_group = null ) {
 		$args = parent::get_default_args( array(), $this->group );
 
-		if ( isset( $field_args['field_args'] ) ) {
+		if ( isset( $field_args[ 'field_args' ] ) ) {
 			$args = wp_parse_args( $field_args, $args );
 		} else {
-			$args['field_args'] = wp_parse_args( $field_args, $this->args );
+			$args[ 'field_args' ] = wp_parse_args( $field_args, $this->args );
 		}
 
 		return $args;
@@ -1217,43 +1217,43 @@ 
 	 */
 	protected function convert_deprecated_params( $args ) {
 
-		if ( isset( $args['row_classes'] ) ) {
+		if ( isset( $args[ 'row_classes' ] ) ) {
 
 			// We'll let this one be.
 			// $this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_PARAM, 'row_classes', 'classes' );
 
 			// row_classes param could be a callback. This is definitely deprecated.
-			if ( is_callable( $args['row_classes'] ) ) {
+			if ( is_callable( $args[ 'row_classes' ] ) ) {
 
 				$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'row_classes', 'classes_cb' );
 
-				$args['classes_cb'] = $args['row_classes'];
-				$args['classes'] = null;
+				$args[ 'classes_cb' ] = $args[ 'row_classes' ];
+				$args[ 'classes' ] = null;
 			} else {
 
-				$args['classes'] = $args['row_classes'];
+				$args[ 'classes' ] = $args[ 'row_classes' ];
 			}
 
-			unset( $args['row_classes'] );
+			unset( $args[ 'row_classes' ] );
 		}
 
 
 		// default param can be passed a callback as well
-		if ( is_callable( $args['default'] ) ) {
+		if ( is_callable( $args[ 'default' ] ) ) {
 
 			$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'default', 'default_cb' );
 
-			$args['default_cb'] = $args['default'];
-			$args['default'] = null;
+			$args[ 'default_cb' ] = $args[ 'default' ];
+			$args[ 'default' ] = null;
 		}
 
 		// options param can be passed a callback as well
-		if ( is_callable( $args['options'] ) ) {
+		if ( is_callable( $args[ 'options' ] ) ) {
 
 			$this->deprecated_param( __CLASS__ . '::__construct()', '2.2.3', self::DEPRECATED_CB_PARAM, 'options', 'options_cb' );
 
-			$args['options_cb'] = $args['options'];
-			$args['options'] = array();
+			$args[ 'options_cb' ] = $args[ 'options' ];
+			$args[ 'options' ] = array();
 		}
 
 		return $args;

vendor/cmb2/includes/CMB2_Sanitize.php

Doc Comments +3 added lines

@@ -366,6 +366,7 @@ 
 	/**
 	 * Gets the values for the `file` field type from the data being saved.
 	 * @since  2.2.0
+	 * @param string $id_key
 	 */
 	public function _get_group_file_value_array( $id_key ) {
 		$alldata = $this->field->group->data_to_save;
@@ -387,6 +388,7 @@ 
 	/**
 	 * Peforms saving of `file` attachement's ID
 	 * @since  1.1.0
+	 * @param string $file_id_key
 	 */
 	public function _save_file_id_value( $file_id_key ) {
 		$id_field = $this->_new_supporting_field( $file_id_key );
@@ -407,6 +409,7 @@ 
 	/**
 	 * Peforms saving of `text_datetime_timestamp_timezone` utc timestamp
 	 * @since  2.2.0
+	 * @param string $utc_key
 	 */
 	public function _save_utc_value( $utc_key, $utc_stamp ) {
 		return $this->_new_supporting_field( $utc_key )->save_field( $utc_stamp );

Spacing +8 added lines, -8 removed lines

@@ -179,7 +179,7 @@ 
 
 		global $wp_locale;
 
-		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
+		$search = array( $wp_locale->number_format[ 'thousands_sep' ], $wp_locale->number_format[ 'decimal_point' ] );
 		$replace = array( '', '.' );
 
 		// for repeatable
@@ -224,8 +224,8 @@ 
 			return $repeat_value;
 		}
 
-		if ( isset( $this->value['date'], $this->value['time'] ) ) {
-			$this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] );
+		if ( isset( $this->value[ 'date' ], $this->value[ 'time' ] ) ) {
+			$this->value = $this->field->get_timestamp_from_value( $this->value[ 'date' ] . ' ' . $this->value[ 'time' ] );
 		}
 
 		if ( $tz_offset = $this->field->field_timezone_offset() ) {
@@ -263,7 +263,7 @@ 
 		$tzstring = null;
 
 		if ( is_array( $this->value ) && array_key_exists( 'timezone', $this->value ) ) {
-			$tzstring = $this->value['timezone'];
+			$tzstring = $this->value[ 'timezone' ];
 		}
 
 		if ( empty( $tzstring ) ) {
@@ -283,8 +283,8 @@ 
 			$tzstring = false !== $tzstring ? $tzstring : timezone_name_from_abbr( '', 0, 0 );
 		}
 
-		$full_format = $this->field->args['date_format'] . ' ' . $this->field->args['time_format'];
-		$full_date   = $this->value['date'] . ' ' . $this->value['time'];
+		$full_format = $this->field->args[ 'date_format' ] . ' ' . $this->field->args[ 'time_format' ];
+		$full_date   = $this->value[ 'date' ] . ' ' . $this->value[ 'time' ];
 
 		try {
 
@@ -307,7 +307,7 @@ 
 			} else {
 				// Save the utc timestamp supporting field
 				if ( $repeat ) {
-					$utc_values[ $utc_key ][] = $utc_stamp;
+					$utc_values[ $utc_key ][ ] = $utc_stamp;
 				} else {
 					$this->_save_utc_value( $utc_key, $utc_stamp );
 				}
@@ -442,7 +442,7 @@ 
 			if ( $this->value ) {
 				$val = $this->$method( true );
 				if ( ! empty( $val ) ) {
-					$new_value[] = $val;
+					$new_value[ ] = $val;
 				}
 			}
 		}

vendor/cmb2/includes/rest-api/CMB2_REST.php

Doc Comments +2 added lines, -1 removed lines

@@ -202,6 +202,7 @@ 
 	 * @param string|array $object_types Object(s) the field is being registered
 	 *                                   to, "post"|"term"|"comment" etc.
 	 * @param string $object_types       Canonical object type for callbacks.
+	 * @param string $object_type
 	 *
 	 * @return void
 	 */
@@ -701,7 +702,7 @@ 
 	 * Retrieve all CMB2_REST instances from the registry.
 	 *
 	 * @since  2.2.3
-	 * @return CMB2[] Array of all registered CMB2_REST instances.
+	 * @return CMB2_REST[] Array of all registered CMB2_REST instances.
 	 */
 	public static function get_all() {
 		return self::$boxes;

Spacing +21 added lines, -21 removed lines

@@ -148,30 +148,30 @@ 
 		foreach ( self::$boxes as $cmb_id => $rest_box ) {
 			$types = array_flip( $rest_box->cmb->box_types() );
 
-			if ( isset( $types['user'] ) ) {
-				unset( $types['user'] );
-				self::$type_boxes['user'][ $cmb_id ] = $cmb_id;
+			if ( isset( $types[ 'user' ] ) ) {
+				unset( $types[ 'user' ] );
+				self::$type_boxes[ 'user' ][ $cmb_id ] = $cmb_id;
 			}
 
-			if ( isset( $types['comment'] ) ) {
-				unset( $types['comment'] );
-				self::$type_boxes['comment'][ $cmb_id ] = $cmb_id;
+			if ( isset( $types[ 'comment' ] ) ) {
+				unset( $types[ 'comment' ] );
+				self::$type_boxes[ 'comment' ][ $cmb_id ] = $cmb_id;
 			}
 
-			if ( isset( $types['term'] ) ) {
-				unset( $types['term'] );
+			if ( isset( $types[ 'term' ] ) ) {
+				unset( $types[ 'term' ] );
 
 				$taxonomies = array_merge(
 					$taxonomies,
 					CMB2_Utils::ensure_array( $rest_box->cmb->prop( 'taxonomies' ) )
 				);
 
-				self::$type_boxes['term'][ $cmb_id ] = $cmb_id;
+				self::$type_boxes[ 'term' ][ $cmb_id ] = $cmb_id;
 			}
 
 			if ( ! empty( $types ) ) {
 				$alltypes = array_merge( $alltypes, array_flip( $types ) );
-				self::$type_boxes['post'][ $cmb_id ] = $cmb_id;
+				self::$type_boxes[ 'post' ][ $cmb_id ] = $cmb_id;
 			}
 		}
 
@@ -181,15 +181,15 @@ 
 			self::register_rest_field( $alltypes, 'post' );
 		}
 
-		if ( ! empty( self::$type_boxes['user'] ) ) {
+		if ( ! empty( self::$type_boxes[ 'user' ] ) ) {
 			self::register_rest_field( 'user', 'user' );
 		}
 
-		if ( ! empty( self::$type_boxes['comment'] ) ) {
+		if ( ! empty( self::$type_boxes[ 'comment' ] ) ) {
 			self::register_rest_field( 'comment', 'comment' );
 		}
 
-		if ( ! empty( self::$type_boxes['term'] ) ) {
+		if ( ! empty( self::$type_boxes[ 'term' ] ) ) {
 			self::register_rest_field( $taxonomies, 'term' );
 		}
 	}
@@ -222,18 +222,18 @@ 
 	 */
 	protected function declare_read_edit_fields() {
 		foreach ( $this->cmb->prop( 'fields' ) as $field ) {
-			$show_in_rest = isset( $field['show_in_rest'] ) ? $field['show_in_rest'] : null;
+			$show_in_rest = isset( $field[ 'show_in_rest' ] ) ? $field[ 'show_in_rest' ] : null;
 
 			if ( false === $show_in_rest ) {
 				continue;
 			}
 
 			if ( $this->can_read( $show_in_rest ) ) {
-				$this->read_fields[] = $field['id'];
+				$this->read_fields[ ] = $field[ 'id' ];
 			}
 
 			if ( $this->can_edit( $show_in_rest ) ) {
-				$this->edit_fields[] = $field['id'];
+				$this->edit_fields[ ] = $field[ 'id' ];
 			}
 
 		}
@@ -364,7 +364,7 @@ 
 	 * @return mixed
 	 */
 	protected static function get_rest_values( $object, $request, $object_type, $main_object_type = 'post' ) {
-		if ( ! isset( $object['id'] ) ) {
+		if ( ! isset( $object[ 'id' ] ) ) {
 			return;
 		}
 
@@ -375,12 +375,12 @@ 
 				$rest_box = self::$boxes[ $cmb_id ];
 
 				foreach ( $rest_box->read_fields as $field_id ) {
-					$rest_box->cmb->object_id( $object['id'] );
+					$rest_box->cmb->object_id( $object[ 'id' ] );
 					$rest_box->cmb->object_type( $main_object_type );
 
 					$field = $rest_box->cmb->get_field( $field_id );
 
-					$field->object_id( $object['id'] );
+					$field->object_id( $object[ 'id' ] );
 					$field->object_type( $main_object_type );
 
 					$values[ $cmb_id ][ $field->id( true ) ] = $field->get_data();
@@ -614,8 +614,8 @@ 
 					return intval( $object->comment_ID );
 				}
 			case 'term':
-				if ( is_array( $object ) && isset( $object['term_id'] ) ) {
-					return intval( $object['term_id'] );
+				if ( is_array( $object ) && isset( $object[ 'term_id' ] ) ) {
+					return intval( $object[ 'term_id' ] );
 				} elseif ( isset( $object->term_id ) ) {
 					return intval( $object->term_id );
 				}

vendor/cmb2/includes/rest-api/CMB2_REST_Controller.php

Doc Comments +1 added lines, -2 removed lines

@@ -198,7 +198,7 @@ 
 	 * @since  2.2.3
 	 *
 	 * @param  mixed $cb Callable function/method.
-	 * @return mixed     Results of output buffer after calling function/method.
+	 * @return string     Results of output buffer after calling function/method.
 	 */
 	public function get_cb_results( $cb ) {
 		$args = func_get_args();
@@ -214,7 +214,6 @@ 
 	 *
 	 * @since 2.2.3
 	 *
-	 * @param  mixed            $item     WordPress representation of the item.
 	 * @param  WP_REST_Request  $request  Request object.
 	 * @return WP_REST_Response $response
 	 */

Spacing +7 added lines, -7 removed lines

@@ -219,7 +219,7 @@ 
 	 * @return WP_REST_Response $response
 	 */
 	public function prepare_item_for_response( $data, $request = null ) {
-		$data = $this->filter_response_by_context( $data, $this->request['context'] );
+		$data = $this->filter_response_by_context( $data, $this->request[ 'context' ] );
 
 		/**
 		 * Filter the prepared CMB2 item response.
@@ -290,12 +290,12 @@ 
 
 		} else {
 
-			if ( isset( $this->request['object_id'] ) ) {
-				$this->rest_box->cmb->object_id( sanitize_text_field( $this->request['object_id'] ) );
+			if ( isset( $this->request[ 'object_id' ] ) ) {
+				$this->rest_box->cmb->object_id( sanitize_text_field( $this->request[ 'object_id' ] ) );
 			}
 
-			if ( isset( $this->request['object_type'] ) ) {
-				$this->rest_box->cmb->object_type( sanitize_text_field( $this->request['object_type'] ) );
+			if ( isset( $this->request[ 'object_type' ] ) ) {
+				$this->rest_box->cmb->object_type( sanitize_text_field( $this->request[ 'object_type' ] ) );
 			}
 		}
 	}
@@ -313,8 +313,8 @@ 
 	public function initiate_request( $request, $request_type ) {
 		$this->request = $request;
 
-		if ( ! isset( $this->request['context'] ) || empty( $this->request['context'] ) ) {
-			$this->request['context'] = 'view';
+		if ( ! isset( $this->request[ 'context' ] ) || empty( $this->request[ 'context' ] ) ) {
+			$this->request[ 'context' ] = 'view';
 		}
 
 		if ( ! self::$request_type ) {

vendor/cmb2/includes/types/CMB2_Type_Base.php

Doc Comments +1 added lines, -2 removed lines

@@ -107,7 +107,6 @@ 
 
 	/**
 	 * Fall back to CMB2_Types methods
-	 * @param string $field
 	 * @throws Exception Throws an exception if the field is invalid.
 	 * @return mixed
 	 */
@@ -128,7 +127,7 @@ 
 	 * Magic getter for our object.
 	 * @param string $field
 	 * @throws Exception Throws an exception if the field is invalid.
-	 * @return mixed
+	 * @return CMB2_Field
 	 */
 	public function __get( $field ) {
 		switch ( $field ) {

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	public function __construct( CMB2_Types $types, $args = array() ) {
 		$this->types = $types;
-		$args['rendered'] = isset( $args['rendered'] ) ? (bool) $args['rendered'] : true;
+		$args[ 'rendered' ] = isset( $args[ 'rendered' ] ) ? (bool) $args[ 'rendered' ] : true;
 		$this->args = $args;
 	}
 
@@ -56,7 +56,7 @@ 
 	 * @return string|CMB2_Type_Base           Rendered output or this object.
 	 */
 	public function rendered( $rendered ) {
-		if ( $this->args['rendered'] ) {
+		if ( $this->args[ 'rendered' ] ) {
 			return is_a( $rendered, __CLASS__ ) ? $rendered->rendered : $rendered;
 		}
 

vendor/cmb2/includes/types/CMB2_Type_Text_Datetime_Timestamp.php

Doc Comments +6 added lines

@@ -39,6 +39,9 @@ 
 		return $this->rendered( $date_input . "\n" . $time_input );
 	}
 
+	/**
+	 * @param boolean $has_good_value
+	 */
 	public function date_args( $args, $has_good_value ) {
 		$date_args = wp_parse_args( $args['datepicker'], array(
 			'class' => 'cmb2-text-small cmb2-datepicker',
@@ -54,6 +57,9 @@ 
 		return $this->parse_picker_options( 'date', $date_args );
 	}
 
+	/**
+	 * @param boolean $has_good_value
+	 */
 	public function time_args( $args, $has_good_value ) {
 		$time_args = wp_parse_args( $args['timepicker'], array(
 			'class' => 'cmb2-timepicker text-time',

Spacing +11 added lines, -11 removed lines

@@ -22,16 +22,16 @@ 
 			'timepicker' => array(),
 		) );
 
-		if ( empty( $args['value'] ) ) {
-			$args['value'] = $field->escaped_value();
+		if ( empty( $args[ 'value' ] ) ) {
+			$args[ 'value' ] = $field->escaped_value();
 			// This will be used if there is a select_timezone set for this field
 			$tz_offset = $field->field_timezone_offset();
 			if ( ! empty( $tz_offset ) ) {
-				$args['value'] -= $tz_offset;
+				$args[ 'value' ] -= $tz_offset;
 			}
 		}
 
-		$has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] );
+		$has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] );
 
 		$date_input = parent::render( $this->date_args( $args, $has_good_value ) );
 		$time_input = parent::render( $this->time_args( $args, $has_good_value ) );
@@ -40,31 +40,31 @@ 
 	}
 
 	public function date_args( $args, $has_good_value ) {
-		$date_args = wp_parse_args( $args['datepicker'], array(
+		$date_args = wp_parse_args( $args[ 'datepicker' ], array(
 			'class' => 'cmb2-text-small cmb2-datepicker',
 			'name'  => $this->_name( '[date]' ),
 			'id'    => $this->_id( '_date' ),
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '',
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '',
 			'desc'  => '',
 		) );
 
-		$date_args['rendered'] = true;
+		$date_args[ 'rendered' ] = true;
 
 		// Let's get the date-format, and set it up as a data attr for the field.
 		return $this->parse_picker_options( 'date', $date_args );
 	}
 
 	public function time_args( $args, $has_good_value ) {
-		$time_args = wp_parse_args( $args['timepicker'], array(
+		$time_args = wp_parse_args( $args[ 'timepicker' ], array(
 			'class' => 'cmb2-timepicker text-time',
 			'name'  => $this->_name( '[time]' ),
 			'id'    => $this->_id( '_time' ),
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '',
-			'desc'  => $args['desc'],
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '',
+			'desc'  => $args[ 'desc' ],
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
 		) );
 
-		$time_args['rendered'] = true;
+		$time_args[ 'rendered' ] = true;
 
 		// Let's get the time-format, and set it up as a data attr for the field.
 		return $this->parse_picker_options( 'time', $time_args );

vendor/cmb2/includes/types/CMB2_Type_Textarea_Code.php

Doc Comments -1 removed lines

@@ -15,7 +15,6 @@
 	/**
 	 * Handles outputting an 'textarea' element
 	 * @since  1.1.0
-	 * @param  array  $args Override arguments
 	 * @return string       Form textarea element
 	 */
 	public function render() {

vendor/composer/ClassLoader.php

Doc Comments +4 added lines

@@ -367,6 +367,10 @@
         return $file;
     }
 
+    /**
+     * @param string $class
+     * @param string $ext
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup

Indentation +387 added lines, -387 removed lines

@@ -42,392 +42,392 @@ 
  */
 class ClassLoader
 {
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-    private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    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 array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    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 array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    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 array|string $paths  The PSR-0 base directories
-     */
-    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 array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    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
-     */
-    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
-     */
-    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
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $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
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * 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;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
-                            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;
-    }
+	 // PSR-4
+	 private $prefixLengthsPsr4 = array();
+	 private $prefixDirsPsr4 = array();
+	 private $fallbackDirsPsr4 = array();
+
+	 // PSR-0
+	 private $prefixesPsr0 = array();
+	 private $fallbackDirsPsr0 = array();
+
+	 private $useIncludePath = false;
+	 private $classMap = array();
+	 private $classMapAuthoritative = false;
+	 private $missingClasses = array();
+	 private $apcuPrefix;
+
+	 public function getPrefixes()
+	 {
+		  if (!empty($this->prefixesPsr0)) {
+				return call_user_func_array('array_merge', $this->prefixesPsr0);
+		  }
+
+		  return array();
+	 }
+
+	 public function getPrefixesPsr4()
+	 {
+		  return $this->prefixDirsPsr4;
+	 }
+
+	 public function getFallbackDirs()
+	 {
+		  return $this->fallbackDirsPsr0;
+	 }
+
+	 public function getFallbackDirsPsr4()
+	 {
+		  return $this->fallbackDirsPsr4;
+	 }
+
+	 public function getClassMap()
+	 {
+		  return $this->classMap;
+	 }
+
+	 /**
+	  * @param array $classMap Class to filename map
+	  */
+	 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 array|string $paths   The PSR-0 root directories
+	  * @param bool         $prepend Whether to prepend the directories
+	  */
+	 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 array|string $paths   The PSR-4 base directories
+	  * @param bool         $prepend Whether to prepend the directories
+	  *
+	  * @throws \InvalidArgumentException
+	  */
+	 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 array|string $paths  The PSR-0 base directories
+	  */
+	 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 array|string $paths  The PSR-4 base directories
+	  *
+	  * @throws \InvalidArgumentException
+	  */
+	 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
+	  */
+	 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
+	  */
+	 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
+	  */
+	 public function setApcuPrefix($apcuPrefix)
+	 {
+		  $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $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
+	  */
+	 public function register($prepend = false)
+	 {
+		  spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+	 }
+
+	 /**
+	  * Unregisters this instance as an autoloader.
+	  */
+	 public function unregister()
+	 {
+		  spl_autoload_unregister(array($this, 'loadClass'));
+	 }
+
+	 /**
+	  * Loads the given class or interface.
+	  *
+	  * @param  string    $class The name of the class
+	  * @return bool|null True if loaded, null otherwise
+	  */
+	 public function loadClass($class)
+	 {
+		  if ($file = $this->findFile($class)) {
+				includeFile($file);
+
+				return true;
+		  }
+	 }
+
+	 /**
+	  * 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;
+	 }
+
+	 private function findFileWithExtension($class, $ext)
+	 {
+		  // PSR-4 lookup
+		  $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+		  $first = $class[0];
+		  if (isset($this->prefixLengthsPsr4[$first])) {
+				foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+					 if (0 === strpos($class, $prefix)) {
+						  foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+								if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+									 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;
+	 }
 }
 
 /**
@@ -437,5 +437,5 @@ 
  */
 function includeFile($file)
 {
-    include $file;
+	 include $file;
 }

Spacing +88 added lines, -88 removed lines

@@ -59,8 +59,8 @@ 
 
     public function getPrefixes()
     {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        if ( ! empty( $this->prefixesPsr0 ) ) {
+            return call_user_func_array( 'array_merge', $this->prefixesPsr0 );
         }
 
         return array();
@@ -89,10 +89,10 @@ 
     /**
      * @param array $classMap Class to filename map
      */
-    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;
         }
@@ -106,10 +106,10 @@ 
      * @param array|string $paths   The PSR-0 root directories
      * @param bool         $prepend Whether to prepend the directories
      */
-    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,
                     $this->fallbackDirsPsr0
@@ -124,20 +124,20 @@ 
             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(
+        if ( $prepend ) {
+            $this->prefixesPsr0[ $first ][ $prefix ] = array_merge(
                 (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
+                $this->prefixesPsr0[ $first ][ $prefix ]
             );
         } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
+            $this->prefixesPsr0[ $first ][ $prefix ] = array_merge(
+                $this->prefixesPsr0[ $first ][ $prefix ],
                 (array) $paths
             );
         }
@@ -153,11 +153,11 @@ 
      *
      * @throws \InvalidArgumentException
      */
-    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,
                     $this->fallbackDirsPsr4
@@ -168,24 +168,24 @@ 
                     (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(
+            $this->prefixDirsPsr4[ $prefix ] = array_merge(
                 (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
+                $this->prefixDirsPsr4[ $prefix ]
             );
         } else {
             // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
+            $this->prefixDirsPsr4[ $prefix ] = array_merge(
+                $this->prefixDirsPsr4[ $prefix ],
                 (array) $paths
             );
         }
@@ -198,12 +198,12 @@ 
      * @param string       $prefix The prefix
      * @param array|string $paths  The PSR-0 base directories
      */
-    public function set($prefix, $paths)
+    public function set( $prefix, $paths )
     {
-        if (!$prefix) {
+        if ( ! $prefix ) {
             $this->fallbackDirsPsr0 = (array) $paths;
         } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+            $this->prefixesPsr0[ $prefix[ 0 ] ][ $prefix ] = (array) $paths;
         }
     }
 
@@ -216,17 +216,17 @@ 
      *
      * @throws \InvalidArgumentException
      */
-    public function setPsr4($prefix, $paths)
+    public function setPsr4( $prefix, $paths )
     {
-        if (!$prefix) {
+        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;
         }
     }
 
@@ -235,7 +235,7 @@ 
      *
      * @param bool $useIncludePath
      */
-    public function setUseIncludePath($useIncludePath)
+    public function setUseIncludePath( $useIncludePath )
     {
         $this->useIncludePath = $useIncludePath;
     }
@@ -257,7 +257,7 @@ 
      *
      * @param bool $classMapAuthoritative
      */
-    public function setClassMapAuthoritative($classMapAuthoritative)
+    public function setClassMapAuthoritative( $classMapAuthoritative )
     {
         $this->classMapAuthoritative = $classMapAuthoritative;
     }
@@ -277,9 +277,9 @@ 
      *
      * @param string|null $apcuPrefix
      */
-    public function setApcuPrefix($apcuPrefix)
+    public function setApcuPrefix( $apcuPrefix )
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists( 'apcu_fetch' ) && ini_get( 'apc.enabled' ) ? $apcuPrefix : null;
     }
 
     /**
@@ -297,9 +297,9 @@ 
      *
      * @param bool $prepend Whether to prepend the autoloader or not
      */
-    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 );
     }
 
     /**
@@ -307,7 +307,7 @@ 
      */
     public function unregister()
     {
-        spl_autoload_unregister(array($this, 'loadClass'));
+        spl_autoload_unregister( array( $this, 'loadClass' ) );
     }
 
     /**
@@ -316,10 +316,10 @@ 
      * @param  string    $class The name of the class
      * @return bool|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;
         }
@@ -332,52 +332,52 @@ 
      *
      * @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;
     }
 
-    private function findFileWithExtension($class, $ext)
+    private function findFileWithExtension( $class, $ext )
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+        $logicalPathPsr4 = strtr( $class, '\\', DIRECTORY_SEPARATOR ) . $ext;
+
+        $first = $class[ 0 ];
+        if ( isset( $this->prefixLengthsPsr4[ $first ] ) ) {
+            foreach ( $this->prefixLengthsPsr4[ $first ] as $prefix => $length ) {
+                if ( 0 === strpos( $class, $prefix ) ) {
+                    foreach ( $this->prefixDirsPsr4[ $prefix ] as $dir ) {
+                        if ( file_exists( $file = $dir . DIRECTORY_SEPARATOR . substr( $logicalPathPsr4, $length ) ) ) {
                             return $file;
                         }
                     }
@@ -386,27 +386,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;
                         }
                     }
@@ -415,14 +415,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;
         }
 
@@ -435,7 +435,7 @@ 
  *
  * Prevents access to $this/self from included files.
  */
-function includeFile($file)
+function includeFile( $file )
 {
     include $file;
 }

Braces +23 added lines, -46 removed lines

@@ -40,8 +40,7 @@ 
  * @see    http://www.php-fig.org/psr/psr-0/
  * @see    http://www.php-fig.org/psr/psr-4/
  */
-class ClassLoader
-{
+class ClassLoader {
     // PSR-4
     private $prefixLengthsPsr4 = array();
     private $prefixDirsPsr4 = array();
@@ -57,8 +56,7 @@ 
     private $missingClasses = array();
     private $apcuPrefix;
 
-    public function getPrefixes()
-    {
+    public function getPrefixes() {
         if (!empty($this->prefixesPsr0)) {
             return call_user_func_array('array_merge', $this->prefixesPsr0);
         }
@@ -66,31 +64,26 @@ 
         return array();
     }
 
-    public function getPrefixesPsr4()
-    {
+    public function getPrefixesPsr4() {
         return $this->prefixDirsPsr4;
     }
 
-    public function getFallbackDirs()
-    {
+    public function getFallbackDirs() {
         return $this->fallbackDirsPsr0;
     }
 
-    public function getFallbackDirsPsr4()
-    {
+    public function getFallbackDirsPsr4() {
         return $this->fallbackDirsPsr4;
     }
 
-    public function getClassMap()
-    {
+    public function getClassMap() {
         return $this->classMap;
     }
 
     /**
      * @param array $classMap Class to filename map
      */
-    public function addClassMap(array $classMap)
-    {
+    public function addClassMap(array $classMap) {
         if ($this->classMap) {
             $this->classMap = array_merge($this->classMap, $classMap);
         } else {
@@ -106,8 +99,7 @@ 
      * @param array|string $paths   The PSR-0 root directories
      * @param bool         $prepend Whether to prepend the directories
      */
-    public function add($prefix, $paths, $prepend = false)
-    {
+    public function add($prefix, $paths, $prepend = false) {
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
@@ -153,8 +145,7 @@ 
      *
      * @throws \InvalidArgumentException
      */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
+    public function addPsr4($prefix, $paths, $prepend = false) {
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
@@ -198,8 +189,7 @@ 
      * @param string       $prefix The prefix
      * @param array|string $paths  The PSR-0 base directories
      */
-    public function set($prefix, $paths)
-    {
+    public function set($prefix, $paths) {
         if (!$prefix) {
             $this->fallbackDirsPsr0 = (array) $paths;
         } else {
@@ -216,8 +206,7 @@ 
      *
      * @throws \InvalidArgumentException
      */
-    public function setPsr4($prefix, $paths)
-    {
+    public function setPsr4($prefix, $paths) {
         if (!$prefix) {
             $this->fallbackDirsPsr4 = (array) $paths;
         } else {
@@ -235,8 +224,7 @@ 
      *
      * @param bool $useIncludePath
      */
-    public function setUseIncludePath($useIncludePath)
-    {
+    public function setUseIncludePath($useIncludePath) {
         $this->useIncludePath = $useIncludePath;
     }
 
@@ -246,8 +234,7 @@ 
      *
      * @return bool
      */
-    public function getUseIncludePath()
-    {
+    public function getUseIncludePath() {
         return $this->useIncludePath;
     }
 
@@ -257,8 +244,7 @@ 
      *
      * @param bool $classMapAuthoritative
      */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
+    public function setClassMapAuthoritative($classMapAuthoritative) {
         $this->classMapAuthoritative = $classMapAuthoritative;
     }
 
@@ -267,8 +253,7 @@ 
      *
      * @return bool
      */
-    public function isClassMapAuthoritative()
-    {
+    public function isClassMapAuthoritative() {
         return $this->classMapAuthoritative;
     }
 
@@ -277,8 +262,7 @@ 
      *
      * @param string|null $apcuPrefix
      */
-    public function setApcuPrefix($apcuPrefix)
-    {
+    public function setApcuPrefix($apcuPrefix) {
         $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
     }
 
@@ -287,8 +271,7 @@ 
      *
      * @return string|null
      */
-    public function getApcuPrefix()
-    {
+    public function getApcuPrefix() {
         return $this->apcuPrefix;
     }
 
@@ -297,16 +280,14 @@ 
      *
      * @param bool $prepend Whether to prepend the autoloader or not
      */
-    public function register($prepend = false)
-    {
+    public function register($prepend = false) {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
     }
 
     /**
      * Unregisters this instance as an autoloader.
      */
-    public function unregister()
-    {
+    public function unregister() {
         spl_autoload_unregister(array($this, 'loadClass'));
     }
 
@@ -316,8 +297,7 @@ 
      * @param  string    $class The name of the class
      * @return bool|null True if loaded, null otherwise
      */
-    public function loadClass($class)
-    {
+    public function loadClass($class) {
         if ($file = $this->findFile($class)) {
             includeFile($file);
 
@@ -332,8 +312,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];
@@ -367,8 +346,7 @@ 
         return $file;
     }
 
-    private function findFileWithExtension($class, $ext)
-    {
+    private function findFileWithExtension($class, $ext) {
         // PSR-4 lookup
         $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
 
@@ -435,7 +413,6 @@ 
  *
  * Prevents access to $this/self from included files.
  */
-function includeFile($file)
-{
+function includeFile($file) {
     include $file;
 }