Skip to content
This repository was archived by the owner on Dec 9, 2023. It is now read-only.

Commit 06e2d52

Browse files
committed
Merge branch '3.0' into 3.1
* 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
2 parents 26786e2 + c54bc35 commit 06e2d52

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ErrorHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ private function reRegister($prev)
353353
* @param int $line
354354
* @param array $context
355355
*
356-
* @return bool Returns false when no handling happens so that the PHP engine can handle the error itself.
356+
* @return bool Returns false when no handling happens so that the PHP engine can handle the error itself
357357
*
358358
* @throws \ErrorException When $this->thrownErrors requests so
359359
*

ExceptionHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function setHandler(callable $handler = null)
8484
*
8585
* @param string $format The format for links to source files
8686
*
87-
* @return string The previous file link format.
87+
* @return string The previous file link format
8888
*/
8989
public function setFileLinkFormat($format)
9090
{

Tests/DebugClassLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
1919
{
2020
/**
21-
* @var int Error reporting level before running tests.
21+
* @var int Error reporting level before running tests
2222
*/
2323
private $errorReporting;
2424

0 commit comments

Comments
 (0)