diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d64d1b88..0023858ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,9 @@ All notable changes to this project will be documented in this file. - Allow model_locations to have glob patterns [\#1059 / saackearl](https://github.com/barryvdh/laravel-ide-helper/pull/1059) - Error when generating helper for macroable classes which are not facades and contain a "fake" method [\#1066 / domkrm] (https://github.com/barryvdh/laravel-ide-helper/pull/1066) +### Removed +- Removed format and broken generateJsonHelper [\#1053 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1053) + 2020-09-07, 2.8.1 ----------------- ### Added diff --git a/config/ide-helper.php b/config/ide-helper.php index 94118a668..8a6f96a2f 100644 --- a/config/ide-helper.php +++ b/config/ide-helper.php @@ -7,12 +7,11 @@ | Filename & Format |-------------------------------------------------------------------------- | - | The default filename (without extension) and the format (php or json) + | The default filename | */ - 'filename' => '_ide_helper', - 'format' => 'php', + 'filename' => '_ide_helper.php', /* |-------------------------------------------------------------------------- diff --git a/src/Console/GeneratorCommand.php b/src/Console/GeneratorCommand.php index c2abf146b..40758ecf7 100644 --- a/src/Console/GeneratorCommand.php +++ b/src/Console/GeneratorCommand.php @@ -89,15 +89,13 @@ public function handle() } $filename = $this->argument('filename'); - $format = $this->option('format'); - // Strip the php extension - if (substr($filename, -4, 4) === '.php') { - $filename = substr($filename, 0, -4); + // Add the php extension if missing + // This is a backwards-compatible shim and can be removed in the future + if (substr($filename, -4, 4) !== '.php') { + $filename .= '.php'; } - $filename .= '.' . $format; - if ($this->option('memory')) { $this->useMemoryDriver(); } @@ -115,7 +113,7 @@ public function handle() } $generator = new Generator($this->config, $this->view, $this->getOutput(), $helpers); - $content = $generator->generate($format); + $content = $generator->generate(); $written = $this->files->put($filename, $content); if ($written !== false) { @@ -165,11 +163,9 @@ protected function getArguments() */ protected function getOptions() { - $format = $this->config->get('ide-helper.format'); $writeMixins = $this->config->get('ide-helper.write_eloquent_model_mixins'); return [ - ['format', 'F', InputOption::VALUE_OPTIONAL, 'The format for the IDE Helper', $format], ['write_mixins', 'W', InputOption::VALUE_OPTIONAL, 'Write mixins to Laravel Model?', $writeMixins], ['helpers', 'H', InputOption::VALUE_NONE, 'Include the helper files'], ['memory', 'M', InputOption::VALUE_NONE, 'Use sqlite memory driver'], diff --git a/src/Generator.php b/src/Generator.php index 877e91563..948eb925b 100644 --- a/src/Generator.php +++ b/src/Generator.php @@ -67,21 +67,9 @@ public function __construct( /** * Generate the helper file contents; * - * @param string $format The format to generate the helper in (php/json) * @return string; */ - public function generate($format = 'php') - { - // Check if the generator for this format exists - $method = 'generate' . ucfirst($format) . 'Helper'; - if (method_exists($this, $method)) { - return $this->$method(); - } - - return $this->generatePhpHelper(); - } - - public function generatePhpHelper() + public function generate() { $app = app(); return $this->view->make('helper') @@ -94,33 +82,6 @@ public function generatePhpHelper() ->render(); } - public function generateJsonHelper() - { - $classes = []; - foreach ($this->getValidAliases() as $aliases) { - foreach ($aliases as $alias) { - $functions = []; - foreach ($alias->getMethods() as $method) { - $functions[$method->getName()] = '(' . $method->getParamsWithDefault() . ')'; - } - $classes[$alias->getAlias()] = [ - 'functions' => $functions, - ]; - } - } - - $flags = JSON_FORCE_OBJECT; - if (defined('JSON_PRETTY_PRINT')) { - $flags |= JSON_PRETTY_PRINT; - } - - return json_encode([ - 'php' => [ - 'classes' => $classes, - ], - ], $flags); - } - protected function detectDrivers() { $defaultUserModel = config('auth.providers.users.model', config('auth.model', 'App\User'));