Ticket #38773: 38773.3.diff

src/wp-includes/formatting.php

@@ -3214 +3214 @@
         $diff = (int) abs( $to - $from );
 
         if ( $diff < HOUR_IN_SECONDS ) {
-                $mins = round( $diff / MINUTE_IN_SECONDS );
+                $mins = floor( $diff / MINUTE_IN_SECONDS );
                 if ( $mins <= 1 )
                         $mins = 1;
                 /* translators: min=minute */
                 $since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
         } elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
-                $hours = round( $diff / HOUR_IN_SECONDS );
+                $hours = floor( $diff / HOUR_IN_SECONDS );
                 if ( $hours <= 1 )
                         $hours = 1;
                 $since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
         } elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
-                $days = round( $diff / DAY_IN_SECONDS );
+                $days = floor( $diff / DAY_IN_SECONDS );
                 if ( $days <= 1 )
                         $days = 1;
                 $since = sprintf( _n( '%s day', '%s days', $days ), $days );
         } elseif ( $diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
-                $weeks = round( $diff / WEEK_IN_SECONDS );
+                $weeks = floor( $diff / WEEK_IN_SECONDS );
                 if ( $weeks <= 1 )
                         $weeks = 1;
                 $since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
         } elseif ( $diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS ) {
-                $months = round( $diff / MONTH_IN_SECONDS );
+                $months = floor( $diff / MONTH_IN_SECONDS );
                 if ( $months <= 1 )
                         $months = 1;
                 $since = sprintf( _n( '%s month', '%s months', $months ), $months );
         } elseif ( $diff >= YEAR_IN_SECONDS ) {
-                $years = round( $diff / YEAR_IN_SECONDS );
+                $years = floor( $diff / YEAR_IN_SECONDS );
                 if ( $years <= 1 )
                         $years = 1;
                 $since = sprintf( _n( '%s year', '%s years', $years ), $years );

tests/phpunit/tests/formatting/HumanTimeDiff.php

@@ +1 @@
+<?php
+
+/**
+ * @group formatting
+ * @ticket 38773
+ */
+class Tests_Formatting_HiumanTimeDiff extends WP_UnitTestCase {
+        function test_simple() {
+                // Test some basic differences such as "1 hour", "5 mins", "2 days".
+                $startdate = new DateTime( '2016-01-01 12:00:00' );
+
+                // Test a difference of 5 minutes.
+                $stopdate = new DateTime( '2016-01-01 12:05:00' );
+                $this->assertEquals( '5 mins', human_time_diff( $startdate->getTimestamp(), $stopdate->getTimestamp() ) );
+
+                // Test a difference of 1 hour.
+                $stopdate = new DateTime( '2016-01-01 13:00:00' );
+                $this->assertEquals( '1 hour', human_time_diff( $startdate->getTimestamp(), $stopdate->getTimestamp() ) );
+
+                // Test a difference of 2 days.
+                $stopdate = new DateTime( '2016-01-03 12:00:00' );
+                $this->assertEquals( '2 days', human_time_diff( $startdate->getTimestamp(), $stopdate->getTimestamp() ) );
+        }
+        function test_rounding() {
+                // Test some close dates for rounding issues.
+                $startdate = new DateTime( '2016-01-01 12:00:00' );
+
+                // Test a difference of 2 hours and 30 minutes and 1 second.
+                $stopdate = new DateTime( '2016-01-01 14:30:01' );
+                $this->assertEquals( '2 hours', human_time_diff( $startdate->getTimestamp(), $stopdate->getTimestamp() ) );
+
+                // Test a difference of 1 month and 16 days.
+                $stopdate = new DateTime( '2016-02-17 12:00:00' );
+                $this->assertEquals( '1 month', human_time_diff( $startdate->getTimestamp(), $stopdate->getTimestamp() ) );
+
+                // Test a difference of 2 years 6 months and 1 day.
+                $stopdate = new DateTime( '2018-07-02 12:00:00' );
+                $this->assertEquals( '2 years', human_time_diff( $startdate->getTimestamp(), $stopdate->getTimestamp() ) );
+        }
+
+}