Changeset 46649

Timestamp:

11/04/2019 12:57:17 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Adjust the test for wp_redirect() status codes added in [46641] per the documentation and coding standards.

Move the test to a more appropriate place for consistency with wp_sanitize_redirect() and wp_validate_redirect() tests.

See #44317.

Location:

trunk

Files:

• src/wp-includes/pluggable.php (modified) (1 diff)
• tests/phpunit/tests/formatting/redirect.php (modified) (1 diff)
• tests/phpunit/tests/pluggable.php (modified) (1 diff)

trunk/src/wp-includes/pluggable.php

@@ -1252 +1252 @@
                 }
 
-                if ( 300 > $status || 399 < $status ) {
+                if ( $status < 300 || 399 < $status ) {
                         wp_die( __( 'HTTP redirect status code must be a redirection code, 3xx.' ) );
                 }

trunk/tests/phpunit/tests/formatting/redirect.php

@@ -19 +19 @@
         function home_url() {
                 return 'http://example.com/';
+        }
+
+        /**
+         * @ticket 44317
+         *
+         * @dataProvider get_bad_status_codes
+         * @expectedException WPDieException
+         *
+         * @param string $location The path or URL to redirect to.
+         * @param int    $status   HTTP response status code to use.
+         */
+        public function test_wp_redirect_bad_status_code( $location, $status ) {
+                wp_redirect( $location, $status );
+        }
+
+        public function get_bad_status_codes() {
+                return array(
+                        // Tests for bad arguments
+                        array( '/wp-admin', 404 ),
+                        array( '/wp-admin', 410 ),
+                        array( '/wp-admin', 500 ),
+                        // Tests for condition.
+                        array( '/wp-admin', 299 ),
+                        array( '/wp-admin', 400 ),
+                );
         }
 

trunk/tests/phpunit/tests/pluggable.php

@@ -5 +5 @@
  */
 class Tests_Pluggable extends WP_UnitTestCase {
-
-        /**
-         * @expectedException WPDieException
-         * @dataProvider get_bad_status_codes
-         *
-         * @ticket 44317
-         * @param string $location The path or URL to redirect to.
-         * @param int $status HTTP response status code to use.
-         */
-        public function test_wp_redirect_bad_status_code( $location, $status ) {
-                wp_redirect( $location, $status );
-        }
-
-        public function get_bad_status_codes() {
-                return [
-                        // Tests for bad arguments
-                        [ '/wp-admin', 404 ],
-                        [ '/wp-admin', 410 ],
-                        [ '/wp-admin', 500 ],
-                        // Tests for condition.
-                        [ '/wp-admin', 299 ],
-                        [ '/wp-admin', 400 ],
-                ];
-        }
 
         /**