Ticket #48074: 48074-tests-Remove-work-arounds-for-PHP-5.6.patch

tests/phpunit/includes/utils.php

@@ -465 +465 @@
 function benchmark_pcre_backtracking( $pattern, $subject, $strategy ) {
         $saved_config = ini_get( 'pcre.backtrack_limit' );
 
-        // Attempt to prevent PHP crashes.  Adjust these lower when needed.
-        if ( version_compare( phpversion(), '5.4.8', '>' ) ) {
-                $limit = 1000000;
-        } else {
-                $limit = 20000;  // 20,000 is a reasonable upper limit, but see also https://core.trac.wordpress.org/ticket/29557#comment:10
-        }
+        // Attempt to prevent PHP crashes. Adjust these lower when needed.
+        $limit = 1000000;
 
         // Start with small numbers, so if a crash is encountered at higher numbers we can still debug the problem.
         for ( $i = 4; $i <= $limit; $i *= 2 ) {

tests/phpunit/tests/admin/wpPrivacyRequestsTable.php

@@ -24 +24 @@
          * @return PHPUnit_Framework_MockObject_MockObject|WP_Privacy_Requests_Table $instance Mocked class instance.
          */
         public function get_mocked_class_instance() {
-                if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
-                        $this->markTestSkipped( 'ReflectionMethod::setAccessible is only available in PHP 5.3+' );
-                }
-
                 $args = array(
                         'plural'   => 'privacy_requests',
                         'singular' => 'privacy_request',

tests/phpunit/tests/compat.php

@@ -246 +246 @@
                         $this->markTestSkipped( 'The intl extension is not loaded. ResourceBundle not tested for is_countable().' );
                 }
 
-                if ( version_compare( PHP_VERSION, '5.4', '<' ) ) {
-                        $this->markTestSkipped( 'ResourceBundle is only countable in PHP 5.4+' );
-                        return;
-                }
-
                 $this->assertTrue( is_countable( new ResourceBundle( 'en', null ) ) );
         }
 

tests/phpunit/tests/customize/nav-menus.php

@@ -1083 +1083 @@
                 );
 
                 // Add global namespace prefix to check #41488.
-                if ( version_compare( PHP_VERSION, '5.3', '>=' ) ) {
-                        $original_args['fallback_cb'] = '\\' . $original_args['fallback_cb'];
-                }
+                $original_args['fallback_cb'] = '\\' . $original_args['fallback_cb'];
 
                 $args = $menus->filter_wp_nav_menu_args( $original_args );
 

tests/phpunit/tests/db/charset.php

@@ -482 +482 @@
          * @ticket 21212
          */
         function test_strip_invalid_text( $data, $expected, $message ) {
-                if ( version_compare( PHP_VERSION, '5.3', '<' ) && stristr( php_uname( 's' ), 'win' ) ) {
-                        $this->markTestSkipped( 'This test fails in PHP 5.2 on Windows. See https://core.trac.wordpress.org/ticket/31262' );
-                }
-
                 $charset = self::$_wpdb->charset;
                 if ( isset( $data[0]['connection_charset'] ) ) {
                         $new_charset = $data[0]['connection_charset'];

tests/phpunit/tests/functions.php

@@ -918 +918 @@
          * @ticket 28786
          */
         function test_wp_json_encode_depth() {
-                if ( version_compare( PHP_VERSION, '5.5', '<' ) ) {
-                        $this->markTestSkipped( 'json_encode() supports the $depth parameter in PHP 5.5+' );
-                };
-
                 $data = array( array( array( 1, 2, 3 ) ) );
                 $json = wp_json_encode( $data, 0, 1 );
                 $this->assertFalse( $json );

tests/phpunit/tests/post/query.php

@@ -705 +705 @@
          * @dataProvider set_found_posts_provider
          */
         public function test_set_found_posts_not_posts_as_an_array( $posts, $expected ) {
-                if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
-                        $this->markTestSkipped( 'ReflectionMethod::setAccessible is only available in PHP 5.3+' );
-                        return;
-                }
-
                 $q = new WP_Query(
                         array(
                                 'post_type'      => 'wptests_pt',

tests/phpunit/tests/rest-api/rest-request.php

@@ -491 +491 @@
         }
 
         public function test_has_valid_params_json_error() {
-                if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
-                        return $this->markTestSkipped( 'JSON validation is only available for PHP 5.3+' );
-                }
-
                 $this->request->set_header( 'Content-Type', 'application/json' );
                 $this->request->set_body( '{"invalid": JSON}' );
 
@@ -507 +503 @@
 
 
         public function test_has_valid_params_empty_json_no_error() {
-                if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
-                        return $this->markTestSkipped( 'JSON validation is only available for PHP 5.3+' );
-                }
-
                 $this->request->set_header( 'Content-Type', 'application/json' );
                 $this->request->set_body( '' );
 

tests/phpunit/tests/theme/customHeader.php

@@ -126 +126 @@
                 $this->assertFalse( has_custom_header() );
                 $this->assertEmpty( $html );
 
-                // ReflectionMethod::setAccessible is only available in PHP 5.3+
-                if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
-                        return;
-                }
                 // The container should always be returned in the Customizer preview.
                 $this->_set_customize_previewing( true );
                 $html = get_custom_header_markup();
@@ -226 +222 @@
         }
 
         function test_header_script_is_enqueued_by_the_custom_header_markup_without_video_when_previewing_in_customizer() {
-                if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
-                        $this->markTestSkipped( 'ReflectionMethod::setAccessible is only available in PHP 5.3+' );
-                        return;
-                }
-
                 $this->_add_theme_support(
                         array(
                                 'video'                 => true,

tests/phpunit/tests/widgets/media-widget.php

@@ -479 +479 @@
          * @covers WP_Widget_Media::has_content()
          */
         function test_has_content() {
-                if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
-                        $this->markTestSkipped( 'ReflectionMethod::setAccessible is only available for PHP 5.3+' );
-                        return;
-                }
-
                 $attachment_id = self::factory()->attachment->create_object(
                         array(
                                 'file'           => DIR_TESTDATA . '/images/canola.jpg',