This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.
Go to file
Fabien Potencier 6ccaa65bb8 merged branch stloyd/feature/doctrine_versions (PR #6632)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #6632).

Commits
-------

a1c0ff5 Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version

Discussion
----------

Update `composer.json` files

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

by fabpot at 2013-01-09T17:55:54Z

When will Doctrine 2.4 be released? If not in the next couple of weeks, this PR cannot be merged as we need to ship Symfony 2.2 with a stable version of Doctrine.

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

by stof at 2013-01-09T18:13:59Z

@fabpot This allows to use Doctrine 2.4. It does not require to use 2.4. Actually, as Doctrine releases are BC, I would even vote for using ``~2.2`` as requirement

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

by fabpot at 2013-01-10T08:18:52Z

If the Doctrine is fine with `~2.2`, let's do that. @beberlei Can you confirm?

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

by stloyd at 2013-01-10T08:30:19Z

As Doctrine latest release is `2.3.2` maybe for Symfony `2.2` we should increase to `~2.3` not `~2.2` ?

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

by stof at 2013-01-10T09:15:00Z

@stloyd Why should we force using 2.3 when we don't require any of the 2.3 features ? Composer will use the most recent package matching the constraint anyway, so 2.2 will not be used unless someone forbids 2.3 in another package.

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

by stloyd at 2013-01-29T19:24:09Z

@fabpot ping
2013-02-01 10:33:54 +01:00
src/Symfony Update composer.json files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version 2013-02-01 10:33:53 +01:00
.editorconfig Add EditorConfig File 2012-06-16 14:08:15 +02:00
.gitignore ignore composer.phar 2012-04-20 14:10:06 +01:00
.travis.yml Merge branch '2.1' 2013-01-05 16:33:05 +01:00
autoload.php.dist [travis-ci] Zend Garbage Collection only for PHP5.4 2012-11-19 15:21:43 +01:00
CHANGELOG-2.0.md updated CHANGELOG for 2.0.22 2013-01-17 16:39:41 +01:00
CHANGELOG-2.1.md updated CHANGELOG for 2.1.7 2013-01-17 17:21:31 +01:00
composer.json Update composer.json files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version 2013-02-01 10:33:53 +01:00
CONTRIBUTING.md Making it easier to grab the PR template. 2012-12-15 21:57:27 +00:00
CONTRIBUTORS.md update CONTRIBUTORS for 2.0.22 2013-01-17 16:40:10 +01:00
LICENSE updated license year 2013-01-04 17:59:43 +01:00
phpunit.xml.dist [Locale] fixed tests 2012-12-05 14:13:56 +01:00
README.md Fix typos in README 2013-01-19 11:32:41 +01:00
UPGRADE-2.1.md Merge branch '2.1' 2012-11-29 11:32:45 +01:00
UPGRADE-2.2.md Updated UPGRADE-2.2.md for twig bridge section 2013-01-28 18:15:08 +01:00
UPGRADE-3.0.md [TwigBridge] added the render tag deprecation to the CHANGELOG for 3.0 2013-01-28 18:29:00 +01:00

README

What is Symfony2?

Symfony2 is a PHP 5.3 full-stack web framework. It is written with speed and flexibility in mind. It allows developers to build better and easy to maintain websites with PHP.

Symfony can be used to develop all kind of websites, from your personal blog to high traffic ones like Dailymotion or Yahoo! Answers.

Requirements

Symfony2 is only supported on PHP 5.3.3 and up.

Be warned that PHP versions before 5.3.8 are known to be buggy and might not work for you:

Installation

The best way to install Symfony2 is to download the Symfony Standard Edition available at http://symfony.com/download.

Documentation

The "Quick Tour" tutorial gives you a first feeling of the framework. If, like us, you think that Symfony2 can help speed up your development and take the quality of your work to the next level, read the official Symfony2 documentation.

Contributing

Symfony2 is an open source, community-driven project. If you'd like to contribute, please read the Contributing Code part of the documentation. If you're submitting a pull request, please follow the guidelines in the Submitting a Patch section and use Pull Request Template.

Running Symfony2 Tests

Information on how to run the Symfony2 test suite can be found in the Running Symfony2 Tests section.