[Notifier] Fix GoIpTransport

nicolas-grekas · nicolas-grekas · commit 5afb93c518fa · 2024-11-13T19:41:47.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -2668,16 +2668,6 @@ public function testReservedFlags()
             $this->assertNotSame(0b10000000, $value, sprintf('The constant "%s" should not use the reserved value "0b10000000".', $constant));
         }
     }
-
-    /**
-     * @group legacy
-     */
-    public function testInvalidUriCreationDeprecated()
-    {
-        $this->expectDeprecation('Since symfony/http-foundation 6.3: Calling "Symfony\Component\HttpFoundation\Request::create()" with an invalid URI is deprecated.');
-        $request = Request::create('/invalid-path:123');
-        $this->assertEquals('http://localhost/invalid-path:123', $request->getUri());
-    }
 }
 
 class RequestContentProxy extends Request
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
@@ -106,7 +106,7 @@ public function testFromDsnWithMixDsnQueryOptions()
 
         $this->assertEquals(
             Connection::fromDsn('redis://localhost/queue/group1/consumer1', ['consumer' => 'specific-consumer'], $this->createRedisMock()),
-            Connection::fromDsn('redis://localhost/queue/group1/consumer1', [], $this->createRedisMock()))
+            Connection::fromDsn('redis://localhost/queue/group1/consumer1', [], $this->createRedisMock())
         );
     }
 
@@ -439,8 +439,7 @@ public function testFromDsnOnUnixSocketWithUserAndPassword()
                 'delete_after_ack' => true,
                 'host' => '/var/run/redis/redis.sock',
                 'port' => 0,
-                'user' => 'user',
-                'pass' => 'password',
+                'auth' => ['user', 'password'],
             ], $redis),
             Connection::fromDsn('redis://user:password@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
         );
@@ -460,7 +459,7 @@ public function testFromDsnOnUnixSocketWithPassword()
                 'delete_after_ack' => true,
                 'host' => '/var/run/redis/redis.sock',
                 'port' => 0,
-                'pass' => 'password',
+                'auth' => 'password',
             ], $redis),
             Connection::fromDsn('redis://password@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
         );
@@ -480,7 +479,7 @@ public function testFromDsnOnUnixSocketWithUser()
                 'delete_after_ack' => true,
                 'host' => '/var/run/redis/redis.sock',
                 'port' => 0,
-                'user' => 'user',
+                'auth' => 'user',
             ], $redis),
             Connection::fromDsn('redis://user:@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
         );
@@ -494,7 +493,7 @@ private function createRedisMock(): \Redis
             ->willReturn(true);
         $redis->expects($this->any())
             ->method('isConnected')
-            ->willReturnOnConsecutiveCalls(false, true);
+            ->willReturnOnConsecutiveCalls(false, true, true);
 
         return $redis;
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/GoIp/GoIpTransport.php b/src/Symfony/Component/Notifier/Bridge/GoIp/GoIpTransport.php
@@ -71,7 +71,7 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new LogicException(sprintf('The "%s" transport does not support the "From" option.', __CLASS__));
         }
 
-        $response = $this->client->request('GET', $this->getEndpoint(), [
+        $response = $this->client->request('GET', 'https://'.$this->getEndpoint(), [
             'query' => [
                 'u' => $this->username,
                 'p' => $this->password,

Original file line number	Diff line number	Diff line change
`@@ -2668,16 +2668,6 @@ public function testReservedFlags()`
`2668`	`2668`	`$this->assertNotSame(0b10000000, $value, sprintf('The constant "%s" should not use the reserved value "0b10000000".', $constant));`
`2669`	`2669`	`}`
`2670`	`2670`	`}`
`2671`		`-`
`2672`		`- /**`
`2673`		`- * @group legacy`
`2674`		`- */`
`2675`		`- public function testInvalidUriCreationDeprecated()`
`2676`		`- {`
`2677`		`- $this->expectDeprecation('Since symfony/http-foundation 6.3: Calling "Symfony\Component\HttpFoundation\Request::create()" with an invalid URI is deprecated.');`
`2678`		`- $request = Request::create('/invalid-path:123');`
`2679`		`- $this->assertEquals('http://localhost/invalid-path:123', $request->getUri());`
`2680`		`- }`
`2681`	`2671`	`}`
`2682`	`2672`
`2683`	`2673`	`class RequestContentProxy extends Request`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ protected function doSend(MessageInterface $message): SentMessage`
`71`	`71`	`throw new LogicException(sprintf('The "%s" transport does not support the "From" option.', __CLASS__));`
`72`	`72`	`}`
`73`	`73`
`74`		`- $response = $this->client->request('GET', $this->getEndpoint(), [`
	`74`	`+ $response = $this->client->request('GET', 'https://'.$this->getEndpoint(), [`
`75`	`75`	`'query' => [`
`76`	`76`	`'u' => $this->username,`
`77`	`77`	`'p' => $this->password,`