added the ServiceProviderInterface::boot() method

doc/changelog.rst

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

src/Silex/Application.php

@@ -48,6 +48,9 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
 {
     const VERSION = '@package_version@';
 
+    private $providers = array();
+    private $booted = false;
+
     /**
      * Constructor.
      */
@@ -147,9 +150,22 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
             $this[$key] = $value;
         }
 
+        $this->providers[] = $provider;
+
         $provider->register($this);
     }
 
+    public function boot()
+    {
+        if (!$this->booted) {
+            foreach ($this->providers as $provider) {
+                $provider->boot($this);
+            }
+
+            $this->booted = true;
+        }
+    }
+
     /**
      * Maps a pattern to a callable.
      *
@@ -439,6 +455,10 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
      */
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
+        if (!$this->booted) {
+            $this->boot();
+        }
+
         $this->beforeDispatched = false;
 
         $current = HttpKernelInterface::SUB_REQUEST === $type ? $this['request'] : $this['request_error'];

src/Silex/Provider/DoctrineServiceProvider.php

@@ -119,4 +119,8 @@ class DoctrineServiceProvider implements ServiceProviderInterface
             return $dbs[$app['dbs.default']];
         });
     }
+
+    public function boot(Application $app)
+    {
+    }
 }

src/Silex/Provider/FormServiceProvider.php

@@ -52,4 +52,8 @@ class FormServiceProvider implements ServiceProviderInterface
             return new DefaultCsrfProvider($app['form.secret']);
         });
     }
+
+    public function boot(Application $app)
+    {
+    }
 }

src/Silex/Provider/HttpCacheServiceProvider.php

@@ -42,4 +42,8 @@ class HttpCacheServiceProvider implements ServiceProviderInterface
             $app['http_cache.options'] = array();
         }
     }
+
+    public function boot(Application $app)
+    {
+    }
 }

src/Silex/Provider/MonologServiceProvider.php

@@ -50,7 +50,10 @@ class MonologServiceProvider implements ServiceProviderInterface
                 return Logger::DEBUG;
             };
         }
+    }
 
+    public function boot(Application $app)
+    {
         $app->before(function (Request $request) use ($app) {
             $app['monolog']->addInfo('> '.$request->getMethod().' '.$request->getRequestUri());
         });

src/Silex/Provider/SessionServiceProvider.php

@@ -49,8 +49,6 @@ class SessionServiceProvider implements ServiceProviderInterface
             );
         });
 
-        $app['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'onKernelRequest'), 128);
-
         if (!isset($app['session.storage.options'])) {
             $app['session.storage.options'] = array();
         }
@@ -70,4 +68,9 @@ class SessionServiceProvider implements ServiceProviderInterface
             $request->getSession()->start();
         }
     }
+
+    public function boot(Application $app)
+    {
+        $app['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'onKernelRequest'), 128);
+    }
 }

src/Silex/Provider/SwiftmailerServiceProvider.php

@@ -76,14 +76,17 @@ class SwiftmailerServiceProvider implements ServiceProviderInterface
             return new \Swift_Events_SimpleEventDispatcher();
         });
 
-        $app->finish(function () use ($app) {
-            $app['swiftmailer.spooltransport']->getSpool()->flushQueue($app['swiftmailer.transport']);
-        });
-
         if (isset($app['swiftmailer.class_path'])) {
             require_once $app['swiftmailer.class_path'].'/Swift.php';
 
             \Swift::registerAutoload($app['swiftmailer.class_path'].'/../swift_init.php');
         }
     }
+
+    public function boot(Application $app)
+    {
+        $app->finish(function () use ($app) {
+            $app['swiftmailer.spooltransport']->getSpool()->flushQueue($app['swiftmailer.transport']);
+        });
+    }
 }

src/Silex/Provider/TranslationServiceProvider.php

@@ -53,4 +53,8 @@ class TranslationServiceProvider implements ServiceProviderInterface
             return new MessageSelector();
         });
     }
+
+    public function boot(Application $app)
+    {
+    }
 }

src/Silex/Provider/TwigServiceProvider.php

@@ -90,4 +90,8 @@ class TwigServiceProvider implements ServiceProviderInterface
             ));
         });
     }
+
+    public function boot(Application $app)
+    {
+    }
 }

src/Silex/Provider/UrlGeneratorServiceProvider.php

@@ -31,4 +31,8 @@ class UrlGeneratorServiceProvider implements ServiceProviderInterface
             return new UrlGenerator($app['routes'], $app['request_context']);
         });
     }
+
+    public function boot(Application $app)
+    {
+    }
 }

src/Silex/Provider/ValidatorServiceProvider.php

@@ -43,4 +43,8 @@ class ValidatorServiceProvider implements ServiceProviderInterface
             return new ConstraintValidatorFactory();
         });
     }
+
+    public function boot(Application $app)
+    {
+    }
 }

src/Silex/ServiceProviderInterface.php

@@ -21,7 +21,19 @@ interface ServiceProviderInterface
     /**
      * Registers services on the given app.
      *
+     * This method should only be used to configure services and parameters.
+     * It should not get services.
+     *
      * @param Application $app An Application instance
      */
     function register(Application $app);
+
+    /**
+     * Bootstraps the application.
+     *
+     * This method is called after all services are registers
+     * and should be used for "dynamic" configuration (whenever
+     * a service must be requested).
+     */
+    function boot(Application $app);
 }