Merge branch '5.0'

* 5.0: [HttpClient] Fix deps Fix tests
symfony · Dec 1, 2019 · e0f6cdb · e0f6cdb
2 parents 861fb4b + a266b35
commit e0f6cdb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -14,6 +14,7 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader;

diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
@@ -24,7 +24,8 @@
         "php": "^7.2.5",
         "psr/log": "^1.0",
         "symfony/http-client-contracts": "^1.1.8|^2",
-        "symfony/polyfill-php73": "^1.11"
+        "symfony/polyfill-php73": "^1.11",
+        "symfony/service-contracts": "^1.0|^2"
     },
     "require-dev": {
         "guzzlehttp/promises": "^1.3.1",
@@ -33,9 +34,7 @@
         "psr/http-client": "^1.0",
         "symfony/dependency-injection": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4|^5.0",
-        "symfony/process": "^4.4|^5.0",
-        "symfony/service-contracts": "^1.0|^2",
-        "symfony/var-dumper": "^4.4|^5.0"
+        "symfony/process": "^4.4|^5.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\HttpClient\\": "" },

diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
@@ -35,7 +35,7 @@
  * @internal
  */
 abstract class AbstractPreAuthenticatedListener extends AbstractListener
-
+{
     protected $logger;
     private $tokenStorage;
     private $authenticationManager;

diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -13,6 +13,7 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;