Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,19 @@ Changelog

## develop

- [completion] Do not suggest static members on non-static calls and
vice-versa.

## 2018-12-02 0.11.0

BC Break:

- [rpc] All handlers must now be registered with the "name" attribute.

Features:

- [worse-reflection-extension] Allows new framewalkers to be registered
(i.e. new ways to infer types).
- [config] Support loading config from JSON files

Improvements:
Expand Down
54 changes: 27 additions & 27 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions lib/Phpactor.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,16 @@ public static function boot(InputInterface $input, string $vendorDir): PhpactorC
$config = [];

$cwd = getcwd();

$loader = ConfigLoaderBuilder::create()
->enableJsonDeserializer('json')
->enableYamlDeserializer('yaml')
->addCandidate($cwd . '/.phpactor.json', 'json')
->addCandidate($cwd . '/.phpactor.yml', 'yaml')
->addXdgCandidate('phpactor', 'phpactor.json', 'json')
->addXdgCandidate('phpactor', 'phpactor.yml', 'yaml')
->addCandidate($cwd . '/.phpactor.json', 'json')
->addCandidate($cwd . '/.phpactor.yml', 'yaml')
->loader();

$config = $loader->load();
$config[CoreExtension::COMMAND] = $input->getFirstArgument();
$config[FilePathResolverExtension::PARAM_APPLICATION_ROOT] = realpath(__DIR__ . '/..');
Expand Down