Updated against 5.5.17 and cleaned up README a bit

This commit is contained in:
Josh Sherman 2014-09-20 10:37:17 -04:00
parent b8fe9db5ff
commit 17b8b86a36
2 changed files with 20 additions and 23 deletions

View file

@ -1,5 +1,4 @@
php.vim
=======
# php.vim
This project is a fork of [php.vim][StanAngeloff] which is an improved version
of [php.vim--Garvin][garvin] which in turn is an update of the
@ -9,14 +8,9 @@ syntax file distributed with Vim.
The point of this fork is to embrace the latest and greatest PHP has to offer
and constantly update against the latest PHP release.
Last updated against **5.5.16**
Last updated against **5.5.17**
[StanAngeloff]: https://github.com/StanAngeloff/php.vim
[garvin]: https://github.com/vim-scripts/php.vim--Garvin
[php-vim]: http://www.vim.org/scripts/script.php?script_id=2874
Improvements
------------
## Improvements
- Spell checking was enabled in strings and comments (both single and
multi-line).
@ -30,18 +24,14 @@ Improvements
- New modules added: memcache, memcached, redis, test_helpers and xdebug
- Support for static classes and docblock parameters (patched by @kris89)
[html5]: https://github.com/othree/html5.vim
Customising
-----------
## Customising
A script `update_syntax.php` is provided to re-generate the syntax file.
A single variable `$allowed_extensions` can be customised to
[turn on/off][defaults] certain extensions.
When re-generating the syntax file, you must have allowed extensions installed.
[defaults]: https://github.com/StanAngeloff/php.vim/blob/master/update_syntax.php#L29-L101
When re-generating the syntax file, you must have allowed extensions
installed.
### Original README
@ -49,11 +39,18 @@ When re-generating the syntax file, you must have allowed extensions installed.
> The list of PHP constants, functions, and classes was updated to be current
> with PHP 5.3. Many new classes were added in the 5.2 branch and the
> distributed version only covers up to 5.1.4. In addition I simplified the
> file, removing several sections that are not often used (at least by me) such
> as automatic folding of all control structures and ASP tags support. I also
> removed several switches designed for b/c with VIM 5.X and 6.X. As an
> file, removing several sections that are not often used (at least by me)
> such as automatic folding of all control structures and ASP tags support. I
> also removed several switches designed for b/c with VIM 5.X and 6.X. As an
> addition I have included the PHP file I used to generate the constant,
> function, class list. It uses reflection to mine out these items from your
> PHP installation and generate part of the php.vim script. Before running open
> up the file and adjust the output file location and the list of extensions to
> generate syntax for. Then run "php php_vimgen.php" from your shell.
> PHP installation and generate part of the php.vim script. Before running
> open up the file and adjust the output file location and the list of
> extensions to generate syntax for. Then run "php php_vimgen.php" from your
> shell.
[defaults]: https://github.com/StanAngeloff/php.vim/blob/master/update_syntax.php#L29-L101
[garvin]: https://github.com/vim-scripts/php.vim--Garvin
[html5]: https://github.com/othree/html5.vim
[php-vim]: http://www.vim.org/scripts/script.php?script_id=2874
[StanAngeloff]: https://github.com/StanAngeloff/php.vim

View file

@ -557,7 +557,7 @@ syn keyword phpClasses OAuth OAuthException OAuthProvider contained
" odbc
syn keyword phpFunctions odbc_autocommit odbc_binmode odbc_close odbc_close_all odbc_columns odbc_commit odbc_connect odbc_cursor odbc_data_source odbc_execute odbc_error odbc_errormsg odbc_exec odbc_fetch_array odbc_fetch_object odbc_fetch_row odbc_fetch_into odbc_field_len odbc_field_scale odbc_field_name odbc_field_type odbc_field_num odbc_free_result odbc_gettypeinfo odbc_longreadlen odbc_next_result odbc_num_fields odbc_num_rows odbc_pconnect odbc_prepare odbc_result odbc_result_all odbc_rollback odbc_setoption odbc_specialcolumns odbc_statistics odbc_tables odbc_primarykeys odbc_columnprivileges odbc_tableprivileges odbc_foreignkeys odbc_procedures odbc_procedurecolumns odbc_do odbc_field_precision contained
" openssl
syn keyword phpFunctions openssl_pkey_free openssl_pkey_new openssl_pkey_export openssl_pkey_export_to_file openssl_pkey_get_private openssl_pkey_get_public openssl_pkey_get_details openssl_free_key openssl_get_privatekey openssl_get_publickey openssl_x509_read openssl_x509_free openssl_x509_parse openssl_x509_checkpurpose openssl_x509_check_private_key openssl_x509_export openssl_x509_export_to_file openssl_pkcs12_export openssl_pkcs12_export_to_file openssl_pkcs12_read openssl_csr_new openssl_csr_export openssl_csr_export_to_file openssl_csr_sign openssl_csr_get_subject openssl_csr_get_public_key openssl_digest openssl_encrypt openssl_decrypt openssl_cipher_iv_length openssl_sign openssl_verify openssl_seal openssl_open openssl_pkcs7_verify openssl_pkcs7_decrypt openssl_pkcs7_sign openssl_pkcs7_encrypt openssl_private_encrypt openssl_private_decrypt openssl_public_encrypt openssl_public_decrypt openssl_get_md_methods openssl_get_cipher_methods openssl_dh_compute_key openssl_random_pseudo_bytes openssl_error_string contained
syn keyword phpFunctions openssl_pkey_free openssl_pkey_new openssl_pkey_export openssl_pkey_export_to_file openssl_pkey_get_private openssl_pkey_get_public openssl_pkey_get_details openssl_free_key openssl_get_privatekey openssl_get_publickey openssl_x509_read openssl_x509_free openssl_x509_parse openssl_x509_checkpurpose openssl_x509_check_private_key openssl_x509_export openssl_x509_export_to_file openssl_pkcs12_export openssl_pkcs12_export_to_file openssl_pkcs12_read openssl_csr_new openssl_csr_export openssl_csr_export_to_file openssl_csr_sign openssl_csr_get_subject openssl_csr_get_public_key openssl_digest openssl_encrypt openssl_decrypt openssl_cipher_iv_length openssl_sign openssl_verify openssl_seal openssl_open openssl_pbkdf2 openssl_pkcs7_verify openssl_pkcs7_decrypt openssl_pkcs7_sign openssl_pkcs7_encrypt openssl_private_encrypt openssl_private_decrypt openssl_public_encrypt openssl_public_decrypt openssl_get_md_methods openssl_get_cipher_methods openssl_dh_compute_key openssl_random_pseudo_bytes openssl_error_string contained
" pcre
syn keyword phpFunctions preg_match preg_match_all preg_replace preg_replace_callback preg_filter preg_split preg_quote preg_grep preg_last_error contained
" PDO