Updating composer
raise required PHP version to 5.3.3
merged branch Tobion/php-version (PR #327)

Commits
-------

e5f337f raise required PHP version to 5.3.3

Discussion
----------

raise required PHP version to 5.3.3

closes symfony/symfony#2985
fixes symfony/symfony#4176
raised the minimum version of PHP to 5.3.3
Allowed renaming of "app" directory without breaking requirements checking
updated vendors (closes #329)
merged branch jalliot/composer-upstream (PR #314)

Commits
-------

e3fea40 Updating composer

Discussion
----------

Updating composer

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

by fabpot at 2012-04-20T04:53:55Z

For some reasons, composer does not work after this PR (assert(): Assertion failed).

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

by jalliot at 2012-04-20T07:34:38Z

I had the same problems some times and fixed it by removing the `*` constraint and putting `doctrine/orm: 2.2.2` instead for instance but that's not a good option...
@Seldaek Do you know why such a problem?

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

by Seldaek at 2012-04-20T07:40:10Z

Well, I do know we have one (or more?) assert issue still - hopefully @naderman can check it out this weekend. Until this is fixed I would advise keeping the strict requires as before, it puts less stress on the solver.
updated vendors
merged branch jmfontaine/requirements-checking (PR #328)

Commits
-------

9d1e6de Allowed renaming of "app" directory without breaking requirements checking

Discussion
----------

Allow renaming of "app" directory without breaking requirements checking

Sometimes one need to have an application directory which name should not be "app". For example, there is already an "app" directory and an "api" or an "admin" directory is needed to store a wholly different, yet related,  application.

Requirements checking has "app/cache" and "app/logs" hard coded so it fails if the application directory is not "app".

I changed this to be dynamically retrieved so any application directory name will work now on.
Contributors: removed 2 links
merged branch gajdaw/contributors_fix (PR #332)

Commits
-------

9d0f663 Contributors: removed 2 links

Discussion
----------

Contributors: removed 2 links

There are three identical links on Welcome page:

    <li><a href="http://symfony.com/doc/current/contributing/index.html">Contributing</a></li>

Two of them are removed in this commit.
HTML fixes
merged branch gajdaw/contributors_fix (PR #333)

Commits
-------

494e3d9 HTML fixes

Discussion
----------

HTML fixes

Some HTML fixes (Demo page is XML valid).

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

by gajdaw at 2012-05-15T05:57:10Z

We can test XML conformance of the output with functional tests.

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

by fabpot at 2012-05-15T06:30:26Z

There is no need to test conformance. We are just talking about internal code here.

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

by gajdaw at 2012-05-15T06:42:50Z

Ok. I reverted the tests.

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

by gajdaw at 2012-05-15T06:50:25Z

@fabpot The Symfony is evolving. And from time to time it will probably happen that someone breaks
the validity of HTML. Using tests we can avoid it.

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

by fabpot at 2012-05-15T07:02:52Z

After making the last change, can you squash your commits so that I can merge this PR? Thanks.

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

by gajdaw at 2012-05-15T07:21:40Z

@fabpot Don't merge: one more typo.

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

by gajdaw at 2012-05-15T07:23:55Z

@fabpot Finished.
[app] In the console script, the Application::run() method now receives the already created ArgvInput $input object as its first argument.
merged branch hhamon/console_takes_input (PR #334)

Commits
-------

e3357a4 [app] In the console script, the Application::run() method now receives the already created ArgvInput $input object as its first argument.

Discussion
----------

Make the Application::run() method receive the already created $input object in app/console
[check] PHP bug #55156 might prevent annotations from working properly
merged branch vicb/php_doc (PR #338)

Commits
-------

6e23b7e [check] PHP bug #55156 might prevent annotations from working properly

Discussion
----------

[check] PHP bug #55156 might prevent annotations from working properly

see https://bugs.php.net/bug.php?id=55156
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Acme/DemoBundle/Controller/WelcomeController.php
	src/Acme/DemoBundle/Resources/public/css/demo.css
	src/Acme/DemoBundle/Resources/views/Demo/index.html.twig
	src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig
	src/Acme/DemoBundle/Resources/views/layout.html.twig