Skip to content

Commit d7be1a9

Browse files
CS fixes
1 parent 94d4e28 commit d7be1a9

12 files changed

+63
-67
lines changed

ConstraintValidator.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ protected function buildViolation($message, array $parameters = array())
7777
* supports the 2.4 context API.
7878
*
7979
* @param ExecutionContextInterface $context The context to use
80-
* @param string $message The violation message
81-
* @param array $parameters The message parameters
80+
* @param string $message The violation message
81+
* @param array $parameters The message parameters
8282
*
8383
* @return ConstraintViolationBuilderInterface The violation builder
8484
*
@@ -126,9 +126,9 @@ protected function formatTypeOf($value)
126126
* won't know what an "object", "array" or "resource" is and will be
127127
* confused by the violation message.
128128
*
129-
* @param mixed $value The value to format as string
130-
* @param int $format A bitwise combination of the format
131-
* constants in this class
129+
* @param mixed $value The value to format as string
130+
* @param int $format A bitwise combination of the format
131+
* constants in this class
132132
*
133133
* @return string The string representation of the passed value
134134
*/
@@ -186,9 +186,9 @@ protected function formatValue($value, $format = 0)
186186
* Each of the values is converted to a string using
187187
* {@link formatValue()}. The values are then concatenated with commas.
188188
*
189-
* @param array $values A list of values
190-
* @param int $format A bitwise combination of the format
191-
* constants in this class
189+
* @param array $values A list of values
190+
* @param int $format A bitwise combination of the format
191+
* constants in this class
192192
*
193193
* @return string The string representation of the value list
194194
*

Constraints/GroupSequence.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ public function getIterator()
110110
/**
111111
* Returns whether the given offset exists in the sequence.
112112
*
113-
* @param int $offset The offset
113+
* @param int $offset The offset
114114
*
115-
* @return bool Whether the offset exists
115+
* @return bool Whether the offset exists
116116
*
117117
* @deprecated Implemented for backwards compatibility with Symfony < 2.5.
118118
* To be removed in Symfony 3.0.
@@ -125,7 +125,7 @@ public function offsetExists($offset)
125125
/**
126126
* Returns the group at the given offset.
127127
*
128-
* @param int $offset The offset
128+
* @param int $offset The offset
129129
*
130130
* @return string The group a the given offset
131131
*
@@ -149,8 +149,8 @@ public function offsetGet($offset)
149149
/**
150150
* Sets the group at the given offset.
151151
*
152-
* @param int $offset The offset
153-
* @param string $value The group name
152+
* @param int $offset The offset
153+
* @param string $value The group name
154154
*
155155
* @deprecated Implemented for backwards compatibility with Symfony < 2.5.
156156
* To be removed in Symfony 3.0.
@@ -169,7 +169,7 @@ public function offsetSet($offset, $value)
169169
/**
170170
* Removes the group at the given offset.
171171
*
172-
* @param int $offset The offset
172+
* @param int $offset The offset
173173
*
174174
* @deprecated Implemented for backwards compatibility with Symfony < 2.5.
175175
* To be removed in Symfony 3.0.
@@ -182,7 +182,7 @@ public function offsetUnset($offset)
182182
/**
183183
* Returns the number of groups in the sequence.
184184
*
185-
* @return int The number of groups
185+
* @return int The number of groups
186186
*
187187
* @deprecated Implemented for backwards compatibility with Symfony < 2.5.
188188
* To be removed in Symfony 3.0.

Context/ExecutionContext.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ class ExecutionContext implements ExecutionContextInterface
123123
/**
124124
* Creates a new execution context.
125125
*
126-
* @param ValidatorInterface $validator The validator
127-
* @param mixed $root The root value of the
128-
* validated object graph
129-
* @param TranslatorInterface $translator The translator
130-
* @param string|null $translationDomain The translation domain to
131-
* use for translating
132-
* violation messages
126+
* @param ValidatorInterface $validator The validator
127+
* @param mixed $root The root value of the
128+
* validated object graph
129+
* @param TranslatorInterface $translator The translator
130+
* @param string|null $translationDomain The translation domain to
131+
* use for translating
132+
* violation messages
133133
*
134134
* @internal Called by {@link ExecutionContextFactory}. Should not be used
135135
* in user code.

Context/ExecutionContextFactory.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ class ExecutionContextFactory implements ExecutionContextFactoryInterface
3838
/**
3939
* Creates a new context factory.
4040
*
41-
* @param TranslatorInterface $translator The translator
42-
* @param string|null $translationDomain The translation domain to
43-
* use for translating
44-
* violation messages
41+
* @param TranslatorInterface $translator The translator
42+
* @param string|null $translationDomain The translation domain to
43+
* use for translating
44+
* violation messages
4545
*/
4646
public function __construct(TranslatorInterface $translator, $translationDomain = null)
4747
{

Context/ExecutionContextInterface.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ public function setGroup($group);
139139
/**
140140
* Marks an object as validated in a specific validation group.
141141
*
142-
* @param string $cacheKey The hash of the object
143-
* @param string $groupHash The group's name or hash, if it is group
144-
* sequence
142+
* @param string $cacheKey The hash of the object
143+
* @param string $groupHash The group's name or hash, if it is group
144+
* sequence
145145
*
146146
* @internal Used by the validator engine. Should not be called by user
147147
* code.
@@ -151,12 +151,12 @@ public function markGroupAsValidated($cacheKey, $groupHash);
151151
/**
152152
* Returns whether an object was validated in a specific validation group.
153153
*
154-
* @param string $cacheKey The hash of the object
155-
* @param string $groupHash The group's name or hash, if it is group
156-
* sequence
154+
* @param string $cacheKey The hash of the object
155+
* @param string $groupHash The group's name or hash, if it is group
156+
* sequence
157157
*
158-
* @return bool Whether the object was already validated for that
159-
* group
158+
* @return bool Whether the object was already validated for that
159+
* group
160160
*
161161
* @internal Used by the validator engine. Should not be called by user
162162
* code.
@@ -166,7 +166,7 @@ public function isGroupValidated($cacheKey, $groupHash);
166166
/**
167167
* Marks a constraint as validated for an object.
168168
*
169-
* @param string $cacheKey The hash of the object
169+
* @param string $cacheKey The hash of the object
170170
* @param string $constraintHash The hash of the constraint
171171
*
172172
* @internal Used by the validator engine. Should not be called by user
@@ -177,10 +177,10 @@ public function markConstraintAsValidated($cacheKey, $constraintHash);
177177
/**
178178
* Returns whether a constraint was validated for an object.
179179
*
180-
* @param string $cacheKey The hash of the object
180+
* @param string $cacheKey The hash of the object
181181
* @param string $constraintHash The hash of the constraint
182182
*
183-
* @return bool Whether the constraint was already validated
183+
* @return bool Whether the constraint was already validated
184184
*
185185
* @internal Used by the validator engine. Should not be called by user
186186
* code.

Mapping/ClassMetadataInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function getConstrainedProperties();
4646
*
4747
* If it is, you can access the group sequence with {@link getGroupSequence()}.
4848
*
49-
* @return bool Returns true if the "Default" group is overridden
49+
* @return bool Returns true if the "Default" group is overridden
5050
*
5151
* @see \Symfony\Component\Validator\Constraints\GroupSequence
5252
*/
@@ -71,8 +71,8 @@ public function getGroupSequence();
7171
* This interface will be used to obtain the group sequence when an object
7272
* of this class is validated.
7373
*
74-
* @return bool Returns true if the "Default" group is overridden by
75-
* a dynamic group sequence
74+
* @return bool Returns true if the "Default" group is overridden by
75+
* a dynamic group sequence
7676
*
7777
* @see \Symfony\Component\Validator\GroupSequenceProviderInterface
7878
*/

Mapping/Factory/LazyLoadingMetadataFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function getMetadataFor($value)
146146
*
147147
* @param string|object $value A class name or an object
148148
*
149-
* @return bool Whether metadata can be returned for that class
149+
* @return bool Whether metadata can be returned for that class
150150
*/
151151
public function hasMetadataFor($value)
152152
{

Mapping/MetadataInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ interface MetadataInterface extends LegacyMetadataInterface
3434
/**
3535
* Returns the strategy for cascading objects.
3636
*
37-
* @return int The cascading strategy
37+
* @return int The cascading strategy
3838
*
3939
* @see CascadingStrategy
4040
*/
@@ -43,7 +43,7 @@ public function getCascadingStrategy();
4343
/**
4444
* Returns the strategy for traversing traversable objects.
4545
*
46-
* @return int The traversal strategy
46+
* @return int The traversal strategy
4747
*
4848
* @see TraversalStrategy
4949
*/

Validator/RecursiveContextualValidator.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,17 @@ protected function normalizeGroups($groups)
313313
* traversal, the object will be iterated and each nested object will be
314314
* validated instead.
315315
*
316-
* @param object $object The object to cascade
317-
* @param string $propertyPath The current property path
318-
* @param string[] $groups The validated groups
319-
* @param int $traversalStrategy The strategy for traversing the
320-
* cascaded object
321-
* @param ExecutionContextInterface $context The current execution context
316+
* @param object $object The object to cascade
317+
* @param string $propertyPath The current property path
318+
* @param string[] $groups The validated groups
319+
* @param int $traversalStrategy The strategy for traversing the
320+
* cascaded object
321+
* @param ExecutionContextInterface $context The current execution context
322322
*
323-
* @throws NoSuchMetadataException If the object has no associated metadata
324-
* and does not implement {@link \Traversable}
325-
* or if traversal is disabled via the
326-
* $traversalStrategy argument
323+
* @throws NoSuchMetadataException If the object has no associated metadata
324+
* and does not implement {@link \Traversable}
325+
* or if traversal is disabled via the
326+
* $traversalStrategy argument
327327
* @throws UnsupportedMetadataException If the metadata returned by the
328328
* metadata factory does not implement
329329
* {@link ClassMetadataInterface}
@@ -384,11 +384,11 @@ private function validateObject($object, $propertyPath, array $groups, $traversa
384384
* @param array|\Traversable $collection The collection
385385
* @param string $propertyPath The current property path
386386
* @param string[] $groups The validated groups
387-
* @param bool $stopRecursion Whether to disable
387+
* @param bool $stopRecursion Whether to disable
388388
* recursive iteration. For
389389
* backwards compatibility
390390
* with Symfony < 2.5.
391-
* @param ExecutionContextInterface $context The current execution context
391+
* @param ExecutionContextInterface $context The current execution context
392392
*
393393
* @see ClassNode
394394
* @see CollectionNode
@@ -832,12 +832,12 @@ private function stepThroughGroupSequence($value, $object, $cacheKey, MetadataIn
832832
/**
833833
* Validates a node's value against all constraints in the given group.
834834
*
835-
* @param mixed $value The validated value
836-
* @param string $cacheKey The key for caching the
837-
* validated value
838-
* @param MetadataInterface $metadata The metadata of the value
839-
* @param string $group The group to validate
840-
* @param ExecutionContextInterface $context The execution context
835+
* @param mixed $value The validated value
836+
* @param string $cacheKey The key for caching the
837+
* validated value
838+
* @param MetadataInterface $metadata The metadata of the value
839+
* @param string $group The group to validate
840+
* @param ExecutionContextInterface $context The execution context
841841
*/
842842
private function validateInGroup($value, $cacheKey, MetadataInterface $metadata, $group, ExecutionContextInterface $context)
843843
{

ValidatorBuilderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public function setPropertyAccessor(PropertyAccessorInterface $propertyAccessor)
174174
/**
175175
* Sets the API version that the returned validator should support.
176176
*
177-
* @param int $apiVersion The required API version
177+
* @param int $apiVersion The required API version
178178
*
179179
* @return ValidatorBuilderInterface The builder object
180180
*

Violation/ConstraintViolationBuilderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function setInvalidValue($invalidValue);
8282
* Sets the number which determines how the plural form of the violation
8383
* message is chosen when it is translated.
8484
*
85-
* @param int $number The number for determining the plural form
85+
* @param int $number The number for determining the plural form
8686
*
8787
* @return ConstraintViolationBuilderInterface This builder
8888
*

Violation/LegacyConstraintViolationBuilder.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111

1212
namespace Symfony\Component\Validator\Violation;
1313

14-
use Symfony\Component\Translation\TranslatorInterface;
15-
use Symfony\Component\Validator\Constraint;
16-
use Symfony\Component\Validator\ConstraintViolation;
17-
use Symfony\Component\Validator\ConstraintViolationList;
1814
use Symfony\Component\Validator\ExecutionContextInterface;
1915
use Symfony\Component\Validator\Util\PropertyPath;
2016

0 commit comments

Comments
 (0)