mirrors/barryvdh_laravel-ide-helper
1
0
Fork 0
mirror of https://github.com/barryvdh/laravel-ide-helper.git synced 2026-08-20 02:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #600 from mike-grinspan/patch-1

Browse Source 
Use Illuminate\Support\Carbon instead of Carbon\Carbon
This commit is contained in:
Barry vd. Heuvel
2018-05-07 11:44:40 +02:00
committed by GitHub
parent 50ecd8b815 b6f525b320
commit 94248adae8
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/ide-helper.php
+4 -4
View File
@@ -153,13 +153,13 @@ return array(
| |
| For example, normally you would see this: | For example, normally you would see this:
| |
| * @property \Carbon\Carbon $created_at | * @property \Illuminate\Support\Carbon $created_at
| * @property \Carbon\Carbon $updated_at | * @property \Illuminate\Support\Carbon $updated_at
| |
| With this enabled, the properties will be this: | With this enabled, the properties will be this:
| |
| * @property \Carbon\Carbon $createdAt | * @property \Illuminate\Support\Carbon $createdAt
| * @property \Carbon\Carbon $updatedAt | * @property \Illuminate\Support\Carbon $updatedAt
| |
| Note, it is currently an all-or-nothing option. | Note, it is currently an all-or-nothing option.
| |
readme.md
+2 -2
View File
@@ -122,8 +122,8 @@ php artisan ide-helper:models Post
* @property integer $author_id * @property integer $author_id
* @property string $title * @property string $title
* @property string $text * @property string $text
* @property \Carbon\Carbon $created_at * @property \Illuminate\Support\Carbon $created_at
* @property \Carbon\Carbon $updated_at * @property \Illuminate\Support\Carbon $updated_at
* @property-read \User $author * @property-read \User $author
* @property-read \Illuminate\Database\Eloquent\Collection|\Comment[] $comments * @property-read \Illuminate\Database\Eloquent\Collection|\Comment[] $comments
*/ */
src/Console/ModelsCommand.php
+2 -2
View File
@@ -283,7 +283,7 @@ class ModelsCommand extends Command
break; break;
case 'date': case 'date':
case 'datetime': case 'datetime':
$realType = '\Carbon\Carbon'; $realType = '\Illuminate\Support\Carbon';
break; break;
case 'collection': case 'collection':
$realType = '\Illuminate\Support\Collection'; $realType = '\Illuminate\Support\Collection';
@@ -347,7 +347,7 @@ class ModelsCommand extends Command
foreach ($columns as $column) { foreach ($columns as $column) {
$name = $column->getName(); $name = $column->getName();
if (in_array($name, $model->getDates())) { if (in_array($name, $model->getDates())) {
$type = '\Carbon\Carbon'; $type = '\Illuminate\Support\Carbon';
} else { } else {
$type = $column->getType()->getName(); $type = $column->getType()->getName();
switch ($type) { switch ($type) {