Ticket #39667: 39667.8.diff
File 39667.8.diff, 7.2 KB (added by , 6 years ago) 


src/wpincludes/functions.php
diff git src/wpincludes/functions.php src/wpincludes/functions.php index 59a728b593..861425c804 100644
function size_format( $bytes, $decimals = 0 ) { 323 323 } 324 324 325 325 /** 326 * Convert a filelengthto human readable format.326 * Convert a duration to human readable format. 327 327 * 328 * @since 5. 0328 * @since 5.1.0 329 329 * 330 * @param string $filelength Duration will be in string format (HH:ii:ss) OR (ii:ss). 331 * @return booleanstring A human readable filelength string, false on failure. 330 * @param string $duration Duration will be in string format (HH:ii:ss) OR (ii:ss), 331 * with a possible prepended negative sign (). 332 * @return stringfalse A human readable duration string, false on failure. 332 333 */ 333 function human_readable_duration( $filelength = '' ) { 334 // Return false if filelength is empty or not in format. 335 if ( ( empty( $filelength )  ! is_string( $filelength ) ) ) { 334 function human_readable_duration( $duration = '' ) { 335 if ( ( empty( $duration )  ! is_string( $duration ) ) ) { 336 336 return false; 337 337 } 338 338 339 // Validate filelength format. 340 if ( ! ( (bool) preg_match( '/^(([03]?[09])([2][03])):([05]?[09])(:([05]?[09]))?$/', $filelength ) ) ) { 341 return false; 339 $duration = trim( $duration ); 340 341 // Remove prepended negative sign. 342 if ( '' === substr( $duration, 0, 1 ) ) { 343 $duration = substr( $duration, 1 ); 342 344 } 343 345 344 $human_readable_duration = array(); 346 // Extract duration parts. 347 $duration_parts = array_reverse( explode( ':', $duration ) ); 348 $duration_count = count( $duration_parts ); 345 349 346 // Extract duration.347 $ durations = array_reverse( explode( ':', $filelength ) );348 $ duration_count = count( $durations );350 $hour = null; 351 $minute = null; 352 $second = null; 349 353 350 354 if ( 3 === $duration_count ) { 355 // Validate HH:ii:ss duration format. 356 if ( ! ( (bool) preg_match( '/^([09]+):([05]?[09]):([05]?[09])$/', $duration ) ) ) { 357 return false; 358 } 351 359 // Three parts: hours, minutes & seconds. 352 list( $second, $minute, $hour ) = $duration s;360 list( $second, $minute, $hour ) = $duration_parts; 353 361 } elseif ( 2 === $duration_count ) { 362 // Validate ii:ss duration format. 363 if ( ! ( (bool) preg_match( '/^([05]?[09]):([05]?[09])$/', $duration ) ) ) { 364 return false; 365 } 354 366 // Two parts: minutes & seconds. 355 list( $second, $minute ) = $duration s;367 list( $second, $minute ) = $duration_parts; 356 368 } else { 357 369 return false; 358 370 } 359 371 372 $human_readable_duration = array(); 373 360 374 // Add the hour part to the string. 361 if ( ! empty( $hour ) &&is_numeric( $hour ) ) {375 if ( is_numeric( $hour ) ) { 362 376 /* translators: Time duration in hour or hours. */ 363 377 $human_readable_duration[] = sprintf( _n( '%s hour', '%s hours', $hour ), (int) $hour ); 364 378 } 365 379 366 380 // Add the minute part to the string. 367 if ( ! empty( $minute ) &&is_numeric( $minute ) ) {381 if ( is_numeric( $minute ) ) { 368 382 /* translators: Time duration in minute or minutes. */ 369 383 $human_readable_duration[] = sprintf( _n( '%s minute', '%s minutes', $minute ), (int) $minute ); 370 384 } 371 385 372 386 // Add the second part to the string. 373 if ( ! empty( $second ) &&is_numeric( $second ) ) {387 if ( is_numeric( $second ) ) { 374 388 /* translators: Time duration in second or seconds. */ 375 389 $human_readable_duration[] = sprintf( _n( '%s second', '%s seconds', $second ), (int) $second ); 376 390 } 
tests/phpunit/tests/functions.php
diff git tests/phpunit/tests/functions.php tests/phpunit/tests/functions.php index 84d032dd95..efbc88a762 100644
class Tests_Functions extends WP_UnitTestCase { 1579 1579 } 1580 1580 1581 1581 /** 1582 * Test the human_readable_duration function.1582 * Test human_readable_duration(). 1583 1583 * 1584 1584 * @ticket 39667 1585 * @dataProvider _datahuman_readable_duration()1585 * @dataProvider data_test_human_readable_duration 1586 1586 * 1587 * @param $input1588 * @param $expected1587 * @param string $input Duration. 1588 * @param string $expected Expected human readable duration. 1589 1589 */ 1590 public function test_ duration_format( $input, $expected ) {1590 public function test_human_readable_duration( $input, $expected ) { 1591 1591 $this>assertSame( $expected, human_readable_duration( $input ) ); 1592 1592 } 1593 1593 1594 public function _datahuman_readable_duration() { 1594 /** 1595 * Dataprovider for test_duration_format(). 1596 * 1597 * @return array { 1598 * @type array { 1599 * @type string $input Duration. 1600 * @type string $expect Expected human readable duration. 1601 * } 1602 * } 1603 */ 1604 public function data_test_human_readable_duration() { 1595 1605 return array( 1596 array( array(), false ), 1606 // Valid ii:ss cases. 1607 array( '0:0', '0 minutes, 0 seconds' ), 1608 array( '00:00', '0 minutes, 0 seconds' ), 1609 array( '0:5', '0 minutes, 5 seconds' ), 1610 array( '0:05', '0 minutes, 5 seconds' ), 1611 array( '01:01', '1 minute, 1 second' ), 1597 1612 array( '30:00', '30 minutes, 0 seconds' ), 1613 array( ' 30:00 ', '30 minutes, 0 seconds' ), 1614 // Valid HH:ii:ss cases. 1615 array( '0:0:0', '0 hours, 0 minutes, 0 seconds' ), 1616 array( '00:00:00', '0 hours, 0 minutes, 0 seconds' ), 1617 array( '00:30:34', '0 hours, 30 minutes, 34 seconds' ), 1618 array( '01:01:01', '1 hour, 1 minute, 1 second' ), 1619 array( '1:02:00', '1 hour, 2 minutes, 0 seconds' ), 1620 array( '10:30:34', '10 hours, 30 minutes, 34 seconds' ), 1621 array( '1234567890:59:59', '1234567890 hours, 59 minutes, 59 seconds' ), 1622 // Valid ii:ss cases with negative sign. 1623 array( '00:00', '0 minutes, 0 seconds' ), 1624 array( '3:00', '3 minutes, 0 seconds' ), 1625 array( '03:00', '3 minutes, 0 seconds' ), 1626 array( '30:00', '30 minutes, 0 seconds' ), 1627 // Valid HH:ii:ss cases with negative sign. 1628 array( '00:00:00', '0 hours, 0 minutes, 0 seconds' ), 1629 array( '1:02:00', '1 hour, 2 minutes, 0 seconds' ), 1630 // Invalid cases. 1631 array( null, false ), 1632 array( '', false ), 1633 array( ':', false ), 1634 array( '::', false ), 1635 array( array(), false ), 1598 1636 array( 'Batman Begins !', false ), 1599 1637 array( '', false ), 1600 1638 array( '1', false ), … … class Tests_Functions extends WP_UnitTestCase { 1602 1640 array( 0, false ), 1603 1641 array( 1, false ), 1604 1642 array( '00', false ), 1605 array( '00:00', '0 minutes, 0 seconds' ), 1606 array( '00:00:00', '0 hours, 0 minutes, 0 seconds' ), 1607 array( '10:30:34', '10 hours, 30 minutes, 34 seconds' ), 1608 array( '00:30:34', '0 hours, 30 minutes, 34 seconds' ), 1609 array( 'MM:30:00', false ), 1610 array( '30:MM', false ), 1611 array( 'MM:00', false ), 1612 array( 'MM:MM', false ), 1613 array( '01:01', '1 minute, 1 second' ), 1614 array( '01:01:01', '1 hour, 1 minute, 1 second' ), 1615 array( '0:05', '5 seconds' ), 1616 array( '1:02:00', '1 hour, 2 minutes, 0 seconds' ), 1643 array( '30:10', false ), 1644 array( ':30:00', false ), // Missing HH. 1645 array( 'MM:30:00', false ), // Invalid HH. 1646 array( '30:MM:00', false ), // Invalid ii. 1647 array( '30:30:MM', false ), // Invalid ss. 1648 array( '30:MM', false ), // Invalid ss. 1649 array( 'MM:00', false ), // Invalid ii. 1650 array( 'MM:MM', false ), // Invalid ii and ss. 1651 array( '10 :30', false ), // Containing a space. 1652 array( '59:61', false ), // Out of bound. 1653 array( '61:59', false ), // Out of bound. 1654 array( '3:59:61', false ), // Out of bound. 1655 array( '03:61:59', false ), // Out of bound. 1617 1656 ); 1618 1657 } 1619 1658 }