#2132 - Replace all uses of foo_callback with foo

7 files changed, 15 insertions, 15 deletions

diff --git a/ale_linters/php/langserver.vim b/ale_linters/php/langserver.vim
index ca91db4c..c88281c4 100644
--- a/ale_linters/php/langserver.vim
+++ b/ale_linters/php/langserver.vim
@@ -13,9 +13,9 @@ endfunction
 call ale#linter#Define('php', {
 \   'name': 'langserver',
 \   'lsp': 'stdio',
-\   'executable_callback': ale#node#FindExecutableFunc('php_langserver', [
+\   'executable': {b -> ale#node#FindExecutable(b, 'php_langserver', [
 \       'vendor/bin/php-language-server.php',
-\   ]),
+\   ])},
 \   'command': 'php %e',
-\   'project_root_callback': 'ale_linters#php#langserver#GetProjectRoot',
+\   'project_root': function('ale_linters#php#langserver#GetProjectRoot'),
 \})
diff --git a/ale_linters/php/phan.vim b/ale_linters/php/phan.vim
index c6f16356..53cb1ea9 100644
--- a/ale_linters/php/phan.vim
+++ b/ale_linters/php/phan.vim
@@ -67,7 +67,7 @@ endfunction
 
 call ale#linter#Define('php', {
 \   'name': 'phan',
-\   'executable_callback': 'ale_linters#php#phan#GetExecutable',
-\   'command_callback': 'ale_linters#php#phan#GetCommand',
+\   'executable': function('ale_linters#php#phan#GetExecutable'),
+\   'command': function('ale_linters#php#phan#GetCommand'),
 \   'callback': 'ale_linters#php#phan#Handle',
 \})
diff --git a/ale_linters/php/php.vim b/ale_linters/php/php.vim
index 5d87196c..51a109b9 100644
--- a/ale_linters/php/php.vim
+++ b/ale_linters/php/php.vim
@@ -32,7 +32,7 @@ endfunction
 
 call ale#linter#Define('php', {
 \   'name': 'php',
-\   'executable_callback': ale#VarFunc('php_php_executable'),
+\   'executable': {b -> ale#Var(b, 'php_php_executable')},
 \   'output_stream': 'stdout',
 \   'command': '%e -l -d error_reporting=E_ALL -d display_errors=1 -d log_errors=0 --',
 \   'callback': 'ale_linters#php#php#Handle',
diff --git a/ale_linters/php/phpcs.vim b/ale_linters/php/phpcs.vim
index 408c2652..1c92bbb2 100644
--- a/ale_linters/php/phpcs.vim
+++ b/ale_linters/php/phpcs.vim
@@ -44,10 +44,10 @@ endfunction
 
 call ale#linter#Define('php', {
 \   'name': 'phpcs',
-\   'executable_callback': ale#node#FindExecutableFunc('php_phpcs', [
+\   'executable': {b -> ale#node#FindExecutable(b, 'php_phpcs', [
 \       'vendor/bin/phpcs',
 \       'phpcs'
-\   ]),
-\   'command_callback': 'ale_linters#php#phpcs#GetCommand',
+\   ])},
+\   'command': function('ale_linters#php#phpcs#GetCommand'),
 \   'callback': 'ale_linters#php#phpcs#Handle',
 \})
diff --git a/ale_linters/php/phpmd.vim b/ale_linters/php/phpmd.vim
index 65f1cc3c..9b1d1e44 100644
--- a/ale_linters/php/phpmd.vim
+++ b/ale_linters/php/phpmd.vim
@@ -32,7 +32,7 @@ endfunction
 
 call ale#linter#Define('php', {
 \   'name': 'phpmd',
-\   'executable_callback': ale#VarFunc('php_phpmd_executable'),
-\   'command_callback': 'ale_linters#php#phpmd#GetCommand',
+\   'executable': {b -> ale#Var(b, 'php_phpmd_executable')},
+\   'command': function('ale_linters#php#phpmd#GetCommand'),
 \   'callback': 'ale_linters#php#phpmd#Handle',
 \})
diff --git a/ale_linters/php/phpstan.vim b/ale_linters/php/phpstan.vim
index 1c831e1b..34d4e799 100644
--- a/ale_linters/php/phpstan.vim
+++ b/ale_linters/php/phpstan.vim
@@ -65,7 +65,7 @@ endfunction
 
 call ale#linter#Define('php', {
 \   'name': 'phpstan',
-\   'executable_callback': 'ale_linters#php#phpstan#GetExecutable',
+\   'executable': function('ale_linters#php#phpstan#GetExecutable'),
 \   'command_chain': [
 \       {'callback': 'ale_linters#php#phpstan#VersionCheck'},
 \       {'callback': 'ale_linters#php#phpstan#GetCommand'},
diff --git a/ale_linters/php/psalm.vim b/ale_linters/php/psalm.vim
index dce59178..3cdb026a 100644
--- a/ale_linters/php/psalm.vim
+++ b/ale_linters/php/psalm.vim
@@ -13,9 +13,9 @@ endfunction
 call ale#linter#Define('php', {
 \   'name': 'psalm',
 \   'lsp': 'stdio',
-\   'executable_callback': ale#node#FindExecutableFunc('psalm_langserver', [
+\   'executable': {b -> ale#node#FindExecutable(b, 'psalm_langserver', [
 \       'vendor/bin/psalm-language-server',
-\   ]),
+\   ])},
 \   'command': '%e',
-\   'project_root_callback': 'ale_linters#php#psalm#GetProjectRoot',
+\   'project_root': function('ale_linters#php#psalm#GetProjectRoot'),
 \})