Commit graph

59 commits

Author SHA1 Message Date
Josh Sherman
17b8b86a36 Updated against 5.5.17 and cleaned up README a bit 2014-09-20 10:37:17 -04:00
Josh Sherman
b8fe9db5ff Updated README 2014-08-24 16:52:24 -04:00
Josh Sherman
6bc797f1b1 Updated to PHP 5.5.16
Also dropped test_helpers in favor of uopz.
2014-08-24 16:52:00 -04:00
Josh Sherman
6d41bb8ebd Updated against PHP 5.5.15
Got varnish worked out and added to the syntax.
2014-07-29 22:10:16 -04:00
Josh Sherman
a3d9a0622e Updated against PHP 5.5.14
Bunch of new stuff in 5.5.14, I also had to disable the varnish extension as I
couldn't get it working locally. Starting to think that perhaps I should build
out a Linux VM to run the updates against as doing so on OS X has been a bit of
a pain with a handful of packages.
2014-06-30 18:44:50 -04:00
Josh Sherman
5da9e87d89 Built against 5.5.13, no change O_o 2014-06-08 10:35:01 -04:00
Joshua Sherman
351c49dbd7 Updated against PHP 5.5.12 2014-05-07 13:50:13 -04:00
Joshua Sherman
faa13514fe PHP 5.5.11 and added tokyotyrant and varnish 2014-04-11 11:36:06 -04:00
Josh Sherman
cc2285a67e Updated against PHP 5.5.10
Added some logic to strip out the null character APC stuff, added some more extensions and added some logic to attempt to install via `brew` when the argument "brew" is passed to the update script
2014-03-11 18:18:00 -04:00
Josh Sherman
87ee790293 Merge pull request #6 from webgefrickel/fixhidden
fixed wrong hidden char
2014-02-24 11:19:30 -05:00
Steffen Rademacker
074b943910 fixed wrong hidden char 2014-02-24 14:43:57 +01:00
Joshua Sherman
f3748eb7ec Updated against 5.5.9 and added more extensions 2014-02-10 13:43:26 -05:00
Joshua Sherman
d30ecd69f8 Added @license as well
Pretty much adding @tags as I'm running into them in projects.
2014-01-14 01:01:14 -05:00
Joshua Sherman
dfe51a3864 Merge remote-tracking branch 'upstream/master'
Conflicts:
	syntax/php.template
	syntax/php.vim

Attempted to merge in upstream changes as they claimed to have fixed an issue
that broke spell checking presumably introduced by my branch. I was unable to
get spell checking working with the syntax file that was part of my original
fork: 36ccde5296

Because of this I left my script as is in favor of highlighting just the
@attribute part of the docblock and not highlighting the entire comment string
which appeared visually awkward to me. Ideally I'd love to get spell checking
working in all the places that it should be working but that seems to be a
bigger issue all together.

Also added support for the @usage attribute as it's something that is fairly
common albeit not standard docblocking
2014-01-14 00:23:14 -05:00
Joshua Sherman
4d3a14f74b Enabling more modules
I don't see the need in selectively including syntax for modules when I can
just install the modules and include them all. Expanded to include all of the
modules I could that were in the list already and updated. Going to look into
getting a more up to date module list for PHP 5.5+ and expanding further.
2014-01-13 23:32:12 -05:00
Joshua Sherman
9de06afeb4 Updated against PHP 5.5.8
Updated README and updated against the latest PHP version.
2014-01-13 23:10:35 -05:00
Joshua Sherman
3369a28954 Added test_helpers functions
For all of my friends that are good about unit testing and use the test_helpers
2014-01-13 22:55:31 -05:00
Joshua Sherman
40a8adb7f3 Fixed issue with static classes with numbers
Inadvertently also resolved issues with static classes with underscores as
well. Thanks to @kris89 for giving me a head's up where to look. Closes #2
2014-01-13 22:47:02 -05:00
Stan Angeloff
22c7308fdb Restore spell-checking in docblock comments. 2014-01-13 16:38:15 +02:00
Stan Angeloff
b6c2b2937d Merge remote-tracking branch 'boxofrox/fix/php-tag-recognition' 2014-01-09 09:22:06 +02:00
Justin Charette
65e2b0ae85 Stop phpDocParam highlight leakage
Problem:  The new Java-like syntax highligting added phpDocComment, et
al.  However phpDocParams highlighted indented html tags in a file with
no doc comments.

Fix: Mark phpDocParams as contained, so phpDocParams must reside in
phpDocComments to receive vim highlights.

Signed-off-by: Justin Charette <charetjc@gmail.com>
2014-01-08 23:48:50 -05:00
Joshua Sherman
e6ea831193 Merge branch 'master' of https://github.com/kris89/php.vim
Conflicts:
	syntax/php.template
2014-01-07 10:54:41 -05:00
Husak Kristijan
a3a40f7585 adds dockblock update 2014-01-07 09:13:03 +01:00
Joshua Sherman
e747364d65 Added improvement to the README 2014-01-06 09:50:14 -05:00
Joshua Sherman
45af33ff74 Added Static class and docblock highlighting
This is actually a rework of the patch @kris89 sent in that adds the syntax to the php.template file so they won't be lost when regenerating the php.vim file. Thanks @kris89 !!
2014-01-06 09:35:58 -05:00
Joshua Sherman
249550d2c2 Merge branch 'master' of https://github.com/StanAngeloff/php.vim
Conflicts:
	syntax/php.template
	syntax/php.vim
2014-01-06 09:31:41 -05:00
Husak Kristijan
0fc1176724 adds Static class highlight and docblock highlighting 2014-01-06 15:00:30 +01:00
Stan Angeloff
356f296e56 Extend PHP to use Java-like syntaxing highlighting (via @tetsuo13).
This commit merges parts of:

9d1e381f03
2014-01-03 11:20:39 +02:00
Stan Angeloff
bbe3272c39 Merge @paulyg commits.
This commit merges parts of:

b9b2b2daaa
e3333be231
2014-01-03 10:50:52 +02:00
Stan Angeloff
fc99f30264 Highlight booleans as 'Boolean'. 2014-01-02 17:31:36 +02:00
Stan Angeloff
dface50c42 Add 'yield' to the list of keywords (as of PHP 5.5). 2014-01-02 17:28:18 +02:00
Stan Angeloff
c85155b2c2 Update template file and re-generate using PHP 5.5.7
$ php -v

PHP 5.5.7-1+sury.org~saucy+1 (cli) (built: Dec 12 2013 21:54:59)
Copyright (c) 1997-2013 The PHP Group
Zend Engine v2.5.0, Copyright (c) 1998-2013 Zend Technologies
    with Zend OPcache v7.0.3-dev, Copyright (c) 1999-2013, by Zend Technologies
    with Xdebug v2.2.3, Copyright (c) 2002-2013, by Derick Rethans
2014-01-02 17:25:35 +02:00
Stan Angeloff
200921f568 Merge @joshtronic commit.
This commit merges parts of:

e9c5d0f6be

The 'finally' keyword was added to the list of recognised keywords.
2014-01-02 17:19:09 +02:00
Stan Angeloff
8adb70b636 Merge @pixelastic commit.
This commit merges parts of:

8b4b165bab
2014-01-02 17:17:09 +02:00
Stan Angeloff
4cd4f224ec Merge @aantonello commits.
This commit merges parts of:

9d24eab4ea
63c93d8825

The syntax file is more closely aligned with the generic syntax highlighting
groups in Vim.

This didn't change highlighting for my custom syntax colours, hopefully it
will not affect others as well.
2014-01-02 17:13:53 +02:00
Joshua John Sherman
d1ac476e0b Update README.md 2014-01-01 12:31:38 -05:00
Joshua Sherman
e9c5d0f6be Updated header and added support for finally 2014-01-01 12:30:11 -05:00
Joshua Sherman
db528cd03c Fixed link in README 2014-01-01 09:53:29 -05:00
Joshua Sherman
4477d204f1 Joshed it up, no joshin’
Updated to PHP 5.5.4 and added some modules I enjoy, specifically memcache, memcached, redis and xdebug.
2014-01-01 09:48:51 -05:00
Stan Angeloff
36ccde5296 Auto-generate Vim syntax with PHP 5.5.0RC1.
This commit does not add support for the new 5.5 keywords or language
constructs.
2013-05-14 14:43:13 +03:00
Stan Angeloff
f398d9a5e8 Auto-generate Vim syntax with PHP 5.5.0alpha5 (cli) (built: Feb 25 2013). 2013-02-25 09:41:59 +02:00
Stan Angeloff
6e695b0557 Use MySQL as the default buffer SQL syntax. 2013-02-25 09:05:40 +02:00
Stan Angeloff
48d2f7bb77 Merge remote-tracking branch 'jaywilliams/mysql'
> Use MySQL for Syntax Highlighting.
>
> Rather than use the limited SQL syntax, why not use the full MySQL syntax?
2013-02-25 08:58:24 +02:00
Stan Angeloff
e231676f34 Clean up syntax file, no functional changes. 2013-02-25 08:56:48 +02:00
Jay Williams
54cce0565c Use Mysql for SQL Syntax 2013-02-22 16:42:22 -06:00
Jay Williams
e6c311fdc9 Use Mysql for SQL Syntax 2013-02-22 16:42:00 -06:00
Stan Angeloff
fcfbb12a68 Auto-generate Vim syntax with PHP 5.4.6-1ubuntu1.1. 2012-11-29 13:57:34 +02:00
Stan Angeloff
c9ff5be35c Update README (switch to Markdown too). 2012-06-01 10:50:53 +03:00
Stan Angeloff
eae050302e Basic PHP 5.4 support.
This commit adds support for:

- New Core constants,
- New language keywords: trait, insteadof,
- New types, e.g., calleable and binary numbers.
2012-04-16 17:04:21 +03:00
Stan Angeloff
c74b98e131 Update template script to be smarter about missing extensions. 2012-04-16 16:52:50 +03:00