Merge pull request #1294 from FriendsOfSymfony/DEPRECATIONS

Fix deprecations

Author: GuilhemN

Routing/Loader/RestRouteLoader.php

@@ -117,10 +117,14 @@ private function getControllerLocator($controller)
         if ($this->container->has($controller)) {
             // service_id
             $prefix = $controller.':';
-            $this->container->enterScope('request');
-            $this->container->set('request', new Request());
+            if (method_exists($this->container, 'enterScope')) {
+                $this->container->enterScope('request');
+                $this->container->set('request', new Request());
+            }
             $class = get_class($this->container->get($controller));
-            $this->container->leaveScope('request');
+            if (method_exists($this->container, 'enterScope')) {
+                $this->container->leaveScope('request');
+            }
         } elseif (class_exists($controller)) {
             // full class name
             $class = $controller;

View/ViewHandler.php

@@ -22,6 +22,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Routing\RouterInterface;
 use FOS\RestBundle\Util\Codes;
 
 /**
@@ -240,7 +241,7 @@ public function isFormatTemplating($format)
     /**
      * Gets the router service.
      *
-     * @return \Symfony\Component\Routing\RouterInterface
+     * @return RouterInterface
      */
     protected function getRouter()
     {