Changeset 41991 for trunk/tests/phpunit/tests/canonical/noRewrite.php

Timestamp:

10/24/2017 02:17:22 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Canonical: Strip trailing punctuation from permalinks.

Previously attempted in [40256], which caused the test for decoded curly quotes to fail in some environments.

$_SERVER['REQUEST_URI'] contains the encoded URI, so this version removes the failing tests and only checks for encoded curly quotes.

Props joostdevalk, lancewillett, SergeyBiryukov.
Fixes #20383.

File:

• trunk/tests/phpunit/tests/canonical/noRewrite.php (modified) (2 diffs)

trunk/tests/phpunit/tests/canonical/noRewrite.php

@@ -47 +47 @@
                         array( '/?post_type=page&page_id=1', '/?p=1' ),
 
-                        array( '/?p=358 ', array('url' => '/?p=358',  'qv' => array('p' => '358') ) ), // Trailing spaces
-                        array( '/?p=358%20', array('url' => '/?p=358',  'qv' => array('p' => '358') ) ),
+                        // Trailing spaces and punctuation in query string args.
+                        array( '/?p=358 ',          array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // space
+                        array( '/?p=358%20',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded space
+                        array( '/?p=358!',          array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // exclamation mark
+                        array( '/?p=358%21',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded exclamation mark
+                        array( '/?p=358"',          array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // double quote
+                        array( '/?p=358%22',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded double quote
+                        array( '/?p=358\'',         array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // single quote
+                        array( '/?p=358%27',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded single quote
+                        array( '/?p=358(',          array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // opening bracket
+                        array( '/?p=358%28',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded opening bracket
+                        array( '/?p=358)',          array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // closing bracket
+                        array( '/?p=358%29',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded closing bracket
+                        array( '/?p=358,',          array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // comma
+                        array( '/?p=358%2C',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded comma
+                        array( '/?p=358.',          array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // period
+                        array( '/?p=358%2E',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded period
+                        array( '/?p=358;',          array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // semicolon
+                        array( '/?p=358%3B',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded semicolon
+                        array( '/?p=358{',          array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // opening curly bracket
+                        array( '/?p=358%7B',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded opening curly bracket
+                        array( '/?p=358}',          array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // closing curly bracket
+                        array( '/?p=358%7D',        array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded closing curly bracket
+                        array( '/?p=358%E2%80%9C',  array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded opening curly quote
+                        array( '/?p=358%E2%80%9D',  array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded closing curly quote
+
+                        // Trailing spaces and punctuation in permalinks.
+                        array( '/page/2/ ',         '/page/2/', 20383 ), // space
+                        array( '/page/2/%20',       '/page/2/', 20383 ), // encoded space
+                        array( '/page/2/!',         '/page/2/', 20383 ), // exclamation mark
+                        array( '/page/2/%21',       '/page/2/', 20383 ), // encoded exclamation mark
+                        array( '/page/2/"',         '/page/2/', 20383 ), // double quote
+                        array( '/page/2/%22',       '/page/2/', 20383 ), // encoded double quote
+                        array( '/page/2/\'',        '/page/2/', 20383 ), // single quote
+                        array( '/page/2/%27',       '/page/2/', 20383 ), // encoded single quote
+                        array( '/page/2/(',         '/page/2/', 20383 ), // opening bracket
+                        array( '/page/2/%28',       '/page/2/', 20383 ), // encoded opening bracket
+                        array( '/page/2/)',         '/page/2/', 20383 ), // closing bracket
+                        array( '/page/2/%29',       '/page/2/', 20383 ), // encoded closing bracket
+                        array( '/page/2/,',         '/page/2/', 20383 ), // comma
+                        array( '/page/2/%2C',       '/page/2/', 20383 ), // encoded comma
+                        array( '/page/2/.',         '/page/2/', 20383 ), // period
+                        array( '/page/2/%2E',       '/page/2/', 20383 ), // encoded period
+                        array( '/page/2/;',         '/page/2/', 20383 ), // semicolon
+                        array( '/page/2/%3B',       '/page/2/', 20383 ), // encoded semicolon
+                        array( '/page/2/{',         '/page/2/', 20383 ), // opening curly bracket
+                        array( '/page/2/%7B',       '/page/2/', 20383 ), // encoded opening curly bracket
+                        array( '/page/2/}',         '/page/2/', 20383 ), // closing curly bracket
+                        array( '/page/2/%7D',       '/page/2/', 20383 ), // encoded closing curly bracket
+                        array( '/page/2/%E2%80%9C', '/page/2/', 20383 ), // encoded opening curly quote
+                        array( '/page/2/%E2%80%9D', '/page/2/', 20383 ), // encoded closing curly quote
 
                         array( '/?page_id=1', '/?p=1' ), // redirect page_id to p (should cover page_id|p|attachment_id to one another
@@ -55 +104 @@
                         array( '/?feed=rss2&p=1', '/?feed=rss2&p=1', 21841 ),
                         array( '/?feed=rss&p=1', '/?feed=rss2&p=1', 24623 ),
-
                 );
         }