From 949c8f122d8ce0721f53f97c2488d0a5d583e3f7 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 20 Apr 2020 09:05:39 +0200 Subject: [PATCH] php binary --- vimrc | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/vimrc b/vimrc index d4c7245..db318da 100644 --- a/vimrc +++ b/vimrc @@ -39,7 +39,7 @@ Plugin 'arnaud-lb/vim-php-namespace.git' Plugin 'tpope/vim-surround.git' Plugin 'scrooloose/nerdtree' Plugin 'nerdtree-ack' -Plugin 'php-cs-fixer' +" Plugin 'php-cs-fixer' Plugin 'php-doc-upgrade' Plugin 'php.vim' Plugin 'closetag.vim' @@ -83,6 +83,7 @@ Plugin 'c9s/phpunit.vim' Plugin 'terryma/vim-multiple-cursors' Plugin 'dkarter/bullets.vim' Plugin 'connorholyday/vim-snazzy' +" Plugin 'patstockwell/vim-monokai-tasty' call vundle#end() @@ -95,6 +96,7 @@ syntax on if has('gui_running') " colorscheme tender " colorscheme dracula + " colorscheme vim-monokai-tasty colorscheme snazzy else colorscheme Tomorrow-Night-Bright @@ -122,11 +124,6 @@ if has('gui_running') let g:semanticEnableFileTypes = { 'javascript': 'js', 'vim': 'vim', 'php': 'php'} endif -" PHP-CS-FIXER " -"""""""""""""""" - -let g:php_cs_fixer_level = 'symfony' - " NERDTREE-GIT " """""""""""""""" let g:NERDTreeIndicatorMapCustom = { @@ -149,6 +146,9 @@ let g:vim_markdown_autowrite = 0 let g:vim_markdown_conceal = 0 let g:instant_markdown_autostart = 0 +let g:polyglot_disabled = ['markdown'] + + " COLORIZER " """"""""""""" @@ -232,7 +232,8 @@ command! Sfforms CtrlPSymfonyForms " PHP-CS-FIXER " """""""""""""""" -let g:php_cs_fixer_php_path = "/usr/bin/php7.1" +let g:php_cs_fixer_level = '' +let g:php_cs_fixer_php_path = "/usr/bin/php7.3" " CTAGS " """"""""" @@ -381,6 +382,15 @@ augroup phpSyntaxOverride augroup END let g:pdv_template_dir = $HOME."/.vim/bundle/pdv/templates_snip/" +let g:pdv_cfg_autoEndFunction = 0 +let g:pdv_cfg_autoEndClass = 0 +let g:pdv_cfg_php4always = 0 +let g:pdv_cfg_php4guess = 0 +let g:pdv_cfg_annotation_Package = 0 +let g:pdv_cfg_annotation_Version = 0 +let g:pdv_cfg_annotation_Copyright = 0 +let g:pdv_cfg_annotation_License = 0 + " Vdebug " """""""""" @@ -401,7 +411,7 @@ noremap :call PhpDoc() let mapleader = "_" map :!indentation % -map :call PhpCsFixerFixFile() +map :!php7.3 ~/php-cs-fixer.phar fix "%" --rules=@PSR2 map :!phpmd % text /usr/share/phpmd/psr2.xml \| cut -d: -f2- map :!php -l % map :w @@ -451,7 +461,8 @@ set fdc=2 set splitbelow set splitright set hlsearch -set modeline +set nomodeline +" set modeline " set guifont=Consolas\ 13 set guifont=Fantasque\ Sans\ Mono\ 14