Skip to content

Commit 551bd65

Browse files
authored
Merge pull request #418 from qkdreyer/patch-2
chore: remove php-http/socket-client<2.0 support
2 parents dda96d4 + 07fcabf commit 551bd65

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ jobs:
3737
symfony-deprecations-helper: "weak"
3838

3939
# Test with httplug 1.x clients
40-
- dependencies: "php-http/buzz-adapter:^1.0 php-http/guzzle6-adapter:^1.1.1 php-http/react-adapter:^0.2.1 php-http/socket-client:^1.0"
40+
- dependencies: "php-http/buzz-adapter:^1.0 php-http/guzzle6-adapter:^1.1.1 php-http/react-adapter:^0.2.1"
4141
php-version: "7.3"
4242
symfony-deprecations-helper: "weak"
4343
# Test with httplug 2.x clients
44-
- dependencies: "php-http/guzzle7-adapter php-http/curl-client:^2.0.0 php-http/vcr-plugin:^1.0@dev"
44+
- dependencies: "php-http/guzzle7-adapter php-http/curl-client:^2.0.0 php-http/vcr-plugin:^1.0@dev php-http/socket-client:^2.0"
4545
php-version: "7.3"
4646
symfony-deprecations-helper: "weak"
4747

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
},
4444
"conflict": {
4545
"php-http/guzzle6-adapter": "<1.1",
46-
"php-http/curl-client": "<2.0"
46+
"php-http/curl-client": "<2.0",
47+
"php-http/socket-client": "<2.0"
4748
},
4849
"require-dev": {
4950
"guzzlehttp/psr7": "^1.7",

src/ClientFactory/SocketFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ public function createClient(array $config = [])
3131
throw new \LogicException('To use the Socket client you need to install the "php-http/socket-client" package.');
3232
}
3333

34-
return new Client($this->messageFactory, $config);
34+
return new Client($config);
3535
}
3636
}

0 commit comments

Comments
 (0)