Merge branch '6.4' into 7.1

* 6.4:
  Replace external FTP server by a local docker instance
  [PhpUnitBridge][Console][VarDumper] Fix handling NO_COLOR env var
  fix test
  [Validator] Add test for `D` regex modifier in `TimeValidator`

Author: nicolas-grekas

.github/workflows/integration-tests.yml

@@ -44,6 +44,13 @@ jobs:
           LDAP_PORT_NUMBER: 3389
           LDAP_USERS: a
           LDAP_PASSWORDS: a
+      ftp:
+        image: onekilo79/ftpd_test
+        ports:
+          - 21:21
+          - 30000-30009:30000-30009
+        volumes:
+          - ./:/hostmount
       redis:
         image: redis:6.2.8
         ports:
@@ -162,6 +169,11 @@ jobs:
           curl -s -u Administrator:111111@ -X POST http://localhost:8091/pools/default/buckets -d 'ramQuotaMB=100&bucketType=ephemeral&name=cache'
           curl -s -u Administrator:111111@ -X POST http://localhost:8091/pools/default -d 'memoryQuota=256'
 
+      - name: Create FTP fixtures
+        run: |
+          mkdir -p ./ftpusers/test/pub
+          touch ./ftpusers/test/pub/example ./ftpusers/test/readme.txt
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -212,6 +224,7 @@ jobs:
       - name: Run tests
         run: ./phpunit --group integration -v
         env:
+          INTEGRATION_FTP_URL: 'ftp://test:test@localhost'
           REDIS_HOST: 'localhost:16379'
           REDIS_AUTHENTICATED_HOST: 'localhost:16380'
           REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'

src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

@@ -407,7 +407,7 @@ private static function hasColorSupport(): bool
         }
 
         // Follow https://no-color.org/
-        if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
+        if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {
             return false;
         }
 

src/Symfony/Component/Console/Output/StreamOutput.php

@@ -90,7 +90,7 @@ protected function doWrite(string $message, bool $newline): void
     protected function hasColorSupport(): bool
     {
         // Follow https://no-color.org/
-        if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
+        if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {
             return false;
         }
 

src/Symfony/Component/Finder/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 = [];
 

src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php

@@ -244,11 +244,13 @@ public function testBoundaryContentTypeHeader()
         );
     }
 
-    public function testConstructThrowsOnUnexpectedFieldType()
+    public function testGetPartsThrowsOnUnexpectedFieldType()
     {
+        $dataPart = new FormDataPart(['foo' => new \stdClass()]);
+
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('A form field value can only be a string, an array, or an instance of TextPart ("stdClass" given).');
+        $this->expectExceptionMessage('The value of the form field "foo" can only be a string, an array, or an instance of TextPart, "stdClass" given.');
 
-        new FormDataPart(['foo' => new \stdClass()]);
+        $dataPart->getParts();
     }
 }

src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php

@@ -94,6 +94,19 @@ public function testValidTimesWithoutSeconds(string $time)
         $this->assertNoViolation();
     }
 
+    /**
+     * @dataProvider getValidTimesWithoutSeconds
+     */
+    public function testValidTimesWithoutSecondsWithNewLine(string $time)
+    {
+        $this->validator->validate($time."\n", new Time(withSeconds: false));
+
+        $this->buildViolation('This value is not a valid time.')
+            ->setParameter('{{ value }}', '"'.$time."\n".'"')
+            ->setCode(Time::INVALID_FORMAT_ERROR)
+            ->assertRaised();
+    }
+
     public static function getValidTimesWithoutSeconds()
     {
         return [

src/Symfony/Component/VarDumper/Dumper/CliDumper.php

@@ -587,7 +587,7 @@ private function hasColorSupport(mixed $stream): bool
         }
 
         // Follow https://no-color.org/
-        if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
+        if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {
             return false;
         }