Merge branch '2.5' into 2.6

* 2.5:
  Update filesystem readme.md to include exists method
  Add machine readable events
  [HttpKernel][2.6] Adding support for invokable controllers in the RequestDataCollector
  fixed typo
  [Translations] Added missing Hebrew language trans-unit sources
  [DependencyInjection] inlined factory not referenced
  Fixed case for empty folder
  Fixed whitespace control for password form widget
  [Routing] correctly initialize condition as string

Author: fabpot

DataCollector/RequestDataCollector.php

@@ -147,6 +147,14 @@ public function collect(Request $request, Response $response, \Exception $except
                     'file' => $r->getFilename(),
                     'line' => $r->getStartLine(),
                 );
+            } elseif (is_object($controller)) {
+                $r = new \ReflectionClass($controller);
+                $this->data['controller'] = array(
+                    'class' => $r->getName(),
+                    'method' => null,
+                    'file' => $r->getFileName(),
+                    'line' => $r->getStartLine(),
+                );
             } else {
                 $this->data['controller'] = (string) $controller ?: 'n/a';
             }

KernelEvents.php

@@ -29,6 +29,8 @@ final class KernelEvents
      * receives a Symfony\Component\HttpKernel\Event\GetResponseEvent
      * instance.
      *
+     * @Event
+     *
      * @var string
      *
      * @api
@@ -43,6 +45,8 @@ final class KernelEvents
      * a Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent
      * instance.
      *
+     * @Event
+     *
      * @var string
      *
      * @api
@@ -58,6 +62,8 @@ final class KernelEvents
      * Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent
      * instance.
      *
+     * @Event
+     *
      * @var string
      *
      * @api
@@ -72,6 +78,8 @@ final class KernelEvents
      * request. The event listener method receives a
      * Symfony\Component\HttpKernel\Event\FilterControllerEvent instance.
      *
+     * @Event
+     *
      * @var string
      *
      * @api
@@ -86,6 +94,8 @@ final class KernelEvents
      * replied. The event listener method receives a
      * Symfony\Component\HttpKernel\Event\FilterResponseEvent instance.
      *
+     * @Event
+     *
      * @var string
      *
      * @api
@@ -99,6 +109,8 @@ final class KernelEvents
      * The event listener method receives a
      * Symfony\Component\HttpKernel\Event\PostResponseEvent instance.
      *
+     * @Event
+     *
      * @var string
      */
     const TERMINATE = 'kernel.terminate';

Tests/DataCollector/RequestDataCollectorTest.php

@@ -59,6 +59,7 @@ public function testControllerInspection()
         // make sure we always match the line number
         $r1 = new \ReflectionMethod($this, 'testControllerInspection');
         $r2 = new \ReflectionMethod($this, 'staticControllerMethod');
+        $r3 = new \ReflectionClass($this);
         // test name, callable, expected
         $controllerTests = array(
             array(
@@ -132,6 +133,17 @@ function () { return 'foo'; },
                     'line' => 'n/a',
                 ),
             ),
+
+            array(
+                'Invokable controller',
+                $this,
+                array(
+                    'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
+                    'method' => null,
+                    'file' => __FILE__,
+                    'line' => $r3->getStartLine(),
+                ),
+            ),
         );
 
         $c = new RequestDataCollector();
@@ -202,4 +214,9 @@ public static function __callStatic($method, $args)
     {
         throw new \LogicException('Unexpected method call');
     }
+
+    public function __invoke()
+    {
+        throw new \LogicException('Unexpected method call');
+    }
 }