vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-03-31 02:34:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTP API: Add a $component parameter to wp_parse_url() to give it parity with PHP's parse_url() function.

Browse Source 
Fixes #36356
Props jrf


git-svn-id: https://develop.svn.wordpress.org/trunk@38449 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn
2016-08-30 16:35:33 +00:00
parent dd8591044a
commit 48f389015e
2 changed files with 114 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
tests/phpunit/tests/http/http.php
View File

@@ -6,6 +6,8 @@
*/
class Tests_HTTP_HTTP extends WP_UnitTestCase {
protected static $full_test_url = 'http://username:password@host.name:9090/path?arg1=value1&arg2=value2#anchor';
/**
* @dataProvider make_absolute_url_testcases
*/
@@ -16,7 +18,7 @@ class Tests_HTTP_HTTP extends WP_UnitTestCase {
}
$actual = WP_Http::make_absolute_url( $relative_url, $absolute_url );
$this->assertEquals( $expected, $actual );
$this->assertSame( $expected, $actual );
}
function make_absolute_url_testcases() {
@@ -72,12 +74,22 @@ class Tests_HTTP_HTTP extends WP_UnitTestCase {
*/
function test_wp_parse_url( $url, $expected ) {
$actual = wp_parse_url( $url );
$this->assertEquals( $expected, $actual );
$this->assertSame( $expected, $actual );
}
function parse_url_testcases() {
// 0: The URL, 1: The expected resulting structure
return array(
array( self::$full_test_url, array(
'scheme' => 'http',
'host' => 'host.name',
'port' => 9090,
'user' => 'username',
'pass' => 'password',
'path' => '/path',
'query' => 'arg1=value1&arg2=value2',
'fragment' => 'anchor',
) ),
array( 'http://example.com/', array( 'scheme' => 'http', 'host' => 'example.com', 'path' => '/' ) ),
// < PHP 5.4.7: Schemeless URL
@@ -85,7 +97,7 @@ class Tests_HTTP_HTTP extends WP_UnitTestCase {
array( '//example.com/', array( 'host' => 'example.com', 'path' => '/' ) ),
array( 'http://example.com//path/', array( 'scheme' => 'http', 'host' => 'example.com', 'path' => '//path/' ) ),
// < PHP 5.4.7: Scheme seperator in the URL
// < PHP 5.4.7: Scheme separator in the URL
array( 'http://example.com/http://example.net/', array( 'scheme' => 'http', 'host' => 'example.com', 'path' => '/http://example.net/' ) ),
array( '/path/http://example.net/', array( 'path' => '/path/http://example.net/' ) ),
@@ -103,6 +115,62 @@ class Tests_HTTP_HTTP extends WP_UnitTestCase {
*/
}
/**
* @ticket 36356
*
* @dataProvider parse_url_component_testcases
*/
function test_wp_parse_url_with_component( $url, $component, $expected ) {
$actual = wp_parse_url( $url, $component );
$this->assertSame( $expected, $actual );
}
function parse_url_component_testcases() {
// 0: The URL, 1: The requested component, 2: The expected resulting component.
return array(
array( self::$full_test_url, -1, array(
'scheme' => 'http',
'host' => 'host.name',
'port' => 9090,
'user' => 'username',
'pass' => 'password',
'path' => '/path',
'query' => 'arg1=value1&arg2=value2',
'fragment' => 'anchor',
) ),
array( self::$full_test_url, PHP_URL_SCHEME, 'http' ),
array( self::$full_test_url, PHP_URL_USER, 'username' ),
array( self::$full_test_url, PHP_URL_PASS, 'password' ),
array( self::$full_test_url, PHP_URL_HOST, 'host.name' ),
array( self::$full_test_url, PHP_URL_PORT, 9090 ),
array( self::$full_test_url, PHP_URL_PATH, '/path' ),
array( self::$full_test_url, PHP_URL_QUERY, 'arg1=value1&arg2=value2' ),
array( self::$full_test_url, PHP_URL_FRAGMENT, 'anchor' ),
// < PHP 5.4.7: Schemeless URL
array( '//example.com/path/', PHP_URL_HOST, 'example.com' ),
array( '//example.com/path/', PHP_URL_PATH, '/path/' ),
array( '//example.com/', PHP_URL_HOST, 'example.com' ),
array( '//example.com/', PHP_URL_PATH, '/' ),
array( 'http://example.com//path/', PHP_URL_HOST, 'example.com' ),
array( 'http://example.com//path/', PHP_URL_PATH, '//path/' ),
// < PHP 5.4.7: Scheme separator in the URL
array( 'http://example.com/http://example.net/', PHP_URL_HOST, 'example.com' ),
array( 'http://example.com/http://example.net/', PHP_URL_PATH, '/http://example.net/' ),
array( '/path/http://example.net/', PHP_URL_HOST, null ),
array( '/path/http://example.net/', PHP_URL_PATH, '/path/http://example.net/' ),
// < PHP 5.4.7: IPv6 literals in schemeless URLs are handled incorrectly.
array( '//[::FFFF::127.0.0.1]/', PHP_URL_HOST, '[::FFFF::127.0.0.1]' ),
array( '//[::FFFF::127.0.0.1]/', PHP_URL_PATH, '/' ),
// PHP's parse_url() calls this an invalid URL, we handle it as a path
array( '/://example.com/', PHP_URL_PATH, '/://example.com/' ),
);
}
/**
* @ticket 35426
*/