Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit 6733efdfe9da · 2024-08-13T16:27:37.000+02:00
* 5.4:
  Replace external FTP server by a local docker instance
  [PhpUnitBridge][Console][VarDumper] Fix handling NO_COLOR env var
diff --git a/.github/workflows/integration-tests.yml b/.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'
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -418,7 +418,7 @@ private static function hasColorSupport()
         }
 
         // Follow https://no-color.org/
-        if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
+        if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {
             return false;
         }
 
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -93,7 +93,7 @@ protected function doWrite(string $message, bool $newline)
     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;
         }
 
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php b/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 = [];
 
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -621,7 +621,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;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ private static function hasColorSupport()`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`// Follow https://no-color.org/`
`421`		`- if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {`
	`421`	`+ if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {`
`422`	`422`	`return false;`
`423`	`423`	`}`
`424`	`424`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ protected function doWrite(string $message, bool $newline)`
`93`	`93`	`protected function hasColorSupport(): bool`
`94`	`94`	`{`
`95`	`95`	`// Follow https://no-color.org/`
`96`		`- if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {`
	`96`	`+ if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {`
`97`	`97`	`return false;`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ private function hasColorSupport(mixed $stream): bool`
`621`	`621`	`}`
`622`	`622`
`623`	`623`	`// Follow https://no-color.org/`
`624`		`- if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {`
	`624`	`+ if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {`
`625`	`625`	`return false;`
`626`	`626`	`}`
`627`	`627`