update

tamedevelopers · tamedevelopers · commit b3d6a5e3bbd8 · 2025-09-14T01:39:05.000+01:00
diff --git a/src/Time.php b/src/Time.php
@@ -19,7 +19,7 @@
  * - Add/subtract helpers: addSeconds/Minutes/Hours/Days/Weeks/Months/Years and sub*
  * - Formatting: format(), toDateTimeString(), toJsTimer(), timestamp()
  * - Range helper: dateRange()
- * - Text features/config: config(), greeting (via __greeting), timeAgo (via __timeAgo)
+ * - Text features/config: config(), greeting (via greeting), timeAgo (via timeAgo)
  *
  * All methods are documented at their definitions for clarity.
  */
@@ -81,8 +81,8 @@ public function __construct($date = null, $timezone = null)
             $this->timezone = TimeHelper::configureAndSetTimezone($timezone);
         }
 
-        if(empty($this->date)){
-            $clone = $this->__setDate($date);
+        if (empty($this->date)) {
+            $clone = $this->setDate($date);
 
             $this->date         = $clone->date;
             $this->timestamp    = $clone->timestamp;
@@ -91,7 +91,7 @@ public function __construct($date = null, $timezone = null)
 
         // clone copy of self
         if(!self::isTimeInstance()){
-            self::$staticData = clone $this;
+            self::$staticData = $this->copy();
         }
     }
 
@@ -288,7 +288,7 @@ public function subYears($value = 0)
      */
     public function createFromFormat($datetime, $format = 'm/d/Y h:i:sa')
     {
-        return $this->__setDate(
+        return $this->setDate(
             self::timestamp($datetime, $format)
         );
     }
@@ -300,7 +300,7 @@ public function createFromFormat($datetime, $format = 'm/d/Y h:i:sa')
      */
     public function date($date)
     {
-        return $this->__setDate($date);
+        return $this->setDate($date);
     }
 
     /**
@@ -320,7 +320,7 @@ public function now()
      */
     public function today()
     {
-        return $this->__setDate('today');
+        return $this->setDate('today');
     }
 
     /**
@@ -330,7 +330,7 @@ public function today()
      */
     public function yesterday()
     {
-        return $this->__setDate('yesterday');
+        return $this->setDate('yesterday');
     }
 
     /**
@@ -346,8 +346,8 @@ public function yesterday()
      */
     public function format($format = null, $date = null)
     {
-        if(!empty($date)){
-            $clone = $this->__setDate($date);
+        if (!empty($date)) {
+            $clone = $this->setDate($date);
             $this->date = $clone->date;
         }
 
@@ -467,7 +467,7 @@ public static function config(?array $options = [])
      * Get the stored date time
      * @return int
      */
-    public function __getDate()
+    public function getDate()
     {
         return (int) $this->date;
     }
@@ -476,63 +476,63 @@ public function __getDate()
      * Get the number of seconds between the stored time and the current time.
      * @return mixed
      */
-    public function __getSecond()
+    public function getSecond()
     {
-        return $this->__timeDifference('sec');
+        return $this->timeDifference('sec');
     }
 
     /**
      * Get the number of minutes between the stored time and the current time.
      * @return mixed
      */
-    public function __getMin() 
+    public function getMin() 
     {
-        return $this->__timeDifference('mins');
+        return $this->timeDifference('mins');
     }
 
     /**
      * Get the number of hours between the stored time and the current time.
      * @return mixed
      */
-    public function __getHour() 
+    public function getHour() 
     {
-        return $this->__timeDifference('hour');
+        return $this->timeDifference('hour');
     }
     
     /**
      * Get the number of days between the stored time and the current time.
      * @return mixed
      */
-    public function __getDay() 
+    public function getDay() 
     {
-        return $this->__timeDifference('days');
+        return $this->timeDifference('days');
     }
 
     /**
      * Get the number of weeks between the stored time and the current time.
      * @return mixed
      */
-    public function __getWeek() 
+    public function getWeek() 
     {
-        return $this->__timeDifference('weeks');
+        return $this->timeDifference('weeks');
     }
     
     /**
      * Get the number of months between the stored time and the current time.
      * @return mixed
      */
-    public function __getMonth() 
+    public function getMonth() 
     {
-        return $this->__timeDifference('month');
+        return $this->timeDifference('month');
     }
     
     /**
      * Get the number of years between the stored time and the current time.
      * @return mixed
      */
-    public function __getYear() 
+    public function getYear() 
     {
-        return $this->__timeDifference('year');
+        return $this->timeDifference('year');
     }
 
     /**
@@ -541,7 +541,7 @@ public function __getYear()
      * 
      * @return string
      */
-    public function __greeting($date = 'now') 
+    public function greeting($date = 'now') 
     {
         $clone = $this->clone();
         $clone->date = TimeHelper::setPassedDate($date);
@@ -576,7 +576,7 @@ public function __greeting($date = 'now')
      * 
      * @return mixed
      */
-    public function __timeDifferenceBetween($firstDate, $lastDate, $mode = null)
+    public function timeDifferenceBetween($firstDate, $lastDate, $mode = null)
     {
         $clone = $this->clone();
 
@@ -597,7 +597,7 @@ public function __timeDifferenceBetween($firstDate, $lastDate, $mode = null)
      * 
      * @return mixed
      */
-    public function __timeDifference($mode  = null)
+    public function timeDifference($mode  = null)
     {
         $clone = $this->clone();
 
@@ -621,17 +621,17 @@ public function __timeDifference($mode  = null)
      * 
      * @return string
      */
-    public function __timeAgo($mode = null)
+    public function timeAgo($mode = null)
     {
-        $diff = $this->__timeDifference();
+        $diff = $this->timeDifference();
 
         $minutes    = $diff['mins'];
         $seconds    = $diff['sec'];
         $hours      = $diff['hour'];
         $days       = $diff['days'];
         $weeks      = $diff['weeks'];
         $years      = $diff['year'];
-        $date       = $this->__getDate();
+        $date       = $this->getDate();
         $text       = self::getText();
 
         if ($days === 0 && $hours === 0 && $minutes < 1) {
@@ -732,8 +732,8 @@ public function __debugInfo(): array
             'formatted'      => date('Y-m-d H:i:s', $time),
             'timezone'       => (string) ($this->timezoneName ?? $this->timezone),
             'utc_offset'     => ($this->utcOffset ?? date('(P)', $time)),
-            'greeting'       => $this->__greeting($time),
-            'time_ago_short' => $this->__timeAgo('short'),
+            'greeting'       => $this->greeting($time),
+            'time_ago_short' => $this->timeAgo('short'),
         ];
     }
 }
diff --git a/src/Traits/TimeExtraTrait.php b/src/Traits/TimeExtraTrait.php
@@ -25,7 +25,7 @@ trait TimeExtraTrait
     private function dtInTz(int $timestamp): DateTime
     {
         $dt = new DateTime('@' . $timestamp); // start from UTC-based ts
-        $dt->setTimezone(new DateTimeZone((string) $this->__getTimezone()));
+        $dt->setTimezone(new DateTimeZone((string) $this->getTimezone()));
         return $dt;
     }
 
@@ -343,7 +343,7 @@ public function diffInSeconds($otherDate): int
      */
     public function isToday(): bool
     {
-        $now = new DateTime('now', new DateTimeZone((string) $this->__getTimezone()));
+        $now = new DateTime('now', new DateTimeZone((string) $this->getTimezone()));
         $today = $now->format('Y-m-d');
         $cur = $this->dtInTz((int) $this->date)->format('Y-m-d');
         return $today === $cur;
@@ -356,7 +356,7 @@ public function isToday(): bool
      */
     public function isTomorrow(): bool
     {
-        $tz = new DateTimeZone((string) $this->__getTimezone());
+        $tz = new DateTimeZone((string) $this->getTimezone());
         $tomorrow = new DateTime('tomorrow', $tz);
         $cur = $this->dtInTz((int) $this->date)->format('Y-m-d');
         return $tomorrow->format('Y-m-d') === $cur;
@@ -369,7 +369,7 @@ public function isTomorrow(): bool
      */
     public function isYesterday(): bool
     {
-        $tz = new DateTimeZone((string) $this->__getTimezone());
+        $tz = new DateTimeZone((string) $this->getTimezone());
         $yesterday = new DateTime('yesterday', $tz);
         $cur = $this->dtInTz((int) $this->date)->format('Y-m-d');
         return $yesterday->format('Y-m-d') === $cur;
diff --git a/src/Traits/TimeTrait.php b/src/Traits/TimeTrait.php
@@ -107,10 +107,10 @@ private function buildTimeModifier($mode = 'day', $value = 0, $sub = false)
      * 
      * @return string
      */
-    public function __getTimezone()
+    public function getTimezone()
     {
-        if(empty($this->timezone)){
-            $this->__setTimezone();
+        if (empty($this->timezone)) {
+            $this->setTimezone();
         }
 
         return $this->timezone;
@@ -122,7 +122,7 @@ public function __getTimezone()
      * 
      * @return $this
      */
-    public function __setTimezone($timezone = null)
+    public function setTimezone($timezone = null)
     {
         $clone = $this->clone();
 
@@ -138,7 +138,7 @@ public function __setTimezone($timezone = null)
      * 
      * @return $this
      */
-    public function __setDate($date = null)
+    public function setDate($date = null)
     {
         $clone = $this->clone();
         $clone->date = TimeHelper::setPassedDate($date);
@@ -176,7 +176,7 @@ private function setTimeZoneAndTimeStamp($timezone = null)
     private function timestampPrint()
     {
         // ensure timezone cached
-        $this->timezone = $this->getTimeZone();
+        $this->timezone = $this->getTimezone();
         $this->timezoneName = $this->timezone;
 
         // refresh system timezone and cache UTC offset
@@ -209,7 +209,7 @@ public function debugTimestamp(): string
     {
         $date   = $this->format('Y-m-d H:i:s');
         $micro  = $this->microseconds();
-        $tz     = (string) $this->__getTimezone();
+        $tz     = (string) $this->getTimezone();
         $offset = date('(P)', (int) $this->date);
         return sprintf('%s.%s %s %s', $date, $micro, $tz, $offset);
     }
@@ -268,23 +268,23 @@ private static function nonExistMethod($method = null, $args = null, $clone = nu
 
         // create correct method name
         $method = match ($name) {
-            'greetings', 'greeting' => '__greeting',
+            'greetings', 'greeting' => 'greeting',
             'tojs', 'jstimer' => 'toJsTimer',
-            's', 'sec', 'secs', 'getseconds', 'getsec' => '__getSecond',
-            'min', 'mins', 'getminute', 'getminutes', 'getmin', 'getmins' => '__getMin',
-            'hr', 'hrs', 'hour', 'hours', 'gethr', 'gethours', 'gethour' => '__getHour',
-            'getday', 'getdays', 'getd', 'day', 'days' => '__getDay',
-            'getweek', 'getweeks', 'week', 'weeks', 'getw' => '__getWeek',
-            'getmonths', 'getmonth', 'getm', 'month', 'months' => '__getMonth',
-            'getyr', 'getyears', 'getyear', 'year', 'years', 'yr', 'yrs', 'y' => '__getYear',
-            'time', 'gettimes', 'gettime', 'getdate' => '__getDate',
-            'setdate' => '__setDate',
-            'gettimezone' => '__getTimezone',
-            'settimezone' => '__setTimezone',
-            'diffbetween', 'timediffbetween' => '__timeDifferenceBetween',
-            'diff', 'timediff' => '__timeDifference',
+            's', 'sec', 'secs', 'getseconds', 'getsec' => 'getSecond',
+            'min', 'mins', 'getminute', 'getminutes', 'getmin', 'getmins' => 'getMin',
+            'hr', 'hrs', 'hour', 'hours', 'gethr', 'gethours', 'gethour' => 'getHour',
+            'getday', 'getdays', 'getd', 'day', 'days' => 'getDay',
+            'getweek', 'getweeks', 'week', 'weeks', 'getw' => 'getWeek',
+            'getmonths', 'getmonth', 'getm', 'month', 'months' => 'getMonth',
+            'getyr', 'getyears', 'getyear', 'year', 'years', 'yr', 'yrs', 'y' => 'getYear',
+            'time', 'gettimes', 'gettime', 'getdate' => 'getDate',
+            'setdate' => 'setDate',
+            'gettimezone' => 'getTimezone',
+            'settimezone' => 'setTimezone',
+            'diffbetween', 'timediffbetween' => 'timeDifferenceBetween',
+            'diff', 'timediff' => 'timeDifference',
             'daterange', 'range' => 'dateRange',
-            'ago', 'timeago' => '__timeAgo',
+            'ago', 'timeago' => 'timeAgo',
             'addsecond' => 'addSeconds',
             'subsecond' => 'subSeconds',
             'addminute' => 'addMinutes',
diff --git a/tests/time.php b/tests/time.php
@@ -35,6 +35,11 @@
 //     $time4->year(),
 // ];
 
+dd(
+    $time2,
+    $time3::greetings('24 Jan 2025 14:00:00'),
+);
+
 dd(
     [
         'Time-1: '. $time->getTimeZone(),

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`* - Add/subtract helpers: addSeconds/Minutes/Hours/Days/Weeks/Months/Years and sub*`
`20`	`20`	`* - Formatting: format(), toDateTimeString(), toJsTimer(), timestamp()`
`21`	`21`	`* - Range helper: dateRange()`
`22`		`- * - Text features/config: config(), greeting (via __greeting), timeAgo (via __timeAgo)`
	`22`	`+ * - Text features/config: config(), greeting (via greeting), timeAgo (via timeAgo)`
`23`	`23`	`*`
`24`	`24`	`* All methods are documented at their definitions for clarity.`
`25`	`25`	`*/`
`@@ -81,8 +81,8 @@ public function __construct($date = null, $timezone = null)`
`81`	`81`	`$this->timezone = TimeHelper::configureAndSetTimezone($timezone);`
`82`	`82`	`}`
`83`	`83`
`84`		`- if(empty($this->date)){`
`85`		`- $clone = $this->__setDate($date);`
	`84`	`+ if (empty($this->date)) {`
	`85`	`+ $clone = $this->setDate($date);`
`86`	`86`
`87`	`87`	`$this->date = $clone->date;`
`88`	`88`	`$this->timestamp = $clone->timestamp;`
`@@ -91,7 +91,7 @@ public function __construct($date = null, $timezone = null)`
`91`	`91`
`92`	`92`	`// clone copy of self`
`93`	`93`	`if(!self::isTimeInstance()){`
`94`		`- self::$staticData = clone $this;`
	`94`	`+ self::$staticData = $this->copy();`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`@@ -288,7 +288,7 @@ public function subYears($value = 0)`
`288`	`288`	`*/`
`289`	`289`	`public function createFromFormat($datetime, $format = 'm/d/Y h:i:sa')`
`290`	`290`	`{`
`291`		`- return $this->__setDate(`
	`291`	`+ return $this->setDate(`
`292`	`292`	`self::timestamp($datetime, $format)`
`293`	`293`	`);`
`294`	`294`	`}`
`@@ -300,7 +300,7 @@ public function createFromFormat($datetime, $format = 'm/d/Y h:i:sa')`
`300`	`300`	`*/`
`301`	`301`	`public function date($date)`
`302`	`302`	`{`
`303`		`- return $this->__setDate($date);`
	`303`	`+ return $this->setDate($date);`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`/**`
`@@ -320,7 +320,7 @@ public function now()`
`320`	`320`	`*/`
`321`	`321`	`public function today()`
`322`	`322`	`{`
`323`		`- return $this->__setDate('today');`
	`323`	`+ return $this->setDate('today');`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`/**`
`@@ -330,7 +330,7 @@ public function today()`
`330`	`330`	`*/`
`331`	`331`	`public function yesterday()`
`332`	`332`	`{`
`333`		`- return $this->__setDate('yesterday');`
	`333`	`+ return $this->setDate('yesterday');`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`/**`
`@@ -346,8 +346,8 @@ public function yesterday()`
`346`	`346`	`*/`
`347`	`347`	`public function format($format = null, $date = null)`
`348`	`348`	`{`
`349`		`- if(!empty($date)){`
`350`		`- $clone = $this->__setDate($date);`
	`349`	`+ if (!empty($date)) {`
	`350`	`+ $clone = $this->setDate($date);`
`351`	`351`	`$this->date = $clone->date;`
`352`	`352`	`}`
`353`	`353`
`@@ -467,7 +467,7 @@ public static function config(?array $options = [])`
`467`	`467`	`* Get the stored date time`
`468`	`468`	`* @return int`
`469`	`469`	`*/`
`470`		`- public function __getDate()`
	`470`	`+ public function getDate()`
`471`	`471`	`{`
`472`	`472`	`return (int) $this->date;`
`473`	`473`	`}`
`@@ -476,63 +476,63 @@ public function __getDate()`
`476`	`476`	`* Get the number of seconds between the stored time and the current time.`
`477`	`477`	`* @return mixed`
`478`	`478`	`*/`
`479`		`- public function __getSecond()`
	`479`	`+ public function getSecond()`
`480`	`480`	`{`
`481`		`- return $this->__timeDifference('sec');`
	`481`	`+ return $this->timeDifference('sec');`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`/**`
`485`	`485`	`* Get the number of minutes between the stored time and the current time.`
`486`	`486`	`* @return mixed`
`487`	`487`	`*/`
`488`		`- public function __getMin()`
	`488`	`+ public function getMin()`
`489`	`489`	`{`
`490`		`- return $this->__timeDifference('mins');`
	`490`	`+ return $this->timeDifference('mins');`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`/**`
`494`	`494`	`* Get the number of hours between the stored time and the current time.`
`495`	`495`	`* @return mixed`
`496`	`496`	`*/`
`497`		`- public function __getHour()`
	`497`	`+ public function getHour()`
`498`	`498`	`{`
`499`		`- return $this->__timeDifference('hour');`
	`499`	`+ return $this->timeDifference('hour');`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`/**`
`503`	`503`	`* Get the number of days between the stored time and the current time.`
`504`	`504`	`* @return mixed`
`505`	`505`	`*/`
`506`		`- public function __getDay()`
	`506`	`+ public function getDay()`
`507`	`507`	`{`
`508`		`- return $this->__timeDifference('days');`
	`508`	`+ return $this->timeDifference('days');`
`509`	`509`	`}`
`510`	`510`
`511`	`511`	`/**`
`512`	`512`	`* Get the number of weeks between the stored time and the current time.`
`513`	`513`	`* @return mixed`
`514`	`514`	`*/`
`515`		`- public function __getWeek()`
	`515`	`+ public function getWeek()`
`516`	`516`	`{`
`517`		`- return $this->__timeDifference('weeks');`
	`517`	`+ return $this->timeDifference('weeks');`
`518`	`518`	`}`
`519`	`519`
`520`	`520`	`/**`
`521`	`521`	`* Get the number of months between the stored time and the current time.`
`522`	`522`	`* @return mixed`
`523`	`523`	`*/`
`524`		`- public function __getMonth()`
	`524`	`+ public function getMonth()`
`525`	`525`	`{`
`526`		`- return $this->__timeDifference('month');`
	`526`	`+ return $this->timeDifference('month');`
`527`	`527`	`}`
`528`	`528`
`529`	`529`	`/**`
`530`	`530`	`* Get the number of years between the stored time and the current time.`
`531`	`531`	`* @return mixed`
`532`	`532`	`*/`
`533`		`- public function __getYear()`
	`533`	`+ public function getYear()`
`534`	`534`	`{`
`535`		`- return $this->__timeDifference('year');`
	`535`	`+ return $this->timeDifference('year');`
`536`	`536`	`}`
`537`	`537`
`538`	`538`	`/**`
`@@ -541,7 +541,7 @@ public function __getYear()`
`541`	`541`	`*`
`542`	`542`	`* @return string`
`543`	`543`	`*/`
`544`		`- public function __greeting($date = 'now')`
	`544`	`+ public function greeting($date = 'now')`
`545`	`545`	`{`
`546`	`546`	`$clone = $this->clone();`
`547`	`547`	`$clone->date = TimeHelper::setPassedDate($date);`
`@@ -576,7 +576,7 @@ public function __greeting($date = 'now')`
`576`	`576`	`*`
`577`	`577`	`* @return mixed`
`578`	`578`	`*/`
`579`		`- public function __timeDifferenceBetween($firstDate, $lastDate, $mode = null)`
	`579`	`+ public function timeDifferenceBetween($firstDate, $lastDate, $mode = null)`
`580`	`580`	`{`
`581`	`581`	`$clone = $this->clone();`
`582`	`582`
`@@ -597,7 +597,7 @@ public function __timeDifferenceBetween($firstDate, $lastDate, $mode = null)`
`597`	`597`	`*`
`598`	`598`	`* @return mixed`
`599`	`599`	`*/`
`600`		`- public function __timeDifference($mode = null)`
	`600`	`+ public function timeDifference($mode = null)`
`601`	`601`	`{`
`602`	`602`	`$clone = $this->clone();`
`603`	`603`
`@@ -621,17 +621,17 @@ public function __timeDifference($mode = null)`
`621`	`621`	`*`
`622`	`622`	`* @return string`
`623`	`623`	`*/`
`624`		`- public function __timeAgo($mode = null)`
	`624`	`+ public function timeAgo($mode = null)`
`625`	`625`	`{`
`626`		`- $diff = $this->__timeDifference();`
	`626`	`+ $diff = $this->timeDifference();`
`627`	`627`
`628`	`628`	`$minutes = $diff['mins'];`
`629`	`629`	`$seconds = $diff['sec'];`
`630`	`630`	`$hours = $diff['hour'];`
`631`	`631`	`$days = $diff['days'];`
`632`	`632`	`$weeks = $diff['weeks'];`
`633`	`633`	`$years = $diff['year'];`
`634`		`- $date = $this->__getDate();`
	`634`	`+ $date = $this->getDate();`
`635`	`635`	`$text = self::getText();`
`636`	`636`
`637`	`637`	`if ($days === 0 && $hours === 0 && $minutes < 1) {`
`@@ -732,8 +732,8 @@ public function __debugInfo(): array`
`732`	`732`	`'formatted' => date('Y-m-d H:i:s', $time),`
`733`	`733`	`'timezone' => (string) ($this->timezoneName ?? $this->timezone),`
`734`	`734`	`'utc_offset' => ($this->utcOffset ?? date('(P)', $time)),`
`735`		`- 'greeting' => $this->__greeting($time),`
`736`		`- 'time_ago_short' => $this->__timeAgo('short'),`
	`735`	`+ 'greeting' => $this->greeting($time),`
	`736`	`+ 'time_ago_short' => $this->timeAgo('short'),`
`737`	`737`	`];`
`738`	`738`	`}`
`739`	`739`	`}`