From 00682acdea2e7e9b37caa732f93672ca1a73d65c Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sun, 7 Jun 2020 14:29:13 +0200 Subject: [PATCH] Small update in our internal terminology --- .../Component/HttpClient/NoPrivateNetworkHttpClient.php | 2 +- .../HttpClient/Tests/NoPrivateNetworkHttpClientTest.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php index 3d86f09e76..d4c69cabce 100644 --- a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php +++ b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php @@ -81,7 +81,7 @@ final class NoPrivateNetworkHttpClient implements HttpClientInterface, LoggerAwa $options['on_progress'] = function (int $dlNow, int $dlSize, array $info) use ($onProgress, $subnets, &$lastPrimaryIp): void { if ($info['primary_ip'] !== $lastPrimaryIp) { if (IpUtils::checkIp($info['primary_ip'], $subnets ?? self::PRIVATE_SUBNETS)) { - throw new TransportException(sprintf('IP "%s" is blacklisted for "%s".', $info['primary_ip'], $info['url'])); + throw new TransportException(sprintf('IP "%s" is blocked for "%s".', $info['primary_ip'], $info['url'])); } $lastPrimaryIp = $info['primary_ip']; diff --git a/src/Symfony/Component/HttpClient/Tests/NoPrivateNetworkHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/NoPrivateNetworkHttpClientTest.php index 1e099689b1..aabfe38c01 100755 --- a/src/Symfony/Component/HttpClient/Tests/NoPrivateNetworkHttpClientTest.php +++ b/src/Symfony/Component/HttpClient/Tests/NoPrivateNetworkHttpClientTest.php @@ -22,7 +22,7 @@ use Symfony\Contracts\HttpClient\ResponseInterface; class NoPrivateNetworkHttpClientTest extends TestCase { - public function getBlacklistData(): array + public function getExcludeData(): array { return [ // private @@ -63,16 +63,16 @@ class NoPrivateNetworkHttpClientTest extends TestCase } /** - * @dataProvider getBlacklistData + * @dataProvider getExcludeData */ - public function testBlacklist(string $ipAddr, $subnets, bool $mustThrow) + public function testExclude(string $ipAddr, $subnets, bool $mustThrow) { $content = 'foo'; $url = sprintf('http://%s/', 0 < substr_count($ipAddr, ':') ? sprintf('[%s]', $ipAddr) : $ipAddr); if ($mustThrow) { $this->expectException(TransportException::class); - $this->expectExceptionMessage(sprintf('IP "%s" is blacklisted for "%s".', $ipAddr, $url)); + $this->expectExceptionMessage(sprintf('IP "%s" is blocked for "%s".', $ipAddr, $url)); } $previousHttpClient = $this->getHttpClientMock($url, $ipAddr, $content);