Skip to content

Commit 45e9008

Browse files
committed
Merge branch '3.1'
* 3.1: fixed CS fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 [Security] Allow LDAP loadUser override removed dots at the end of @param and @return fixed typo
2 parents 3e52b8f + 322da5f commit 45e9008

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Exception/IOExceptionInterface.php

Lines changed: 1 addition & 1 deletion
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 The path
2525
*/
2626
public function getPath();
2727
}

Filesystem.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ public function rename($origin, $target, $overwrite = false)
283283
/**
284284
* Tells whether a file exists and is readable.
285285
*
286-
* @param string $filename Path to the file.
286+
* @param string $filename Path to the file
287287
*
288288
* @throws IOException When windows path is longer than 258 characters
289289
*/
@@ -522,11 +522,11 @@ public function isAbsolutePath($file)
522522
/**
523523
* Creates a temporary file with support for custom stream wrappers.
524524
*
525-
* @param string $dir The directory where the temporary filename will be created.
526-
* @param string $prefix The prefix of the generated temporary filename.
527-
* Note: Windows uses only the first three characters of prefix.
525+
* @param string $dir The directory where the temporary filename will be created
526+
* @param string $prefix The prefix of the generated temporary filename
527+
* Note: Windows uses only the first three characters of prefix
528528
*
529-
* @return string The new temporary filename (with path), or throw an exception on failure.
529+
* @return string The new temporary filename (with path), or throw an exception on failure
530530
*/
531531
public function tempnam($dir, $prefix)
532532
{
@@ -574,8 +574,8 @@ public function tempnam($dir, $prefix)
574574
/**
575575
* Atomically dumps content into a file.
576576
*
577-
* @param string $filename The file to be written to.
578-
* @param string $content The data to write into the file.
577+
* @param string $filename The file to be written to
578+
* @param string $content The data to write into the file
579579
*
580580
* @throws IOException If the file cannot be written to.
581581
*/
@@ -619,7 +619,7 @@ private function toIterator($files)
619619
/**
620620
* Gets a 2-tuple of scheme (may be null) and hierarchical part of a filename (e.g. file:///tmp -> array(file, tmp)).
621621
*
622-
* @param string $filename The filename to be parsed.
622+
* @param string $filename The filename to be parsed
623623
*
624624
* @return array The filename scheme and hierarchical part
625625
*/

0 commit comments

Comments
 (0)