Skip to content

Commit 5d2d655

Browse files
Merge branch '3.4' into 4.0
* 3.4: [Translation] Process multiple segments within a single unit. Document the container.autowiring.strict_mode option fix custom radios/inputs for checkbox/radio type Another PR template tweak [FrameworkBundle] Add missing XML config for circular_reference_handler. Add tests. fix CS [PropertyInfo] ReflectionExtractor: give a chance to other extractors if no properties Clean calls to http_build_query() [WebProfilerBundle] limit ajax request to 100 and remove the last one Add support for URL-like DSNs for the PdoSessionHandler [HttpFoundation] Fix missing "throw" in JsonResponse Improve the documentation of Suppress warning from sapi_windows_vt100_support on stream other than STDIO removed extra-verbose comments Fixes #26136: Avoid emitting warning in hasParameterOption() Added a README entry to the PR template [HttpFoundation] Add x-zip-compressed to MimeTypeExtensionGuesser. [DI] Add null check for removeChild
2 parents 760e47a + 253a449 commit 5d2d655

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Filesystem.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,13 +524,18 @@ public function makePathRelative($endPath, $startPath)
524524
/**
525525
* Mirrors a directory to another.
526526
*
527+
* Copies files and directories from the origin directory into the target directory. By default:
528+
*
529+
* - existing files in the target directory will be overwritten, except if they are newer (see the `override` option)
530+
* - files in the target directory that do not exist in the source directory will not be deleted (see the `delete` option)
531+
*
527532
* @param string $originDir The origin directory
528533
* @param string $targetDir The target directory
529-
* @param \Traversable $iterator A Traversable instance
534+
* @param \Traversable $iterator Iterator that filters which files and directories to copy
530535
* @param array $options An array of boolean options
531536
* Valid options are:
532-
* - $options['override'] Whether to override an existing file on copy or not (see copy())
533-
* - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink())
537+
* - $options['override'] If true, target files newer than origin files are overwritten (see copy(), defaults to false)
538+
* - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink(), defaults to false)
534539
* - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
535540
*
536541
* @throws IOException When file type is unknown

0 commit comments

Comments
 (0)