added BootableProviderInterface

src/Silex/Api/BootableProviderInterface.php

@@ -0,0 +1,31 @@
+<?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\Api;
+
+use Silex\Application;
+
+/**
+ * Interface that must implement all Silex service providers.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+interface BootableProviderInterface
+{
+    /**
+     * Bootstraps the application.
+     *
+     * This method is called after all services are registered
+     * and should be used for "dynamic" configuration (whenever
+     * a service must be requested).
+     */
+    public function boot(Application $app);
+}

src/Silex/Api/ServiceProviderInterface.php

@@ -29,13 +29,4 @@ interface ServiceProviderInterface
      * @param Application $app An Application instance
      */
     public function register(Application $app);
-
-    /**
-     * Bootstraps the application.
-     *
-     * This method is called after all services are registered
-     * and should be used for "dynamic" configuration (whenever
-     * a service must be requested).
-     */
-    public function boot(Application $app);
 }

src/Silex/Application.php

@@ -30,6 +30,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
+use Silex\Api\BootableProviderInterface;
 use Silex\Api\EventListenerProviderInterface;
 use Silex\Api\ControllerProviderInterface;
 use Silex\Api\ServiceProviderInterface;
@@ -189,7 +190,9 @@ public function boot()
                     $provider->subscribe($this, $this['dispatcher']);
                 }
 
-                $provider->boot($this);
+                if ($provider instanceof BootableProviderInterface) {
+                    $provider->boot($this);
+                }
             }
         }
     }

src/Silex/Provider/DoctrineServiceProvider.php

@@ -127,8 +127,4 @@ public function register(Application $app)
             return $dbs[$app['dbs.default']];
         });
     }
-
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/FormServiceProvider.php

@@ -103,8 +103,4 @@ public function register(Application $app)
             return new DefaultCsrfProvider($app['form.secret']);
         });
     }
-
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/HttpCacheServiceProvider.php

@@ -58,8 +58,4 @@ public function subscribe(Application $app, EventDispatcherInterface $dispatcher
     {
         $dispatcher->addSubscriber($app['http_cache.esi_listener']);
     }
-
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/HttpFragmentServiceProvider.php

@@ -82,8 +82,4 @@ public function subscribe(Application $app, EventDispatcherInterface $dispatcher
     {
         $dispatcher->addSubscriber($app['fragment.listener']);
     }
-
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/MonologServiceProvider.php

@@ -15,6 +15,7 @@
 use Monolog\Handler\StreamHandler;
 use Silex\Application;
 use Silex\Api\ServiceProviderInterface;
+use Silex\Api\BootableProviderInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -26,7 +27,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class MonologServiceProvider implements ServiceProviderInterface
+class MonologServiceProvider implements ServiceProviderInterface, BootableProviderInterface
 {
     public function register(Application $app)
     {

src/Silex/Provider/RememberMeServiceProvider.php

@@ -103,8 +103,4 @@ public function subscribe(Application $app, EventDispatcherInterface $dispatcher
     {
         $dispatcher->addSubscriber($app['security.remember_me.response_listener']);
     }
-
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/SecurityServiceProvider.php

@@ -12,6 +12,7 @@
 namespace Silex\Provider;
 
 use Silex\Application;
+use Silex\Api\BootableProviderInterface;
 use Silex\Api\ControllerProviderInterface;
 use Silex\Api\ServiceProviderInterface;
 use Silex\Api\EventListenerProviderInterface;
@@ -60,7 +61,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class SecurityServiceProvider implements ServiceProviderInterface, EventListenerProviderInterface, ControllerProviderInterface
+class SecurityServiceProvider implements ServiceProviderInterface, EventListenerProviderInterface, ControllerProviderInterface, BootableProviderInterface
 {
     protected $fakeRoutes;
 

src/Silex/Provider/SerializerServiceProvider.php

@@ -49,15 +49,4 @@ public function register(Application $app)
             return array(new CustomNormalizer(), new GetSetMethodNormalizer());
         });
     }
-
-    /**
-     * {@inheritDoc}
-     *
-     * This provider does not execute any code when booting.
-     *
-     * @param Silex\Application $app
-     */
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/ServiceControllerServiceProvider.php

@@ -23,9 +23,4 @@ public function register(Application $app)
             return new ServiceControllerResolver($resolver, $app['callback_resolver']);
         }));
     }
-
-    public function boot(Application $app)
-    {
-        // noop
-    }
 }

src/Silex/Provider/SessionServiceProvider.php

@@ -85,8 +85,4 @@ public function subscribe(Application $app, EventDispatcherInterface $dispatcher
             $app['dispatcher']->addSubscriber($app['session.listener.test']);
         }
     }
-
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/SwiftmailerServiceProvider.php

@@ -98,8 +98,4 @@ public function subscribe(Application $app, EventDispatcherInterface $dispatcher
             }
         });
     }
-
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/TranslationServiceProvider.php

@@ -53,8 +53,4 @@ public function register(Application $app)
         $app['translator.domains'] = array();
         $app['locale_fallbacks'] = array('en');
     }
-
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/TwigServiceProvider.php

@@ -106,8 +106,4 @@ public function register(Application $app)
             ));
         });
     }
-
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/UrlGeneratorServiceProvider.php

@@ -30,8 +30,4 @@ public function register(Application $app)
             return new UrlGenerator($app['routes'], $app['request_context']);
         });
     }
-
-    public function boot(Application $app)
-    {
-    }
 }

src/Silex/Provider/ValidatorServiceProvider.php

@@ -58,8 +58,4 @@ public function register(Application $app)
             return array();
         });
     }
-
-    public function boot(Application $app)
-    {
-    }
 }