Skip to content

Commit 253a449

Browse files
Merge branch '2.8' into 3.4
* 2.8: Another PR template tweak [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 [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 e078773 + 125403a commit 253a449

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
@@ -519,13 +519,18 @@ public function makePathRelative($endPath, $startPath)
519519
/**
520520
* Mirrors a directory to another.
521521
*
522+
* Copies files and directories from the origin directory into the target directory. By default:
523+
*
524+
* - existing files in the target directory will be overwritten, except if they are newer (see the `override` option)
525+
* - files in the target directory that do not exist in the source directory will not be deleted (see the `delete` option)
526+
*
522527
* @param string $originDir The origin directory
523528
* @param string $targetDir The target directory
524-
* @param \Traversable $iterator A Traversable instance
529+
* @param \Traversable $iterator Iterator that filters which files and directories to copy
525530
* @param array $options An array of boolean options
526531
* Valid options are:
527-
* - $options['override'] Whether to override an existing file on copy or not (see copy())
528-
* - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink())
532+
* - $options['override'] If true, target files newer than origin files are overwritten (see copy(), defaults to false)
533+
* - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink(), defaults to false)
529534
* - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
530535
*
531536
* @throws IOException When file type is unknown

0 commit comments

Comments
 (0)