Merge pull request stephpy#31 from adriaanzon/master

Improve startup time with autoloading

Author: stephpy

plugin/php-cs-fixer.vim renamed to autoload/php_cs_fixer.vim

@@ -1,12 +1,7 @@
 "=============================================================================
-" File: php-cs-fixer.vim
+" File: autoload/php_cs_fixer.vim
 " Author: Stéphane PY
 
-if exists("g:vim_php_cs_fixer") || &cp
-    finish
-endif
-let g:vim_php_cs_fixer = 1
-
 " Global options definition."{{{
 let g:php_cs_fixer_path = get(g:, 'php_cs_fixer_path', '~/php-cs-fixer.phar')
 let g:php_cs_fixer_php_path = get(g:, 'php_cs_fixer_php_path', 'php')
@@ -27,9 +22,6 @@ if g:php_cs_fixer_version >= 2
 else
     let g:php_cs_fixer_level = get(g:, 'php_cs_fixer_level', 'symfony')
 endif
-let g:php_cs_fixer_enable_default_mapping = get(g:, 'php_cs_fixer_enable_default_mapping', '1')
-let g:php_cs_fixer_dry_run = get(g:, 'php_cs_fixer_dry_run', 0)
-let g:php_cs_fixer_verbose = get(g:, 'php_cs_fixer_verbose', 0)
 
 if g:php_cs_fixer_version == 1
 	if exists('g:php_cs_fixer_config')
@@ -50,7 +42,7 @@ if exists('g:php_cs_fixer_cache')
 endif
 "}}}
 
-fun! PhpCsFixerFix(path, dry_run)
+fun! php_cs_fixer#fix(path, dry_run)
 
     if !executable('php-cs-fixer')
       if !filereadable(expand(g:php_cs_fixer_path))
@@ -127,18 +119,3 @@ fun! PhpCsFixerFix(path, dry_run)
         endif
     endif
 endfun
-
-fun! PhpCsFixerFixDirectory()
-    call PhpCsFixerFix(expand('%:p:h'), g:php_cs_fixer_dry_run)
-endfun
-
-fun! PhpCsFixerFixFile()
-    call PhpCsFixerFix(expand('%:p'), g:php_cs_fixer_dry_run)
-endfun
-
-if(g:php_cs_fixer_enable_default_mapping == 1)
-    nnoremap <silent><leader>pcd :call PhpCsFixerFixDirectory()<CR>
-    nnoremap <silent><leader>pcf :call PhpCsFixerFixFile()<CR>
-endif
-
-" vim: foldmethod=marker

plugin/php_cs_fixer.vim

@@ -0,0 +1,32 @@
+"=============================================================================
+" File: plugin/php_cs_fixer.vim
+" Author: Stéphane PY
+
+if exists("g:vim_php_cs_fixer") || &cp
+    finish
+endif
+let g:vim_php_cs_fixer = 1
+
+let g:php_cs_fixer_enable_default_mapping = get(g:, 'php_cs_fixer_enable_default_mapping', '1')
+let g:php_cs_fixer_dry_run = get(g:, 'php_cs_fixer_dry_run', 0)
+let g:php_cs_fixer_verbose = get(g:, 'php_cs_fixer_verbose', 0)
+
+" Backwards compatibility
+fun! PhpCsFixerFix(path, dry_run)
+    call php_cs_fixer#fix(a:path, a:dry_run)
+endfun
+
+fun! PhpCsFixerFixDirectory()
+    call php_cs_fixer#fix(expand('%:p:h'), g:php_cs_fixer_dry_run)
+endfun
+
+fun! PhpCsFixerFixFile()
+    call php_cs_fixer#fix(expand('%:p'), g:php_cs_fixer_dry_run)
+endfun
+
+if(g:php_cs_fixer_enable_default_mapping == 1)
+    nnoremap <silent><leader>pcd :call PhpCsFixerFixDirectory()<CR>
+    nnoremap <silent><leader>pcf :call PhpCsFixerFixFile()<CR>
+endif
+
+" vim: foldmethod=marker