Merge branch '2.8' into 3.4

* 2.8:
  Fix class documentation
  [Validator] Add a missing translation
  Fix phpdocs
  [EventDispatcher] Remove template method in test case
  Added LB translation for #27993 (UUID validator message translation)
  Replace deprecated validateValue with validate
This commit is contained in:
Fabien Potencier 2018-10-10 02:28:31 -07:00
commit 86a9e4a381
6 changed files with 23 additions and 15 deletions

View File

@ -369,10 +369,12 @@ class Command
/**
* Adds an argument.
*
* @param string $name The argument name
* @param int $mode The argument mode: InputArgument::REQUIRED or InputArgument::OPTIONAL
* @param string $description A description text
* @param mixed $default The default value (for InputArgument::OPTIONAL mode only)
* @param string $name The argument name
* @param int|null $mode The argument mode: self::REQUIRED or self::OPTIONAL
* @param string $description A description text
* @param string|string[]|null $default The default value (for self::OPTIONAL mode only)
*
* @throws InvalidArgumentException When argument mode is not valid
*
* @return $this
*/
@ -386,11 +388,13 @@ class Command
/**
* Adds an option.
*
* @param string $name The option name
* @param string $shortcut The shortcut (can be null)
* @param int $mode The option mode: One of the InputOption::VALUE_* constants
* @param string $description A description text
* @param mixed $default The default value (must be null for InputOption::VALUE_NONE)
* @param string $name The option name
* @param string|array $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
* @param int|null $mode The option mode: One of the VALUE_* constants
* @param string $description A description text
* @param string|string[]|bool|null $default The default value (must be null for self::VALUE_NONE)
*
* @throws InvalidArgumentException If option mode is invalid or incompatible
*
* @return $this
*/

View File

@ -31,8 +31,6 @@ class GenericEventTest extends TestCase
*/
protected function setUp()
{
parent::setUp();
$this->subject = new \stdClass();
$this->event = new GenericEvent($this->subject, array('name' => 'Event'));
}
@ -44,8 +42,6 @@ class GenericEventTest extends TestCase
{
$this->subject = null;
$this->event = null;
parent::tearDown();
}
public function testConstruct()

View File

@ -17,7 +17,7 @@ namespace Symfony\Component\HttpFoundation;
* A StreamedResponse uses a callback for its content.
*
* The callback should use the standard PHP functions like echo
* to stream the response back to the client. The flush() method
* to stream the response back to the client. The flush() function
* can also be used if needed.
*
* @see flush()

View File

@ -97,7 +97,7 @@ interface ExecutionContextInterface
* {
* $validator = $this->context->getValidator();
*
* $violations = $validator->validateValue($value, new Length(array('min' => 3)));
* $violations = $validator->validate($value, new Length(array('min' => 3)));
*
* if (count($violations) > 0) {
* // ...

View File

@ -318,6 +318,10 @@
<source>Error</source>
<target>Feeler</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>Dëst ass keng gëlteg UUID.</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -318,6 +318,10 @@
<source>Error</source>
<target>Błąd</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>To nie jest poprawne UUID.</target>
</trans-unit>
</body>
</file>
</xliff>