Skip to content

Commit d7eb6da

Browse files
Merge branch '5.4' into 6.4
* 5.4: Replace external FTP server by a local docker instance [PhpUnitBridge][Console][VarDumper] Fix handling NO_COLOR env var
2 parents cc9d880 + ae25a91 commit d7eb6da

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

Tests/Iterator/RecursiveDirectoryIteratorTest.php

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,38 @@ protected function setUp(): void
2424

2525
/**
2626
* @group network
27+
* @group integration
2728
*/
2829
public function testRewindOnFtp()
2930
{
30-
$i = new RecursiveDirectoryIterator('ftp://test.rebex.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
31+
if (!getenv('INTEGRATION_FTP_URL')) {
32+
self::markTestSkipped('INTEGRATION_FTP_URL env var is not defined.');
33+
}
34+
35+
$i = new RecursiveDirectoryIterator(getenv('INTEGRATION_FTP_URL').\DIRECTORY_SEPARATOR, \RecursiveDirectoryIterator::SKIP_DOTS);
3136

3237
$i->rewind();
3338

34-
$this->assertTrue(true);
39+
$this->expectNotToPerformAssertions();
3540
}
3641

3742
/**
3843
* @group network
44+
* @group integration
3945
*/
4046
public function testSeekOnFtp()
4147
{
42-
$i = new RecursiveDirectoryIterator('ftp://test.rebex.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
48+
if (!getenv('INTEGRATION_FTP_URL')) {
49+
self::markTestSkipped('INTEGRATION_FTP_URL env var is not defined.');
50+
}
51+
52+
$ftpUrl = getenv('INTEGRATION_FTP_URL');
53+
54+
$i = new RecursiveDirectoryIterator($ftpUrl.\DIRECTORY_SEPARATOR, \RecursiveDirectoryIterator::SKIP_DOTS);
4355

4456
$contains = [
45-
'ftp://test.rebex.net'.\DIRECTORY_SEPARATOR.'pub',
46-
'ftp://test.rebex.net'.\DIRECTORY_SEPARATOR.'readme.txt',
57+
$ftpUrl.\DIRECTORY_SEPARATOR.'pub',
58+
$ftpUrl.\DIRECTORY_SEPARATOR.'readme.txt',
4759
];
4860
$actual = [];
4961

0 commit comments

Comments
 (0)