Merge branch '6.4' into 7.0

xabbuh · xabbuh · commit ed617c8a3093 · 2024-03-21T20:37:36.000+01:00
* 6.4:
  preserve the file modification time when mirroring directories
  use local PHP web server to test HTTP stream wrappers
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -72,6 +72,9 @@ public function copy(string $originFile, string $targetFile, bool $overwriteNewe
                 // Like `cp`, preserve executable permission bits
                 self::box('chmod', $targetFile, fileperms($targetFile) | (fileperms($originFile) & 0111));
 
+                // Like `cp`, preserve the file modification time
+                self::box('touch', $targetFile, filemtime($originFile));
+
                 if ($bytesCopied !== $bytesOrigin = filesize($originFile)) {
                     throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s" (%g of %g bytes copied).', $originFile, $targetFile, $bytesCopied, $bytesOrigin), 0, null, $originFile);
                 }
diff --git a/src/Symfony/Component/Mime/Tests/Fixtures/web/index.php b/src/Symfony/Component/Mime/Tests/Fixtures/web/index.php
@@ -0,0 +1 @@
+<?php
diff --git a/src/Symfony/Component/Mime/Tests/Fixtures/web/logo_symfony_header.png b/src/Symfony/Component/Mime/Tests/Fixtures/web/logo_symfony_header.png
diff --git a/src/Symfony/Component/Mime/Tests/Part/DataPartTest.php b/src/Symfony/Component/Mime/Tests/Part/DataPartTest.php
@@ -18,6 +18,8 @@
 use Symfony\Component\Mime\Header\ParameterizedHeader;
 use Symfony\Component\Mime\Header\UnstructuredHeader;
 use Symfony\Component\Mime\Part\DataPart;
+use Symfony\Component\Process\PhpExecutableFinder;
+use Symfony\Component\Process\Process;
 
 class DataPartTest extends TestCase
 {
@@ -134,16 +136,22 @@ public function testFromPathWithNotAFile()
         DataPart::fromPath(__DIR__.'/../Fixtures/mimetypes/');
     }
 
-    /**
-     * @group network
-     */
     public function testFromPathWithUrl()
     {
         if (!\in_array('https', stream_get_wrappers())) {
             $this->markTestSkipped('"https" stream wrapper is not enabled.');
         }
 
-        $p = DataPart::fromPath($file = 'https://symfony.com/images/common/logo/logo_symfony_header.png');
+        $finder = new PhpExecutableFinder();
+        $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', '127.0.0.1:8057']));
+        $process->setWorkingDirectory(__DIR__.'/../Fixtures/web');
+        $process->start();
+
+        do {
+            usleep(50000);
+        } while (!@fopen('http://127.0.0.1:8057', 'r'));
+
+        $p = DataPart::fromPath($file = 'http://localhost:8057/logo_symfony_header.png');
         $content = file_get_contents($file);
         $this->assertEquals($content, $p->getBody());
         $maxLineLength = 76;
diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json
@@ -25,6 +25,7 @@
         "league/html-to-markdown": "^5.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
         "symfony/dependency-injection": "^6.4|^7.0",
+        "symfony/process": "^6.4|^7.0",
         "symfony/property-access": "^6.4|^7.0",
         "symfony/property-info": "^6.4|^7.0",
         "symfony/serializer": "^6.4|^7.0"

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,9 @@ public function copy(string $originFile, string $targetFile, bool $overwriteNewe`
`72`	`72`	// Like `cp`, preserve executable permission bits
`73`	`73`	`self::box('chmod', $targetFile, fileperms($targetFile) \| (fileperms($originFile) & 0111));`
`74`	`74`
	`75`	+ // Like `cp`, preserve the file modification time
	`76`	`+ self::box('touch', $targetFile, filemtime($originFile));`
	`77`	`+`
`75`	`78`	`if ($bytesCopied !== $bytesOrigin = filesize($originFile)) {`
`76`	`79`	`throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s" (%g of %g bytes copied).', $originFile, $targetFile, $bytesCopied, $bytesOrigin), 0, null, $originFile);`
`77`	`80`	`}`