merged branch igorw/require-dev2 (PR #340)

Commits ------- 5772e556 Mention Finder and Process in changelog also ed3178ba Add note to changelog, improve symfony_bridges changelog entry 1f30a648 Move some dependencies to require-dev and suggest Discussion ---------- Move some dependencies to require-dev and suggest * BrowserKit, CssSelector and DomCrawler are only needed for functional tests This should be an optional dependency. * Process and Finder are only used to build the phar, they are dev dependencies. PS: Thanks to @weaverryan for pointing it out! --------------------------------------------------------------------------- by fabpot at 2012-05-31T14:03:34Z That should be documented in the changelog as this is a BC break. --------------------------------------------------------------------------- by igorw at 2012-05-31T14:12:22Z Done. --------------------------------------------------------------------------- by igorw at 2012-05-31T14:57:49Z BTW: Keeping browserkit and friends for the phar was intentional.

merged branch igorw/require-dev2 (PR #340)
Commits ------- 5772e556 Mention Finder and Process in changelog also ed3178ba Add note to changelog, improve symfony_bridges changelog entry 1f30a648 Move some dependencies to require-dev and suggest Discussion ---------- Move some dependencies to require-dev and suggest * BrowserKit, CssSelector and DomCrawler are only needed for functional tests This should be an optional dependency. * Process and Finder are only used to build the phar, they are dev dependencies. PS: Thanks to @weaverryan for pointing it out! --------------------------------------------------------------------------- by fabpot at 2012-05-31T14:03:34Z That should be documented in the changelog as this is a BC break. --------------------------------------------------------------------------- by igorw at 2012-05-31T14:12:22Z Done. --------------------------------------------------------------------------- by igorw at 2012-05-31T14:57:49Z BTW: Keeping browserkit and friends for the phar was intentional.
49f46333 · Fabien Potencier · 1f90112b · 5772e556 · 49f46333 · 49f46333
Commit 49f46333 authored May 31, 2012 by Fabien Potencier
Hide whitespace changes
Inline Side-by-side

Showing with 162 additions and 32 deletions

composer.json composer.json +11 -7

composer.lock composer.lock +143 -23

doc/changelog.rst doc/changelog.rst +8 -2

No files found.
--- a/composer.json
+++ b/composer.json
@@ -17,27 +17,31 @@
    "require": {
        "php": ">=5.3.3",
        "pimple/pimple": "1.*",
-        "symfony/browser-kit": "2.1.*",
-        "symfony/css-selector": "2.1.*",
-        "symfony/dom-crawler": "2.1.*",
        "symfony/event-dispatcher": "2.1.*",
        "symfony/http-foundation": "2.1.*",
        "symfony/http-kernel": "2.1.*",
-        "symfony/routing": "2.1.*",
+        "symfony/routing": "2.1.*"
-        "symfony/process": "2.1.*",
-        "symfony/finder": "2.1.*"
    },
    "require-dev": {
        "symfony/form": "2.1.*",
        "monolog/monolog": ">=1.0.0",
+        "symfony/browser-kit": "2.1.*",
+        "symfony/css-selector": "2.1.*",
+        "symfony/finder": "2.1.*",
+        "symfony/monolog-bridge": "2.1.*",
+        "symfony/process": "2.1.*",
        "symfony/translation": "2.1.*",
        "symfony/twig-bridge": "2.1.*",
-        "symfony/monolog-bridge": "2.1.*",
        "symfony/validator": "2.1.*",
        "twig/twig": ">=1.2.0",
        "doctrine/dbal": "2.1.*",
        "swiftmailer/swiftmailer": "4.1.*"
    },
+    "suggest": {
+        "symfony/browser-kit": "2.1.*",
+        "symfony/css-selector": "2.1.*",
+        "symfony/dom-crawler": "2.1.*"
+    },
    "autoload": {
        "psr-0": { "Silex": "src/" }
    },

--- a/composer.lock
+++ b/composer.lock
 {
-    "hash": "f7193a3cd703d32a4f245ce9c03c3a7f",
+    "hash": "2159a9aea3c462e2837553e85846d0ac",
    "packages": [
        {
            "package": "pimple/pimple",
@@ -13,9 +13,92 @@
            "source-reference": "v1.0.0"
        },
        {
-            "package": "symfony/browser-kit",
+            "package": "symfony/event-dispatcher",
            "version": "dev-master",
-            "source-reference": "6d1864547be92e51972a416fae9460b8be4afe0e"
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/event-dispatcher",
+            "version": "dev-master",
+            "source-reference": "30d3f5da80c2aeab15bcdb5a7d448d15bc294b23"
+        },
+        {
+            "package": "symfony/http-foundation",
+            "version": "dev-master",
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/http-foundation",
+            "version": "dev-master",
+            "source-reference": "d9ef2afd0218415a8c04ea48a2c83bb5b8f0f51c"
+        },
+        {
+            "package": "symfony/http-kernel",
+            "version": "dev-master",
+            "source-reference": "a9dbd268659d19eabcc8285ca4622b232f55aa91"
+        },
+        {
+            "package": "symfony/http-kernel",
+            "version": "dev-master",
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/options-resolver",
+            "version": "dev-master",
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/options-resolver",
+            "version": "dev-master",
+            "source-reference": "addf0f914af769838e2c4ada01ceb3e16d62bf83"
+        },
+        {
+            "package": "symfony/routing",
+            "version": "dev-master",
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/routing",
+            "version": "dev-master",
+            "source-reference": "1d5a64f26588d63e3a1235a6ade0d54ae4ab3381"
+        }
+    ],
+    "packages-dev": [
+        {
+            "package": "doctrine/common",
+            "version": "dev-master",
+            "source-reference": "25e7b91a41dda2adfff529a814a4f9f90a30fa62"
+        },
+        {
+            "package": "doctrine/common",
+            "version": "dev-master",
+            "alias-pretty-version": "2.3.x-dev",
+            "alias-version": "2.3.9999999.9999999-dev"
+        },
+        {
+            "package": "doctrine/dbal",
+            "version": "2.1.x-dev",
+            "source-reference": "76799960a54af583e82bedcf246e8c9c18006e94"
+        },
+        {
+            "package": "monolog/monolog",
+            "version": "1.1.0"
+        },
+        {
+            "package": "swiftmailer/swiftmailer",
+            "version": "dev-master",
+            "alias-pretty-version": "4.1.x-dev",
+            "alias-version": "4.1.9999999.9999999-dev"
+        },
+        {
+            "package": "swiftmailer/swiftmailer",
+            "version": "dev-master",
+            "source-reference": "d33d54cc8a081b0b85734744936ede1ba230dd64"
        },
        {
            "package": "symfony/browser-kit",
@@ -24,9 +107,9 @@
            "alias-version": "2.1.9999999.9999999-dev"
        },
        {
-            "package": "symfony/css-selector",
+            "package": "symfony/browser-kit",
            "version": "dev-master",
-            "source-reference": "d0a98b37fbb57188766fd7c7d757354397ee6ead"
+            "source-reference": "6d1864547be92e51972a416fae9460b8be4afe0e"
        },
        {
            "package": "symfony/css-selector",
@@ -34,6 +117,11 @@
            "alias-pretty-version": "2.1.x-dev",
            "alias-version": "2.1.9999999.9999999-dev"
        },
+        {
+            "package": "symfony/css-selector",
+            "version": "dev-master",
+            "source-reference": "d0a98b37fbb57188766fd7c7d757354397ee6ead"
+        },
        {
            "package": "symfony/dom-crawler",
            "version": "dev-master",
@@ -46,48 +134,48 @@
            "source-reference": "2e27527036c4cd608692718414835173c40f52bd"
        },
        {
-            "package": "symfony/event-dispatcher",
+            "package": "symfony/finder",
            "version": "dev-master",
            "alias-pretty-version": "2.1.x-dev",
            "alias-version": "2.1.9999999.9999999-dev"
        },
        {
-            "package": "symfony/event-dispatcher",
+            "package": "symfony/finder",
            "version": "dev-master",
-            "source-reference": "30d3f5da80c2aeab15bcdb5a7d448d15bc294b23"
+            "source-reference": "9ee9a907afeef52956187e862714a7702ca26590"
        },
        {
-            "package": "symfony/finder",
+            "package": "symfony/form",
            "version": "dev-master",
-            "source-reference": "9ee9a907afeef52956187e862714a7702ca26590"
+            "source-reference": "96755781bf3859c2fe4551dc8bce8a8ab3935321"
        },
        {
-            "package": "symfony/finder",
+            "package": "symfony/form",
            "version": "dev-master",
            "alias-pretty-version": "2.1.x-dev",
            "alias-version": "2.1.9999999.9999999-dev"
        },
        {
-            "package": "symfony/http-foundation",
+            "package": "symfony/locale",
            "version": "dev-master",
-            "source-reference": "d9ef2afd0218415a8c04ea48a2c83bb5b8f0f51c"
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
        },
        {
-            "package": "symfony/http-foundation",
+            "package": "symfony/locale",
            "version": "dev-master",
-            "alias-pretty-version": "2.1.x-dev",
+            "source-reference": "57539eb3caacf17c883a5fbe1bfdc7a98dedc854"
-            "alias-version": "2.1.9999999.9999999-dev"
        },
        {
-            "package": "symfony/http-kernel",
+            "package": "symfony/monolog-bridge",
            "version": "dev-master",
            "alias-pretty-version": "2.1.x-dev",
            "alias-version": "2.1.9999999.9999999-dev"
        },
        {
-            "package": "symfony/http-kernel",
+            "package": "symfony/monolog-bridge",
            "version": "dev-master",
-            "source-reference": "a9dbd268659d19eabcc8285ca4622b232f55aa91"
+            "source-reference": "ee24f08e2e74ee964018ce9d5de2a37977f6ec6b"
        },
        {
            "package": "symfony/process",
@@ -101,18 +189,50 @@
            "source-reference": "f4f101fc7c1adb8b157058dcc1715f28f1d53208"
        },
        {
-            "package": "symfony/routing",
+            "package": "symfony/translation",
+            "version": "dev-master",
+            "source-reference": "db3e85934353a130d743b2ddd53dd678c8ebca12"
+        },
+        {
+            "package": "symfony/translation",
            "version": "dev-master",
            "alias-pretty-version": "2.1.x-dev",
            "alias-version": "2.1.9999999.9999999-dev"
        },
        {
-            "package": "symfony/routing",
+            "package": "symfony/twig-bridge",
            "version": "dev-master",
-            "source-reference": "1d5a64f26588d63e3a1235a6ade0d54ae4ab3381"
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/twig-bridge",
+            "version": "dev-master",
+            "source-reference": "416d3fa67b10e4076dbabc094f354ca14c9f9d26"
+        },
+        {
+            "package": "symfony/validator",
+            "version": "dev-master",
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/validator",
+            "version": "dev-master",
+            "source-reference": "9c89324845ccc24214f7fd307b9dc646d41a0a6f"
+        },
+        {
+            "package": "twig/twig",
+            "version": "dev-master",
+            "alias-pretty-version": "1.8.x-dev",
+            "alias-version": "1.8.9999999.9999999-dev"
+        },
+        {
+            "package": "twig/twig",
+            "version": "dev-master",
+            "source-reference": "6d072640c44f1781049afd2d96060c72da80662a"
        }
    ],
-    "packages-dev": null,
    "aliases": [
    ],

--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -3,9 +3,15 @@ Changelog
 This changelog references all backward incompatibilities as we introduce them:
-* **2012-05-26**: added ``boot()`` to ``ServiceProviderInterface``
+* **2012-05-31**: Made the ``BrowserKit``, ``CssSelector``, ``DomCrawler``,
+  ``Finder`` and ``Process`` components optional dependencies. Projects that
+  depend on them (e.g. through functional tests) should add those dependencies
+  to the ``require-dev`` section of their ``composer.json``.
-* **2012-05-26**: Removed ``SymfonyBridgesServiceProvider``
+* **2012-05-26**: added ``boot()`` to ``ServiceProviderInterface``.
+* **2012-05-26**: Removed ``SymfonyBridgesServiceProvider``. It is now implicit
+  by checking the existence of the bridge.
 * **2012-05-26**: Removed the ``translator.messages`` parameter (use
  ``translator.domains`` instead).