From e36345ca536ed52eb7a0113108fecb6315018c56 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sun, 13 Sep 2020 17:13:47 +0100 Subject: [PATCH] Fix geography error --- app/Models/Article.php | 2 +- app/Models/Bookmark.php | 2 +- app/Models/Contact.php | 2 +- app/Models/Like.php | 2 +- app/Models/Media.php | 2 +- app/Models/MicropubClient.php | 2 +- app/Models/Note.php | 2 +- app/Models/Place.php | 4 +- app/Models/Tag.php | 2 +- app/Models/User.php | 2 +- app/Models/WebMention.php | 2 +- config/ide-helper.php | 258 ++++++++++++++++++++++++++++++++++ 12 files changed, 270 insertions(+), 12 deletions(-) create mode 100644 config/ide-helper.php diff --git a/app/Models/Article.php b/app/Models/Article.php index a48c1ed9..fb706001 100644 --- a/app/Models/Article.php +++ b/app/Models/Article.php @@ -18,7 +18,7 @@ use Spatie\CommonMarkHighlighter\FencedCodeRenderer; use Spatie\CommonMarkHighlighter\IndentedCodeRenderer; /** - * App\Models\Article. + * App\Models\Article * * @property int $id * @property string $titleurl diff --git a/app/Models/Bookmark.php b/app/Models/Bookmark.php index 9d472f44..d0d2315b 100644 --- a/app/Models/Bookmark.php +++ b/app/Models/Bookmark.php @@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Support\Carbon; /** - * App\Models\Bookmark. + * App\Models\Bookmark * * @property int $id * @property string $url diff --git a/app/Models/Contact.php b/app/Models/Contact.php index a15a4fc2..9eb8cc09 100644 --- a/app/Models/Contact.php +++ b/app/Models/Contact.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Carbon; /** - * App\Models\Contact. + * App\Models\Contact * * @property int $id * @property string $nick diff --git a/app/Models/Like.php b/app/Models/Like.php index 76b790a0..64c89c9e 100644 --- a/app/Models/Like.php +++ b/app/Models/Like.php @@ -13,7 +13,7 @@ use Illuminate\Support\Carbon; use Mf2; /** - * App\Models\Like. + * App\Models\Like * * @property int $id * @property string $url diff --git a/app/Models/Media.php b/app/Models/Media.php index df8a4666..c5354345 100644 --- a/app/Models/Media.php +++ b/app/Models/Media.php @@ -12,7 +12,7 @@ use Illuminate\Support\Carbon; use Illuminate\Support\Str; /** - * App\Models\Media. + * App\Models\Media * * @property int $id * @property string|null $token diff --git a/app/Models/MicropubClient.php b/app/Models/MicropubClient.php index 0f5d8d93..c2a1e399 100644 --- a/app/Models/MicropubClient.php +++ b/app/Models/MicropubClient.php @@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Carbon; /** - * App\Models\MicropubClient. + * App\Models\MicropubClient * * @property int $id * @property string $client_url diff --git a/app/Models/Note.php b/app/Models/Note.php index 091cd6bb..3d9f422d 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -22,7 +22,7 @@ use Normalizer; use Spatie\CommonMarkHighlighter\{FencedCodeRenderer, IndentedCodeRenderer}; /** - * App\Models\Note. + * App\Models\Note * * @property int $id * @property string|null $note diff --git a/app/Models/Place.php b/app/Models/Place.php index e0125377..f94e0b2d 100644 --- a/app/Models/Place.php +++ b/app/Models/Place.php @@ -15,14 +15,14 @@ use MStaack\LaravelPostgis\Eloquent\PostgisTrait; use MStaack\LaravelPostgis\Geometries\Point; /** - * App\Models\Place. + * App\Models\Place * * @property int $id * @property string $name * @property string $slug * @property string|null $description * @property Point $location - * @property string|null $polygon + * @property mixed|null $polygon * @property Carbon|null $created_at * @property Carbon|null $updated_at * @property string|null $icon diff --git a/app/Models/Tag.php b/app/Models/Tag.php index f049adeb..828ba595 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Support\Carbon; /** - * App\Models\Tag. + * App\Models\Tag * * @property int $id * @property string $tag diff --git a/app/Models/User.php b/app/Models/User.php index 2d0c8fb5..005406c5 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -13,7 +13,7 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Support\Carbon; /** - * App\Models\User. + * App\Models\User * * @property int $id * @property string $name diff --git a/app/Models/WebMention.php b/app/Models/WebMention.php index 48fe5596..1a62a900 100644 --- a/app/Models/WebMention.php +++ b/app/Models/WebMention.php @@ -17,7 +17,7 @@ use Jonnybarnes\WebmentionsParser\Authorship; use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException; /** - * App\Models\WebMention. + * App\Models\WebMention * * @property int $id * @property string $source diff --git a/config/ide-helper.php b/config/ide-helper.php new file mode 100644 index 00000000..07b9ca57 --- /dev/null +++ b/config/ide-helper.php @@ -0,0 +1,258 @@ + '_ide_helper', + 'format' => 'php', + + /* + |-------------------------------------------------------------------------- + | Where to write the PhpStorm specific meta file + |-------------------------------------------------------------------------- + | + | PhpStorm also supports the directory `.phpstorm.meta.php/` with arbitrary + | files in it, should you need additional files for your project; e.g. + | `.phpstorm.meta.php/laravel_ide_Helper.php'. + | + */ + 'meta_filename' => '.phpstorm.meta.php', + + /* + |-------------------------------------------------------------------------- + | Fluent helpers + |-------------------------------------------------------------------------- + | + | Set to true to generate commonly used Fluent methods + | + */ + + 'include_fluent' => false, + + /* + |-------------------------------------------------------------------------- + | Factory Builders + |-------------------------------------------------------------------------- + | + | Set to true to generate factory generators for better factory() + | method auto-completion. + | + */ + + 'include_factory_builders' => false, + + /* + |-------------------------------------------------------------------------- + | Write Model Magic methods + |-------------------------------------------------------------------------- + | + | Set to false to disable write magic methods of model + | + */ + + 'write_model_magic_where' => true, + + /* + |-------------------------------------------------------------------------- + | Write Model relation count properties + |-------------------------------------------------------------------------- + | + | Set to false to disable writing of relation count properties to model DocBlocks. + | + */ + + 'write_model_relation_count_properties' => true, + + /* + |-------------------------------------------------------------------------- + | Write Eloquent Model Mixins + |-------------------------------------------------------------------------- + | + | This will add the necessary DocBlock mixins to the model class + | contained in the Laravel Framework. This helps the IDE with + | auto-completion. + | + | Please be aware that this setting changes a file within the /vendor directory. + | + */ + + 'write_eloquent_model_mixins' => false, + + /* + |-------------------------------------------------------------------------- + | Helper files to include + |-------------------------------------------------------------------------- + | + | Include helper files. By default not included, but can be toggled with the + | -- helpers (-H) option. Extra helper files can be included. + | + */ + + 'include_helpers' => false, + + 'helper_files' => [ + base_path() . '/vendor/laravel/framework/src/Illuminate/Support/helpers.php', + ], + + /* + |-------------------------------------------------------------------------- + | Model locations to include + |-------------------------------------------------------------------------- + | + | Define in which directories the ide-helper:models command should look + | for models. + | + | glob patterns are supported to easier reach models in sub-directories, + | e.g. `app/Services/* /Models` (without the space) + | + */ + + 'model_locations' => [ + 'app', + ], + + /* + |-------------------------------------------------------------------------- + | Models to ignore + |-------------------------------------------------------------------------- + | + | Define which models should be ignored. + | + */ + + 'ignored_models' => [ + + ], + + /* + |-------------------------------------------------------------------------- + | Extra classes + |-------------------------------------------------------------------------- + | + | These implementations are not really extended, but called with magic functions + | + */ + + 'extra' => [ + 'Eloquent' => ['Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'], + 'Session' => ['Illuminate\Session\Store'], + ], + + 'magic' => [], + + /* + |-------------------------------------------------------------------------- + | Interface implementations + |-------------------------------------------------------------------------- + | + | These interfaces will be replaced with the implementing class. Some interfaces + | are detected by the helpers, others can be listed below. + | + */ + + 'interfaces' => [ + + ], + + /* + |-------------------------------------------------------------------------- + | Support for custom DB types + |-------------------------------------------------------------------------- + | + | This setting allow you to map any custom database type (that you may have + | created using CREATE TYPE statement or imported using database plugin + | / extension to a Doctrine type. + | + | Each key in this array is a name of the Doctrine2 DBAL Platform. Currently valid names are: + | 'postgresql', 'db2', 'drizzle', 'mysql', 'oracle', 'sqlanywhere', 'sqlite', 'mssql' + | + | This name is returned by getName() method of the specific Doctrine/DBAL/Platforms/AbstractPlatform descendant + | + | The value of the array is an array of type mappings. Key is the name of the custom type, + | (for example, "jsonb" from Postgres 9.4) and the value is the name of the corresponding Doctrine2 type (in + | our case it is 'json_array'. Doctrine types are listed here: + | http://doctrine-dbal.readthedocs.org/en/latest/reference/types.html + | + | So to support jsonb in your models when working with Postgres, just add the following entry to the array below: + | + | "postgresql" => array( + | "jsonb" => "json_array", + | ), + | + */ + 'custom_db_types' => [ + 'postgresql' => [ + 'geography' => 'array', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Support for camel cased models + |-------------------------------------------------------------------------- + | + | There are some Laravel packages (such as Eloquence) that allow for accessing + | Eloquent model properties via camel case, instead of snake case. + | + | Enabling this option will support these packages by saving all model + | properties as camel case, instead of snake case. + | + | For example, normally you would see this: + | + | * @property \Illuminate\Support\Carbon $created_at + | * @property \Illuminate\Support\Carbon $updated_at + | + | With this enabled, the properties will be this: + | + | * @property \Illuminate\Support\Carbon $createdAt + | * @property \Illuminate\Support\Carbon $updatedAt + | + | Note, it is currently an all-or-nothing option. + | + */ + 'model_camel_case_properties' => false, + + /* + |-------------------------------------------------------------------------- + | Property Casts + |-------------------------------------------------------------------------- + | + | Cast the given "real type" to the given "type". + | + */ + 'type_overrides' => [ + 'integer' => 'int', + 'boolean' => 'bool', + ], + + /* + |-------------------------------------------------------------------------- + | Include DocBlocks from classes + |-------------------------------------------------------------------------- + | + | Include DocBlocks from classes to allow additional code inspection for + | magic methods and properties. + | + */ + 'include_class_docblocks' => false, + + /* + |-------------------------------------------------------------------------- + | Force FQN usage + |-------------------------------------------------------------------------- + | + | Use the fully qualified (class) name in docBlock, + | event if class exists in a given file + | or there is an import (use className) of a given class + | + */ + 'force_fqn' => false, +];