change some word

Author: miya0001

README.md

@@ -15,7 +15,7 @@ This is a plugin which sends link headers for HTTP/2 server push.
 There is a filter hook for items to send as link header.
 
 ```
-add_filter( 'http2_server_push_items', function( $items ) {
+add_filter( 'http2_server_preload_items', function( $items ) {
   $new = array(
     'image' => array(
       '/wp-content/uploads/favicon.png'

http2-server-push-preload.php

@@ -34,15 +34,15 @@ function activate_autoupdate() {
 add_action( 'send_headers', function() {
 	if ( ! is_admin() ) {
 		do_action( 'wp_enqueue_scripts' );
-		Http2_Server_Push\send_http2_link_header( Http2_Server_Push\get_enqueued_items() );
+		Http2_Server_Push\send_http2_link_header( Http2_Server_Push\get_preload_items() );
 	}
 } );
 
 add_action( 'admin_enqueue_scripts', function() {
 	if ( headers_sent() ) {
 		return;
 	}
-	Http2_Server_Push\send_http2_link_header( Http2_Server_Push\get_enqueued_items() );
+	Http2_Server_Push\send_http2_link_header( Http2_Server_Push\get_preload_items() );
 }, 9999 );
 
 add_filter( 'http_request_args', function ( $response, $url ) {

lib/functions.php

@@ -13,7 +13,7 @@ function send_http2_link_header( $items ) {
 		foreach ( $urls as $url ) {
 			$links[] = sprintf(
 				'<%s>; rel=preload; as=%s',
-				esc_url_raw( $url ),
+				$url,
 				$as
 			);
 		}
@@ -29,13 +29,13 @@ function send_http2_link_header( $items ) {
  *
  * @return array An array of URLs.
  */
-function get_enqueued_items() {
+function get_preload_items() {
 	$items = array(
 		'style' => get_urls( wp_styles() ),
 		'script' => get_urls( wp_scripts() ),
 	);
 
-	return apply_filters( 'http2_server_push_items', $items );
+	return apply_filters( 'http2_server_preload_items', $items );
 }
 
 /**
@@ -57,8 +57,9 @@ function get_urls( $wp_links ) {
 
 	$urls = array();
 	foreach ( $to_do as $handle ) {
-		if ( ! empty( $links[ $handle ] ) && $links[ $handle ]->src && is_string( $links[ $handle ]->src ) ) {
-			$src = $links[ $handle ]->src;
+		if ( ! empty( $links[ $handle ] ) && ! empty( $links[ $handle ]->src )
+		                        && is_string( $links[ $handle ]->src ) ) {
+			$src = esc_url_raw( $links[ $handle ]->src );
 			if ( preg_match( "#^http://#", $src ) ) {
 				continue;
 			} elseif ( preg_match( "#^https://#", $src ) ) {

tests/test-http2-server-push.php

@@ -16,7 +16,7 @@ public function setUp()
 
 	public function test_get_enqueued_items()
 	{
-		$urls = Http2_Server_Push\get_enqueued_items();
+		$urls = Http2_Server_Push\get_preload_items();
 
 		$this->assertTrue( is_array( $urls ) );
 		$this->assertTrue( is_array( $urls['style'] ) );
@@ -42,7 +42,7 @@ public function test_get_urls()
 
 	public function test_filter_http2_server_push_items()
 	{
-		add_filter( 'http2_server_push_items', function( $items ) {
+		add_filter( 'http2_server_preload_items', function( $items ) {
 			$new = array(
 				'image' => array(
 					'/wp-content/uploads/favicon.png'
@@ -52,7 +52,7 @@ public function test_filter_http2_server_push_items()
 			return array_merge_recursive( $items, $new );
 		} );
 
-		$urls = Http2_Server_Push\get_enqueued_items();
+		$urls = Http2_Server_Push\get_preload_items();
 
 		$this->assertSame( '/wp-content/uploads/favicon.png', $urls['image'][0] );
 		$this->assertTrue( !! $urls['style'] );