Prevent member names being fontified with type face

font-lock-keywords of cc-mode take precendence over php-mode's keywords
unless explicitly required. We now override (defined before) cc-mode
font-lock-keywords for variable members and function names because in
PHP, not all type keywords are reserved, unlike other the other cc-mode
languages.

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
Make comments in beginning of line possible to indent

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
Added notes about PSR-2 coding style in README

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
Restored handling of newlines and spaces at end of line for PSR-2

Updated tests to match whitespace displaying according to code style

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
Correct wrongly resolved merge conflict for "as"

Fix was merged in d117a47 but the test case for issue-178 still failed,
this commit makes all different uses for "as" behave properly.

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
Make php-mode work with Emacs 24.4

Fixed by conditionally loading the cl compatibility package at
compile-time. At the same time replaced the old usages of set-difference
with cl-set-difference, so it's clear that the require 'cl only serves
to work around this specific cc-mode bug.

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>