fix format

hekmatinasser · Nov 13, 2020 · fe687e2 · fe687e2 · javadzanguei · Nov 17, 2020
1 parent 48f0d68
commit fe687e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/Traits/Creator.php b/src/Traits/Creator.php
@@ -4,7 +4,6 @@
 namespace Hekmatinasser\Verta\Traits;
 
 use DateTime;
-use DateTimeInterface;
 use DateTimeZone;
 use Exception;
 use InvalidArgumentException;
@@ -62,7 +61,7 @@ public static function now($timezone = null) {
 
     public static function today($timezone = null)
     {
-        return static::now($timezone)->startDay();
+        return (new static($timezone))->startDay();
     }
 
     /**
@@ -74,7 +73,7 @@ public static function today($timezone = null)
      */
     public static function tomorrow($timezone = null)
     {
-        return static::today($timezone)->addDay();
+        return (new static('+1 day', $timezone))->startDay();
     }
 
     /**
@@ -86,7 +85,7 @@ public static function tomorrow($timezone = null)
      */
     public static function yesterday($timezone = null)
     {
-        return static::today($timezone)->subDay();
+        return (new static('-1 day', $timezone))->startDay();
     }
 
     /**

diff --git a/src/Traits/Formatting.php b/src/Traits/Formatting.php
@@ -48,7 +48,7 @@ protected function date($format){
         $timestamp = $this->getTimestamp();
 
 
-        list( $gYear, $gMonth, $gDay, $gWeek ) = explode( '-', date('Y-m-d-w', $timestamp) );
+        list( $gYear, $gMonth, $gDay, $gWeek ) = explode( '-', parent::format('Y-m-d-w'));
         list( $pYear, $pMonth, $pDay ) = static::getJalali( $gYear, $gMonth, $gDay );
         $pWeek = ( $gWeek + 1 );
 
@@ -205,7 +205,7 @@ protected function dateWord($format){
 
         $timestamp = $this->getTimestamp();
 
-        list($gYear, $gMonth, $gDay, $gWeek) = explode('-', date('Y-m-d-w', $timestamp));
+        list($gYear, $gMonth, $gDay, $gWeek) = explode('-', parent::format('Y-m-d-w'));
         list($pYear, $pMonth, $pDay) = static::getJalali($gYear, $gMonth, $gDay);
         $pWeek = ($gWeek + 1);
 
@@ -300,14 +300,10 @@ protected function dateWord($format){
 
                 # Time
                 case 'a':
+                    $result .= (parent::format('a') == 'am' ? self::AM : self::PM);
                 case 'A':
-                    if (date('a', $timestamp) == 'am') {
-                        $result .= (($par == 'a') ? self::AM : self::ANTE_MERIDIEM);
-                    } else {
-                        $result .= (($par == 'a') ? self::PM : self::POST_MERIDIEM);
-                    }
+                    $result .= (parent::format('a') == 'am' ? self::ANTE_MERIDIEM : self::POST_MERIDIEM);
                     break;
-
                 case 'B':
                 case 'g':
                 case 'G':
@@ -316,15 +312,15 @@ protected function dateWord($format){
                 case 's':
                 case 'u':
                 case 'i':
-                    $result .= $word->getWord(strval(date($par, $timestamp)));
+                    $result .= $word->getWord(strval(parent::format($par)));
                     break;
                 case 'e':
                 case 'I':
                 case 'O':
                 case 'P':
                 case 'T':
                 case 'Z':
-                    $result .= date($par, $timestamp);
+                    $result .= parent::format($par);
                     break;
 
                 # Full Date/Time
@@ -481,6 +477,7 @@ public function format($format) {
     public function formatGregorian($format) {
 
         return $this->datetime()->format($format);
+        return $this->datetime()->format($format);
     }
 
     /**