vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-04 06:37:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code is Poetry.

Browse Source 
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.



git-svn-id: https://develop.svn.wordpress.org/trunk@42343 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast
2017-11-30 23:09:33 +00:00
parent ec6a089f98
commit 8f95800d52
1103 changed files with 105978 additions and 78184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/includes/testcase.php
+82 -66
View File
@@ -14,24 +14,24 @@ require_once dirname( __FILE__ ) . '/trac.php';
*/
class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
protected static $forced_tickets = array();
protected $expected_deprecated = array();
protected $caught_deprecated = array();
protected static $forced_tickets = array();
protected $expected_deprecated = array();
protected $caught_deprecated = array();
protected $expected_doing_it_wrong = array();
protected $caught_doing_it_wrong = array();
protected $caught_doing_it_wrong = array();
protected static $hooks_saved = array();
protected static $ignore_files;
function __isset( $name ) {
return 'factory' === $name;
}
}
function __get( $name ) {
if ( 'factory' === $name ) {
return self::factory();
}
}
}
}
/**
* Fetches the factory object for generating WordPress fixtures.
@@ -55,7 +55,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
$backtrace = debug_backtrace();
// [0] WP_UnitTestCase::get_called_class()
// [1] WP_UnitTestCase::setUpBeforeClass()
if ( 'call_user_func' === $backtrace[2]['function'] ) {
if ( 'call_user_func' === $backtrace[2]['function'] ) {
return $backtrace[2]['args'][0][0];
}
return $backtrace[2]['class'];
@@ -65,9 +65,9 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
global $wpdb;
$wpdb->suppress_errors = false;
$wpdb->show_errors = true;
$wpdb->show_errors = true;
$wpdb->db_connect();
ini_set('display_errors', 1 );
ini_set( 'display_errors', 1 );
parent::setUpBeforeClass();
@@ -100,7 +100,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
}
function setUp() {
set_time_limit(0);
set_time_limit( 0 );
if ( ! self::$ignore_files ) {
self::$ignore_files = $this->scan_user_uploads();
@@ -159,7 +159,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
}
}
$wp_query = new WP_Query();
$wp = new WP();
$wp = new WP();
// Reset globals related to the post loop and `setup_postdata()`.
$post_globals = array( 'post', 'id', 'authordata', 'currentday', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages' );
@@ -176,7 +176,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
}
function clean_up_global_scope() {
$_GET = array();
$_GET = array();
$_POST = array();
self::flush_cache();
}
@@ -184,7 +184,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
/**
* Allow tests to be skipped on some automated runs
*
* For test runs on Travis for something other than trunk/master
* For test runs on Travis for something other than trunk/master
* we want to skip tests that only need to run for master.
*/
public function skipOnAutomatedBranches() {
@@ -320,10 +320,10 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
static function flush_cache() {
global $wp_object_cache;
$wp_object_cache->group_ops = array();
$wp_object_cache->stats = array();
$wp_object_cache->group_ops = array();
$wp_object_cache->stats = array();
$wp_object_cache->memcache_debug = array();
$wp_object_cache->cache = array();
$wp_object_cache->cache = array();
if ( method_exists( $wp_object_cache, '__remoteset' ) ) {
$wp_object_cache->__remoteset();
}
@@ -351,14 +351,16 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
}
function _create_temporary_tables( $query ) {
if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) )
if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) ) {
return substr_replace( trim( $query ), 'CREATE TEMPORARY TABLE', 0, 12 );
}
return $query;
}
function _drop_temporary_tables( $query ) {
if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) )
if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) ) {
return substr_replace( trim( $query ), 'DROP TEMPORARY TABLE', 0, 10 );
}
return $query;
}
@@ -377,10 +379,12 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
function expectDeprecated() {
$annotations = $this->getAnnotations();
foreach ( array( 'class', 'method' ) as $depth ) {
if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) )
if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) ) {
$this->expected_deprecated = array_merge( $this->expected_deprecated, $annotations[ $depth ]['expectedDeprecated'] );
if ( ! empty( $annotations[ $depth ]['expectedIncorrectUsage'] ) )
}
if ( ! empty( $annotations[ $depth ]['expectedIncorrectUsage'] ) ) {
$this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, $annotations[ $depth ]['expectedIncorrectUsage'] );
}
}
add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
add_action( 'deprecated_argument_run', array( $this, 'deprecated_function_run' ) );
@@ -388,8 +392,8 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
add_action( 'doing_it_wrong_run', array( $this, 'doing_it_wrong_run' ) );
add_action( 'deprecated_function_trigger_error', '__return_false' );
add_action( 'deprecated_argument_trigger_error', '__return_false' );
add_action( 'deprecated_hook_trigger_error', '__return_false' );
add_action( 'doing_it_wrong_trigger_error', '__return_false' );
add_action( 'deprecated_hook_trigger_error', '__return_false' );
add_action( 'doing_it_wrong_trigger_error', '__return_false' );
}
function expectedDeprecated() {
@@ -470,13 +474,15 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
}
function deprecated_function_run( $function ) {
if ( ! in_array( $function, $this->caught_deprecated ) )
if ( ! in_array( $function, $this->caught_deprecated ) ) {
$this->caught_deprecated[] = $function;
}
}
function doing_it_wrong_run( $function ) {
if ( ! in_array( $function, $this->caught_doing_it_wrong ) )
if ( ! in_array( $function, $this->caught_doing_it_wrong ) ) {
$this->caught_doing_it_wrong[] = $function;
}
}
function assertWPError( $actual, $message = '' ) {
@@ -502,7 +508,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
}
function assertEqualFields( $object, $fields ) {
foreach( $fields as $field_name => $field_value ) {
foreach ( $fields as $field_name => $field_value ) {
if ( $object->$field_name != $field_value ) {
$this->fail();
}
@@ -534,7 +540,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
$this->assertTrue( is_array( $array ) );
$this->assertNotEmpty( $array );
foreach( $array as $sub_array ) {
foreach ( $array as $sub_array ) {
$this->assertTrue( is_array( $sub_array ) );
$this->assertNotEmpty( $sub_array );
}
@@ -562,16 +568,18 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
// from all over the place (globals, GET, etc), which makes it tricky
// to run them more than once without very carefully clearing everything
$_GET = $_POST = array();
foreach (array('query_string', 'id', 'postdata', 'authordata', 'day', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages', 'pagenow') as $v) {
if ( isset( $GLOBALS[$v] ) ) unset( $GLOBALS[$v] );
foreach ( array( 'query_string', 'id', 'postdata', 'authordata', 'day', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages', 'pagenow' ) as $v ) {
if ( isset( $GLOBALS[ $v ] ) ) {
unset( $GLOBALS[ $v ] );
}
}
$parts = parse_url($url);
if (isset($parts['scheme'])) {
$parts = parse_url( $url );
if ( isset( $parts['scheme'] ) ) {
$req = isset( $parts['path'] ) ? $parts['path'] : '';
if (isset($parts['query'])) {
if ( isset( $parts['query'] ) ) {
$req .= '?' . $parts['query'];
// parse the url query vars into $_GET
parse_str($parts['query'], $_GET);
parse_str( $parts['query'], $_GET );
}
} else {
$req = $url;
@@ -581,23 +589,23 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
}
$_SERVER['REQUEST_URI'] = $req;
unset($_SERVER['PATH_INFO']);
unset( $_SERVER['PATH_INFO'] );
self::flush_cache();
unset($GLOBALS['wp_query'], $GLOBALS['wp_the_query']);
unset( $GLOBALS['wp_query'], $GLOBALS['wp_the_query'] );
$GLOBALS['wp_the_query'] = new WP_Query();
$GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
$GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
$public_query_vars = $GLOBALS['wp']->public_query_vars;
$private_query_vars = $GLOBALS['wp']->private_query_vars;
$GLOBALS['wp'] = new WP();
$GLOBALS['wp'] = new WP();
$GLOBALS['wp']->public_query_vars = $public_query_vars;
$GLOBALS['wp']->private_query_vars = $private_query_vars;
_cleanup_query_vars();
$GLOBALS['wp']->main($parts['query']);
$GLOBALS['wp']->main( $parts['query'] );
}
protected function checkRequirements() {
@@ -619,16 +627,18 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
return;
}
if ( WP_TESTS_FORCE_KNOWN_BUGS )
if ( WP_TESTS_FORCE_KNOWN_BUGS ) {
return;
}
$tickets = PHPUnit_Util_Test::getTickets( get_class( $this ), $this->getName( false ) );
foreach ( $tickets as $ticket ) {
if ( is_numeric( $ticket ) ) {
$this->knownWPBug( $ticket );
} elseif ( 'Plugin' == substr( $ticket, 0, 6 ) ) {
$ticket = substr( $ticket, 6 );
if ( $ticket && is_numeric( $ticket ) )
if ( $ticket && is_numeric( $ticket ) ) {
$this->knownPluginBug( $ticket );
}
}
}
}
@@ -637,10 +647,12 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
* Skips the current test if there is an open WordPress ticket with id $ticket_id
*/
function knownWPBug( $ticket_id ) {
if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets ) )
if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets ) ) {
return;
if ( ! TracTickets::isTracTicketClosed( 'https://core.trac.wordpress.org', $ticket_id ) )
}
if ( ! TracTickets::isTracTicketClosed( 'https://core.trac.wordpress.org', $ticket_id ) ) {
$this->markTestSkipped( sprintf( 'WordPress Ticket #%d is not fixed', $ticket_id ) );
}
}
/**
@@ -654,10 +666,12 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
* Skips the current test if there is an open plugin ticket with id $ticket_id
*/
function knownPluginBug( $ticket_id ) {
if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) )
if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) ) {
return;
if ( ! TracTickets::isTracTicketClosed( 'https://plugins.trac.wordpress.org', $ticket_id ) )
}
if ( ! TracTickets::isTracTicketClosed( 'https://plugins.trac.wordpress.org', $ticket_id ) ) {
$this->markTestSkipped( sprintf( 'WordPress Plugin Ticket #%d is not fixed', $ticket_id ) );
}
}
public static function forceTicket( $ticket ) {
@@ -678,12 +692,13 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
*/
function temp_filename() {
$tmp_dir = '';
$dirs = array( 'TMP', 'TMPDIR', 'TEMP' );
foreach( $dirs as $dir )
if ( isset( $_ENV[$dir] ) && !empty( $_ENV[$dir] ) ) {
$dirs = array( 'TMP', 'TMPDIR', 'TEMP' );
foreach ( $dirs as $dir ) {
if ( isset( $_ENV[ $dir ] ) && ! empty( $_ENV[ $dir ] ) ) {
$tmp_dir = $dir;
break;
}
}
if ( empty( $tmp_dir ) ) {
$tmp_dir = '/tmp';
}
@@ -700,9 +715,9 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
*
* @param string $prop,... Any number of WP_Query properties that are expected to be true for the current request.
*/
function assertQueryTrue(/* ... */) {
function assertQueryTrue() {
global $wp_query;
$all = array(
$all = array(
'is_404',
'is_admin',
'is_archive',
@@ -738,7 +753,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
$this->assertContains( $true_thing, $all, "Unknown conditional: {$true_thing}." );
}
$passed = true;
$passed = true;
$message = '';
foreach ( $all as $query_thing ) {
@@ -747,11 +762,11 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
if ( in_array( $query_thing, $true ) ) {
if ( ! $result ) {
$message .= $query_thing . ' is false but is expected to be true. ' . PHP_EOL;
$passed = false;
$passed = false;
}
} else if ( $result ) {
} elseif ( $result ) {
$message .= $query_thing . ' is true but is expected to be false. ' . PHP_EOL;
$passed = false;
$passed = false;
}
}
@@ -789,7 +804,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
$files = array();
$iterator = new RecursiveDirectoryIterator( $dir );
$objects = new RecursiveIteratorIterator( $iterator );
$objects = new RecursiveIteratorIterator( $iterator );
foreach ( $objects as $name => $object ) {
if ( is_file( $name ) ) {
$files[] = $name;
@@ -806,7 +821,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
}
$uploads = wp_upload_dir();
$files = $this->files_in_dir( $uploads['basedir'] );
$files = $this->files_in_dir( $uploads['basedir'] );
return $files;
}
@@ -835,7 +850,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
/**
* Helper to Convert a microtime string into a float
*/
protected function _microtime_to_float($microtime ){
protected function _microtime_to_float( $microtime ) {
$time_array = explode( ' ', $microtime );
return array_sum( $time_array );
}
@@ -870,27 +885,28 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
$wp_rewrite->flush_rules();
}
function _make_attachment($upload, $parent_post_id = 0) {
function _make_attachment( $upload, $parent_post_id = 0 ) {
$type = '';
if ( !empty($upload['type']) ) {
if ( ! empty( $upload['type'] ) ) {
$type = $upload['type'];
} else {
$mime = wp_check_filetype( $upload['file'] );
if ($mime)
if ( $mime ) {
$type = $mime['type'];
}
}
$attachment = array(
'post_title' => basename( $upload['file'] ),
'post_content' => '',
'post_type' => 'attachment',
'post_parent' => $parent_post_id,
'post_title' => basename( $upload['file'] ),
'post_content' => '',
'post_type' => 'attachment',
'post_parent' => $parent_post_id,
'post_mime_type' => $type,
'guid' => $upload[ 'url' ],
'guid' => $upload['url'],
);
// Save the data
$id = wp_insert_attachment( $attachment, $upload[ 'file' ], $parent_post_id );
$id = wp_insert_attachment( $attachment, $upload['file'], $parent_post_id );
wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
return $id;
}
@@ -903,7 +919,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
return $wpdb->update(
$wpdb->posts,
array(
'post_modified' => $date,
'post_modified' => $date,
'post_modified_gmt' => $date,
),
array(