Commit d4885d9b authored by Fabien Potencier's avatar Fabien Potencier

Merge branch '1.2' into 1.3

* 1.2:
  Fix README doc about running unit tests
parents b99bf4ba 0161e781
......@@ -39,12 +39,12 @@ Read the `documentation`_ for more information.
Tests
-----
To run the test suite, you need `Composer`_:
To run the test suite, you need `Composer`_ and `PHPUnit`_:
.. code-block:: bash
$ php composer.phar install --dev
$ vendor/bin/phpunit
$ composer install
$ phpunit
Community
---------
......@@ -58,5 +58,6 @@ Silex is licensed under the MIT license.
.. _Symfony2 components: http://symfony.com
.. _Composer: http://getcomposer.org
.. _PHPUnit: https://phpunit.de
.. _silex.zip: http://silex.sensiolabs.org/download
.. _documentation: http://silex.sensiolabs.org/documentation
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment