Skip to content

Commit e16b9e4

Browse files
Merge branch '3.4' into 4.2
* 3.4: [FrameworkBundle] Update the xsd to match the actual session configuration [Form] CsrfValidationListener marks the token as invalid if it is not a string [VarDumper] Fixed phpDoc [PhpUnitBridge] fix PHP 5.3 compat [Filesystem] Fixed some docblocks and typos bumped Symfony version to 3.4.23 updated VERSION for 3.4.22 update CONTRIBUTORS for 3.4.22 updated CHANGELOG for 3.4.22 fix some minor typos do not overwrite the constraint being evaluated
2 parents 7c16ebc + acf9975 commit e16b9e4

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Exception/IOExceptionInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ interface IOExceptionInterface extends ExceptionInterface
2121
/**
2222
* Returns the associated path for the exception.
2323
*
24-
* @return string The path
24+
* @return string|null The path
2525
*/
2626
public function getPath();
2727
}

Filesystem.php

+13-13
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ public function exists($files)
138138
* Sets access and modification time of file.
139139
*
140140
* @param string|iterable $files A filename, an array of files, or a \Traversable instance to create
141-
* @param int $time The touch time as a Unix timestamp
142-
* @param int $atime The access time as a Unix timestamp
141+
* @param int|null $time The touch time as a Unix timestamp, if not supplied the current system time is used
142+
* @param int|null $atime The access time as a Unix timestamp, if not supplied the current system time is used
143143
*
144144
* @throws IOException When touch fails
145145
*/
@@ -194,7 +194,7 @@ public function remove($files)
194194
* @param int $umask The mode mask (octal)
195195
* @param bool $recursive Whether change the mod recursively or not
196196
*
197-
* @throws IOException When the change fail
197+
* @throws IOException When the change fails
198198
*/
199199
public function chmod($files, $mode, $umask = 0000, $recursive = false)
200200
{
@@ -215,7 +215,7 @@ public function chmod($files, $mode, $umask = 0000, $recursive = false)
215215
* @param string $user The new owner user name
216216
* @param bool $recursive Whether change the owner recursively or not
217217
*
218-
* @throws IOException When the change fail
218+
* @throws IOException When the change fails
219219
*/
220220
public function chown($files, $user, $recursive = false)
221221
{
@@ -242,7 +242,7 @@ public function chown($files, $user, $recursive = false)
242242
* @param string $group The group name
243243
* @param bool $recursive Whether change the group recursively or not
244244
*
245-
* @throws IOException When the change fail
245+
* @throws IOException When the change fails
246246
*/
247247
public function chgrp($files, $group, $recursive = false)
248248
{
@@ -524,14 +524,14 @@ public function makePathRelative($endPath, $startPath)
524524
* - existing files in the target directory will be overwritten, except if they are newer (see the `override` option)
525525
* - files in the target directory that do not exist in the source directory will not be deleted (see the `delete` option)
526526
*
527-
* @param string $originDir The origin directory
528-
* @param string $targetDir The target directory
529-
* @param \Traversable $iterator Iterator that filters which files and directories to copy
530-
* @param array $options An array of boolean options
531-
* Valid options are:
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)
534-
* - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
527+
* @param string $originDir The origin directory
528+
* @param string $targetDir The target directory
529+
* @param \Traversable|null $iterator Iterator that filters which files and directories to copy, if null a recursive iterator is created
530+
* @param array $options An array of boolean options
531+
* Valid options are:
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)
534+
* - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
535535
*
536536
* @throws IOException When file type is unknown
537537
*/

0 commit comments

Comments
 (0)