From 58559315423e9da9193471d2fc31bc7db8c0fbde Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Wed, 11 Mar 2020 16:53:25 +0000 Subject: [PATCH] Define the polyfill before attempting to call it --- tests/includes/listener-loader.php | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/includes/listener-loader.php b/tests/includes/listener-loader.php index 030a77f9c14..0e5a40557ee 100644 --- a/tests/includes/listener-loader.php +++ b/tests/includes/listener-loader.php @@ -7,6 +7,25 @@ $wp_tests_dir = getenv( 'WP_TESTS_DIR' ) ? getenv( 'WP_TESTS_DIR' ) : '/tmp/wordpress-tests-lib'; +// Polyfill a function that wasn't added until WordPress 5.1. +if ( ! function_exists( 'tests_get_phpunit_version' ) ) { + /** + * Retrieves PHPUnit runner version. + */ + function tests_get_phpunit_version() { + if ( class_exists( 'PHPUnit_Runner_Version' ) ) { + $version = PHPUnit_Runner_Version::id(); + } elseif ( class_exists( 'PHPUnit\Runner\Version' ) ) { + // Must be parsable by PHP 5.2.x. + $version = call_user_func( 'PHPUnit\Runner\Version::id' ); + } else { + $version = 0; + } + + return $version; + } +} + /** * The listener-loader.php file wasn't introduced into the core test framework until r44701, which * means it came after WordPress 5.0 (r43971). @@ -26,22 +45,3 @@ if ( file_exists( $wp_tests_dir . '/includes/listener-loader.php' ) ) { require $wp_tests_dir . '/includes/speed-trap-listener.php'; } } - -// Polyfill a function that wasn't added until WordPress 5.1. -if ( ! function_exists( 'tests_get_phpunit_version' ) ) { - /** - * Retrieves PHPUnit runner version. - */ - function tests_get_phpunit_version() { - if ( class_exists( 'PHPUnit_Runner_Version' ) ) { - $version = PHPUnit_Runner_Version::id(); - } elseif ( class_exists( 'PHPUnit\Runner\Version' ) ) { - // Must be parsable by PHP 5.2.x. - $version = call_user_func( 'PHPUnit\Runner\Version::id' ); - } else { - $version = 0; - } - - return $version; - } -}