[mount] refactor mounting to not expose an __invoke method

src/Silex/Application.php

@@ -215,7 +215,7 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
     {
         $this['dispatcher']->addListener(Events::onSilexError, function(GetResponseForErrorEvent $event) use ($callback) {
             $exception = $event->getException();
-            $result = $callback->__invoke($exception);
+            $result = $callback($exception);
 
             if (null !== $result) {
                 $event->setStringResponse($result);
@@ -263,10 +263,22 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
      */
     public function mount($prefix, $app)
     {
+        $mountHandler = function (Request $request, $prefix) use ($app) {
+            if (is_callable($app)) {
+                $app = $app();
+            }
+
+            foreach ($app['controllers']->all() as $controller) {
+                $controller->getRoute()->setPattern(rtrim($prefix, '/').$controller->getRoute()->getPattern());
+            }
+
+            return $app->handle($request);
+        };
+
         $prefix = rtrim($prefix, '/');
 
         $this
-            ->match($prefix.'/{path}', $app)
+            ->match($prefix.'/{path}', $mountHandler)
             ->assert('path', '.*')
             ->value('prefix', $prefix);
     }
@@ -290,21 +302,6 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
         return $this['kernel']->handle($request, $type, $catch);
     }
 
-    /**
-     * Handles a Request when this application has been mounted under a prefix.
-     *
-     * @param Request $request A Request instance
-     * @param string  $path    The path info (without the prefix)
-     */
-    public function __invoke(Request $request, $prefix)
-    {
-        foreach ($this['controllers']->all() as $controller) {
-            $controller->getRoute()->setPattern(rtrim($prefix, '/').$controller->getRoute()->getPattern());
-        }
-
-        return $this->handle($request);
-    }
-
     /**
      * Handles onCoreRequest events.
      */

src/Silex/LazyApplication.php

@@ -37,17 +37,14 @@ class LazyApplication
     }
 
     /**
-     * Handles a Request when this application has been mounted under a prefix.
-     *
-     * @param Request $request A Request instance
-     * @param string  $path    The path info (without the prefix)
+     * Returns the application.
      */
-    public function __invoke(Request $request, $prefix)
+    public function __invoke()
     {
         if (!$this->app) {
             $this->app = require $this->appPath;
         }
 
-        return $this->app->__invoke($request, $prefix);
+        return $this->app;
     }
 }

tests/Silex/Tests/FunctionalTest.php

@@ -57,15 +57,14 @@ class FunctionalTest extends \PHPUnit_Framework_TestCase
 
     public function testLazyMount()
     {
-        $mounted = function (Request $request, $prefix) {
+        $mountedFactory = function () {
             $mounted = new Application();
             $mounted->get('/{name}', function ($name) { return new Response($name); });
-
-            return $mounted($request, $prefix);
+            return $mounted;
         };
 
         $app = new Application();
-        $app->mount('/hello', $mounted);
+        $app->mount('/hello', $mountedFactory);
 
         $response = $app->handle(Request::create('/hello/Silex'));
         $this->assertEquals('Silex', $response->getContent());