Merge branch 'release/1.2.0'

Author: jimmypuckett

VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

composer.json

@@ -22,16 +22,16 @@
         "php": ">=7.2",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.4",
-        "illuminate/container": "~5.7|~6|~7",
-        "illuminate/database": "~5.7|~6|~7",
-        "illuminate/encryption": "~5.7|~6|~7",
-        "illuminate/http": "~5.7|~6|~7",
-        "illuminate/routing": "~5.7|~6|~7",
+        "illuminate/container": "~5.8|~6|~7",
+        "illuminate/database": "~5.8|~6|~7",
+        "illuminate/encryption": "~5.8|~6|~7",
+        "illuminate/http": "~5.8|~6|~7",
+        "illuminate/routing": "~5.8|~6|~7",
         "nesbot/carbon": "~1.2|~2",
         "vlucas/phpdotenv": "^3.6|^4.0"
     },
     "require-dev": {
-        "illuminate/auth": "~5.7|~6|~7",
+        "illuminate/auth": "~5.8|~6|~7",
         "mockery/mockery": "^1.3.1",
         "phpunit/phpunit": "^8.4|^9.0",
         "psy/psysh": "^0.10",

src/Support/Model.php

@@ -149,8 +149,8 @@ abstract class Model implements Arrayable, ArrayAccess, Jsonable, JsonSerializab
      */
     public function __construct(array $attributes = [], Model $parentModel = null)
     {
-        // All dates from API comes as epoch
-        $this->dateFormat = 'U';
+        // All dates from API comes as epoch with milliseconds
+        $this->dateFormat = 'Uv';
         // None of this  models will use timestamps, but need the date casting
         $this->timestamps = false;
 

tests/Support/ModelTest.php

@@ -4,7 +4,6 @@
 
 use DateTime;
 use GuzzleHttp\Exception\InvalidArgumentException;
-use Illuminate\Database\Eloquent\JsonEncodingException;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Date;
 use LogicException;
@@ -779,49 +778,51 @@ public function castToDatetimeValuesProvider()
         $carbon = Carbon::now();
         $datetime = new DateTime();
         return [
-            'carbon' => [
-                'value' => $carbon,
+            'carbon'       => [
+                'value'                    => $carbon,
                 'timestampsInMilliseconds' => true,
-                'expected' => Date::instance($carbon),
+                'expected'                 => Date::instance($carbon),
             ],
-            'datetime' => [
-                'value' => $datetime,
+            'datetime'     => [
+                'value'                    => $datetime,
                 'timestampsInMilliseconds' => true,
-                'expected' => Date::parse(
-                    $datetime->format('Y-m-d H:i:s.u'), $datetime->getTimezone()
-                ),
+                'expected'                 => Date::parse($datetime->format('Y-m-d H:i:s.u'), $datetime->getTimezone()),
             ],
-            'carbon2' => [
-                'value' => $carbon,
+            'carbon2'      => [
+                'value'                    => $carbon,
                 'timestampsInMilliseconds' => false,
-                'expected' => Date::instance($carbon),
+                'expected'                 => Date::instance($carbon),
             ],
-            'datetime2' => [
-                'value' => $datetime,
+            'datetime2'    => [
+                'value'                    => $datetime,
                 'timestampsInMilliseconds' => false,
-                'expected' => Date::parse(
-                    $datetime->format('Y-m-d H:i:s.u'), $datetime->getTimezone()
-                ),
+                'expected'                 => Date::parse($datetime->format('Y-m-d H:i:s.u'), $datetime->getTimezone()),
             ],
-            'timestamp' => [
-                'value' => 1579542588,
+            'timestamp'    => [
+                'value'                    => 1579542588,
                 'timestampsInMilliseconds' => false,
-                'expected' => Date::createFromTimestamp(1579542588),
+                'expected'                 => Date::createFromTimestamp(1579542588),
             ],
             'timestamp_ms' => [
-                'value' => 1579542588123,
+                'value'                    => 1579542588123,
                 'timestampsInMilliseconds' => true,
-                'expected' => Date::createFromTimestampMs(1579542588123),
+                'expected'                 => Date::createFromTimestampMs(1579542588123),
             ],
-            'standard' => [
-                'value' => '2020-02-01',
+            'standard_ms'  => [
+                'value'                    => '2020-02-01',
                 'timestampsInMilliseconds' => true,
-                'expected' =>  Date::instance(Carbon::createFromFormat('Y-m-d', '2020-02-01')->startOfDay()),
+                'expected'                 => Date::instance(
+                    Carbon::createFromFormat('Y-m-d', '2020-02-01')
+                          ->startOfDay()
+                ),
             ],
-            'standard' => [
-                'value' => '2020-02-01',
+            'standard'     => [
+                'value'                    => '2020-02-01',
                 'timestampsInMilliseconds' => false,
-                'expected' =>  Date::instance(Carbon::createFromFormat('Y-m-d', '2020-02-01')->startOfDay()),
+                'expected'                 => Date::instance(
+                    Carbon::createFromFormat('Y-m-d', '2020-02-01')
+                          ->startOfDay()
+                ),
             ],
         ];
     }
@@ -833,9 +834,11 @@ public function castToDatetimeValuesProvider()
     public function it_casts_to_datetime_from_various_values($value, $timestampInMilliseconds, $expected)
     {
         $model = new Model();
-        $model->setRawAttributes([
-            'datetime_value' => $value
-        ]);
+        $model->setRawAttributes(
+            [
+                'datetime_value' => $value,
+            ]
+        );
 
         $reflection = new ReflectionObject($model);