removed the Symfony bridges provider as it is not needed anymore with Composer

doc/changelog.rst

@@ -3,6 +3,8 @@ Changelog
 
 This changelog references all backward incompatibilities as we introduce them:
 
+* **2012-05-26**: Removed ``SymfonyBridgesServiceProvider``
+
 * **2012-05-26**: Removed the ``translator.messages`` parameter (use
   ``translator.domains`` instead).
 

doc/providers/index.rst

@@ -8,7 +8,6 @@ Silex
     monolog
     session
     swiftmailer
-    symfony_bridges
     translation
     twig
     url_generator

doc/providers/symfony_bridges.rst

-SymfonyBridgesServiceProvider
-=============================
-
-The *SymfonyBridgesServiceProvider* provides additional integration between
-Symfony2 components and libraries.
-
-Parameters
-----------
-
-none
-
-Twig
-----
-
-When the ``SymfonyBridgesServiceProvider`` is enabled, the
-``TwigServiceProvider`` will provide you with the following additional
-capabilities:
-
-* **UrlGeneratorServiceProvider**: If you are using the
-  ``UrlGeneratorServiceProvider``, you will get ``path`` and ``url`` helpers
-  for Twig. You can find more information in the `Symfony2 Routing
-  documentation
-  <http://symfony.com/doc/current/book/routing.html#generating-urls-from-a-template>`_.
-
-* **TranslationServiceProvider**: If you are using the
-  ``TranslationServiceProvider``, you will get ``trans`` and ``transchoice``
-  helpers for translation in Twig templates. You can find more information in
-  the `Symfony2 Translation documentation
-  <http://symfony.com/doc/current/book/translation.html#twig-templates>`_.
-
-* **FormServiceProvider**: If you are using the ``FormServiceProvider``, you
-  will get a set of helpers for working with forms in templates. You can find
-  more information in the `Symfony2 Forms reference
-  <http://symfony.com/doc/current/reference/forms/twig_reference.html>`_.
-
-Registering
------------
-
-.. code-block:: php
-
-    $app->register(new Silex\Provider\SymfonyBridgesServiceProvider());
-
-.. note::
-
-    The Symfony bridges do not come with the ``silex.zip`, so you need to add
-    them as a dependency to your ``composer.json`` file:
-
-    .. code-block:: json
-
-        "require": {
-            "symfony/twig-bridge": "2.1.*",
-        }

doc/providers/twig.rst

@@ -53,6 +53,39 @@ Registering
             "twig/twig": ">=1.8,<2.0-dev"
         }
 
+Symfony2 Components Integration
+-------------------------------
+
+Symfony provides a Twig bridge that provides additional integration between
+some Symfony2 components and Twig. Add it as a dependency to your
+``composer.json`` file:
+
+.. code-block:: json
+
+    "require": {
+        "symfony/twig-bridge": "2.1.*",
+    }
+
+When present, the ``TwigServiceProvider`` will provide you with the following
+additional capabilities:
+
+* **UrlGeneratorServiceProvider**: If you are using the
+  ``UrlGeneratorServiceProvider``, you will have access to the ``path()`` and
+  ``url()`` functions. You can find more information in the `Symfony2 Routing
+  documentation
+  <http://symfony.com/doc/current/book/routing.html#generating-urls-from-a-template>`_.
+
+* **TranslationServiceProvider**: If you are using the
+  ``TranslationServiceProvider``, you will get the ``trans()`` and
+  ``transchoice()`` functions for translation in Twig templates. You can find
+  more information in the `Symfony2 Translation documentation
+  <http://symfony.com/doc/current/book/translation.html#twig-templates>`_.
+
+* **FormServiceProvider**: If you are using the ``FormServiceProvider``, you
+  will get a set of helpers for working with forms in templates. You can find
+  more information in the `Symfony2 Forms reference
+  <http://symfony.com/doc/current/reference/forms/twig_reference.html>`_.
+
 Usage
 -----
 

src/Silex/Provider/SymfonyBridgesServiceProvider.php

-<?php
-
-/*
- * This file is part of the Silex framework.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Silex\Provider;
-
-use Silex\Application;
-use Silex\ServiceProviderInterface;
-
-/**
- * Symfony bridges Provider.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class SymfonyBridgesServiceProvider implements ServiceProviderInterface
-{
-    public function register(Application $app)
-    {
-        $app['symfony_bridges'] = true;
-    }
-}

src/Silex/Provider/TwigServiceProvider.php

@@ -45,7 +45,7 @@ class TwigServiceProvider implements ServiceProviderInterface
                 $twig->addExtension(new \Twig_Extension_Debug());
             }
 
-            if (isset($app['symfony_bridges'])) {
+            if (class_exists('Symfony\Bridge\Twig\TwigEngine')) {
                 if (isset($app['url_generator'])) {
                     $twig->addExtension(new TwigRoutingExtension($app['url_generator']));
                 }