Merge branch '4.3' into 4.4

* 4.3: Fix more bad tests Fix test fixtures with deprecated method signatures. Fix 4.3 tests forward compat [Messenger] fix empty amqp body returned as false Fix routing cache broken when using generator_class
symfony · Sep 6, 2019 · 20a11a0 · 20a11a0
2 parents 8eb46b5 + aa3cd52
commit 20a11a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/Tests/Functional/MissingUserProviderTest.php b/Tests/Functional/MissingUserProviderTest.php
@@ -24,6 +24,7 @@ public function testUserProviderIsNeeded()
 
         $response = $client->getResponse();
         $this->assertSame(500, $response->getStatusCode());
+        $this->stringContains('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException', $response->getContent());
         $this->stringContains('"default" firewall requires a user provider but none was defined.', $response->getContent());
     }
 }
diff --git a/Tests/Functional/app/MissingUserProvider/bundles.php b/Tests/Functional/app/MissingUserProvider/bundles.php
@@ -16,5 +16,6 @@
 return [
     new FrameworkBundle(),
     new SecurityBundle(),
+    new Symfony\Bundle\TwigBundle\TwigBundle(),
     new MissingUserProviderBundle(),
 ];
diff --git a/Tests/Functional/app/MissingUserProvider/config.yml b/Tests/Functional/app/MissingUserProvider/config.yml
@@ -1,5 +1,5 @@
 imports:
-    - { resource: ./../config/framework.yml }
+    - { resource: ./../config/default.yml }
 
 security:
     firewalls: