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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
Changelog
=========

## develop

Improvements:

- [worse-reflection] Support for virtual methods in interfaces - @dantleech

## 2020-06-09 (0.16.0)

Expand Down
2 changes: 2 additions & 0 deletions autoload/phpactor.vim
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,8 @@ function! phpactor#rpc(action, arguments)

let l:workspaceDir = phpactor#getRootDirectory()

" note that we should escape these arguments, but using the list syntax
" here causes tests to fail on travis with VIM 8.3 ...
let l:cmd = g:phpactorPhpBin . ' ' . g:phpactorbinpath . ' rpc --working-dir=' . l:workspaceDir

let result = system(l:cmd, json_encode(request))
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "phpactor/phpactor",
"description": "PHP refactoring and intellisense tool for text editors",
"minimum-stability": "stable",
"minimum-stability": "dev",
"prefer-stable": true,
"license": "MIT",
"require": {
Expand Down Expand Up @@ -42,7 +42,7 @@
"phpactor/text-document": "^1.2.1",
"phpactor/worse-reference-finder-extension": "^0.1.3",
"phpactor/worse-reference-finders": "^0.2.4",
"phpactor/worse-reflection": "^0.4.2",
"phpactor/worse-reflection": "^0.4.3",
"phpactor/worse-reflection-extension": "^0.2.3",
"sebastian/diff": "^3.0",
"symfony/console": "^4.0",
Expand Down
16 changes: 8 additions & 8 deletions composer.lock

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

11 changes: 7 additions & 4 deletions doc/phpactor.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,13 @@ When jumping to a file location: if the target file open in a window, switch
to that window instead of switching buffers. The default is false.

*g:PhpactorRootDirectoryStrategy*
Each RPC call to phpactor comes with some workspace root directory. This
setting allows select a |Funcref| to the custom strategy that can assign this
directory. Notice the upper case of the first letter of this variable.
Currently no arguments is passed to the function.
Each Phpactor request requires the project's root directory to be known. By
default it will assume the directory in which you started VIM, but this may
not suit all workflows.

This setting allows |Funcref| to be specified. This function should return the
working directory in whichever way is required. No arguments are passed to
this function.

==============================================================================
COMPLETION *phpactor-completion*
Expand Down
11 changes: 7 additions & 4 deletions plugin/phpactor.vim
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,13 @@ let g:phpactorInputListStrategy = get(g:, 'phpactorInputListStrategy', 'phpactor
let g:phpactorUseOpenWindows = get(g:, 'phpactorUseOpenWindows', v:false)

""
" Each RPC call to phpactor comes with some workspace root directory.
" This setting allows select a |Funcref| to the custom strategy that can assign this directory.
" Notice the upper case of the first letter of this variable.
" Currently no arguments is passed to the function.
" Each Phpactor request requires the project's root directory to be known. By
" default it will assume the directory in which you started VIM, but this may
" not suit all workflows.
"
" This setting allows |Funcref| to be specified. This function should return
" the working directory in whichever way is required. No arguments are passed
" to this function.
let g:PhpactorRootDirectoryStrategy = get(g:, 'PhpactorRootDirectoryStrategy', {-> g:phpactorInitialCwd})

" Config }}}
Expand Down