ntwb / wordpress

src/wp-includes/class-wp-customize-nav-menus.php

Doc Comments +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 	 * @since 4.3.0
 	 * @access public
 	 *
-	 * @param object $manager An instance of the WP_Customize_Manager class.
+	 * @param WP_Customize_Manager $manager An instance of the WP_Customize_Manager class.
 	 */
 	public function __construct( $manager ) {
 		$this->previewed_menus = array();
@@ -876,7 +876,7 @@ 
 	 *
 	 * @param string $nav_menu_content The HTML content for the navigation menu.
 	 * @param object $args             An object containing wp_nav_menu() arguments.
-	 * @return null
+	 * @return string
 	 */
 	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
 		if ( ! empty( $args->can_partial_refresh ) && ! empty( $args->instance_number ) ) {

Spacing +272 added lines, -272 removed lines

@@ -44,31 +44,31 @@ 
 	 *
 	 * @param object $manager An instance of the WP_Customize_Manager class.
 	 */
-	public function __construct( $manager ) {
+	public function __construct($manager) {
 		$this->previewed_menus = array();
 		$this->manager         = $manager;
 
 		// Skip useless hooks when the user can't manage nav menus anyway.
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			return;
 		}
 
-		add_filter( 'customize_refresh_nonces', array( $this, 'filter_nonces' ) );
-		add_action( 'wp_ajax_load-available-menu-items-customizer', array( $this, 'ajax_load_available_items' ) );
-		add_action( 'wp_ajax_search-available-menu-items-customizer', array( $this, 'ajax_search_available_items' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_filter('customize_refresh_nonces', array($this, 'filter_nonces'));
+		add_action('wp_ajax_load-available-menu-items-customizer', array($this, 'ajax_load_available_items'));
+		add_action('wp_ajax_search-available-menu-items-customizer', array($this, 'ajax_search_available_items'));
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_scripts'));
 
 		// Needs to run after core Navigation section is set up.
-		add_action( 'customize_register', array( $this, 'customize_register' ), 11 );
+		add_action('customize_register', array($this, 'customize_register'), 11);
 
-		add_filter( 'customize_dynamic_setting_args', array( $this, 'filter_dynamic_setting_args' ), 10, 2 );
-		add_filter( 'customize_dynamic_setting_class', array( $this, 'filter_dynamic_setting_class' ), 10, 3 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'print_templates' ) );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'available_items_template' ) );
-		add_action( 'customize_preview_init', array( $this, 'customize_preview_init' ) );
+		add_filter('customize_dynamic_setting_args', array($this, 'filter_dynamic_setting_args'), 10, 2);
+		add_filter('customize_dynamic_setting_class', array($this, 'filter_dynamic_setting_class'), 10, 3);
+		add_action('customize_controls_print_footer_scripts', array($this, 'print_templates'));
+		add_action('customize_controls_print_footer_scripts', array($this, 'available_items_template'));
+		add_action('customize_preview_init', array($this, 'customize_preview_init'));
 
 		// Selective Refresh partials.
-		add_filter( 'customize_dynamic_partial_args', array( $this, 'customize_dynamic_partial_args' ), 10, 2 );
+		add_filter('customize_dynamic_partial_args', array($this, 'customize_dynamic_partial_args'), 10, 2);
 	}
 
 	/**
@@ -80,8 +80,8 @@ 
 	 * @param array $nonces Array of nonces.
 	 * @return array $nonces Modified array of nonces.
 	 */
-	public function filter_nonces( $nonces ) {
-		$nonces['customize-menus'] = wp_create_nonce( 'customize-menus' );
+	public function filter_nonces($nonces) {
+		$nonces['customize-menus'] = wp_create_nonce('customize-menus');
 		return $nonces;
 	}
 
@@ -92,25 +92,25 @@ 
 	 * @access public
 	 */
 	public function ajax_load_available_items() {
-		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
+		check_ajax_referer('customize-menus', 'customize-menus-nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['type'] ) || empty( $_POST['object'] ) ) {
-			wp_send_json_error( 'nav_menus_missing_type_or_object_parameter' );
+		if (empty($_POST['type']) || empty($_POST['object'])) {
+			wp_send_json_error('nav_menus_missing_type_or_object_parameter');
 		}
 
-		$type = sanitize_key( $_POST['type'] );
-		$object = sanitize_key( $_POST['object'] );
-		$page = empty( $_POST['page'] ) ? 0 : absint( $_POST['page'] );
-		$items = $this->load_available_items_query( $type, $object, $page );
+		$type = sanitize_key($_POST['type']);
+		$object = sanitize_key($_POST['object']);
+		$page = empty($_POST['page']) ? 0 : absint($_POST['page']);
+		$items = $this->load_available_items_query($type, $object, $page);
 
-		if ( is_wp_error( $items ) ) {
-			wp_send_json_error( $items->get_error_code() );
+		if (is_wp_error($items)) {
+			wp_send_json_error($items->get_error_code());
 		} else {
-			wp_send_json_success( array( 'items' => $items ) );
+			wp_send_json_success(array('items' => $items));
 		}
 	}
 
@@ -126,62 +126,62 @@ 
 	 * @param int    $page   Optional. The page number used to generate the query offset. Default is '0'.
 	 * @return WP_Error|array Returns either a WP_Error object or an array of menu items.
 	 */
-	public function load_available_items_query( $type = 'post_type', $object = 'page', $page = 0 ) {
+	public function load_available_items_query($type = 'post_type', $object = 'page', $page = 0) {
 		$items = array();
 
-		if ( 'post_type' === $type ) {
-			$post_type = get_post_type_object( $object );
-			if ( ! $post_type ) {
-				return new WP_Error( 'nav_menus_invalid_post_type' );
+		if ('post_type' === $type) {
+			$post_type = get_post_type_object($object);
+			if ( ! $post_type) {
+				return new WP_Error('nav_menus_invalid_post_type');
 			}
 
-			if ( 0 === $page && 'page' === $object ) {
+			if (0 === $page && 'page' === $object) {
 				// Add "Home" link. Treat as a page, but switch to custom on add.
 				$items[] = array(
 					'id'         => 'home',
-					'title'      => _x( 'Home', 'nav menu home label' ),
+					'title'      => _x('Home', 'nav menu home label'),
 					'type'       => 'custom',
-					'type_label' => __( 'Custom Link' ),
+					'type_label' => __('Custom Link'),
 					'object'     => '',
 					'url'        => home_url(),
 				);
-			} elseif ( 'post' !== $object && 0 === $page && $post_type->has_archive ) {
+			} elseif ('post' !== $object && 0 === $page && $post_type->has_archive) {
 				// Add a post type archive link.
 				$items[] = array(
-					'id'         => $object . '-archive',
+					'id'         => $object.'-archive',
 					'title'      => $post_type->labels->archives,
 					'type'       => 'post_type_archive',
-					'type_label' => __( 'Post Type Archive' ),
+					'type_label' => __('Post Type Archive'),
 					'object'     => $object,
-					'url'        => get_post_type_archive_link( $object ),
+					'url'        => get_post_type_archive_link($object),
 				);
 			}
 
-			$posts = get_posts( array(
+			$posts = get_posts(array(
 				'numberposts' => 10,
 				'offset'      => 10 * $page,
 				'orderby'     => 'date',
 				'order'       => 'DESC',
 				'post_type'   => $object,
-			) );
-			foreach ( $posts as $post ) {
+			));
+			foreach ($posts as $post) {
 				$post_title = $post->post_title;
-				if ( '' === $post_title ) {
+				if ('' === $post_title) {
 					/* translators: %d: ID of a post */
-					$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+					$post_title = sprintf(__('#%d (no title)'), $post->ID);
 				}
 				$items[] = array(
 					'id'         => "post-{$post->ID}",
-					'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'title'      => html_entity_decode($post_title, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'post_type',
-					'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
+					'type_label' => get_post_type_object($post->post_type)->labels->singular_name,
 					'object'     => $post->post_type,
-					'object_id'  => intval( $post->ID ),
-					'url'        => get_permalink( intval( $post->ID ) ),
+					'object_id'  => intval($post->ID),
+					'url'        => get_permalink(intval($post->ID)),
 				);
 			}
-		} elseif ( 'taxonomy' === $type ) {
-			$terms = get_terms( $object, array(
+		} elseif ('taxonomy' === $type) {
+			$terms = get_terms($object, array(
 				'child_of'     => 0,
 				'exclude'      => '',
 				'hide_empty'   => false,
@@ -192,20 +192,20 @@ 
 				'order'        => 'DESC',
 				'orderby'      => 'count',
 				'pad_counts'   => false,
-			) );
-			if ( is_wp_error( $terms ) ) {
+			));
+			if (is_wp_error($terms)) {
 				return $terms;
 			}
 
-			foreach ( $terms as $term ) {
+			foreach ($terms as $term) {
 				$items[] = array(
 					'id'         => "term-{$term->term_id}",
-					'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'title'      => html_entity_decode($term->name, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'taxonomy',
-					'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+					'type_label' => get_taxonomy($term->taxonomy)->labels->singular_name,
 					'object'     => $term->taxonomy,
-					'object_id'  => intval( $term->term_id ),
-					'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+					'object_id'  => intval($term->term_id),
+					'url'        => get_term_link(intval($term->term_id), $term->taxonomy),
 				);
 			}
 		}
@@ -220,7 +220,7 @@ 
 		 * @param string $object The object name.
 		 * @param int    $page   The current page number.
 		 */
-		$items = apply_filters( 'customize_nav_menu_available_items', $items, $type, $object, $page );
+		$items = apply_filters('customize_nav_menu_available_items', $items, $type, $object, $page);
 
 		return $items;
 	}
@@ -232,28 +232,28 @@ 
 	 * @access public
 	 */
 	public function ajax_search_available_items() {
-		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
+		check_ajax_referer('customize-menus', 'customize-menus-nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['search'] ) ) {
-			wp_send_json_error( 'nav_menus_missing_search_parameter' );
+		if (empty($_POST['search'])) {
+			wp_send_json_error('nav_menus_missing_search_parameter');
 		}
 
-		$p = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0;
-		if ( $p < 1 ) {
+		$p = isset($_POST['page']) ? absint($_POST['page']) : 0;
+		if ($p < 1) {
 			$p = 1;
 		}
 
-		$s = sanitize_text_field( wp_unslash( $_POST['search'] ) );
-		$items = $this->search_available_items_query( array( 'pagenum' => $p, 's' => $s ) );
+		$s = sanitize_text_field(wp_unslash($_POST['search']));
+		$items = $this->search_available_items_query(array('pagenum' => $p, 's' => $s));
 
-		if ( empty( $items ) ) {
-			wp_send_json_error( array( 'message' => __( 'No results found.' ) ) );
+		if (empty($items)) {
+			wp_send_json_error(array('message' => __('No results found.')));
 		} else {
-			wp_send_json_success( array( 'items' => $items ) );
+			wp_send_json_success(array('items' => $items));
 		}
 	}
 
@@ -268,12 +268,12 @@ 
 	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
 	 * @return array Menu items.
 	 */
-	public function search_available_items_query( $args = array() ) {
+	public function search_available_items_query($args = array()) {
 		$items = array();
 
-		$post_type_objects = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
+		$post_type_objects = get_post_types(array('show_in_nav_menus' => true), 'objects');
 		$query = array(
-			'post_type'              => array_keys( $post_type_objects ),
+			'post_type'              => array_keys($post_type_objects),
 			'suppress_filters'       => true,
 			'update_post_term_cache' => false,
 			'update_post_meta_cache' => false,
@@ -281,55 +281,55 @@ 
 			'posts_per_page'         => 20,
 		);
 
-		$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
-		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
+		$args['pagenum'] = isset($args['pagenum']) ? absint($args['pagenum']) : 1;
+		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ($args['pagenum'] - 1) : 0;
 
-		if ( isset( $args['s'] ) ) {
+		if (isset($args['s'])) {
 			$query['s'] = $args['s'];
 		}
 
 		// Query posts.
-		$get_posts = new WP_Query( $query );
+		$get_posts = new WP_Query($query);
 
 		// Check if any posts were found.
-		if ( $get_posts->post_count ) {
-			foreach ( $get_posts->posts as $post ) {
+		if ($get_posts->post_count) {
+			foreach ($get_posts->posts as $post) {
 				$post_title = $post->post_title;
-				if ( '' === $post_title ) {
+				if ('' === $post_title) {
 					/* translators: %d: ID of a post */
-					$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+					$post_title = sprintf(__('#%d (no title)'), $post->ID);
 				}
 				$items[] = array(
-					'id'         => 'post-' . $post->ID,
-					'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'id'         => 'post-'.$post->ID,
+					'title'      => html_entity_decode($post_title, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'post_type',
-					'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
+					'type_label' => $post_type_objects[$post->post_type]->labels->singular_name,
 					'object'     => $post->post_type,
-					'object_id'  => intval( $post->ID ),
-					'url'        => get_permalink( intval( $post->ID ) ),
+					'object_id'  => intval($post->ID),
+					'url'        => get_permalink(intval($post->ID)),
 				);
 			}
 		}
 
 		// Query taxonomy terms.
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'names' );
-		$terms = get_terms( $taxonomies, array(
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'names');
+		$terms = get_terms($taxonomies, array(
 			'name__like' => $args['s'],
 			'number'     => 20,
 			'offset'     => 20 * ($args['pagenum'] - 1),
-		) );
+		));
 
 		// Check if any taxonomies were found.
-		if ( ! empty( $terms ) ) {
-			foreach ( $terms as $term ) {
+		if ( ! empty($terms)) {
+			foreach ($terms as $term) {
 				$items[] = array(
-					'id'         => 'term-' . $term->term_id,
-					'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'id'         => 'term-'.$term->term_id,
+					'title'      => html_entity_decode($term->name, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'taxonomy',
-					'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+					'type_label' => get_taxonomy($term->taxonomy)->labels->singular_name,
 					'object'     => $term->taxonomy,
-					'object_id'  => intval( $term->term_id ),
-					'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+					'object_id'  => intval($term->term_id),
+					'url'        => get_term_link(intval($term->term_id), $term->taxonomy),
 				);
 			}
 		}
@@ -342,7 +342,7 @@ 
 		 * @param array $items The array of menu items.
 		 * @param array $args  Includes 'pagenum' and 's' (search) arguments.
 		 */
-		$items = apply_filters( 'customize_nav_menu_searched_items', $items, $args );
+		$items = apply_filters('customize_nav_menu_searched_items', $items, $args);
 
 		return $items;
 	}
@@ -354,44 +354,44 @@ 
 	 * @access public
 	 */
 	public function enqueue_scripts() {
-		wp_enqueue_style( 'customize-nav-menus' );
-		wp_enqueue_script( 'customize-nav-menus' );
+		wp_enqueue_style('customize-nav-menus');
+		wp_enqueue_script('customize-nav-menus');
 
-		$temp_nav_menu_setting      = new WP_Customize_Nav_Menu_Setting( $this->manager, 'nav_menu[-1]' );
-		$temp_nav_menu_item_setting = new WP_Customize_Nav_Menu_Item_Setting( $this->manager, 'nav_menu_item[-1]' );
+		$temp_nav_menu_setting      = new WP_Customize_Nav_Menu_Setting($this->manager, 'nav_menu[-1]');
+		$temp_nav_menu_item_setting = new WP_Customize_Nav_Menu_Item_Setting($this->manager, 'nav_menu_item[-1]');
 
 		// Pass data to JS.
 		$settings = array(
 			'allMenus'             => wp_get_nav_menus(),
 			'itemTypes'            => $this->available_item_types(),
 			'l10n'                 => array(
-				'untitled'          => _x( '(no label)', 'missing menu item navigation label' ),
-				'unnamed'           => _x( '(unnamed)', 'Missing menu name.' ),
-				'custom_label'      => __( 'Custom Link' ),
+				'untitled'          => _x('(no label)', 'missing menu item navigation label'),
+				'unnamed'           => _x('(unnamed)', 'Missing menu name.'),
+				'custom_label'      => __('Custom Link'),
 				/* translators: %s: menu location */
-				'menuLocation'      => _x( '(Currently set to: %s)', 'menu' ),
-				'menuNameLabel'     => __( 'Menu Name' ),
-				'itemAdded'         => __( 'Menu item added' ),
-				'itemDeleted'       => __( 'Menu item deleted' ),
-				'menuAdded'         => __( 'Menu created' ),
-				'menuDeleted'       => __( 'Menu deleted' ),
-				'movedUp'           => __( 'Menu item moved up' ),
-				'movedDown'         => __( 'Menu item moved down' ),
-				'movedLeft'         => __( 'Menu item moved out of submenu' ),
-				'movedRight'        => __( 'Menu item is now a sub-item' ),
+				'menuLocation'      => _x('(Currently set to: %s)', 'menu'),
+				'menuNameLabel'     => __('Menu Name'),
+				'itemAdded'         => __('Menu item added'),
+				'itemDeleted'       => __('Menu item deleted'),
+				'menuAdded'         => __('Menu created'),
+				'menuDeleted'       => __('Menu deleted'),
+				'movedUp'           => __('Menu item moved up'),
+				'movedDown'         => __('Menu item moved down'),
+				'movedLeft'         => __('Menu item moved out of submenu'),
+				'movedRight'        => __('Menu item is now a sub-item'),
 				/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-				'customizingMenus'  => sprintf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) ),
+				'customizingMenus'  => sprintf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('nav_menus')->title)),
 				/* translators: %s: title of menu item which is invalid */
-				'invalidTitleTpl'   => __( '%s (Invalid)' ),
+				'invalidTitleTpl'   => __('%s (Invalid)'),
 				/* translators: %s: title of menu item in draft status */
-				'pendingTitleTpl'   => __( '%s (Pending)' ),
-				'itemsFound'        => __( 'Number of items found: %d' ),
-				'itemsFoundMore'    => __( 'Additional items found: %d' ),
-				'itemsLoadingMore'  => __( 'Loading more results... please wait.' ),
-				'reorderModeOn'     => __( 'Reorder mode enabled' ),
-				'reorderModeOff'    => __( 'Reorder mode closed' ),
-				'reorderLabelOn'    => esc_attr__( 'Reorder menu items' ),
-				'reorderLabelOff'   => esc_attr__( 'Close reorder mode' ),
+				'pendingTitleTpl'   => __('%s (Pending)'),
+				'itemsFound'        => __('Number of items found: %d'),
+				'itemsFoundMore'    => __('Additional items found: %d'),
+				'itemsLoadingMore'  => __('Loading more results... please wait.'),
+				'reorderModeOn'     => __('Reorder mode enabled'),
+				'reorderModeOff'    => __('Reorder mode closed'),
+				'reorderLabelOn'    => esc_attr__('Reorder menu items'),
+				'reorderLabelOff'   => esc_attr__('Close reorder mode'),
 			),
 			'settingTransport'     => 'postMessage',
 			'phpIntMax'            => PHP_INT_MAX,
@@ -402,29 +402,29 @@ 
 			'locationSlugMappedToName' => get_registered_nav_menus(),
 		);
 
-		$data = sprintf( 'var _wpCustomizeNavMenusSettings = %s;', wp_json_encode( $settings ) );
-		wp_scripts()->add_data( 'customize-nav-menus', 'data', $data );
+		$data = sprintf('var _wpCustomizeNavMenusSettings = %s;', wp_json_encode($settings));
+		wp_scripts()->add_data('customize-nav-menus', 'data', $data);
 
 		// This is copied from nav-menus.php, and it has an unfortunate object name of `menus`.
 		$nav_menus_l10n = array(
 			'oneThemeLocationNoMenus' => null,
-			'moveUp'       => __( 'Move up one' ),
-			'moveDown'     => __( 'Move down one' ),
-			'moveToTop'    => __( 'Move to the top' ),
+			'moveUp'       => __('Move up one'),
+			'moveDown'     => __('Move down one'),
+			'moveToTop'    => __('Move to the top'),
 			/* translators: %s: previous item name */
-			'moveUnder'    => __( 'Move under %s' ),
+			'moveUnder'    => __('Move under %s'),
 			/* translators: %s: previous item name */
-			'moveOutFrom'  => __( 'Move out from under %s' ),
+			'moveOutFrom'  => __('Move out from under %s'),
 			/* translators: %s: previous item name */
-			'under'        => __( 'Under %s' ),
+			'under'        => __('Under %s'),
 			/* translators: %s: previous item name */
-			'outFrom'      => __( 'Out from under %s' ),
+			'outFrom'      => __('Out from under %s'),
 			/* translators: 1: item name, 2: item position, 3: total number of items */
-			'menuFocus'    => __( '%1$s. Menu item %2$d of %3$d.' ),
+			'menuFocus'    => __('%1$s. Menu item %2$d of %3$d.'),
 			/* translators: 1: item name, 2: item position, 3: parent item name */
-			'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+			'subMenuFocus' => __('%1$s. Sub item number %2$d under %3$s.'),
 		);
-		wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
+		wp_localize_script('nav-menu', 'menus', $nav_menus_l10n);
 	}
 
 	/**
@@ -441,13 +441,13 @@ 
 	 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 	 * @return array|false
 	 */
-	public function filter_dynamic_setting_args( $setting_args, $setting_id ) {
-		if ( preg_match( WP_Customize_Nav_Menu_Setting::ID_PATTERN, $setting_id ) ) {
+	public function filter_dynamic_setting_args($setting_args, $setting_id) {
+		if (preg_match(WP_Customize_Nav_Menu_Setting::ID_PATTERN, $setting_id)) {
 			$setting_args = array(
 				'type'      => WP_Customize_Nav_Menu_Setting::TYPE,
 				'transport' => 'postMessage',
 			);
-		} elseif ( preg_match( WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id ) ) {
+		} elseif (preg_match(WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id)) {
 			$setting_args = array(
 				'type'      => WP_Customize_Nav_Menu_Item_Setting::TYPE,
 				'transport' => 'postMessage',
@@ -467,12 +467,12 @@ 
 	 * @param array  $setting_args  WP_Customize_Setting or a subclass.
 	 * @return string
 	 */
-	public function filter_dynamic_setting_class( $setting_class, $setting_id, $setting_args ) {
-		unset( $setting_id );
+	public function filter_dynamic_setting_class($setting_class, $setting_id, $setting_args) {
+		unset($setting_id);
 
-		if ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type'] ) {
+		if ( ! empty($setting_args['type']) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type']) {
 			$setting_class = 'WP_Customize_Nav_Menu_Setting';
-		} elseif ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type'] ) {
+		} elseif ( ! empty($setting_args['type']) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type']) {
 			$setting_class = 'WP_Customize_Nav_Menu_Item_Setting';
 		}
 		return $setting_class;
@@ -487,145 +487,145 @@ 
 	public function customize_register() {
 
 		// Require JS-rendered control types.
-		$this->manager->register_panel_type( 'WP_Customize_Nav_Menus_Panel' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Name_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Auto_Add_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Item_Control' );
+		$this->manager->register_panel_type('WP_Customize_Nav_Menus_Panel');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Name_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Auto_Add_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Item_Control');
 
 		// Create a panel for Menus.
-		$description = '<p>' . __( 'This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.' ) . '</p>';
-		if ( current_theme_supports( 'widgets' ) ) {
+		$description = '<p>'.__('This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.').'</p>';
+		if (current_theme_supports('widgets')) {
 			/* translators: URL to the widgets panel of the customizer */
-			$description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+			$description .= '<p>'.sprintf(__('Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.'), "javascript:wp.customize.panel( 'widgets' ).focus();").'</p>';
 		} else {
-			$description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>';
+			$description .= '<p>'.__('Menus can be displayed in locations defined by your theme.').'</p>';
 		}
-		$this->manager->add_panel( new WP_Customize_Nav_Menus_Panel( $this->manager, 'nav_menus', array(
-			'title'       => __( 'Menus' ),
+		$this->manager->add_panel(new WP_Customize_Nav_Menus_Panel($this->manager, 'nav_menus', array(
+			'title'       => __('Menus'),
 			'description' => $description,
 			'priority'    => 100,
 			// 'theme_supports' => 'menus|widgets', @todo allow multiple theme supports
-		) ) );
+		)));
 		$menus = wp_get_nav_menus();
 
 		// Menu locations.
 		$locations     = get_registered_nav_menus();
-		$num_locations = count( array_keys( $locations ) );
-		if ( 1 == $num_locations ) {
-			$description = '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
+		$num_locations = count(array_keys($locations));
+		if (1 == $num_locations) {
+			$description = '<p>'.__('Your theme supports one menu. Select which menu you would like to use.').'</p>';
 		} else {
 			/* translators: %s: number of menu locations */
-			$description = '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+			$description = '<p>'.sprintf(_n('Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations), number_format_i18n($num_locations)).'</p>';
 		}
-		if ( current_theme_supports( 'widgets' ) ) {
+		if (current_theme_supports('widgets')) {
 			/* translators: URL to the widgets panel of the customizer */
-			$description .= '<p>' . sprintf( __( 'You can also place menus in <a href="%s">widget areas</a> with the &#8220;Custom Menu&#8221; widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+			$description .= '<p>'.sprintf(__('You can also place menus in <a href="%s">widget areas</a> with the &#8220;Custom Menu&#8221; widget.'), "javascript:wp.customize.panel( 'widgets' ).focus();").'</p>';
 		}
 
-		$this->manager->add_section( 'menu_locations', array(
-			'title'       => __( 'Menu Locations' ),
+		$this->manager->add_section('menu_locations', array(
+			'title'       => __('Menu Locations'),
 			'panel'       => 'nav_menus',
 			'priority'    => 5,
 			'description' => $description,
-		) );
+		));
 
-		$choices = array( '0' => __( '&mdash; Select &mdash;' ) );
-		foreach ( $menus as $menu ) {
-			$choices[ $menu->term_id ] = wp_html_excerpt( $menu->name, 40, '&hellip;' );
+		$choices = array('0' => __('&mdash; Select &mdash;'));
+		foreach ($menus as $menu) {
+			$choices[$menu->term_id] = wp_html_excerpt($menu->name, 40, '&hellip;');
 		}
 
-		foreach ( $locations as $location => $description ) {
+		foreach ($locations as $location => $description) {
 			$setting_id = "nav_menu_locations[{$location}]";
 
-			$setting = $this->manager->get_setting( $setting_id );
-			if ( $setting ) {
+			$setting = $this->manager->get_setting($setting_id);
+			if ($setting) {
 				$setting->transport = 'postMessage';
-				remove_filter( "customize_sanitize_{$setting_id}", 'absint' );
-				add_filter( "customize_sanitize_{$setting_id}", array( $this, 'intval_base10' ) );
+				remove_filter("customize_sanitize_{$setting_id}", 'absint');
+				add_filter("customize_sanitize_{$setting_id}", array($this, 'intval_base10'));
 			} else {
-				$this->manager->add_setting( $setting_id, array(
-					'sanitize_callback' => array( $this, 'intval_base10' ),
+				$this->manager->add_setting($setting_id, array(
+					'sanitize_callback' => array($this, 'intval_base10'),
 					'theme_supports'    => 'menus',
 					'type'              => 'theme_mod',
 					'transport'         => 'postMessage',
 					'default'           => 0,
-				) );
+				));
 			}
 
-			$this->manager->add_control( new WP_Customize_Nav_Menu_Location_Control( $this->manager, $setting_id, array(
+			$this->manager->add_control(new WP_Customize_Nav_Menu_Location_Control($this->manager, $setting_id, array(
 				'label'       => $description,
 				'location_id' => $location,
 				'section'     => 'menu_locations',
 				'choices'     => $choices,
-			) ) );
+			)));
 		}
 
 		// Register each menu as a Customizer section, and add each menu item to each menu.
-		foreach ( $menus as $menu ) {
+		foreach ($menus as $menu) {
 			$menu_id = $menu->term_id;
 
 			// Create a section for each menu.
-			$section_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_section( new WP_Customize_Nav_Menu_Section( $this->manager, $section_id, array(
-				'title'     => html_entity_decode( $menu->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+			$section_id = 'nav_menu['.$menu_id.']';
+			$this->manager->add_section(new WP_Customize_Nav_Menu_Section($this->manager, $section_id, array(
+				'title'     => html_entity_decode($menu->name, ENT_QUOTES, get_bloginfo('charset')),
 				'priority'  => 10,
 				'panel'     => 'nav_menus',
-			) ) );
+			)));
 
-			$nav_menu_setting_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_setting( new WP_Customize_Nav_Menu_Setting( $this->manager, $nav_menu_setting_id, array(
+			$nav_menu_setting_id = 'nav_menu['.$menu_id.']';
+			$this->manager->add_setting(new WP_Customize_Nav_Menu_Setting($this->manager, $nav_menu_setting_id, array(
 				'transport' => 'postMessage',
-			) ) );
+			)));
 
 			// Add the menu contents.
-			$menu_items = (array) wp_get_nav_menu_items( $menu_id );
+			$menu_items = (array) wp_get_nav_menu_items($menu_id);
 
-			foreach ( array_values( $menu_items ) as $i => $item ) {
+			foreach (array_values($menu_items) as $i => $item) {
 
 				// Create a setting for each menu item (which doesn't actually manage data, currently).
-				$menu_item_setting_id = 'nav_menu_item[' . $item->ID . ']';
+				$menu_item_setting_id = 'nav_menu_item['.$item->ID.']';
 
 				$value = (array) $item;
 				$value['nav_menu_term_id'] = $menu_id;
-				$this->manager->add_setting( new WP_Customize_Nav_Menu_Item_Setting( $this->manager, $menu_item_setting_id, array(
+				$this->manager->add_setting(new WP_Customize_Nav_Menu_Item_Setting($this->manager, $menu_item_setting_id, array(
 					'value'     => $value,
 					'transport' => 'postMessage',
-				) ) );
+				)));
 
 				// Create a control for each menu item.
-				$this->manager->add_control( new WP_Customize_Nav_Menu_Item_Control( $this->manager, $menu_item_setting_id, array(
+				$this->manager->add_control(new WP_Customize_Nav_Menu_Item_Control($this->manager, $menu_item_setting_id, array(
 					'label'    => $item->title,
 					'section'  => $section_id,
 					'priority' => 10 + $i,
-				) ) );
+				)));
 			}
 
 			// Note: other controls inside of this section get added dynamically in JS via the MenuSection.ready() function.
 		}
 
 		// Add the add-new-menu section and controls.
-		$this->manager->add_section( new WP_Customize_New_Menu_Section( $this->manager, 'add_menu', array(
-			'title'    => __( 'Add a Menu' ),
+		$this->manager->add_section(new WP_Customize_New_Menu_Section($this->manager, 'add_menu', array(
+			'title'    => __('Add a Menu'),
 			'panel'    => 'nav_menus',
 			'priority' => 999,
-		) ) );
+		)));
 
-		$this->manager->add_control( 'new_menu_name', array(
+		$this->manager->add_control('new_menu_name', array(
 			'label'       => '',
 			'section'     => 'add_menu',
 			'type'        => 'text',
 			'settings'    => array(),
 			'input_attrs' => array(
 				'class'       => 'menu-name-field',
-				'placeholder' => __( 'New menu name' ),
+				'placeholder' => __('New menu name'),
 			),
-		) );
+		));
 
-		$this->manager->add_control( new WP_Customize_New_Menu_Control( $this->manager, 'create_new_menu', array(
+		$this->manager->add_control(new WP_Customize_New_Menu_Control($this->manager, 'create_new_menu', array(
 			'section'  => 'add_menu',
 			'settings' => array(),
-		) ) );
+		)));
 	}
 
 	/**
@@ -640,8 +640,8 @@ 
 	 * @param mixed $value Number to convert.
 	 * @return int Integer.
 	 */
-	public function intval_base10( $value ) {
-		return intval( $value, 10 );
+	public function intval_base10($value) {
+		return intval($value, 10);
 	}
 
 	/**
@@ -655,9 +655,9 @@ 
 	public function available_item_types() {
 		$item_types = array();
 
-		$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
-		if ( $post_types ) {
-			foreach ( $post_types as $slug => $post_type ) {
+		$post_types = get_post_types(array('show_in_nav_menus' => true), 'objects');
+		if ($post_types) {
+			foreach ($post_types as $slug => $post_type) {
 				$item_types[] = array(
 					'title'  => $post_type->labels->name,
 					'type'   => 'post_type',
@@ -666,10 +666,10 @@ 
 			}
 		}
 
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'objects' );
-		if ( $taxonomies ) {
-			foreach ( $taxonomies as $slug => $taxonomy ) {
-				if ( 'post_format' === $taxonomy && ! current_theme_supports( 'post-formats' ) ) {
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'objects');
+		if ($taxonomies) {
+			foreach ($taxonomies as $slug => $taxonomy) {
+				if ('post_format' === $taxonomy && ! current_theme_supports('post-formats')) {
 					continue;
 				}
 				$item_types[] = array(
@@ -687,7 +687,7 @@ 
 		 *
 		 * @param array $item_types Custom menu item types.
 		 */
-		$item_types = apply_filters( 'customize_nav_menu_available_item_types', $item_types );
+		$item_types = apply_filters('customize_nav_menu_available_item_types', $item_types);
 
 		return $item_types;
 	}
@@ -713,7 +713,7 @@ 
 						<button type="button" class="button-link item-add">
 							<span class="screen-reader-text"><?php
 								/* translators: 1: Title of a menu item, 2: Type of a menu item */
-								printf( __( 'Add to menu: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}' );
+								printf(__('Add to menu: %1$s (%2$s)'), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}');
 							?></span>
 						</button>
 					</div>
@@ -726,10 +726,10 @@ 
 				<?php
 				printf(
 					'<button type="button" class="menus-move-up">%1$s</button><button type="button" class="menus-move-down">%2$s</button><button type="button" class="menus-move-left">%3$s</button><button type="button" class="menus-move-right">%4$s</button>',
-					__( 'Move up' ),
-					__( 'Move down' ),
-					__( 'Move one level up' ),
-					__( 'Move one level down' )
+					__('Move up'),
+					__('Move down'),
+					__('Move one level up'),
+					__('Move one level down')
 				);
 				?>
 			</div>
@@ -748,49 +748,49 @@ 
 		<div id="available-menu-items" class="accordion-container">
 			<div class="customize-section-title">
 				<button type="button" class="customize-section-back" tabindex="-1">
-					<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+					<span class="screen-reader-text"><?php _e('Back'); ?></span>
 				</button>
 				<h3>
 					<span class="customize-action">
 						<?php
 							/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-							printf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) );
+							printf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('nav_menus')->title));
 						?>
 					</span>
-					<?php _e( 'Add Menu Items' ); ?>
+					<?php _e('Add Menu Items'); ?>
 				</h3>
 			</div>
 			<div id="available-menu-items-search" class="accordion-section cannot-expand">
 				<div class="accordion-section-title">
-					<label class="screen-reader-text" for="menu-items-search"><?php _e( 'Search Menu Items' ); ?></label>
-					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e( 'Search menu items&hellip;' ) ?>" aria-describedby="menu-items-search-desc" />
-					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
+					<label class="screen-reader-text" for="menu-items-search"><?php _e('Search Menu Items'); ?></label>
+					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e('Search menu items&hellip;') ?>" aria-describedby="menu-items-search-desc" />
+					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e('The search results will be updated as you type.'); ?></p>
 					<span class="spinner"></span>
 				</div>
-				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e( 'Clear Results' ); ?></span></button>
+				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e('Clear Results'); ?></span></button>
 				<ul class="accordion-section-content" data-type="search"></ul>
 			</div>
 			<div id="new-custom-menu-item" class="accordion-section">
 				<h4 class="accordion-section-title" role="presentation">
-					<?php _e( 'Custom Links' ); ?>
+					<?php _e('Custom Links'); ?>
 					<button type="button" class="button-link" aria-expanded="false">
-						<span class="screen-reader-text"><?php _e( 'Toggle section: Custom Links' ); ?></span>
+						<span class="screen-reader-text"><?php _e('Toggle section: Custom Links'); ?></span>
 						<span class="toggle-indicator" aria-hidden="true"></span>
 					</button>
 				</h4>
 				<div class="accordion-section-content customlinkdiv">
 					<input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][menu-item-type]" />
 					<p id="menu-item-url-wrap" class="wp-clearfix">
-						<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+						<label class="howto" for="custom-menu-item-url"><?php _e('URL'); ?></label>
 						<input id="custom-menu-item-url" name="menu-item[-1][menu-item-url]" type="text" class="code menu-item-textbox" value="http://">
 					</p>
 					<p id="menu-item-name-wrap" class="wp-clearfix">
-						<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+						<label class="howto" for="custom-menu-item-name"><?php _e('Link Text'); ?></label>
 						<input id="custom-menu-item-name" name="menu-item[-1][menu-item-title]" type="text" class="regular-text menu-item-textbox">
 					</p>
 					<p class="button-controls">
 						<span class="add-to-menu">
-							<input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
+							<input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
 							<span class="spinner"></span>
 						</span>
 					</p>
@@ -798,22 +798,22 @@ 
 			</div>
 			<?php
 			// Containers for per-post-type item browsing; items added with JS.
-			foreach ( $this->available_item_types() as $available_item_type ) {
-				$id = sprintf( 'available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object'] );
+			foreach ($this->available_item_types() as $available_item_type) {
+				$id = sprintf('available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object']);
 				?>
-				<div id="<?php echo esc_attr( $id ); ?>" class="accordion-section">
+				<div id="<?php echo esc_attr($id); ?>" class="accordion-section">
 					<h4 class="accordion-section-title" role="presentation">
-						<?php echo esc_html( $available_item_type['title'] ); ?>
+						<?php echo esc_html($available_item_type['title']); ?>
 						<span class="spinner"></span>
-						<span class="no-items"><?php _e( 'No items' ); ?></span>
+						<span class="no-items"><?php _e('No items'); ?></span>
 						<button type="button" class="button-link" aria-expanded="false">
 							<span class="screen-reader-text"><?php
 							/* translators: %s: Title of a section with menu items */
-							printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) ); ?></span>
+							printf(__('Toggle section: %s'), esc_html($available_item_type['title'])); ?></span>
 							<span class="toggle-indicator" aria-hidden="true"></span>
 						</button>
 					</h4>
-					<ul class="accordion-section-content" data-type="<?php echo esc_attr( $available_item_type['type'] ); ?>" data-object="<?php echo esc_attr( $available_item_type['object'] ); ?>"></ul>
+					<ul class="accordion-section-content" data-type="<?php echo esc_attr($available_item_type['type']); ?>" data-object="<?php echo esc_attr($available_item_type['object']); ?>"></ul>
 				</div>
 				<?php
 			}
@@ -845,17 +845,17 @@ 
 	 * @param string      $partial_id   Partial ID.
 	 * @return array Partial args.
 	 */
-	public function customize_dynamic_partial_args( $partial_args, $partial_id ) {
+	public function customize_dynamic_partial_args($partial_args, $partial_id) {
 
-		if ( preg_match( '/^nav_menu_instance\[[0-9a-f]{32}\]$/', $partial_id ) ) {
-			if ( false === $partial_args ) {
+		if (preg_match('/^nav_menu_instance\[[0-9a-f]{32}\]$/', $partial_id)) {
+			if (false === $partial_args) {
 				$partial_args = array();
 			}
 			$partial_args = array_merge(
 				$partial_args,
 				array(
 					'type'                => 'nav_menu_instance',
-					'render_callback'     => array( $this, 'render_nav_menu_partial' ),
+					'render_callback'     => array($this, 'render_nav_menu_partial'),
 					'container_inclusive' => true,
 					'settings'            => array(), // Empty because the nav menu instance may relate to a menu or a location.
 					'capability'          => 'edit_theme_options',
@@ -873,11 +873,11 @@ 
 	 * @access public
 	 */
 	public function customize_preview_init() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue_deps' ) );
-		add_filter( 'wp_nav_menu_args', array( $this, 'filter_wp_nav_menu_args' ), 1000 );
-		add_filter( 'wp_nav_menu', array( $this, 'filter_wp_nav_menu' ), 10, 2 );
-		add_filter( 'wp_footer', array( $this, 'export_preview_data' ), 1 );
-		add_filter( 'customize_render_partials_response', array( $this, 'export_partial_rendered_nav_menu_instances' ) );
+		add_action('wp_enqueue_scripts', array($this, 'customize_preview_enqueue_deps'));
+		add_filter('wp_nav_menu_args', array($this, 'filter_wp_nav_menu_args'), 1000);
+		add_filter('wp_nav_menu', array($this, 'filter_wp_nav_menu'), 10, 2);
+		add_filter('wp_footer', array($this, 'export_preview_data'), 1);
+		add_filter('customize_render_partials_response', array($this, 'export_partial_rendered_nav_menu_instances'));
 	}
 
 	/**
@@ -891,7 +891,7 @@ 
 	 * @param array $args An array containing wp_nav_menu() arguments.
 	 * @return array Arguments.
 	 */
-	public function filter_wp_nav_menu_args( $args ) {
+	public function filter_wp_nav_menu_args($args) {
 		/*
 		 * The following conditions determine whether or not this instance of
 		 * wp_nav_menu() can use selective refreshed. A wp_nav_menu() can be
@@ -899,25 +899,25 @@ 
 		 */
 		$can_partial_refresh = (
 			// ...if wp_nav_menu() is directly echoing out the menu (and thus isn't manipulating the string after generated),
-			! empty( $args['echo'] )
+			! empty($args['echo'])
 			&&
 			// ...and if the fallback_cb can be serialized to JSON, since it will be included in the placement context data,
-			( empty( $args['fallback_cb'] ) || is_string( $args['fallback_cb'] ) )
+			(empty($args['fallback_cb']) || is_string($args['fallback_cb']))
 			&&
 			// ...and if the walker can also be serialized to JSON, since it will be included in the placement context data as well,
-			( empty( $args['walker'] ) || is_string( $args['walker'] ) )
+			(empty($args['walker']) || is_string($args['walker']))
 			// ...and if it has a theme location assigned or an assigned menu to display,
 			&& (
-				! empty( $args['theme_location'] )
+				! empty($args['theme_location'])
 				||
-				( ! empty( $args['menu'] ) && ( is_numeric( $args['menu'] ) || is_object( $args['menu'] ) ) )
+				( ! empty($args['menu']) && (is_numeric($args['menu']) || is_object($args['menu'])))
 			)
 			&&
 			// ...and if the nav menu would be rendered with a wrapper container element (upon which to attach data-* attributes).
 			(
-				! empty( $args['container'] )
+				! empty($args['container'])
 				||
-				( isset( $args['items_wrap'] ) && '<' === substr( $args['items_wrap'], 0, 1 ) )
+				(isset($args['items_wrap']) && '<' === substr($args['items_wrap'], 0, 1))
 			)
 		);
 		$args['can_partial_refresh'] = $can_partial_refresh;
@@ -925,7 +925,7 @@ 
 		$exported_args = $args;
 
 		// Empty out args which may not be JSON-serializable.
-		if ( ! $can_partial_refresh ) {
+		if ( ! $can_partial_refresh) {
 			$exported_args['fallback_cb'] = '';
 			$exported_args['walker'] = '';
 		}
@@ -934,15 +934,15 @@ 
 		 * Replace object menu arg with a term_id menu arg, as this exports better
 		 * to JS and is easier to compare hashes.
 		 */
-		if ( ! empty( $exported_args['menu'] ) && is_object( $exported_args['menu'] ) ) {
+		if ( ! empty($exported_args['menu']) && is_object($exported_args['menu'])) {
 			$exported_args['menu'] = $exported_args['menu']->term_id;
 		}
 
-		ksort( $exported_args );
-		$exported_args['args_hmac'] = $this->hash_nav_menu_args( $exported_args );
+		ksort($exported_args);
+		$exported_args['args_hmac'] = $this->hash_nav_menu_args($exported_args);
 
 		$args['customize_preview_nav_menus_args'] = $exported_args;
-		$this->preview_nav_menu_instance_args[ $exported_args['args_hmac'] ] = $exported_args;
+		$this->preview_nav_menu_instance_args[$exported_args['args_hmac']] = $exported_args;
 		return $args;
 	}
 
@@ -960,12 +960,12 @@ 
 	 * @param object $args             An object containing wp_nav_menu() arguments.
 	 * @return null
 	 */
-	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
-		if ( isset( $args->customize_preview_nav_menus_args['can_partial_refresh'] ) && $args->customize_preview_nav_menus_args['can_partial_refresh'] ) {
-			$attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'nav_menu_instance[' . $args->customize_preview_nav_menus_args['args_hmac'] . ']' ) );
+	public function filter_wp_nav_menu($nav_menu_content, $args) {
+		if (isset($args->customize_preview_nav_menus_args['can_partial_refresh']) && $args->customize_preview_nav_menus_args['can_partial_refresh']) {
+			$attributes = sprintf(' data-customize-partial-id="%s"', esc_attr('nav_menu_instance['.$args->customize_preview_nav_menus_args['args_hmac'].']'));
 			$attributes .= ' data-customize-partial-type="nav_menu_instance"';
-			$attributes .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $args->customize_preview_nav_menus_args ) ) );
-			$nav_menu_content = preg_replace( '#^(<\w+)#', '$1 ' . $attributes, $nav_menu_content, 1 );
+			$attributes .= sprintf(' data-customize-partial-placement-context="%s"', esc_attr(wp_json_encode($args->customize_preview_nav_menus_args)));
+			$nav_menu_content = preg_replace('#^(<\w+)#', '$1 '.$attributes, $nav_menu_content, 1);
 		}
 		return $nav_menu_content;
 	}
@@ -982,8 +982,8 @@ 
 	 * @param array $args The arguments to hash.
 	 * @return string Hashed nav menu arguments.
 	 */
-	public function hash_nav_menu_args( $args ) {
-		return wp_hash( serialize( $args ) );
+	public function hash_nav_menu_args($args) {
+		return wp_hash(serialize($args));
 	}
 
 	/**
@@ -993,8 +993,8 @@ 
 	 * @access public
 	 */
 	public function customize_preview_enqueue_deps() {
-		wp_enqueue_script( 'customize-preview-nav-menus' ); // Note that we have overridden this.
-		wp_enqueue_style( 'customize-preview' );
+		wp_enqueue_script('customize-preview-nav-menus'); // Note that we have overridden this.
+		wp_enqueue_style('customize-preview');
 	}
 
 	/**
@@ -1009,7 +1009,7 @@ 
 		$exports = array(
 			'navMenuInstanceArgs' => $this->preview_nav_menu_instance_args,
 		);
-		printf( '<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode( $exports ) );
+		printf('<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode($exports));
 	}
 
 	/**
@@ -1021,7 +1021,7 @@ 
 	 * @param array $response Response.
 	 * @return array Response.
 	 */
-	public function export_partial_rendered_nav_menu_instances( $response ) {
+	public function export_partial_rendered_nav_menu_instances($response) {
 		$response['nav_menu_instance_args'] = $this->preview_nav_menu_instance_args;
 		return $response;
 	}
@@ -1038,25 +1038,25 @@ 
 	 * @param array                $nav_menu_args Nav menu args supplied as container context.
 	 * @return string|false
 	 */
-	public function render_nav_menu_partial( $partial, $nav_menu_args ) {
-		unset( $partial );
+	public function render_nav_menu_partial($partial, $nav_menu_args) {
+		unset($partial);
 
-		if ( ! isset( $nav_menu_args['args_hmac'] ) ) {
+		if ( ! isset($nav_menu_args['args_hmac'])) {
 			// Error: missing_args_hmac.
 			return false;
 		}
 
 		$nav_menu_args_hmac = $nav_menu_args['args_hmac'];
-		unset( $nav_menu_args['args_hmac'] );
+		unset($nav_menu_args['args_hmac']);
 
-		ksort( $nav_menu_args );
-		if ( ! hash_equals( $this->hash_nav_menu_args( $nav_menu_args ), $nav_menu_args_hmac ) ) {
+		ksort($nav_menu_args);
+		if ( ! hash_equals($this->hash_nav_menu_args($nav_menu_args), $nav_menu_args_hmac)) {
 			// Error: args_hmac_mismatch.
 			return false;
 		}
 
 		ob_start();
-		wp_nav_menu( $nav_menu_args );
+		wp_nav_menu($nav_menu_args);
 		$content = ob_get_clean();
 
 		return $content;

src/wp-includes/class-wp-image-editor.php

Doc Comments +2 added lines, -2 removed lines

@@ -197,7 +197,7 @@ 
 	 *
 	 * @param int $width
 	 * @param int $height
-	 * @return true
+	 * @return boolean
 	 */
 	protected function update_size( $width = null, $height = null ) {
 		$this->size = array(
@@ -213,7 +213,7 @@ 
 	 * @since 4.0.0
 	 * @access public
 	 *
-	 * @return int $quality Compression Quality. Range: [1,100]
+	 * @return boolean $quality Compression Quality. Range: [1,100]
 	 */
 	public function get_quality() {
 		if ( ! $this->quality ) {

Braces +22 added lines, -16 removed lines

@@ -313,8 +313,7 @@ 
 		if ( $filename ) {
 			$file_ext = strtolower( pathinfo( $filename, PATHINFO_EXTENSION ) );
 			$file_mime = $this->get_mime_type( $file_ext );
-		}
-		else {
+		} else {
 			// If no file specified, grab editor's current extension and mime-type.
 			$file_ext = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
 			$file_mime = $this->mime_type;
@@ -348,8 +347,9 @@ 
 			$info = pathinfo( $filename );
 			$dir  = $info['dirname'];
 
-			if ( isset( $info['extension'] ) )
-				$ext = $info['extension'];
+			if ( isset( $info['extension'] ) ) {
+							$ext = $info['extension'];
+			}
 
 			$filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
 		}
@@ -370,8 +370,9 @@ 
 	 */
 	public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
 		// $suffix will be appended to the destination filename, just before the extension
-		if ( ! $suffix )
-			$suffix = $this->get_suffix();
+		if ( ! $suffix ) {
+					$suffix = $this->get_suffix();
+		}
 
 		$info = pathinfo( $this->file );
 		$dir  = $info['dirname'];
@@ -380,8 +381,9 @@ 
 		$name = wp_basename( $this->file, ".$ext" );
 		$new_ext = strtolower( $extension ? $extension : $ext );
 
-		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) )
-			$dir = $_dest_path;
+		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) ) {
+					$dir = $_dest_path;
+		}
 
 		return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
 	}
@@ -395,8 +397,9 @@ 
 	 * @return false|string suffix
 	 */
 	public function get_suffix() {
-		if ( ! $this->get_size() )
-			return false;
+		if ( ! $this->get_size() ) {
+					return false;
+		}
 
 		return "{$this->size['width']}x{$this->size['height']}";
 	}
@@ -427,8 +430,9 @@ 
 
 			$fp = fopen( $filename, 'w' );
 
-			if ( ! $fp )
-				return false;
+			if ( ! $fp ) {
+							return false;
+			}
 
 			fwrite( $fp, $contents );
 			fclose( $fp );
@@ -454,8 +458,9 @@ 
 	 * @return string|false
 	 */
 	protected static function get_mime_type( $extension = null ) {
-		if ( ! $extension )
-			return false;
+		if ( ! $extension ) {
+					return false;
+		}
 
 		$mime_types = wp_get_mime_types();
 		$extensions = array_keys( $mime_types );
@@ -484,8 +489,9 @@ 
 	protected static function get_extension( $mime_type = null ) {
 		$extensions = explode( '|', array_search( $mime_type, wp_get_mime_types() ) );
 
-		if ( empty( $extensions[0] ) )
-			return false;
+		if ( empty( $extensions[0] ) ) {
+					return false;
+		}
 
 		return $extensions[0];
 	}

Spacing +63 added lines, -63 removed lines

@@ -24,7 +24,7 @@ 
 	 *
 	 * @param string $file Path to the file to load.
 	 */
-	public function __construct( $file ) {
+	public function __construct($file) {
 		$this->file = $file;
 	}
 
@@ -41,7 +41,7 @@ 
 	 * @param array $args
 	 * @return bool
 	 */
-	public static function test( $args = array() ) {
+	public static function test($args = array()) {
 		return false;
 	}
 
@@ -58,7 +58,7 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public static function supports_mime_type( $mime_type ) {
+	public static function supports_mime_type($mime_type) {
 		return false;
 	}
 
@@ -84,7 +84,7 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	abstract public function save( $destfilename = null, $mime_type = null );
+	abstract public function save($destfilename = null, $mime_type = null);
 
 	/**
 	 * Resizes current image.
@@ -102,7 +102,7 @@ 
 	 * @param  bool     $crop
 	 * @return bool|WP_Error
 	 */
-	abstract public function resize( $max_w, $max_h, $crop = false );
+	abstract public function resize($max_w, $max_h, $crop = false);
 
 	/**
 	 * Resize multiple images from a single source.
@@ -122,7 +122,7 @@ 
 	 * }
 	 * @return array An array of resized images metadata by size.
 	 */
-	abstract public function multi_resize( $sizes );
+	abstract public function multi_resize($sizes);
 
 	/**
 	 * Crops Image.
@@ -140,7 +140,7 @@ 
 	 * @param bool $src_abs Optional. If the source crop points are absolute.
 	 * @return bool|WP_Error
 	 */
-	abstract public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false );
+	abstract public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false);
 
 	/**
 	 * Rotates current image counter-clockwise by $angle.
@@ -152,7 +152,7 @@ 
 	 * @param float $angle
 	 * @return bool|WP_Error
 	 */
-	abstract public function rotate( $angle );
+	abstract public function rotate($angle);
 
 	/**
 	 * Flips current image.
@@ -165,7 +165,7 @@ 
 	 * @param bool $vert Flip along Vertical Axis
 	 * @return bool|WP_Error
 	 */
-	abstract public function flip( $horz, $vert );
+	abstract public function flip($horz, $vert);
 
 	/**
 	 * Streams current image to browser.
@@ -177,7 +177,7 @@ 
 	 * @param string $mime_type
 	 * @return bool|WP_Error
 	 */
-	abstract public function stream( $mime_type = null );
+	abstract public function stream($mime_type = null);
 
 	/**
 	 * Gets dimensions of image.
@@ -201,7 +201,7 @@ 
 	 * @param int $height
 	 * @return true
 	 */
-	protected function update_size( $width = null, $height = null ) {
+	protected function update_size($width = null, $height = null) {
 		$this->size = array(
 			'width' => (int) $width,
 			'height' => (int) $height
@@ -218,7 +218,7 @@ 
 	 * @return int $quality Compression Quality. Range: [1,100]
 	 */
 	public function get_quality() {
-		if ( ! $this->quality ) {
+		if ( ! $this->quality) {
 			$this->set_quality();
 		}
 
@@ -234,8 +234,8 @@ 
 	 * @param int $quality Compression Quality. Range: [1,100]
 	 * @return true|WP_Error True if set successfully; WP_Error on failure.
 	 */
-	public function set_quality( $quality = null ) {
-		if ( null === $quality ) {
+	public function set_quality($quality = null) {
+		if (null === $quality) {
 			/**
 			 * Filter the default image compression quality setting.
 			 *
@@ -249,9 +249,9 @@ 
 			 * @param int    $quality   Quality level between 1 (low) and 100 (high).
 			 * @param string $mime_type Image mime type.
 			 */
-			$quality = apply_filters( 'wp_editor_set_quality', $this->default_quality, $this->mime_type );
+			$quality = apply_filters('wp_editor_set_quality', $this->default_quality, $this->mime_type);
 
-			if ( 'image/jpeg' == $this->mime_type ) {
+			if ('image/jpeg' == $this->mime_type) {
 				/**
 				 * Filter the JPEG compression quality for backward-compatibility.
 				 *
@@ -268,24 +268,24 @@ 
 				 * @param int    $quality Quality level between 0 (low) and 100 (high) of the JPEG.
 				 * @param string $context Context of the filter.
 				 */
-				$quality = apply_filters( 'jpeg_quality', $quality, 'image_resize' );
+				$quality = apply_filters('jpeg_quality', $quality, 'image_resize');
 			}
 
-			if ( $quality < 0 || $quality > 100 ) {
+			if ($quality < 0 || $quality > 100) {
 				$quality = $this->default_quality;
 			}
 		}
 
 		// Allow 0, but squash to 1 due to identical images in GD, and for backwards compatibility.
-		if ( 0 === $quality ) {
+		if (0 === $quality) {
 			$quality = 1;
 		}
 
-		if ( ( $quality >= 1 ) && ( $quality <= 100 ) ) {
+		if (($quality >= 1) && ($quality <= 100)) {
 			$this->quality = $quality;
 			return true;
 		} else {
-			return new WP_Error( 'invalid_image_quality', __('Attempted to set image quality outside of the range [1,100].') );
+			return new WP_Error('invalid_image_quality', __('Attempted to set image quality outside of the range [1,100].'));
 		}
 	}
 
@@ -304,34 +304,34 @@ 
 	 * @param string $mime_type
 	 * @return array { filename|null, extension, mime-type }
 	 */
-	protected function get_output_format( $filename = null, $mime_type = null ) {
+	protected function get_output_format($filename = null, $mime_type = null) {
 		$new_ext = null;
 
 		// By default, assume specified type takes priority
-		if ( $mime_type ) {
-			$new_ext = $this->get_extension( $mime_type );
+		if ($mime_type) {
+			$new_ext = $this->get_extension($mime_type);
 		}
 
-		if ( $filename ) {
-			$file_ext = strtolower( pathinfo( $filename, PATHINFO_EXTENSION ) );
-			$file_mime = $this->get_mime_type( $file_ext );
+		if ($filename) {
+			$file_ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+			$file_mime = $this->get_mime_type($file_ext);
 		}
 		else {
 			// If no file specified, grab editor's current extension and mime-type.
-			$file_ext = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
+			$file_ext = strtolower(pathinfo($this->file, PATHINFO_EXTENSION));
 			$file_mime = $this->mime_type;
 		}
 
 		// Check to see if specified mime-type is the same as type implied by
 		// file extension.  If so, prefer extension from file.
-		if ( ! $mime_type || ( $file_mime == $mime_type ) ) {
+		if ( ! $mime_type || ($file_mime == $mime_type)) {
 			$mime_type = $file_mime;
 			$new_ext = $file_ext;
 		}
 
 		// Double-check that the mime-type selected is supported by the editor.
 		// If not, choose a default instead.
-		if ( ! $this->supports_mime_type( $mime_type ) ) {
+		if ( ! $this->supports_mime_type($mime_type)) {
 			/**
 			 * Filter default mime type prior to getting the file extension.
 			 *
@@ -341,22 +341,22 @@ 
 			 *
 			 * @param string $mime_type Mime type string.
 			 */
-			$mime_type = apply_filters( 'image_editor_default_mime_type', $this->default_mime_type );
-			$new_ext = $this->get_extension( $mime_type );
+			$mime_type = apply_filters('image_editor_default_mime_type', $this->default_mime_type);
+			$new_ext = $this->get_extension($mime_type);
 		}
 
-		if ( $filename ) {
+		if ($filename) {
 			$ext = '';
-			$info = pathinfo( $filename );
+			$info = pathinfo($filename);
 			$dir  = $info['dirname'];
 
-			if ( isset( $info['extension'] ) )
+			if (isset($info['extension']))
 				$ext = $info['extension'];
 
-			$filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
+			$filename = trailingslashit($dir).wp_basename($filename, ".$ext").".{$new_ext}";
 		}
 
-		return array( $filename, $new_ext, $mime_type );
+		return array($filename, $new_ext, $mime_type);
 	}
 
 	/**
@@ -370,22 +370,22 @@ 
 	 * @param string $extension
 	 * @return string filename
 	 */
-	public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
+	public function generate_filename($suffix = null, $dest_path = null, $extension = null) {
 		// $suffix will be appended to the destination filename, just before the extension
-		if ( ! $suffix )
+		if ( ! $suffix)
 			$suffix = $this->get_suffix();
 
-		$info = pathinfo( $this->file );
+		$info = pathinfo($this->file);
 		$dir  = $info['dirname'];
 		$ext  = $info['extension'];
 
-		$name = wp_basename( $this->file, ".$ext" );
-		$new_ext = strtolower( $extension ? $extension : $ext );
+		$name = wp_basename($this->file, ".$ext");
+		$new_ext = strtolower($extension ? $extension : $ext);
 
-		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) )
+		if ( ! is_null($dest_path) && $_dest_path = realpath($dest_path))
 			$dir = $_dest_path;
 
-		return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
+		return trailingslashit($dir)."{$name}-{$suffix}.{$new_ext}";
 	}
 
 	/**
@@ -397,7 +397,7 @@ 
 	 * @return false|string suffix
 	 */
 	public function get_suffix() {
-		if ( ! $this->get_size() )
+		if ( ! $this->get_size())
 			return false;
 
 		return "{$this->size['width']}x{$this->size['height']}";
@@ -414,29 +414,29 @@ 
 	 * @param array $arguments
 	 * @return bool
 	 */
-	protected function make_image( $filename, $function, $arguments ) {
-		if ( $stream = wp_is_stream( $filename ) ) {
+	protected function make_image($filename, $function, $arguments) {
+		if ($stream = wp_is_stream($filename)) {
 			ob_start();
 		} else {
 			// The directory containing the original file may no longer exist when using a replication plugin.
-			wp_mkdir_p( dirname( $filename ) );
+			wp_mkdir_p(dirname($filename));
 		}
 
-		$result = call_user_func_array( $function, $arguments );
+		$result = call_user_func_array($function, $arguments);
 
-		if ( $result && $stream ) {
+		if ($result && $stream) {
 			$contents = ob_get_contents();
 
-			$fp = fopen( $filename, 'w' );
+			$fp = fopen($filename, 'w');
 
-			if ( ! $fp )
+			if ( ! $fp)
 				return false;
 
-			fwrite( $fp, $contents );
-			fclose( $fp );
+			fwrite($fp, $contents);
+			fclose($fp);
 		}
 
-		if ( $stream ) {
+		if ($stream) {
 			ob_end_clean();
 		}
 
@@ -455,15 +455,15 @@ 
 	 * @param string $extension
 	 * @return string|false
 	 */
-	protected static function get_mime_type( $extension = null ) {
-		if ( ! $extension )
+	protected static function get_mime_type($extension = null) {
+		if ( ! $extension)
 			return false;
 
 		$mime_types = wp_get_mime_types();
-		$extensions = array_keys( $mime_types );
+		$extensions = array_keys($mime_types);
 
-		foreach ( $extensions as $_extension ) {
-			if ( preg_match( "/{$extension}/i", $_extension ) ) {
+		foreach ($extensions as $_extension) {
+			if (preg_match("/{$extension}/i", $_extension)) {
 				return $mime_types[$_extension];
 			}
 		}
@@ -483,10 +483,10 @@ 
 	 * @param string $mime_type
 	 * @return string|false
 	 */
-	protected static function get_extension( $mime_type = null ) {
-		$extensions = explode( '|', array_search( $mime_type, wp_get_mime_types() ) );
+	protected static function get_extension($mime_type = null) {
+		$extensions = explode('|', array_search($mime_type, wp_get_mime_types()));
 
-		if ( empty( $extensions[0] ) )
+		if (empty($extensions[0]))
 			return false;
 
 		return $extensions[0];

src/wp-includes/class-wp.php

Doc Comments +1 added lines, -1 removed lines

@@ -699,7 +699,7 @@
 	 * @access public
 	 *
 	 * @param string $subject subject
-	 * @param array  $matches data used for substitution
+	 * @param string[]  $matches data used for substitution
 	 * @return string
 	 */
 	public static function apply($subject, $matches) {

Indentation +16 added lines, -16 removed lines

@@ -610,22 +610,22 @@
  	}
 
  	/**
-	 * Set the Headers for 404, if nothing is found for requested URL.
-	 *
-	 * Issue a 404 if a request doesn't match any posts and doesn't match
-	 * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
-	 * issued, and if the request was not a search or the homepage.
-	 *
-	 * Otherwise, issue a 200.
-	 *
-	 * This sets headers after posts have been queried. handle_404() really means "handle status."
-	 * By inspecting the result of querying posts, seemingly successful requests can be switched to
-	 * a 404 so that canonical redirection logic can kick in.
-	 *
-	 * @since 2.0.0
-     * @access public
-	 *
-	 * @global WP_Query $wp_query
+ 	 * Set the Headers for 404, if nothing is found for requested URL.
+ 	 *
+ 	 * Issue a 404 if a request doesn't match any posts and doesn't match
+ 	 * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
+ 	 * issued, and if the request was not a search or the homepage.
+ 	 *
+ 	 * Otherwise, issue a 200.
+ 	 *
+ 	 * This sets headers after posts have been queried. handle_404() really means "handle status."
+ 	 * By inspecting the result of querying posts, seemingly successful requests can be switched to
+ 	 * a 404 so that canonical redirection logic can kick in.
+ 	 *
+ 	 * @since 2.0.0
+ 	 * @access public
+ 	 *
+ 	 * @global WP_Query $wp_query
  	 */
 	public function handle_404() {
 		global $wp_query;

Spacing +142 added lines, -143 removed lines

@@ -15,7 +15,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
+	public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed');
 
 	/**
 	 * Private query variables.
@@ -26,7 +26,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'title' );
+	public $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'title');
 
 	/**
 	 * Extra query variables set by the user.
@@ -100,7 +100,7 @@ 
 	 * @param string $qv Query variable name.
 	 */
 	public function add_query_var($qv) {
-		if ( !in_array($qv, $this->public_query_vars) )
+		if ( ! in_array($qv, $this->public_query_vars))
 			$this->public_query_vars[] = $qv;
 	}
 
@@ -112,8 +112,8 @@ 
 	 *
 	 * @param string $name Query variable name.
 	 */
-	public function remove_query_var( $name ) {
-		$this->public_query_vars = array_diff( $this->public_query_vars, array( $name ) );
+	public function remove_query_var($name) {
+		$this->public_query_vars = array_diff($this->public_query_vars, array($name));
 	}
 
 	/**
@@ -154,35 +154,35 @@ 
 		 * @param WP           $this             Current WordPress environment instance.
 		 * @param array|string $extra_query_vars Extra passed query variables.
 		 */
-		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
+		if ( ! apply_filters('do_parse_request', true, $this, $extra_query_vars))
 			return;
 
 		$this->query_vars = array();
 		$post_type_query_vars = array();
 
-		if ( is_array( $extra_query_vars ) ) {
+		if (is_array($extra_query_vars)) {
 			$this->extra_query_vars = & $extra_query_vars;
-		} elseif ( ! empty( $extra_query_vars ) ) {
-			parse_str( $extra_query_vars, $this->extra_query_vars );
+		} elseif ( ! empty($extra_query_vars)) {
+			parse_str($extra_query_vars, $this->extra_query_vars);
 		}
 		// Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
 
 		// Fetch the rewrite rules.
 		$rewrite = $wp_rewrite->wp_rewrite_rules();
 
-		if ( ! empty($rewrite) ) {
+		if ( ! empty($rewrite)) {
 			// If we match a rewrite rule, this will be cleared.
 			$error = '404';
 			$this->did_permalink = true;
 
-			$pathinfo = isset( $_SERVER['PATH_INFO'] ) ? $_SERVER['PATH_INFO'] : '';
-			list( $pathinfo ) = explode( '?', $pathinfo );
-			$pathinfo = str_replace( "%", "%25", $pathinfo );
+			$pathinfo = isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '';
+			list($pathinfo) = explode('?', $pathinfo);
+			$pathinfo = str_replace("%", "%25", $pathinfo);
 
-			list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
+			list($req_uri) = explode('?', $_SERVER['REQUEST_URI']);
 			$self = $_SERVER['PHP_SELF'];
-			$home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
-			$home_path_regex = sprintf( '|^%s|i', preg_quote( $home_path, '|' ) );
+			$home_path = trim(parse_url(home_url(), PHP_URL_PATH), '/');
+			$home_path_regex = sprintf('|^%s|i', preg_quote($home_path, '|'));
 
 			// Trim path info from the end and the leading home path from the
 			// front. For path info requests, this leaves us with the requesting
@@ -190,22 +190,22 @@ 
 			// requested permalink.
 			$req_uri = str_replace($pathinfo, '', $req_uri);
 			$req_uri = trim($req_uri, '/');
-			$req_uri = preg_replace( $home_path_regex, '', $req_uri );
+			$req_uri = preg_replace($home_path_regex, '', $req_uri);
 			$req_uri = trim($req_uri, '/');
 			$pathinfo = trim($pathinfo, '/');
-			$pathinfo = preg_replace( $home_path_regex, '', $pathinfo );
+			$pathinfo = preg_replace($home_path_regex, '', $pathinfo);
 			$pathinfo = trim($pathinfo, '/');
 			$self = trim($self, '/');
-			$self = preg_replace( $home_path_regex, '', $self );
+			$self = preg_replace($home_path_regex, '', $self);
 			$self = trim($self, '/');
 
 			// The requested permalink is in $pathinfo for path info requests and
 			//  $req_uri for other requests.
-			if ( ! empty($pathinfo) && !preg_match('|^.*' . $wp_rewrite->index . '$|', $pathinfo) ) {
+			if ( ! empty($pathinfo) && ! preg_match('|^.*'.$wp_rewrite->index.'$|', $pathinfo)) {
 				$requested_path = $pathinfo;
 			} else {
 				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
-				if ( $req_uri == $wp_rewrite->index )
+				if ($req_uri == $wp_rewrite->index)
 					$req_uri = '';
 				$requested_path = $req_uri;
 			}
@@ -215,32 +215,32 @@ 
 
 			// Look for matches.
 			$request_match = $requested_path;
-			if ( empty( $request_match ) ) {
+			if (empty($request_match)) {
 				// An empty request could only match against ^$ regex
-				if ( isset( $rewrite['$'] ) ) {
+				if (isset($rewrite['$'])) {
 					$this->matched_rule = '$';
 					$query = $rewrite['$'];
 					$matches = array('');
 				}
 			} else {
-				foreach ( (array) $rewrite as $match => $query ) {
+				foreach ((array) $rewrite as $match => $query) {
 					// If the requested file is the anchor of the match, prepend it to the path info.
-					if ( ! empty($requested_file) && strpos($match, $requested_file) === 0 && $requested_file != $requested_path )
-						$request_match = $requested_file . '/' . $requested_path;
+					if ( ! empty($requested_file) && strpos($match, $requested_file) === 0 && $requested_file != $requested_path)
+						$request_match = $requested_file.'/'.$requested_path;
 
-					if ( preg_match("#^$match#", $request_match, $matches) ||
-						preg_match("#^$match#", urldecode($request_match), $matches) ) {
+					if (preg_match("#^$match#", $request_match, $matches) ||
+						preg_match("#^$match#", urldecode($request_match), $matches)) {
 
-						if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
+						if ($wp_rewrite->use_verbose_page_rules && preg_match('/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch)) {
 							// This is a verbose page match, let's check to be sure about it.
-							$page = get_page_by_path( $matches[ $varmatch[1] ] );
-							if ( ! $page ) {
+							$page = get_page_by_path($matches[$varmatch[1]]);
+							if ( ! $page) {
 						 		continue;
 							}
 
-							$post_status_obj = get_post_status_object( $page->post_status );
+							$post_status_obj = get_post_status_object($page->post_status);
 							if ( ! $post_status_obj->public && ! $post_status_obj->protected
-								&& ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
+								&& ! $post_status_obj->private && $post_status_obj->exclude_from_search) {
 								continue;
 							}
 						}
@@ -252,7 +252,7 @@ 
 				}
 			}
 
-			if ( isset( $this->matched_rule ) ) {
+			if (isset($this->matched_rule)) {
 				// Trim the query of everything up to the '?'.
 				$query = preg_replace("!^.+\?!", '', $query);
 
@@ -265,16 +265,16 @@ 
 				parse_str($query, $perma_query_vars);
 
 				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' == $error )
-					unset( $error, $_GET['error'] );
+				if ('404' == $error)
+					unset($error, $_GET['error']);
 			}
 
 			// If req_uri is empty or if it is a request for ourself, unset error.
-			if ( empty($requested_path) || $requested_file == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
-				unset( $error, $_GET['error'] );
+			if (empty($requested_path) || $requested_file == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false) {
+				unset($error, $_GET['error']);
 
-				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
-					unset( $perma_query_vars );
+				if (isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false)
+					unset($perma_query_vars);
 
 				$this->did_permalink = false;
 			}
@@ -291,36 +291,36 @@ 
 		 *
 		 * @param array $public_query_vars The array of whitelisted query variables.
 		 */
-		$this->public_query_vars = apply_filters( 'query_vars', $this->public_query_vars );
+		$this->public_query_vars = apply_filters('query_vars', $this->public_query_vars);
 
-		foreach ( get_post_types( array(), 'objects' ) as $post_type => $t ) {
-			if ( is_post_type_viewable( $t ) && $t->query_var ) {
+		foreach (get_post_types(array(), 'objects') as $post_type => $t) {
+			if (is_post_type_viewable($t) && $t->query_var) {
 				$post_type_query_vars[$t->query_var] = $post_type;
 			}
 		}
 
-		foreach ( $this->public_query_vars as $wpvar ) {
-			if ( isset( $this->extra_query_vars[$wpvar] ) )
+		foreach ($this->public_query_vars as $wpvar) {
+			if (isset($this->extra_query_vars[$wpvar]))
 				$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
-			elseif ( isset( $_POST[$wpvar] ) )
+			elseif (isset($_POST[$wpvar]))
 				$this->query_vars[$wpvar] = $_POST[$wpvar];
-			elseif ( isset( $_GET[$wpvar] ) )
+			elseif (isset($_GET[$wpvar]))
 				$this->query_vars[$wpvar] = $_GET[$wpvar];
-			elseif ( isset( $perma_query_vars[$wpvar] ) )
+			elseif (isset($perma_query_vars[$wpvar]))
 				$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
 
-			if ( !empty( $this->query_vars[$wpvar] ) ) {
-				if ( ! is_array( $this->query_vars[$wpvar] ) ) {
+			if ( ! empty($this->query_vars[$wpvar])) {
+				if ( ! is_array($this->query_vars[$wpvar])) {
 					$this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar];
 				} else {
-					foreach ( $this->query_vars[$wpvar] as $vkey => $v ) {
-						if ( !is_object( $v ) ) {
+					foreach ($this->query_vars[$wpvar] as $vkey => $v) {
+						if ( ! is_object($v)) {
 							$this->query_vars[$wpvar][$vkey] = (string) $v;
 						}
 					}
 				}
 
-				if ( isset($post_type_query_vars[$wpvar] ) ) {
+				if (isset($post_type_query_vars[$wpvar])) {
 					$this->query_vars['post_type'] = $post_type_query_vars[$wpvar];
 					$this->query_vars['name'] = $this->query_vars[$wpvar];
 				}
@@ -328,43 +328,43 @@ 
 		}
 
 		// Convert urldecoded spaces back into +
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t )
-			if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
-				$this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
+		foreach (get_taxonomies(array(), 'objects') as $taxonomy => $t)
+			if ($t->query_var && isset($this->query_vars[$t->query_var]))
+				$this->query_vars[$t->query_var] = str_replace(' ', '+', $this->query_vars[$t->query_var]);
 
 		// Don't allow non-publicly queryable taxonomies to be queried from the front end.
-		if ( ! is_admin() ) {
-			foreach ( get_taxonomies( array( 'publicly_queryable' => false ), 'objects' ) as $taxonomy => $t ) {
+		if ( ! is_admin()) {
+			foreach (get_taxonomies(array('publicly_queryable' => false), 'objects') as $taxonomy => $t) {
 				/*
 				 * Disallow when set to the 'taxonomy' query var.
 				 * Non-publicly queryable taxonomies cannot register custom query vars. See register_taxonomy().
 				 */
-				if ( isset( $this->query_vars['taxonomy'] ) && $taxonomy === $this->query_vars['taxonomy'] ) {
-					unset( $this->query_vars['taxonomy'], $this->query_vars['term'] );
+				if (isset($this->query_vars['taxonomy']) && $taxonomy === $this->query_vars['taxonomy']) {
+					unset($this->query_vars['taxonomy'], $this->query_vars['term']);
 				}
 			}
 		}
 
 		// Limit publicly queried post_types to those that are publicly_queryable
-		if ( isset( $this->query_vars['post_type']) ) {
-			$queryable_post_types = get_post_types( array('publicly_queryable' => true) );
-			if ( ! is_array( $this->query_vars['post_type'] ) ) {
-				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
-					unset( $this->query_vars['post_type'] );
+		if (isset($this->query_vars['post_type'])) {
+			$queryable_post_types = get_post_types(array('publicly_queryable' => true));
+			if ( ! is_array($this->query_vars['post_type'])) {
+				if ( ! in_array($this->query_vars['post_type'], $queryable_post_types))
+					unset($this->query_vars['post_type']);
 			} else {
-				$this->query_vars['post_type'] = array_intersect( $this->query_vars['post_type'], $queryable_post_types );
+				$this->query_vars['post_type'] = array_intersect($this->query_vars['post_type'], $queryable_post_types);
 			}
 		}
 
 		// Resolve conflicts between posts with numeric slugs and date archive queries.
-		$this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
+		$this->query_vars = wp_resolve_numeric_slug_conflicts($this->query_vars);
 
-		foreach ( (array) $this->private_query_vars as $var) {
-			if ( isset($this->extra_query_vars[$var]) )
+		foreach ((array) $this->private_query_vars as $var) {
+			if (isset($this->extra_query_vars[$var]))
 				$this->query_vars[$var] = $this->extra_query_vars[$var];
 		}
 
-		if ( isset($error) )
+		if (isset($error))
 			$this->query_vars['error'] = $error;
 
 		/**
@@ -374,7 +374,7 @@ 
 		 *
 		 * @param array $query_vars The array of requested query variables.
 		 */
-		$this->query_vars = apply_filters( 'request', $this->query_vars );
+		$this->query_vars = apply_filters('request', $this->query_vars);
 
 		/**
 		 * Fires once all query variables for the current request have been parsed.
@@ -383,7 +383,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'parse_request', array( &$this ) );
+		do_action_ref_array('parse_request', array(&$this));
 	}
 
 	/**
@@ -401,50 +401,50 @@ 
 		$status = null;
 		$exit_required = false;
 
-		if ( is_user_logged_in() )
+		if (is_user_logged_in())
 			$headers = array_merge($headers, wp_get_nocache_headers());
-		if ( ! empty( $this->query_vars['error'] ) ) {
+		if ( ! empty($this->query_vars['error'])) {
 			$status = (int) $this->query_vars['error'];
-			if ( 404 === $status ) {
-				if ( ! is_user_logged_in() )
+			if (404 === $status) {
+				if ( ! is_user_logged_in())
 					$headers = array_merge($headers, wp_get_nocache_headers());
-				$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
-			} elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
+				$headers['Content-Type'] = get_option('html_type').'; charset='.get_option('blog_charset');
+			} elseif (in_array($status, array(403, 500, 502, 503))) {
 				$exit_required = true;
 			}
-		} elseif ( empty( $this->query_vars['feed'] ) ) {
-			$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
+		} elseif (empty($this->query_vars['feed'])) {
+			$headers['Content-Type'] = get_option('html_type').'; charset='.get_option('blog_charset');
 		} else {
 			// Set the correct content type for feeds
 			$type = $this->query_vars['feed'];
-			if ( 'feed' == $this->query_vars['feed'] ) {
+			if ('feed' == $this->query_vars['feed']) {
 				$type = get_default_feed();
 			}
-			$headers['Content-Type'] = feed_content_type( $type ) . '; charset=' . get_option( 'blog_charset' );
+			$headers['Content-Type'] = feed_content_type($type).'; charset='.get_option('blog_charset');
 
 			// We're showing a feed, so WP is indeed the only thing that last changed
-			if ( !empty($this->query_vars['withcomments'])
-				|| false !== strpos( $this->query_vars['feed'], 'comments-' )
-				|| ( empty($this->query_vars['withoutcomments'])
-					&& ( !empty($this->query_vars['p'])
-						|| !empty($this->query_vars['name'])
-						|| !empty($this->query_vars['page_id'])
-						|| !empty($this->query_vars['pagename'])
-						|| !empty($this->query_vars['attachment'])
-						|| !empty($this->query_vars['attachment_id'])
+			if ( ! empty($this->query_vars['withcomments'])
+				|| false !== strpos($this->query_vars['feed'], 'comments-')
+				|| (empty($this->query_vars['withoutcomments'])
+					&& ( ! empty($this->query_vars['p'])
+						|| ! empty($this->query_vars['name'])
+						|| ! empty($this->query_vars['page_id'])
+						|| ! empty($this->query_vars['pagename'])
+						|| ! empty($this->query_vars['attachment'])
+						|| ! empty($this->query_vars['attachment_id'])
 					)
 				)
 			)
 				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
 			else
 				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
-			$wp_etag = '"' . md5($wp_last_modified) . '"';
+			$wp_etag = '"'.md5($wp_last_modified).'"';
 			$headers['Last-Modified'] = $wp_last_modified;
 			$headers['ETag'] = $wp_etag;
 
 			// Support for Conditional GET
 			if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-				$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
+				$client_etag = wp_unslash($_SERVER['HTTP_IF_NONE_MATCH']);
 			else $client_etag = false;
 
 			$client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
@@ -454,9 +454,8 @@ 
 			// Make a timestamp for our most recent modification...
 			$wp_modified_timestamp = strtotime($wp_last_modified);
 
-			if ( ($client_last_modified && $client_etag) ?
-					 (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
-					 (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
+			if (($client_last_modified && $client_etag) ?
+					 (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) : (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag))) {
 				$status = 304;
 				$exit_required = true;
 			}
@@ -470,23 +469,23 @@ 
 		 * @param array $headers The list of headers to be sent.
 		 * @param WP    $this    Current WordPress environment instance.
 		 */
-		$headers = apply_filters( 'wp_headers', $headers, $this );
+		$headers = apply_filters('wp_headers', $headers, $this);
 
-		if ( ! empty( $status ) )
-			status_header( $status );
+		if ( ! empty($status))
+			status_header($status);
 
 		// If Last-Modified is set to false, it should not be sent (no-cache situation).
-		if ( isset( $headers['Last-Modified'] ) && false === $headers['Last-Modified'] ) {
-			unset( $headers['Last-Modified'] );
+		if (isset($headers['Last-Modified']) && false === $headers['Last-Modified']) {
+			unset($headers['Last-Modified']);
 
 			// In PHP 5.3+, make sure we are not sending a Last-Modified header.
-			if ( function_exists( 'header_remove' ) ) {
-				@header_remove( 'Last-Modified' );
+			if (function_exists('header_remove')) {
+				@header_remove('Last-Modified');
 			} else {
 				// In PHP 5.2, send an empty Last-Modified header, but only as a
 				// last resort to override a header already sent. #WP23021
-				foreach ( headers_list() as $header ) {
-					if ( 0 === stripos( $header, 'Last-Modified' ) ) {
+				foreach (headers_list() as $header) {
+					if (0 === stripos($header, 'Last-Modified')) {
 						$headers['Last-Modified'] = '';
 						break;
 					}
@@ -494,10 +493,10 @@ 
 			}
 		}
 
-		foreach ( (array) $headers as $name => $field_value )
+		foreach ((array) $headers as $name => $field_value)
 			@header("{$name}: {$field_value}");
 
-		if ( $exit_required )
+		if ($exit_required)
 			exit();
 
 		/**
@@ -507,7 +506,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'send_headers', array( &$this ) );
+		do_action_ref_array('send_headers', array(&$this));
 	}
 
 	/**
@@ -521,16 +520,16 @@ 
 	 */
 	public function build_query_string() {
 		$this->query_string = '';
-		foreach ( (array) array_keys($this->query_vars) as $wpvar) {
-			if ( '' != $this->query_vars[$wpvar] ) {
+		foreach ((array) array_keys($this->query_vars) as $wpvar) {
+			if ('' != $this->query_vars[$wpvar]) {
 				$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
-				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
+				if ( ! is_scalar($this->query_vars[$wpvar])) // Discard non-scalars.
 					continue;
-				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
+				$this->query_string .= $wpvar.'='.rawurlencode($this->query_vars[$wpvar]);
 			}
 		}
 
-		if ( has_filter( 'query_string' ) ) {  // Don't bother filtering and parsing if no plugins are hooked in.
+		if (has_filter('query_string')) {  // Don't bother filtering and parsing if no plugins are hooked in.
 			/**
 			 * Filters the query string before parsing.
 			 *
@@ -539,7 +538,7 @@ 
 			 *
 			 * @param string $query_string The query string to modify.
 			 */
-			$this->query_string = apply_filters( 'query_string', $this->query_string );
+			$this->query_string = apply_filters('query_string', $this->query_string);
 			parse_str($this->query_string, $this->query_vars);
 		}
 	}
@@ -567,22 +566,22 @@ 
 		global $wp_query;
 
 		// Extract updated query vars back into global namespace.
-		foreach ( (array) $wp_query->query_vars as $key => $value ) {
-			$GLOBALS[ $key ] = $value;
+		foreach ((array) $wp_query->query_vars as $key => $value) {
+			$GLOBALS[$key] = $value;
 		}
 
 		$GLOBALS['query_string'] = $this->query_string;
 		$GLOBALS['posts'] = & $wp_query->posts;
-		$GLOBALS['post'] = isset( $wp_query->post ) ? $wp_query->post : null;
+		$GLOBALS['post'] = isset($wp_query->post) ? $wp_query->post : null;
 		$GLOBALS['request'] = $wp_query->request;
 
-		if ( $wp_query->is_single() || $wp_query->is_page() ) {
+		if ($wp_query->is_single() || $wp_query->is_page()) {
 			$GLOBALS['more']   = 1;
 			$GLOBALS['single'] = 1;
 		}
 
-		if ( $wp_query->is_author() && isset( $wp_query->post ) )
-			$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		if ($wp_query->is_author() && isset($wp_query->post))
+			$GLOBALS['authordata'] = get_userdata($wp_query->post->post_author);
 	}
 
 	/**
@@ -641,70 +640,70 @@ 
 		 * @param bool     $preempt  Whether to short-circuit default header status handling. Default false.
 		 * @param WP_Query $wp_query WordPress Query object.
 		 */
-		if ( false !== apply_filters( 'pre_handle_404', false, $wp_query ) ) {
+		if (false !== apply_filters('pre_handle_404', false, $wp_query)) {
 			return;
 		}
 
 		// If we've already issued a 404, bail.
-		if ( is_404() )
+		if (is_404())
 			return;
 
 		// Never 404 for the admin, robots, or if we found posts.
-		if ( is_admin() || is_robots() || $wp_query->posts ) {
+		if (is_admin() || is_robots() || $wp_query->posts) {
 
 			$success = true;
-			if ( is_singular() ) {
+			if (is_singular()) {
 				$p = false;
 
-				if ( $wp_query->post instanceof WP_Post ) {
+				if ($wp_query->post instanceof WP_Post) {
 					$p = clone $wp_query->post;
 				}
 
 				// Only set X-Pingback for single posts that allow pings.
-				if ( $p && pings_open( $p ) ) {
-					@header( 'X-Pingback: ' . get_bloginfo( 'pingback_url' ) );
+				if ($p && pings_open($p)) {
+					@header('X-Pingback: '.get_bloginfo('pingback_url'));
 				}
 
 				// check for paged content that exceeds the max number of pages
 				$next = '<!--nextpage-->';
-				if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $this->query_vars['page'] ) ) {
-					$page = trim( $this->query_vars['page'], '/' );
-					$success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 );
+				if ($p && false !== strpos($p->post_content, $next) && ! empty($this->query_vars['page'])) {
+					$page = trim($this->query_vars['page'], '/');
+					$success = (int) $page <= (substr_count($p->post_content, $next) + 1);
 				}
 			}
 
-			if ( $success ) {
-				status_header( 200 );
+			if ($success) {
+				status_header(200);
 				return;
 			}
 		}
 
 		// We will 404 for paged queries, as no posts were found.
-		if ( ! is_paged() ) {
+		if ( ! is_paged()) {
 
 			// Don't 404 for authors without posts as long as they matched an author on this site.
-			$author = get_query_var( 'author' );
-			if ( is_author() && is_numeric( $author ) && $author > 0 && is_user_member_of_blog( $author ) ) {
-				status_header( 200 );
+			$author = get_query_var('author');
+			if (is_author() && is_numeric($author) && $author > 0 && is_user_member_of_blog($author)) {
+				status_header(200);
 				return;
 			}
 
 			// Don't 404 for these queries if they matched an object.
-			if ( ( is_tag() || is_category() || is_tax() || is_post_type_archive() ) && get_queried_object() ) {
-				status_header( 200 );
+			if ((is_tag() || is_category() || is_tax() || is_post_type_archive()) && get_queried_object()) {
+				status_header(200);
 				return;
 			}
 
 			// Don't 404 for these queries either.
-			if ( is_home() || is_search() || is_feed() ) {
-				status_header( 200 );
+			if (is_home() || is_search() || is_feed()) {
+				status_header(200);
 				return;
 			}
 		}
 
 		// Guess it's time to 404.
 		$wp_query->set_404();
-		status_header( 404 );
+		status_header(404);
 		nocache_headers();
 	}
 
@@ -735,7 +734,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'wp', array( &$this ) );
+		do_action_ref_array('wp', array(&$this));
 	}
 }
 
@@ -825,6 +824,6 @@ 
 	 */
 	public function callback($matches) {
 		$index = intval(substr($matches[0], 9, -1));
-		return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
+		return (isset($this->_matches[$index]) ? urlencode($this->_matches[$index]) : '');
 	}
 }

Braces +73 added lines, -50 removed lines

@@ -100,8 +100,9 @@ 
 	 * @param string $qv Query variable name.
 	 */
 	public function add_query_var($qv) {
-		if ( !in_array($qv, $this->public_query_vars) )
-			$this->public_query_vars[] = $qv;
+		if ( !in_array($qv, $this->public_query_vars) ) {
+					$this->public_query_vars[] = $qv;
+		}
 	}
 
 	/**
@@ -154,8 +155,9 @@ 
 		 * @param WP           $this             Current WordPress environment instance.
 		 * @param array|string $extra_query_vars Extra passed query variables.
 		 */
-		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
-			return;
+		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) ) {
+					return;
+		}
 
 		$this->query_vars = array();
 		$post_type_query_vars = array();
@@ -205,8 +207,9 @@ 
 				$requested_path = $pathinfo;
 			} else {
 				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
-				if ( $req_uri == $wp_rewrite->index )
-					$req_uri = '';
+				if ( $req_uri == $wp_rewrite->index ) {
+									$req_uri = '';
+				}
 				$requested_path = $req_uri;
 			}
 			$requested_file = $req_uri;
@@ -225,8 +228,9 @@ 
 			} else {
 				foreach ( (array) $rewrite as $match => $query ) {
 					// If the requested file is the anchor of the match, prepend it to the path info.
-					if ( ! empty($requested_file) && strpos($match, $requested_file) === 0 && $requested_file != $requested_path )
-						$request_match = $requested_file . '/' . $requested_path;
+					if ( ! empty($requested_file) && strpos($match, $requested_file) === 0 && $requested_file != $requested_path ) {
+											$request_match = $requested_file . '/' . $requested_path;
+					}
 
 					if ( preg_match("#^$match#", $request_match, $matches) ||
 						preg_match("#^$match#", urldecode($request_match), $matches) ) {
@@ -265,16 +269,18 @@ 
 				parse_str($query, $perma_query_vars);
 
 				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' == $error )
-					unset( $error, $_GET['error'] );
+				if ( '404' == $error ) {
+									unset( $error, $_GET['error'] );
+				}
 			}
 
 			// If req_uri is empty or if it is a request for ourself, unset error.
 			if ( empty($requested_path) || $requested_file == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
 				unset( $error, $_GET['error'] );
 
-				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
-					unset( $perma_query_vars );
+				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
+									unset( $perma_query_vars );
+				}
 
 				$this->did_permalink = false;
 			}
@@ -300,14 +306,15 @@ 
 		}
 
 		foreach ( $this->public_query_vars as $wpvar ) {
-			if ( isset( $this->extra_query_vars[$wpvar] ) )
-				$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
-			elseif ( isset( $_POST[$wpvar] ) )
-				$this->query_vars[$wpvar] = $_POST[$wpvar];
-			elseif ( isset( $_GET[$wpvar] ) )
-				$this->query_vars[$wpvar] = $_GET[$wpvar];
-			elseif ( isset( $perma_query_vars[$wpvar] ) )
-				$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
+			if ( isset( $this->extra_query_vars[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
+			} elseif ( isset( $_POST[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $_POST[$wpvar];
+			} elseif ( isset( $_GET[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $_GET[$wpvar];
+			} elseif ( isset( $perma_query_vars[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
+			}
 
 			if ( !empty( $this->query_vars[$wpvar] ) ) {
 				if ( ! is_array( $this->query_vars[$wpvar] ) ) {
@@ -328,9 +335,10 @@ 
 		}
 
 		// Convert urldecoded spaces back into +
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t )
-			if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
+		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
+					if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
 				$this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
+		}
 
 		// Don't allow non-publicly queryable taxonomies to be queried from the front end.
 		if ( ! is_admin() ) {
@@ -349,8 +357,9 @@ 
 		if ( isset( $this->query_vars['post_type']) ) {
 			$queryable_post_types = get_post_types( array('publicly_queryable' => true) );
 			if ( ! is_array( $this->query_vars['post_type'] ) ) {
-				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
-					unset( $this->query_vars['post_type'] );
+				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) ) {
+									unset( $this->query_vars['post_type'] );
+				}
 			} else {
 				$this->query_vars['post_type'] = array_intersect( $this->query_vars['post_type'], $queryable_post_types );
 			}
@@ -360,12 +369,14 @@ 
 		$this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
 
 		foreach ( (array) $this->private_query_vars as $var) {
-			if ( isset($this->extra_query_vars[$var]) )
-				$this->query_vars[$var] = $this->extra_query_vars[$var];
+			if ( isset($this->extra_query_vars[$var]) ) {
+							$this->query_vars[$var] = $this->extra_query_vars[$var];
+			}
 		}
 
-		if ( isset($error) )
-			$this->query_vars['error'] = $error;
+		if ( isset($error) ) {
+					$this->query_vars['error'] = $error;
+		}
 
 		/**
 		 * Filters the array of parsed query variables.
@@ -401,13 +412,15 @@ 
 		$status = null;
 		$exit_required = false;
 
-		if ( is_user_logged_in() )
-			$headers = array_merge($headers, wp_get_nocache_headers());
+		if ( is_user_logged_in() ) {
+					$headers = array_merge($headers, wp_get_nocache_headers());
+		}
 		if ( ! empty( $this->query_vars['error'] ) ) {
 			$status = (int) $this->query_vars['error'];
 			if ( 404 === $status ) {
-				if ( ! is_user_logged_in() )
-					$headers = array_merge($headers, wp_get_nocache_headers());
+				if ( ! is_user_logged_in() ) {
+									$headers = array_merge($headers, wp_get_nocache_headers());
+				}
 				$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
 			} elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
 				$exit_required = true;
@@ -434,18 +447,21 @@ 
 						|| !empty($this->query_vars['attachment_id'])
 					)
 				)
-			)
-				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
-			else
-				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
+			) {
+							$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
+			} else {
+							$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
+			}
 			$wp_etag = '"' . md5($wp_last_modified) . '"';
 			$headers['Last-Modified'] = $wp_last_modified;
 			$headers['ETag'] = $wp_etag;
 
 			// Support for Conditional GET
-			if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-				$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
-			else $client_etag = false;
+			if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+							$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
+			} else {
+				$client_etag = false;
+			}
 
 			$client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
 			// If string is empty, return 0. If not, attempt to parse into a timestamp
@@ -472,8 +488,9 @@ 
 		 */
 		$headers = apply_filters( 'wp_headers', $headers, $this );
 
-		if ( ! empty( $status ) )
-			status_header( $status );
+		if ( ! empty( $status ) ) {
+					status_header( $status );
+		}
 
 		// If Last-Modified is set to false, it should not be sent (no-cache situation).
 		if ( isset( $headers['Last-Modified'] ) && false === $headers['Last-Modified'] ) {
@@ -494,11 +511,13 @@ 
 			}
 		}
 
-		foreach ( (array) $headers as $name => $field_value )
-			@header("{$name}: {$field_value}");
+		foreach ( (array) $headers as $name => $field_value ) {
+					@header("{$name}: {$field_value}");
+		}
 
-		if ( $exit_required )
-			exit();
+		if ( $exit_required ) {
+					exit();
+		}
 
 		/**
 		 * Fires once the requested HTTP headers for caching, content type, etc. have been sent.
@@ -524,8 +543,10 @@ 
 		foreach ( (array) array_keys($this->query_vars) as $wpvar) {
 			if ( '' != $this->query_vars[$wpvar] ) {
 				$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
-				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
+				if ( !is_scalar($this->query_vars[$wpvar]) ) {
+					// Discard non-scalars.
 					continue;
+				}
 				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
 			}
 		}
@@ -581,8 +602,9 @@ 
 			$GLOBALS['single'] = 1;
 		}
 
-		if ( $wp_query->is_author() && isset( $wp_query->post ) )
-			$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		if ( $wp_query->is_author() && isset( $wp_query->post ) ) {
+					$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		}
 	}
 
 	/**
@@ -646,8 +668,9 @@ 
 		}
 
 		// If we've already issued a 404, bail.
-		if ( is_404() )
-			return;
+		if ( is_404() ) {
+					return;
+		}
 
 		// Never 404 for the admin, robots, or if we found posts.
 		if ( is_admin() || is_robots() || $wp_query->posts ) {

src/wp-includes/class.wp-dependencies.php

Doc Comments +3 added lines, -3 removed lines

@@ -270,7 +270,7 @@ 
 	 * @access public
 	 * @since 2.1.0
 	 *
-	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
+	 * @param string $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 * @return void
 	 */
 	public function remove( $handles ) {
@@ -289,7 +289,7 @@ 
 	 * @access public
 	 * @since 2.1.0
 	 *
-	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
+	 * @param string $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 */
 	public function enqueue( $handles ) {
 		foreach ( (array) $handles as $handle ) {
@@ -311,7 +311,7 @@ 
 	 * @access public
 	 * @since 2.1.0
 	 *
-	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
+	 * @param string $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 */
 	public function dequeue( $handles ) {
 		foreach ( (array) $handles as $handle ) {

Spacing +60 added lines, -60 removed lines

@@ -95,26 +95,26 @@ 
 	 * @param mixed $group   Group level: level (int), no groups (false).
 	 * @return array Handles of items that have been processed.
 	 */
-	public function do_items( $handles = false, $group = false ) {
+	public function do_items($handles = false, $group = false) {
 		/*
 		 * If nothing is passed, print the queue. If a string is passed,
 		 * print that item. If an array is passed, print those items.
 		 */
 		$handles = false === $handles ? $this->queue : (array) $handles;
-		$this->all_deps( $handles );
+		$this->all_deps($handles);
 
-		foreach ( $this->to_do as $key => $handle ) {
-			if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
+		foreach ($this->to_do as $key => $handle) {
+			if ( ! in_array($handle, $this->done, true) && isset($this->registered[$handle])) {
 				/*
 				 * Attempt to process the item. If successful,
 				 * add the handle to the done array.
 				 *
 				 * Unset the item from the to_do array.
 				 */
-				if ( $this->do_item( $handle, $group ) )
+				if ($this->do_item($handle, $group))
 					$this->done[] = $handle;
 
-				unset( $this->to_do[$key] );
+				unset($this->to_do[$key]);
 			}
 		}
 
@@ -130,7 +130,7 @@ 
 	 * @param string $handle Name of the item. Should be unique.
 	 * @return bool True on success, false if not set.
 	 */
-	public function do_item( $handle ) {
+	public function do_item($handle) {
 		return isset($this->registered[$handle]);
 	}
 
@@ -150,43 +150,43 @@ 
 	 * @param int|false $group     Group level: (int) level, (false) no groups.
 	 * @return bool True on success, false on failure.
 	 */
-	public function all_deps( $handles, $recursion = false, $group = false ) {
-		if ( !$handles = (array) $handles )
+	public function all_deps($handles, $recursion = false, $group = false) {
+		if ( ! $handles = (array) $handles)
 			return false;
 
-		foreach ( $handles as $handle ) {
+		foreach ($handles as $handle) {
 			$handle_parts = explode('?', $handle);
 			$handle = $handle_parts[0];
 			$queued = in_array($handle, $this->to_do, true);
 
-			if ( in_array($handle, $this->done, true) ) // Already done
+			if (in_array($handle, $this->done, true)) // Already done
 				continue;
 
-			$moved     = $this->set_group( $handle, $recursion, $group );
-			$new_group = $this->groups[ $handle ];
+			$moved     = $this->set_group($handle, $recursion, $group);
+			$new_group = $this->groups[$handle];
 
-			if ( $queued && !$moved ) // already queued and in the right group
+			if ($queued && ! $moved) // already queued and in the right group
 				continue;
 
 			$keep_going = true;
-			if ( !isset($this->registered[$handle]) )
+			if ( ! isset($this->registered[$handle]))
 				$keep_going = false; // Item doesn't exist.
-			elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
+			elseif ($this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)))
 				$keep_going = false; // Item requires dependencies that don't exist.
-			elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) )
+			elseif ($this->registered[$handle]->deps && ! $this->all_deps($this->registered[$handle]->deps, true, $new_group))
 				$keep_going = false; // Item requires dependencies that don't exist.
 
-			if ( ! $keep_going ) { // Either item or its dependencies don't exist.
-				if ( $recursion )
+			if ( ! $keep_going) { // Either item or its dependencies don't exist.
+				if ($recursion)
 					return false; // Abort this branch.
 				else
 					continue; // We're at the top level. Move on to the next one.
 			}
 
-			if ( $queued ) // Already grabbed it and its dependencies.
+			if ($queued) // Already grabbed it and its dependencies.
 				continue;
 
-			if ( isset($handle_parts[1]) )
+			if (isset($handle_parts[1]))
 				$this->args[$handle] = $handle_parts[1];
 
 			$this->to_do[] = $handle;
@@ -214,10 +214,10 @@ 
 	 * @param mixed            $args   Optional. Custom property of the item. NOT the class property $args. Examples: $media, $in_footer. 
 	 * @return bool Whether the item has been registered. True on success, false on failure.
 	 */
-	public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
-		if ( isset($this->registered[$handle]) )
+	public function add($handle, $src, $deps = array(), $ver = false, $args = null) {
+		if (isset($this->registered[$handle]))
 			return false;
-		$this->registered[$handle] = new _WP_Dependency( $handle, $src, $deps, $ver, $args );
+		$this->registered[$handle] = new _WP_Dependency($handle, $src, $deps, $ver, $args);
 		return true;
 	}
 
@@ -234,11 +234,11 @@ 
 	 * @param mixed  $value  The data value.
 	 * @return bool True on success, false on failure.
 	 */
-	public function add_data( $handle, $key, $value ) {
-		if ( !isset( $this->registered[$handle] ) )
+	public function add_data($handle, $key, $value) {
+		if ( ! isset($this->registered[$handle]))
 			return false;
 
-		return $this->registered[$handle]->add_data( $key, $value );
+		return $this->registered[$handle]->add_data($key, $value);
 	}
 
 	/**
@@ -253,11 +253,11 @@ 
 	 * @param string $key    The data key.
 	 * @return mixed Extra item data (string), false otherwise.
 	 */
-	public function get_data( $handle, $key ) {
-		if ( !isset( $this->registered[$handle] ) )
+	public function get_data($handle, $key) {
+		if ( ! isset($this->registered[$handle]))
 			return false;
 
-		if ( !isset( $this->registered[$handle]->extra[$key] ) )
+		if ( ! isset($this->registered[$handle]->extra[$key]))
 			return false;
 
 		return $this->registered[$handle]->extra[$key];
@@ -273,8 +273,8 @@ 
 	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 * @return void
 	 */
-	public function remove( $handles ) {
-		foreach ( (array) $handles as $handle )
+	public function remove($handles) {
+		foreach ((array) $handles as $handle)
 			unset($this->registered[$handle]);
 	}
 
@@ -292,12 +292,12 @@ 
 	 *
 	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 */
-	public function enqueue( $handles ) {
-		foreach ( (array) $handles as $handle ) {
+	public function enqueue($handles) {
+		foreach ((array) $handles as $handle) {
 			$handle = explode('?', $handle);
-			if ( !in_array($handle[0], $this->queue) && isset($this->registered[$handle[0]]) ) {
+			if ( ! in_array($handle[0], $this->queue) && isset($this->registered[$handle[0]])) {
 				$this->queue[] = $handle[0];
-				if ( isset($handle[1]) )
+				if (isset($handle[1]))
 					$this->args[$handle[0]] = $handle[1];
 			}
 		}
@@ -315,11 +315,11 @@ 
 	 *
 	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 */
-	public function dequeue( $handles ) {
-		foreach ( (array) $handles as $handle ) {
+	public function dequeue($handles) {
+		foreach ((array) $handles as $handle) {
 			$handle = explode('?', $handle);
 			$key = array_search($handle[0], $this->queue);
-			if ( false !== $key ) {
+			if (false !== $key) {
 				unset($this->queue[$key]);
 				unset($this->args[$handle[0]]);
 			}
@@ -335,15 +335,15 @@ 
 	 * @param string $handle Name of the item. Should be unique.
 	 * @return bool Whether the handle is found after recursively searching the dependency tree.
 	 */
-	protected function recurse_deps( $queue, $handle ) {
-		foreach ( $queue as $queued ) {
-			if ( ! isset( $this->registered[ $queued ] ) ) {
+	protected function recurse_deps($queue, $handle) {
+		foreach ($queue as $queued) {
+			if ( ! isset($this->registered[$queued])) {
 				continue;
 			}
 
-			if ( in_array( $handle, $this->registered[ $queued ]->deps ) ) {
+			if (in_array($handle, $this->registered[$queued]->deps)) {
 				return true;
-			} elseif ( $this->recurse_deps( $this->registered[ $queued ]->deps, $handle ) ) {
+			} elseif ($this->recurse_deps($this->registered[$queued]->deps, $handle)) {
 				return true;
 			}
 		}
@@ -362,28 +362,28 @@ 
 	 * @param string $list   Property name of list array.
 	 * @return bool|_WP_Dependency Found, or object Item data.
 	 */
-	public function query( $handle, $list = 'registered' ) {
-		switch ( $list ) {
+	public function query($handle, $list = 'registered') {
+		switch ($list) {
 			case 'registered' :
 			case 'scripts': // back compat
-				if ( isset( $this->registered[ $handle ] ) )
-					return $this->registered[ $handle ];
+				if (isset($this->registered[$handle]))
+					return $this->registered[$handle];
 				return false;
 
 			case 'enqueued' :
 			case 'queue' :
-				if ( in_array( $handle, $this->queue ) ) {
+				if (in_array($handle, $this->queue)) {
 					return true;
 				}
-				return $this->recurse_deps( $this->queue, $handle );
+				return $this->recurse_deps($this->queue, $handle);
 
 			case 'to_do' :
 			case 'to_print': // back compat
-				return in_array( $handle, $this->to_do );
+				return in_array($handle, $this->to_do);
 
 			case 'done' :
 			case 'printed': // back compat
-				return in_array( $handle, $this->done );
+				return in_array($handle, $this->done);
 		}
 		return false;
 	}
@@ -399,14 +399,14 @@ 
 	 * @param mixed  $group     Group level.
 	 * @return bool Not already in the group or a lower group
 	 */
-	public function set_group( $handle, $recursion, $group ) {
+	public function set_group($handle, $recursion, $group) {
 		$group = (int) $group;
 
-		if ( isset( $this->groups[ $handle ] ) && $this->groups[ $handle ] <= $group ) {
+		if (isset($this->groups[$handle]) && $this->groups[$handle] <= $group) {
 			return false;
 		}
 
-		$this->groups[ $handle ] = $group;
+		$this->groups[$handle] = $group;
 
 		return true;
 	}
@@ -467,7 +467,7 @@ 
 	 * @since 2.6.0
 	 * @var null
 	 */
-	public $args = null;  // Custom property, such as $in_footer or $media.
+	public $args = null; // Custom property, such as $in_footer or $media.
 
 	/**
 	 * Extra data to supply to the handle.
@@ -484,8 +484,8 @@ 
 	 * @since 2.6.0
 	 */
 	public function __construct() {
-		@list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
-		if ( ! is_array($this->deps) )
+		@list($this->handle, $this->src, $this->deps, $this->ver, $this->args) = func_get_args();
+		if ( ! is_array($this->deps))
 			$this->deps = array();
 	}
 
@@ -499,8 +499,8 @@ 
 	 * @param mixed  $data The data value to add.
 	 * @return bool False if not scalar, true otherwise.
 	 */
-	public function add_data( $name, $data ) {
-		if ( !is_scalar($name) )
+	public function add_data($name, $data) {
+		if ( ! is_scalar($name))
 			return false;
 		$this->extra[$name] = $data;
 		return true;

Braces +65 added lines, -37 removed lines

@@ -111,8 +111,9 @@ 
 				 *
 				 * Unset the item from the to_do array.
 				 */
-				if ( $this->do_item( $handle, $group ) )
-					$this->done[] = $handle;
+				if ( $this->do_item( $handle, $group ) ) {
+									$this->done[] = $handle;
+				}
 
 				unset( $this->to_do[$key] );
 			}
@@ -151,43 +152,61 @@ 
 	 * @return bool True on success, false on failure.
 	 */
 	public function all_deps( $handles, $recursion = false, $group = false ) {
-		if ( !$handles = (array) $handles )
-			return false;
+		if ( !$handles = (array) $handles ) {
+					return false;
+		}
 
 		foreach ( $handles as $handle ) {
 			$handle_parts = explode('?', $handle);
 			$handle = $handle_parts[0];
 			$queued = in_array($handle, $this->to_do, true);
 
-			if ( in_array($handle, $this->done, true) ) // Already done
+			if ( in_array($handle, $this->done, true) ) {
+				// Already done
 				continue;
+			}
 
 			$moved     = $this->set_group( $handle, $recursion, $group );
 			$new_group = $this->groups[ $handle ];
 
-			if ( $queued && !$moved ) // already queued and in the right group
+			if ( $queued && !$moved ) {
+				// already queued and in the right group
 				continue;
+			}
 
 			$keep_going = true;
-			if ( !isset($this->registered[$handle]) )
-				$keep_going = false; // Item doesn't exist.
-			elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
-				$keep_going = false; // Item requires dependencies that don't exist.
-			elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) )
-				$keep_going = false; // Item requires dependencies that don't exist.
+			if ( !isset($this->registered[$handle]) ) {
+							$keep_going = false;
+			}
+			// Item doesn't exist.
+			elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) ) {
+							$keep_going = false;
+			}
+			// Item requires dependencies that don't exist.
+			elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) ) {
+							$keep_going = false;
+			}
+			// Item requires dependencies that don't exist.
 
 			if ( ! $keep_going ) { // Either item or its dependencies don't exist.
-				if ( $recursion )
-					return false; // Abort this branch.
-				else
-					continue; // We're at the top level. Move on to the next one.
+				if ( $recursion ) {
+									return false;
+				}
+				// Abort this branch.
+				else {
+									continue;
+				}
+				// We're at the top level. Move on to the next one.
 			}
 
-			if ( $queued ) // Already grabbed it and its dependencies.
+			if ( $queued ) {
+				// Already grabbed it and its dependencies.
 				continue;
+			}
 
-			if ( isset($handle_parts[1]) )
-				$this->args[$handle] = $handle_parts[1];
+			if ( isset($handle_parts[1]) ) {
+							$this->args[$handle] = $handle_parts[1];
+			}
 
 			$this->to_do[] = $handle;
 		}
@@ -215,8 +234,9 @@ 
 	 * @return bool Whether the item has been registered. True on success, false on failure.
 	 */
 	public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
-		if ( isset($this->registered[$handle]) )
-			return false;
+		if ( isset($this->registered[$handle]) ) {
+					return false;
+		}
 		$this->registered[$handle] = new _WP_Dependency( $handle, $src, $deps, $ver, $args );
 		return true;
 	}
@@ -235,8 +255,9 @@ 
 	 * @return bool True on success, false on failure.
 	 */
 	public function add_data( $handle, $key, $value ) {
-		if ( !isset( $this->registered[$handle] ) )
-			return false;
+		if ( !isset( $this->registered[$handle] ) ) {
+					return false;
+		}
 
 		return $this->registered[$handle]->add_data( $key, $value );
 	}
@@ -254,11 +275,13 @@ 
 	 * @return mixed Extra item data (string), false otherwise.
 	 */
 	public function get_data( $handle, $key ) {
-		if ( !isset( $this->registered[$handle] ) )
-			return false;
+		if ( !isset( $this->registered[$handle] ) ) {
+					return false;
+		}
 
-		if ( !isset( $this->registered[$handle]->extra[$key] ) )
-			return false;
+		if ( !isset( $this->registered[$handle]->extra[$key] ) ) {
+					return false;
+		}
 
 		return $this->registered[$handle]->extra[$key];
 	}
@@ -274,8 +297,9 @@ 
 	 * @return void
 	 */
 	public function remove( $handles ) {
-		foreach ( (array) $handles as $handle )
-			unset($this->registered[$handle]);
+		foreach ( (array) $handles as $handle ) {
+					unset($this->registered[$handle]);
+		}
 	}
 
 	/**
@@ -297,8 +321,9 @@ 
 			$handle = explode('?', $handle);
 			if ( !in_array($handle[0], $this->queue) && isset($this->registered[$handle[0]]) ) {
 				$this->queue[] = $handle[0];
-				if ( isset($handle[1]) )
-					$this->args[$handle[0]] = $handle[1];
+				if ( isset($handle[1]) ) {
+									$this->args[$handle[0]] = $handle[1];
+				}
 			}
 		}
 	}
@@ -366,8 +391,9 @@ 
 		switch ( $list ) {
 			case 'registered' :
 			case 'scripts': // back compat
-				if ( isset( $this->registered[ $handle ] ) )
-					return $this->registered[ $handle ];
+				if ( isset( $this->registered[ $handle ] ) ) {
+									return $this->registered[ $handle ];
+				}
 				return false;
 
 			case 'enqueued' :
@@ -485,8 +511,9 @@ 
 	 */
 	public function __construct() {
 		@list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
-		if ( ! is_array($this->deps) )
-			$this->deps = array();
+		if ( ! is_array($this->deps) ) {
+					$this->deps = array();
+		}
 	}
 
 	/**
@@ -500,8 +527,9 @@ 
 	 * @return bool False if not scalar, true otherwise.
 	 */
 	public function add_data( $name, $data ) {
-		if ( !is_scalar($name) )
-			return false;
+		if ( !is_scalar($name) ) {
+					return false;
+		}
 		$this->extra[$name] = $data;
 		return true;
 	}

src/wp-includes/feed.php

Doc Comments +1 added lines, -1 removed lines

@@ -524,7 +524,7 @@
  * @since 2.5.0
  *
  * @param string $data Input string
- * @return array array(type, value)
+ * @return string[] array(type, value)
  */
 function prep_atom_text_construct($data) {
 	if (strpos($data, '<') === false && strpos($data, '&') === false) {

Braces +42 added lines, -28 removed lines

@@ -179,8 +179,9 @@ 
  * @return string The filtered content.
  */
 function get_the_content_feed($feed_type = null) {
-	if ( !$feed_type )
-		$feed_type = get_default_feed();
+	if ( !$feed_type ) {
+			$feed_type = get_default_feed();
+	}
 
 	/** This filter is documented in wp-includes/post-template.php */
 	$content = apply_filters( 'the_content', get_the_content() );
@@ -281,8 +282,9 @@ 
 function get_comment_guid($comment_id = null) {
 	$comment = get_comment($comment_id);
 
-	if ( !is_object($comment) )
-		return false;
+	if ( !is_object($comment) ) {
+			return false;
+	}
 
 	return get_the_guid($comment->comment_post_ID) . '#comment-' . $comment->comment_ID;
 }
@@ -365,34 +367,41 @@ 
  * @return string All of the post categories for displaying in the feed.
  */
 function get_the_category_rss($type = null) {
-	if ( empty($type) )
-		$type = get_default_feed();
+	if ( empty($type) ) {
+			$type = get_default_feed();
+	}
 	$categories = get_the_category();
 	$tags = get_the_tags();
 	$the_list = '';
 	$cat_names = array();
 
 	$filter = 'rss';
-	if ( 'atom' == $type )
-		$filter = 'raw';
+	if ( 'atom' == $type ) {
+			$filter = 'raw';
+	}
 
-	if ( !empty($categories) ) foreach ( (array) $categories as $category ) {
+	if ( !empty($categories) ) {
+		foreach ( (array) $categories as $category ) {
 		$cat_names[] = sanitize_term_field('name', $category->name, $category->term_id, 'category', $filter);
 	}
+	}
 
-	if ( !empty($tags) ) foreach ( (array) $tags as $tag ) {
+	if ( !empty($tags) ) {
+		foreach ( (array) $tags as $tag ) {
 		$cat_names[] = sanitize_term_field('name', $tag->name, $tag->term_id, 'post_tag', $filter);
 	}
+	}
 
 	$cat_names = array_unique($cat_names);
 
 	foreach ( $cat_names as $cat_name ) {
-		if ( 'rdf' == $type )
-			$the_list .= "\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
-		elseif ( 'atom' == $type )
-			$the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', esc_attr( get_bloginfo_rss( 'url' ) ), esc_attr( $cat_name ) );
-		else
-			$the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
+		if ( 'rdf' == $type ) {
+					$the_list .= "\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
+		} elseif ( 'atom' == $type ) {
+					$the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', esc_attr( get_bloginfo_rss( 'url' ) ), esc_attr( $cat_name ) );
+		} else {
+					$the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
+		}
 	}
 
 	/**
@@ -428,10 +437,11 @@ 
  */
 function html_type_rss() {
 	$type = get_bloginfo('html_type');
-	if (strpos($type, 'xhtml') !== false)
-		$type = 'xhtml';
-	else
-		$type = 'html';
+	if (strpos($type, 'xhtml') !== false) {
+			$type = 'xhtml';
+	} else {
+			$type = 'html';
+	}
 	echo $type;
 }
 
@@ -450,8 +460,9 @@ 
  * @since 1.5.0
  */
 function rss_enclosure() {
-	if ( post_password_required() )
-		return;
+	if ( post_password_required() ) {
+			return;
+	}
 
 	foreach ( (array) get_post_custom() as $key => $val) {
 		if ($key == 'enclosure') {
@@ -489,8 +500,9 @@ 
  * @since 2.2.0
  */
 function atom_enclosure() {
-	if ( post_password_required() )
-		return;
+	if ( post_password_required() ) {
+			return;
+	}
 
 	foreach ( (array) get_post_custom() as $key => $val ) {
 		if ($key == 'enclosure') {
@@ -618,8 +630,9 @@ 
  * @since 2.8.0
  */
 function feed_content_type( $type = '' ) {
-	if ( empty($type) )
-		$type = get_default_feed();
+	if ( empty($type) ) {
+			$type = get_default_feed();
+	}
 
 	$types = array(
 		'rss'  => 'application/rss+xml',
@@ -683,8 +696,9 @@ 
 	$feed->set_output_encoding( get_option( 'blog_charset' ) );
 	$feed->handle_content_type();
 
-	if ( $feed->error() )
-		return new WP_Error( 'simplepie-error', $feed->error() );
+	if ( $feed->error() ) {
+			return new WP_Error( 'simplepie-error', $feed->error() );
+	}
 
 	return $feed;
 }

Spacing +71 added lines, -71 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param string $info Converted string value of the blog information.
 	 * @param string $show The type of blog information to retrieve.
 	 */
-	return apply_filters( 'get_bloginfo_rss', convert_chars( $info ), $show );
+	return apply_filters('get_bloginfo_rss', convert_chars($info), $show);
 }
 
 /**
@@ -61,7 +61,7 @@ 
 	 * @param string $rss_container RSS container for the blog information.
 	 * @param string $show          The type of blog information to retrieve.
 	 */
-	echo apply_filters( 'bloginfo_rss', get_bloginfo_rss( $show ), $show );
+	echo apply_filters('bloginfo_rss', get_bloginfo_rss($show), $show);
 }
 
 /**
@@ -83,7 +83,7 @@ 
 	 * @param string $feed_type Type of default feed. Possible values include 'rss2', 'atom'.
 	 *                          Default 'rss2'.
 	 */
-	$default_feed = apply_filters( 'default_feed', 'rss2' );
+	$default_feed = apply_filters('default_feed', 'rss2');
 	return 'rss' == $default_feed ? 'rss2' : $default_feed;
 }
 
@@ -96,10 +96,10 @@ 
  * @param string $deprecated Unused..
  * @return string The document title.
  */
-function get_wp_title_rss( $deprecated = '–' ) {
-	if ( '–' !== $deprecated ) {
+function get_wp_title_rss($deprecated = '–') {
+	if ('–' !== $deprecated) {
 		/* translators: %s: 'document_title_separator' filter name */
-		_deprecated_argument( __FUNCTION__, '4.4.0', sprintf( __( 'Use the %s filter instead.' ), '<code>document_title_separator</code>' ) );
+		_deprecated_argument(__FUNCTION__, '4.4.0', sprintf(__('Use the %s filter instead.'), '<code>document_title_separator</code>'));
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @param string $title      The current blog title.
 	 * @param string $deprecated Unused.
 	 */
-	return apply_filters( 'get_wp_title_rss', wp_get_document_title(), $deprecated );
+	return apply_filters('get_wp_title_rss', wp_get_document_title(), $deprecated);
 }
 
 /**
@@ -122,10 +122,10 @@ 
  *
  * @param string $deprecated Unused.
  */
-function wp_title_rss( $deprecated = '&#8211;' ) {
-	if ( '&#8211;' !== $deprecated ) {
+function wp_title_rss($deprecated = '&#8211;') {
+	if ('&#8211;' !== $deprecated) {
 		/* translators: %s: 'document_title_separator' filter name */
-		_deprecated_argument( __FUNCTION__, '4.4.0', sprintf( __( 'Use the %s filter instead.' ), '<code>document_title_separator</code>' ) );
+		_deprecated_argument(__FUNCTION__, '4.4.0', sprintf(__('Use the %s filter instead.'), '<code>document_title_separator</code>'));
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 * @param string $wp_title_rss The current blog title.
 	 * @param string $deprecated   Unused.
 	 */
-	echo apply_filters( 'wp_title_rss', get_wp_title_rss(), $deprecated );
+	echo apply_filters('wp_title_rss', get_wp_title_rss(), $deprecated);
 }
 
 /**
@@ -159,7 +159,7 @@ 
 	 *
 	 * @param string $title The current post title.
 	 */
-	$title = apply_filters( 'the_title_rss', $title );
+	$title = apply_filters('the_title_rss', $title);
 	return $title;
 }
 
@@ -182,11 +182,11 @@ 
  * @return string The filtered content.
  */
 function get_the_content_feed($feed_type = null) {
-	if ( !$feed_type )
+	if ( ! $feed_type)
 		$feed_type = get_default_feed();
 
 	/** This filter is documented in wp-includes/post-template.php */
-	$content = apply_filters( 'the_content', get_the_content() );
+	$content = apply_filters('the_content', get_the_content());
 	$content = str_replace(']]>', ']]&gt;', $content);
 	/**
 	 * Filter the post content for use in feeds.
@@ -197,7 +197,7 @@ 
 	 * @param string $feed_type Type of feed. Possible values include 'rss2', 'atom'.
 	 *                          Default 'rss2'.
 	 */
-	return apply_filters( 'the_content_feed', $content, $feed_type );
+	return apply_filters('the_content_feed', $content, $feed_type);
 }
 
 /**
@@ -225,7 +225,7 @@ 
 	 *
 	 * @param string $output The current post excerpt.
 	 */
-	echo apply_filters( 'the_excerpt_rss', $output );
+	echo apply_filters('the_excerpt_rss', $output);
 }
 
 /**
@@ -241,7 +241,7 @@ 
 	 *
 	 * @param string $post_permalink The current post permalink.
 	 */
-	echo esc_url( apply_filters( 'the_permalink_rss', get_permalink() ) );
+	echo esc_url(apply_filters('the_permalink_rss', get_permalink()));
 }
 
 /**
@@ -259,7 +259,7 @@ 
 	 * @param string $comment_permalink The current comment permalink with
 	 *                                  '#comments' appended.
 	 */
-	echo esc_url( apply_filters( 'comments_link_feed', get_comments_link() ) );
+	echo esc_url(apply_filters('comments_link_feed', get_comments_link()));
 }
 
 /**
@@ -270,7 +270,7 @@ 
  * @param int|WP_Comment $comment_id Optional comment object or id. Defaults to global comment object.
  */
 function comment_guid($comment_id = null) {
-	echo esc_url( get_comment_guid($comment_id) );
+	echo esc_url(get_comment_guid($comment_id));
 }
 
 /**
@@ -284,10 +284,10 @@ 
 function get_comment_guid($comment_id = null) {
 	$comment = get_comment($comment_id);
 
-	if ( !is_object($comment) )
+	if ( ! is_object($comment))
 		return false;
 
-	return get_the_guid($comment->comment_post_ID) . '#comment-' . $comment->comment_ID;
+	return get_the_guid($comment->comment_post_ID).'#comment-'.$comment->comment_ID;
 }
 
 /**
@@ -298,7 +298,7 @@ 
  *
  * @param int|WP_Comment $comment Optional. Comment object or id. Defaults to global comment object.
  */
-function comment_link( $comment = null ) {
+function comment_link($comment = null) {
 	/**
 	 * Filter the current comment's permalink.
 	 *
@@ -308,7 +308,7 @@ 
 	 *
 	 * @param string $comment_permalink The current comment permalink.
 	 */
-	echo esc_url( apply_filters( 'comment_link', get_comment_link( $comment ) ) );
+	echo esc_url(apply_filters('comment_link', get_comment_link($comment)));
 }
 
 /**
@@ -328,7 +328,7 @@ 
 	 *
 	 * @param string $comment_author The current comment author.
 	 */
-	return apply_filters( 'comment_author_rss', get_comment_author() );
+	return apply_filters('comment_author_rss', get_comment_author());
 }
 
 /**
@@ -354,7 +354,7 @@ 
 	 *
 	 * @param string $comment_text The content of the current comment.
 	 */
-	$comment_text = apply_filters( 'comment_text_rss', $comment_text );
+	$comment_text = apply_filters('comment_text_rss', $comment_text);
 	echo $comment_text;
 }
 
@@ -371,7 +371,7 @@ 
  * @return string All of the post categories for displaying in the feed.
  */
 function get_the_category_rss($type = null) {
-	if ( empty($type) )
+	if (empty($type))
 		$type = get_default_feed();
 	$categories = get_the_category();
 	$tags = get_the_tags();
@@ -379,26 +379,26 @@ 
 	$cat_names = array();
 
 	$filter = 'rss';
-	if ( 'atom' == $type )
+	if ('atom' == $type)
 		$filter = 'raw';
 
-	if ( !empty($categories) ) foreach ( (array) $categories as $category ) {
+	if ( ! empty($categories)) foreach ((array) $categories as $category) {
 		$cat_names[] = sanitize_term_field('name', $category->name, $category->term_id, 'category', $filter);
 	}
 
-	if ( !empty($tags) ) foreach ( (array) $tags as $tag ) {
+	if ( ! empty($tags)) foreach ((array) $tags as $tag) {
 		$cat_names[] = sanitize_term_field('name', $tag->name, $tag->term_id, 'post_tag', $filter);
 	}
 
 	$cat_names = array_unique($cat_names);
 
-	foreach ( $cat_names as $cat_name ) {
-		if ( 'rdf' == $type )
+	foreach ($cat_names as $cat_name) {
+		if ('rdf' == $type)
 			$the_list .= "\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
-		elseif ( 'atom' == $type )
-			$the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', esc_attr( get_bloginfo_rss( 'url' ) ), esc_attr( $cat_name ) );
+		elseif ('atom' == $type)
+			$the_list .= sprintf('<category scheme="%1$s" term="%2$s" />', esc_attr(get_bloginfo_rss('url')), esc_attr($cat_name));
 		else
-			$the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
+			$the_list .= "\t\t<category><![CDATA[".@html_entity_decode($cat_name, ENT_COMPAT, get_option('blog_charset'))."]]></category>\n";
 	}
 
 	/**
@@ -410,7 +410,7 @@ 
 	 * @param string $type     Type of feed. Possible values include 'rss2', 'atom'.
 	 *                         Default 'rss2'.
 	 */
-	return apply_filters( 'the_category_rss', $the_list, $type );
+	return apply_filters('the_category_rss', $the_list, $type);
 }
 
 /**
@@ -456,16 +456,16 @@ 
  * @since 1.5.0
  */
 function rss_enclosure() {
-	if ( post_password_required() )
+	if (post_password_required())
 		return;
 
-	foreach ( (array) get_post_custom() as $key => $val) {
+	foreach ((array) get_post_custom() as $key => $val) {
 		if ($key == 'enclosure') {
-			foreach ( (array) $val as $enc ) {
+			foreach ((array) $val as $enc) {
 				$enclosure = explode("\n", $enc);
 
 				// only get the first element, e.g. audio/mpeg from 'audio/mpeg mpga mp2 mp3'
-				$t = preg_split('/[ \t]/', trim($enclosure[2]) );
+				$t = preg_split('/[ \t]/', trim($enclosure[2]));
 				$type = $t[0];
 
 				/**
@@ -475,7 +475,7 @@ 
 				 *
 				 * @param string $html_link_tag The HTML link tag with a URI and other attributes.
 				 */
-				echo apply_filters( 'rss_enclosure', '<enclosure url="' . trim( htmlspecialchars( $enclosure[0] ) ) . '" length="' . trim( $enclosure[1] ) . '" type="' . $type . '" />' . "\n" );
+				echo apply_filters('rss_enclosure', '<enclosure url="'.trim(htmlspecialchars($enclosure[0])).'" length="'.trim($enclosure[1]).'" type="'.$type.'" />'."\n");
 			}
 		}
 	}
@@ -495,12 +495,12 @@ 
  * @since 2.2.0
  */
 function atom_enclosure() {
-	if ( post_password_required() )
+	if (post_password_required())
 		return;
 
-	foreach ( (array) get_post_custom() as $key => $val ) {
+	foreach ((array) get_post_custom() as $key => $val) {
 		if ($key == 'enclosure') {
-			foreach ( (array) $val as $enc ) {
+			foreach ((array) $val as $enc) {
 				$enclosure = explode("\n", $enc);
 				/**
 				 * Filter the atom enclosure HTML link tag for the current post.
@@ -509,7 +509,7 @@ 
 				 *
 				 * @param string $html_link_tag The HTML link tag with a URI and other attributes.
 				 */
-				echo apply_filters( 'atom_enclosure', '<link href="' . trim( htmlspecialchars( $enclosure[0] ) ) . '" rel="enclosure" length="' . trim( $enclosure[1] ) . '" type="' . trim( $enclosure[2] ) . '" />' . "\n" );
+				echo apply_filters('atom_enclosure', '<link href="'.trim(htmlspecialchars($enclosure[0])).'" rel="enclosure" length="'.trim($enclosure[1]).'" type="'.trim($enclosure[2]).'" />'."\n");
 			}
 		}
 	}
@@ -538,11 +538,11 @@ 
 	}
 
 	$parser = xml_parser_create();
-	xml_parse($parser, '<div>' . $data . '</div>', true);
+	xml_parse($parser, '<div>'.$data.'</div>', true);
 	$code = xml_get_error_code($parser);
 	xml_parser_free($parser);
 
-	if (!$code) {
+	if ( ! $code) {
 		if (strpos($data, '<') === false) {
 			return array('text', $data);
 		} else {
@@ -566,8 +566,8 @@ 
  * @see get_site_icon_url()
  */
 function atom_site_icon() {
-	$url = get_site_icon_url( 32 );
-	if ( $url ) {
+	$url = get_site_icon_url(32);
+	if ($url) {
 		echo "<icon>$url</icon>\n";
 	}
 }
@@ -579,17 +579,17 @@ 
  */
 function rss2_site_icon() {
 	$rss_title = get_wp_title_rss();
-	if ( empty( $rss_title ) ) {
-		$rss_title = get_bloginfo_rss( 'name' );
+	if (empty($rss_title)) {
+		$rss_title = get_bloginfo_rss('name');
 	}
 
-	$url = get_site_icon_url( 32 );
-	if ( $url ) {
+	$url = get_site_icon_url(32);
+	if ($url) {
 		echo '
 <image>
-	<url>' . convert_chars( $url ) . '</url>
-	<title>' . $rss_title . '</title>
-	<link>' . get_bloginfo_rss( 'url' ) . '</link>
+	<url>' . convert_chars($url).'</url>
+	<title>' . $rss_title.'</title>
+	<link>' . get_bloginfo_rss('url').'</link>
 	<width>32</width>
 	<height>32</height>
 </image> ' . "\n";
@@ -615,7 +615,7 @@ 
 	 *
 	 * @param string $feed_link The link for the feed with set URL scheme.
 	 */
-	echo esc_url( apply_filters( 'self_link', set_url_scheme( 'http://' . $host['host'] . wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
+	echo esc_url(apply_filters('self_link', set_url_scheme('http://'.$host['host'].wp_unslash($_SERVER['REQUEST_URI']))));
 }
 
 /**
@@ -625,8 +625,8 @@ 
  *
  * @param string $type Type of feed. Possible values include 'rss', rss2', 'atom', and 'rdf'.
  */
-function feed_content_type( $type = '' ) {
-	if ( empty($type) )
+function feed_content_type($type = '') {
+	if (empty($type))
 		$type = get_default_feed();
 
 	$types = array(
@@ -636,7 +636,7 @@ 
 		'rdf'  => 'application/rdf+xml'
 	);
 
-	$content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';
+	$content_type = ( ! empty($types[$type])) ? $types[$type] : 'application/octet-stream';
 
 	/**
 	 * Filter the content type for a specific feed type.
@@ -646,7 +646,7 @@ 
 	 * @param string $content_type Content type indicating the type of data that a feed contains.
 	 * @param string $type         Type of feed. Possible values include 'rss', rss2', 'atom', and 'rdf'.
 	 */
-	return apply_filters( 'feed_content_type', $content_type, $type );
+	return apply_filters('feed_content_type', $content_type, $type);
 }
 
 /**
@@ -660,22 +660,22 @@ 
  *
  * @return WP_Error|SimplePie WP_Error object on failure or SimplePie object on success
  */
-function fetch_feed( $url ) {
-	require_once( ABSPATH . WPINC . '/class-feed.php' );
+function fetch_feed($url) {
+	require_once(ABSPATH.WPINC.'/class-feed.php');
 
 	$feed = new SimplePie();
 
-	$feed->set_sanitize_class( 'WP_SimplePie_Sanitize_KSES' );
+	$feed->set_sanitize_class('WP_SimplePie_Sanitize_KSES');
 	// We must manually overwrite $feed->sanitize because SimplePie's
 	// constructor sets it before we have a chance to set the sanitization class
 	$feed->sanitize = new WP_SimplePie_Sanitize_KSES();
 
-	$feed->set_cache_class( 'WP_Feed_Cache' );
-	$feed->set_file_class( 'WP_SimplePie_File' );
+	$feed->set_cache_class('WP_Feed_Cache');
+	$feed->set_file_class('WP_SimplePie_File');
 
-	$feed->set_feed_url( $url );
+	$feed->set_feed_url($url);
 	/** This filter is documented in wp-includes/class-feed.php */
-	$feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url ) );
+	$feed->set_cache_duration(apply_filters('wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url));
 	/**
 	 * Fires just before processing the SimplePie feed object.
 	 *
@@ -684,13 +684,13 @@ 
 	 * @param object &$feed SimplePie feed object, passed by reference.
 	 * @param mixed  $url   URL of feed to retrieve. If an array of URLs, the feeds are merged.
 	 */
-	do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
+	do_action_ref_array('wp_feed_options', array(&$feed, $url));
 	$feed->init();
-	$feed->set_output_encoding( get_option( 'blog_charset' ) );
+	$feed->set_output_encoding(get_option('blog_charset'));
 	$feed->handle_content_type();
 
-	if ( $feed->error() )
-		return new WP_Error( 'simplepie-error', $feed->error() );
+	if ($feed->error())
+		return new WP_Error('simplepie-error', $feed->error());
 
 	return $feed;
 }

src/wp-includes/ID3/getid3.lib.php

Doc Comments +59 added lines

@@ -99,6 +99,9 @@ 
 	}
 
 
+	/**
+	 * @param string $binarynumerator
+	 */
 	public static function DecimalBinary2Float($binarynumerator) {
 		$numerator   = self::Bin2Dec($binarynumerator);
 		$denominator = self::Bin2Dec('1'.str_repeat('0', strlen($binarynumerator)));
@@ -106,6 +109,9 @@ 
 	}
 
 
+	/**
+	 * @param string $binarypointnumber
+	 */
 	public static function NormalizeBinaryPoint($binarypointnumber, $maxbits=52) {
 		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
 		if (strpos($binarypointnumber, '.') === false) {
@@ -177,6 +183,9 @@ 
 	}
 
 
+	/**
+	 * @param string $byteword
+	 */
 	public static function LittleEndian2Float($byteword) {
 		return self::BigEndian2Float(strrev($byteword));
 	}
@@ -366,6 +375,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $number
+	 */
 	public static function LittleEndian2String($number, $minbytes=1, $synchsafe=false) {
 		$intstring = '';
 		while ($number > 0) {
@@ -458,16 +470,25 @@ 
 	}
 
 
+	/**
+	 * @param string $rawdata
+	 */
 	public static function FixedPoint8_8($rawdata) {
 		return self::BigEndian2Int(substr($rawdata, 0, 1)) + (float) (self::BigEndian2Int(substr($rawdata, 1, 1)) / pow(2, 8));
 	}
 
 
+	/**
+	 * @param string $rawdata
+	 */
 	public static function FixedPoint16_16($rawdata) {
 		return self::BigEndian2Int(substr($rawdata, 0, 2)) + (float) (self::BigEndian2Int(substr($rawdata, 2, 2)) / pow(2, 16));
 	}
 
 
+	/**
+	 * @param string $rawdata
+	 */
 	public static function FixedPoint2_30($rawdata) {
 		$binarystring = self::BigEndian2Bin($rawdata);
 		return self::Bin2Dec(substr($binarystring, 0, 2)) + (float) (self::Bin2Dec(substr($binarystring, 2, 30)) / pow(2, 30));
@@ -531,6 +552,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param SimpleXMLElement $XMLobject
+	 */
 	public static function SimpleXMLelement2array($XMLobject) {
 		if (!is_object($XMLobject) && !is_array($XMLobject)) {
 			return $XMLobject;
@@ -631,6 +655,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $filename_dest
+	 */
 	public static function CopyFileParts($filename_source, $filename_dest, $offset, $length) {
 		if (!self::intValueSupported($offset + $length)) {
 			throw new Exception('cannot copy file portion, it extends beyond the '.round(PHP_INT_MAX / 1073741824).'GB limit');
@@ -863,6 +890,10 @@ 
 	}
 
 	// UTF-16BE => UTF-8
+
+	/**
+	 * @param string $string
+	 */
 	public static function iconv_fallback_utf16be_utf8($string) {
 		if (substr($string, 0, 2) == "\xFE\xFF") {
 			// strip BOM
@@ -877,6 +908,10 @@ 
 	}
 
 	// UTF-16LE => UTF-8
+
+	/**
+	 * @param string $string
+	 */
 	public static function iconv_fallback_utf16le_utf8($string) {
 		if (substr($string, 0, 2) == "\xFF\xFE") {
 			// strip BOM
@@ -891,6 +926,10 @@ 
 	}
 
 	// UTF-16BE => ISO-8859-1
+
+	/**
+	 * @param string $string
+	 */
 	public static function iconv_fallback_utf16be_iso88591($string) {
 		if (substr($string, 0, 2) == "\xFE\xFF") {
 			// strip BOM
@@ -905,6 +944,10 @@ 
 	}
 
 	// UTF-16LE => ISO-8859-1
+
+	/**
+	 * @param string $string
+	 */
 	public static function iconv_fallback_utf16le_iso88591($string) {
 		if (substr($string, 0, 2) == "\xFF\xFE") {
 			// strip BOM
@@ -940,6 +983,9 @@ 
 		return $string;
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function iconv_fallback($in_charset, $out_charset, $string) {
 
 		if ($in_charset == $out_charset) {
@@ -1271,6 +1317,12 @@ 
 	}
 
 
+	/**
+	 * @param integer $begin
+	 * @param integer $end
+	 * @param string $file
+	 * @param string $name
+	 */
 	public static function EmbeddedLookup($key, $begin, $end, $file, $name) {
 
 		// Cached
@@ -1317,6 +1369,10 @@ 
 		return (isset($cache[$file][$name][$key]) ? $cache[$file][$name][$key] : '');
 	}
 
+	/**
+	 * @param string $filename
+	 * @param string $sourcefile
+	 */
 	public static function IncludeDependency($filename, $sourcefile, $DieOnFailure=false) {
 		global $GETID3_ERRORARRAY;
 
@@ -1341,6 +1397,9 @@ 
 		return trim($string, "\x00");
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public static function getFileSizeSyscall($path) {
 		$filesize = false;
 

Indentation +5 added lines, -5 removed lines

@@ -1367,11 +1367,11 @@
 
 
 	/**
-	* Workaround for Bug #37268 (https://bugs.php.net/bug.php?id=37268)
-	* @param string $path A path.
-	* @param string $suffix If the name component ends in suffix this will also be cut off.
-	* @return string
-	*/
+	 * Workaround for Bug #37268 (https://bugs.php.net/bug.php?id=37268)
+	 * @param string $path A path.
+	 * @param string $suffix If the name component ends in suffix this will also be cut off.
+	 * @return string
+	 */
 	public static function mb_basename($path, $suffix = null) {
 		$splited = preg_split('#/#', rtrim($path, '/ '));
 		return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1);

Spacing +62 added lines, -62 removed lines

@@ -15,7 +15,7 @@ 
 class getid3_lib
 {
 
-	public static function PrintHexBytes($string, $hex=true, $spaces=true, $htmlencoding='UTF-8') {
+	public static function PrintHexBytes($string, $hex = true, $spaces = true, $htmlencoding = 'UTF-8') {
 		$returnstring = '';
 		for ($i = 0; $i < strlen($string); $i++) {
 			if ($hex) {
@@ -27,7 +27,7 @@ 
 				$returnstring .= ' ';
 			}
 		}
-		if (!empty($htmlencoding)) {
+		if ( ! empty($htmlencoding)) {
 			if ($htmlencoding === true) {
 				$htmlencoding = 'UTF-8'; // prior to getID3 v1.9.0 the function's 4th parameter was boolean
 			}
@@ -53,7 +53,7 @@ 
 	}
 
 
-	public static function safe_inc(&$variable, $increment=1) {
+	public static function safe_inc(&$variable, $increment = 1) {
 		if (isset($variable)) {
 			$variable += $increment;
 		} else {
@@ -82,7 +82,7 @@ 
 		static $hasINT64 = null;
 		if ($hasINT64 === null) { // 10x faster than is_null()
 			$hasINT64 = is_int(pow(2, 31)); // 32-bit int are limited to (2^31)-1
-			if (!$hasINT64 && !defined('PHP_INT_MIN')) {
+			if ( ! $hasINT64 && ! defined('PHP_INT_MIN')) {
 				define('PHP_INT_MIN', ~PHP_INT_MAX);
 			}
 		}
@@ -106,7 +106,7 @@ 
 	}
 
 
-	public static function NormalizeBinaryPoint($binarypointnumber, $maxbits=52) {
+	public static function NormalizeBinaryPoint($binarypointnumber, $maxbits = 52) {
 		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
 		if (strpos($binarypointnumber, '.') === false) {
 			$binarypointnumber = '0.'.$binarypointnumber;
@@ -188,7 +188,7 @@ 
 		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
 
 		$bitword = self::BigEndian2Bin($byteword);
-		if (!$bitword) {
+		if ( ! $bitword) {
 			return 0;
 		}
 		$signbit = $bitword{0};
@@ -260,7 +260,7 @@ 
 	}
 
 
-	public static function BigEndian2Int($byteword, $synchsafe=false, $signed=false) {
+	public static function BigEndian2Int($byteword, $synchsafe = false, $signed = false) {
 		$intvalue = 0;
 		$bytewordlen = strlen($byteword);
 		if ($bytewordlen == 0) {
@@ -274,7 +274,7 @@ 
 				$intvalue += ord($byteword{$i}) * pow(256, ($bytewordlen - 1 - $i));
 			}
 		}
-		if ($signed && !$synchsafe) {
+		if ($signed && ! $synchsafe) {
 			// synchsafe ints are not allowed to be signed
 			if ($bytewordlen <= PHP_INT_SIZE) {
 				$signMaskBit = 0x80 << (8 * ($bytewordlen - 1));
@@ -289,7 +289,7 @@ 
 	}
 
 
-	public static function LittleEndian2Int($byteword, $signed=false) {
+	public static function LittleEndian2Int($byteword, $signed = false) {
 		return self::BigEndian2Int(strrev($byteword), false, $signed);
 	}
 
@@ -304,7 +304,7 @@ 
 	}
 
 
-	public static function BigEndian2String($number, $minbytes=1, $synchsafe=false, $signed=false) {
+	public static function BigEndian2String($number, $minbytes = 1, $synchsafe = false, $signed = false) {
 		if ($number < 0) {
 			throw new Exception('ERROR: self::BigEndian2String() does not support negative numbers');
 		}
@@ -339,7 +339,7 @@ 
 	}
 
 
-	public static function Bin2Dec($binstring, $signed=false) {
+	public static function Bin2Dec($binstring, $signed = false) {
 		$signmult = 1;
 		if ($signed) {
 			if ($binstring{0} == '1') {
@@ -366,7 +366,7 @@ 
 	}
 
 
-	public static function LittleEndian2String($number, $minbytes=1, $synchsafe=false) {
+	public static function LittleEndian2String($number, $minbytes = 1, $synchsafe = false) {
 		$intstring = '';
 		while ($number > 0) {
 			if ($synchsafe) {
@@ -384,7 +384,7 @@ 
 	public static function array_merge_clobber($array1, $array2) {
 		// written by kcØhireability*com
 		// taken from http://www.php.net/manual/en/function.array-merge-recursive.php
-		if (!is_array($array1) || !is_array($array2)) {
+		if ( ! is_array($array1) || ! is_array($array2)) {
 			return false;
 		}
 		$newarray = $array1;
@@ -400,14 +400,14 @@ 
 
 
 	public static function array_merge_noclobber($array1, $array2) {
-		if (!is_array($array1) || !is_array($array2)) {
+		if ( ! is_array($array1) || ! is_array($array2)) {
 			return false;
 		}
 		$newarray = $array1;
 		foreach ($array2 as $key => $val) {
 			if (is_array($val) && isset($newarray[$key]) && is_array($newarray[$key])) {
 				$newarray[$key] = self::array_merge_noclobber($newarray[$key], $val);
-			} elseif (!isset($newarray[$key])) {
+			} elseif ( ! isset($newarray[$key])) {
 				$newarray[$key] = $val;
 			}
 		}
@@ -425,7 +425,7 @@ 
 		return true;
 	}
 
-	public static function fileextension($filename, $numextensions=1) {
+	public static function fileextension($filename, $numextensions = 1) {
 		if (strstr($filename, '.')) {
 			$reversedfilename = strrev($filename);
 			$offset = 0;
@@ -444,9 +444,9 @@ 
 	public static function PlaytimeString($seconds) {
 		$sign = (($seconds < 0) ? '-' : '');
 		$seconds = round(abs($seconds));
-		$H = (int) floor( $seconds                            / 3600);
-		$M = (int) floor(($seconds - (3600 * $H)            ) /   60);
-		$S = (int) round( $seconds - (3600 * $H) - (60 * $M)        );
+		$H = (int) floor($seconds / 3600);
+		$M = (int) floor(($seconds - (3600 * $H)) / 60);
+		$S = (int) round($seconds - (3600 * $H) - (60 * $M));
 		return $sign.($H ? $H.':' : '').($H ? str_pad($M, 2, '0', STR_PAD_LEFT) : intval($M)).':'.str_pad($S, 2, 0, STR_PAD_LEFT);
 	}
 
@@ -490,11 +490,11 @@ 
 		return $ReturnedArray;
 	}
 
-	public static function array_max($arraydata, $returnkey=false) {
+	public static function array_max($arraydata, $returnkey = false) {
 		$maxvalue = false;
 		$maxkey = false;
 		foreach ($arraydata as $key => $value) {
-			if (!is_array($value)) {
+			if ( ! is_array($value)) {
 				if ($value > $maxvalue) {
 					$maxvalue = $value;
 					$maxkey = $key;
@@ -504,11 +504,11 @@ 
 		return ($returnkey ? $maxkey : $maxvalue);
 	}
 
-	public static function array_min($arraydata, $returnkey=false) {
+	public static function array_min($arraydata, $returnkey = false) {
 		$minvalue = false;
 		$minkey = false;
 		foreach ($arraydata as $key => $value) {
-			if (!is_array($value)) {
+			if ( ! is_array($value)) {
 				if ($value > $minvalue) {
 					$minvalue = $value;
 					$minkey = $key;
@@ -532,7 +532,7 @@ 
 	}
 
 	public static function SimpleXMLelement2array($XMLobject) {
-		if (!is_object($XMLobject) && !is_array($XMLobject)) {
+		if ( ! is_object($XMLobject) && ! is_array($XMLobject)) {
 			return $XMLobject;
 		}
 		$XMLarray = (is_object($XMLobject) ? get_object_vars($XMLobject) : $XMLobject);
@@ -547,7 +547,7 @@ 
 	// self::md5_data() - returns md5sum for a file from startuing position to absolute end position
 	public static function hash_data($file, $offset, $end, $algorithm) {
 		static $tempdir = '';
-		if (!self::intValueSupported($end)) {
+		if ( ! self::intValueSupported($end)) {
 			return false;
 		}
 		switch ($algorithm) {
@@ -581,7 +581,7 @@ 
 
 				$RequiredFiles = array('cygwin1.dll', 'head.exe', 'tail.exe', $windows_call);
 				foreach ($RequiredFiles as $required_file) {
-					if (!is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
+					if ( ! is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
 						// helper apps not available - fall back to old method
 						break 2;
 					}
@@ -632,7 +632,7 @@ 
 	}
 
 	public static function CopyFileParts($filename_source, $filename_dest, $offset, $length) {
-		if (!self::intValueSupported($offset + $length)) {
+		if ( ! self::intValueSupported($offset + $length)) {
 			throw new Exception('cannot copy file portion, it extends beyond the '.round(PHP_INT_MAX / 1073741824).'GB limit');
 		}
 		if (is_readable($filename_source) && is_file($filename_source) && ($fp_src = fopen($filename_source, 'rb'))) {
@@ -664,25 +664,25 @@ 
 			$newcharstring = chr($charval);
 		} elseif ($charval < 2048) {
 			// 110bbbbb 10bbbbbb
-			$newcharstring  = chr(($charval >>   6) | 0xC0);
+			$newcharstring  = chr(($charval >> 6) | 0xC0);
 			$newcharstring .= chr(($charval & 0x3F) | 0x80);
 		} elseif ($charval < 65536) {
 			// 1110bbbb 10bbbbbb 10bbbbbb
-			$newcharstring  = chr(($charval >>  12) | 0xE0);
-			$newcharstring .= chr(($charval >>   6) | 0xC0);
+			$newcharstring  = chr(($charval >> 12) | 0xE0);
+			$newcharstring .= chr(($charval >> 6) | 0xC0);
 			$newcharstring .= chr(($charval & 0x3F) | 0x80);
 		} else {
 			// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-			$newcharstring  = chr(($charval >>  18) | 0xF0);
-			$newcharstring .= chr(($charval >>  12) | 0xC0);
-			$newcharstring .= chr(($charval >>   6) | 0xC0);
+			$newcharstring  = chr(($charval >> 18) | 0xF0);
+			$newcharstring .= chr(($charval >> 12) | 0xC0);
+			$newcharstring .= chr(($charval >> 6) | 0xC0);
 			$newcharstring .= chr(($charval & 0x3F) | 0x80);
 		}
 		return $newcharstring;
 	}
 
 	// ISO-8859-1 => UTF-8
-	public static function iconv_fallback_iso88591_utf8($string, $bom=false) {
+	public static function iconv_fallback_iso88591_utf8($string, $bom = false) {
 		if (function_exists('utf8_encode')) {
 			return utf8_encode($string);
 		}
@@ -699,7 +699,7 @@ 
 	}
 
 	// ISO-8859-1 => UTF-16BE
-	public static function iconv_fallback_iso88591_utf16be($string, $bom=false) {
+	public static function iconv_fallback_iso88591_utf16be($string, $bom = false) {
 		$newcharstring = '';
 		if ($bom) {
 			$newcharstring .= "\xFE\xFF";
@@ -711,7 +711,7 @@ 
 	}
 
 	// ISO-8859-1 => UTF-16LE
-	public static function iconv_fallback_iso88591_utf16le($string, $bom=false) {
+	public static function iconv_fallback_iso88591_utf16le($string, $bom = false) {
 		$newcharstring = '';
 		if ($bom) {
 			$newcharstring .= "\xFF\xFE";
@@ -741,18 +741,18 @@ 
 				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
 						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 2)}) & 0x3F) << 6) &
 							(ord($string{($offset + 3)}) & 0x3F);
 				$offset += 4;
 			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
 				// 1110bbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 1)}) & 0x3F) << 6) &
 							(ord($string{($offset + 2)}) & 0x3F);
 				$offset += 3;
 			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
 				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
+				$charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
 							(ord($string{($offset + 1)}) & 0x3F);
 				$offset += 2;
 			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
@@ -772,7 +772,7 @@ 
 	}
 
 	// UTF-8 => UTF-16BE
-	public static function iconv_fallback_utf8_utf16be($string, $bom=false) {
+	public static function iconv_fallback_utf8_utf16be($string, $bom = false) {
 		$newcharstring = '';
 		if ($bom) {
 			$newcharstring .= "\xFE\xFF";
@@ -784,18 +784,18 @@ 
 				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
 						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 2)}) & 0x3F) << 6) &
 							(ord($string{($offset + 3)}) & 0x3F);
 				$offset += 4;
 			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
 				// 1110bbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 1)}) & 0x3F) << 6) &
 							(ord($string{($offset + 2)}) & 0x3F);
 				$offset += 3;
 			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
 				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
+				$charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
 							(ord($string{($offset + 1)}) & 0x3F);
 				$offset += 2;
 			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
@@ -815,7 +815,7 @@ 
 	}
 
 	// UTF-8 => UTF-16LE
-	public static function iconv_fallback_utf8_utf16le($string, $bom=false) {
+	public static function iconv_fallback_utf8_utf16le($string, $bom = false) {
 		$newcharstring = '';
 		if ($bom) {
 			$newcharstring .= "\xFF\xFE";
@@ -827,18 +827,18 @@ 
 				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
 						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 2)}) & 0x3F) << 6) &
 							(ord($string{($offset + 3)}) & 0x3F);
 				$offset += 4;
 			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
 				// 1110bbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 1)}) & 0x3F) << 6) &
 							(ord($string{($offset + 2)}) & 0x3F);
 				$offset += 3;
 			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
 				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
+				$charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
 							(ord($string{($offset + 1)}) & 0x3F);
 				$offset += 2;
 			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
@@ -988,7 +988,7 @@ 
 		throw new Exception('PHP does not have iconv() support - cannot convert from '.$in_charset.' to '.$out_charset);
 	}
 
-	public static function recursiveMultiByteCharString2HTML($data, $charset='ISO-8859-1') {
+	public static function recursiveMultiByteCharString2HTML($data, $charset = 'ISO-8859-1') {
 		if (is_string($data)) {
 			return self::MultiByteCharString2HTML($data, $charset);
 		} elseif (is_array($data)) {
@@ -1002,7 +1002,7 @@ 
 		return $data;
 	}
 
-	public static function MultiByteCharString2HTML($string, $charset='ISO-8859-1') {
+	public static function MultiByteCharString2HTML($string, $charset = 'ISO-8859-1') {
 		$string = (string) $string; // in case trying to pass a numeric (float, int) string, would otherwise return an empty string
 		$HTMLstring = '';
 
@@ -1044,16 +1044,16 @@ 
 					$charval = 0;
 					if ($char_ord_val < 0x80) {
 						$charval = $char_ord_val;
-					} elseif ((($char_ord_val & 0xF0) >> 4) == 0x0F  &&  $i+3 < $strlen) {
+					} elseif ((($char_ord_val & 0xF0) >> 4) == 0x0F && $i + 3 < $strlen) {
 						$charval  = (($char_ord_val & 0x07) << 18);
 						$charval += ((ord($string{++$i}) & 0x3F) << 12);
 						$charval += ((ord($string{++$i}) & 0x3F) << 6);
-						$charval +=  (ord($string{++$i}) & 0x3F);
-					} elseif ((($char_ord_val & 0xE0) >> 5) == 0x07  &&  $i+2 < $strlen) {
+						$charval += (ord($string{++$i}) & 0x3F);
+					} elseif ((($char_ord_val & 0xE0) >> 5) == 0x07 && $i + 2 < $strlen) {
 						$charval  = (($char_ord_val & 0x0F) << 12);
 						$charval += ((ord($string{++$i}) & 0x3F) << 6);
-						$charval +=  (ord($string{++$i}) & 0x3F);
-					} elseif ((($char_ord_val & 0xC0) >> 6) == 0x03  &&  $i+1 < $strlen) {
+						$charval += (ord($string{++$i}) & 0x3F);
+					} elseif ((($char_ord_val & 0xC0) >> 6) == 0x03 && $i + 1 < $strlen) {
 						$charval  = (($char_ord_val & 0x1F) << 6);
 						$charval += (ord($string{++$i}) & 0x3F);
 					}
@@ -1150,7 +1150,7 @@ 
 	}
 
 
-	public static function GetDataImageSize($imgData, &$imageinfo=array()) {
+	public static function GetDataImageSize($imgData, &$imageinfo = array()) {
 		static $tempdir = '';
 		if (empty($tempdir)) {
 			// yes this is ugly, feel free to suggest a better way
@@ -1202,11 +1202,11 @@ 
 	public static function CopyTagsToComments(&$ThisFileInfo) {
 
 		// Copy all entries from ['tags'] into common ['comments']
-		if (!empty($ThisFileInfo['tags'])) {
+		if ( ! empty($ThisFileInfo['tags'])) {
 			foreach ($ThisFileInfo['tags'] as $tagtype => $tagarray) {
 				foreach ($tagarray as $tagname => $tagdata) {
 					foreach ($tagdata as $key => $value) {
-						if (!empty($value)) {
+						if ( ! empty($value)) {
 							if (empty($ThisFileInfo['comments'][$tagname])) {
 
 								// fall through and append value
@@ -1222,7 +1222,7 @@ 
 									}
 								}
 
-							} elseif (!is_array($value)) {
+							} elseif ( ! is_array($value)) {
 
 								$newvaluelength = strlen(trim($value));
 								foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) {
@@ -1235,9 +1235,9 @@ 
 								}
 
 							}
-							if (is_array($value) || empty($ThisFileInfo['comments'][$tagname]) || !in_array(trim($value), $ThisFileInfo['comments'][$tagname])) {
+							if (is_array($value) || empty($ThisFileInfo['comments'][$tagname]) || ! in_array(trim($value), $ThisFileInfo['comments'][$tagname])) {
 								$value = (is_string($value) ? trim($value) : $value);
-								if (!is_numeric($key)) {
+								if ( ! is_numeric($key)) {
 									$ThisFileInfo['comments'][$tagname][$key] = $value;
 								} else {
 									$ThisFileInfo['comments'][$tagname][]     = $value;
@@ -1249,7 +1249,7 @@ 
 			}
 
 			// Copy to ['comments_html']
-			if (!empty($ThisFileInfo['comments'])) {
+			if ( ! empty($ThisFileInfo['comments'])) {
 				foreach ($ThisFileInfo['comments'] as $field => $values) {
 					if ($field == 'picture') {
 						// pictures can take up a lot of space, and we don't need multiple copies of them
@@ -1317,7 +1317,7 @@ 
 		return (isset($cache[$file][$name][$key]) ? $cache[$file][$name][$key] : '');
 	}
 
-	public static function IncludeDependency($filename, $sourcefile, $DieOnFailure=false) {
+	public static function IncludeDependency($filename, $sourcefile, $DieOnFailure = false) {
 		global $GETID3_ERRORARRAY;
 
 		if (file_exists($filename)) {

src/wp-includes/ID3/getid3.php

Doc Comments +39 added lines

@@ -335,6 +335,10 @@ 
 	}
 
 	// public: analyze file
+
+	/**
+	 * @param string $filename
+	 */
 	public function analyze($filename) {
 		try {
 			if (!$this->openfile($filename)) {
@@ -486,6 +490,10 @@ 
 
 
 	// private: error handling
+
+	/**
+	 * @param string $message
+	 */
 	public function error($message) {
 		$this->CleanUp();
 		if (!isset($this->info['error'])) {
@@ -1097,6 +1105,9 @@ 
 
 
 
+	/**
+	 * @param string $filedata
+	 */
 	public function GetFileFormat(&$filedata, $filename='') {
 		// this function will determine the format of a file based on usually
 		// the first 2-4 bytes of the file (8 bytes for PNG, 16 bytes for JPG,
@@ -1136,6 +1147,10 @@ 
 
 
 	// converts array to $encoding charset from $this->encoding
+
+	/**
+	 * @param string $encoding
+	 */
 	public function CharConvert(&$array, $encoding) {
 
 		// identical encoding - end here
@@ -1280,6 +1295,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $algorithm
+	 */
 	public function getHashdata($algorithm) {
 		switch ($algorithm) {
 			case 'md5':
@@ -1573,6 +1591,9 @@ 
 		return tempnam($this->tempdir, 'gI3');
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function include_module($name) {
 		//if (!file_exists($this->include_path.'module.'.$name.'.php')) {
 		if (!file_exists(GETID3_INCLUDEPATH.'module.'.$name.'.php')) {
@@ -1600,6 +1621,9 @@ 
 	private $dependency_to = null;
 
 
+	/**
+	 * @param string $call_module
+	 */
 	public function __construct(getID3 $getid3, $call_module=null) {
 		$this->getid3 = $getid3;
 
@@ -1664,6 +1688,9 @@ 
 		return fread($this->getid3->fp, $bytes);
 	}
 
+	/**
+	 * @param integer $whence
+	 */
 	protected function fseek($bytes, $whence=SEEK_SET) {
 		if ($this->data_string_flag) {
 			switch ($whence) {
@@ -1701,20 +1728,32 @@ 
 		return feof($this->getid3->fp);
 	}
 
+	/**
+	 * @param string $module
+	 */
 	final protected function isDependencyFor($module) {
 		return $this->dependency_to == $module;
 	}
 
+	/**
+	 * @param string $text
+	 */
 	protected function error($text) {
 		$this->getid3->info['error'][] = $text;
 
 		return false;
 	}
 
+	/**
+	 * @param string $text
+	 */
 	protected function warning($text) {
 		return $this->getid3->warning($text);
 	}
 
+	/**
+	 * @param string $text
+	 */
 	protected function notice($text) {
 		// does nothing for now
 	}

Indentation +2 added lines, -2 removed lines

@@ -1588,8 +1588,8 @@
 abstract class getid3_handler {
 
 	/**
-	* @var getID3
-	*/
+	 * @var getID3
+	 */
 	protected $getid3;                       // pointer
 
 	protected $data_string_flag     = false; // analyzing filepointer or string

Spacing +111 added lines, -111 removed lines

@@ -11,24 +11,24 @@ 
 /////////////////////////////////////////////////////////////////
 
 // define a constant rather than looking up every time it is needed
-if (!defined('GETID3_OS_ISWINDOWS')) {
+if ( ! defined('GETID3_OS_ISWINDOWS')) {
 	define('GETID3_OS_ISWINDOWS', (stripos(PHP_OS, 'WIN') === 0));
 }
 // Get base path of getID3() - ONCE
-if (!defined('GETID3_INCLUDEPATH')) {
+if ( ! defined('GETID3_INCLUDEPATH')) {
 	define('GETID3_INCLUDEPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
 }
 // Workaround Bug #39923 (https://bugs.php.net/bug.php?id=39923)
-if (!defined('IMG_JPG') && defined('IMAGETYPE_JPEG')) {
+if ( ! defined('IMG_JPG') && defined('IMAGETYPE_JPEG')) {
 	define('IMG_JPG', IMAGETYPE_JPEG);
 }
 
 // attempt to define temp dir as something flexible but reliable
 $temp_dir = ini_get('upload_tmp_dir');
-if ($temp_dir && (!is_dir($temp_dir) || !is_readable($temp_dir))) {
+if ($temp_dir && ( ! is_dir($temp_dir) || ! is_readable($temp_dir))) {
 	$temp_dir = '';
 }
-if (!$temp_dir && function_exists('sys_get_temp_dir')) { // sys_get_temp_dir added in PHP v5.2.1
+if ( ! $temp_dir && function_exists('sys_get_temp_dir')) { // sys_get_temp_dir added in PHP v5.2.1
 	// sys_get_temp_dir() may give inaccessible temp dir, e.g. with open_basedir on virtual hosts
 	$temp_dir = sys_get_temp_dir();
 }
@@ -52,16 +52,16 @@ 
 			break;
 		}
 	}
-	if (!$found_valid_tempdir) {
+	if ( ! $found_valid_tempdir) {
 		$temp_dir = '';
 	}
 	unset($open_basedirs, $found_valid_tempdir, $basedir);
 }
-if (!$temp_dir) {
+if ( ! $temp_dir) {
 	$temp_dir = '*'; // invalid directory name should force tempnam() to use system default temp dir
 }
 // $temp_dir = '/something/else/';  // feel free to override temp dir here if it works better for your system
-if (!defined('GETID3_TEMP_DIR')) {
+if ( ! defined('GETID3_TEMP_DIR')) {
 	define('GETID3_TEMP_DIR', $temp_dir);
 }
 unset($open_basedir, $temp_dir);
@@ -72,19 +72,19 @@ 
 class getID3
 {
 	// public: Settings
-	public $encoding        = 'UTF-8';        // CASE SENSITIVE! - i.e. (must be supported by iconv()). Examples:  ISO-8859-1  UTF-8  UTF-16  UTF-16BE
-	public $encoding_id3v1  = 'ISO-8859-1';   // Should always be 'ISO-8859-1', but some tags may be written in other encodings such as 'EUC-CN' or 'CP1252'
+	public $encoding        = 'UTF-8'; // CASE SENSITIVE! - i.e. (must be supported by iconv()). Examples:  ISO-8859-1  UTF-8  UTF-16  UTF-16BE
+	public $encoding_id3v1  = 'ISO-8859-1'; // Should always be 'ISO-8859-1', but some tags may be written in other encodings such as 'EUC-CN' or 'CP1252'
 
 	// public: Optional tag checks - disable for speed.
-	public $option_tag_id3v1         = true;  // Read and process ID3v1 tags
-	public $option_tag_id3v2         = true;  // Read and process ID3v2 tags
-	public $option_tag_lyrics3       = true;  // Read and process Lyrics3 tags
-	public $option_tag_apetag        = true;  // Read and process APE tags
-	public $option_tags_process      = true;  // Copy tags to root key 'tags' and encode to $this->encoding
-	public $option_tags_html         = true;  // Copy tags to root key 'tags_html' properly translated from various encodings to HTML entities
+	public $option_tag_id3v1         = true; // Read and process ID3v1 tags
+	public $option_tag_id3v2         = true; // Read and process ID3v2 tags
+	public $option_tag_lyrics3       = true; // Read and process Lyrics3 tags
+	public $option_tag_apetag        = true; // Read and process APE tags
+	public $option_tags_process      = true; // Copy tags to root key 'tags' and encode to $this->encoding
+	public $option_tags_html         = true; // Copy tags to root key 'tags_html' properly translated from various encodings to HTML entities
 
 	// public: Optional tag/comment calucations
-	public $option_extra_info        = true;  // Calculate additional info such as bitrate, channelmode etc
+	public $option_extra_info        = true; // Calculate additional info such as bitrate, channelmode etc
 
 	// public: Optional handling of embedded attachments (e.g. images)
 	public $option_save_attachments  = true; // defaults to true (ATTACHMENTS_INLINE) for backward compatibility
@@ -93,15 +93,15 @@ 
 	public $option_md5_data          = false; // Get MD5 sum of data part - slow
 	public $option_md5_data_source   = false; // Use MD5 of source file if availble - only FLAC and OptimFROG
 	public $option_sha1_data         = false; // Get SHA1 sum of data part - slow
-	public $option_max_2gb_check     = null;  // Check whether file is larger than 2GB and thus not supported by 32-bit PHP (null: auto-detect based on PHP_INT_MAX)
+	public $option_max_2gb_check     = null; // Check whether file is larger than 2GB and thus not supported by 32-bit PHP (null: auto-detect based on PHP_INT_MAX)
 
 	// public: Read buffer size in bytes
 	public $option_fread_buffer_size = 32768;
 
 	// Public variables
-	public $filename;                         // Filename of file being analysed.
-	public $fp;                               // Filepointer to file being analysed.
-	public $info;                             // Result array.
+	public $filename; // Filename of file being analysed.
+	public $fp; // Filepointer to file being analysed.
+	public $info; // Result array.
 	public $tempdir = GETID3_TEMP_DIR;
 	public $memory_limit = 0;
 
@@ -159,7 +159,7 @@ 
 		}
 
 		// Load support library
-		if (!include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
+		if ( ! include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
 			$this->startup_error .= 'getid3.lib.php is missing or corrupt';
 		}
 
@@ -174,18 +174,18 @@ 
 		// This path cannot contain spaces, but the below code will attempt to get the
 		//   8.3-equivalent path automatically
 		// IMPORTANT: This path must include the trailing slash
-		if (GETID3_OS_ISWINDOWS && !defined('GETID3_HELPERAPPSDIR')) {
+		if (GETID3_OS_ISWINDOWS && ! defined('GETID3_HELPERAPPSDIR')) {
 
 			$helperappsdir = GETID3_INCLUDEPATH.'..'.DIRECTORY_SEPARATOR.'helperapps'; // must not have any space in this path
 
-			if (!is_dir($helperappsdir)) {
+			if ( ! is_dir($helperappsdir)) {
 				$this->startup_warning .= '"'.$helperappsdir.'" cannot be defined as GETID3_HELPERAPPSDIR because it does not exist';
 			} elseif (strpos(realpath($helperappsdir), ' ') !== false) {
 				$DirPieces = explode(DIRECTORY_SEPARATOR, realpath($helperappsdir));
 				$path_so_far = array();
 				foreach ($DirPieces as $key => $value) {
 					if (strpos($value, ' ') !== false) {
-						if (!empty($path_so_far)) {
+						if ( ! empty($path_so_far)) {
 							$commandline = 'dir /x '.escapeshellarg(implode(DIRECTORY_SEPARATOR, $path_so_far));
 							$dir_listing = `$commandline`;
 							$lines = explode("\n", $dir_listing);
@@ -223,7 +223,7 @@ 
 
 	// public: setOption
 	public function setOption($optArray) {
-		if (!is_array($optArray) || empty($optArray)) {
+		if ( ! is_array($optArray) || empty($optArray)) {
 			return false;
 		}
 		foreach ($optArray as $opt => $val) {
@@ -238,10 +238,10 @@ 
 
 	public function openfile($filename) {
 		try {
-			if (!empty($this->startup_error)) {
+			if ( ! empty($this->startup_error)) {
 				throw new getid3_exception($this->startup_error);
 			}
-			if (!empty($this->startup_warning)) {
+			if ( ! empty($this->startup_warning)) {
 				$this->warning($this->startup_warning);
 			}
 
@@ -265,13 +265,13 @@ 
 				// great
 			} else {
 				$errormessagelist = array();
-				if (!is_readable($filename)) {
+				if ( ! is_readable($filename)) {
 					$errormessagelist[] = '!is_readable';
 				}
-				if (!is_file($filename)) {
+				if ( ! is_file($filename)) {
 					$errormessagelist[] = '!is_file';
 				}
-				if (!file_exists($filename)) {
+				if ( ! file_exists($filename)) {
 					$errormessagelist[] = '!file_exists';
 				}
 				if (empty($errormessagelist)) {
@@ -317,14 +317,14 @@ 
 			// set more parameters
 			$this->info['avdataoffset']        = 0;
 			$this->info['avdataend']           = $this->info['filesize'];
-			$this->info['fileformat']          = '';                // filled in later
-			$this->info['audio']['dataformat'] = '';                // filled in later, unset if not used
-			$this->info['video']['dataformat'] = '';                // filled in later, unset if not used
-			$this->info['tags']                = array();           // filled in later, unset if not used
-			$this->info['error']               = array();           // filled in later, unset if not used
-			$this->info['warning']             = array();           // filled in later, unset if not used
-			$this->info['comments']            = array();           // filled in later, unset if not used
-			$this->info['encoding']            = $this->encoding;   // required by id3v2 and iso modules - can be unset at the end if desired
+			$this->info['fileformat']          = ''; // filled in later
+			$this->info['audio']['dataformat'] = ''; // filled in later, unset if not used
+			$this->info['video']['dataformat'] = ''; // filled in later, unset if not used
+			$this->info['tags']                = array(); // filled in later, unset if not used
+			$this->info['error']               = array(); // filled in later, unset if not used
+			$this->info['warning']             = array(); // filled in later, unset if not used
+			$this->info['comments']            = array(); // filled in later, unset if not used
+			$this->info['encoding']            = $this->encoding; // required by id3v2 and iso modules - can be unset at the end if desired
 
 			return true;
 
@@ -337,7 +337,7 @@ 
 	// public: analyze file
 	public function analyze($filename) {
 		try {
-			if (!$this->openfile($filename)) {
+			if ( ! $this->openfile($filename)) {
 				return $this->info;
 			}
 
@@ -366,7 +366,7 @@ 
 			}
 
 			// ID3v2 detection (NOT parsing), even if ($this->option_tag_id3v2 == false) done to make fileformat easier
-			if (!$this->option_tag_id3v2) {
+			if ( ! $this->option_tag_id3v2) {
 				fseek($this->fp, 0);
 				$header = fread($this->fp, 10);
 				if ((substr($header, 0, 3) == 'ID3') && (strlen($header) == 10)) {
@@ -385,7 +385,7 @@ 
 			$determined_format = $this->GetFileFormat($formattest, $filename);
 
 			// unable to determine file format
-			if (!$determined_format) {
+			if ( ! $determined_format) {
 				fclose($this->fp);
 				return $this->error('unable to determine file format');
 			}
@@ -414,14 +414,14 @@ 
 			$this->info['mime_type'] = $determined_format['mime_type'];
 
 			// supported format signature pattern detected, but module deleted
-			if (!file_exists(GETID3_INCLUDEPATH.$determined_format['include'])) {
+			if ( ! file_exists(GETID3_INCLUDEPATH.$determined_format['include'])) {
 				fclose($this->fp);
 				return $this->error('Format not supported, module "'.$determined_format['include'].'" was removed.');
 			}
 
 			// module requires iconv support
 			// Check encoding/iconv support
-			if (!empty($determined_format['iconv_req']) && !function_exists('iconv') && !in_array($this->encoding, array('ISO-8859-1', 'UTF-8', 'UTF-16LE', 'UTF-16BE', 'UTF-16'))) {
+			if ( ! empty($determined_format['iconv_req']) && ! function_exists('iconv') && ! in_array($this->encoding, array('ISO-8859-1', 'UTF-8', 'UTF-16LE', 'UTF-16BE', 'UTF-16'))) {
 				$errormessage = 'iconv() support is required for this module ('.$determined_format['include'].') for encodings other than ISO-8859-1, UTF-8, UTF-16LE, UTF16-BE, UTF-16. ';
 				if (GETID3_OS_ISWINDOWS) {
 					$errormessage .= 'PHP does not have iconv() support. Please enable php_iconv.dll in php.ini, and copy iconv.dll from c:/php/dlls to c:/windows/system32';
@@ -436,7 +436,7 @@ 
 
 			// instantiate module class
 			$class_name = 'getid3_'.$determined_format['module'];
-			if (!class_exists($class_name)) {
+			if ( ! class_exists($class_name)) {
 				return $this->error('Format not supported, module "'.$determined_format['include'].'" is corrupt.');
 			}
 			$class = new $class_name($this);
@@ -463,7 +463,7 @@ 
 			// get the MD5 sum of the audio/video portion of the file - without ID3/APE/Lyrics3/etc header/footer tags
 			if ($this->option_md5_data) {
 				// do not calc md5_data if md5_data_source is present - set by flac only - future MPC/SV8 too
-				if (!$this->option_md5_data_source || empty($this->info['md5_data_source'])) {
+				if ( ! $this->option_md5_data_source || empty($this->info['md5_data_source'])) {
 					$this->getHashdata('md5');
 				}
 			}
@@ -488,7 +488,7 @@ 
 	// private: error handling
 	public function error($message) {
 		$this->CleanUp();
-		if (!isset($this->info['error'])) {
+		if ( ! isset($this->info['error'])) {
 			$this->info['error'] = array();
 		}
 		$this->info['error'][] = $message;
@@ -518,7 +518,7 @@ 
 		}
 
 		// remove empty root keys
-		if (!empty($this->info)) {
+		if ( ! empty($this->info)) {
 			foreach ($this->info as $key => $value) {
 				if (empty($this->info[$key]) && ($this->info[$key] !== 0) && ($this->info[$key] !== '0')) {
 					unset($this->info[$key]);
@@ -537,10 +537,10 @@ 
 		}
 
 		// remove possible duplicated identical entries
-		if (!empty($this->info['error'])) {
+		if ( ! empty($this->info['error'])) {
 			$this->info['error'] = array_values(array_unique($this->info['error']));
 		}
-		if (!empty($this->info['warning'])) {
+		if ( ! empty($this->info['warning'])) {
 			$this->info['warning'] = array_values(array_unique($this->info['warning']));
 		}
 
@@ -764,7 +764,7 @@ 
 
 				// TTA  - audio       - TTA Lossless Audio Compressor (http://tta.corecodec.org)
 				'tta'  => array(
-							'pattern'   => '^TTA',  // could also be '^TTA(\x01|\x02|\x03|2|1)'
+							'pattern'   => '^TTA', // could also be '^TTA(\x01|\x02|\x03|2|1)'
 							'group'     => 'audio',
 							'module'    => 'tta',
 							'mime_type' => 'application/octet-stream',
@@ -1052,7 +1052,7 @@ 
 				// Misc other formats
 
 				// PAR2 - data        - Parity Volume Set Specification 2.0
-				'par2' => array (
+				'par2' => array(
 							'pattern'   => '^PAR2\x00PKT',
 							'group'     => 'misc',
 							'module'    => 'par2',
@@ -1097,7 +1097,7 @@ 
 
 
 
-	public function GetFileFormat(&$filedata, $filename='') {
+	public function GetFileFormat(&$filedata, $filename = '') {
 		// this function will determine the format of a file based on usually
 		// the first 2-4 bytes of the file (8 bytes for PNG, 16 bytes for JPG,
 		// and in the case of ISO CD image, 6 bytes offset 32kb from the start
@@ -1107,7 +1107,7 @@ 
 		foreach ($this->GetFileFormatArray() as $format_name => $info) {
 			// The /s switch on preg_match() forces preg_match() NOT to treat
 			// newline (0x0A) characters as special chars but do a binary match
-			if (!empty($info['pattern']) && preg_match('#'.$info['pattern'].'#s', $filedata)) {
+			if ( ! empty($info['pattern']) && preg_match('#'.$info['pattern'].'#s', $filedata)) {
 				$info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
 				return $info;
 			}
@@ -1127,7 +1127,7 @@ 
 			// and verify there's at least one instance of "TRACK xx AUDIO" in the file
 			$GetFileFormatArray = $this->GetFileFormatArray();
 			$info = $GetFileFormatArray['cue'];
-			$info['include']   = 'module.'.$info['group'].'.'.$info['module'].'.php';
+			$info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
 			return $info;
 		}
 
@@ -1165,26 +1165,26 @@ 
 		static $tags;
 		if (empty($tags)) {
 			$tags = array(
-				'asf'       => array('asf'           , 'UTF-16LE'),
-				'midi'      => array('midi'          , 'ISO-8859-1'),
-				'nsv'       => array('nsv'           , 'ISO-8859-1'),
-				'ogg'       => array('vorbiscomment' , 'UTF-8'),
-				'png'       => array('png'           , 'UTF-8'),
-				'tiff'      => array('tiff'          , 'ISO-8859-1'),
-				'quicktime' => array('quicktime'     , 'UTF-8'),
-				'real'      => array('real'          , 'ISO-8859-1'),
-				'vqf'       => array('vqf'           , 'ISO-8859-1'),
-				'zip'       => array('zip'           , 'ISO-8859-1'),
-				'riff'      => array('riff'          , 'ISO-8859-1'),
-				'lyrics3'   => array('lyrics3'       , 'ISO-8859-1'),
-				'id3v1'     => array('id3v1'         , $this->encoding_id3v1),
-				'id3v2'     => array('id3v2'         , 'UTF-8'), // not according to the specs (every frame can have a different encoding), but getID3() force-converts all encodings to UTF-8
-				'ape'       => array('ape'           , 'UTF-8'),
-				'cue'       => array('cue'           , 'ISO-8859-1'),
-				'matroska'  => array('matroska'      , 'UTF-8'),
-				'flac'      => array('vorbiscomment' , 'UTF-8'),
-				'divxtag'   => array('divx'          , 'ISO-8859-1'),
-				'iptc'      => array('iptc'          , 'ISO-8859-1'),
+				'asf'       => array('asf', 'UTF-16LE'),
+				'midi'      => array('midi', 'ISO-8859-1'),
+				'nsv'       => array('nsv', 'ISO-8859-1'),
+				'ogg'       => array('vorbiscomment', 'UTF-8'),
+				'png'       => array('png', 'UTF-8'),
+				'tiff'      => array('tiff', 'ISO-8859-1'),
+				'quicktime' => array('quicktime', 'UTF-8'),
+				'real'      => array('real', 'ISO-8859-1'),
+				'vqf'       => array('vqf', 'ISO-8859-1'),
+				'zip'       => array('zip', 'ISO-8859-1'),
+				'riff'      => array('riff', 'ISO-8859-1'),
+				'lyrics3'   => array('lyrics3', 'ISO-8859-1'),
+				'id3v1'     => array('id3v1', $this->encoding_id3v1),
+				'id3v2'     => array('id3v2', 'UTF-8'), // not according to the specs (every frame can have a different encoding), but getID3() force-converts all encodings to UTF-8
+				'ape'       => array('ape', 'UTF-8'),
+				'cue'       => array('cue', 'ISO-8859-1'),
+				'matroska'  => array('matroska', 'UTF-8'),
+				'flac'      => array('vorbiscomment', 'UTF-8'),
+				'divxtag'   => array('divx', 'ISO-8859-1'),
+				'iptc'      => array('iptc', 'ISO-8859-1'),
 			);
 		}
 
@@ -1193,19 +1193,19 @@ 
 			list($tag_name, $encoding) = $tagname_encoding_array;
 
 			// fill in default encoding type if not already present
-			if (isset($this->info[$comment_name]) && !isset($this->info[$comment_name]['encoding'])) {
+			if (isset($this->info[$comment_name]) && ! isset($this->info[$comment_name]['encoding'])) {
 				$this->info[$comment_name]['encoding'] = $encoding;
 			}
 
 			// copy comments if key name set
-			if (!empty($this->info[$comment_name]['comments'])) {
+			if ( ! empty($this->info[$comment_name]['comments'])) {
 				foreach ($this->info[$comment_name]['comments'] as $tag_key => $valuearray) {
 					foreach ($valuearray as $key => $value) {
 						if (is_string($value)) {
 							$value = trim($value, " \r\n\t"); // do not trim nulls from $value!! Unicode characters will get mangled if trailing nulls are removed!
 						}
 						if ($value) {
-							if (!is_numeric($key)) {
+							if ( ! is_numeric($key)) {
 								$this->info['tags'][trim($tag_name)][trim($tag_key)][$key] = $value;
 							} else {
 								$this->info['tags'][trim($tag_name)][trim($tag_key)][]     = $value;
@@ -1217,7 +1217,7 @@ 
 					}
 				}
 
-				if (!isset($this->info['tags'][$tag_name])) {
+				if ( ! isset($this->info['tags'][$tag_name])) {
 					// comments are set but contain nothing but empty strings, so skip
 					continue;
 				}
@@ -1228,14 +1228,14 @@ 
 					}
 				}
 
-				$this->CharConvert($this->info['tags'][$tag_name], $encoding);           // only copy gets converted!
+				$this->CharConvert($this->info['tags'][$tag_name], $encoding); // only copy gets converted!
 			}
 
 		}
 
 		// pictures can take up a lot of space, and we don't need multiple copies of them
 		// let there be a single copy in [comments][picture], and not elsewhere
-		if (!empty($this->info['tags'])) {
+		if ( ! empty($this->info['tags'])) {
 			$unset_keys = array('tags', 'tags_html');
 			foreach ($this->info['tags'] as $tagtype => $tagarray) {
 				foreach ($tagarray as $tagname => $tagdata) {
@@ -1291,7 +1291,7 @@ 
 				break;
 		}
 
-		if (!empty($this->info['fileformat']) && !empty($this->info['dataformat']) && ($this->info['fileformat'] == 'ogg') && ($this->info['audio']['dataformat'] == 'vorbis')) {
+		if ( ! empty($this->info['fileformat']) && ! empty($this->info['dataformat']) && ($this->info['fileformat'] == 'ogg') && ($this->info['audio']['dataformat'] == 'vorbis')) {
 
 			// We cannot get an identical md5_data value for Ogg files where the comments
 			// span more than 1 Ogg page (compared to the same audio data with smaller
@@ -1350,7 +1350,7 @@ 
 
 				}
 
-				if (!empty($VorbisCommentError)) {
+				if ( ! empty($VorbisCommentError)) {
 
 					$this->info['warning'][]         = 'Failed making system call to vorbiscomment(.exe) - '.$algorithm.'_data will be incorrect. If vorbiscomment is unavailable, please download from http://www.vorbis.com/download.psp and put in the getID3() directory. Error returned: '.$VorbisCommentError;
 					$this->info[$algorithm.'_data']  = false;
@@ -1380,7 +1380,7 @@ 
 
 		} else {
 
-			if (!empty($this->info['avdataoffset']) || (isset($this->info['avdataend']) && ($this->info['avdataend'] < $this->info['filesize']))) {
+			if ( ! empty($this->info['avdataoffset']) || (isset($this->info['avdataend']) && ($this->info['avdataend'] < $this->info['filesize']))) {
 
 				// get hash from part of file
 				$this->info[$algorithm.'_data'] = getid3_lib::hash_data($this->info['filenamepath'], $this->info['avdataoffset'], $this->info['avdataend'], $algorithm);
@@ -1407,7 +1407,7 @@ 
 	public function ChannelsBitratePlaytimeCalculations() {
 
 		// set channelmode on audio
-		if (!empty($this->info['audio']['channelmode']) || !isset($this->info['audio']['channels'])) {
+		if ( ! empty($this->info['audio']['channelmode']) || ! isset($this->info['audio']['channels'])) {
 			// ignore
 		} elseif ($this->info['audio']['channels'] == 1) {
 			$this->info['audio']['channelmode'] = 'mono';
@@ -1429,7 +1429,7 @@ 
 		//}
 
 		// video bitrate undetermined, but calculable
-		if (isset($this->info['video']['dataformat']) && $this->info['video']['dataformat'] && (!isset($this->info['video']['bitrate']) || ($this->info['video']['bitrate'] == 0))) {
+		if (isset($this->info['video']['dataformat']) && $this->info['video']['dataformat'] && ( ! isset($this->info['video']['bitrate']) || ($this->info['video']['bitrate'] == 0))) {
 			// if video bitrate not set
 			if (isset($this->info['audio']['bitrate']) && ($this->info['audio']['bitrate'] > 0) && ($this->info['audio']['bitrate'] == $this->info['bitrate'])) {
 				// AND if audio bitrate is set to same as overall bitrate
@@ -1445,11 +1445,11 @@ 
 			}
 		}
 
-		if ((!isset($this->info['playtime_seconds']) || ($this->info['playtime_seconds'] <= 0)) && !empty($this->info['bitrate'])) {
+		if (( ! isset($this->info['playtime_seconds']) || ($this->info['playtime_seconds'] <= 0)) && ! empty($this->info['bitrate'])) {
 			$this->info['playtime_seconds'] = (($this->info['avdataend'] - $this->info['avdataoffset']) * 8) / $this->info['bitrate'];
 		}
 
-		if (!isset($this->info['bitrate']) && !empty($this->info['playtime_seconds'])) {
+		if ( ! isset($this->info['bitrate']) && ! empty($this->info['playtime_seconds'])) {
 			$this->info['bitrate'] = (($this->info['avdataend'] - $this->info['avdataoffset']) * 8) / $this->info['playtime_seconds'];
 		}
 		if (isset($this->info['bitrate']) && empty($this->info['audio']['bitrate']) && empty($this->info['video']['bitrate'])) {
@@ -1463,7 +1463,7 @@ 
 		}
 
 		// Set playtime string
-		if (!empty($this->info['playtime_seconds']) && empty($this->info['playtime_string'])) {
+		if ( ! empty($this->info['playtime_seconds']) && empty($this->info['playtime_string'])) {
 			$this->info['playtime_string'] = getid3_lib::PlaytimeString($this->info['playtime_seconds']);
 		}
 	}
@@ -1493,17 +1493,17 @@ 
 				break;
 
 			default:
-				if (!empty($this->info['video']['frame_rate'])) {
+				if ( ! empty($this->info['video']['frame_rate'])) {
 					$FrameRate = $this->info['video']['frame_rate'];
 				} else {
 					return false;
 				}
-				if (!empty($this->info['playtime_seconds'])) {
+				if ( ! empty($this->info['playtime_seconds'])) {
 					$PlaytimeSeconds = $this->info['playtime_seconds'];
 				} else {
 					return false;
 				}
-				if (!empty($this->info['video']['bitrate'])) {
+				if ( ! empty($this->info['video']['bitrate'])) {
 					$BitrateCompressed = $this->info['video']['bitrate'];
 				} else {
 					return false;
@@ -1518,15 +1518,15 @@ 
 
 
 	public function CalculateCompressionRatioAudio() {
-		if (empty($this->info['audio']['bitrate']) || empty($this->info['audio']['channels']) || empty($this->info['audio']['sample_rate']) || !is_numeric($this->info['audio']['sample_rate'])) {
+		if (empty($this->info['audio']['bitrate']) || empty($this->info['audio']['channels']) || empty($this->info['audio']['sample_rate']) || ! is_numeric($this->info['audio']['sample_rate'])) {
 			return false;
 		}
-		$this->info['audio']['compression_ratio'] = $this->info['audio']['bitrate'] / ($this->info['audio']['channels'] * $this->info['audio']['sample_rate'] * (!empty($this->info['audio']['bits_per_sample']) ? $this->info['audio']['bits_per_sample'] : 16));
+		$this->info['audio']['compression_ratio'] = $this->info['audio']['bitrate'] / ($this->info['audio']['channels'] * $this->info['audio']['sample_rate'] * ( ! empty($this->info['audio']['bits_per_sample']) ? $this->info['audio']['bits_per_sample'] : 16));
 
-		if (!empty($this->info['audio']['streams'])) {
+		if ( ! empty($this->info['audio']['streams'])) {
 			foreach ($this->info['audio']['streams'] as $streamnumber => $streamdata) {
-				if (!empty($streamdata['bitrate']) && !empty($streamdata['channels']) && !empty($streamdata['sample_rate'])) {
-					$this->info['audio']['streams'][$streamnumber]['compression_ratio'] = $streamdata['bitrate'] / ($streamdata['channels'] * $streamdata['sample_rate'] * (!empty($streamdata['bits_per_sample']) ? $streamdata['bits_per_sample'] : 16));
+				if ( ! empty($streamdata['bitrate']) && ! empty($streamdata['channels']) && ! empty($streamdata['sample_rate'])) {
+					$this->info['audio']['streams'][$streamnumber]['compression_ratio'] = $streamdata['bitrate'] / ($streamdata['channels'] * $streamdata['sample_rate'] * ( ! empty($streamdata['bits_per_sample']) ? $streamdata['bits_per_sample'] : 16));
 				}
 			}
 		}
@@ -1536,7 +1536,7 @@ 
 
 	public function CalculateReplayGain() {
 		if (isset($this->info['replay_gain'])) {
-			if (!isset($this->info['replay_gain']['reference_volume'])) {
+			if ( ! isset($this->info['replay_gain']['reference_volume'])) {
 				$this->info['replay_gain']['reference_volume'] = (double) 89.0;
 			}
 			if (isset($this->info['replay_gain']['track']['adjustment'])) {
@@ -1557,8 +1557,8 @@ 
 	}
 
 	public function ProcessAudioStreams() {
-		if (!empty($this->info['audio']['bitrate']) || !empty($this->info['audio']['channels']) || !empty($this->info['audio']['sample_rate'])) {
-			if (!isset($this->info['audio']['streams'])) {
+		if ( ! empty($this->info['audio']['bitrate']) || ! empty($this->info['audio']['channels']) || ! empty($this->info['audio']['sample_rate'])) {
+			if ( ! isset($this->info['audio']['streams'])) {
 				foreach ($this->info['audio'] as $key => $value) {
 					if ($key != 'streams') {
 						$this->info['audio']['streams'][0][$key] = $value;
@@ -1575,7 +1575,7 @@ 
 
 	public function include_module($name) {
 		//if (!file_exists($this->include_path.'module.'.$name.'.php')) {
-		if (!file_exists(GETID3_INCLUDEPATH.'module.'.$name.'.php')) {
+		if ( ! file_exists(GETID3_INCLUDEPATH.'module.'.$name.'.php')) {
 			throw new getid3_exception('Required module.'.$name.'.php is missing.');
 		}
 		include_once(GETID3_INCLUDEPATH.'module.'.$name.'.php');
@@ -1590,17 +1590,17 @@ 
 	/**
 	* @var getID3
 	*/
-	protected $getid3;                       // pointer
+	protected $getid3; // pointer
 
 	protected $data_string_flag     = false; // analyzing filepointer or string
-	protected $data_string          = '';    // string to analyze
-	protected $data_string_position = 0;     // seek position in string
-	protected $data_string_length   = 0;     // string length
+	protected $data_string          = ''; // string to analyze
+	protected $data_string_position = 0; // seek position in string
+	protected $data_string_length   = 0; // string length
 
 	private $dependency_to = null;
 
 
-	public function __construct(getID3 $getid3, $call_module=null) {
+	public function __construct(getID3 $getid3, $call_module = null) {
 		$this->getid3 = $getid3;
 
 		if ($call_module) {
@@ -1658,13 +1658,13 @@ 
 			return substr($this->data_string, $this->data_string_position - $bytes, $bytes);
 		}
 		$pos = $this->ftell() + $bytes;
-		if (!getid3_lib::intValueSupported($pos)) {
+		if ( ! getid3_lib::intValueSupported($pos)) {
 			throw new getid3_exception('cannot fread('.$bytes.' from '.$this->ftell().') because beyond PHP filesystem limit', 10);
 		}
 		return fread($this->getid3->fp, $bytes);
 	}
 
-	protected function fseek($bytes, $whence=SEEK_SET) {
+	protected function fseek($bytes, $whence = SEEK_SET) {
 		if ($this->data_string_flag) {
 			switch ($whence) {
 				case SEEK_SET:
@@ -1687,7 +1687,7 @@ 
 			} elseif ($whence == SEEK_END) {
 				$pos = $this->getid3->info['filesize'] + $bytes;
 			}
-			if (!getid3_lib::intValueSupported($pos)) {
+			if ( ! getid3_lib::intValueSupported($pos)) {
 				throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10);
 			}
 		}
@@ -1719,7 +1719,7 @@ 
 		// does nothing for now
 	}
 
-	public function saveAttachment($name, $offset, $length, $image_mime=null) {
+	public function saveAttachment($name, $offset, $length, $image_mime = null) {
 		try {
 
 			// do not extract at all
@@ -1741,7 +1741,7 @@ 
 
 				// set up destination path
 				$dir = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->getid3->option_save_attachments), DIRECTORY_SEPARATOR);
-				if (!is_dir($dir) || !is_writable($dir)) { // check supplied directory
+				if ( ! is_dir($dir) || ! is_writable($dir)) { // check supplied directory
 					throw new Exception('supplied path ('.$dir.') does not exist, or is not writable');
 				}
 				$dest = $dir.DIRECTORY_SEPARATOR.$name.($image_mime ? '.'.getid3_lib::ImageExtFromMime($image_mime) : '');

Braces +1 added lines, -2 removed lines

@@ -350,8 +350,7 @@
 						$tag_class = 'getid3_'.$tag_name;
 						$tag = new $tag_class($this);
 						$tag->Analyze();
-					}
-					catch (getid3_exception $e) {
+					} catch (getid3_exception $e) {
 						throw $e;
 					}
 				}

src/wp-includes/ID3/module.audio-video.asf.php

Doc Comments +4 added lines

@@ -1684,6 +1684,10 @@
 		return (isset($lookup[$WMpictureType]) ? $lookup[$WMpictureType] : '');
 	}
 
+	/**
+	 * @param string $asf_header_extension_object_data
+	 * @param integer $unhandled_sections
+	 */
 	public function HeaderExtensionObjectDataParse(&$asf_header_extension_object_data, &$unhandled_sections) {
 		// http://msdn.microsoft.com/en-us/library/bb643323.aspx
 

Spacing +98 added lines, -99 removed lines

@@ -19,12 +19,12 @@ 
 class getid3_asf extends getid3_handler {
 
 	public function __construct(getID3 $getid3) {
-		parent::__construct($getid3);  // extends getid3_handler::__construct()
+		parent::__construct($getid3); // extends getid3_handler::__construct()
 
 		// initialize all GUID constants
 		$GUIDarray = $this->KnownGUIDs();
 		foreach ($GUIDarray as $GUIDname => $hexstringvalue) {
-			if (!defined($GUIDname)) {
+			if ( ! defined($GUIDname)) {
 				define($GUIDname, $this->GUIDtoBytestring($hexstringvalue));
 			}
 		}
@@ -220,8 +220,8 @@ 
 					switch ($StreamPropertiesObjectData['stream_type']) {
 
 						case GETID3_ASF_Audio_Media:
-							$thisfile_audio['dataformat']   = (!empty($thisfile_audio['dataformat'])   ? $thisfile_audio['dataformat']   : 'asf');
-							$thisfile_audio['bitrate_mode'] = (!empty($thisfile_audio['bitrate_mode']) ? $thisfile_audio['bitrate_mode'] : 'cbr');
+							$thisfile_audio['dataformat']   = ( ! empty($thisfile_audio['dataformat']) ? $thisfile_audio['dataformat'] : 'asf');
+							$thisfile_audio['bitrate_mode'] = ( ! empty($thisfile_audio['bitrate_mode']) ? $thisfile_audio['bitrate_mode'] : 'cbr');
 
 							$audiodata = getid3_riff::parseWAVEFORMATex(substr($StreamPropertiesObjectData['type_specific_data'], 0, 16));
 							unset($audiodata['raw']);
@@ -229,8 +229,8 @@ 
 							break;
 
 						case GETID3_ASF_Video_Media:
-							$thisfile_video['dataformat']   = (!empty($thisfile_video['dataformat'])   ? $thisfile_video['dataformat']   : 'asf');
-							$thisfile_video['bitrate_mode'] = (!empty($thisfile_video['bitrate_mode']) ? $thisfile_video['bitrate_mode'] : 'cbr');
+							$thisfile_video['dataformat']   = ( ! empty($thisfile_video['dataformat']) ? $thisfile_video['dataformat'] : 'asf');
+							$thisfile_video['bitrate_mode'] = ( ! empty($thisfile_video['bitrate_mode']) ? $thisfile_video['bitrate_mode'] : 'cbr');
 							break;
 
 						case GETID3_ASF_Command_Media:
@@ -270,7 +270,7 @@ 
 						//return false;
 						break;
 					}
-					$thisfile_asf_headerextensionobject['reserved_2']          = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
+					$thisfile_asf_headerextensionobject['reserved_2'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
 					$offset += 2;
 					if ($thisfile_asf_headerextensionobject['reserved_2'] != 6) {
 						$info['warning'][] = 'header_extension_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_headerextensionobject['reserved_2']).') does not match expected value of "6"';
@@ -279,7 +279,7 @@ 
 					}
 					$thisfile_asf_headerextensionobject['extension_data_size'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
 					$offset += 4;
-					$thisfile_asf_headerextensionobject['extension_data']      =                              substr($ASFHeaderData, $offset, $thisfile_asf_headerextensionobject['extension_data_size']);
+					$thisfile_asf_headerextensionobject['extension_data']      = substr($ASFHeaderData, $offset, $thisfile_asf_headerextensionobject['extension_data_size']);
 					$unhandled_sections = 0;
 					$thisfile_asf_headerextensionobject['extension_data_parsed'] = $this->HeaderExtensionObjectDataParse($thisfile_asf_headerextensionobject['extension_data'], $unhandled_sections);
 					if ($unhandled_sections === 0) {
@@ -355,11 +355,11 @@ 
 								list($AudioCodecBitrate, $AudioCodecFrequency, $AudioCodecChannels) = explode(',', $this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['description']));
 								$thisfile_audio['codec'] = $this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['name']);
 
-								if (!isset($thisfile_audio['bitrate']) && strstr($AudioCodecBitrate, 'kbps')) {
+								if ( ! isset($thisfile_audio['bitrate']) && strstr($AudioCodecBitrate, 'kbps')) {
 									$thisfile_audio['bitrate'] = (int) (trim(str_replace('kbps', '', $AudioCodecBitrate)) * 1000);
 								}
 								//if (!isset($thisfile_video['bitrate']) && isset($thisfile_audio['bitrate']) && isset($thisfile_asf['file_properties_object']['max_bitrate']) && ($thisfile_asf_codeclistobject['codec_entries_count'] > 1)) {
-								if (empty($thisfile_video['bitrate']) && !empty($thisfile_audio['bitrate']) && !empty($info['bitrate'])) {
+								if (empty($thisfile_video['bitrate']) && ! empty($thisfile_audio['bitrate']) && ! empty($info['bitrate'])) {
 									//$thisfile_video['bitrate'] = $thisfile_asf['file_properties_object']['max_bitrate'] - $thisfile_audio['bitrate'];
 									$thisfile_video['bitrate'] = $info['bitrate'] - $thisfile_audio['bitrate'];
 								}
@@ -416,7 +416,7 @@ 
 										break;
 								}
 
-								if (!isset($thisfile_audio['channels'])) {
+								if ( ! isset($thisfile_audio['channels'])) {
 									if (strstr($AudioCodecChannels, 'stereo')) {
 										$thisfile_audio['channels'] = 2;
 									} elseif (strstr($AudioCodecChannels, 'mono')) {
@@ -533,7 +533,7 @@ 
 					$thisfile_asf_markerobject['name'] = substr($ASFHeaderData, $offset, $thisfile_asf_markerobject['name_length']);
 					$offset += $thisfile_asf_markerobject['name_length'];
 					for ($MarkersCounter = 0; $MarkersCounter < $thisfile_asf_markerobject['markers_count']; $MarkersCounter++) {
-						$thisfile_asf_markerobject['markers'][$MarkersCounter]['offset']  = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
+						$thisfile_asf_markerobject['markers'][$MarkersCounter]['offset'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
 						$offset += 8;
 						$thisfile_asf_markerobject['markers'][$MarkersCounter]['presentation_time']         = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
 						$offset += 8;
@@ -547,9 +547,9 @@ 
 						$offset += 4;
 						$thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description']        = substr($ASFHeaderData, $offset, $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length']);
 						$offset += $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length'];
-						$PaddingLength = $thisfile_asf_markerobject['markers'][$MarkersCounter]['entry_length'] - 4 -  4 - 4 - $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length'];
+						$PaddingLength = $thisfile_asf_markerobject['markers'][$MarkersCounter]['entry_length'] - 4 - 4 - 4 - $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length'];
 						if ($PaddingLength > 0) {
-							$thisfile_asf_markerobject['markers'][$MarkersCounter]['padding']               = substr($ASFHeaderData, $offset, $PaddingLength);
+							$thisfile_asf_markerobject['markers'][$MarkersCounter]['padding'] = substr($ASFHeaderData, $offset, $PaddingLength);
 							$offset += $PaddingLength;
 						}
 					}
@@ -691,7 +691,7 @@ 
 
 					$ASFcommentKeysToCopy = array('title'=>'title', 'author'=>'artist', 'copyright'=>'copyright', 'description'=>'comment', 'rating'=>'rating');
 					foreach ($ASFcommentKeysToCopy as $keytocopyfrom => $keytocopyto) {
-						if (!empty($thisfile_asf_contentdescriptionobject[$keytocopyfrom])) {
+						if ( ! empty($thisfile_asf_contentdescriptionobject[$keytocopyfrom])) {
 							$thisfile_asf_comments[$keytocopyto][] = $this->TrimTerm($thisfile_asf_contentdescriptionobject[$keytocopyfrom]);
 						}
 					}
@@ -775,7 +775,7 @@ 
 
 							case 'wm/albumtitle':
 							case 'album':
-								$thisfile_asf_comments['album']  = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
+								$thisfile_asf_comments['album'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
 								break;
 
 							case 'wm/genre':
@@ -807,7 +807,7 @@ 
 							case 'wm/year':
 							case 'year':
 							case 'date':
-								$thisfile_asf_comments['year'] = array( $this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
+								$thisfile_asf_comments['year'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
 								break;
 
 							case 'wm/lyrics':
@@ -1033,7 +1033,7 @@ 
 								break;
 						}
 
-						if (!empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
+						if ( ! empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
 							foreach ($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'] as $dummy => $dataarray) {
 								if (isset($dataarray['flags']['stream_number']) && ($dataarray['flags']['stream_number'] == $streamnumber)) {
 									$thisfile_asf_audiomedia_currentstream['bitrate'] = $dataarray['bitrate'];
@@ -1042,9 +1042,9 @@ 
 								}
 							}
 						} else {
-							if (!empty($thisfile_asf_audiomedia_currentstream['bytes_sec'])) {
+							if ( ! empty($thisfile_asf_audiomedia_currentstream['bytes_sec'])) {
 								$thisfile_audio['bitrate'] += $thisfile_asf_audiomedia_currentstream['bytes_sec'] * 8;
-							} elseif (!empty($thisfile_asf_audiomedia_currentstream['bitrate'])) {
+							} elseif ( ! empty($thisfile_asf_audiomedia_currentstream['bitrate'])) {
 								$thisfile_audio['bitrate'] += $thisfile_asf_audiomedia_currentstream['bitrate'];
 							}
 						}
@@ -1119,7 +1119,7 @@ 
 						$videomediaoffset += 4;
 						$thisfile_asf_videomedia_currentstream['format_data']['codec_data']       = substr($streamdata['type_specific_data'], $videomediaoffset);
 
-						if (!empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
+						if ( ! empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
 							foreach ($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'] as $dummy => $dataarray) {
 								if (isset($dataarray['flags']['stream_number']) && ($dataarray['flags']['stream_number'] == $streamnumber)) {
 									$thisfile_asf_videomedia_currentstream['bitrate'] = $dataarray['bitrate'];
@@ -1225,7 +1225,7 @@ 
 					$thisfile_asf_simpleindexobject['objectid_guid']             = $NextObjectGUIDtext;
 					$thisfile_asf_simpleindexobject['objectsize']                = $NextObjectSize;
 
-					$thisfile_asf_simpleindexobject['fileid']                    =                  substr($SimpleIndexObjectData, $offset, 16);
+					$thisfile_asf_simpleindexobject['fileid']                    = substr($SimpleIndexObjectData, $offset, 16);
 					$offset += 16;
 					$thisfile_asf_simpleindexobject['fileid_guid']               = $this->BytestringToGUID($thisfile_asf_simpleindexobject['fileid']);
 					$thisfile_asf_simpleindexobject['index_entry_time_interval'] = getid3_lib::LittleEndian2Int(substr($SimpleIndexObjectData, $offset, 8));
@@ -1379,8 +1379,7 @@ 
 		}
 
 		switch (isset($thisfile_audio['codec']) ? $thisfile_audio['codec'] : '') {
-			case 'MPEG Layer-3':
-				$thisfile_audio['dataformat'] = 'mp3';
+			case 'MPEG Layer-3' : $thisfile_audio['dataformat'] = 'mp3';
 				break;
 
 			default:
@@ -1401,7 +1400,7 @@ 
 						// AH 2003-10-01
 						$thisfile_audio['encoder_options'] = $this->TrimConvert($thisfile_asf_codeclistobject['codec_entries'][0]['description']);
 
-						$thisfile_audio['codec']   = $thisfile_audio['encoder'];
+						$thisfile_audio['codec'] = $thisfile_audio['encoder'];
 						break;
 
 					default:
@@ -1413,15 +1412,15 @@ 
 		}
 
 		if (isset($info['audio'])) {
-			$thisfile_audio['lossless']           = (isset($thisfile_audio['lossless'])           ? $thisfile_audio['lossless']           : false);
-			$thisfile_audio['dataformat']         = (!empty($thisfile_audio['dataformat'])        ? $thisfile_audio['dataformat']         : 'asf');
+			$thisfile_audio['lossless']           = (isset($thisfile_audio['lossless']) ? $thisfile_audio['lossless'] : false);
+			$thisfile_audio['dataformat']         = ( ! empty($thisfile_audio['dataformat']) ? $thisfile_audio['dataformat'] : 'asf');
 		}
-		if (!empty($thisfile_video['dataformat'])) {
-			$thisfile_video['lossless']           = (isset($thisfile_audio['lossless'])           ? $thisfile_audio['lossless']           : false);
+		if ( ! empty($thisfile_video['dataformat'])) {
+			$thisfile_video['lossless']           = (isset($thisfile_audio['lossless']) ? $thisfile_audio['lossless'] : false);
 			$thisfile_video['pixel_aspect_ratio'] = (isset($thisfile_audio['pixel_aspect_ratio']) ? $thisfile_audio['pixel_aspect_ratio'] : (float) 1);
-			$thisfile_video['dataformat']         = (!empty($thisfile_video['dataformat'])        ? $thisfile_video['dataformat']         : 'asf');
+			$thisfile_video['dataformat']         = ( ! empty($thisfile_video['dataformat']) ? $thisfile_video['dataformat'] : 'asf');
 		}
-		if (!empty($thisfile_video['streams'])) {
+		if ( ! empty($thisfile_video['streams'])) {
 			$thisfile_video['resolution_x'] = 0;
 			$thisfile_video['resolution_y'] = 0;
 			foreach ($thisfile_video['streams'] as $key => $valuearray) {
@@ -1433,7 +1432,7 @@ 
 		}
 		$info['bitrate'] = (isset($thisfile_audio['bitrate']) ? $thisfile_audio['bitrate'] : 0) + (isset($thisfile_video['bitrate']) ? $thisfile_video['bitrate'] : 0);
 
-		if ((!isset($info['playtime_seconds']) || ($info['playtime_seconds'] <= 0)) && ($info['bitrate'] > 0)) {
+		if (( ! isset($info['playtime_seconds']) || ($info['playtime_seconds'] <= 0)) && ($info['bitrate'] > 0)) {
 			$info['playtime_seconds'] = ($info['filesize'] - $info['avdataoffset']) / ($info['bitrate'] / 8);
 		}
 
@@ -1593,13 +1592,13 @@ 
 		// AaBbCcDd-EeFf-GgHh-IiJj-KkLlMmNnOoPp is stored as this 16-byte string:
 		// $Dd $Cc $Bb $Aa $Ff $Ee $Hh $Gg $Ii $Jj $Kk $Ll $Mm $Nn $Oo $Pp
 
-		$hexbytecharstring  = chr(hexdec(substr($GUIDstring,  6, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  4, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  2, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  0, 2)));
+		$hexbytecharstring  = chr(hexdec(substr($GUIDstring, 6, 2)));
+		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 4, 2)));
+		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 2, 2)));
+		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 0, 2)));
 
 		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 11, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  9, 2)));
+		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 9, 2)));
 
 		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 16, 2)));
 		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 14, 2)));
@@ -1618,19 +1617,19 @@ 
 	}
 
 	public static function BytestringToGUID($Bytestring) {
-		$GUIDstring  = str_pad(dechex(ord($Bytestring{3})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{2})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{1})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{0})),  2, '0', STR_PAD_LEFT);
+		$GUIDstring  = str_pad(dechex(ord($Bytestring{3})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{2})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{1})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{0})), 2, '0', STR_PAD_LEFT);
 		$GUIDstring .= '-';
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{5})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{4})),  2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{5})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{4})), 2, '0', STR_PAD_LEFT);
 		$GUIDstring .= '-';
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{7})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{6})),  2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{7})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{6})), 2, '0', STR_PAD_LEFT);
 		$GUIDstring .= '-';
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{8})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{9})),  2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{8})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{9})), 2, '0', STR_PAD_LEFT);
 		$GUIDstring .= '-';
 		$GUIDstring .= str_pad(dechex(ord($Bytestring{10})), 2, '0', STR_PAD_LEFT);
 		$GUIDstring .= str_pad(dechex(ord($Bytestring{11})), 2, '0', STR_PAD_LEFT);
@@ -1642,7 +1641,7 @@ 
 		return strtoupper($GUIDstring);
 	}
 
-	public static function FILETIMEtoUNIXtime($FILETIME, $round=true) {
+	public static function FILETIMEtoUNIXtime($FILETIME, $round = true) {
 		// FILETIME is a 64-bit unsigned integer representing
 		// the number of 100-nanosecond intervals since January 1, 1601
 		// UNIX timestamp is number of seconds since January 1, 1970
@@ -1694,12 +1693,12 @@ 
 			$offset = $objectOffset;
 			$thisObject = array();
 
-			$thisObject['guid']                              =                              substr($asf_header_extension_object_data, $offset, 16);
+			$thisObject['guid'] = substr($asf_header_extension_object_data, $offset, 16);
 			$offset += 16;
 			$thisObject['guid_text'] = $this->BytestringToGUID($thisObject['guid']);
 			$thisObject['guid_name'] = $this->GUIDname($thisObject['guid_text']);
 
-			$thisObject['size']                              = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  8));
+			$thisObject['size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 8));
 			$offset += 8;
 			if ($thisObject['size'] <= 0) {
 				break;
@@ -1707,67 +1706,67 @@ 
 
 			switch ($thisObject['guid']) {
 				case GETID3_ASF_Extended_Stream_Properties_Object:
-					$thisObject['start_time']                        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  8));
+					$thisObject['start_time']                        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 8));
 					$offset += 8;
 					$thisObject['start_time_unix']                   = $this->FILETIMEtoUNIXtime($thisObject['start_time']);
 
-					$thisObject['end_time']                          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  8));
+					$thisObject['end_time']                          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 8));
 					$offset += 8;
 					$thisObject['end_time_unix']                     = $this->FILETIMEtoUNIXtime($thisObject['end_time']);
 
-					$thisObject['data_bitrate']                      = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['data_bitrate']                      = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['buffer_size']                       = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['buffer_size']                       = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['initial_buffer_fullness']           = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['initial_buffer_fullness']           = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['alternate_data_bitrate']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['alternate_data_bitrate']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['alternate_buffer_size']             = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['alternate_buffer_size']             = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['alternate_initial_buffer_fullness'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['alternate_initial_buffer_fullness'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['maximum_object_size']               = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['maximum_object_size']               = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['flags_raw']                         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['flags_raw']                         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 					$thisObject['flags']['reliable']                = (bool) $thisObject['flags_raw'] & 0x00000001;
 					$thisObject['flags']['seekable']                = (bool) $thisObject['flags_raw'] & 0x00000002;
 					$thisObject['flags']['no_cleanpoints']          = (bool) $thisObject['flags_raw'] & 0x00000004;
 					$thisObject['flags']['resend_live_cleanpoints'] = (bool) $thisObject['flags_raw'] & 0x00000008;
 
-					$thisObject['stream_number']                     = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['stream_number']                     = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
-					$thisObject['stream_language_id_index']          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['stream_language_id_index']          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
-					$thisObject['average_time_per_frame']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['average_time_per_frame']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['stream_name_count']                 = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['stream_name_count']                 = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
-					$thisObject['payload_extension_system_count']    = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['payload_extension_system_count']    = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
 					for ($i = 0; $i < $thisObject['stream_name_count']; $i++) {
 						$streamName = array();
 
-						$streamName['language_id_index']             = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$streamName['language_id_index']             = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$streamName['stream_name_length']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$streamName['stream_name_length']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$streamName['stream_name']                   = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  $streamName['stream_name_length']));
+						$streamName['stream_name']                   = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, $streamName['stream_name_length']));
 						$offset += $streamName['stream_name_length'];
 
 						$thisObject['stream_names'][$i] = $streamName;
@@ -1776,20 +1775,20 @@ 
 					for ($i = 0; $i < $thisObject['payload_extension_system_count']; $i++) {
 						$payloadExtensionSystem = array();
 
-						$payloadExtensionSystem['extension_system_id']   =                              substr($asf_header_extension_object_data, $offset, 16);
+						$payloadExtensionSystem['extension_system_id'] = substr($asf_header_extension_object_data, $offset, 16);
 						$offset += 16;
 						$payloadExtensionSystem['extension_system_id_text'] = $this->BytestringToGUID($payloadExtensionSystem['extension_system_id']);
 
-						$payloadExtensionSystem['extension_system_size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$payloadExtensionSystem['extension_system_size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 						if ($payloadExtensionSystem['extension_system_size'] <= 0) {
 							break 2;
 						}
 
-						$payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+						$payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 						$offset += 4;
 
-						$payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  $payloadExtensionSystem['extension_system_info_length']));
+						$payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, $payloadExtensionSystem['extension_system_info_length']));
 						$offset += $payloadExtensionSystem['extension_system_info_length'];
 
 						$thisObject['payload_extension_systems'][$i] = $payloadExtensionSystem;
@@ -1802,32 +1801,32 @@ 
 					break;
 
 				case GETID3_ASF_Metadata_Object:
-					$thisObject['description_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['description_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
 					for ($i = 0; $i < $thisObject['description_record_counts']; $i++) {
 						$descriptionRecord = array();
 
-						$descriptionRecord['reserved_1']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2)); // must be zero
+						$descriptionRecord['reserved_1']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2)); // must be zero
 						$offset += 2;
 
-						$descriptionRecord['stream_number']      = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['stream_number']      = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$descriptionRecord['name_length']        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['name_length']        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$descriptionRecord['data_type']          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['data_type']          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 						$descriptionRecord['data_type_text'] = self::metadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']);
 
-						$descriptionRecord['data_length']        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+						$descriptionRecord['data_length']        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 						$offset += 4;
 
-						$descriptionRecord['name']               =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['name_length']);
+						$descriptionRecord['name']               = substr($asf_header_extension_object_data, $offset, $descriptionRecord['name_length']);
 						$offset += $descriptionRecord['name_length'];
 
-						$descriptionRecord['data']               =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['data_length']);
+						$descriptionRecord['data']               = substr($asf_header_extension_object_data, $offset, $descriptionRecord['data_length']);
 						$offset += $descriptionRecord['data_length'];
 						switch ($descriptionRecord['data_type']) {
 							case 0x0000: // Unicode string
@@ -1857,16 +1856,16 @@ 
 					break;
 
 				case GETID3_ASF_Language_List_Object:
-					$thisObject['language_id_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['language_id_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
 					for ($i = 0; $i < $thisObject['language_id_record_counts']; $i++) {
 						$languageIDrecord = array();
 
-						$languageIDrecord['language_id_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  1));
+						$languageIDrecord['language_id_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 1));
 						$offset += 1;
 
-						$languageIDrecord['language_id']                =                              substr($asf_header_extension_object_data, $offset,  $languageIDrecord['language_id_length']);
+						$languageIDrecord['language_id']                = substr($asf_header_extension_object_data, $offset, $languageIDrecord['language_id_length']);
 						$offset += $languageIDrecord['language_id_length'];
 
 						$thisObject['language_id_record'][$i] = $languageIDrecord;
@@ -1874,32 +1873,32 @@ 
 					break;
 
 				case GETID3_ASF_Metadata_Library_Object:
-					$thisObject['description_records_count'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['description_records_count'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
 					for ($i = 0; $i < $thisObject['description_records_count']; $i++) {
 						$descriptionRecord = array();
 
-						$descriptionRecord['language_list_index'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['language_list_index'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$descriptionRecord['stream_number']       = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['stream_number']       = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$descriptionRecord['name_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['name_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$descriptionRecord['data_type']           = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['data_type']           = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 						$descriptionRecord['data_type_text'] = self::metadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']);
 
-						$descriptionRecord['data_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+						$descriptionRecord['data_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 						$offset += 4;
 
-						$descriptionRecord['name']                =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['name_length']);
+						$descriptionRecord['name']                = substr($asf_header_extension_object_data, $offset, $descriptionRecord['name_length']);
 						$offset += $descriptionRecord['name_length'];
 
-						$descriptionRecord['data']                =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['data_length']);
+						$descriptionRecord['data']                = substr($asf_header_extension_object_data, $offset, $descriptionRecord['data_length']);
 						$offset += $descriptionRecord['data_length'];
 
 						if (preg_match('#^WM/Picture$#', str_replace("\x00", '', trim($descriptionRecord['name'])))) {
@@ -1934,12 +1933,12 @@ 
 	public static function metadataLibraryObjectDataTypeLookup($id) {
 		static $lookup = array(
 			0x0000 => 'Unicode string', // The data consists of a sequence of Unicode characters
-			0x0001 => 'BYTE array',     // The type of the data is implementation-specific
-			0x0002 => 'BOOL',           // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer. Only 0x0000 or 0x0001 are permitted values
-			0x0003 => 'DWORD',          // The data is 4 bytes long and should be interpreted as a 32-bit unsigned integer
-			0x0004 => 'QWORD',          // The data is 8 bytes long and should be interpreted as a 64-bit unsigned integer
-			0x0005 => 'WORD',           // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer
-			0x0006 => 'GUID',           // The data is 16 bytes long and should be interpreted as a 128-bit GUID
+			0x0001 => 'BYTE array', // The type of the data is implementation-specific
+			0x0002 => 'BOOL', // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer. Only 0x0000 or 0x0001 are permitted values
+			0x0003 => 'DWORD', // The data is 4 bytes long and should be interpreted as a 32-bit unsigned integer
+			0x0004 => 'QWORD', // The data is 8 bytes long and should be interpreted as a 64-bit unsigned integer
+			0x0005 => 'WORD', // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer
+			0x0006 => 'GUID', // The data is 16 bytes long and should be interpreted as a 128-bit GUID
 		);
 		return (isset($lookup[$id]) ? $lookup[$id] : 'invalid');
 	}
@@ -1983,10 +1982,10 @@ 
 		$WMpicture['image_mime'] = '';
 		$imagechunkcheck = getid3_lib::GetDataImageSize($WMpicture['data'], $imageinfo);
 		unset($imageinfo);
-		if (!empty($imagechunkcheck)) {
+		if ( ! empty($imagechunkcheck)) {
 			$WMpicture['image_mime'] = image_type_to_mime_type($imagechunkcheck[2]);
 		}
-		if (!isset($this->getid3->info['asf']['comments']['picture'])) {
+		if ( ! isset($this->getid3->info['asf']['comments']['picture'])) {
 			$this->getid3->info['asf']['comments']['picture'] = array();
 		}
 		$this->getid3->info['asf']['comments']['picture'][] = array('data'=>$WMpicture['data'], 'image_mime'=>$WMpicture['image_mime']);

src/wp-includes/ID3/module.audio-video.flv.php

Doc Comments +15 added lines

@@ -390,6 +390,9 @@ 
 	public $bytes;
 	public $pos;
 
+	/**
+	 * @param string $bytes
+	 */
 	public function __construct(&$bytes) {
 		$this->bytes =& $bytes;
 		$this->pos = 0;
@@ -473,6 +476,9 @@ 
 class AMFReader {
 	public $stream;
 
+	/**
+	 * @param AMFStream $stream
+	 */
 	public function __construct(&$stream) {
 		$this->stream =& $stream;
 	}
@@ -635,6 +641,9 @@ 
 	public $width;
 	public $height;
 
+	/**
+	 * @param string $sps
+	 */
 	public function __construct($sps) {
 		$this->sps = $sps;
 	}
@@ -691,6 +700,9 @@ 
 		}
 	}
 
+	/**
+	 * @param integer $bits
+	 */
 	public function skipBits($bits) {
 		$newBits = $this->currentBits + $bits;
 		$this->currentBytes += (int)floor($newBits / 8);
@@ -703,6 +715,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param integer $bits
+	 */
 	public function getBits($bits) {
 		$result = 0;
 		for ($i = 0; $i < $bits; $i++) {

Spacing +66 added lines, -66 removed lines

@@ -52,25 +52,25 @@ 
 //                                                            ///
 /////////////////////////////////////////////////////////////////
 
-define('GETID3_FLV_TAG_AUDIO',          8);
-define('GETID3_FLV_TAG_VIDEO',          9);
-define('GETID3_FLV_TAG_META',          18);
+define('GETID3_FLV_TAG_AUDIO', 8);
+define('GETID3_FLV_TAG_VIDEO', 9);
+define('GETID3_FLV_TAG_META', 18);
 
-define('GETID3_FLV_VIDEO_H263',         2);
-define('GETID3_FLV_VIDEO_SCREEN',       3);
-define('GETID3_FLV_VIDEO_VP6FLV',       4);
+define('GETID3_FLV_VIDEO_H263', 2);
+define('GETID3_FLV_VIDEO_SCREEN', 3);
+define('GETID3_FLV_VIDEO_VP6FLV', 4);
 define('GETID3_FLV_VIDEO_VP6FLV_ALPHA', 5);
-define('GETID3_FLV_VIDEO_SCREENV2',     6);
-define('GETID3_FLV_VIDEO_H264',         7);
-
-define('H264_AVC_SEQUENCE_HEADER',          0);
-define('H264_PROFILE_BASELINE',            66);
-define('H264_PROFILE_MAIN',                77);
-define('H264_PROFILE_EXTENDED',            88);
-define('H264_PROFILE_HIGH',               100);
-define('H264_PROFILE_HIGH10',             110);
-define('H264_PROFILE_HIGH422',            122);
-define('H264_PROFILE_HIGH444',            144);
+define('GETID3_FLV_VIDEO_SCREENV2', 6);
+define('GETID3_FLV_VIDEO_H264', 7);
+
+define('H264_AVC_SEQUENCE_HEADER', 0);
+define('H264_PROFILE_BASELINE', 66);
+define('H264_PROFILE_MAIN', 77);
+define('H264_PROFILE_EXTENDED', 88);
+define('H264_PROFILE_HIGH', 100);
+define('H264_PROFILE_HIGH10', 110);
+define('H264_PROFILE_HIGH422', 122);
+define('H264_PROFILE_HIGH444', 144);
 define('H264_PROFILE_HIGH444_PREDICTIVE', 244);
 
 class getid3_flv extends getid3_handler {
@@ -88,7 +88,7 @@ 
 		$FLVheader = $this->fread(5);
 
 		$info['fileformat'] = 'flv';
-		$info['flv']['header']['signature'] =                           substr($FLVheader, 0, 3);
+		$info['flv']['header']['signature'] = substr($FLVheader, 0, 3);
 		$info['flv']['header']['version']   = getid3_lib::BigEndian2Int(substr($FLVheader, 3, 1));
 		$TypeFlags                          = getid3_lib::BigEndian2Int(substr($FLVheader, 4, 1));
 
@@ -114,13 +114,13 @@ 
 		$tagParseCount = 0;
 		$info['flv']['framecount'] = array('total'=>0, 'audio'=>0, 'video'=>0);
 		$flv_framecount = &$info['flv']['framecount'];
-		while ((($this->ftell() + 16) < $info['avdataend']) && (($tagParseCount++ <= $this->max_frames) || !$found_valid_meta_playtime))  {
+		while ((($this->ftell() + 16) < $info['avdataend']) && (($tagParseCount++ <= $this->max_frames) || ! $found_valid_meta_playtime)) {
 			$ThisTagHeader = $this->fread(16);
 
-			$PreviousTagLength = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  0, 4));
-			$TagType           = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  4, 1));
-			$DataLength        = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  5, 3));
-			$Timestamp         = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  8, 3));
+			$PreviousTagLength = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 0, 4));
+			$TagType           = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 4, 1));
+			$DataLength        = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 5, 3));
+			$Timestamp         = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 8, 3));
 			$LastHeaderByte    = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 15, 1));
 			$NextOffset = $this->ftell() - 1 + $DataLength;
 			if ($Timestamp > $Duration) {
@@ -131,18 +131,18 @@ 
 			switch ($TagType) {
 				case GETID3_FLV_TAG_AUDIO:
 					$flv_framecount['audio']++;
-					if (!$found_audio) {
+					if ( ! $found_audio) {
 						$found_audio = true;
 						$info['flv']['audio']['audioFormat']     = ($LastHeaderByte >> 4) & 0x0F;
 						$info['flv']['audio']['audioRate']       = ($LastHeaderByte >> 2) & 0x03;
 						$info['flv']['audio']['audioSampleSize'] = ($LastHeaderByte >> 1) & 0x01;
-						$info['flv']['audio']['audioType']       =  $LastHeaderByte       & 0x01;
+						$info['flv']['audio']['audioType']       = $LastHeaderByte & 0x01;
 					}
 					break;
 
 				case GETID3_FLV_TAG_VIDEO:
 					$flv_framecount['video']++;
-					if (!$found_video) {
+					if ( ! $found_video) {
 						$found_video = true;
 						$info['flv']['video']['videoCodec'] = $LastHeaderByte & 0x07;
 
@@ -154,11 +154,11 @@ 
 							$AVCPacketType = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 0, 1));
 							if ($AVCPacketType == H264_AVC_SEQUENCE_HEADER) {
 								//	read AVCDecoderConfigurationRecord
-								$configurationVersion       = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  4, 1));
-								$AVCProfileIndication       = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  5, 1));
-								$profile_compatibility      = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  6, 1));
-								$lengthSizeMinusOne         = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  7, 1));
-								$numOfSequenceParameterSets = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  8, 1));
+								$configurationVersion       = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 1));
+								$AVCProfileIndication       = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 1));
+								$profile_compatibility      = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 1));
+								$lengthSizeMinusOne         = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 7, 1));
+								$numOfSequenceParameterSets = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 8, 1));
 
 								if (($numOfSequenceParameterSets & 0x1F) != 0) {
 									//	there is at least one SequenceParameterSet
@@ -236,10 +236,10 @@ 
 
 							}
 
-						} elseif ($info['flv']['video']['videoCodec'] ==  GETID3_FLV_VIDEO_VP6FLV_ALPHA) {
+						} elseif ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_VP6FLV_ALPHA) {
 
 							/* contributed by schouwerwouØgmail*com */
-							if (!isset($info['video']['resolution_x'])) { // only when meta data isn't set
+							if ( ! isset($info['video']['resolution_x'])) { // only when meta data isn't set
 								$PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 2));
 								$PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 7, 2));
 								$info['video']['resolution_x'] = ($PictureSizeEnc['x'] & 0xFF) << 3;
@@ -248,7 +248,7 @@ 
 							/* end schouwerwouØgmail*com */
 
 						}
-						if (!empty($info['video']['resolution_x']) && !empty($info['video']['resolution_y'])) {
+						if ( ! empty($info['video']['resolution_x']) && ! empty($info['video']['resolution_y'])) {
 							$info['video']['pixel_aspect_ratio'] = $info['video']['resolution_x'] / $info['video']['resolution_y'];
 						}
 					}
@@ -256,7 +256,7 @@ 
 
 				// Meta tag
 				case GETID3_FLV_TAG_META:
-					if (!$found_meta) {
+					if ( ! $found_meta) {
 						$found_meta = true;
 						$this->fseek(-1, SEEK_CUR);
 						$datachunk = $this->fread($DataLength);
@@ -285,7 +285,7 @@ 
 								}
 							}
 						}
-						if (!empty($info['flv']['meta']['onMetaData']['duration'])) {
+						if ( ! empty($info['flv']['meta']['onMetaData']['duration'])) {
 							$found_valid_meta_playtime = true;
 						}
 					}
@@ -304,22 +304,22 @@ 
 		}
 
 		if ($info['flv']['header']['hasAudio']) {
-			$info['audio']['codec']           =   self::audioFormatLookup($info['flv']['audio']['audioFormat']);
-			$info['audio']['sample_rate']     =     self::audioRateLookup($info['flv']['audio']['audioRate']);
+			$info['audio']['codec']           = self::audioFormatLookup($info['flv']['audio']['audioFormat']);
+			$info['audio']['sample_rate']     = self::audioRateLookup($info['flv']['audio']['audioRate']);
 			$info['audio']['bits_per_sample'] = self::audioBitDepthLookup($info['flv']['audio']['audioSampleSize']);
 
-			$info['audio']['channels']   =  $info['flv']['audio']['audioType'] + 1; // 0=mono,1=stereo
+			$info['audio']['channels']   = $info['flv']['audio']['audioType'] + 1; // 0=mono,1=stereo
 			$info['audio']['lossless']   = ($info['flv']['audio']['audioFormat'] ? false : true); // 0=uncompressed
 			$info['audio']['dataformat'] = 'flv';
 		}
-		if (!empty($info['flv']['header']['hasVideo'])) {
+		if ( ! empty($info['flv']['header']['hasVideo'])) {
 			$info['video']['codec']      = self::videoCodecLookup($info['flv']['video']['videoCodec']);
 			$info['video']['dataformat'] = 'flv';
 			$info['video']['lossless']   = false;
 		}
 
 		// Set information from meta
-		if (!empty($info['flv']['meta']['onMetaData']['duration'])) {
+		if ( ! empty($info['flv']['meta']['onMetaData']['duration'])) {
 			$info['playtime_seconds'] = $info['flv']['meta']['onMetaData']['duration'];
 			$info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
 		}
@@ -391,7 +391,7 @@ 
 	public $pos;
 
 	public function __construct(&$bytes) {
-		$this->bytes =& $bytes;
+		$this->bytes = & $bytes;
 		$this->pos = 0;
 	}
 
@@ -474,7 +474,7 @@ 
 	public $stream;
 
 	public function __construct(&$stream) {
-		$this->stream =& $stream;
+		$this->stream = & $stream;
 	}
 
 	public function readData() {
@@ -642,35 +642,35 @@ 
 	public function readData() {
 		$this->skipBits(8);
 		$this->skipBits(8);
-		$profile = $this->getBits(8);                               // read profile
+		$profile = $this->getBits(8); // read profile
 		if ($profile > 0) {
 			$this->skipBits(8);
-			$level_idc = $this->getBits(8);                         // level_idc
-			$this->expGolombUe();                                   // seq_parameter_set_id // sps
-			$this->expGolombUe();                                   // log2_max_frame_num_minus4
-			$picOrderType = $this->expGolombUe();                   // pic_order_cnt_type
+			$level_idc = $this->getBits(8); // level_idc
+			$this->expGolombUe(); // seq_parameter_set_id // sps
+			$this->expGolombUe(); // log2_max_frame_num_minus4
+			$picOrderType = $this->expGolombUe(); // pic_order_cnt_type
 			if ($picOrderType == 0) {
-				$this->expGolombUe();                               // log2_max_pic_order_cnt_lsb_minus4
+				$this->expGolombUe(); // log2_max_pic_order_cnt_lsb_minus4
 			} elseif ($picOrderType == 1) {
-				$this->skipBits(1);                                 // delta_pic_order_always_zero_flag
-				$this->expGolombSe();                               // offset_for_non_ref_pic
-				$this->expGolombSe();                               // offset_for_top_to_bottom_field
+				$this->skipBits(1); // delta_pic_order_always_zero_flag
+				$this->expGolombSe(); // offset_for_non_ref_pic
+				$this->expGolombSe(); // offset_for_top_to_bottom_field
 				$num_ref_frames_in_pic_order_cnt_cycle = $this->expGolombUe(); // num_ref_frames_in_pic_order_cnt_cycle
 				for ($i = 0; $i < $num_ref_frames_in_pic_order_cnt_cycle; $i++) {
-					$this->expGolombSe();                           // offset_for_ref_frame[ i ]
+					$this->expGolombSe(); // offset_for_ref_frame[ i ]
 				}
 			}
-			$this->expGolombUe();                                   // num_ref_frames
-			$this->skipBits(1);                                     // gaps_in_frame_num_value_allowed_flag
-			$pic_width_in_mbs_minus1 = $this->expGolombUe();        // pic_width_in_mbs_minus1
+			$this->expGolombUe(); // num_ref_frames
+			$this->skipBits(1); // gaps_in_frame_num_value_allowed_flag
+			$pic_width_in_mbs_minus1 = $this->expGolombUe(); // pic_width_in_mbs_minus1
 			$pic_height_in_map_units_minus1 = $this->expGolombUe(); // pic_height_in_map_units_minus1
 
-			$frame_mbs_only_flag = $this->getBits(1);               // frame_mbs_only_flag
+			$frame_mbs_only_flag = $this->getBits(1); // frame_mbs_only_flag
 			if ($frame_mbs_only_flag == 0) {
-				$this->skipBits(1);                                 // mb_adaptive_frame_field_flag
+				$this->skipBits(1); // mb_adaptive_frame_field_flag
 			}
-			$this->skipBits(1);                                     // direct_8x8_inference_flag
-			$frame_cropping_flag = $this->getBits(1);               // frame_cropping_flag
+			$this->skipBits(1); // direct_8x8_inference_flag
+			$frame_cropping_flag = $this->getBits(1); // frame_cropping_flag
 
 			$frame_crop_left_offset   = 0;
 			$frame_crop_right_offset  = 0;
@@ -678,12 +678,12 @@ 
 			$frame_crop_bottom_offset = 0;
 
 			if ($frame_cropping_flag) {
-				$frame_crop_left_offset   = $this->expGolombUe();   // frame_crop_left_offset
-				$frame_crop_right_offset  = $this->expGolombUe();   // frame_crop_right_offset
-				$frame_crop_top_offset    = $this->expGolombUe();   // frame_crop_top_offset
-				$frame_crop_bottom_offset = $this->expGolombUe();   // frame_crop_bottom_offset
+				$frame_crop_left_offset   = $this->expGolombUe(); // frame_crop_left_offset
+				$frame_crop_right_offset  = $this->expGolombUe(); // frame_crop_right_offset
+				$frame_crop_top_offset    = $this->expGolombUe(); // frame_crop_top_offset
+				$frame_crop_bottom_offset = $this->expGolombUe(); // frame_crop_bottom_offset
 			}
-			$this->skipBits(1);                                     // vui_parameters_present_flag
+			$this->skipBits(1); // vui_parameters_present_flag
 			// etc
 
 			$this->width  = (($pic_width_in_mbs_minus1 + 1) * 16) - ($frame_crop_left_offset * 2) - ($frame_crop_right_offset * 2);
@@ -693,7 +693,7 @@ 
 
 	public function skipBits($bits) {
 		$newBits = $this->currentBits + $bits;
-		$this->currentBytes += (int)floor($newBits / 8);
+		$this->currentBytes += (int) floor($newBits / 8);
 		$this->currentBits = $newBits % 8;
 	}