Skip to content

Commit e89bc78

Browse files
committed
build: re-add jbzoo/http-client ^8.0 dev dep (Wave B)
1 parent 58108b3 commit e89bc78

3 files changed

Lines changed: 2 additions & 9 deletions

File tree

.phan.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
// Libs
3232
'vendor/jbzoo/data',
33-
// 'vendor/jbzoo/http-client', // removed with http-client during the 8.0 batch; re-add in Wave B
33+
'vendor/jbzoo/http-client',
3434
'vendor/jbzoo/utils',
3535
'vendor/jbzoo/markdown',
3636

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"jbzoo/codestyle" : "^8.0",
4141
"jbzoo/data" : "^8.0",
4242
"jbzoo/utils" : "^8.0",
43+
"jbzoo/http-client" : "^8.0",
4344

4445
"guzzlehttp/guzzle" : ">=7.10.0",
4546
"symfony/process" : ">=7.3.4"

tests/PHPUnitHttpServerTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
namespace JBZoo\PHPUnit;
1818

19-
use JBZoo\HttpClient\HttpClient;
2019
use JBZoo\HttpClient\Response;
2120
use JBZoo\Utils\FS;
2221
use JBZoo\Utils\Sys;
@@ -27,13 +26,6 @@ protected function setUp(): void
2726
{
2827
parent::setUp();
2928

30-
// Interim (major 8.0 toolchain batch): jbzoo/http-client is temporarily removed from
31-
// require-dev because its 7.x line pins jbzoo/data ^7.2 / jbzoo/utils ^7.3, unsatisfiable
32-
// against this batch's ^8.0. It is re-added at ^8.0 in Wave B; drop this guard then.
33-
if (!\class_exists(HttpClient::class)) {
34-
skip('jbzoo/http-client is not installed during the 8.0 toolchain batch (re-added in Wave B).');
35-
}
36-
3729
FS::rmDir(PROJECT_BUILD . '/coverage_cov');
3830
FS::rmDir(PROJECT_BUILD . '/coverage_html');
3931
FS::rmDir(PROJECT_BUILD . '/coverage_xml');

0 commit comments

Comments
 (0)