diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CS fixes

Browse Source
This commit is contained in:
Graham Campbell 2014-12-04 20:26:11 +00:00
parent 9aff1ec93c
commit ed4fb54901
68 changed files with 204 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
View File

@ -310,10 +310,10 @@ abstract class AbstractDoctrineExtension extends Extension
/** /**
* Loads a cache driver. * Loads a cache driver.
* *
* @param string $cacheDriverServiceId The cache driver name. * @param string $cacheDriverServiceId The cache driver name.
* @param string $objectManagerName The object manager name. * @param string $objectManagerName The object manager name.
* @param array $cacheDriver The cache driver mapping. * @param array $cacheDriver The cache driver mapping.
* @param \Symfony\Component\DependencyInjection\ContainerBuilder $container The ContainerBuilder instance. * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container The ContainerBuilder instance.
* *
* @return string * @return string
* *

2
src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
View File

@ -167,7 +167,7 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe
/** /**
* Updates the logging level based on the verbosity setting of the console output. * Updates the logging level based on the verbosity setting of the console output.
* *
* @return bool Whether the handler is enabled and verbosity is not set to quiet. * @return bool Whether the handler is enabled and verbosity is not set to quiet.
*/ */
private function updateLevel() private function updateLevel()
{ {

6
src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
View File

@ -108,9 +108,9 @@ EOF
} }
/** /**
* @param string $warmupDir * @param string $warmupDir
* @param string $realCacheDir * @param string $realCacheDir
* @param bool $enableOptionalWarmers * @param bool $enableOptionalWarmers
*/ */
protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = true) protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = true)
{ {

4
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
View File

@ -74,8 +74,8 @@ abstract class Descriptor implements DescriptorInterface
/** /**
* Writes content to output. * Writes content to output.
* *
* @param string $content * @param string $content
* @param bool $decorated * @param bool $decorated
*/ */
protected function write($content, $decorated = false) protected function write($content, $decorated = false)
{ {

11
src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
View File

@ -48,10 +48,10 @@ class AssetsExtension extends \Twig_Extension
* *
* Absolute paths (i.e. http://...) are returned unmodified. * Absolute paths (i.e. http://...) are returned unmodified.
* *
* @param string $path A public path * @param string $path A public path
* @param string $packageName The name of the asset package to use * @param string $packageName The name of the asset package to use
* @param bool $absolute Whether to return an absolute URL or a relative one * @param bool $absolute Whether to return an absolute URL or a relative one
* @param string|bool|null $version A specific version * @param string|bool|null $version A specific version
* *
* @return string A public path which takes into account the base path and URL path * @return string A public path which takes into account the base path and URL path
*/ */
@ -93,8 +93,9 @@ class AssetsExtension extends \Twig_Extension
* *
* @param string $url The URL that has to be absolute * @param string $url The URL that has to be absolute
* *
* @return string The absolute URL
* @throws \RuntimeException * @throws \RuntimeException
*
* @return string The absolute URL
*/ */
private function ensureUrlIsAbsolute($url) private function ensureUrlIsAbsolute($url)
{ {

2
src/Symfony/Component/ClassLoader/Psr4ClassLoader.php
View File

@ -77,7 +77,7 @@ class Psr4ClassLoader
/** /**
* Registers this instance as an autoloader. * Registers this instance as an autoloader.
* *
* @param bool $prepend * @param bool $prepend
*/ */
public function register($prepend = false) public function register($prepend = false)
{ {

8
src/Symfony/Component/Console/Application.php
View File

@ -815,8 +815,8 @@ class Application
* *
* Can be useful to force terminal dimensions for functional tests. * Can be useful to force terminal dimensions for functional tests.
* *
* @param int $width The width * @param int $width The width
* @param int $height The height * @param int $height The height
* *
* @return Application The current application * @return Application The current application
*/ */
@ -1050,8 +1050,8 @@ class Application
* Finds alternative of $name among $collection, * Finds alternative of $name among $collection,
* if nothing is found in $collection, try in $abbrevs * if nothing is found in $collection, try in $abbrevs
* *
* @param string $name The string * @param string $name The string
* @param array|\Traversable $collection The collection * @param array|\Traversable $collection The collection
* *
* @return array A sorted array of similar string * @return array A sorted array of similar string
*/ */

4
src/Symfony/Component/Console/Descriptor/Descriptor.php
View File

@ -59,8 +59,8 @@ abstract class Descriptor implements DescriptorInterface
/** /**
* Writes content to output. * Writes content to output.
* *
* @param string $content * @param string $content
* @param bool $decorated * @param bool $decorated
*/ */
protected function write($content, $decorated = false) protected function write($content, $decorated = false)
{ {

20
src/Symfony/Component/Console/Helper/ProgressBar.php
View File

@ -150,7 +150,7 @@ class ProgressBar
/** /**
* Gets the progress bar start time. * Gets the progress bar start time.
* *
* @return int The progress bar start time * @return int The progress bar start time
*/ */
public function getStartTime() public function getStartTime()
{ {
@ -160,7 +160,7 @@ class ProgressBar
/** /**
* Gets the progress bar maximal steps. * Gets the progress bar maximal steps.
* *
* @return int The progress bar max steps * @return int The progress bar max steps
*/ */
public function getMaxSteps() public function getMaxSteps()
{ {
@ -170,7 +170,7 @@ class ProgressBar
/** /**
* Gets the progress bar step. * Gets the progress bar step.
* *
* @return int The progress bar step * @return int The progress bar step
*/ */
public function getStep() public function getStep()
{ {
@ -180,7 +180,7 @@ class ProgressBar
/** /**
* Gets the progress bar step width. * Gets the progress bar step width.
* *
* @return int The progress bar step width * @return int The progress bar step width
*/ */
public function getStepWidth() public function getStepWidth()
{ {
@ -190,7 +190,7 @@ class ProgressBar
/** /**
* Gets the current progress bar percent. * Gets the current progress bar percent.
* *
* @return int The current progress bar percent * @return int The current progress bar percent
*/ */
public function getProgressPercent() public function getProgressPercent()
{ {
@ -200,7 +200,7 @@ class ProgressBar
/** /**
* Sets the progress bar width. * Sets the progress bar width.
* *
* @param int $size The progress bar size * @param int $size The progress bar size
*/ */
public function setBarWidth($size) public function setBarWidth($size)
{ {
@ -210,7 +210,7 @@ class ProgressBar
/** /**
* Gets the progress bar width. * Gets the progress bar width.
* *
* @return int The progress bar size * @return int The progress bar size
*/ */
public function getBarWidth() public function getBarWidth()
{ {
@ -299,7 +299,7 @@ class ProgressBar
/** /**
* Sets the redraw frequency. * Sets the redraw frequency.
* *
* @param int $freq The frequency in steps * @param int $freq The frequency in steps
*/ */
public function setRedrawFrequency($freq) public function setRedrawFrequency($freq)
{ {
@ -328,7 +328,7 @@ class ProgressBar
/** /**
* Advances the progress output X steps. * Advances the progress output X steps.
* *
* @param int $step Number of steps to advance * @param int $step Number of steps to advance
* *
* @throws \LogicException * @throws \LogicException
*/ */
@ -340,7 +340,7 @@ class ProgressBar
/** /**
* Sets the current progress. * Sets the current progress.
* *
* @param int $step The current progress * @param int $step The current progress
* *
* @throws \LogicException * @throws \LogicException
*/ */

16
src/Symfony/Component/Console/Helper/QuestionHelper.php
View File

@ -164,7 +164,7 @@ class QuestionHelper extends Helper
* Autocompletes a question. * Autocompletes a question.
* *
* @param OutputInterface $output * @param OutputInterface $output
* @param Question $question * @param Question $question
* *
* @return string * @return string
*/ */
@ -281,9 +281,9 @@ class QuestionHelper extends Helper
/** /**
* Gets a hidden response from user. * Gets a hidden response from user.
* *
* @param OutputInterface $output An Output instance * @param OutputInterface $output An Output instance
* *
* @return string The answer * @return string The answer
* *
* @throws \RuntimeException In case the fallback is deactivated and the response cannot be hidden * @throws \RuntimeException In case the fallback is deactivated and the response cannot be hidden
*/ */
@ -341,11 +341,11 @@ class QuestionHelper extends Helper
/** /**
* Validates an attempt. * Validates an attempt.
* *
* @param callable $interviewer A callable that will ask for a question and return the result * @param callable $interviewer A callable that will ask for a question and return the result
* @param OutputInterface $output An Output instance * @param OutputInterface $output An Output instance
* @param Question $question A Question instance * @param Question $question A Question instance
* *
* @return string The validated response * @return string The validated response
* *
* @throws \Exception In case the max number of attempts has been reached and no valid response has been given * @throws \Exception In case the max number of attempts has been reached and no valid response has been given
*/ */
@ -370,7 +370,7 @@ class QuestionHelper extends Helper
/** /**
* Returns a valid unix shell. * Returns a valid unix shell.
* *
* @return string|bool The valid shell name, false in case no valid shell is found * @return string|bool The valid shell name, false in case no valid shell is found
*/ */
private function getShell() private function getShell()
{ {

12
src/Symfony/Component/Console/Helper/Table.php
View File

@ -296,9 +296,9 @@ class Table
/** /**
* Renders table cell with padding. * Renders table cell with padding.
* *
* @param array $row * @param array $row
* @param int $column * @param int $column
* @param string $cellFormat * @param string $cellFormat
*/ */
private function renderCell(array $row, $column, $cellFormat) private function renderCell(array $row, $column, $cellFormat)
{ {
@ -339,7 +339,7 @@ class Table
/** /**
* Gets column width. * Gets column width.
* *
* @param int $column * @param int $column
* *
* @return int * @return int
*/ */
@ -364,8 +364,8 @@ class Table
/** /**
* Gets cell width. * Gets cell width.
* *
* @param array $row * @param array $row
* @param int $column * @param int $column
* *
* @return int * @return int
*/ */

2
src/Symfony/Component/Console/Helper/TableStyle.php
View File

@ -228,7 +228,7 @@ class TableStyle
/** /**
* Sets cell padding type. * Sets cell padding type.
* *
* @param int $padType STR_PAD_* * @param int $padType STR_PAD_*
* *
* @return TableStyle * @return TableStyle
*/ */

6
src/Symfony/Component/Console/Logger/ConsoleLogger.php
View File

@ -96,8 +96,10 @@ class ConsoleLogger extends AbstractLogger
* Interpolates context values into the message placeholders * Interpolates context values into the message placeholders
* *
* @author PHP Framework Interoperability Group * @author PHP Framework Interoperability Group
* @param string $message *
* @param array $context * @param string $message
* @param array $context
*
* @return string * @return string
*/ */
private function interpolate($message, array $context) private function interpolate($message, array $context)

2
src/Symfony/Component/Console/Question/ChoiceQuestion.php
View File

@ -47,7 +47,7 @@ class ChoiceQuestion extends Question
* *
* When multiselect is set to true, multiple choices can be answered. * When multiselect is set to true, multiple choices can be answered.
* *
* @param bool $multiselect * @param bool $multiselect
* *
* @return ChoiceQuestion The current instance * @return ChoiceQuestion The current instance
*/ */

6
src/Symfony/Component/Console/Question/Question.php
View File

@ -72,7 +72,7 @@ class Question
/** /**
* Sets whether the user response must be hidden or not. * Sets whether the user response must be hidden or not.
* *
* @param bool $hidden * @param bool $hidden
* *
* @return Question The current instance * @return Question The current instance
* *
@ -102,7 +102,7 @@ class Question
/** /**
* Sets whether to fallback on non-hidden question if the response can not be hidden. * Sets whether to fallback on non-hidden question if the response can not be hidden.
* *
* @param bool $fallback * @param bool $fallback
* *
* @return Question The current instance * @return Question The current instance
*/ */
@ -179,7 +179,7 @@ class Question
* *
* Null means an unlimited number of attempts. * Null means an unlimited number of attempts.
* *
* @param null|int $attempts * @param null|int $attempts
* *
* @return Question The current instance * @return Question The current instance
* *

2
src/Symfony/Component/Console/Tester/ApplicationTester.php
View File

@ -119,7 +119,7 @@ class ApplicationTester
/** /**
* Gets the status code returned by the last execution of the application. * Gets the status code returned by the last execution of the application.
* *
* @return int The status code * @return int The status code
*/ */
public function getStatusCode() public function getStatusCode()
{ {

2
src/Symfony/Component/Console/Tester/CommandTester.php
View File

@ -123,7 +123,7 @@ class CommandTester
/** /**
* Gets the status code returned by the last execution of the application. * Gets the status code returned by the last execution of the application.
* *
* @return int The status code * @return int The status code
*/ */
public function getStatusCode() public function getStatusCode()
{ {

4
src/Symfony/Component/Debug/DebugClassLoader.php
View File

@ -140,7 +140,7 @@ class DebugClassLoader
* *
* @param string $class The name of the class * @param string $class The name of the class
* *
* @return bool|null True, if loaded * @return bool|null True, if loaded
* *
* @throws \RuntimeException * @throws \RuntimeException
*/ */
@ -213,7 +213,7 @@ class DebugClassLoader
chdir($cwd); chdir($cwd);
} }
if ( 0 === substr_compare($real, $tail, -strlen($tail), strlen($tail), true) if (0 === substr_compare($real, $tail, -strlen($tail), strlen($tail), true)
&& 0 !== substr_compare($real, $tail, -strlen($tail), strlen($tail), false) && 0 !== substr_compare($real, $tail, -strlen($tail), strlen($tail), false)
) { ) {
throw new \RuntimeException(sprintf('Case mismatch between class and source file names: %s vs %s', $class, $real)); throw new \RuntimeException(sprintf('Case mismatch between class and source file names: %s vs %s', $class, $real));

4
src/Symfony/Component/Debug/ErrorHandler.php
View File

@ -88,7 +88,7 @@ class ErrorHandler
/** /**
* Sets the level at which the conversion to Exception is done. * Sets the level at which the conversion to Exception is done.
* *
* @param int|null $level The level (null to use the error_reporting() value and 0 to disable) * @param int|null $level The level (null to use the error_reporting() value and 0 to disable)
*/ */
public function setLevel($level) public function setLevel($level)
{ {
@ -98,7 +98,7 @@ class ErrorHandler
/** /**
* Sets the display_errors flag value. * Sets the display_errors flag value.
* *
* @param int $displayErrors The display_errors flag value * @param int $displayErrors The display_errors flag value
*/ */
public function setDisplayErrors($displayErrors) public function setDisplayErrors($displayErrors)
{ {

2
src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
View File

@ -30,7 +30,7 @@ class DecoratorServicePass implements CompilerPassInterface
} }
$definition->setDecoratedService(null); $definition->setDecoratedService(null);
list ($inner, $renamedId) = $decorated; list($inner, $renamedId) = $decorated;
if (!$renamedId) { if (!$renamedId) {
$renamedId = $id.'.inner'; $renamedId = $id.'.inner';
} }

2
src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
View File

@ -142,7 +142,7 @@ class XmlDumper extends Dumper
$service->setAttribute('lazy', 'true'); $service->setAttribute('lazy', 'true');
} }
if (null !== $decorated = $definition->getDecoratedService()) { if (null !== $decorated = $definition->getDecoratedService()) {
list ($decorated, $renamedId) = $decorated; list($decorated, $renamedId) = $decorated;
$service->setAttribute('decorates', $decorated); $service->setAttribute('decorates', $decorated);
if (null !== $renamedId) { if (null !== $renamedId) {
$service->setAttribute('decoration-inner-name', $renamedId); $service->setAttribute('decoration-inner-name', $renamedId);

2
src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
View File

@ -140,7 +140,7 @@ class YamlDumper extends Dumper
} }
if (null !== $decorated = $definition->getDecoratedService()) { if (null !== $decorated = $definition->getDecoratedService()) {
list ($decorated, $renamedId) = $decorated; list($decorated, $renamedId) = $decorated;
$code .= sprintf(" decorates: %s\n", $decorated); $code .= sprintf(" decorates: %s\n", $decorated);
if (null !== $renamedId) { if (null !== $renamedId) {
$code .= sprintf(" decoration_inner_name: %s\n", $renamedId); $code .= sprintf(" decoration_inner_name: %s\n", $renamedId);

10
src/Symfony/Component/ExpressionLanguage/Token.php
View File

@ -32,9 +32,9 @@ class Token
/** /**
* Constructor. * Constructor.
* *
* @param int $type The type of the token * @param int $type The type of the token
* @param string $value The token value * @param string $value The token value
* @param int $cursor The cursor position in the source * @param int $cursor The cursor position in the source
*/ */
public function __construct($type, $value, $cursor) public function __construct($type, $value, $cursor)
{ {
@ -56,8 +56,8 @@ class Token
/** /**
* Tests the current token for a type and/or a value. * Tests the current token for a type and/or a value.
* *
* @param array|int $type The type to test * @param array|int $type The type to test
* @param string|null $value The token value * @param string|null $value The token value
* *
* @return bool * @return bool
*/ */

4
src/Symfony/Component/Filesystem/Filesystem.php
View File

@ -32,8 +32,8 @@ class Filesystem
* @param string $targetFile The target filename * @param string $targetFile The target filename
* @param bool $override Whether to override an existing file or not * @param bool $override Whether to override an existing file or not
* *
* @throws FileNotFoundException When originFile doesn't exist * @throws FileNotFoundException When originFile doesn't exist
* @throws IOException When copy fails * @throws IOException When copy fails
*/ */
public function copy($originFile, $targetFile, $override = false) public function copy($originFile, $targetFile, $override = false)
{ {

2
src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
View File

@ -65,7 +65,7 @@ class FilesystemTestCase extends \PHPUnit_Framework_TestCase
} }
/** /**
* @param int $expectedFilePerms expected file permissions as three digits (i.e. 755) * @param int $expectedFilePerms expected file permissions as three digits (i.e. 755)
* @param string $filePath * @param string $filePath
*/ */
protected function assertFilePermissions($expectedFilePerms, $filePath) protected function assertFilePermissions($expectedFilePerms, $filePath)

4
src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
View File

@ -242,9 +242,9 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
/** /**
* Rounds a number according to the configured precision and rounding mode. * Rounds a number according to the configured precision and rounding mode.
* *
* @param int|float $number A number. * @param int|float $number A number.
* *
* @return int|float The rounded number. * @return int|float The rounded number.
*/ */
private function round($number) private function round($number)
{ {

4
src/Symfony/Component/Form/Form.php
View File

@ -1128,8 +1128,8 @@ class Form implements \IteratorAggregate, FormInterface
/** /**
* Utility function for indenting multi-line strings. * Utility function for indenting multi-line strings.
* *
* @param string $string The string * @param string $string The string
* @param int $level The number of spaces to use for indentation * @param int $level The number of spaces to use for indentation
* *
* @return string The indented string * @return string The indented string
*/ */

12
src/Symfony/Component/Form/FormError.php
View File

@ -61,12 +61,12 @@ class FormError implements \Serializable
* Any array key in $messageParameters will be used as a placeholder in * Any array key in $messageParameters will be used as a placeholder in
* $messageTemplate. * $messageTemplate.
* *
* @param string $message The translated error message * @param string $message The translated error message
* @param string|null $messageTemplate The template for the error message * @param string|null $messageTemplate The template for the error message
* @param array $messageParameters The parameters that should be * @param array $messageParameters The parameters that should be
* substituted in the message template * substituted in the message template
* @param int|null $messagePluralization The value for error message pluralization * @param int|null $messagePluralization The value for error message pluralization
* @param mixed $cause The cause of the error * @param mixed $cause The cause of the error
* *
* @see \Symfony\Component\Translation\Translator * @see \Symfony\Component\Translation\Translator
*/ */

16
src/Symfony/Component/Form/FormErrorIterator.php
View File

@ -128,7 +128,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
/** /**
* Returns the current position of the iterator. * Returns the current position of the iterator.
* *
* @return int The 0-indexed position. * @return int The 0-indexed position.
*/ */
public function key() public function key()
{ {
@ -138,7 +138,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
/** /**
* Returns whether the iterator's position is valid. * Returns whether the iterator's position is valid.
* *
* @return bool Whether the iterator is valid. * @return bool Whether the iterator is valid.
*/ */
public function valid() public function valid()
{ {
@ -159,9 +159,9 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
/** /**
* Returns whether a position exists in the iterator. * Returns whether a position exists in the iterator.
* *
* @param int $position The position * @param int $position The position
* *
* @return bool Whether that position exists * @return bool Whether that position exists
*/ */
public function offsetExists($position) public function offsetExists($position)
{ {
@ -171,7 +171,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
/** /**
* Returns the element at a position in the iterator. * Returns the element at a position in the iterator.
* *
* @param int $position The position * @param int $position The position
* *
* @return FormError|FormErrorIterator The element at the given position * @return FormError|FormErrorIterator The element at the given position
* *
@ -210,7 +210,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
* Returns whether the current element of the iterator can be recursed * Returns whether the current element of the iterator can be recursed
* into. * into.
* *
* @return bool Whether the current element is an instance of this class * @return bool Whether the current element is an instance of this class
*/ */
public function hasChildren() public function hasChildren()
{ {
@ -240,7 +240,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
* *
* $count = count($form->getErrors(true, true)); * $count = count($form->getErrors(true, true));
* *
* @return int The number of iterated elements * @return int The number of iterated elements
*/ */
public function count() public function count()
{ {
@ -250,7 +250,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
/** /**
* Sets the position of the iterator. * Sets the position of the iterator.
* *
* @param int $position The new position * @param int $position The new position
* *
* @throws OutOfBoundsException If the position is invalid * @throws OutOfBoundsException If the position is invalid
*/ */

6
src/Symfony/Component/Form/FormInterface.php
View File

@ -94,9 +94,9 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
/** /**
* Returns the errors of this form. * Returns the errors of this form.
* *
* @param bool $deep Whether to include errors of child forms as well * @param bool $deep Whether to include errors of child forms as well
* @param bool $flatten Whether to flatten the list of errors in case * @param bool $flatten Whether to flatten the list of errors in case
* $deep is set to true * $deep is set to true
* *
* @return FormErrorIterator An iterator over the {@link FormError} * @return FormErrorIterator An iterator over the {@link FormError}
* instances that where added to this form * instances that where added to this form

2
src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
View File

@ -213,7 +213,7 @@ class ViolationMapperTest extends \PHPUnit_Framework_TestCase
$violation = $this->getConstraintViolation('children[address].data.street'); $violation = $this->getConstraintViolation('children[address].data.street');
$parent = $this->getForm('parent'); $parent = $this->getForm('parent');
$child = $this->getForm('address', 'address'); $child = $this->getForm('address', 'address');
$grandChild = $this->getForm('street' , 'street'); $grandChild = $this->getForm('street', 'street');
$parent->add($child); $parent->add($child);
$child->add($grandChild); $child->add($grandChild);

2
src/Symfony/Component/Form/Util/ServerParams.php
View File

@ -28,7 +28,7 @@ class ServerParams
/** /**
* Returns maximum post size in bytes. * Returns maximum post size in bytes.
* *
* @return null|int The maximum post size in bytes * @return null|int The maximum post size in bytes
*/ */
public function getPostMaxSize() public function getPostMaxSize()
{ {

2
src/Symfony/Component/HttpFoundation/JsonResponse.php
View File

@ -139,7 +139,7 @@ class JsonResponse extends Response
/** /**
* Sets options used while encoding data to JSON. * Sets options used while encoding data to JSON.
* *
* @param int $encodingOptions * @param int $encodingOptions
* *
* @return JsonResponse * @return JsonResponse
*/ */

2
src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
View File

@ -148,7 +148,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
/** /**
* Returns the number of attributes. * Returns the number of attributes.
* *
* @return int The number of attributes * @return int The number of attributes
*/ */
public function count() public function count()
{ {

4
src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
View File

@ -56,8 +56,8 @@ class MetadataBag implements SessionBagInterface
/** /**
* Constructor. * Constructor.
* *
* @param string $storageKey The key used to store bag in the session. * @param string $storageKey The key used to store bag in the session.
* @param int $updateThreshold The time to wait between two UPDATED updates * @param int $updateThreshold The time to wait between two UPDATED updates
*/ */
public function __construct($storageKey = '_sf2_meta', $updateThreshold = 0) public function __construct($storageKey = '_sf2_meta', $updateThreshold = 0)
{ {

6
src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php
View File

@ -19,9 +19,9 @@ class ValueExporter
/** /**
* Converts a PHP value to a string. * Converts a PHP value to a string.
* *
* @param mixed $value The PHP value * @param mixed $value The PHP value
* @param int $depth only for internal usage * @param int $depth only for internal usage
* @param bool $deep only for internal usage * @param bool $deep only for internal usage
* *
* @return string The string representation of the given value * @return string The string representation of the given value
*/ */

2
src/Symfony/Component/HttpKernel/Event/KernelEvent.php
View File

@ -90,7 +90,7 @@ class KernelEvent extends Event
/** /**
* Checks if this is a master request. * Checks if this is a master request.
* *
* @return bool True if the request is a master request * @return bool True if the request is a master request
* *
* @api * @api
*/ */

2
src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
View File

@ -104,7 +104,7 @@ class ExceptionListener implements EventSubscriberInterface
* Clones the request for the exception. * Clones the request for the exception.
* *
* @param \Exception $exception The thrown exception. * @param \Exception $exception The thrown exception.
* @param Request $request The original request. * @param Request $request The original request.
* *
* @return Request $request The cloned request. * @return Request $request The cloned request.
*/ */

1
src/Symfony/Component/HttpKernel/EventListener/SaveSessionListener.php
View File

@ -13,7 +13,6 @@ namespace Symfony\Component\HttpKernel\EventListener;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent; use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\KernelEvents;
/** /**

6
src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php
View File

@ -21,9 +21,9 @@ class UnprocessableEntityHttpException extends HttpException
/** /**
* Constructor. * Constructor.
* *
* @param string $message The internal exception message * @param string $message The internal exception message
* @param \Exception $previous The previous exception * @param \Exception $previous The previous exception
* @param int $code The internal exception code * @param int $code The internal exception code
*/ */
public function __construct($message = null, \Exception $previous = null, $code = 0) public function __construct($message = null, \Exception $previous = null, $code = 0)
{ {

2
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
View File

@ -11,8 +11,6 @@
namespace Symfony\Component\HttpKernel\Tests\Bundle; namespace Symfony\Component\HttpKernel\Tests\Bundle;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle; use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand; use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand;
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle; use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle;

6
src/Symfony/Component/Process/Process.php
View File

@ -906,7 +906,7 @@ class Process
* *
* To disable the timeout, set this value to null. * To disable the timeout, set this value to null.
* *
* @param int|float|null $timeout The timeout in seconds * @param int|float|null $timeout The timeout in seconds
* *
* @return self The current Process instance. * @return self The current Process instance.
* *
@ -957,7 +957,7 @@ class Process
/** /**
* Sets PTY mode. * Sets PTY mode.
* *
* @param bool $bool * @param bool $bool
* *
* @return self * @return self
*/ */
@ -1338,7 +1338,7 @@ class Process
/** /**
* Validates and returns the filtered timeout. * Validates and returns the filtered timeout.
* *
* @param int|float|null $timeout * @param int|float|null $timeout
* *
* @return float|null * @return float|null
* *

4
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
View File

@ -213,7 +213,7 @@ class PropertyAccessor implements PropertyAccessorInterface
* @return array The values read in the path. * @return array The values read in the path.
* *
* @throws UnexpectedTypeException If a value within the path is neither object nor array. * @throws UnexpectedTypeException If a value within the path is neither object nor array.
* @throws NoSuchIndexException If a non-existing index is accessed * @throws NoSuchIndexException If a non-existing index is accessed
*/ */
private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $propertyPath, $lastIndex, $ignoreInvalidIndices = true) private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $propertyPath, $lastIndex, $ignoreInvalidIndices = true)
{ {
@ -519,7 +519,7 @@ class PropertyAccessor implements PropertyAccessorInterface
* @param object $object The object to write to * @param object $object The object to write to
* @param string $property The property to write * @param string $property The property to write
* *
* @return bool Whether the property is writable * @return bool Whether the property is writable
*/ */
private function isPropertyWritable($object, $property) private function isPropertyWritable($object, $property)
{ {

2
src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
View File

@ -85,7 +85,7 @@ class PropertyAccessorBuilder
} }
/** /**
* @return bool true is exceptions in read context for array is enabled * @return bool true is exceptions in read context for array is enabled
*/ */
public function isExceptionOnInvalidIndexEnabled() public function isExceptionOnInvalidIndexEnabled()
{ {

4
src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
View File

@ -92,7 +92,7 @@ interface PropertyAccessorInterface
* @param object|array $objectOrArray The object or array to check * @param object|array $objectOrArray The object or array to check
* @param string|PropertyPathInterface $propertyPath The property path to check * @param string|PropertyPathInterface $propertyPath The property path to check
* *
* @return bool Whether the value can be set * @return bool Whether the value can be set
* *
* @throws Exception\InvalidArgumentException If the property path is invalid * @throws Exception\InvalidArgumentException If the property path is invalid
*/ */
@ -107,7 +107,7 @@ interface PropertyAccessorInterface
* @param object|array $objectOrArray The object or array to check * @param object|array $objectOrArray The object or array to check
* @param string|PropertyPathInterface $propertyPath The property path to check * @param string|PropertyPathInterface $propertyPath The property path to check
* *
* @return bool Whether the property path can be read * @return bool Whether the property path can be read
* *
* @throws Exception\InvalidArgumentException If the property path is invalid * @throws Exception\InvalidArgumentException If the property path is invalid
*/ */

2
src/Symfony/Component/Routing/Route.php
View File

@ -268,7 +268,7 @@ class Route implements \Serializable
* *
* @param string $scheme * @param string $scheme
* *
* @return bool true if the scheme requirement exists, otherwise false * @return bool true if the scheme requirement exists, otherwise false
*/ */
public function hasScheme($scheme) public function hasScheme($scheme)
{ {

8
src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
View File

@ -114,6 +114,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
* ACL entries have the CASCADE option on their foreign key so they will also get deleted * ACL entries have the CASCADE option on their foreign key so they will also get deleted
* *
* @param SecurityIdentityInterface $sid * @param SecurityIdentityInterface $sid
*
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function deleteSecurityIdentity(SecurityIdentityInterface $sid) public function deleteSecurityIdentity(SecurityIdentityInterface $sid)
@ -368,7 +369,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
* Updates a user security identity when the user's username changes * Updates a user security identity when the user's username changes
* *
* @param UserSecurityIdentity $usid * @param UserSecurityIdentity $usid
* @param string $oldUsername * @param string $oldUsername
*/ */
public function updateUserSecurityIdentity(UserSecurityIdentity $usid, $oldUsername) public function updateUserSecurityIdentity(UserSecurityIdentity $usid, $oldUsername)
{ {
@ -653,7 +654,9 @@ QUERY;
* Constructs the SQL to delete a security identity. * Constructs the SQL to delete a security identity.
* *
* @param SecurityIdentityInterface $sid * @param SecurityIdentityInterface $sid
*
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*
* @return string * @return string
*/ */
protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid) protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid)
@ -692,7 +695,8 @@ QUERY;
* Constructs the SQL for updating a user security identity. * Constructs the SQL for updating a user security identity.
* *
* @param UserSecurityIdentity $usid * @param UserSecurityIdentity $usid
* @param string $oldUsername * @param string $oldUsername
*
* @return string * @return string
*/ */
protected function getUpdateUserSecurityIdentitySql(UserSecurityIdentity $usid, $oldUsername) protected function getUpdateUserSecurityIdentitySql(UserSecurityIdentity $usid, $oldUsername)

2
src/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.php
View File

@ -62,7 +62,7 @@ interface CsrfTokenManagerInterface
* *
* @param CsrfToken $token A CSRF token * @param CsrfToken $token A CSRF token
* *
* @return bool Returns true if the token is valid, false otherwise * @return bool Returns true if the token is valid, false otherwise
*/ */
public function isTokenValid(CsrfToken $token); public function isTokenValid(CsrfToken $token);
} }

4
src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
View File

@ -40,8 +40,8 @@ class NativeSessionTokenStorage implements TokenStorageInterface
/** /**
* Initializes the storage with a session namespace. * Initializes the storage with a session namespace.
* *
* @param string $namespace The namespace under which the token is stored * @param string $namespace The namespace under which the token is stored
* in the session * in the session
*/ */
public function __construct($namespace = self::SESSION_NAMESPACE) public function __construct($namespace = self::SESSION_NAMESPACE)
{ {

2
src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php
View File

@ -53,7 +53,7 @@ interface TokenStorageInterface
* *
* @param string $tokenId The token ID * @param string $tokenId The token ID
* *
* @return bool Whether a token exists with the given ID * @return bool Whether a token exists with the given ID
*/ */
public function hasToken($tokenId); public function hasToken($tokenId);
} }

10
src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
View File

@ -38,11 +38,11 @@ class SimplePreAuthenticationListener implements ListenerInterface
/** /**
* Constructor. * Constructor.
* *
* @param SecurityContextInterface $securityContext A SecurityContext instance * @param SecurityContextInterface $securityContext A SecurityContext instance
* @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance
* @param string $providerKey * @param string $providerKey
* @param SimplePreAuthenticatorInterface $simpleAuthenticator A SimplePreAuthenticatorInterface instance * @param SimplePreAuthenticatorInterface $simpleAuthenticator A SimplePreAuthenticatorInterface instance
* @param LoggerInterface $logger A LoggerInterface instance * @param LoggerInterface $logger A LoggerInterface instance
*/ */
public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, $providerKey, SimplePreAuthenticatorInterface $simpleAuthenticator, LoggerInterface $logger = null) public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, $providerKey, SimplePreAuthenticatorInterface $simpleAuthenticator, LoggerInterface $logger = null)
{ {

2
src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
View File

@ -157,7 +157,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
$this->securityContext->expects($this->any())->method('getToken')->will($this->returnValue($token)); $this->securityContext->expects($this->any())->method('getToken')->will($this->returnValue($token));
$this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('kuba')); $this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('kuba'));
$this->request->query->expects($this->once())->method('remove', '_switch_user'); $this->request->query->expects($this->once())->method('remove', '_switch_user');
$this->request->query->expects($this->any())->method('all')->will($this->returnValue(array('page' => 3,'section' => 2))); $this->request->query->expects($this->any())->method('all')->will($this->returnValue(array('page' => 3, 'section' => 2)));
$this->request->expects($this->any())->method('getUri')->will($this->returnValue('/')); $this->request->expects($this->any())->method('getUri')->will($this->returnValue('/'));
$this->request->server->expects($this->once())->method('set')->with('QUERY_STRING', 'page=3&section=2'); $this->request->server->expects($this->once())->method('set')->with('QUERY_STRING', 'page=3&section=2');

2
src/Symfony/Component/Serializer/Serializer.php
View File

@ -157,7 +157,7 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz
/** /**
* Returns a matching normalizer. * Returns a matching normalizer.
* *
* @param object $data The object to get the serializer for * @param object $data The object to get the serializer for
* @param string $format format name, present to give the option to normalizers to act differently based on formats * @param string $format format name, present to give the option to normalizers to act differently based on formats
* *
* @return NormalizerInterface|null * @return NormalizerInterface|null

4
src/Symfony/Component/Templating/Asset/Package.php
View File

@ -56,8 +56,8 @@ class Package implements PackageInterface
/** /**
* Applies version to the supplied path. * Applies version to the supplied path.
* *
* @param string $path A path * @param string $path A path
* @param string|bool|null $version A specific version * @param string|bool|null $version A specific version
* *
* @return string The versionized path * @return string The versionized path
*/ */

6
src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php
View File

@ -105,9 +105,9 @@ class CoreAssetsHelper extends Helper implements PackageInterface
* *
* Absolute paths (i.e. http://...) are returned unmodified. * Absolute paths (i.e. http://...) are returned unmodified.
* *
* @param string $path A public path * @param string $path A public path
* @param string $packageName The name of the asset package to use * @param string $packageName The name of the asset package to use
* @param string|bool|null $version A specific version * @param string|bool|null $version A specific version
* *
* @return string A public path which takes into account the base path and URL path * @return string A public path which takes into account the base path and URL path
*/ */

4
src/Symfony/Component/Translation/Loader/JsonFileLoader.php
View File

@ -54,9 +54,9 @@ class JsonFileLoader extends ArrayLoader implements LoaderInterface
/** /**
* Translates JSON_ERROR_* constant into meaningful message. * Translates JSON_ERROR_* constant into meaningful message.
* *
* @param int $errorCode Error code returned by json_last_error() call * @param int $errorCode Error code returned by json_last_error() call
* *
* @return string Message string * @return string Message string
*/ */
private function getJSONErrorMessage($errorCode) private function getJSONErrorMessage($errorCode)
{ {

16
src/Symfony/Component/Validator/ConstraintValidator.php
View File

@ -77,8 +77,8 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
* supports the 2.4 context API. * supports the 2.4 context API.
* *
* @param ExecutionContextInterface $context The context to use * @param ExecutionContextInterface $context The context to use
* @param string $message The violation message * @param string $message The violation message
* @param array $parameters The message parameters * @param array $parameters The message parameters
* *
* @return ConstraintViolationBuilderInterface The violation builder * @return ConstraintViolationBuilderInterface The violation builder
* *
@ -126,9 +126,9 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
* won't know what an "object", "array" or "resource" is and will be * won't know what an "object", "array" or "resource" is and will be
* confused by the violation message. * confused by the violation message.
* *
* @param mixed $value The value to format as string * @param mixed $value The value to format as string
* @param int $format A bitwise combination of the format * @param int $format A bitwise combination of the format
* constants in this class * constants in this class
* *
* @return string The string representation of the passed value * @return string The string representation of the passed value
*/ */
@ -186,9 +186,9 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
* Each of the values is converted to a string using * Each of the values is converted to a string using
* {@link formatValue()}. The values are then concatenated with commas. * {@link formatValue()}. The values are then concatenated with commas.
* *
* @param array $values A list of values * @param array $values A list of values
* @param int $format A bitwise combination of the format * @param int $format A bitwise combination of the format
* constants in this class * constants in this class
* *
* @return string The string representation of the value list * @return string The string representation of the value list
* *

14
src/Symfony/Component/Validator/Constraints/GroupSequence.php
View File

@ -110,9 +110,9 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
/** /**
* Returns whether the given offset exists in the sequence. * Returns whether the given offset exists in the sequence.
* *
* @param int $offset The offset * @param int $offset The offset
* *
* @return bool Whether the offset exists * @return bool Whether the offset exists
* *
* @deprecated Implemented for backwards compatibility with Symfony < 2.5. * @deprecated Implemented for backwards compatibility with Symfony < 2.5.
* To be removed in Symfony 3.0. * To be removed in Symfony 3.0.
@ -125,7 +125,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
/** /**
* Returns the group at the given offset. * Returns the group at the given offset.
* *
* @param int $offset The offset * @param int $offset The offset
* *
* @return string The group a the given offset * @return string The group a the given offset
* *
@ -149,8 +149,8 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
/** /**
* Sets the group at the given offset. * Sets the group at the given offset.
* *
* @param int $offset The offset * @param int $offset The offset
* @param string $value The group name * @param string $value The group name
* *
* @deprecated Implemented for backwards compatibility with Symfony < 2.5. * @deprecated Implemented for backwards compatibility with Symfony < 2.5.
* To be removed in Symfony 3.0. * To be removed in Symfony 3.0.
@ -169,7 +169,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
/** /**
* Removes the group at the given offset. * Removes the group at the given offset.
* *
* @param int $offset The offset * @param int $offset The offset
* *
* @deprecated Implemented for backwards compatibility with Symfony < 2.5. * @deprecated Implemented for backwards compatibility with Symfony < 2.5.
* To be removed in Symfony 3.0. * To be removed in Symfony 3.0.
@ -182,7 +182,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
/** /**
* Returns the number of groups in the sequence. * Returns the number of groups in the sequence.
* *
* @return int The number of groups * @return int The number of groups
* *
* @deprecated Implemented for backwards compatibility with Symfony < 2.5. * @deprecated Implemented for backwards compatibility with Symfony < 2.5.
* To be removed in Symfony 3.0. * To be removed in Symfony 3.0.

14
src/Symfony/Component/Validator/Context/ExecutionContext.php
View File

@ -123,13 +123,13 @@ class ExecutionContext implements ExecutionContextInterface
/** /**
* Creates a new execution context. * Creates a new execution context.
* *
* @param ValidatorInterface $validator The validator * @param ValidatorInterface $validator The validator
* @param mixed $root The root value of the * @param mixed $root The root value of the
* validated object graph * validated object graph
* @param TranslatorInterface $translator The translator * @param TranslatorInterface $translator The translator
* @param string|null $translationDomain The translation domain to * @param string|null $translationDomain The translation domain to
* use for translating * use for translating
* violation messages * violation messages
* *
* @internal Called by {@link ExecutionContextFactory}. Should not be used * @internal Called by {@link ExecutionContextFactory}. Should not be used
* in user code. * in user code.

8
src/Symfony/Component/Validator/Context/ExecutionContextFactory.php
View File

@ -38,10 +38,10 @@ class ExecutionContextFactory implements ExecutionContextFactoryInterface
/** /**
* Creates a new context factory. * Creates a new context factory.
* *
* @param TranslatorInterface $translator The translator * @param TranslatorInterface $translator The translator
* @param string|null $translationDomain The translation domain to * @param string|null $translationDomain The translation domain to
* use for translating * use for translating
* violation messages * violation messages
*/ */
public function __construct(TranslatorInterface $translator, $translationDomain = null) public function __construct(TranslatorInterface $translator, $translationDomain = null)
{ {

22
src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
View File

@ -139,9 +139,9 @@ interface ExecutionContextInterface extends LegacyExecutionContextInterface
/** /**
* Marks an object as validated in a specific validation group. * Marks an object as validated in a specific validation group.
* *
* @param string $cacheKey The hash of the object * @param string $cacheKey The hash of the object
* @param string $groupHash The group's name or hash, if it is group * @param string $groupHash The group's name or hash, if it is group
* sequence * sequence
* *
* @internal Used by the validator engine. Should not be called by user * @internal Used by the validator engine. Should not be called by user
* code. * code.
@ -151,12 +151,12 @@ interface ExecutionContextInterface extends LegacyExecutionContextInterface
/** /**
* Returns whether an object was validated in a specific validation group. * Returns whether an object was validated in a specific validation group.
* *
* @param string $cacheKey The hash of the object * @param string $cacheKey The hash of the object
* @param string $groupHash The group's name or hash, if it is group * @param string $groupHash The group's name or hash, if it is group
* sequence * sequence
* *
* @return bool Whether the object was already validated for that * @return bool Whether the object was already validated for that
* group * group
* *
* @internal Used by the validator engine. Should not be called by user * @internal Used by the validator engine. Should not be called by user
* code. * code.
@ -166,7 +166,7 @@ interface ExecutionContextInterface extends LegacyExecutionContextInterface
/** /**
* Marks a constraint as validated for an object. * Marks a constraint as validated for an object.
* *
* @param string $cacheKey The hash of the object * @param string $cacheKey The hash of the object
* @param string $constraintHash The hash of the constraint * @param string $constraintHash The hash of the constraint
* *
* @internal Used by the validator engine. Should not be called by user * @internal Used by the validator engine. Should not be called by user
@ -177,10 +177,10 @@ interface ExecutionContextInterface extends LegacyExecutionContextInterface
/** /**
* Returns whether a constraint was validated for an object. * Returns whether a constraint was validated for an object.
* *
* @param string $cacheKey The hash of the object * @param string $cacheKey The hash of the object
* @param string $constraintHash The hash of the constraint * @param string $constraintHash The hash of the constraint
* *
* @return bool Whether the constraint was already validated * @return bool Whether the constraint was already validated
* *
* @internal Used by the validator engine. Should not be called by user * @internal Used by the validator engine. Should not be called by user
* code. * code.

6
src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php
View File

@ -46,7 +46,7 @@ interface ClassMetadataInterface extends MetadataInterface, LegacyPropertyMetada
* *
* If it is, you can access the group sequence with {@link getGroupSequence()}. * If it is, you can access the group sequence with {@link getGroupSequence()}.
* *
* @return bool Returns true if the "Default" group is overridden * @return bool Returns true if the "Default" group is overridden
* *
* @see \Symfony\Component\Validator\Constraints\GroupSequence * @see \Symfony\Component\Validator\Constraints\GroupSequence
*/ */
@ -71,8 +71,8 @@ interface ClassMetadataInterface extends MetadataInterface, LegacyPropertyMetada
* This interface will be used to obtain the group sequence when an object * This interface will be used to obtain the group sequence when an object
* of this class is validated. * of this class is validated.
* *
* @return bool Returns true if the "Default" group is overridden by * @return bool Returns true if the "Default" group is overridden by
* a dynamic group sequence * a dynamic group sequence
* *
* @see \Symfony\Component\Validator\GroupSequenceProviderInterface * @see \Symfony\Component\Validator\GroupSequenceProviderInterface
*/ */

2
src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
View File

@ -146,7 +146,7 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
* *
* @param string|object $value A class name or an object * @param string|object $value A class name or an object
* *
* @return bool Whether metadata can be returned for that class * @return bool Whether metadata can be returned for that class
*/ */
public function hasMetadataFor($value) public function hasMetadataFor($value)
{ {

4
src/Symfony/Component/Validator/Mapping/MetadataInterface.php
View File

@ -34,7 +34,7 @@ interface MetadataInterface extends LegacyMetadataInterface
/** /**
* Returns the strategy for cascading objects. * Returns the strategy for cascading objects.
* *
* @return int The cascading strategy * @return int The cascading strategy
* *
* @see CascadingStrategy * @see CascadingStrategy
*/ */
@ -43,7 +43,7 @@ interface MetadataInterface extends LegacyMetadataInterface
/** /**
* Returns the strategy for traversing traversable objects. * Returns the strategy for traversing traversable objects.
* *
* @return int The traversal strategy * @return int The traversal strategy
* *
* @see TraversalStrategy * @see TraversalStrategy
*/ */

36
src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
View File

@ -313,17 +313,17 @@ class RecursiveContextualValidator implements ContextualValidatorInterface
* traversal, the object will be iterated and each nested object will be * traversal, the object will be iterated and each nested object will be
* validated instead. * validated instead.
* *
* @param object $object The object to cascade * @param object $object The object to cascade
* @param string $propertyPath The current property path * @param string $propertyPath The current property path
* @param string[] $groups The validated groups * @param string[] $groups The validated groups
* @param int $traversalStrategy The strategy for traversing the * @param int $traversalStrategy The strategy for traversing the
* cascaded object * cascaded object
* @param ExecutionContextInterface $context The current execution context * @param ExecutionContextInterface $context The current execution context
* *
* @throws NoSuchMetadataException If the object has no associated metadata * @throws NoSuchMetadataException If the object has no associated metadata
* and does not implement {@link \Traversable} * and does not implement {@link \Traversable}
* or if traversal is disabled via the * or if traversal is disabled via the
* $traversalStrategy argument * $traversalStrategy argument
* @throws UnsupportedMetadataException If the metadata returned by the * @throws UnsupportedMetadataException If the metadata returned by the
* metadata factory does not implement * metadata factory does not implement
* {@link ClassMetadataInterface} * {@link ClassMetadataInterface}
@ -384,11 +384,11 @@ class RecursiveContextualValidator implements ContextualValidatorInterface
* @param array|\Traversable $collection The collection * @param array|\Traversable $collection The collection
* @param string $propertyPath The current property path * @param string $propertyPath The current property path
* @param string[] $groups The validated groups * @param string[] $groups The validated groups
* @param bool $stopRecursion Whether to disable * @param bool $stopRecursion Whether to disable
* recursive iteration. For * recursive iteration. For
* backwards compatibility * backwards compatibility
* with Symfony < 2.5. * with Symfony < 2.5.
* @param ExecutionContextInterface $context The current execution context * @param ExecutionContextInterface $context The current execution context
* *
* @see ClassNode * @see ClassNode
* @see CollectionNode * @see CollectionNode
@ -832,12 +832,12 @@ class RecursiveContextualValidator implements ContextualValidatorInterface
/** /**
* Validates a node's value against all constraints in the given group. * Validates a node's value against all constraints in the given group.
* *
* @param mixed $value The validated value * @param mixed $value The validated value
* @param string $cacheKey The key for caching the * @param string $cacheKey The key for caching the
* validated value * validated value
* @param MetadataInterface $metadata The metadata of the value * @param MetadataInterface $metadata The metadata of the value
* @param string $group The group to validate * @param string $group The group to validate
* @param ExecutionContextInterface $context The execution context * @param ExecutionContextInterface $context The execution context
*/ */
private function validateInGroup($value, $cacheKey, MetadataInterface $metadata, $group, ExecutionContextInterface $context) private function validateInGroup($value, $cacheKey, MetadataInterface $metadata, $group, ExecutionContextInterface $context)
{ {

2
src/Symfony/Component/Validator/ValidatorBuilderInterface.php
View File

@ -174,7 +174,7 @@ interface ValidatorBuilderInterface
/** /**
* Sets the API version that the returned validator should support. * Sets the API version that the returned validator should support.
* *
* @param int $apiVersion The required API version * @param int $apiVersion The required API version
* *
* @return ValidatorBuilderInterface The builder object * @return ValidatorBuilderInterface The builder object
* *

2
src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
View File

@ -82,7 +82,7 @@ interface ConstraintViolationBuilderInterface
* Sets the number which determines how the plural form of the violation * Sets the number which determines how the plural form of the violation
* message is chosen when it is translated. * message is chosen when it is translated.
* *
* @param int $number The number for determining the plural form * @param int $number The number for determining the plural form
* *
* @return ConstraintViolationBuilderInterface This builder * @return ConstraintViolationBuilderInterface This builder
* *

4
src/Symfony/Component/Validator/Violation/LegacyConstraintViolationBuilder.php
View File

@ -11,10 +11,6 @@
namespace Symfony\Component\Validator\Violation; namespace Symfony\Component\Validator\Violation;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintViolation;
use Symfony\Component\Validator\ConstraintViolationList;
use Symfony\Component\Validator\ExecutionContextInterface; use Symfony\Component\Validator\ExecutionContextInterface;
use Symfony\Component\Validator\Util\PropertyPath; use Symfony\Component\Validator\Util\PropertyPath;