merged branch igorw/require-dev (PR #306)

Commits
-------

560f93a1 Use the composer require-dev key for dev dependencies

Discussion
----------

Use the composer require-dev key for dev dependencies

README.md

@@ -29,6 +29,14 @@ and you're done!
 
 Read the [documentation][3] for more information.
 
+## Tests
+
+To run the test suite, you need [composer](http://getcomposer.org) and
+[PHPUnit](https://github.com/sebastianbergmann/phpunit).
+
+    $ php composer.phar install --dev
+    $ phpunit
+
 ## License
 
 Silex is licensed under the MIT license.

composer.json

@@ -28,13 +28,14 @@
         "symfony/process": "2.1.*",
         "symfony/finder": "2.1.*"
     },
-    "suggest": {
+    "require-dev": {
         "symfony/form": "2.1.*",
         "monolog/monolog": ">=1.0.0",
         "symfony/translation": "2.1.*",
         "symfony/twig-bridge": "2.1.*",
         "symfony/validator": "2.1.*",
-        "twig/twig": ">=1.2.0"
+        "twig/twig": ">=1.2.0",
+        "doctrine/dbal": "2.1.*"
     },
     "autoload": {
         "psr-0": { "Silex": "src/" }

composer.lock

 {
-    "hash": "fe5aa65692e9cdbe9bbc18a5a3ec82fa",
+    "hash": "a586259aaee544b9010df4bc93aa9858",
     "packages": [
         {
             "package": "pimple/pimple",
             "version": "dev-master",
-            "source-reference": "321db91e49b6cf8cbeed58d8db662d40de96d2c3"
+            "source-reference": "4e5fc6a6d58a7d9ad1d1974726edc360d28b70ab"
         },
         {
             "package": "symfony/browser-kit",
             "version": "dev-master",
-            "source-reference": "9460a0de24a8eb632277da7273e4a8799e87cf68"
+            "source-reference": "f91ab705dc8f4fdfdc5baad0082a1263d77e147e",
+            "alias": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/class-loader",
             "version": "dev-master",
-            "source-reference": "edda8afab03e73aaddba4cf925ef07942e608f48"
+            "source-reference": "cd1550a4a6c0794b6b109af2db43fde6e18ee363",
+            "alias": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/css-selector",
             "version": "dev-master",
-            "source-reference": "615d450be946a0573b3d7d62cf8dacf63e16eff5"
+            "source-reference": "dd695aadd80d8e6e726a7a050535c04325cefa02",
+            "alias": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/dom-crawler",
             "version": "dev-master",
-            "source-reference": "0186d8495c90277d9a8cfb6fb47d5095b5d07048"
+            "source-reference": "9b4694da9a1239771468096c574d8309992a8454",
+            "alias": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/event-dispatcher",
             "version": "dev-master",
-            "source-reference": "01fc2ae0147b4f78779956db5b373bce59917c55"
+            "source-reference": "07e1d0174f3a0ec36bbe04b3850270df7a86271d",
+            "alias": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/finder",
             "version": "dev-master",
-            "source-reference": "713ba1dbd03b424afd1f944626dc0ce1b5b8c442"
+            "source-reference": "57ec7198a70e6c40e450ba66cc2f8ecab98746c8",
+            "alias": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/http-foundation",
             "version": "dev-master",
-            "source-reference": "6ba6f8bd8a27fe370cba501fd41429ceead119df"
+            "source-reference": "b9aceabb83f3d03fe451cdd867d987e863e7a25e",
+            "alias": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/http-kernel",
             "version": "dev-master",
-            "source-reference": "05463806bf87b80b54bf2a6fcc8a1934a7260304"
+            "source-reference": "2048aa455abe5ca6089fab93fcb787742beb7e49",
+            "alias": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/process",
             "version": "dev-master",
-            "source-reference": "05d2c2b0372a616b1e9adaf90fd6c547c60b5d58"
+            "source-reference": "2e4da8c8076744bafed97451bb1574c96cda0e68",
+            "alias": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/routing",
             "version": "dev-master",
-            "source-reference": "584d4b195eef8dac7fd3fb4515bb5c5c1e1cf803"
+            "source-reference": "0811d83da31aacfe32a580b5db4287cae8f3d5a9",
+            "alias": "2.1.9999999.9999999-dev"
+        }
+    ],
+    "packages-dev": [
+        {
+            "package": "doctrine/common",
+            "version": "2.2.x-dev",
+            "source-reference": "1e0aa60d109c630d19543d999f12e2852ef8f932"
+        },
+        {
+            "package": "doctrine/dbal",
+            "version": "2.1.x-dev",
+            "source-reference": "9d3625eeb1f7c840d3897d8961e977b554276a1d"
+        },
+        {
+            "package": "monolog/monolog",
+            "version": "dev-master",
+            "source-reference": "6c15897ac74bd53572328094eacf03fbb7b8bca7"
+        },
+        {
+            "package": "symfony/form",
+            "version": "dev-master",
+            "source-reference": "8cdce8f12c9e223550d83cc8a8d420fbd7eb8055",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/locale",
+            "version": "dev-master",
+            "source-reference": "d84707d17c196e640019a8413f0764da46089a2d",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/translation",
+            "version": "dev-master",
+            "source-reference": "996c638a7bc7427290c140bec1fab62a0db1044c",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/twig-bridge",
+            "version": "dev-master",
+            "source-reference": "b1301ae3412dba8d40074c1b72adfa1b55babbcd",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/validator",
+            "version": "dev-master",
+            "source-reference": "ce994a5616b20f6ebf37d66a1a89bdd3af6b4ea2",
+            "alias": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "twig/twig",
+            "version": "dev-master",
+            "source-reference": "5799a889c03e38a2c6d0b475194ab8c0b8904487",
+            "alias": "1.7.9999999.9999999-dev"
         }
     ],
     "aliases": []

tests/Silex/Tests/Provider/DoctrineServiceProviderTest.php

@@ -23,7 +23,7 @@ class DoctrineServiceProviderTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        if (!is_dir(__DIR__.'/../../../../vendor/doctrine-common/lib') || !is_dir(__DIR__.'/../../../../vendor/doctrine-dbal/lib')) {
+        if (!is_dir(__DIR__.'/../../../../vendor/doctrine/common/lib') || !is_dir(__DIR__.'/../../../../vendor/doctrine/dbal/lib')) {
             $this->markTestSkipped('Doctrine Common/DBAL submodules were not installed.');
         }
     }
@@ -31,10 +31,7 @@ class DoctrineServiceProviderTest extends \PHPUnit_Framework_TestCase
     public function testOptionsInitializer()
     {
         $app = new Application();
-        $app->register(new DoctrineServiceProvider(), array(
-            'db.common.class_path' => __DIR__.'/../../../../vendor/doctrine-common/lib',
-            'db.dbal.class_path' => __DIR__.'/../../../../vendor/doctrine-dbal/lib',
-        ));
+        $app->register(new DoctrineServiceProvider());
 
         $this->assertEquals($app['db.default_options'], $app['db']->getParams());
     }
@@ -43,9 +40,6 @@ class DoctrineServiceProviderTest extends \PHPUnit_Framework_TestCase
     {
         $app = new Application();
         $app->register(new DoctrineServiceProvider(), array(
-            'db.common.class_path' => __DIR__.'/../../../../vendor/doctrine-common/lib',
-            'db.dbal.class_path' => __DIR__.'/../../../../vendor/doctrine-dbal/lib',
-
             'db.options' => array('driver' => 'pdo_sqlite', 'memory' => true),
         ));
 
@@ -63,9 +57,6 @@ class DoctrineServiceProviderTest extends \PHPUnit_Framework_TestCase
     {
         $app = new Application();
         $app->register(new DoctrineServiceProvider(), array(
-            'db.common.class_path' => __DIR__.'/../../../../vendor/doctrine-common/lib',
-            'db.dbal.class_path' => __DIR__.'/../../../../vendor/doctrine-dbal/lib',
-
             'dbs.options' => array(
                 'sqlite1' => array('driver' => 'pdo_sqlite', 'memory' => true),
                 'sqlite2' => array('driver' => 'pdo_sqlite', 'path' => sys_get_temp_dir().'/silex'),

tests/Silex/Tests/Provider/MonologServiceProviderTest.php

@@ -27,7 +27,7 @@ class MonologServiceProviderTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        if (!is_dir(__DIR__.'/../../../../vendor/monolog/src')) {
+        if (!is_dir(__DIR__.'/../../../../vendor/monolog/monolog/src')) {
             $this->markTestSkipped('Monolog submodule was not installed.');
         }
     }
@@ -36,9 +36,7 @@ class MonologServiceProviderTest extends \PHPUnit_Framework_TestCase
     {
         $app = new Application();
 
-        $app->register(new MonologServiceProvider(), array(
-            'monolog.class_path'    => __DIR__.'/../../../../vendor/monolog/src',
-        ));
+        $app->register(new MonologServiceProvider());
 
         $app['monolog.handler'] = $app->share(function () use ($app) {
             return new TestHandler($app['monolog.level']);

tests/Silex/Tests/Provider/TwigServiceProviderTest.php

@@ -25,7 +25,7 @@ class TwigServiceProviderTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        if (!is_dir(__DIR__.'/../../../../vendor/twig/lib')) {
+        if (!is_dir(__DIR__.'/../../../../vendor/twig/twig/lib')) {
             $this->markTestSkipped('Twig submodule was not installed.');
         }
     }
@@ -36,7 +36,6 @@ class TwigServiceProviderTest extends \PHPUnit_Framework_TestCase
 
         $app->register(new TwigServiceProvider(), array(
             'twig.templates'    => array('hello' => 'Hello {{ name }}!'),
-            'twig.class_path'   => __DIR__.'/../../../../vendor/twig/lib',
         ));
 
         $app->get('/hello/{name}', function ($name) use ($app) {
@@ -57,7 +56,6 @@ class TwigServiceProviderTest extends \PHPUnit_Framework_TestCase
                 'hello' => '{{ render("/foo") }}',
                 'foo'   => 'foo',
             ),
-            'twig.class_path'   => __DIR__.'/../../../../vendor/twig/lib',
         ));
 
         $app->get('/hello', function () use ($app) {

tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php

@@ -23,7 +23,7 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        if (!is_dir(__DIR__.'/../../../../vendor/Symfony/Component/Validator')) {
+        if (!is_dir(__DIR__.'/../../../../vendor/symfony/validator')) {
             $this->markTestSkipped('Validator submodule was not installed.');
         }
     }
@@ -32,9 +32,7 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
     {
         $app = new Application();
 
-        $app->register(new ValidatorServiceProvider(), array(
-            'validator.class_path' =>  __DIR__.'/../../../../vendor/Symfony/Component/Validator'
-        ));
+        $app->register(new ValidatorServiceProvider());
 
         return $app;
     }