@@ -14,13 +14,11 @@ class Time implements ArrayAccess, Arrayable
1414 protected $ seconds ;
1515 protected $ user ;
1616 protected $ date ;
17+
1718 private $ hoursPerDay ;
19+ private $ timeFormat ;
1820
1921 const TIME_FORMAT = '[%sign][%days>d ][%hours>h ][%minutes>m ][%seconds>s] ' ;
20- /**
21- * @var string
22- */
23- private $ timeFormat ;
2422
2523 /**
2624 * Time constructor.
@@ -126,33 +124,42 @@ public function setHumanReadable($humanReadable)
126124 /**
127125 * Seconds to human readable string.
128126 *
129- * @param int $seconds
127+ * @param int $inputSeconds
130128 * @param int $hoursPerDay
131129 * @param string $format
132130 *
133131 * @return string
134132 */
135133 static public function humanReadable (
136- $ seconds ,
134+ $ inputSeconds ,
137135 $ hoursPerDay = 8 ,
138136 $ format = self ::TIME_FORMAT
139137 ) {
140- $ sign = $ seconds < 0 ? '- ' : '' ;
141- $ seconds = abs ($ seconds );
138+ $ sign = $ inputSeconds < 0 ? '- ' : '' ;
139+ $ inputSeconds = abs ($ inputSeconds );
142140
143141 $ secondsInAMinute = 60 ;
144142 $ secondsInAnHour = 60 * $ secondsInAMinute ;
145143 $ secondsInADay = $ hoursPerDay * $ secondsInAnHour ;
146144
147- $ days = floor ($ seconds / $ secondsInADay );
148- $ hourSeconds = $ seconds % $ secondsInADay ;
149- $ hours = floor ($ hourSeconds / $ secondsInAnHour );
150- $ minuteSeconds = $ hourSeconds % $ secondsInAnHour ;
151- $ minutes = floor ($ minuteSeconds / $ secondsInAMinute );
145+ $ days = floor ($ inputSeconds / $ secondsInADay );
146+ $ days_overall = $ inputSeconds / $ secondsInADay ;
147+
148+ $ hourSeconds = $ inputSeconds % $ secondsInADay ;
149+ $ hours = floor ($ hourSeconds / $ secondsInAnHour );
150+ $ hours_overall = $ inputSeconds / $ secondsInAnHour ;
151+
152+ $ minuteSeconds = $ hourSeconds % $ secondsInAnHour ;
153+ $ minutes = floor ($ minuteSeconds / $ secondsInAMinute );
154+ $ minutes_overall = $ inputSeconds / $ secondsInAMinute ;
155+
152156 $ remainingSeconds = $ minuteSeconds % $ secondsInAMinute ;
153157 $ seconds = ceil ($ remainingSeconds );
158+ $ seconds_overall = $ inputSeconds ;
159+
160+ $ inserts = compact ('sign ' , 'days ' , 'hours ' , 'minutes ' , 'seconds ' , 'days_overall ' , 'hours_overall ' ,
161+ 'minutes_overall ' , 'seconds_overall ' );
154162
155- $ inserts = compact ('sign ' , 'days ' , 'hours ' , 'minutes ' , 'seconds ' );
156163 foreach ($ inserts as $ key => $ insert ) {
157164 if ($ key == 'sign ' ) {
158165 continue ;
0 commit comments