Merge branch '1.3'

* 1.3:
  tweaked docs
  added warning about route security trait
  PHPDocs Application -> HttpKernelInterface
  Very little typo fix.

doc/providers/security.rst

@@ -645,4 +645,23 @@ Traits
         // do something but only for admins
     })->secure('ROLE_ADMIN');
 
+.. caution::
+
+    The ``Silex\Route\SecurityTrait`` must be used with a user defined
+    ``Route`` class, not the application.
+
+    .. code-block:: php
+
+        use Silex\Route;
+
+        class MyRoute extends Route
+        {
+            use Route\SecurityTrait;
+        }
+
+    .. code-block:: php
+
+        $app['route_class'] = 'MyRoute';
+
+
 .. _cookbook: http://symfony.com/doc/current/cookbook/security/custom_authentication_provider.html

doc/usage.rst

@@ -513,7 +513,7 @@ setting a more specific type hint for the Closure argument::
         return new Response('Error', 404 /* ignored */, array('X-Status-Code' => 200));
 
 If you want to use a separate error handler for logging, make sure you register
-it with a higher priority then response error handlers, because once a response
+it with a higher priority than response error handlers, because once a response
 is returned, the following handlers are ignored.
 
 .. note::

src/Silex/WebTestCase.php

@@ -12,7 +12,7 @@
 namespace Silex;
 
 use Symfony\Component\HttpKernel\Client;
-use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * WebTestCase is the base class for functional tests.
@@ -22,9 +22,9 @@ use Symfony\Component\HttpKernel\HttpKernel;
 abstract class WebTestCase extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Application instance.
+     * HttpKernelInterface instance.
      *
-     * @var Application
+     * @var HttpKernelInterface
      */
     protected $app;
 
@@ -42,14 +42,14 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase
     /**
      * Creates the application.
      *
-     * @return HttpKernel
+     * @return HttpKernelInterface
      */
     abstract public function createApplication();
 
     /**
      * Creates a Client.
      *
-     * @param array $server An array of server parameters
+     * @param array $server Server parameters
      *
      * @return Client A Client instance
      */