Ticket #21602: 21602.3.diff

tests/phpunit/includes/testcase-canonical.php

@@ -146 +146 @@
 
                 foreach ( self::$term_ids as $tid => $tax ) {
                         wp_delete_term( $tid, $tax );
                 }
 
                 self::$author_id = null;
                 self::$post_ids = array();
                 self::$comment_ids = array();
                 self::$term_ids = array();
                 self::$terms = array();
         }
 
         /**
          * Assert that a given URL is the same a the canonical URL generated by WP.
          *
+         * This runs the canonical tests with the home_url hostname being forced to uppercase in addition to standard.
+         *
          * @since 4.1.0
          *
          * @param string $test_url                Raw URL that will be run through redirect_canonical().
          * @param string $expected                Expected string.
          * @param int    $ticket                  Optional. Trac ticket number.
          * @param array  $expected_doing_it_wrong Array of class/function names expected to throw _doing_it_wrong() notices.
          */
         public function assertCanonical( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
+                $test_url = home_url( $test_url );
+
+                $this->_assertCanonical( $test_url, $expected, $ticket, $expected_doing_it_wrong );
+
+                // Re-test with the home_url hostname forced to uppercase.
+                add_filter( 'home_url', array( $this, 'filter_uppercase_hostname' ) );
+                $this->_assertCanonical( $test_url, $expected, $ticket, $expected_doing_it_wrong );
+        }
+
+        /**
+         * Internal helper for `::assertCanonical` for force an uppercase hostname in `home_url()`.
+         *
+         * @ignore
+         */
+        public function filter_uppercase_hostname( $url ) {
+                return str_replace( '://' . WP_TESTS_DOMAIN, '://' . strtoupper( WP_TESTS_DOMAIN ), $url );
+        }
+
+        /**
+         * Internal helper for `::assertCanonical`.
+         *
+         * @ignore
+         */
+        public function _assertCanonical( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
                 $this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, (array) $expected_doing_it_wrong );
 
                 if ( $ticket )
                         $this->knownWPBug( $ticket );
 
                 $ticket_ref = ($ticket > 0) ? 'Ticket #' . $ticket : null;
 
                 if ( is_string($expected) )
                         $expected = array('url' => $expected);
                 elseif ( is_array($expected) && !isset($expected['url']) && !isset($expected['qv']) )
                         $expected = array( 'qv' => $expected );
 
                 if ( !isset($expected['url']) && !isset($expected['qv']) )
                         $this->markTestSkipped('No valid expected output was provided');
 
-                $this->go_to( home_url( $test_url ) );
+                $this->go_to( $test_url );
 
                 // Does the redirect match what's expected?
-                $can_url = $this->get_canonical( $test_url );
+                $can_response = redirect_canonical( null, false );
+                $can_url = $can_response ? $can_response : $test_url;
                 $parsed_can_url = parse_url($can_url);
 
-                // Just test the Path and Query if present
-                if ( isset($expected['url']) ) {
-                        $this->assertEquals( $expected['url'], $parsed_can_url['path'] . (!empty($parsed_can_url['query']) ? '?' . $parsed_can_url['query'] : ''), $ticket_ref );
+                if ( isset( $expected['url'] ) ) {
+                        if ( $test_url == $expected['url'] ) {
+                                $this->assertNull( $can_response, $ticket_ref );
+                        } else {
+                                $this->assertEquals( WP_TESTS_DOMAIN, $parsed_can_url['host'] );
+                                $this->assertEquals( $expected['url'], $parsed_can_url['path'] . (!empty($parsed_can_url['query']) ? '?' . $parsed_can_url['query'] : ''), $ticket_ref );
+                        }
                 }
 
                 if ( ! isset($expected['qv']) )
                         return;
 
                 // "make" that the request and check the query is correct
                 $this->go_to( $can_url );
 
                 // Are all query vars accounted for, And correct?
                 global $wp;
 
                 $query_vars = array_diff($wp->query_vars, $wp->extra_query_vars);
                 if ( !empty($parsed_can_url['query']) ) {
                         parse_str($parsed_can_url['query'], $_qv);
 
                         // $_qv should not contain any elements which are set in $query_vars already (ie. $_GET vars should not be present in the Rewrite)
                         $this->assertEquals( array(), array_intersect( $query_vars, $_qv ), 'Query vars are duplicated from the Rewrite into $_GET; ' . $ticket_ref );
 
                         $query_vars = array_merge($query_vars, $_qv);
                 }
 
                 $this->assertEquals( $expected['qv'], $query_vars );
         }
 
-        /**
-         * Get the canonical URL given a raw URL.
-         *
-         * @param string $test_url Should be relative to the site "front", ie /category/uncategorized/
-         *                         as opposed to http://example.com/category/uncategorized/
-         * @return $can_url Returns the original $test_url if no canonical can be generated, otherwise returns
-         *                  the fully-qualified URL as generated by redirect_canonical().
-         */
-        public function get_canonical( $test_url ) {
-                $test_url = home_url( $test_url );
-
-                $can_url = redirect_canonical( $test_url, false );
-                if ( ! $can_url )
-                        return $test_url; // No redirect will take place for this request
-
-                return $can_url;
-        }
 }

tests/phpunit/tests/canonical/pageOnFront.php

@@ -32 +32 @@
         function data() {
                 /* Format:
                  * [0]: $test_url,
                  * [1]: expected results: Any of the following can be used
                  *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
                  *      array( expected query vars to be set, same as 'qv' above )
                  *      (string) expected redirect location
                  * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
                  */
                  return array(
                         // Check against an odd redirect
                         array( '/page/2/', '/page/2/' ),
                         array( '/?page=2', '/page/2/' ),
                         array( '/page/1/', '/' ),
                         array( '/?page=1', '/' ),
+                        array( '/', '/' /*, 21602 */ ),
 
                         // The page designated as the front page should redirect to the front of the site
                         array( '/front-page/', '/' ),
                         array( '/front-page/2/', '/page/2/' ),
                         array( '/front-page/?page=2', '/page/2/' ),
                         array( '/blog-page/?paged=2', '/blog-page/page/2/' ),
                  );
         }
 }

src/wp-includes/canonical.php

@@ -634 +634 @@
         if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $admins ) ) {
                 wp_redirect( admin_url() );
                 exit;
         }
 
         $logins = array(
                 home_url( 'wp-login.php', 'relative' ),
                 home_url( 'login', 'relative' ),
                 site_url( 'login', 'relative' ),
         );
         if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins ) ) {
                 wp_redirect( wp_login_url() );
                 exit;
         }
 }
+
+/**
+ * Force the hostname in the home_url & site_url to lowercase.
+ *
+ * Domain names are case insensitive, however pathnames are not.
+ * WordPress makes comparisons based on the entire url, so this
+ * forces the hostname to a conistent lowercase value.
+ *
+ * @param string $url The URL to force the hostname to lowercase on.
+ * @return string The URL with the hostname lowercased.
+ */
+function force_lowercase_hostname_in_url( $url, $path = null, $scheme = null ) {
+        if ( 'relative' != $scheme ) {
+                $url = preg_replace_callback( '!^(\w+://)([^/]*[A-Z][^/]*/)!', 'force_lowercase_hostname_in_url_cb', $url );
+        }
+        return $url;
+}
+
+/**
+ * Callback for `force_lowercase_hostname_in_url()`.
+ *
+ * @ignore
+ */
+function force_lowercase_hostname_in_url_cb( $host ) {
+        return $host[1] . strtolower( $host[2] );
+}
+add_filter( 'home_url', 'force_lowercase_hostname_in_url', 100, 3 );
+add_filter( 'site_url', 'force_lowercase_hostname_in_url', 100, 3 );
+ No newline at end of file