Merge branch '3.0' into 3.1

fabpot · fabpot · commit 322da5f0910d · 2016-06-29T07:41:56.000+02:00
* 3.0: fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 removed dots at the end of @param and @return fixed typo
diff --git a/Exception/IOExceptionInterface.php b/Exception/IOExceptionInterface.php
@@ -21,7 +21,7 @@ interface IOExceptionInterface extends ExceptionInterface
     /**
      * Returns the associated path for the exception.
      *
-     * @return string The path.
+     * @return string The path
      */
     public function getPath();
 }
diff --git a/Filesystem.php b/Filesystem.php
@@ -283,7 +283,7 @@ public function rename($origin, $target, $overwrite = false)
     /**
      * Tells whether a file exists and is readable.
      *
-     * @param string $filename Path to the file.
+     * @param string $filename Path to the file
      *
      * @throws IOException When windows path is longer than 258 characters
      */
@@ -479,11 +479,11 @@ public function isAbsolutePath($file)
     /**
      * Creates a temporary file with support for custom stream wrappers.
      *
-     * @param string $dir    The directory where the temporary filename will be created.
-     * @param string $prefix The prefix of the generated temporary filename.
-     *                       Note: Windows uses only the first three characters of prefix.
+     * @param string $dir    The directory where the temporary filename will be created
+     * @param string $prefix The prefix of the generated temporary filename
+     *                       Note: Windows uses only the first three characters of prefix
      *
-     * @return string The new temporary filename (with path), or throw an exception on failure.
+     * @return string The new temporary filename (with path), or throw an exception on failure
      */
     public function tempnam($dir, $prefix)
     {
@@ -531,8 +531,8 @@ public function tempnam($dir, $prefix)
     /**
      * Atomically dumps content into a file.
      *
-     * @param string $filename The file to be written to.
-     * @param string $content  The data to write into the file.
+     * @param string $filename The file to be written to
+     * @param string $content  The data to write into the file
      *
      * @throws IOException If the file cannot be written to.
      */
@@ -576,7 +576,7 @@ private function toIterator($files)
     /**
      * Gets a 2-tuple of scheme (may be null) and hierarchical part of a filename (e.g. file:///tmp -> array(file, tmp)).
      *
-     * @param string $filename The filename to be parsed.
+     * @param string $filename The filename to be parsed
      *
      * @return array The filename scheme and hierarchical part
      */

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ interface IOExceptionInterface extends ExceptionInterface`
`21`	`21`	`/**`
`22`	`22`	`* Returns the associated path for the exception.`
`23`	`23`	`*`
`24`		`- * @return string The path.`
	`24`	`+ * @return string The path`
`25`	`25`	`*/`
`26`	`26`	`public function getPath();`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ public function rename($origin, $target, $overwrite = false)`
`283`	`283`	`/**`
`284`	`284`	`* Tells whether a file exists and is readable.`
`285`	`285`	`*`
`286`		`- * @param string $filename Path to the file.`
	`286`	`+ * @param string $filename Path to the file`
`287`	`287`	`*`
`288`	`288`	`* @throws IOException When windows path is longer than 258 characters`
`289`	`289`	`*/`
`@@ -479,11 +479,11 @@ public function isAbsolutePath($file)`
`479`	`479`	`/**`
`480`	`480`	`* Creates a temporary file with support for custom stream wrappers.`
`481`	`481`	`*`
`482`		`- * @param string $dir The directory where the temporary filename will be created.`
`483`		`- * @param string $prefix The prefix of the generated temporary filename.`
`484`		`- * Note: Windows uses only the first three characters of prefix.`
	`482`	`+ * @param string $dir The directory where the temporary filename will be created`
	`483`	`+ * @param string $prefix The prefix of the generated temporary filename`
	`484`	`+ * Note: Windows uses only the first three characters of prefix`
`485`	`485`	`*`
`486`		`- * @return string The new temporary filename (with path), or throw an exception on failure.`
	`486`	`+ * @return string The new temporary filename (with path), or throw an exception on failure`
`487`	`487`	`*/`
`488`	`488`	`public function tempnam($dir, $prefix)`
`489`	`489`	`{`
`@@ -531,8 +531,8 @@ public function tempnam($dir, $prefix)`
`531`	`531`	`/**`
`532`	`532`	`* Atomically dumps content into a file.`
`533`	`533`	`*`
`534`		`- * @param string $filename The file to be written to.`
`535`		`- * @param string $content The data to write into the file.`
	`534`	`+ * @param string $filename The file to be written to`
	`535`	`+ * @param string $content The data to write into the file`
`536`	`536`	`*`
`537`	`537`	`* @throws IOException If the file cannot be written to.`
`538`	`538`	`*/`
`@@ -576,7 +576,7 @@ private function toIterator($files)`
`576`	`576`	`/**`
`577`	`577`	`* Gets a 2-tuple of scheme (may be null) and hierarchical part of a filename (e.g. file:///tmp -> array(file, tmp)).`
`578`	`578`	`*`
`579`		`- * @param string $filename The filename to be parsed.`
	`579`	`+ * @param string $filename The filename to be parsed`
`580`	`580`	`*`
`581`	`581`	`* @return array The filename scheme and hierarchical part`
`582`	`582`	`*/`