diff --git a/.travis.yml b/.travis.yml
index 913f031fd2..191da7d344 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,6 +48,8 @@ before_install:
       # Enable Sury ppa
       sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
       sudo add-apt-repository -y ppa:ondrej/php
+      sudo rm /etc/apt/sources.list.d/google-chrome.list
+      sudo rm /etc/apt/sources.list.d/mongodb-3.4.list
       sudo apt update
       sudo apt install -y librabbitmq-dev libsodium-dev
 
diff --git a/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php b/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
index 572685a6c4..71180156ba 100644
--- a/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
@@ -30,9 +30,14 @@ class FormThemeTokenParserTest extends TestCase
     {
         $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
         $env->addTokenParser(new FormThemeTokenParser());
-        $stream = $env->tokenize(new Source($source, ''));
+        $source = new Source($source, '');
+        $stream = $env->tokenize($source);
         $parser = new Parser($env);
 
+        if (method_exists($expected, 'setSourceContext')) {
+            $expected->setSourceContext($source);
+        }
+
         $this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
index 9ab6f9eb49..b6708db544 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -14,14 +14,12 @@ namespace Symfony\Bundle\FrameworkBundle\Controller;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2, use %s instead.', Controller::class, AbstractController::class), E_USER_DEPRECATED);
-
 /**
  * Controller is a simple implementation of a Controller.
  *
  * It provides methods to common features needed in controllers.
  *
- * @deprecated since Symfony 4.2, use {@see AbstractController} instead.
+ * @deprecated since Symfony 4.2, use "Symfony\Bundle\FrameworkBundle\Controller\AbstractController" instead.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */