Merge branch '1.3'

* 1.3:
  fixed deprecation notices
  Fixed not explicitly declared properties
  bumped version to 1.3.4-DEV
  prepared the 1.3.3 release

doc/changelog.rst

@@ -24,7 +24,12 @@ Changelog
 * ``monolog.exception.logger_filter`` option added to Monolog service provider
 * [BC BREAK] ``$app['request']`` service removed, use ``$app['request_stack']`` instead
 
-1.3.3 (2015-XX-XX)
+1.3.4 (2015-XX-XX)
+------------------
+
+* n/a
+
+1.3.3 (2015-09-08)
 ------------------
 
 * added support for Symfony 3.0 and Twig 2.0

src/Silex/Provider/HttpFragmentServiceProvider.php

@@ -20,6 +20,7 @@ use Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer;
 use Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer;
 use Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer;
 use Symfony\Component\HttpKernel\EventListener\FragmentListener;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\UriSigner;
 
 /**
@@ -32,6 +33,10 @@ class HttpFragmentServiceProvider implements ServiceProviderInterface, EventList
     public function register(Container $app)
     {
         $app['fragment.handler'] = function ($app) {
+            if (Kernel::VERSION_ID >= 20800) {
+                return new FragmentHandler($app['request_stack'], $app['fragment.renderers'], $app['debug']);
+            }
+
             return new FragmentHandler($app['fragment.renderers'], $app['debug'], $app['request_stack']);
         };
 

src/Silex/Provider/RoutingServiceProvider.php

@@ -21,6 +21,7 @@ use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\HttpKernel\EventListener\RouterListener;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -75,6 +76,10 @@ class RoutingServiceProvider implements ServiceProviderInterface, EventListenerP
                 return $app['request_matcher'];
             });
 
+            if (Kernel::VERSION_ID >= 20800) {
+                return new RouterListener($urlMatcher, $app['request_stack'], $app['request_context'], $app['logger']);
+            }
+
             return new RouterListener($urlMatcher, $app['request_context'], $app['logger'], $app['request_stack']);
         };
     }

tests/Silex/Tests/CallbackResolverTest.php

@@ -16,6 +16,9 @@ use Silex\CallbackResolver;
 
 class CallbackResolverTest extends \PHPUnit_Framework_Testcase
 {
+    private $app;
+    private $resolver;
+
     public function setup()
     {
         $this->app = new Container();

tests/Silex/Tests/ServiceControllerResolverTest.php

@@ -21,6 +21,11 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class ServiceControllerResolverTest extends \PHPUnit_Framework_Testcase
 {
+    private $app;
+    private $mockCallbackResolver;
+    private $mockResolver;
+    private $resolver;
+
     public function setup()
     {
         $this->mockResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface')