updated vendors

src/Silex/Application.php

@@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\CoreEvents;
+use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\EventDispatcher\Event;
@@ -310,9 +310,9 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
     }
 
     /**
-     * Handles onCoreRequest events.
+     * Handles onKernelRequest events.
      */
-    public function onCoreRequest(KernelEvent $event)
+    public function onKernelRequest(KernelEvent $event)
     {
         $this['request'] = $event->getRequest();
 
@@ -357,7 +357,7 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
      *
      * @param FilterControllerEvent $event A FilterControllerEvent instance
      */
-    public function onCoreController(FilterControllerEvent $event)
+    public function onKernelController(FilterControllerEvent $event)
     {
         $request = $event->getRequest();
         $route = $this['routes']->get($request->attributes->get('_route'));
@@ -371,9 +371,9 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
     /**
      * Handles string responses.
      *
-     * Handler for onCoreView.
+     * Handler for onKernelView.
      */
-    public function onCoreView(GetResponseForControllerResultEvent $event)
+    public function onKernelView(GetResponseForControllerResultEvent $event)
     {
         $response = $event->getControllerResult();
         $converter = new StringResponseConverter();
@@ -383,9 +383,9 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
     /**
      * Runs after filters.
      *
-     * Handler for onCoreResponse.
+     * Handler for onKernelResponse.
      */
-    public function onCoreResponse(Event $event)
+    public function onKernelResponse(Event $event)
     {
         $this['dispatcher']->dispatch(SilexEvents::AFTER);
     }
@@ -394,11 +394,11 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
      * Executes registered error handlers until a response is returned,
      * in which case it returns it to the client.
      *
-     * Handler for onCoreException.
+     * Handler for onKernelException.
      *
      * @see error()
      */
-    public function onCoreException(GetResponseForExceptionEvent $event)
+    public function onKernelException(GetResponseForExceptionEvent $event)
     {
         $errorEvent = new GetResponseForErrorEvent($this, $event->getRequest(), $event->getRequestType(), $event->getException());
         $this['dispatcher']->dispatch(SilexEvents::ERROR, $errorEvent);
@@ -413,14 +413,14 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
      */
     static public function getSubscribedEvents()
     {
-        // onCoreView listener is added manually because it has lower priority
+        // onKernelView listener is added manually because it has lower priority
 
         return array(
-            CoreEvents::REQUEST    => 'onCoreRequest',
-            CoreEvents::CONTROLLER => 'onCoreController',
-            CoreEvents::RESPONSE   => 'onCoreResponse',
-            CoreEvents::EXCEPTION  => 'onCoreException',
-            CoreEvents::VIEW       => array('onCoreView', -10),
+            KernelEvents::REQUEST    => 'onKernelRequest',
+            KernelEvents::CONTROLLER => 'onKernelController',
+            KernelEvents::RESPONSE   => 'onKernelResponse',
+            KernelEvents::EXCEPTION  => 'onKernelException',
+            KernelEvents::VIEW       => array('onKernelView', -10),
         );
     }
 }

src/Silex/Extension/SessionExtension.php

@@ -16,7 +16,7 @@ use Silex\ExtensionInterface;
 
 use Symfony\Component\HttpFoundation\SessionStorage\NativeSessionStorage;
 use Symfony\Component\HttpFoundation\Session;
-use Symfony\Component\HttpKernel\CoreEvents;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 class SessionExtension implements ExtensionInterface
 {
@@ -34,14 +34,14 @@ class SessionExtension implements ExtensionInterface
             return new NativeSessionStorage($app['session.storage.options']);
         });
 
-        $app['dispatcher']->addListener(CoreEvents::REQUEST, array($this, 'onCoreRequest'), -255);
+        $app['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'onKernelRequest'), -255);
 
         if (!isset($app['session.storage.options'])) {
             $app['session.storage.options'] = array();
         }
     }
 
-    public function onCoreRequest($event)
+    public function onKernelRequest($event)
     {
         $request = $event->getRequest();
         $request->setSession($this->app['session']);

src/Silex/WebTestCase.php

@@ -19,7 +19,7 @@ use Symfony\Component\HttpKernel\Test\WebTestCase as BaseWebTestCase;
  *
  * @author Igor Wiedler <igor@wiedler.ch>
  */
-abstract class WebTestCase extends BaseWebTestCase
+abstract class WebTestCase extends \PHPUnit_Framework_TestCase
 {
     protected $app;
 

BrowserKit @ 66eadd4b

-Subproject commit d5060935745cbe509c39f36a34965ff67511282f
+Subproject commit 66eadd4bc5fe20489bc1c4bd0e8f0b13ed9465e7

ClassLoader @ 6894a17b

-Subproject commit f289917e07a7bcecb4d27c782fb9b4380136baa9
+Subproject commit 6894a17bb88831f2d260c7b9897862e5ccf35bae

HttpFoundation @ 320bb10d

-Subproject commit a20dc40fa90b47663017cf7f2f628ca90909985a
+Subproject commit 320bb10dc10a616e3e3791cacd6b3422770b8e17

HttpKernel @ 79d2ac06

-Subproject commit 7442467e4bbba0c7c26960f1dc8211cc11c5298f
+Subproject commit 79d2ac0641432c9fc93e1f4d43d3401aff8cdc4f

Routing @ 0cd62129

-Subproject commit 66ab5135dafa42c1a41b3045a269834a243ef798
+Subproject commit 0cd62129e0bc882452f25d7f576b8b4084388a8a

monolog @ 8492eb74

-Subproject commit 1defa7857f842a5a554b13b776e06e7784e3a99b
+Subproject commit 8492eb74b30429c68beeca22ded788a487d0fd82

twig @ 027f4890

-Subproject commit f742efd602f310c37fdbe40c5ffcf4d61f5a4f52
+Subproject commit 027f4890a76536a6bade74c0e130e5553fc0eeea