fixed regex (closes #70)
abstract methods don't have bodies
Added tests for ReturnStatementsFixer.
Implemented include fixer.
Include fixer v2.
Fixed return; case.
merged branch umpirsky/return-statement-test (PR #77)

Commits
-------

7882ad9 Fixed return; case.
11fac52 Added tests for ReturnStatementsFixer.

Discussion
----------

Added tests for ReturnStatementsFixer.

This should also fix cases described in https://github.com/fabpot/PHP-CS-Fixer/issues/76

---------------------------------------------------------------------------

by ooflorent at 2012-06-07T08:55:29Z

Is `return;` still working ?
Perhaps you could use `\b`

---------------------------------------------------------------------------

by umpirsky at 2012-06-07T09:02:47Z

@ooflorent Fixed, thanks!
merged branch umpirsky/include-fixer (PR #64)

Commits
-------

d14d115 Include fixer v2.
edd500a Implemented include fixer.

Discussion
----------

Include fixer

At first, I wanted to implement removing outer braces for all cases, but it turned out that there are too many cases and dealing with recursive regex would lead to unnecessary complexity and would probably be slower. So I implemented simplified version. It will also replace double with single quotes and fix spacing.

Some examples:

1. `include   "foo.php"` => `include 'foo.php'`
2. `include (  "Buzz/foo-Bar.php" )` => `include 'Buzz/foo-Bar.php'`
3. `require_once  (__DIR__.('foo.php'))` => `require_once (__DIR__.('foo.php'))`

For cases like 3. it only fix white spaces between include and path leaving brackets as they are.

This should fix issue [#47](https://github.com/fabpot/PHP-CS-Fixer/issues/47).

---------------------------------------------------------------------------

by umpirsky at 2012-06-07T06:51:16Z

Any reason not to merge this?

Ping @fabpot.

---------------------------------------------------------------------------

by stof at 2012-06-07T07:48:01Z

@umpirsky the main reason is probably the organization of the Symfony Live :)

---------------------------------------------------------------------------

by umpirsky at 2012-06-07T07:50:36Z

Yeah, I had that in mind. But I guess it's not only @fabpot who can merge?

---------------------------------------------------------------------------

by stof at 2012-06-07T08:52:02Z

it is.
merged branch kriswallsmith/abstract-bodies (PR #75)

Commits
-------

d05ed94 abstract methods don't have bodies

Discussion
----------

abstract methods don't have bodies
merged branch stephpy/selfupdate (PR #71)

Commits
-------

c52116e Add selfupdate command

Discussion
----------

Selfupdate command

I think this command can be useful, i get the same command as composer without the verification of actual version.

Actually we are not able to know what's the version of PHP-CS-FIXER currently installed.

So i copy the remote php-cs-fixer.phar on local each time user launch the command.

---------------------------------------------------------------------------

by sstok at 2012-05-31T14:08:50Z

+1

---------------------------------------------------------------------------

by stof at 2012-05-31T16:25:42Z

@stephpy you should rebase your branch to get rid of these duplicated commits

---------------------------------------------------------------------------

by stephpy at 2012-05-31T16:28:10Z

Right @stof, i'll do it soon.

---------------------------------------------------------------------------

by stof at 2012-05-31T16:28:41Z

And you should keep an author annotation mentioning the original author. This code is clearly copied from Composer.

---------------------------------------------------------------------------

by stephpy at 2012-05-31T16:35:31Z

> And you should keep an author annotation mentioning the original author. This code is clearly copied from Composer.

Yep, sorry :\

---------------------------------------------------------------------------

by stof at 2012-05-31T16:42:26Z

when you rebase your branch, you need to force the push, otherwise, you simply add more merge commits. And you should rebase on top of ``upstream/master`` (or whatever nae you choose for the upstream remote repo), not on top of your local ``master`` as it may also contain the messy merge commits

---------------------------------------------------------------------------

by stephpy at 2012-05-31T16:46:57Z

Thanks very much @stof ;)
added the shebang for the phar