Skip to content

Commit dcbb2a0

Browse files
Merge branch '5.4' into 6.0
* 5.4: Revert "bug #45813 [HttpClient] Move Content-Type after Content-Length (nicolas-grekas)" [FrameworkBundle] Fix exit codes in debug:translation command [Cache] Declaratively declare/hide DoctrineProvider to avoid breaking static analysis [HttpClient] Let curl handle Content-Length headers Improve testsuite [HttpClient] Move Content-Type after Content-Length [HttpClient] minor cs fix [Config] Fix using null values with config builders
2 parents d1f4315 + a162795 commit dcbb2a0

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

Tests/Store/CombinedStoreTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/**
2626
* @author Jérémy Derussé <[email protected]>
27+
* @group integration
2728
*/
2829
class CombinedStoreTest extends AbstractStoreTest
2930
{
@@ -43,7 +44,8 @@ protected function getClockDelay()
4344
*/
4445
public function getStore(): PersistingStoreInterface
4546
{
46-
$redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => null]));
47+
$redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379]));
48+
4749
try {
4850
$redis->connect();
4951
} catch (\Exception $e) {

Tests/Store/PdoStoreTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* @author Jérémy Derussé <[email protected]>
2121
*
2222
* @requires extension pdo_sqlite
23+
* @group integration
2324
*/
2425
class PdoStoreTest extends AbstractStoreTest
2526
{

Tests/Store/ZookeeperStoreTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* @author Ganesh Chandrasekaran <[email protected]>
2020
*
2121
* @requires extension zookeeper
22+
* @group integration
2223
*/
2324
class ZookeeperStoreTest extends AbstractStoreTest
2425
{

0 commit comments

Comments
 (0)