Ticket #33877: 33877.patch

tests/phpunit/includes/bootstrap.php

@@ -38 +38 @@
 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 $_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
 $_SERVER['REQUEST_METHOD'] = 'GET';
+$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
 
 if ( "1" == getenv( 'WP_MULTISITE' ) ||

tests/phpunit/tests/ajax/ReplytoComment.php

@@ -38 +38 @@
 
                 $post_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
                 $this->_draft_post = get_post( $post_id );
-
-                $_SERVER['REMOTE_ADDR'] = '';
         }
 
         public function tearDown() {

tests/phpunit/tests/ajax/ReplytoComment.php

@@ -38 +38 @@
 
                 $post_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
                 $this->_draft_post = get_post( $post_id );
-
-                $_SERVER['REMOTE_ADDR'] = '';
         }
 
         public function tearDown() {

tests/phpunit/tests/comment.php

@@ -77 +77 @@
          * @ticket 14279
          */
         public function test_wp_new_comment_respects_dates() {
-                // `wp_new_comment()` checks REMOTE_ADDR, so we fake it to avoid PHP notices.
-                if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
-                        $remote_addr = $_SERVER['REMOTE_ADDR'];
-                } else {
-                        $_SERVER['REMOTE_ADDR'] = '';
-                }
-
                 $u = $this->factory->user->create();
                 $post_id = $this->factory->post->create( array( 'post_author' => $u ) );
 
@@ -104 +97 @@
 
                 $this->assertEquals( $data['comment_date'], $comment->comment_date );
                 $this->assertEquals( $data['comment_date_gmt'], $comment->comment_date_gmt );
-
-                // Cleanup.
-                if ( isset( $remote_addr ) ) {
-                        $_SERVER['REMOTE_ADDR'] = $remote_addr;
-                } else {
-                        unset( $_SERVER['REMOTE_ADDR'] );
-                }
         }
 
         /**
@@ -238 +224 @@
 
 
         public function test_comment_field_lengths() {
-                // `wp_new_comment()` checks REMOTE_ADDR, so we fake it to avoid PHP notices.
-                if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
-                        $remote_addr = $_SERVER['REMOTE_ADDR'];
-                } else {
-                        $_SERVER['REMOTE_ADDR'] = '';
-                }
-
                 $u = $this->factory->user->create();
                 $post_id = $this->factory->post->create( array( 'post_author' => $u ) );
 
@@ -264 +243 @@
                 $comment = get_comment( $id );
 
                 $this->assertEquals( strlen( $comment->comment_content ), 65535 );
-
-                // Cleanup.
-                if ( isset( $remote_addr ) ) {
-                        $_SERVER['REMOTE_ADDR'] = $remote_addr;
-                } else {
-                        unset( $_SERVER['REMOTE_ADDR'] );
-                }
         }
 
         /**

tests/phpunit/tests/multisite/bootstrap.php

@@ -15 +15 @@
                 global $wpdb;
                 parent::setUp();
                 $this->suppress = $wpdb->suppress_errors();
-
-                $_SERVER[ 'REMOTE_ADDR' ] = '';
         }
 
         function tearDown() {

tests/phpunit/tests/multisite/bootstrap.php

@@ -15 +15 @@
                 global $wpdb;
                 parent::setUp();
                 $this->suppress = $wpdb->suppress_errors();
-
-                $_SERVER[ 'REMOTE_ADDR' ] = '';
         }
 
         function tearDown() {

tests/phpunit/tests/multisite/ms-files-rewriting.php

@@ -19 +19 @@
                 parent::setUp();
                 $this->suppress = $wpdb->suppress_errors();
 
-                $_SERVER[ 'REMOTE_ADDR' ] = '';
-
                 update_site_option( 'ms_files_rewriting', 1 );
                 ms_upload_constants();
         }

tests/phpunit/tests/multisite/ms-files-rewriting.php

@@ -19 +19 @@
                 parent::setUp();
                 $this->suppress = $wpdb->suppress_errors();
 
-                $_SERVER[ 'REMOTE_ADDR' ] = '';
-
                 update_site_option( 'ms_files_rewriting', 1 );
                 ms_upload_constants();
         }

tests/phpunit/tests/multisite/network.php

@@ -16 +16 @@
                 global $wpdb;
                 parent::setUp();
                 $this->suppress = $wpdb->suppress_errors();
-
-                $_SERVER[ 'REMOTE_ADDR' ] = '';
         }
 
         function tearDown() {

tests/phpunit/tests/multisite.php

@@ -14 +14 @@
                 global $wpdb;
                 parent::setUp();
                 $this->suppress = $wpdb->suppress_errors();
-
-                $_SERVER['REMOTE_ADDR'] = '';
         }
 
         function tearDown() {

tests/phpunit/tests/option/multisite.php

@@ -16 +16 @@
                 global $wpdb;
                 parent::setUp();
                 $this->suppress = $wpdb->suppress_errors();
-
-                $_SERVER['REMOTE_ADDR'] = null;
         }
 
         function tearDown() {

tests/phpunit/tests/user/multisite.php

@@ -16 +16 @@
                 global $wpdb;
                 parent::setUp();
                 $this->suppress = $wpdb->suppress_errors();
-
-                $_SERVER[ 'REMOTE_ADDR' ] = '';
         }
 
         function tearDown() {