Merge branch '5.3' into 5.4

derrabus · derrabus · commit d79eebfaf86b · 2021-11-21T14:02:42.000+01:00
* 5.3:
  drop dev dependency on the HttpClient component
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php
@@ -12,7 +12,7 @@ class GmailTransportFactoryTest extends TransportFactoryTestCase
 {
     public function getFactory(): TransportFactoryInterface
     {
-        return new GmailTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
+        return new GmailTransportFactory($this->getDispatcher(), null, $this->getLogger());
     }
 
     public function supportsProvider(): iterable
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/composer.json b/src/Symfony/Component/Mailer/Bridge/Google/composer.json
@@ -20,9 +20,6 @@
         "psr/event-dispatcher": "^1",
         "symfony/mailer": "^4.4|^5.0|^6.0"
     },
-    "require-dev": {
-        "symfony/http-client": "^4.4|^5.0|^6.0"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Google\\": "" },
         "exclude-from-classmap": [

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class GmailTransportFactoryTest extends TransportFactoryTestCase`
`12`	`12`	`{`
`13`	`13`	`public function getFactory(): TransportFactoryInterface`
`14`	`14`	`{`
`15`		`- return new GmailTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());`
	`15`	`+ return new GmailTransportFactory($this->getDispatcher(), null, $this->getLogger());`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public function supportsProvider(): iterable`