Merge branch '1.2' into 1.3

* 1.2:
  Phpdocs

src/Silex/ControllerCollection.php

@@ -43,9 +43,6 @@ class ControllerCollection
     protected $defaultController;
     protected $prefix;
 
-    /**
-     * Constructor.
-     */
     public function __construct(Route $defaultRoute)
     {
         $this->defaultRoute = $defaultRoute;

src/Silex/EventListener/LogListener.php

@@ -100,7 +100,7 @@ class LogListener implements EventSubscriberInterface
     /**
      * Logs an exception.
      *
-     * @param Exception $e
+     * @param \Exception $e
      */
     protected function logException(\Exception $e)
     {

src/Silex/ExceptionListenerWrapper.php

@@ -31,6 +31,7 @@ class ExceptionListenerWrapper
      * Constructor.
      *
      * @param Application $app      An Application instance
+     * @param callable    $callback
      */
     public function __construct(Application $app, $callback)
     {

src/Silex/Provider/SerializerServiceProvider.php

@@ -28,12 +28,12 @@ use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
 class SerializerServiceProvider implements ServiceProviderInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      *
      * This method registers a serializer service. {@link http://api.symfony.com/master/Symfony/Component/Serializer/Serializer.html
      * The service is provided by the Symfony Serializer component}.
      *
-     * @param Silex\Application $app
+     * @param Application $app
      */
     public function register(Application $app)
     {
@@ -51,11 +51,11 @@ class SerializerServiceProvider implements ServiceProviderInterface
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      *
      * This provider does not execute any code when booting.
      *
-     * @param Silex\Application $app
+     * @param Application $app
      */
     public function boot(Application $app)
     {

src/Silex/RedirectableUrlMatcher.php

@@ -22,7 +22,7 @@ use Symfony\Component\Routing\Matcher\RedirectableUrlMatcher as BaseRedirectable
 class RedirectableUrlMatcher extends BaseRedirectableUrlMatcher
 {
     /**
-     * @see RedirectableUrlMatcherInterface::match()
+     * {@inheritdoc}
      */
     public function redirect($path, $route, $scheme = null)
     {

tests/Silex/Tests/CallbackResolverTest.php

@@ -39,7 +39,7 @@ class CallbackResolverTest extends \PHPUnit_Framework_Testcase
     }
 
     /**
-     * @expectedException          InvalidArgumentException
+     * @expectedException          \InvalidArgumentException
      * @expectedExceptionMessage   Service "some_service" does not exist.
      */
     public function testShouldThrowAnExceptionIfServiceIsMissing()

tests/Silex/Tests/CallbackServicesTest.php

@@ -64,7 +64,7 @@ class CallbackServicesTest extends \PHPUnit_Framework_TestCase
 
     public function controller(Application $app)
     {
-        return $app->abort(404);
+        $app->abort(404);
     }
 
     public function before()

tests/Silex/Tests/ControllerTest.php

@@ -31,7 +31,7 @@ class ControllerTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException Silex\Exception\ControllerFrozenException
+     * @expectedException \Silex\Exception\ControllerFrozenException
      */
     public function testBindOnFrozenControllerShouldThrowException()
     {

tests/Silex/Tests/LazyUrlMatcherTest.php

@@ -40,7 +40,7 @@ class LazyUrlMatcherTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
      * @expectedExceptionMessage Factory supplied to LazyUrlMatcher must return implementation of UrlMatcherInterface.
      */
     public function testThatCanInjectUrlMatcherOnly()

tests/Silex/Tests/Provider/MonologServiceProviderTest.php

@@ -147,7 +147,7 @@ class MonologServiceProviderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Provided logging level 'foo' does not exist. Must be a valid monolog logging level.
      */
     public function testNonExistentStringErrorLevel()