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
symfony · Aug 13, 2024 · d7eb6da · d7eb6da
2 parents cc9d880 + ae25a91
commit d7eb6da
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/Tests/Iterator/RecursiveDirectoryIteratorTest.php b/Tests/Iterator/RecursiveDirectoryIteratorTest.php
@@ -24,26 +24,38 @@ protected function setUp(): void
 
     /**
      * @group network
+     * @group integration
      */
     public function testRewindOnFtp()
     {
-        $i = new RecursiveDirectoryIterator('ftp://test.rebex.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
+        if (!getenv('INTEGRATION_FTP_URL')) {
+            self::markTestSkipped('INTEGRATION_FTP_URL env var is not defined.');
+        }
+
+        $i = new RecursiveDirectoryIterator(getenv('INTEGRATION_FTP_URL').\DIRECTORY_SEPARATOR, \RecursiveDirectoryIterator::SKIP_DOTS);
 
         $i->rewind();
 
-        $this->assertTrue(true);
+        $this->expectNotToPerformAssertions();
     }
 
     /**
      * @group network
+     * @group integration
      */
     public function testSeekOnFtp()
     {
-        $i = new RecursiveDirectoryIterator('ftp://test.rebex.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
+        if (!getenv('INTEGRATION_FTP_URL')) {
+            self::markTestSkipped('INTEGRATION_FTP_URL env var is not defined.');
+        }
+
+        $ftpUrl = getenv('INTEGRATION_FTP_URL');
+
+        $i = new RecursiveDirectoryIterator($ftpUrl.\DIRECTORY_SEPARATOR, \RecursiveDirectoryIterator::SKIP_DOTS);
 
         $contains = [
-            'ftp://test.rebex.net'.\DIRECTORY_SEPARATOR.'pub',
-            'ftp://test.rebex.net'.\DIRECTORY_SEPARATOR.'readme.txt',
+            $ftpUrl.\DIRECTORY_SEPARATOR.'pub',
+            $ftpUrl.\DIRECTORY_SEPARATOR.'readme.txt',
         ];
         $actual = [];