From df6b1b6f8289322bb2b178178c9c74a6c2df3a72 Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 27 Dec 2017 17:17:00 -0500 Subject: [PATCH 1/3] Use Illuminate\Support\Carbon instead of Carbon\Carbon --- src/Console/ModelsCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Console/ModelsCommand.php b/src/Console/ModelsCommand.php index 7359a84..cc35914 100644 --- a/src/Console/ModelsCommand.php +++ b/src/Console/ModelsCommand.php @@ -277,7 +277,7 @@ class ModelsCommand extends Command break; case 'date': case 'datetime': - $realType = '\Carbon\Carbon'; + $realType = '\Illuminate\Support\Carbon'; break; case 'collection': $realType = '\Illuminate\Support\Collection'; @@ -337,7 +337,7 @@ class ModelsCommand extends Command foreach ($columns as $column) { $name = $column->getName(); if (in_array($name, $model->getDates())) { - $type = '\Carbon\Carbon'; + $type = '\Illuminate\Support\Carbon'; } else { $type = $column->getType()->getName(); switch ($type) { From d65f1cedcdcb55511615b446aa99e07452d6a743 Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 27 Dec 2017 17:25:44 -0500 Subject: [PATCH 2/3] Use Illuminate\Support\Carbon instead of Carbon\Carbon in readme.md --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 25dcb11..3202d73 100644 --- a/readme.md +++ b/readme.md @@ -122,8 +122,8 @@ php artisan ide-helper:models Post * @property integer $author_id * @property string $title * @property string $text - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at + * @property \Illuminate\Support\Carbon $created_at + * @property \Illuminate\Support\Carbon $updated_at * @property-read \User $author * @property-read \Illuminate\Database\Eloquent\Collection|\Comment[] $comments */ From b6f525b3206f6dfba3b69e084bb114437be9f1ce Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 27 Dec 2017 17:26:16 -0500 Subject: [PATCH 3/3] Use Illuminate\Support\Carbon instead of Carbon\Carbon in config/ide-helper.php --- config/ide-helper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/ide-helper.php b/config/ide-helper.php index 48a06db..38013a2 100644 --- a/config/ide-helper.php +++ b/config/ide-helper.php @@ -153,13 +153,13 @@ return array( | | For example, normally you would see this: | - | * @property \Carbon\Carbon $created_at - | * @property \Carbon\Carbon $updated_at + | * @property \Illuminate\Support\Carbon $created_at + | * @property \Illuminate\Support\Carbon $updated_at | | With this enabled, the properties will be this: | - | * @property \Carbon\Carbon $createdAt - | * @property \Carbon\Carbon $updatedAt + | * @property \Illuminate\Support\Carbon $createdAt + | * @property \Illuminate\Support\Carbon $updatedAt | | Note, it is currently an all-or-nothing option. |