Changeset 38726 for trunk/tests/phpunit/tests/http/http.php

Timestamp:

10/04/2016 08:32:40 PM (10 years ago)

Author:

peterwilsoncc

Message:

HTTP API: Simplify wp_parse_url() to ensure consistent results.

[38694] revealed some URL formats were been parsed incorrectly, including those used by Google Fonts. This change simplifies the function to use placeholder values which cause PHP's parsing to behave consistently.

Props jrf, peterwilsoncc.
Fixes #36356.

File:

• trunk/tests/phpunit/tests/http/http.php (modified) (4 diffs)

trunk/tests/phpunit/tests/http/http.php

@@ -108 +108 @@
                         array( '/://example.com/', array( 'path' => '/://example.com/' ) ),
 
+                        // Schemeless URL containing colons cause parse errors in PHP 7+.
+                        array(
+                                '//fonts.googleapis.com/css?family=Open+Sans:400&subset=latin',
+                                array(
+                                        'host'  => 'fonts.googleapis.com',
+                                        'path'  => '/css',
+                                        'query' => 'family=Open+Sans:400&subset=latin',
+                                ),
+                        ),
+                        array(
+                                '//fonts.googleapis.com/css?family=Open+Sans:400',
+                                array(
+                                        'host'  => 'fonts.googleapis.com',
+                                        'path'  => '/css',
+                                        'query' => 'family=Open+Sans:400',
+                                ),
+                        ),
+
+                        array( 'filenamefound', array( 'path' => 'filenamefound' ) ),
+
+                        // Empty string or non-string passed in.
+                        array( '', array( 'path' => '' ) ),
+                        array( 123, array( 'path' => '123' ) ),
                 );
                 /*
@@ -118 +141 @@
         /**
          * @ticket 36356
-     */
+         */
         function test_wp_parse_url_with_default_component() {
                 $actual = wp_parse_url( self::FULL_TEST_URL, -1 );
@@ -176 +199 @@
                         array( '/://example.com/', PHP_URL_PATH, '/://example.com/' ),
 
+                        // Schemeless URL containing colons cause parse errors in PHP 7+.
+                        array( '//fonts.googleapis.com/css?family=Open+Sans:400&subset=latin', PHP_URL_HOST, 'fonts.googleapis.com' ),
+                        array( '//fonts.googleapis.com/css?family=Open+Sans:400&subset=latin', PHP_URL_PORT, null ),
+                        array( '//fonts.googleapis.com/css?family=Open+Sans:400&subset=latin', PHP_URL_PATH, '/css' ),
+                        array( '//fonts.googleapis.com/css?family=Open+Sans:400&subset=latin', PHP_URL_QUERY, 'family=Open+Sans:400&subset=latin' ),
+                        array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_HOST, 'fonts.googleapis.com' ), // 25
+                        array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_PORT, null ),
+                        array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_PATH, '/css' ), //27
+                        array( '//fonts.googleapis.com/css?family=Open+Sans:400', PHP_URL_QUERY, 'family=Open+Sans:400' ), //28
+
+                        // Empty string or non-string passed in.
+                        array( '', PHP_URL_PATH, '' ),
+                        array( '', PHP_URL_QUERY, null ),
+                        array( 123, PHP_URL_PORT, null ),
+                        array( 123, PHP_URL_PATH, '123' ),
                 );
         }
@@ -225 +263 @@
                 }
         }
+
+        /**
+         * @ticket 36356
+         *
+         * @dataProvider get_component_from_parsed_url_array_testcases
+         */
+        function test_get_component_from_parsed_url_array( $url, $component, $expected ) {
+                $parts  = wp_parse_url( $url );
+                $actual = _get_component_from_parsed_url_array( $parts, $component );
+                $this->assertSame( $expected, $actual );
+        }
+
+        function get_component_from_parsed_url_array_testcases() {
+                // 0: A URL, 1: PHP URL constant, 2: The expected result.
+                return array(
+                        array( 'http://example.com/', -1, array( 'scheme' => 'http', 'host' => 'example.com', 'path' => '/' ) ),
+                        array( 'http://example.com/', -1, array( 'scheme' => 'http', 'host' => 'example.com', 'path' => '/' ) ),
+                        array( 'http://example.com/', PHP_URL_HOST, 'example.com' ),
+                        array( 'http://example.com/', PHP_URL_USER, null ),
+                        array( 'http:///example.com', -1, false ), // Malformed.
+                        array( 'http:///example.com', PHP_URL_HOST, null ), // Malformed.
+                );
+        }
+
+        /**
+         * @ticket 36356
+         *
+         * @dataProvider wp_translate_php_url_constant_to_key_testcases
+         */
+        function test_wp_translate_php_url_constant_to_key( $input, $expected ) {
+                $actual = _wp_translate_php_url_constant_to_key( $input );
+                $this->assertSame( $expected, $actual );
+        }
+
+        function wp_translate_php_url_constant_to_key_testcases() {
+                // 0: PHP URL constant, 1: The expected result.
+                return array(
+                        array( PHP_URL_SCHEME, 'scheme' ),
+                        array( PHP_URL_HOST, 'host' ),
+                        array( PHP_URL_PORT, 'port' ),
+                        array( PHP_URL_USER, 'user' ),
+                        array( PHP_URL_PASS, 'pass' ),
+                        array( PHP_URL_PATH, 'path' ),
+                        array( PHP_URL_QUERY, 'query' ),
+                        array( PHP_URL_FRAGMENT, 'fragment' ),
+
+                        // Test with non-PHP_URL_CONSTANT parameter.
+                        array( 'something', false ),
+                        array( ABSPATH, false ),
+                );
+        }
+
 }