Merge pull request #235 from Propaganistas/parse-carbon

Parse Carbon objects
jenssegers · Mar 12, 2017 · 6a1376e · 6a1376e
2 parents 304a2c1 + 4d6cb34
commit 6a1376e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Date.php b/src/Date.php
@@ -74,7 +74,16 @@ public static function make($time = null, $timezone = null)
      */
     public static function parse($time = null, $timezone = null)
     {
-        $time = static::translateTimeString($time);
+        if ($time instanceof Carbon) {
+            return new static(
+                $time->toDateTimeString(),
+                $timezone ?: $time->getTimezone()
+            );
+        }
+
+        if (! is_int($time)) {
+            $time = static::translateTimeString($time);
+        }
 
         return new static($time, $timezone);
     }
@@ -260,8 +269,8 @@ public function timespan($time = null, $timezone = null)
         $lang = $this->getTranslator();
 
         // Create Date instance if needed
-        if (! $time instanceof self) {
-            $time = new static($time, $timezone);
+        if (! $time instanceof static) {
+            $time = Date::parse($time, $timezone);
         }
 
         $units = [

diff --git a/tests/DateTest.php b/tests/DateTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Carbon\Carbon;
 use Jenssegers\Date\Date;
 use PHPUnit\Framework\TestCase;
 
@@ -59,6 +60,13 @@ public function testMake()
         $this->assertEquals($date1, $date2);
     }
 
+    public function testCreateFromCarbon()
+    {
+        $date = Date::make(Carbon::createFromFormat('U', 1367186296));
+        $this->assertInstanceOf('Jenssegers\Date\Date', $date);
+        $this->assertEquals(1367186296, $date->getTimestamp());
+    }
+
     public function testManipulation()
     {
         $this->assertInstanceOf('Jenssegers\Date\Date', Date::now()->add('1 day'));