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:
commit
86a9e4a381
@ -369,10 +369,12 @@ class Command
|
|||||||
/**
|
/**
|
||||||
* Adds an argument.
|
* Adds an argument.
|
||||||
*
|
*
|
||||||
* @param string $name The argument name
|
* @param string $name The argument name
|
||||||
* @param int $mode The argument mode: InputArgument::REQUIRED or InputArgument::OPTIONAL
|
* @param int|null $mode The argument mode: self::REQUIRED or self::OPTIONAL
|
||||||
* @param string $description A description text
|
* @param string $description A description text
|
||||||
* @param mixed $default The default value (for InputArgument::OPTIONAL mode only)
|
* @param string|string[]|null $default The default value (for self::OPTIONAL mode only)
|
||||||
|
*
|
||||||
|
* @throws InvalidArgumentException When argument mode is not valid
|
||||||
*
|
*
|
||||||
* @return $this
|
* @return $this
|
||||||
*/
|
*/
|
||||||
@ -386,11 +388,13 @@ class Command
|
|||||||
/**
|
/**
|
||||||
* Adds an option.
|
* Adds an option.
|
||||||
*
|
*
|
||||||
* @param string $name The option name
|
* @param string $name The option name
|
||||||
* @param string $shortcut The shortcut (can be null)
|
* @param string|array $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
|
||||||
* @param int $mode The option mode: One of the InputOption::VALUE_* constants
|
* @param int|null $mode The option mode: One of the VALUE_* constants
|
||||||
* @param string $description A description text
|
* @param string $description A description text
|
||||||
* @param mixed $default The default value (must be null for InputOption::VALUE_NONE)
|
* @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
|
* @return $this
|
||||||
*/
|
*/
|
||||||
|
@ -31,8 +31,6 @@ class GenericEventTest extends TestCase
|
|||||||
*/
|
*/
|
||||||
protected function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
parent::setUp();
|
|
||||||
|
|
||||||
$this->subject = new \stdClass();
|
$this->subject = new \stdClass();
|
||||||
$this->event = new GenericEvent($this->subject, array('name' => 'Event'));
|
$this->event = new GenericEvent($this->subject, array('name' => 'Event'));
|
||||||
}
|
}
|
||||||
@ -44,8 +42,6 @@ class GenericEventTest extends TestCase
|
|||||||
{
|
{
|
||||||
$this->subject = null;
|
$this->subject = null;
|
||||||
$this->event = null;
|
$this->event = null;
|
||||||
|
|
||||||
parent::tearDown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testConstruct()
|
public function testConstruct()
|
||||||
|
@ -17,7 +17,7 @@ namespace Symfony\Component\HttpFoundation;
|
|||||||
* A StreamedResponse uses a callback for its content.
|
* A StreamedResponse uses a callback for its content.
|
||||||
*
|
*
|
||||||
* The callback should use the standard PHP functions like echo
|
* 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.
|
* can also be used if needed.
|
||||||
*
|
*
|
||||||
* @see flush()
|
* @see flush()
|
||||||
|
@ -97,7 +97,7 @@ interface ExecutionContextInterface
|
|||||||
* {
|
* {
|
||||||
* $validator = $this->context->getValidator();
|
* $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) {
|
* if (count($violations) > 0) {
|
||||||
* // ...
|
* // ...
|
||||||
|
@ -318,6 +318,10 @@
|
|||||||
<source>Error</source>
|
<source>Error</source>
|
||||||
<target>Feeler</target>
|
<target>Feeler</target>
|
||||||
</trans-unit>
|
</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>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -318,6 +318,10 @@
|
|||||||
<source>Error</source>
|
<source>Error</source>
|
||||||
<target>Błąd</target>
|
<target>Błąd</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
|
<trans-unit id="83">
|
||||||
|
<source>This is not a valid UUID.</source>
|
||||||
|
<target>To nie jest poprawne UUID.</target>
|
||||||
|
</trans-unit>
|
||||||
</body>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
Reference in New Issue
Block a user