From e334960776c11c251fc4762f6d164fb0bd69089f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 28 Jun 2016 07:56:13 +0200 Subject: [PATCH 1/7] fixed typo --- .../Doctrine/DependencyInjection/AbstractDoctrineExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php index af584579c8..96036cbf4a 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php @@ -403,7 +403,7 @@ abstract class AbstractDoctrineExtension extends Extension /** * Returns a modified version of $managerConfigs. * - * The manager called $autoMappedManager will map all bundles that are not mepped by other managers. + * The manager called $autoMappedManager will map all bundles that are not mapped by other managers. * * @param array $managerConfigs * @param array $bundles From 554303e339c3ba9044d037e5cd0250b2c5a0c3c1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 28 Jun 2016 07:50:50 +0200 Subject: [PATCH 2/7] removed dots at the end of @param and @return --- .../Doctrine/ContainerAwareEventManager.php | 10 +-- .../AbstractDoctrineExtension.php | 16 ++-- .../CompilerPass/RegisterMappingsPass.php | 12 +-- .../Form/ChoiceList/EntityChoiceList.php | 4 +- .../Form/ChoiceList/EntityLoaderInterface.php | 6 +- .../Doctrine/Form/ChoiceList/IdReader.php | 6 +- .../Form/ChoiceList/ORMQueryBuilderLoader.php | 4 +- .../Doctrine/Form/Type/DoctrineType.php | 10 +-- .../Bridge/Monolog/Handler/ConsoleHandler.php | 2 +- .../LazyProxy/Fixtures/php/lazy_service.php | 2 +- .../Fixtures/php/lazy_service_with_hints.php | 2 +- .../Bridge/Twig/Extension/FormExtension.php | 14 ++-- .../Bridge/Twig/Form/TwigRendererEngine.php | 10 +-- .../Routing/RedirectableUrlMatcher.php | 2 +- .../Templating/Helper/FormHelper.php | 6 +- .../DataCollector/SecurityDataCollector.php | 2 +- .../Controller/ExceptionController.php | 2 +- .../Resources/views/Collector/time.html.twig | 10 +-- src/Symfony/Component/BrowserKit/Request.php | 2 +- .../Component/ClassLoader/ApcClassLoader.php | 4 +- .../ClassLoader/WinCacheClassLoader.php | 4 +- .../ClassLoader/XcacheClassLoader.php | 4 +- .../Component/Config/ConfigCacheInterface.php | 2 +- .../Component/Config/Definition/ArrayNode.php | 4 +- .../Component/Config/Definition/BaseNode.php | 8 +- .../Builder/ArrayNodeDefinition.php | 2 +- .../Config/Definition/PrototypedArrayNode.php | 4 +- .../Config/Definition/VariableNode.php | 2 +- src/Symfony/Component/Console/Application.php | 2 +- .../Component/Console/Helper/HelperSet.php | 2 +- .../Component/Console/Input/ArgvInput.php | 2 +- .../Console/Tester/ApplicationTester.php | 2 +- .../Console/Tester/CommandTester.php | 2 +- .../Component/CssSelector/CssSelector.php | 4 +- src/Symfony/Component/Debug/ErrorHandler.php | 2 +- .../Component/Debug/ExceptionHandler.php | 2 +- .../Debug/Tests/DebugClassLoaderTest.php | 2 +- .../Compiler/AnalyzeServiceReferencesPass.php | 2 +- .../DependencyInjection/ContainerBuilder.php | 8 +- .../DefinitionDecorator.php | 2 +- .../DependencyInjection/Dumper/PhpDumper.php | 12 +-- .../Tests/Fixtures/php/services10.php | 2 +- .../Tests/Fixtures/php/services12.php | 2 +- .../Tests/Fixtures/php/services13.php | 2 +- .../Tests/Fixtures/php/services19.php | 4 +- .../Tests/Fixtures/php/services20.php | 4 +- .../Tests/Fixtures/php/services9.php | 34 ++++---- .../Tests/Fixtures/php/services9_compiled.php | 26 +++---- src/Symfony/Component/DomCrawler/Crawler.php | 4 +- src/Symfony/Component/DomCrawler/Form.php | 8 +- .../Component/EventDispatcher/Event.php | 4 +- .../EventDispatcher/EventDispatcher.php | 8 +- .../EventDispatcherInterface.php | 4 +- .../EventDispatcher/GenericEvent.php | 28 +++---- .../ImmutableEventDispatcher.php | 2 +- .../Exception/IOExceptionInterface.php | 2 +- .../Component/Filesystem/Filesystem.php | 6 +- .../Finder/Iterator/PathFilterIterator.php | 2 +- .../Component/Form/AbstractRendererEngine.php | 10 +-- src/Symfony/Component/Form/AbstractType.php | 2 +- .../Component/Form/AbstractTypeExtension.php | 2 +- src/Symfony/Component/Form/Button.php | 30 +++---- src/Symfony/Component/Form/ButtonBuilder.php | 66 ++++++++-------- .../Form/ChoiceList/ArrayChoiceList.php | 2 +- .../Form/ChoiceList/View/ChoiceGroupView.php | 2 +- .../Form/ChoiceList/View/ChoiceListView.php | 2 +- .../Form/ChoiceList/View/ChoiceView.php | 6 +- .../Component/Form/ClickableInterface.php | 2 +- .../Component/Form/DataMapperInterface.php | 8 +- .../Extension/Core/ChoiceList/ChoiceList.php | 54 ++++++------- .../Core/ChoiceList/ObjectChoiceList.php | 10 +-- .../Core/ChoiceList/SimpleChoiceList.php | 12 +-- .../BooleanToStringTransformer.php | 8 +- .../DateTimeToArrayTransformer.php | 2 +- .../DateTimeToLocalizedStringTransformer.php | 2 +- .../DateTimeToRfc3339Transformer.php | 2 +- .../IntegerToLocalizedStringTransformer.php | 6 +- .../MoneyToLocalizedStringTransformer.php | 2 +- .../NumberToLocalizedStringTransformer.php | 8 +- .../PercentToLocalizedStringTransformer.php | 4 +- .../Form/Extension/Core/Type/ChoiceType.php | 12 +-- .../Templating/TemplatingRendererEngine.php | 16 ++-- .../Validator/Constraints/FormValidator.php | 14 ++-- .../Validator/ViolationMapper/MappingRule.php | 8 +- .../ViolationMapper/ViolationMapper.php | 12 +-- .../ViolationMapperInterface.php | 2 +- .../ViolationMapper/ViolationPath.php | 4 +- src/Symfony/Component/Form/Form.php | 6 +- src/Symfony/Component/Form/FormBuilder.php | 4 +- .../Component/Form/FormBuilderInterface.php | 6 +- .../Component/Form/FormConfigBuilder.php | 12 +-- .../Form/FormConfigBuilderInterface.php | 78 +++++++++---------- .../Component/Form/FormConfigInterface.php | 66 ++++++++-------- .../Component/Form/FormErrorIterator.php | 6 +- src/Symfony/Component/Form/FormFactory.php | 4 +- .../Form/FormFactoryBuilderInterface.php | 36 ++++----- src/Symfony/Component/Form/FormInterface.php | 26 +++---- src/Symfony/Component/Form/FormRegistry.php | 6 +- .../Form/FormRendererEngineInterface.php | 26 +++---- .../Component/Form/FormRendererInterface.php | 20 ++--- .../Form/FormTypeExtensionInterface.php | 2 +- .../Component/Form/FormTypeInterface.php | 4 +- src/Symfony/Component/Form/FormView.php | 4 +- src/Symfony/Component/Form/Forms.php | 4 +- .../Component/Form/NativeRequestHandler.php | 6 +- .../Component/Form/PreloadedExtension.php | 6 +- .../Form/RequestHandlerInterface.php | 4 +- .../Component/Form/ResolvedFormType.php | 32 ++++---- .../Form/ResolvedFormTypeInterface.php | 40 +++++----- src/Symfony/Component/Form/SubmitButton.php | 4 +- .../Component/Form/Util/OrderedHashMap.php | 2 +- .../Component/Form/Util/ServerParams.php | 2 +- .../HttpFoundation/File/UploadedFile.php | 2 +- .../Component/HttpFoundation/IpUtils.php | 2 +- .../Component/HttpFoundation/ParameterBag.php | 10 +-- .../HttpFoundation/RedirectResponse.php | 2 +- .../Component/HttpFoundation/Request.php | 10 +-- .../Component/HttpFoundation/Response.php | 2 +- .../HttpFoundation/ResponseHeaderBag.php | 2 +- .../Attribute/NamespacedAttributeBag.php | 4 +- .../Session/Flash/AutoExpireFlashBag.php | 2 +- .../HttpFoundation/Session/Flash/FlashBag.php | 2 +- .../Session/Flash/FlashBagInterface.php | 6 +- .../HttpFoundation/Session/Session.php | 2 +- .../Session/SessionBagInterface.php | 2 +- .../Session/SessionInterface.php | 14 ++-- .../Handler/MemcacheSessionHandler.php | 4 +- .../Handler/MemcachedSessionHandler.php | 4 +- .../Handler/NativeFileSessionHandler.php | 2 +- .../Session/Storage/MetadataBag.php | 2 +- .../Storage/MockArraySessionStorage.php | 2 +- .../Storage/MockFileSessionStorage.php | 6 +- .../Session/Storage/NativeSessionStorage.php | 6 +- .../Session/Storage/Proxy/NativeProxy.php | 2 +- .../Storage/SessionStorageInterface.php | 8 +- .../CacheClearer/CacheClearerInterface.php | 2 +- .../CacheClearer/ChainCacheClearer.php | 2 +- .../HttpKernel/EventListener/DumpListener.php | 4 +- .../EventListener/ExceptionListener.php | 6 +- .../Component/HttpKernel/HttpCache/Esi.php | 2 +- .../Component/HttpKernel/HttpCache/Ssi.php | 2 +- .../Component/HttpKernel/KernelInterface.php | 2 +- .../Tests/Profiler/Mock/RedisMock.php | 2 +- .../Component/Intl/Collator/Collator.php | 4 +- .../Data/Bundle/Compiler/GenrbCompiler.php | 4 +- .../Bundle/Reader/BufferedBundleReader.php | 2 +- .../Data/Bundle/Reader/BundleEntryReader.php | 2 +- .../Reader/BundleEntryReaderInterface.php | 6 +- .../Bundle/Reader/BundleReaderInterface.php | 4 +- .../Bundle/Writer/BundleWriterInterface.php | 6 +- .../Data/Bundle/Writer/TextBundleWriter.php | 38 ++++----- .../Intl/Data/Generator/GeneratorConfig.php | 4 +- .../Data/Provider/CurrencyDataProvider.php | 4 +- .../Intl/DateFormatter/IntlDateFormatter.php | 18 ++--- src/Symfony/Component/Intl/Intl.php | 16 ++-- .../Intl/NumberFormatter/NumberFormatter.php | 14 ++-- .../CurrencyBundleInterface.php | 24 +++--- .../LanguageBundleInterface.php | 24 +++--- .../ResourceBundle/LocaleBundleInterface.php | 10 +-- .../ResourceBundle/RegionBundleInterface.php | 10 +-- .../ResourceBundleInterface.php | 2 +- .../Intl/Resources/stubs/functions.php | 8 +- .../Component/Intl/Util/IcuVersion.php | 10 +-- src/Symfony/Component/Intl/Util/SvnCommit.php | 6 +- .../Component/Intl/Util/SvnRepository.php | 18 ++--- src/Symfony/Component/Intl/Util/Version.php | 10 +-- src/Symfony/Component/Locale/Locale.php | 2 +- .../OptionsResolverInterface.php | 36 ++++----- .../Process/Pipes/PipesInterface.php | 6 +- src/Symfony/Component/Process/Process.php | 14 ++-- .../PropertyAccess/PropertyAccessor.php | 4 +- .../PropertyAccess/PropertyPathBuilder.php | 16 ++-- .../Component/Routing/Annotation/Route.php | 2 +- .../Routing/Loader/XmlFileLoader.php | 2 +- .../RedirectableUrlMatcherInterface.php | 2 +- src/Symfony/Component/Routing/Router.php | 2 +- .../Acl/Domain/PermissionGrantingStrategy.php | 2 +- .../Authentication/Token/AnonymousToken.php | 2 +- .../Token/PreAuthenticatedToken.php | 2 +- .../Authentication/Token/TokenInterface.php | 2 +- .../Token/UsernamePasswordToken.php | 2 +- .../Core/User/InMemoryUserProvider.php | 2 +- .../DefaultAuthenticationFailureHandler.php | 2 +- .../DefaultAuthenticationSuccessHandler.php | 2 +- .../Serializer/Encoder/DecoderInterface.php | 2 +- .../Serializer/Encoder/EncoderInterface.php | 2 +- .../Serializer/Encoder/XmlEncoder.php | 2 +- .../Mapping/ClassMetadataInterface.php | 2 +- .../CamelCaseToSnakeCaseNameConverter.php | 4 +- .../Normalizer/CustomNormalizer.php | 10 +-- .../Normalizer/DenormalizableInterface.php | 2 +- .../Normalizer/DenormalizerInterface.php | 6 +- .../Normalizer/GetSetMethodNormalizer.php | 2 +- .../Normalizer/NormalizerInterface.php | 4 +- src/Symfony/Component/Stopwatch/Section.php | 2 +- .../Translation/Loader/MoFileLoader.php | 2 +- .../Tests/PluralizationRulesTest.php | 2 +- .../Validator/ClassBasedInterface.php | 2 +- .../Validator/ConstraintViolation.php | 2 +- .../ConstraintViolationInterface.php | 8 +- .../Validator/ConstraintViolationList.php | 2 +- .../ConstraintViolationListInterface.php | 18 ++--- .../Context/ExecutionContextInterface.php | 2 +- .../Component/Validator/ExecutionContext.php | 20 ++--- .../Validator/ExecutionContextInterface.php | 24 +++--- .../GlobalExecutionContextInterface.php | 10 +-- .../PropertyMetadataContainerInterface.php | 4 +- .../Validator/PropertyMetadataInterface.php | 6 +- .../Component/Validator/Validation.php | 4 +- .../Component/Validator/ValidationVisitor.php | 12 +-- .../Validator/ValidationVisitorInterface.php | 18 ++--- .../Validator/ValidatorInterface.php | 6 +- .../Validator/ValidatorBuilderInterface.php | 2 +- .../Validator/ValidatorInterface.php | 24 +++--- .../Component/VarDumper/Caster/Caster.php | 12 +-- .../VarDumper/Cloner/AbstractCloner.php | 38 ++++----- .../VarDumper/Cloner/ClonerInterface.php | 4 +- .../Component/VarDumper/Cloner/Data.php | 44 +++++------ .../VarDumper/Cloner/DumperInterface.php | 32 ++++---- .../VarDumper/Dumper/AbstractDumper.php | 30 +++---- .../Component/VarDumper/Dumper/CliDumper.php | 20 ++--- .../VarDumper/Dumper/DataDumperInterface.php | 2 +- .../Component/VarDumper/Dumper/HtmlDumper.php | 6 +- src/Symfony/Component/Yaml/Dumper.php | 2 +- src/Symfony/Component/Yaml/Escaper.php | 4 +- src/Symfony/Component/Yaml/Unescaper.php | 8 +- src/Symfony/Component/Yaml/Yaml.php | 2 +- 227 files changed, 967 insertions(+), 967 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php index 5d07cee69b..0888f97ca9 100644 --- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php +++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php @@ -69,9 +69,9 @@ class ContainerAwareEventManager extends EventManager /** * Gets the listeners of a specific event or all listeners. * - * @param string $event The name of the event. + * @param string $event The name of the event * - * @return array The event listeners for the specified event, or all event listeners. + * @return array The event listeners for the specified event, or all event listeners */ public function getListeners($event = null) { @@ -83,7 +83,7 @@ class ContainerAwareEventManager extends EventManager * * @param string $event * - * @return bool TRUE if the specified event has any listeners, FALSE otherwise. + * @return bool TRUE if the specified event has any listeners, FALSE otherwise */ public function hasListeners($event) { @@ -93,8 +93,8 @@ class ContainerAwareEventManager extends EventManager /** * Adds an event listener that listens on the specified events. * - * @param string|array $events The event(s) to listen on. - * @param object|string $listener The listener object. + * @param string|array $events The event(s) to listen on + * @param object|string $listener The listener object * * @throws \RuntimeException */ diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php index af584579c8..40b9308e8d 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php @@ -40,7 +40,7 @@ abstract class AbstractDoctrineExtension extends Extension protected $drivers = array(); /** - * @param array $objectManager A configured object manager. + * @param array $objectManager A configured object manager * @param ContainerBuilder $container A ContainerBuilder instance * * @throws \InvalidArgumentException @@ -300,8 +300,8 @@ abstract class AbstractDoctrineExtension extends Extension /** * Loads a configured object manager metadata, query or result cache driver. * - * @param array $objectManager A configured object manager. - * @param ContainerBuilder $container A ContainerBuilder instance. + * @param array $objectManager A configured object manager + * @param ContainerBuilder $container A ContainerBuilder instance * @param string $cacheName * * @throws \InvalidArgumentException In case of unknown driver type. @@ -314,10 +314,10 @@ abstract class AbstractDoctrineExtension extends Extension /** * Loads a cache driver. * - * @param string $cacheDriverServiceId The cache driver name. - * @param string $objectManagerName The object manager name. - * @param array $cacheDriver The cache driver mapping. - * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container The ContainerBuilder instance. + * @param string $cacheDriverServiceId The cache driver name + * @param string $objectManagerName The object manager name + * @param array $cacheDriver The cache driver mapping + * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container The ContainerBuilder instance * * @return string * @@ -408,7 +408,7 @@ abstract class AbstractDoctrineExtension extends Extension * @param array $managerConfigs * @param array $bundles * - * @return array The modified version of $managerConfigs. + * @return array The modified version of $managerConfigs */ protected function fixManagersAutoMappings(array $managerConfigs, array $bundles) { diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php index fd32b8d4ce..5620740a52 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php @@ -106,18 +106,18 @@ abstract class RegisterMappingsPass implements CompilerPassInterface * The $aliasMap parameter can be used to define bundle namespace shortcuts like the * DoctrineBundle provides automatically for objects in the default Entity/Document folder. * - * @param Definition|Reference $driver Driver DI definition or reference. - * @param string[] $namespaces List of namespaces handled by $driver. + * @param Definition|Reference $driver Driver DI definition or reference + * @param string[] $namespaces List of namespaces handled by $driver * @param string[] $managerParameters List of container parameters that could * hold the manager name. - * @param string $driverPattern Pattern for the metadata driver service name. + * @param string $driverPattern Pattern for the metadata driver service name * @param string $enabledParameter Service container parameter that must be * present to enable the mapping. Set to false * to not do any check, optional. - * @param string $configurationPattern Pattern for the Configuration service name. + * @param string $configurationPattern Pattern for the Configuration service name * @param string $registerAliasMethodName Name of Configuration class method to * register alias. - * @param string[] $aliasMap Map of alias to namespace. + * @param string[] $aliasMap Map of alias to namespace * * @since Support for bundle alias was added in Symfony 2.6 */ @@ -219,7 +219,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface * * @param ContainerBuilder $container * - * @return string The name of the active manager. + * @return string The name of the active manager * * @throws ParameterNotFoundException If none of the managerParameters is found in the container. */ diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php index bd3fa8eb27..d22a85466f 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php @@ -109,7 +109,7 @@ class EntityChoiceList extends ObjectChoiceList * @param string $groupPath A property path pointing to the property used * to group the choices. Only allowed if * the choices are given as flat array. - * @param PropertyAccessorInterface $propertyAccessor The reflection graph for reading property paths. + * @param PropertyAccessorInterface $propertyAccessor The reflection graph for reading property paths */ public function __construct(ObjectManager $manager, $class, $labelPath = null, EntityLoaderInterface $entityLoader = null, $entities = null, array $preferredEntities = array(), $groupPath = null, PropertyAccessorInterface $propertyAccessor = null) { @@ -410,7 +410,7 @@ class EntityChoiceList extends ObjectChoiceList * * @param mixed $entity The choice to create a value for * - * @return int|string A unique value without character limitations. + * @return int|string A unique value without character limitations */ protected function createValue($entity) { diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityLoaderInterface.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityLoaderInterface.php index 2de34afc88..e36043af63 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityLoaderInterface.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityLoaderInterface.php @@ -21,7 +21,7 @@ interface EntityLoaderInterface /** * Returns an array of entities that are valid choices in the corresponding choice list. * - * @return array The entities. + * @return array The entities */ public function getEntities(); @@ -31,9 +31,9 @@ interface EntityLoaderInterface * @param string $identifier The identifier field of the object. This method * is not applicable for fields with multiple * identifiers. - * @param array $values The values of the identifiers. + * @param array $values The values of the identifiers * - * @return array The entities. + * @return array The entities */ public function getEntitiesByIds($identifier, array $values); } diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php index 6ae98b57f8..1f2d1e9e1e 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php @@ -105,9 +105,9 @@ class IdReader * * This method assumes that the object has a single-column ID. * - * @param object $object The object. + * @param object $object The object * - * @return mixed The ID value. + * @return mixed The ID value */ public function getIdValue($object) { @@ -138,7 +138,7 @@ class IdReader * * This method assumes that the object has a single-column ID. * - * @return string The name of the ID field. + * @return string The name of the ID field */ public function getIdField() { diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php index 3c5bd17000..632cdbfec0 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php @@ -43,8 +43,8 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface * deprecated and will not be * supported anymore as of * Symfony 3.0. - * @param ObjectManager $manager Deprecated. - * @param string $class Deprecated. + * @param ObjectManager $manager Deprecated + * @param string $class Deprecated * * @throws UnexpectedTypeException */ diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php index 99f3019726..324611fba1 100644 --- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php +++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php @@ -56,9 +56,9 @@ abstract class DoctrineType extends AbstractType * * For backwards compatibility, objects are cast to strings by default. * - * @param object $choice The object. + * @param object $choice The object * - * @return string The string representation of the object. + * @return string The string representation of the object * * @internal This method is public to be usable as callback. It should not * be used in user code. @@ -75,12 +75,12 @@ abstract class DoctrineType extends AbstractType * a single-column integer ID. In that case, the value of the field is * the ID of the object. That ID is also used as field name. * - * @param object $choice The object. - * @param int|string $key The choice key. + * @param object $choice The object + * @param int|string $key The choice key * @param string $value The choice value. Corresponds to the object's * ID here. * - * @return string The field name. + * @return string The field name * * @internal This method is public to be usable as callback. It should not * be used in user code. diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php index 592584ffa4..0b9ada21b2 100644 --- a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php @@ -168,7 +168,7 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe /** * 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() { diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php index 69e1b9b3e7..fd58c19d81 100644 --- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php +++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php @@ -38,7 +38,7 @@ class LazyServiceProjectServiceContainer extends Container * * @param bool $lazyLoad whether to try lazy-loading the service with a proxy * - * @return stdClass A stdClass instance. + * @return stdClass A stdClass instance */ public function getFooService($lazyLoad = true) { diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php index 349d899649..f57c4c6360 100644 --- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php +++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php @@ -33,7 +33,7 @@ class LazyServiceProjectServiceContainer extends Container * * @param bool $lazyLoad whether to try lazy-loading the service with a proxy * - * @return stdClass A stdClass instance. + * @return stdClass A stdClass instance */ public function getFooService($lazyLoad = true) { diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php index 3f0a423337..e833e3de2d 100644 --- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php @@ -97,9 +97,9 @@ class FormExtension extends \Twig_Extension implements \Twig_Extension_InitRunti /** * Renders a CSRF token. * - * @param string $intention The intention of the protected action. + * @param string $intention The intention of the protected action * - * @return string A CSRF token. + * @return string A CSRF token */ public function renderCsrfToken($intention) { @@ -109,9 +109,9 @@ class FormExtension extends \Twig_Extension implements \Twig_Extension_InitRunti /** * Makes a technical name human readable. * - * @param string $text The text to humanize. + * @param string $text The text to humanize * - * @return string The humanized text. + * @return string The humanized text */ public function humanize($text) { @@ -134,10 +134,10 @@ class FormExtension extends \Twig_Extension implements \Twig_Extension_InitRunti * seems to be much more efficient at executing filters than at executing * methods of an object. * - * @param ChoiceView $choice The choice to check. - * @param string|array $selectedValue The selected value to compare. + * @param ChoiceView $choice The choice to check + * @param string|array $selectedValue The selected value to compare * - * @return bool Whether the choice is selected. + * @return bool Whether the choice is selected * * @see ChoiceView::isSelected() */ diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php index f9dfea3571..5248d5fd37 100644 --- a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php +++ b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php @@ -70,11 +70,11 @@ class TwigRendererEngine extends AbstractRendererEngine implements TwigRendererE * * @see getResourceForBlock() * - * @param string $cacheKey The cache key of the form view. - * @param FormView $view The form view for finding the applying themes. - * @param string $blockName The name of the block to load. + * @param string $cacheKey The cache key of the form view + * @param FormView $view The form view for finding the applying themes + * @param string $blockName The name of the block to load * - * @return bool True if the resource could be loaded, false otherwise. + * @return bool True if the resource could be loaded, false otherwise */ protected function loadResourceForBlockName($cacheKey, FormView $view, $blockName) { @@ -141,7 +141,7 @@ class TwigRendererEngine extends AbstractRendererEngine implements TwigRendererE /** * Loads the resources for all blocks in a theme. * - * @param string $cacheKey The cache key for storing the resource. + * @param string $cacheKey The cache key for storing the resource * @param mixed $theme The theme to load the block from. This parameter * is passed by reference, because it might be necessary * to initialize the theme first. Any changes made to diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableUrlMatcher.php b/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableUrlMatcher.php index 76f853643c..5571c74e81 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableUrlMatcher.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/RedirectableUrlMatcher.php @@ -21,7 +21,7 @@ class RedirectableUrlMatcher extends BaseMatcher /** * Redirects the user to another URL. * - * @param string $path The path info to redirect to. + * @param string $path The path info to redirect to * @param string $route The route that matched * @param string $scheme The URL scheme (null to keep the current one) * diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php index 22848fcbfa..47c434aa47 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -223,9 +223,9 @@ class FormHelper extends Helper /** * Renders a block of the template. * - * @param FormView $view The view for determining the used themes. - * @param string $blockName The name of the block to render. - * @param array $variables The variable to pass to the template. + * @param FormView $view The view for determining the used themes + * @param string $blockName The name of the block to render + * @param array $variables The variable to pass to the template * * @return string The HTML markup */ diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php index a6ea333d95..bd81d49271 100644 --- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php +++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php @@ -132,7 +132,7 @@ class SecurityDataCollector extends DataCollector * Checks if the data contains information about inherited roles. Still the inherited * roles can be an empty array. * - * @return bool true if the profile was contains inherited role information. + * @return bool true if the profile was contains inherited role information */ public function supportsRoleHierarchy() { diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index b0c172c1e9..3eec8d6be9 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php @@ -30,7 +30,7 @@ class ExceptionController protected $twig; /** - * @var bool Show error (false) or exception (true) pages by default. + * @var bool Show error (false) or exception (true) pages by default */ protected $debug; diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig index db807a7211..716f6565a2 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig @@ -115,7 +115,7 @@ /** * Query an element with a CSS selector. * - * @param string selector a CSS-selector-compatible query string. + * @param string selector a CSS-selector-compatible query string * * @return DOMElement|null */ @@ -142,7 +142,7 @@ /** * Check whether this event is a child event. * - * @return true if it is. + * @return true if it is */ function isChildEvent(event) { @@ -152,7 +152,7 @@ /** * Check whether this event is categorized in 'section'. * - * @return true if it is. + * @return true if it is */ function isSectionEvent(event) { @@ -172,8 +172,8 @@ * * @param request the request object * @param max - * @param threshold the threshold (lower bound) of the length of the timeline (in milliseconds). - * @param width the width of the canvas. + * @param threshold the threshold (lower bound) of the length of the timeline (in milliseconds) + * @param width the width of the canvas */ this.drawOne = function(request, max, threshold, width) { diff --git a/src/Symfony/Component/BrowserKit/Request.php b/src/Symfony/Component/BrowserKit/Request.php index c79b341bed..2e2819b4ca 100644 --- a/src/Symfony/Component/BrowserKit/Request.php +++ b/src/Symfony/Component/BrowserKit/Request.php @@ -111,7 +111,7 @@ class Request /** * Gets the request raw body data. * - * @return string The request raw body data. + * @return string The request raw body data */ public function getContent() { diff --git a/src/Symfony/Component/ClassLoader/ApcClassLoader.php b/src/Symfony/Component/ClassLoader/ApcClassLoader.php index c21c64e38b..46ee4a8566 100644 --- a/src/Symfony/Component/ClassLoader/ApcClassLoader.php +++ b/src/Symfony/Component/ClassLoader/ApcClassLoader.php @@ -59,8 +59,8 @@ class ApcClassLoader /** * Constructor. * - * @param string $prefix The APC namespace prefix to use. - * @param object $decorated A class loader object that implements the findFile() method. + * @param string $prefix The APC namespace prefix to use + * @param object $decorated A class loader object that implements the findFile() method * * @throws \RuntimeException * @throws \InvalidArgumentException diff --git a/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php b/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php index 8c846e3c26..3e077450f1 100644 --- a/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php +++ b/src/Symfony/Component/ClassLoader/WinCacheClassLoader.php @@ -60,8 +60,8 @@ class WinCacheClassLoader /** * Constructor. * - * @param string $prefix The WinCache namespace prefix to use. - * @param object $decorated A class loader object that implements the findFile() method. + * @param string $prefix The WinCache namespace prefix to use + * @param object $decorated A class loader object that implements the findFile() method * * @throws \RuntimeException * @throws \InvalidArgumentException diff --git a/src/Symfony/Component/ClassLoader/XcacheClassLoader.php b/src/Symfony/Component/ClassLoader/XcacheClassLoader.php index 11da39d6f3..aa4dc9d052 100644 --- a/src/Symfony/Component/ClassLoader/XcacheClassLoader.php +++ b/src/Symfony/Component/ClassLoader/XcacheClassLoader.php @@ -60,8 +60,8 @@ class XcacheClassLoader /** * Constructor. * - * @param string $prefix The XCache namespace prefix to use. - * @param object $decorated A class loader object that implements the findFile() method. + * @param string $prefix The XCache namespace prefix to use + * @param object $decorated A class loader object that implements the findFile() method * * @throws \RuntimeException * @throws \InvalidArgumentException diff --git a/src/Symfony/Component/Config/ConfigCacheInterface.php b/src/Symfony/Component/Config/ConfigCacheInterface.php index e367ad187e..7c47ad70a5 100644 --- a/src/Symfony/Component/Config/ConfigCacheInterface.php +++ b/src/Symfony/Component/Config/ConfigCacheInterface.php @@ -32,7 +32,7 @@ interface ConfigCacheInterface * * This check should take the metadata passed to the write() method into consideration. * - * @return bool Whether the cache is still fresh. + * @return bool Whether the cache is still fresh */ public function isFresh(); diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php index 751aee1227..e5237f8414 100644 --- a/src/Symfony/Component/Config/Definition/ArrayNode.php +++ b/src/Symfony/Component/Config/Definition/ArrayNode.php @@ -344,8 +344,8 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface /** * Merges values together. * - * @param mixed $leftSide The left side to merge. - * @param mixed $rightSide The right side to merge. + * @param mixed $leftSide The left side to merge + * @param mixed $rightSide The right side to merge * * @return mixed The merged values * diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php index fc3e012916..dbf36335b6 100644 --- a/src/Symfony/Component/Config/Definition/BaseNode.php +++ b/src/Symfony/Component/Config/Definition/BaseNode.php @@ -184,7 +184,7 @@ abstract class BaseNode implements NodeInterface /** * Returns the name of this node. * - * @return string The Node's name. + * @return string The Node's name */ public function getName() { @@ -237,9 +237,9 @@ abstract class BaseNode implements NodeInterface /** * Normalizes a value, applying all normalization closures. * - * @param mixed $value Value to normalize. + * @param mixed $value Value to normalize * - * @return mixed The normalized value. + * @return mixed The normalized value */ final public function normalize($value) { @@ -329,7 +329,7 @@ abstract class BaseNode implements NodeInterface /** * Normalizes the value. * - * @param mixed $value The value to normalize. + * @param mixed $value The value to normalize * * @return mixed The normalized value */ diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index c64b2ecfdb..c78e492400 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -177,7 +177,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition * This method is applicable to prototype nodes only. * * @param string $name The name of the key - * @param bool $removeKeyItem Whether or not the key item should be removed. + * @param bool $removeKeyItem Whether or not the key item should be removed * * @return ArrayNodeDefinition */ diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php index 931b46792f..ae1a76663a 100644 --- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php +++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php @@ -278,8 +278,8 @@ class PrototypedArrayNode extends ArrayNode /** * Merges values together. * - * @param mixed $leftSide The left side to merge. - * @param mixed $rightSide The right side to merge. + * @param mixed $leftSide The left side to merge + * @param mixed $rightSide The right side to merge * * @return mixed The merged values * diff --git a/src/Symfony/Component/Config/Definition/VariableNode.php b/src/Symfony/Component/Config/Definition/VariableNode.php index e2c0677475..a9c35284cd 100644 --- a/src/Symfony/Component/Config/Definition/VariableNode.php +++ b/src/Symfony/Component/Config/Definition/VariableNode.php @@ -57,7 +57,7 @@ class VariableNode extends BaseNode implements PrototypeNodeInterface /** * Sets if this node is allowed to have an empty value. * - * @param bool $boolean True if this entity will accept empty values. + * @param bool $boolean True if this entity will accept empty values */ public function setAllowEmptyValue($boolean) { diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index e88d6116ea..11990242e8 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -235,7 +235,7 @@ class Application /** * Gets the help message. * - * @return string A help message. + * @return string A help message */ public function getHelp() { diff --git a/src/Symfony/Component/Console/Helper/HelperSet.php b/src/Symfony/Component/Console/Helper/HelperSet.php index 9fe56062f0..fb04341378 100644 --- a/src/Symfony/Component/Console/Helper/HelperSet.php +++ b/src/Symfony/Component/Console/Helper/HelperSet.php @@ -29,7 +29,7 @@ class HelperSet implements \IteratorAggregate /** * Constructor. * - * @param Helper[] $helpers An array of helper. + * @param Helper[] $helpers An array of helper */ public function __construct(array $helpers = array()) { diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php index 9291e9eaa6..1732387f7b 100644 --- a/src/Symfony/Component/Console/Input/ArgvInput.php +++ b/src/Symfony/Component/Console/Input/ArgvInput.php @@ -91,7 +91,7 @@ class ArgvInput extends Input /** * Parses a short option. * - * @param string $token The current token. + * @param string $token The current token */ private function parseShortOption($token) { diff --git a/src/Symfony/Component/Console/Tester/ApplicationTester.php b/src/Symfony/Component/Console/Tester/ApplicationTester.php index da8a19ce50..90efbab218 100644 --- a/src/Symfony/Component/Console/Tester/ApplicationTester.php +++ b/src/Symfony/Component/Console/Tester/ApplicationTester.php @@ -37,7 +37,7 @@ class ApplicationTester /** * Constructor. * - * @param Application $application An Application instance to test. + * @param Application $application An Application instance to test */ public function __construct(Application $application) { diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php index 8d6486e11c..f95298bc90 100644 --- a/src/Symfony/Component/Console/Tester/CommandTester.php +++ b/src/Symfony/Component/Console/Tester/CommandTester.php @@ -32,7 +32,7 @@ class CommandTester /** * Constructor. * - * @param Command $command A Command instance to test. + * @param Command $command A Command instance to test */ public function __construct(Command $command) { diff --git a/src/Symfony/Component/CssSelector/CssSelector.php b/src/Symfony/Component/CssSelector/CssSelector.php index 579700a61c..cdf8524067 100644 --- a/src/Symfony/Component/CssSelector/CssSelector.php +++ b/src/Symfony/Component/CssSelector/CssSelector.php @@ -71,8 +71,8 @@ class CssSelector * Optionally, a prefix can be added to the resulting XPath * expression with the $prefix parameter. * - * @param mixed $cssExpr The CSS expression. - * @param string $prefix An optional prefix for the XPath expression. + * @param mixed $cssExpr The CSS expression + * @param string $prefix An optional prefix for the XPath expression * * @return string */ diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php index 9c30ffea44..a8c072f76b 100644 --- a/src/Symfony/Component/Debug/ErrorHandler.php +++ b/src/Symfony/Component/Debug/ErrorHandler.php @@ -354,7 +354,7 @@ class ErrorHandler * @param int $line * @param array $context * - * @return bool Returns false when no handling happens so that the PHP engine can handle the error itself. + * @return bool Returns false when no handling happens so that the PHP engine can handle the error itself * * @throws \ErrorException When $this->thrownErrors requests so * diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php index 0c43ba6a05..5426d70576 100644 --- a/src/Symfony/Component/Debug/ExceptionHandler.php +++ b/src/Symfony/Component/Debug/ExceptionHandler.php @@ -94,7 +94,7 @@ class ExceptionHandler * * @param string $format The format for links to source files * - * @return string The previous file link format. + * @return string The previous file link format */ public function setFileLinkFormat($format) { diff --git a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php index 50ffa7fd3c..02005187bb 100644 --- a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php +++ b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php @@ -18,7 +18,7 @@ use Symfony\Component\Debug\Exception\ContextErrorException; class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase { /** - * @var int Error reporting level before running tests. + * @var int Error reporting level before running tests */ private $errorReporting; diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php index 42b491c7c7..681f8afdde 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php @@ -126,7 +126,7 @@ class AnalyzeServiceReferencesPass implements RepeatablePassInterface /** * Returns a service definition given the full name or an alias. * - * @param string $id A full id or alias for a service definition. + * @param string $id A full id or alias for a service definition * * @return Definition|null The definition related to the supplied id */ diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index b2e9784181..0813110ded 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -343,7 +343,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface /** * Returns all Scope children. * - * @return array An array of scope children. + * @return array An array of scope children */ public function getScopeChildren() { @@ -491,7 +491,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface * parameter, the value will still be 'bar' as defined in the ContainerBuilder * constructor. * - * @param ContainerBuilder $container The ContainerBuilder instance to merge. + * @param ContainerBuilder $container The ContainerBuilder instance to merge * * @throws BadMethodCallException When this ContainerBuilder is frozen */ @@ -976,7 +976,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface * * @param string $name The tag name * - * @return array An array of tags with the tagged service as key, holding a list of attribute arrays. + * @return array An array of tags with the tagged service as key, holding a list of attribute arrays */ public function findTaggedServiceIds($name) { @@ -1021,7 +1021,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface /** * Returns the Service Conditionals. * - * @param mixed $value An array of conditionals to return. + * @param mixed $value An array of conditionals to return * * @return array An array of Service conditionals */ diff --git a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php index 66e705f56f..f462003fd1 100644 --- a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php +++ b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php @@ -25,7 +25,7 @@ class DefinitionDecorator extends Definition private $changes = array(); /** - * @param string $parent The id of Definition instance to decorate. + * @param string $parent The id of Definition instance to decorate */ public function __construct($parent) { diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index aa1257d845..50185820ed 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -570,22 +570,22 @@ class PhpDumper extends Dumper if ($definition->isSynthetic()) { $return[] = '@throws RuntimeException always since this service is expected to be injected dynamically'; } elseif ($class = $definition->getClass()) { - $return[] = sprintf('@return %s A %s instance.', 0 === strpos($class, '%') ? 'object' : '\\'.ltrim($class, '\\'), ltrim($class, '\\')); + $return[] = sprintf('@return %s A %s instance', 0 === strpos($class, '%') ? 'object' : '\\'.ltrim($class, '\\'), ltrim($class, '\\')); } elseif ($definition->getFactory()) { $factory = $definition->getFactory(); if (is_string($factory)) { - $return[] = sprintf('@return object An instance returned by %s().', $factory); + $return[] = sprintf('@return object An instance returned by %s()', $factory); } elseif (is_array($factory) && (is_string($factory[0]) || $factory[0] instanceof Definition || $factory[0] instanceof Reference)) { if (is_string($factory[0]) || $factory[0] instanceof Reference) { - $return[] = sprintf('@return object An instance returned by %s::%s().', (string) $factory[0], $factory[1]); + $return[] = sprintf('@return object An instance returned by %s::%s()', (string) $factory[0], $factory[1]); } elseif ($factory[0] instanceof Definition) { - $return[] = sprintf('@return object An instance returned by %s::%s().', $factory[0]->getClass(), $factory[1]); + $return[] = sprintf('@return object An instance returned by %s::%s()', $factory[0]->getClass(), $factory[1]); } } } elseif ($definition->getFactoryClass(false)) { - $return[] = sprintf('@return object An instance returned by %s::%s().', $definition->getFactoryClass(false), $definition->getFactoryMethod(false)); + $return[] = sprintf('@return object An instance returned by %s::%s()', $definition->getFactoryClass(false), $definition->getFactoryMethod(false)); } elseif ($definition->getFactoryService(false)) { - $return[] = sprintf('@return object An instance returned by %s::%s().', $definition->getFactoryService(false), $definition->getFactoryMethod(false)); + $return[] = sprintf('@return object An instance returned by %s::%s()', $definition->getFactoryService(false), $definition->getFactoryMethod(false)); } $scope = $definition->getScope(); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php index b9b8d5b386..ecf87158a9 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php @@ -52,7 +52,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getTestService() { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php index a53f3a3e81..62d1d5efa5 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php @@ -56,7 +56,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getTestService() { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php index f6038f3903..048a9dda76 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php @@ -50,7 +50,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getBarService() { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php index 455600da7d..985f0a9628 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php @@ -37,7 +37,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getServiceFromAnonymousFactoryService() { @@ -50,7 +50,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getServiceWithMethodCallAndFactoryService() { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services20.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services20.php index 83f6dc7ed3..ec0887ecbc 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services20.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services20.php @@ -37,7 +37,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getDependsOnRequestService() { @@ -54,7 +54,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Request A Request instance. + * @return \Request A Request instance */ protected function getRequestService() { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php index 5977c1c6e7..18499a62c0 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php @@ -57,7 +57,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getBarService() { @@ -76,7 +76,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Baz A Baz instance. + * @return \Baz A Baz instance */ protected function getBazService() { @@ -93,7 +93,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getConfiguredServiceService() { @@ -110,7 +110,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getDecoratedService() { @@ -123,7 +123,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getDecoratorServiceService() { @@ -136,7 +136,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getDecoratorServiceWithNameService() { @@ -149,7 +149,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar A Bar instance. + * @return \Bar A Bar instance */ protected function getFactoryServiceService() { @@ -162,7 +162,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getFooService() { @@ -186,7 +186,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return object A %baz_class% instance. + * @return object A %baz_class% instance */ protected function getFoo_BazService() { @@ -200,7 +200,7 @@ class ProjectServiceContainer extends Container /** * Gets the 'foo_bar' service. * - * @return object A %foo_class% instance. + * @return object A %foo_class% instance */ protected function getFooBarService() { @@ -215,7 +215,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Foo A Foo instance. + * @return \Foo A Foo instance */ protected function getFooWithInlineService() { @@ -232,7 +232,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getMethodCall1Service() { @@ -259,7 +259,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \FooBarBaz A FooBarBaz instance. + * @return \FooBarBaz A FooBarBaz instance */ protected function getNewFactoryServiceService() { @@ -289,7 +289,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getServiceFromStaticMethodService() { @@ -306,7 +306,7 @@ class ProjectServiceContainer extends Container * If you want to be able to request this service from the container directly, * make it public, otherwise you might end up with broken code. * - * @return \ConfClass A ConfClass instance. + * @return \ConfClass A ConfClass instance */ protected function getConfiguratorServiceService() { @@ -327,7 +327,7 @@ class ProjectServiceContainer extends Container * If you want to be able to request this service from the container directly, * make it public, otherwise you might end up with broken code. * - * @return \Bar A Bar instance. + * @return \Bar A Bar instance */ protected function getInlinedService() { @@ -349,7 +349,7 @@ class ProjectServiceContainer extends Container * If you want to be able to request this service from the container directly, * make it public, otherwise you might end up with broken code. * - * @return \FactoryClass A FactoryClass instance. + * @return \FactoryClass A FactoryClass instance */ protected function getNewFactoryService() { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php index 8c1e71f437..d894f673ce 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php @@ -68,7 +68,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getBarService() { @@ -87,7 +87,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Baz A Baz instance. + * @return \Baz A Baz instance */ protected function getBazService() { @@ -104,7 +104,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getConfiguredServiceService() { @@ -124,7 +124,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getDecoratorServiceService() { @@ -137,7 +137,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getDecoratorServiceWithNameService() { @@ -150,7 +150,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar A Bar instance. + * @return \Bar A Bar instance */ protected function getFactoryServiceService() { @@ -163,7 +163,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getFooService() { @@ -187,7 +187,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \BazClass A BazClass instance. + * @return \BazClass A BazClass instance */ protected function getFoo_BazService() { @@ -201,7 +201,7 @@ class ProjectServiceContainer extends Container /** * Gets the 'foo_bar' service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getFooBarService() { @@ -214,7 +214,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Foo A Foo instance. + * @return \Foo A Foo instance */ protected function getFooWithInlineService() { @@ -236,7 +236,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getMethodCall1Service() { @@ -257,7 +257,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \FooBarBaz A FooBarBaz instance. + * @return \FooBarBaz A FooBarBaz instance */ protected function getNewFactoryServiceService() { @@ -290,7 +290,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar\FooClass A Bar\FooClass instance. + * @return \Bar\FooClass A Bar\FooClass instance */ protected function getServiceFromStaticMethodService() { diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index ef8dc1fcb4..37822e53c2 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -324,7 +324,7 @@ class Crawler extends \SplObjectStorage * * @param int $position The position * - * @return Crawler A new instance of the Crawler with the selected node, or an empty Crawler if it does not exist. + * @return Crawler A new instance of the Crawler with the selected node, or an empty Crawler if it does not exist */ public function eq($position) { @@ -383,7 +383,7 @@ class Crawler extends \SplObjectStorage * * @param \Closure $closure An anonymous function * - * @return Crawler A Crawler instance with the selected nodes. + * @return Crawler A Crawler instance with the selected nodes */ public function reduce(\Closure $closure) { diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php index 78dacaa417..0390e3fc78 100644 --- a/src/Symfony/Component/DomCrawler/Form.php +++ b/src/Symfony/Component/DomCrawler/Form.php @@ -85,7 +85,7 @@ class Form extends Link implements \ArrayAccess * * The returned array does not include file fields (@see getFiles). * - * @return array An array of field values. + * @return array An array of field values */ public function getValues() { @@ -106,7 +106,7 @@ class Form extends Link implements \ArrayAccess /** * Gets the file field values. * - * @return array An array of file field values. + * @return array An array of file field values */ public function getFiles() { @@ -135,7 +135,7 @@ class Form extends Link implements \ArrayAccess * This method converts fields with the array notation * (like foo[bar] to arrays) like PHP does. * - * @return array An array of field values. + * @return array An array of field values */ public function getPhpValues() { @@ -162,7 +162,7 @@ class Form extends Link implements \ArrayAccess * For a compound file field foo[bar] it will create foo[bar][name], * instead of foo[name][bar] which would be found in $_FILES. * - * @return array An array of file field values. + * @return array An array of file field values */ public function getPhpFiles() { diff --git a/src/Symfony/Component/EventDispatcher/Event.php b/src/Symfony/Component/EventDispatcher/Event.php index 4a563495e3..956f726452 100644 --- a/src/Symfony/Component/EventDispatcher/Event.php +++ b/src/Symfony/Component/EventDispatcher/Event.php @@ -47,7 +47,7 @@ class Event * * @see Event::stopPropagation() * - * @return bool Whether propagation was already stopped for this event. + * @return bool Whether propagation was already stopped for this event */ public function isPropagationStopped() { @@ -109,7 +109,7 @@ class Event /** * Sets the event's name property. * - * @param string $name The event name. + * @param string $name The event name * * @deprecated since version 2.4, to be removed in 3.0. The event name is passed to the listener call. */ diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php index f1b63f709d..87aca2d480 100644 --- a/src/Symfony/Component/EventDispatcher/EventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/EventDispatcher.php @@ -148,9 +148,9 @@ class EventDispatcher implements EventDispatcherInterface * This method can be overridden to add functionality that is executed * for each listener. * - * @param callable[] $listeners The event listeners. - * @param string $eventName The name of the event to dispatch. - * @param Event $event The event object to pass to the event handlers/listeners. + * @param callable[] $listeners The event listeners + * @param string $eventName The name of the event to dispatch + * @param Event $event The event object to pass to the event handlers/listeners */ protected function doDispatch($listeners, $eventName, Event $event) { @@ -165,7 +165,7 @@ class EventDispatcher implements EventDispatcherInterface /** * Sorts the internal list of listeners for the given event by priority. * - * @param string $eventName The name of the event. + * @param string $eventName The name of the event */ private function sortListeners($eventName) { diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php index a9bdd2c886..abe8d2895e 100644 --- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php +++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php @@ -26,7 +26,7 @@ interface EventDispatcherInterface * @param string $eventName The name of the event to dispatch. The name of * the event is the name of the method that is * invoked on listeners. - * @param Event $event The event to pass to the event handlers/listeners. + * @param Event $event The event to pass to the event handlers/listeners * If not supplied, an empty Event instance is created. * * @return Event @@ -49,7 +49,7 @@ interface EventDispatcherInterface * The subscriber is asked for all the events he is * interested in and added as a listener for these events. * - * @param EventSubscriberInterface $subscriber The subscriber. + * @param EventSubscriberInterface $subscriber The subscriber */ public function addSubscriber(EventSubscriberInterface $subscriber); diff --git a/src/Symfony/Component/EventDispatcher/GenericEvent.php b/src/Symfony/Component/EventDispatcher/GenericEvent.php index 03cbcfe334..2b9f40e26a 100644 --- a/src/Symfony/Component/EventDispatcher/GenericEvent.php +++ b/src/Symfony/Component/EventDispatcher/GenericEvent.php @@ -37,8 +37,8 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * Encapsulate an event with $subject and $args. * - * @param mixed $subject The subject of the event, usually an object. - * @param array $arguments Arguments to store in the event. + * @param mixed $subject The subject of the event, usually an object + * @param array $arguments Arguments to store in the event */ public function __construct($subject = null, array $arguments = array()) { @@ -49,7 +49,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * Getter for subject property. * - * @return mixed $subject The observer subject. + * @return mixed $subject The observer subject */ public function getSubject() { @@ -59,9 +59,9 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * Get argument by key. * - * @param string $key Key. + * @param string $key Key * - * @return mixed Contents of array key. + * @return mixed Contents of array key * * @throws \InvalidArgumentException If key is not found. */ @@ -77,8 +77,8 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * Add argument to event. * - * @param string $key Argument name. - * @param mixed $value Value. + * @param string $key Argument name + * @param mixed $value Value * * @return GenericEvent */ @@ -102,7 +102,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * Set args property. * - * @param array $args Arguments. + * @param array $args Arguments * * @return GenericEvent */ @@ -116,7 +116,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * Has argument. * - * @param string $key Key of arguments array. + * @param string $key Key of arguments array * * @return bool */ @@ -128,7 +128,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * ArrayAccess for argument getter. * - * @param string $key Array key. + * @param string $key Array key * * @return mixed * @@ -142,8 +142,8 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * ArrayAccess for argument setter. * - * @param string $key Array key to set. - * @param mixed $value Value. + * @param string $key Array key to set + * @param mixed $value Value */ public function offsetSet($key, $value) { @@ -153,7 +153,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * ArrayAccess for unset argument. * - * @param string $key Array key. + * @param string $key Array key */ public function offsetUnset($key) { @@ -165,7 +165,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * ArrayAccess has argument. * - * @param string $key Array key. + * @param string $key Array key * * @return bool */ diff --git a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php index 7ef9ece757..806cdd9c40 100644 --- a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php @@ -28,7 +28,7 @@ class ImmutableEventDispatcher implements EventDispatcherInterface /** * Creates an unmodifiable proxy for an event dispatcher. * - * @param EventDispatcherInterface $dispatcher The proxied event dispatcher. + * @param EventDispatcherInterface $dispatcher The proxied event dispatcher */ public function __construct(EventDispatcherInterface $dispatcher) { diff --git a/src/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php b/src/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php index 3535058763..c11965a424 100644 --- a/src/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php +++ b/src/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php @@ -21,7 +21,7 @@ interface IOExceptionInterface extends ExceptionInterface /** * Returns the associated path for the exception. * - * @return string The path. + * @return string The path */ public function getPath(); } diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php index 640e27f2ab..df12e9e499 100644 --- a/src/Symfony/Component/Filesystem/Filesystem.php +++ b/src/Symfony/Component/Filesystem/Filesystem.php @@ -283,7 +283,7 @@ class Filesystem /** * Tells whether a file exists and is readable. * - * @param string $filename Path to the file. + * @param string $filename Path to the file * * @throws IOException When windows path is longer than 258 characters */ @@ -479,8 +479,8 @@ class Filesystem /** * Atomically dumps content into a file. * - * @param string $filename The file to be written to. - * @param string $content The data to write into the file. + * @param string $filename The file to be written to + * @param string $content The data to write into the file * @param null|int $mode The file mode (octal). If null, file permissions are not modified * Deprecated since version 2.3.12, to be removed in 3.0. * diff --git a/src/Symfony/Component/Finder/Iterator/PathFilterIterator.php b/src/Symfony/Component/Finder/Iterator/PathFilterIterator.php index 4971692c69..99cbe52521 100644 --- a/src/Symfony/Component/Finder/Iterator/PathFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/PathFilterIterator.php @@ -63,7 +63,7 @@ class PathFilterIterator extends MultiplePcreFilterIterator * * Use only / as directory separator (on Windows also). * - * @param string $str Pattern: regexp or dirname. + * @param string $str Pattern: regexp or dirname * * @return string regexp corresponding to a given string or regexp */ diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php index 8202cbf97b..ae9938a0f0 100644 --- a/src/Symfony/Component/Form/AbstractRendererEngine.php +++ b/src/Symfony/Component/Form/AbstractRendererEngine.php @@ -126,11 +126,11 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface * * @see getResourceForBlock() * - * @param string $cacheKey The cache key of the form view. - * @param FormView $view The form view for finding the applying themes. - * @param string $blockName The name of the block to load. + * @param string $cacheKey The cache key of the form view + * @param FormView $view The form view for finding the applying themes + * @param string $blockName The name of the block to load * - * @return bool True if the resource could be loaded, false otherwise. + * @return bool True if the resource could be loaded, false otherwise */ abstract protected function loadResourceForBlockName($cacheKey, FormView $view, $blockName); @@ -148,7 +148,7 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface * @param int $hierarchyLevel The level in the block hierarchy that * should be loaded. * - * @return bool True if the resource could be loaded, false otherwise. + * @return bool True if the resource could be loaded, false otherwise */ private function loadResourceForBlockNameHierarchy($cacheKey, FormView $view, array $blockNameHierarchy, $hierarchyLevel) { diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php index 1e74d99e49..e2ed654056 100644 --- a/src/Symfony/Component/Form/AbstractType.php +++ b/src/Symfony/Component/Form/AbstractType.php @@ -55,7 +55,7 @@ abstract class AbstractType implements FormTypeInterface /** * Configures the options for this type. * - * @param OptionsResolver $resolver The resolver for the options. + * @param OptionsResolver $resolver The resolver for the options */ public function configureOptions(OptionsResolver $resolver) { diff --git a/src/Symfony/Component/Form/AbstractTypeExtension.php b/src/Symfony/Component/Form/AbstractTypeExtension.php index 666f292c91..27783a1a4d 100644 --- a/src/Symfony/Component/Form/AbstractTypeExtension.php +++ b/src/Symfony/Component/Form/AbstractTypeExtension.php @@ -55,7 +55,7 @@ abstract class AbstractTypeExtension implements FormTypeExtensionInterface /** * Configures the options for this type. * - * @param OptionsResolver $resolver The resolver for the options. + * @param OptionsResolver $resolver The resolver for the options */ public function configureOptions(OptionsResolver $resolver) { diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php index 1fa5ec25a7..6ceaed278e 100644 --- a/src/Symfony/Component/Form/Button.php +++ b/src/Symfony/Component/Form/Button.php @@ -39,7 +39,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Creates a new button from a form configuration. * - * @param FormConfigInterface $config The button's configuration. + * @param FormConfigInterface $config The button's configuration */ public function __construct(FormConfigInterface $config) { @@ -51,7 +51,7 @@ class Button implements \IteratorAggregate, FormInterface * * @param mixed $offset * - * @return bool Always returns false. + * @return bool Always returns false */ public function offsetExists($offset) { @@ -152,7 +152,7 @@ class Button implements \IteratorAggregate, FormInterface * * @param string $name * - * @return bool Always returns false. + * @return bool Always returns false */ public function has($name) { @@ -226,7 +226,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Unsupported method. * - * @return array Always returns an empty array. + * @return array Always returns an empty array */ public function getExtraData() { @@ -236,7 +236,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Returns the button's configuration. * - * @return FormConfigInterface The configuration. + * @return FormConfigInterface The configuration */ public function getConfig() { @@ -246,7 +246,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Returns whether the button is submitted. * - * @return bool true if the button was submitted. + * @return bool true if the button was submitted */ public function isSubmitted() { @@ -256,7 +256,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Returns the name by which the button is identified in forms. * - * @return string The name of the button. + * @return string The name of the button */ public function getName() { @@ -285,7 +285,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Unsupported method. * - * @return bool Always returns true. + * @return bool Always returns true */ public function isValid() { @@ -295,7 +295,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Unsupported method. * - * @return bool Always returns false. + * @return bool Always returns false */ public function isRequired() { @@ -317,7 +317,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Unsupported method. * - * @return bool Always returns true. + * @return bool Always returns true */ public function isEmpty() { @@ -327,7 +327,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Unsupported method. * - * @return bool Always returns true. + * @return bool Always returns true */ public function isSynchronized() { @@ -366,8 +366,8 @@ class Button implements \IteratorAggregate, FormInterface /** * Submits data to the button. * - * @param null|string $submittedData The data. - * @param bool $clearMissing Not used. + * @param null|string $submittedData The data + * @param bool $clearMissing Not used * * @return Button The button instance * @@ -423,7 +423,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Unsupported method. * - * @return int Always returns 0. + * @return int Always returns 0 */ public function count() { @@ -433,7 +433,7 @@ class Button implements \IteratorAggregate, FormInterface /** * Unsupported method. * - * @return \EmptyIterator Always returns an empty iterator. + * @return \EmptyIterator Always returns an empty iterator */ public function getIterator() { diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php index b34b4bb863..1eaed6a826 100644 --- a/src/Symfony/Component/Form/ButtonBuilder.php +++ b/src/Symfony/Component/Form/ButtonBuilder.php @@ -55,8 +55,8 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Creates a new button builder. * - * @param string $name The name of the button. - * @param array $options The button's options. + * @param string $name The name of the button + * @param array $options The button's options * * @throws InvalidArgumentException If the name is empty. */ @@ -135,7 +135,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface * * @param string $name * - * @return bool Always returns false. + * @return bool Always returns false */ public function has($name) { @@ -145,7 +145,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Returns the children. * - * @return array Always returns an empty array. + * @return array Always returns an empty array */ public function all() { @@ -285,7 +285,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface * * @param bool $disabled Whether the button is disabled * - * @return ButtonBuilder The button builder. + * @return ButtonBuilder The button builder */ public function setDisabled($disabled) { @@ -412,9 +412,9 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Sets the type of the button. * - * @param ResolvedFormTypeInterface $type The type of the button. + * @param ResolvedFormTypeInterface $type The type of the button * - * @return ButtonBuilder The button builder. + * @return ButtonBuilder The button builder */ public function setType(ResolvedFormTypeInterface $type) { @@ -570,7 +570,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return bool Always returns false. + * @return bool Always returns false */ public function getMapped() { @@ -580,7 +580,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return bool Always returns false. + * @return bool Always returns false */ public function getByReference() { @@ -590,7 +590,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return bool Always returns false. + * @return bool Always returns false * * @deprecated since version 2.3, to be removed in 3.0. * Use {@link getInheritData()} instead. @@ -605,7 +605,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return bool Always returns false. + * @return bool Always returns false */ public function getCompound() { @@ -615,7 +615,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Returns the form type used to construct the button. * - * @return ResolvedFormTypeInterface The button's type. + * @return ResolvedFormTypeInterface The button's type */ public function getType() { @@ -625,7 +625,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return array Always returns an empty array. + * @return array Always returns an empty array */ public function getViewTransformers() { @@ -635,7 +635,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return array Always returns an empty array. + * @return array Always returns an empty array */ public function getModelTransformers() { @@ -652,7 +652,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return bool Always returns false. + * @return bool Always returns false */ public function getRequired() { @@ -662,7 +662,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Returns whether the button is disabled. * - * @return bool Whether the button is disabled. + * @return bool Whether the button is disabled */ public function getDisabled() { @@ -672,7 +672,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return bool Always returns false. + * @return bool Always returns false */ public function getErrorBubbling() { @@ -689,7 +689,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Returns additional attributes of the button. * - * @return array An array of key-value combinations. + * @return array An array of key-value combinations */ public function getAttributes() { @@ -699,9 +699,9 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Returns whether the attribute with the given name exists. * - * @param string $name The attribute name. + * @param string $name The attribute name * - * @return bool Whether the attribute exists. + * @return bool Whether the attribute exists */ public function hasAttribute($name) { @@ -711,10 +711,10 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Returns the value of the given attribute. * - * @param string $name The attribute name. - * @param mixed $default The value returned if the attribute does not exist. + * @param string $name The attribute name + * @param mixed $default The value returned if the attribute does not exist * - * @return mixed The attribute value. + * @return mixed The attribute value */ public function getAttribute($name, $default = null) { @@ -738,7 +738,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return bool Always returns false. + * @return bool Always returns false */ public function getDataLocked() { @@ -776,7 +776,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return bool Always returns false. + * @return bool Always returns false */ public function getAutoInitialize() { @@ -786,7 +786,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return bool Always returns false. + * @return bool Always returns false */ public function getInheritData() { @@ -796,7 +796,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Returns all options passed during the construction of the button. * - * @return array The passed options. + * @return array The passed options */ public function getOptions() { @@ -808,7 +808,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface * * @param string $name The option name, * - * @return bool Whether the option exists. + * @return bool Whether the option exists */ public function hasOption($name) { @@ -818,10 +818,10 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Returns the value of a specific option. * - * @param string $name The option name. - * @param mixed $default The value returned if the option does not exist. + * @param string $name The option name + * @param mixed $default The value returned if the option does not exist * - * @return mixed The option value. + * @return mixed The option value */ public function getOption($name, $default = null) { @@ -831,7 +831,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return int Always returns 0. + * @return int Always returns 0 */ public function count() { @@ -841,7 +841,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @return \EmptyIterator Always returns an empty iterator. + * @return \EmptyIterator Always returns an empty iterator */ public function getIterator() { diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php index b89d7b324c..82ebe7421d 100644 --- a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php +++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php @@ -218,7 +218,7 @@ class ArrayChoiceList implements ChoiceListInterface * Checks whether the given choices can be cast to strings without * generating duplicates. * - * @param array $choices The choices. + * @param array $choices The choices * @param array|null $cache The cache for previously checked entries. Internal * * @return bool Returns true if the choices can be cast to strings and diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php index ce7989359a..9e648cc360 100644 --- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php +++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php @@ -35,7 +35,7 @@ class ChoiceGroupView implements \IteratorAggregate /** * Creates a new choice group view. * - * @param string $label The label of the group. + * @param string $label The label of the group * @param ChoiceGroupView[]|ChoiceView[] $choices The choice views in the * group. */ diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php index 99308b826f..cea30dd655 100644 --- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php +++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php @@ -39,7 +39,7 @@ class ChoiceListView /** * Creates a new choice list view. * - * @param ChoiceGroupView[]|ChoiceView[] $choices The choice views. + * @param ChoiceGroupView[]|ChoiceView[] $choices The choice views * @param ChoiceGroupView[]|ChoiceView[] $preferredChoices The preferred * choice views. */ diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php index 6e79d413cc..5078de789a 100644 --- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php +++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php @@ -45,9 +45,9 @@ class ChoiceView /** * Creates a new ChoiceView. * - * @param mixed $data The original choice. - * @param string $value The view representation of the choice. - * @param string $label The label displayed to humans. + * @param mixed $data The original choice + * @param string $value The view representation of the choice + * @param string $label The label displayed to humans */ public function __construct($data, $value, $label) { diff --git a/src/Symfony/Component/Form/ClickableInterface.php b/src/Symfony/Component/Form/ClickableInterface.php index 6e45eff1a7..541ef879d6 100644 --- a/src/Symfony/Component/Form/ClickableInterface.php +++ b/src/Symfony/Component/Form/ClickableInterface.php @@ -21,7 +21,7 @@ interface ClickableInterface /** * Returns whether this element was clicked. * - * @return bool Whether this element was clicked. + * @return bool Whether this element was clicked */ public function isClicked(); } diff --git a/src/Symfony/Component/Form/DataMapperInterface.php b/src/Symfony/Component/Form/DataMapperInterface.php index 6e03168291..779f153835 100644 --- a/src/Symfony/Component/Form/DataMapperInterface.php +++ b/src/Symfony/Component/Form/DataMapperInterface.php @@ -19,8 +19,8 @@ interface DataMapperInterface /** * Maps properties of some data to a list of forms. * - * @param mixed $data Structured data. - * @param FormInterface[] $forms A list of {@link FormInterface} instances. + * @param mixed $data Structured data + * @param FormInterface[] $forms A list of {@link FormInterface} instances * * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported. */ @@ -29,8 +29,8 @@ interface DataMapperInterface /** * Maps the data of a list of forms into the properties of some data. * - * @param FormInterface[] $forms A list of {@link FormInterface} instances. - * @param mixed $data Structured data. + * @param FormInterface[] $forms A list of {@link FormInterface} instances + * @param mixed $data Structured data * * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported. */ diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php index b77f4d4e75..90e5d774e7 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php @@ -101,9 +101,9 @@ class ChoiceList implements ChoiceListInterface * * Safe to be called multiple times. The list is cleared on every call. * - * @param array|\Traversable $choices The choices to write into the list. - * @param array $labels The labels belonging to the choices. - * @param array $preferredChoices The choices to display with priority. + * @param array|\Traversable $choices The choices to write into the list + * @param array $labels The labels belonging to the choices + * @param array $preferredChoices The choices to display with priority */ protected function initialize($choices, array $labels, array $preferredChoices) { @@ -264,9 +264,9 @@ class ChoiceList implements ChoiceListInterface * view objects. * @param array $bucketForRemaining The bucket where to store the * non-preferred view objects. - * @param array|\Traversable $choices The list of choices. - * @param array $labels The labels corresponding to the choices. - * @param array $preferredChoices The preferred choices. + * @param array|\Traversable $choices The list of choices + * @param array $labels The labels corresponding to the choices + * @param array $preferredChoices The preferred choices * * @throws InvalidArgumentException If the structures of the choices and labels array do not match. * @throws InvalidConfigurationException If no valid value or index could be created for a choice. @@ -306,14 +306,14 @@ class ChoiceList implements ChoiceListInterface /** * Recursively adds a choice group. * - * @param string $group The name of the group. + * @param string $group The name of the group * @param array $bucketForPreferred The bucket where to store the preferred * view objects. * @param array $bucketForRemaining The bucket where to store the * non-preferred view objects. - * @param array $choices The list of choices in the group. - * @param array $labels The labels corresponding to the choices in the group. - * @param array $preferredChoices The preferred choices. + * @param array $choices The list of choices in the group + * @param array $labels The labels corresponding to the choices in the group + * @param array $preferredChoices The preferred choices * * @throws InvalidConfigurationException If no valid value or index could be created for a choice. */ @@ -348,9 +348,9 @@ class ChoiceList implements ChoiceListInterface * view objects. * @param array $bucketForRemaining The bucket where to store the * non-preferred view objects. - * @param mixed $choice The choice to add. - * @param string $label The label for the choice. - * @param array $preferredChoices The preferred choices. + * @param mixed $choice The choice to add + * @param string $label The label for the choice + * @param array $preferredChoices The preferred choices * * @throws InvalidConfigurationException If no valid value or index could be created. */ @@ -387,10 +387,10 @@ class ChoiceList implements ChoiceListInterface * Extension point to optimize performance by changing the structure of the * $preferredChoices array. * - * @param mixed $choice The choice to test. - * @param array $preferredChoices An array of preferred choices. + * @param mixed $choice The choice to test + * @param array $preferredChoices An array of preferred choices * - * @return bool Whether the choice is preferred. + * @return bool Whether the choice is preferred */ protected function isPreferred($choice, array $preferredChoices) { @@ -421,7 +421,7 @@ class ChoiceList implements ChoiceListInterface * * @param mixed $choice The choice to create a value for * - * @return string A unique string. + * @return string A unique string */ protected function createValue($choice) { @@ -432,9 +432,9 @@ class ChoiceList implements ChoiceListInterface * Fixes the data type of the given choice value to avoid comparison * problems. * - * @param mixed $value The choice value. + * @param mixed $value The choice value * - * @return string The value as string. + * @return string The value as string */ protected function fixValue($value) { @@ -445,9 +445,9 @@ class ChoiceList implements ChoiceListInterface * Fixes the data types of the given choice values to avoid comparison * problems. * - * @param array $values The choice values. + * @param array $values The choice values * - * @return array The values as strings. + * @return array The values as strings */ protected function fixValues(array $values) { @@ -462,9 +462,9 @@ class ChoiceList implements ChoiceListInterface * Fixes the data type of the given choice index to avoid comparison * problems. * - * @param mixed $index The choice index. + * @param mixed $index The choice index * - * @return int|string The index as PHP array key. + * @return int|string The index as PHP array key */ protected function fixIndex($index) { @@ -479,9 +479,9 @@ class ChoiceList implements ChoiceListInterface * Fixes the data types of the given choice indices to avoid comparison * problems. * - * @param array $indices The choice indices. + * @param array $indices The choice indices * - * @return array The indices as strings. + * @return array The indices as strings */ protected function fixIndices(array $indices) { @@ -510,9 +510,9 @@ class ChoiceList implements ChoiceListInterface /** * Fixes the data type of the given choices to avoid comparison problems. * - * @param array $choices The choices. + * @param array $choices The choices * - * @return array The fixed choices. + * @return array The fixed choices * * @see fixChoice() */ diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php index 65742c45bc..6460ba81ef 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php @@ -88,7 +88,7 @@ class ObjectChoiceList extends ChoiceList * @param string $valuePath A property path pointing to the property used * for the choice values. If not given, integers * are generated instead. - * @param PropertyAccessorInterface $propertyAccessor The reflection graph for reading property paths. + * @param PropertyAccessorInterface $propertyAccessor The reflection graph for reading property paths */ public function __construct($choices, $labelPath = null, array $preferredChoices = array(), $groupPath = null, $valuePath = null, PropertyAccessorInterface $propertyAccessor = null) { @@ -105,9 +105,9 @@ class ObjectChoiceList extends ChoiceList * * Safe to be called multiple times. The list is cleared on every call. * - * @param array|\Traversable $choices The choices to write into the list. - * @param array $labels Ignored. - * @param array $preferredChoices The choices to display with priority. + * @param array|\Traversable $choices The choices to write into the list + * @param array $labels Ignored + * @param array $preferredChoices The choices to display with priority * * @throws InvalidArgumentException When passing a hierarchy of choices and using * the "groupPath" option at the same time. @@ -238,7 +238,7 @@ class ObjectChoiceList extends ChoiceList * * @param mixed $choice The choice to create a value for * - * @return int|string A unique value without character limitations. + * @return int|string A unique value without character limitations */ protected function createValue($choice) { diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php index 90cc4ac023..537e318f80 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php @@ -87,9 +87,9 @@ class SimpleChoiceList extends ChoiceList * view objects. * @param array $bucketForRemaining The bucket where to store the * non-preferred view objects. - * @param array|\Traversable $choices The list of choices. - * @param array $labels Ignored. - * @param array $preferredChoices The preferred choices. + * @param array|\Traversable $choices The list of choices + * @param array $labels Ignored + * @param array $preferredChoices The preferred choices */ protected function addChoices(array &$bucketForPreferred, array &$bucketForRemaining, $choices, array $labels, array $preferredChoices) { @@ -126,10 +126,10 @@ class SimpleChoiceList extends ChoiceList * Optimized for performance by treating the preferred choices as array * where choices are stored in the keys. * - * @param mixed $choice The choice to test. - * @param array $preferredChoices An array of preferred choices. + * @param mixed $choice The choice to test + * @param array $preferredChoices An array of preferred choices * - * @return bool Whether the choice is preferred. + * @return bool Whether the choice is preferred */ protected function isPreferred($choice, array $preferredChoices) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php index b75b98914d..5d3e5eaf05 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php @@ -42,9 +42,9 @@ class BooleanToStringTransformer implements DataTransformerInterface /** * Transforms a Boolean into a string. * - * @param bool $value Boolean value. + * @param bool $value Boolean value * - * @return string String value. + * @return string String value * * @throws TransformationFailedException If the given value is not a Boolean. */ @@ -64,9 +64,9 @@ class BooleanToStringTransformer implements DataTransformerInterface /** * Transforms a string into a Boolean. * - * @param string $value String value. + * @param string $value String value * - * @return bool Boolean value. + * @return bool Boolean value * * @throws TransformationFailedException If the given value is not a string. */ diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php index 9e5d06b12b..24479fb016 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php @@ -53,7 +53,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer * * @param \DateTime|\DateTimeInterface $dateTime A DateTime object * - * @return array Localized date. + * @return array Localized date * * @throws TransformationFailedException If the given value is not an * instance of \DateTime or \DateTimeInterface diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php index 585e6d2471..cac50e16c7 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php @@ -72,7 +72,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer * * @param \DateTime|\DateTimeInterface $dateTime A DateTime object * - * @return string|array Localized date string/array. + * @return string|array Localized date string/array * * @throws TransformationFailedException If the given value is not an instance * of \DateTime or \DateTimeInterface or diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php index 9a80cb2b9b..25bb1a52c9 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php @@ -23,7 +23,7 @@ class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer * * @param \DateTime|\DateTimeInterface $dateTime A DateTime object * - * @return string The formatted date. + * @return string The formatted date * * @throws TransformationFailedException If the given value is not an * instance of \DateTime or \DateTimeInterface diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php index eced0cc61d..999e47391b 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php @@ -22,9 +22,9 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo /** * Constructs a transformer. * - * @param int $scale Unused. - * @param bool $grouping Whether thousands should be grouped. - * @param int $roundingMode One of the ROUND_ constants in this class. + * @param int $scale Unused + * @param bool $grouping Whether thousands should be grouped + * @param int $roundingMode One of the ROUND_ constants in this class */ public function __construct($scale = 0, $grouping = false, $roundingMode = self::ROUND_DOWN) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php index 2d3efdc35b..6eeee1280b 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php @@ -47,7 +47,7 @@ class MoneyToLocalizedStringTransformer extends NumberToLocalizedStringTransform * * @param int|float $value Normalized number * - * @return string Localized money string. + * @return string Localized money string * * @throws TransformationFailedException If the given value is not numeric or * if the value can not be transformed. diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php index 2880eede34..a6113b7bc1 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php @@ -120,9 +120,9 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface /** * Transforms a number type into localized number. * - * @param int|float $value Number value. + * @param int|float $value Number value * - * @return string Localized value. + * @return string Localized value * * @throws TransformationFailedException If the given value is not numeric * or if the value can not be transformed. @@ -257,9 +257,9 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface /** * Rounds a number according to the configured scale 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) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php index fff191e543..88531feaa2 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php @@ -101,9 +101,9 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface /** * Transforms between a percentage value into a normalized format (integer or float). * - * @param string $value Percentage value. + * @param string $value Percentage value * - * @return int|float Normalized value. + * @return int|float Normalized value * * @throws TransformationFailedException If the given value is not a string or * if the value could not be transformed. diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php index a61317de85..a3d7582ff9 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php @@ -419,9 +419,9 @@ class ChoiceType extends AbstractType /** * Adds the sub fields for an expanded choice field. * - * @param FormBuilderInterface $builder The form builder. - * @param array $choiceViews The choice view objects. - * @param array $options The build options. + * @param FormBuilderInterface $builder The form builder + * @param array $choiceViews The choice view objects + * @param array $options The build options */ private function addSubForms(FormBuilderInterface $builder, array $choiceViews, array $options) { @@ -490,12 +490,12 @@ class ChoiceType extends AbstractType * are lost. Store them in a utility array that is used from the * "choice_label" closure by default. * - * @param array|\Traversable $choices The choice labels indexed by choices. + * @param array|\Traversable $choices The choice labels indexed by choices * @param object $choiceLabels The object that receives the choice labels * indexed by generated keys. - * @param int $nextKey The next generated key. + * @param int $nextKey The next generated key * - * @return array The choices in a normalized array with labels replaced by generated keys. + * @return array The choices in a normalized array with labels replaced by generated keys * * @internal Public only to be accessible from closures on PHP 5.3. Don't * use this method as it may be removed without notice and will be in 3.0. diff --git a/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php b/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php index a9003e0032..72b0a4f3df 100644 --- a/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php +++ b/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php @@ -48,11 +48,11 @@ class TemplatingRendererEngine extends AbstractRendererEngine * * @see getResourceForBlock() * - * @param string $cacheKey The cache key of the form view. - * @param FormView $view The form view for finding the applying themes. - * @param string $blockName The name of the block to load. + * @param string $cacheKey The cache key of the form view + * @param FormView $view The form view for finding the applying themes + * @param string $blockName The name of the block to load * - * @return bool True if the resource could be loaded, false otherwise. + * @return bool True if the resource could be loaded, false otherwise */ protected function loadResourceForBlockName($cacheKey, FormView $view, $blockName) { @@ -106,11 +106,11 @@ class TemplatingRendererEngine extends AbstractRendererEngine /** * Tries to load the resource for a block from a theme. * - * @param string $cacheKey The cache key for storing the resource. - * @param string $blockName The name of the block to load a resource for. - * @param mixed $theme The theme to load the block from. + * @param string $cacheKey The cache key for storing the resource + * @param string $blockName The name of the block to load a resource for + * @param mixed $theme The theme to load the block from * - * @return bool True if the resource could be loaded, false otherwise. + * @return bool True if the resource could be loaded, false otherwise */ protected function loadResourceFromTheme($cacheKey, $blockName, $theme) { diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php index 6ce1141cf6..8333e7c216 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php +++ b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php @@ -138,9 +138,9 @@ class FormValidator extends ConstraintValidator /** * Returns whether the data of a form may be walked. * - * @param FormInterface $form The form to test. + * @param FormInterface $form The form to test * - * @return bool Whether the graph walker may walk the data. + * @return bool Whether the graph walker may walk the data */ private static function allowDataWalking(FormInterface $form) { @@ -170,9 +170,9 @@ class FormValidator extends ConstraintValidator /** * Returns the validation groups of the given form. * - * @param FormInterface $form The form. + * @param FormInterface $form The form * - * @return array The validation groups. + * @return array The validation groups */ private static function getValidationGroups(FormInterface $form) { @@ -207,10 +207,10 @@ class FormValidator extends ConstraintValidator /** * Post-processes the validation groups option for a given form. * - * @param array|callable $groups The validation groups. - * @param FormInterface $form The validated form. + * @param array|callable $groups The validation groups + * @param FormInterface $form The validated form * - * @return array The validation groups. + * @return array The validation groups */ private static function resolveValidationGroups($groups, FormInterface $form) { diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php index 48b5ceace6..dc37a15707 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php @@ -55,9 +55,9 @@ class MappingRule * If the rule matches, the form mapped by the rule is returned. * Otherwise this method returns false. * - * @param string $propertyPath The property path to match against the rule. + * @param string $propertyPath The property path to match against the rule * - * @return null|FormInterface The mapped form or null. + * @return null|FormInterface The mapped form or null */ public function match($propertyPath) { @@ -69,9 +69,9 @@ class MappingRule /** * Matches a property path against a prefix of the rule path. * - * @param string $propertyPath The property path to match against the rule. + * @param string $propertyPath The property path to match against the rule * - * @return bool Whether the property path is a prefix of the rule or not. + * @return bool Whether the property path is a prefix of the rule or not */ public function isPrefix($propertyPath) { diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php index 454c0b11ac..4b64386117 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php @@ -141,10 +141,10 @@ class ViolationMapper implements ViolationMapperInterface * If a matching child is found, it is returned. Otherwise * null is returned. * - * @param FormInterface $form The form to search. - * @param PropertyPathIteratorInterface $it The iterator at its current position. + * @param FormInterface $form The form to search + * @param PropertyPathIteratorInterface $it The iterator at its current position * - * @return null|FormInterface The found match or null. + * @return null|FormInterface The found match or null */ private function matchChild(FormInterface $form, PropertyPathIteratorInterface $it) { @@ -212,10 +212,10 @@ class ViolationMapper implements ViolationMapperInterface /** * Reconstructs a property path from a violation path and a form tree. * - * @param ViolationPath $violationPath The violation path. - * @param FormInterface $origin The root form of the tree. + * @param ViolationPath $violationPath The violation path + * @param FormInterface $origin The root form of the tree * - * @return RelativePath The reconstructed path. + * @return RelativePath The reconstructed path */ private function reconstructPath(ViolationPath $violationPath, FormInterface $origin) { diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php index fb56a2bad2..bb7c6b7670 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php @@ -23,7 +23,7 @@ interface ViolationMapperInterface * Maps a constraint violation to a form in the form tree under * the given form. * - * @param ConstraintViolation $violation The violation to map. + * @param ConstraintViolation $violation The violation to map * @param FormInterface $form The root form of the tree * to map it to. * @param bool $allowNonSynchronized Whether to allow diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php index c84f98a200..1e984e2f4d 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php @@ -206,9 +206,9 @@ class ViolationPath implements \IteratorAggregate, PropertyPathInterface * In this example, "address" and "office" map to forms, while * "street does not. * - * @param int $index The element index. + * @param int $index The element index * - * @return bool Whether the element maps to a form. + * @return bool Whether the element maps to a form * * @throws OutOfBoundsException If the offset is invalid. */ diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index 94271cf821..d7109bd3ac 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -162,7 +162,7 @@ class Form implements \IteratorAggregate, FormInterface /** * Creates a new form based on the given configuration. * - * @param FormConfigInterface $config The form configuration. + * @param FormConfigInterface $config The form configuration * * @throws LogicException if a data mapper is not provided for a compound form */ @@ -994,8 +994,8 @@ class Form implements \IteratorAggregate, FormInterface /** * Adds a child to the form (implements the \ArrayAccess interface). * - * @param string $name Ignored. The name of the child is used. - * @param FormInterface $child The child to be added. + * @param string $name Ignored. The name of the child is used + * @param FormInterface $child The child to be added * * @throws AlreadySubmittedException If the form has already been submitted. * @throws LogicException When trying to add a child to a non-compound form. diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php index 44bc08951a..62fd18eae4 100644 --- a/src/Symfony/Component/Form/FormBuilder.php +++ b/src/Symfony/Component/Form/FormBuilder.php @@ -246,9 +246,9 @@ class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormB /** * Converts an unresolved child into a {@link FormBuilder} instance. * - * @param string $name The name of the unresolved child. + * @param string $name The name of the unresolved child * - * @return FormBuilder The created instance. + * @return FormBuilder The created instance */ private function resolveChild($name) { diff --git a/src/Symfony/Component/Form/FormBuilderInterface.php b/src/Symfony/Component/Form/FormBuilderInterface.php index 8cf010774b..b72059242e 100644 --- a/src/Symfony/Component/Form/FormBuilderInterface.php +++ b/src/Symfony/Component/Form/FormBuilderInterface.php @@ -27,7 +27,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild * @param string|FormTypeInterface $type * @param array $options * - * @return FormBuilderInterface The builder object. + * @return FormBuilderInterface The builder object */ public function add($child, $type = null, array $options = array()); @@ -38,7 +38,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild * @param string|FormTypeInterface $type The type of the form or null if name is a property * @param array $options The options * - * @return FormBuilderInterface The created builder. + * @return FormBuilderInterface The created builder */ public function create($name, $type = null, array $options = array()); @@ -58,7 +58,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild * * @param string $name * - * @return FormBuilderInterface The builder object. + * @return FormBuilderInterface The builder object */ public function remove($name); diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php index d217cf0193..2076f016ac 100644 --- a/src/Symfony/Component/Form/FormConfigBuilder.php +++ b/src/Symfony/Component/Form/FormConfigBuilder.php @@ -349,7 +349,7 @@ class FormConfigBuilder implements FormConfigBuilderInterface /** * Alias of {@link getInheritData()}. * - * @return FormConfigBuilder The configuration object. + * @return FormConfigBuilder The configuration object * * @deprecated since version 2.3, to be removed in 3.0. * Use {@link getInheritData()} instead. @@ -713,9 +713,9 @@ class FormConfigBuilder implements FormConfigBuilderInterface /** * Alias of {@link setInheritData()}. * - * @param bool $inheritData Whether the form should inherit its parent's data. + * @param bool $inheritData Whether the form should inherit its parent's data * - * @return FormConfigBuilder The configuration object. + * @return FormConfigBuilder The configuration object * * @deprecated since version 2.3, to be removed in 3.0. * Use {@link setInheritData()} instead. @@ -882,7 +882,7 @@ class FormConfigBuilder implements FormConfigBuilderInterface /** * Validates whether the given variable is a valid form name. * - * @param string|int $name The tested form name. + * @param string|int $name The tested form name * * @throws UnexpectedTypeException If the name is not a string or an integer. * @throws InvalidArgumentException If the name contains invalid characters. @@ -911,9 +911,9 @@ class FormConfigBuilder implements FormConfigBuilderInterface * * contains only letters, digits, numbers, underscores ("_"), * hyphens ("-") and colons (":") * - * @param string $name The tested form name. + * @param string $name The tested form name * - * @return bool Whether the name is valid. + * @return bool Whether the name is valid */ public static function isValidName($name) { diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php index ad8bf69328..72d747c242 100644 --- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php +++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php @@ -22,22 +22,22 @@ interface FormConfigBuilderInterface extends FormConfigInterface /** * Adds an event listener to an event on this form. * - * @param string $eventName The name of the event to listen to. - * @param callable $listener The listener to execute. + * @param string $eventName The name of the event to listen to + * @param callable $listener The listener to execute * @param int $priority The priority of the listener. Listeners * with a higher priority are called before * listeners with a lower priority. * - * @return self The configuration object. + * @return self The configuration object */ public function addEventListener($eventName, $listener, $priority = 0); /** * Adds an event subscriber for events on this form. * - * @param EventSubscriberInterface $subscriber The subscriber to attach. + * @param EventSubscriberInterface $subscriber The subscriber to attach * - * @return self The configuration object. + * @return self The configuration object */ public function addEventSubscriber(EventSubscriberInterface $subscriber); @@ -52,14 +52,14 @@ interface FormConfigBuilderInterface extends FormConfigInterface * @param DataTransformerInterface $viewTransformer * @param bool $forcePrepend if set to true, prepend instead of appending * - * @return self The configuration object. + * @return self The configuration object */ public function addViewTransformer(DataTransformerInterface $viewTransformer, $forcePrepend = false); /** * Clears the view transformers. * - * @return self The configuration object. + * @return self The configuration object */ public function resetViewTransformers(); @@ -74,14 +74,14 @@ interface FormConfigBuilderInterface extends FormConfigInterface * @param DataTransformerInterface $modelTransformer * @param bool $forceAppend if set to true, append instead of prepending * - * @return self The configuration object. + * @return self The configuration object */ public function addModelTransformer(DataTransformerInterface $modelTransformer, $forceAppend = false); /** * Clears the normalization transformers. * - * @return self The configuration object. + * @return self The configuration object */ public function resetModelTransformers(); @@ -91,16 +91,16 @@ interface FormConfigBuilderInterface extends FormConfigInterface * @param string $name The name of the attribute * @param mixed $value The value of the attribute * - * @return self The configuration object. + * @return self The configuration object */ public function setAttribute($name, $value); /** * Sets the attributes. * - * @param array $attributes The attributes. + * @param array $attributes The attributes * - * @return self The configuration object. + * @return self The configuration object */ public function setAttributes(array $attributes); @@ -109,7 +109,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface * * @param DataMapperInterface $dataMapper * - * @return self The configuration object. + * @return self The configuration object */ public function setDataMapper(DataMapperInterface $dataMapper = null); @@ -118,16 +118,16 @@ interface FormConfigBuilderInterface extends FormConfigInterface * * @param bool $disabled Whether the form is disabled * - * @return self The configuration object. + * @return self The configuration object */ public function setDisabled($disabled); /** * Sets the data used for the client data when no value is submitted. * - * @param mixed $emptyData The empty data. + * @param mixed $emptyData The empty data * - * @return self The configuration object. + * @return self The configuration object */ public function setEmptyData($emptyData); @@ -136,7 +136,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface * * @param bool $errorBubbling * - * @return self The configuration object. + * @return self The configuration object */ public function setErrorBubbling($errorBubbling); @@ -145,7 +145,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface * * @param bool $required * - * @return self The configuration object. + * @return self The configuration object */ public function setRequired($required); @@ -156,7 +156,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface * The property path or null if the path should be set * automatically based on the form's name. * - * @return self The configuration object. + * @return self The configuration object */ public function setPropertyPath($propertyPath); @@ -164,9 +164,9 @@ interface FormConfigBuilderInterface extends FormConfigInterface * Sets whether the form should be mapped to an element of its * parent's data. * - * @param bool $mapped Whether the form should be mapped. + * @param bool $mapped Whether the form should be mapped * - * @return self The configuration object. + * @return self The configuration object */ public function setMapped($mapped); @@ -176,25 +176,25 @@ interface FormConfigBuilderInterface extends FormConfigInterface * @param bool $byReference Whether the data should be * modified by reference. * - * @return self The configuration object. + * @return self The configuration object */ public function setByReference($byReference); /** * Sets whether the form should read and write the data of its parent. * - * @param bool $inheritData Whether the form should inherit its parent's data. + * @param bool $inheritData Whether the form should inherit its parent's data * - * @return self The configuration object. + * @return self The configuration object */ public function setInheritData($inheritData); /** * Sets whether the form should be compound. * - * @param bool $compound Whether the form should be compound. + * @param bool $compound Whether the form should be compound * - * @return self The configuration object. + * @return self The configuration object * * @see FormConfigInterface::getCompound() */ @@ -203,18 +203,18 @@ interface FormConfigBuilderInterface extends FormConfigInterface /** * Set the types. * - * @param ResolvedFormTypeInterface $type The type of the form. + * @param ResolvedFormTypeInterface $type The type of the form * - * @return self The configuration object. + * @return self The configuration object */ public function setType(ResolvedFormTypeInterface $type); /** * Sets the initial data of the form. * - * @param mixed $data The data of the form in application format. + * @param mixed $data The data of the form in application format * - * @return self The configuration object. + * @return self The configuration object */ public function setData($data); @@ -225,34 +225,34 @@ interface FormConfigBuilderInterface extends FormConfigInterface * this configuration. The data can only be modified then by * submitting the form. * - * @param bool $locked Whether to lock the default data. + * @param bool $locked Whether to lock the default data * - * @return self The configuration object. + * @return self The configuration object */ public function setDataLocked($locked); /** * Sets the form factory used for creating new forms. * - * @param FormFactoryInterface $formFactory The form factory. + * @param FormFactoryInterface $formFactory The form factory */ public function setFormFactory(FormFactoryInterface $formFactory); /** * Sets the target URL of the form. * - * @param string $action The target URL of the form. + * @param string $action The target URL of the form * - * @return self The configuration object. + * @return self The configuration object */ public function setAction($action); /** * Sets the HTTP method used by the form. * - * @param string $method The HTTP method of the form. + * @param string $method The HTTP method of the form * - * @return self The configuration object. + * @return self The configuration object */ public function setMethod($method); @@ -261,7 +261,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface * * @param RequestHandlerInterface $requestHandler * - * @return self The configuration object. + * @return self The configuration object */ public function setRequestHandler(RequestHandlerInterface $requestHandler); @@ -275,7 +275,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface * In the second case, you need to call * {@link FormInterface::initialize()} manually. * - * @return self The configuration object. + * @return self The configuration object */ public function setAutoInitialize($initialize); diff --git a/src/Symfony/Component/Form/FormConfigInterface.php b/src/Symfony/Component/Form/FormConfigInterface.php index 179905850f..c2f97901d2 100644 --- a/src/Symfony/Component/Form/FormConfigInterface.php +++ b/src/Symfony/Component/Form/FormConfigInterface.php @@ -24,21 +24,21 @@ interface FormConfigInterface /** * Returns the event dispatcher used to dispatch form events. * - * @return EventDispatcherInterface The dispatcher. + * @return EventDispatcherInterface The dispatcher */ public function getEventDispatcher(); /** * Returns the name of the form used as HTTP parameter. * - * @return string The form name. + * @return string The form name */ public function getName(); /** * Returns the property path that the form should be mapped to. * - * @return null|PropertyPathInterface The property path. + * @return null|PropertyPathInterface The property path */ public function getPropertyPath(); @@ -46,21 +46,21 @@ interface FormConfigInterface * Returns whether the form should be mapped to an element of its * parent's data. * - * @return bool Whether the form is mapped. + * @return bool Whether the form is mapped */ public function getMapped(); /** * Returns whether the form's data should be modified by reference. * - * @return bool Whether to modify the form's data by reference. + * @return bool Whether to modify the form's data by reference */ public function getByReference(); /** * Returns whether the form should read and write the data of its parent. * - * @return bool Whether the form should inherit its parent's data. + * @return bool Whether the form should inherit its parent's data */ public function getInheritData(); @@ -71,103 +71,103 @@ interface FormConfigInterface * children. A form can be compound and have no children at all, like * for example an empty collection form. * - * @return bool Whether the form is compound. + * @return bool Whether the form is compound */ public function getCompound(); /** * Returns the form types used to construct the form. * - * @return ResolvedFormTypeInterface The form's type. + * @return ResolvedFormTypeInterface The form's type */ public function getType(); /** * Returns the view transformers of the form. * - * @return DataTransformerInterface[] An array of {@link DataTransformerInterface} instances. + * @return DataTransformerInterface[] An array of {@link DataTransformerInterface} instances */ public function getViewTransformers(); /** * Returns the model transformers of the form. * - * @return DataTransformerInterface[] An array of {@link DataTransformerInterface} instances. + * @return DataTransformerInterface[] An array of {@link DataTransformerInterface} instances */ public function getModelTransformers(); /** * Returns the data mapper of the form. * - * @return DataMapperInterface The data mapper. + * @return DataMapperInterface The data mapper */ public function getDataMapper(); /** * Returns whether the form is required. * - * @return bool Whether the form is required. + * @return bool Whether the form is required */ public function getRequired(); /** * Returns whether the form is disabled. * - * @return bool Whether the form is disabled. + * @return bool Whether the form is disabled */ public function getDisabled(); /** * Returns whether errors attached to the form will bubble to its parent. * - * @return bool Whether errors will bubble up. + * @return bool Whether errors will bubble up */ public function getErrorBubbling(); /** * Returns the data that should be returned when the form is empty. * - * @return mixed The data returned if the form is empty. + * @return mixed The data returned if the form is empty */ public function getEmptyData(); /** * Returns additional attributes of the form. * - * @return array An array of key-value combinations. + * @return array An array of key-value combinations */ public function getAttributes(); /** * Returns whether the attribute with the given name exists. * - * @param string $name The attribute name. + * @param string $name The attribute name * - * @return bool Whether the attribute exists. + * @return bool Whether the attribute exists */ public function hasAttribute($name); /** * Returns the value of the given attribute. * - * @param string $name The attribute name. - * @param mixed $default The value returned if the attribute does not exist. + * @param string $name The attribute name + * @param mixed $default The value returned if the attribute does not exist * - * @return mixed The attribute value. + * @return mixed The attribute value */ public function getAttribute($name, $default = null); /** * Returns the initial data of the form. * - * @return mixed The initial form data. + * @return mixed The initial form data */ public function getData(); /** * Returns the class of the form data or null if the data is scalar or an array. * - * @return string The data class or null. + * @return string The data class or null */ public function getDataClass(); @@ -178,35 +178,35 @@ interface FormConfigInterface * this configuration. The data can only be modified then by * submitting the form. * - * @return bool Whether the data is locked. + * @return bool Whether the data is locked */ public function getDataLocked(); /** * Returns the form factory used for creating new forms. * - * @return FormFactoryInterface The form factory. + * @return FormFactoryInterface The form factory */ public function getFormFactory(); /** * Returns the target URL of the form. * - * @return string The target URL of the form. + * @return string The target URL of the form */ public function getAction(); /** * Returns the HTTP method used by the form. * - * @return string The HTTP method of the form. + * @return string The HTTP method of the form */ public function getMethod(); /** * Returns the request handler used by the form. * - * @return RequestHandlerInterface The request handler. + * @return RequestHandlerInterface The request handler */ public function getRequestHandler(); @@ -221,7 +221,7 @@ interface FormConfigInterface /** * Returns all options passed during the construction of the form. * - * @return array The passed options. + * @return array The passed options */ public function getOptions(); @@ -230,17 +230,17 @@ interface FormConfigInterface * * @param string $name The option name, * - * @return bool Whether the option exists. + * @return bool Whether the option exists */ public function hasOption($name); /** * Returns the value of a specific option. * - * @param string $name The option name. - * @param mixed $default The value returned if the option does not exist. + * @param string $name The option name + * @param mixed $default The value returned if the option does not exist * - * @return mixed The option value. + * @return mixed The option value */ public function getOption($name, $default = null); } diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php index 7ee2df26b4..113de435d5 100644 --- a/src/Symfony/Component/Form/FormErrorIterator.php +++ b/src/Symfony/Component/Form/FormErrorIterator.php @@ -99,7 +99,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array /** * Returns the iterated form. * - * @return FormInterface The form whose errors are iterated by this object. + * @return FormInterface The form whose errors are iterated by this object */ public function getForm() { @@ -128,7 +128,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array /** * Returns the current position of the iterator. * - * @return int The 0-indexed position. + * @return int The 0-indexed position */ public function key() { @@ -138,7 +138,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array /** * 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() { diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php index cfca4588bd..ca228ba31d 100644 --- a/src/Symfony/Component/Form/FormFactory.php +++ b/src/Symfony/Component/Form/FormFactory.php @@ -136,9 +136,9 @@ class FormFactory implements FormFactoryInterface * Wraps a type into a ResolvedFormTypeInterface implementation and connects * it with its parent type. * - * @param FormTypeInterface $type The type to resolve. + * @param FormTypeInterface $type The type to resolve * - * @return ResolvedFormTypeInterface The resolved type. + * @return ResolvedFormTypeInterface The resolved type */ private function resolveType(FormTypeInterface $type) { diff --git a/src/Symfony/Component/Form/FormFactoryBuilderInterface.php b/src/Symfony/Component/Form/FormFactoryBuilderInterface.php index e32f1ce766..d89e2f9f9a 100644 --- a/src/Symfony/Component/Form/FormFactoryBuilderInterface.php +++ b/src/Symfony/Component/Form/FormFactoryBuilderInterface.php @@ -23,86 +23,86 @@ interface FormFactoryBuilderInterface * * @param ResolvedFormTypeFactoryInterface $resolvedTypeFactory * - * @return FormFactoryBuilderInterface The builder. + * @return FormFactoryBuilderInterface The builder */ public function setResolvedTypeFactory(ResolvedFormTypeFactoryInterface $resolvedTypeFactory); /** * Adds an extension to be loaded by the factory. * - * @param FormExtensionInterface $extension The extension. + * @param FormExtensionInterface $extension The extension * - * @return FormFactoryBuilderInterface The builder. + * @return FormFactoryBuilderInterface The builder */ public function addExtension(FormExtensionInterface $extension); /** * Adds a list of extensions to be loaded by the factory. * - * @param FormExtensionInterface[] $extensions The extensions. + * @param FormExtensionInterface[] $extensions The extensions * - * @return FormFactoryBuilderInterface The builder. + * @return FormFactoryBuilderInterface The builder */ public function addExtensions(array $extensions); /** * Adds a form type to the factory. * - * @param FormTypeInterface $type The form type. + * @param FormTypeInterface $type The form type * - * @return FormFactoryBuilderInterface The builder. + * @return FormFactoryBuilderInterface The builder */ public function addType(FormTypeInterface $type); /** * Adds a list of form types to the factory. * - * @param FormTypeInterface[] $types The form types. + * @param FormTypeInterface[] $types The form types * - * @return FormFactoryBuilderInterface The builder. + * @return FormFactoryBuilderInterface The builder */ public function addTypes(array $types); /** * Adds a form type extension to the factory. * - * @param FormTypeExtensionInterface $typeExtension The form type extension. + * @param FormTypeExtensionInterface $typeExtension The form type extension * - * @return FormFactoryBuilderInterface The builder. + * @return FormFactoryBuilderInterface The builder */ public function addTypeExtension(FormTypeExtensionInterface $typeExtension); /** * Adds a list of form type extensions to the factory. * - * @param FormTypeExtensionInterface[] $typeExtensions The form type extensions. + * @param FormTypeExtensionInterface[] $typeExtensions The form type extensions * - * @return FormFactoryBuilderInterface The builder. + * @return FormFactoryBuilderInterface The builder */ public function addTypeExtensions(array $typeExtensions); /** * Adds a type guesser to the factory. * - * @param FormTypeGuesserInterface $typeGuesser The type guesser. + * @param FormTypeGuesserInterface $typeGuesser The type guesser * - * @return FormFactoryBuilderInterface The builder. + * @return FormFactoryBuilderInterface The builder */ public function addTypeGuesser(FormTypeGuesserInterface $typeGuesser); /** * Adds a list of type guessers to the factory. * - * @param FormTypeGuesserInterface[] $typeGuessers The type guessers. + * @param FormTypeGuesserInterface[] $typeGuessers The type guessers * - * @return FormFactoryBuilderInterface The builder. + * @return FormFactoryBuilderInterface The builder */ public function addTypeGuessers(array $typeGuessers); /** * Builds and returns the factory. * - * @return FormFactoryInterface The form factory. + * @return FormFactoryInterface The form factory */ public function getFormFactory(); } diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php index b2131e1da4..13b03f5118 100644 --- a/src/Symfony/Component/Form/FormInterface.php +++ b/src/Symfony/Component/Form/FormInterface.php @@ -23,7 +23,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable /** * Sets the parent form. * - * @param FormInterface|null $parent The parent form or null if it's the root. + * @param FormInterface|null $parent The parent form or null if it's the root * * @return FormInterface The form instance * @@ -36,16 +36,16 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable /** * Returns the parent form. * - * @return FormInterface|null The parent form or null if there is none. + * @return FormInterface|null The parent form or null if there is none */ public function getParent(); /** * Adds or replaces a child to the form. * - * @param FormInterface|string|int $child The FormInterface instance or the name of the child. - * @param string|null $type The child's type, if a name was passed. - * @param array $options The child's options, if a name was passed. + * @param FormInterface|string|int $child The FormInterface instance or the name of the child + * @param string|null $type The child's type, if a name was passed + * @param array $options The child's options, if a name was passed * * @return FormInterface The form instance * @@ -132,7 +132,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable /** * Returns the normalized data of the field. * - * @return mixed When the field is not submitted, the default data is returned. + * @return mixed When the field is not submitted, the default data is returned * When the field is submitted, the normalized submitted data is * returned if the field is valid, null otherwise. */ @@ -155,7 +155,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable /** * Returns the form's configuration. * - * @return FormConfigInterface The configuration. + * @return FormConfigInterface The configuration */ public function getConfig(); @@ -169,14 +169,14 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable /** * Returns the name by which the form is identified in forms. * - * @return string The name of the form. + * @return string The name of the form */ public function getName(); /** * Returns the property path that the form is mapped to. * - * @return \Symfony\Component\PropertyAccess\PropertyPathInterface The property path. + * @return \Symfony\Component\PropertyAccess\PropertyPathInterface The property path */ public function getPropertyPath(); @@ -251,7 +251,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * * Should be called on the root form after constructing the tree. * - * @return FormInterface The form instance. + * @return FormInterface The form instance */ public function initialize(); @@ -263,16 +263,16 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * {@link RequestHandlerInterface} instance, which determines whether to * submit the form or not. * - * @param mixed $request The request to handle. + * @param mixed $request The request to handle * - * @return FormInterface The form instance. + * @return FormInterface The form instance */ public function handleRequest($request = null); /** * Submits data to the form, transforms and validates it. * - * @param null|string|array $submittedData The submitted data. + * @param null|string|array $submittedData The submitted data * @param bool $clearMissing Whether to set fields to NULL * when they are missing in the * submitted data. diff --git a/src/Symfony/Component/Form/FormRegistry.php b/src/Symfony/Component/Form/FormRegistry.php index 67cfca06aa..5f0b795e92 100644 --- a/src/Symfony/Component/Form/FormRegistry.php +++ b/src/Symfony/Component/Form/FormRegistry.php @@ -48,7 +48,7 @@ class FormRegistry implements FormRegistryInterface * Constructor. * * @param FormExtensionInterface[] $extensions An array of FormExtensionInterface - * @param ResolvedFormTypeFactoryInterface $resolvedTypeFactory The factory for resolved form types. + * @param ResolvedFormTypeFactoryInterface $resolvedTypeFactory The factory for resolved form types * * @throws UnexpectedTypeException if any extension does not implement FormExtensionInterface */ @@ -93,9 +93,9 @@ class FormRegistry implements FormRegistryInterface * Wraps a type into a ResolvedFormTypeInterface implementation and connects * it with its parent type. * - * @param FormTypeInterface $type The type to resolve. + * @param FormTypeInterface $type The type to resolve * - * @return ResolvedFormTypeInterface The resolved type. + * @return ResolvedFormTypeInterface The resolved type */ private function resolveAndAddType(FormTypeInterface $type) { diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php index b49ec9cc8a..c3667b1dbb 100644 --- a/src/Symfony/Component/Form/FormRendererEngineInterface.php +++ b/src/Symfony/Component/Form/FormRendererEngineInterface.php @@ -21,7 +21,7 @@ interface FormRendererEngineInterface /** * Sets the theme(s) to be used for rendering a view and its children. * - * @param FormView $view The view to assign the theme(s) to. + * @param FormView $view The view to assign the theme(s) to * @param mixed $themes The theme(s). The type of these themes * is open to the implementation. */ @@ -36,13 +36,13 @@ interface FormRendererEngineInterface * The type of the resource is decided by the implementation. The resource * is later passed to {@link renderBlock()} by the rendering algorithm. * - * @param FormView $view The view for determining the used themes. + * @param FormView $view The view for determining the used themes * First the themes attached directly to the * view with {@link setTheme()} are considered, * then the ones of its parent etc. - * @param string $blockName The name of the block to render. + * @param string $blockName The name of the block to render * - * @return mixed The renderer resource or false, if none was found. + * @return mixed The renderer resource or false, if none was found */ public function getResourceForBlockName(FormView $view, $blockName); @@ -70,7 +70,7 @@ interface FormRendererEngineInterface * The type of the resource is decided by the implementation. The resource * is later passed to {@link renderBlock()} by the rendering algorithm. * - * @param FormView $view The view for determining the used themes. + * @param FormView $view The view for determining the used themes * First the themes attached directly to * the view with {@link setTheme()} are * considered, then the ones of its parent etc. @@ -80,7 +80,7 @@ interface FormRendererEngineInterface * looking. Level 0 indicates the root block, i.e. * the first element of $blockNameHierarchy. * - * @return mixed The renderer resource or false, if none was found. + * @return mixed The renderer resource or false, if none was found */ public function getResourceForBlockNameHierarchy(FormView $view, array $blockNameHierarchy, $hierarchyLevel); @@ -110,7 +110,7 @@ interface FormRendererEngineInterface * The type of the resource is decided by the implementation. The resource * is later passed to {@link renderBlock()} by the rendering algorithm. * - * @param FormView $view The view for determining the used themes. + * @param FormView $view The view for determining the used themes * First the themes attached directly to * the view with {@link setTheme()} are * considered, then the ones of its parent etc. @@ -120,7 +120,7 @@ interface FormRendererEngineInterface * looking. Level 0 indicates the root block, i.e. * the first element of $blockNameHierarchy. * - * @return int|bool The hierarchy level or false, if no resource was found. + * @return int|bool The hierarchy level or false, if no resource was found */ public function getResourceHierarchyLevel(FormView $view, array $blockNameHierarchy, $hierarchyLevel); @@ -131,12 +131,12 @@ interface FormRendererEngineInterface * or {@link getResourceForBlockHierarchy()}. The type of the resource is * decided by the implementation. * - * @param FormView $view The view to render. - * @param mixed $resource The renderer resource. - * @param string $blockName The name of the block to render. - * @param array $variables The variables to pass to the template. + * @param FormView $view The view to render + * @param mixed $resource The renderer resource + * @param string $blockName The name of the block to render + * @param array $variables The variables to pass to the template * - * @return string The HTML markup. + * @return string The HTML markup */ public function renderBlock(FormView $view, $resource, $blockName, array $variables = array()); } diff --git a/src/Symfony/Component/Form/FormRendererInterface.php b/src/Symfony/Component/Form/FormRendererInterface.php index 6dc9e86c37..f0f51e4f59 100644 --- a/src/Symfony/Component/Form/FormRendererInterface.php +++ b/src/Symfony/Component/Form/FormRendererInterface.php @@ -21,14 +21,14 @@ interface FormRendererInterface /** * Returns the engine used by this renderer. * - * @return FormRendererEngineInterface The renderer engine. + * @return FormRendererEngineInterface The renderer engine */ public function getEngine(); /** * Sets the theme(s) to be used for rendering a view and its children. * - * @param FormView $view The view to assign the theme(s) to. + * @param FormView $view The view to assign the theme(s) to * @param mixed $themes The theme(s). The type of these themes * is open to the implementation. */ @@ -37,9 +37,9 @@ interface FormRendererInterface /** * Renders a named block of the form theme. * - * @param FormView $view The view for which to render the block. - * @param string $blockName The name of the block. - * @param array $variables The variables to pass to the template. + * @param FormView $view The view for which to render the block + * @param string $blockName The name of the block + * @param array $variables The variables to pass to the template * * @return string The HTML markup */ @@ -55,9 +55,9 @@ interface FormRendererInterface * If this method is called recursively, the block search is continued * where a block was found before. * - * @param FormView $view The view for which to render the block. - * @param string $blockNameSuffix The suffix of the block name. - * @param array $variables The variables to pass to the template. + * @param FormView $view The view for which to render the block + * @param string $blockNameSuffix The suffix of the block name + * @param array $variables The variables to pass to the template * * @return string The HTML markup */ @@ -95,9 +95,9 @@ interface FormRendererInterface * of the resulting string is capitalized, while all other letters are * turned to lowercase. * - * @param string $text The text to humanize. + * @param string $text The text to humanize * - * @return string The humanized text. + * @return string The humanized text */ public function humanize($text); } diff --git a/src/Symfony/Component/Form/FormTypeExtensionInterface.php b/src/Symfony/Component/Form/FormTypeExtensionInterface.php index a8fd086dc8..095813d211 100644 --- a/src/Symfony/Component/Form/FormTypeExtensionInterface.php +++ b/src/Symfony/Component/Form/FormTypeExtensionInterface.php @@ -62,7 +62,7 @@ interface FormTypeExtensionInterface /** * Overrides the default options from the extended type. * - * @param OptionsResolverInterface $resolver The resolver for the options. + * @param OptionsResolverInterface $resolver The resolver for the options * * @deprecated since version 2.7, to be removed in 3.0. * Use the method configureOptions instead. This method will be diff --git a/src/Symfony/Component/Form/FormTypeInterface.php b/src/Symfony/Component/Form/FormTypeInterface.php index 11c48db26d..a3821e8426 100644 --- a/src/Symfony/Component/Form/FormTypeInterface.php +++ b/src/Symfony/Component/Form/FormTypeInterface.php @@ -71,7 +71,7 @@ interface FormTypeInterface /** * Sets the default options for this type. * - * @param OptionsResolverInterface $resolver The resolver for the options. + * @param OptionsResolverInterface $resolver The resolver for the options * * @deprecated since version 2.7, to be renamed in 3.0. * Use the method configureOptions instead. This method will be @@ -86,7 +86,7 @@ interface FormTypeInterface * is discouraged because it leads to a performance penalty. The support * for returning type instances may be dropped from future releases. * - * @return string|null|FormTypeInterface The name of the parent type if any, null otherwise. + * @return string|null|FormTypeInterface The name of the parent type if any, null otherwise */ public function getParent(); diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php index e424b3c773..4992833e4b 100644 --- a/src/Symfony/Component/Form/FormView.php +++ b/src/Symfony/Component/Form/FormView.php @@ -61,7 +61,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable /** * Returns whether the view was already rendered. * - * @return bool Whether this view's widget is rendered. + * @return bool Whether this view's widget is rendered */ public function isRendered() { @@ -87,7 +87,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable /** * Marks the view as rendered. * - * @return FormView The view object. + * @return FormView The view object */ public function setRendered() { diff --git a/src/Symfony/Component/Form/Forms.php b/src/Symfony/Component/Form/Forms.php index 96ac45129f..60db38cf98 100644 --- a/src/Symfony/Component/Form/Forms.php +++ b/src/Symfony/Component/Form/Forms.php @@ -103,7 +103,7 @@ final class Forms /** * Creates a form factory with the default configuration. * - * @return FormFactoryInterface The form factory. + * @return FormFactoryInterface The form factory */ public static function createFormFactory() { @@ -113,7 +113,7 @@ final class Forms /** * Creates a form factory builder with the default configuration. * - * @return FormFactoryBuilderInterface The form factory builder. + * @return FormFactoryBuilderInterface The form factory builder */ public static function createFormFactoryBuilder() { diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php index c9a76858dd..36a7d7cff2 100644 --- a/src/Symfony/Component/Form/NativeRequestHandler.php +++ b/src/Symfony/Component/Form/NativeRequestHandler.php @@ -132,7 +132,7 @@ class NativeRequestHandler implements RequestHandlerInterface /** * Returns the method used to submit the request to the server. * - * @return string The request method. + * @return string The request method */ private static function getRequestMethod() { @@ -200,9 +200,9 @@ class NativeRequestHandler implements RequestHandlerInterface /** * Sets empty uploaded files to NULL in the given uploaded files array. * - * @param mixed $data The file upload data. + * @param mixed $data The file upload data * - * @return array|null Returns the stripped upload data. + * @return array|null Returns the stripped upload data */ private static function stripEmptyFiles($data) { diff --git a/src/Symfony/Component/Form/PreloadedExtension.php b/src/Symfony/Component/Form/PreloadedExtension.php index 6b4f9ef6a1..65519f83d4 100644 --- a/src/Symfony/Component/Form/PreloadedExtension.php +++ b/src/Symfony/Component/Form/PreloadedExtension.php @@ -38,9 +38,9 @@ class PreloadedExtension implements FormExtensionInterface /** * Creates a new preloaded extension. * - * @param FormTypeInterface[] $types The types that the extension should support. - * @param array[FormTypeExtensionInterface[]] $typeExtensions The type extensions that the extension should support. - * @param FormTypeGuesserInterface|null $typeGuesser The guesser that the extension should support. + * @param FormTypeInterface[] $types The types that the extension should support + * @param array[FormTypeExtensionInterface[]] $typeExtensions The type extensions that the extension should support + * @param FormTypeGuesserInterface|null $typeGuesser The guesser that the extension should support */ public function __construct(array $types, array $typeExtensions, FormTypeGuesserInterface $typeGuesser = null) { diff --git a/src/Symfony/Component/Form/RequestHandlerInterface.php b/src/Symfony/Component/Form/RequestHandlerInterface.php index d0a58e6973..598a7bb174 100644 --- a/src/Symfony/Component/Form/RequestHandlerInterface.php +++ b/src/Symfony/Component/Form/RequestHandlerInterface.php @@ -21,8 +21,8 @@ interface RequestHandlerInterface /** * Submits a form if it was submitted. * - * @param FormInterface $form The form to submit. - * @param mixed $request The current request. + * @param FormInterface $form The form to submit + * @param mixed $request The current request */ public function handleRequest(FormInterface $form, $request = null); } diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php index 765cb7bf6c..54c96959c4 100644 --- a/src/Symfony/Component/Form/ResolvedFormType.php +++ b/src/Symfony/Component/Form/ResolvedFormType.php @@ -123,8 +123,8 @@ class ResolvedFormType implements ResolvedFormTypeInterface /** * Configures a form builder for the type hierarchy. * - * @param FormBuilderInterface $builder The builder to configure. - * @param array $options The options used for the configuration. + * @param FormBuilderInterface $builder The builder to configure + * @param array $options The options used for the configuration */ public function buildForm(FormBuilderInterface $builder, array $options) { @@ -144,9 +144,9 @@ class ResolvedFormType implements ResolvedFormTypeInterface * * This method is called before the children of the view are built. * - * @param FormView $view The form view to configure. - * @param FormInterface $form The form corresponding to the view. - * @param array $options The options used for the configuration. + * @param FormView $view The form view to configure + * @param FormInterface $form The form corresponding to the view + * @param array $options The options used for the configuration */ public function buildView(FormView $view, FormInterface $form, array $options) { @@ -166,9 +166,9 @@ class ResolvedFormType implements ResolvedFormTypeInterface * * This method is called after the children of the view have been built. * - * @param FormView $view The form view to configure. - * @param FormInterface $form The form corresponding to the view. - * @param array $options The options used for the configuration. + * @param FormView $view The form view to configure + * @param FormInterface $form The form corresponding to the view + * @param array $options The options used for the configuration */ public function finishView(FormView $view, FormInterface $form, array $options) { @@ -187,7 +187,7 @@ class ResolvedFormType implements ResolvedFormTypeInterface /** * Returns the configured options resolver used for this type. * - * @return \Symfony\Component\OptionsResolver\OptionsResolverInterface The options resolver. + * @return \Symfony\Component\OptionsResolver\OptionsResolverInterface The options resolver */ public function getOptionsResolver() { @@ -241,12 +241,12 @@ class ResolvedFormType implements ResolvedFormTypeInterface * * Override this method if you want to customize the builder class. * - * @param string $name The name of the builder. - * @param string $dataClass The data class. - * @param FormFactoryInterface $factory The current form factory. - * @param array $options The builder options. + * @param string $name The name of the builder + * @param string $dataClass The data class + * @param FormFactoryInterface $factory The current form factory + * @param array $options The builder options * - * @return FormBuilderInterface The new builder instance. + * @return FormBuilderInterface The new builder instance */ protected function newBuilder($name, $dataClass, FormFactoryInterface $factory, array $options) { @@ -266,9 +266,9 @@ class ResolvedFormType implements ResolvedFormTypeInterface * * Override this method if you want to customize the view class. * - * @param FormView|null $parent The parent view, if available. + * @param FormView|null $parent The parent view, if available * - * @return FormView A new view instance. + * @return FormView A new view instance */ protected function newView(FormView $parent = null) { diff --git a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php index e6a61c753b..1601ef62c2 100644 --- a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php +++ b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php @@ -23,57 +23,57 @@ interface ResolvedFormTypeInterface /** * Returns the name of the type. * - * @return string The type name. + * @return string The type name */ public function getName(); /** * Returns the parent type. * - * @return ResolvedFormTypeInterface|null The parent type or null. + * @return ResolvedFormTypeInterface|null The parent type or null */ public function getParent(); /** * Returns the wrapped form type. * - * @return FormTypeInterface The wrapped form type. + * @return FormTypeInterface The wrapped form type */ public function getInnerType(); /** * Returns the extensions of the wrapped form type. * - * @return FormTypeExtensionInterface[] An array of {@link FormTypeExtensionInterface} instances. + * @return FormTypeExtensionInterface[] An array of {@link FormTypeExtensionInterface} instances */ public function getTypeExtensions(); /** * Creates a new form builder for this type. * - * @param FormFactoryInterface $factory The form factory. - * @param string $name The name for the builder. - * @param array $options The builder options. + * @param FormFactoryInterface $factory The form factory + * @param string $name The name for the builder + * @param array $options The builder options * - * @return FormBuilderInterface The created form builder. + * @return FormBuilderInterface The created form builder */ public function createBuilder(FormFactoryInterface $factory, $name, array $options = array()); /** * Creates a new form view for a form of this type. * - * @param FormInterface $form The form to create a view for. - * @param FormView $parent The parent view or null. + * @param FormInterface $form The form to create a view for + * @param FormView $parent The parent view or null * - * @return FormView The created form view. + * @return FormView The created form view */ public function createView(FormInterface $form, FormView $parent = null); /** * Configures a form builder for the type hierarchy. * - * @param FormBuilderInterface $builder The builder to configure. - * @param array $options The options used for the configuration. + * @param FormBuilderInterface $builder The builder to configure + * @param array $options The options used for the configuration */ public function buildForm(FormBuilderInterface $builder, array $options); @@ -82,9 +82,9 @@ interface ResolvedFormTypeInterface * * It is called before the children of the view are built. * - * @param FormView $view The form view to configure. - * @param FormInterface $form The form corresponding to the view. - * @param array $options The options used for the configuration. + * @param FormView $view The form view to configure + * @param FormInterface $form The form corresponding to the view + * @param array $options The options used for the configuration */ public function buildView(FormView $view, FormInterface $form, array $options); @@ -93,16 +93,16 @@ interface ResolvedFormTypeInterface * * It is called after the children of the view have been built. * - * @param FormView $view The form view to configure. - * @param FormInterface $form The form corresponding to the view. - * @param array $options The options used for the configuration. + * @param FormView $view The form view to configure + * @param FormInterface $form The form corresponding to the view + * @param array $options The options used for the configuration */ public function finishView(FormView $view, FormInterface $form, array $options); /** * Returns the configured options resolver used for this type. * - * @return OptionsResolverInterface The options resolver. + * @return OptionsResolverInterface The options resolver */ public function getOptionsResolver(); } diff --git a/src/Symfony/Component/Form/SubmitButton.php b/src/Symfony/Component/Form/SubmitButton.php index e95cdeeff7..53ff7bc311 100644 --- a/src/Symfony/Component/Form/SubmitButton.php +++ b/src/Symfony/Component/Form/SubmitButton.php @@ -34,8 +34,8 @@ class SubmitButton extends Button implements ClickableInterface /** * Submits data to the button. * - * @param null|string $submittedData The data. - * @param bool $clearMissing Not used. + * @param null|string $submittedData The data + * @param bool $clearMissing Not used * * @return SubmitButton The button instance * diff --git a/src/Symfony/Component/Form/Util/OrderedHashMap.php b/src/Symfony/Component/Form/Util/OrderedHashMap.php index 2ba53e2610..3aaa7d0451 100644 --- a/src/Symfony/Component/Form/Util/OrderedHashMap.php +++ b/src/Symfony/Component/Form/Util/OrderedHashMap.php @@ -92,7 +92,7 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable /** * Creates a new map. * - * @param array $elements The elements to insert initially. + * @param array $elements The elements to insert initially * * @since 2.2.6 */ diff --git a/src/Symfony/Component/Form/Util/ServerParams.php b/src/Symfony/Component/Form/Util/ServerParams.php index d5367d9163..c4da49db84 100644 --- a/src/Symfony/Component/Form/Util/ServerParams.php +++ b/src/Symfony/Component/Form/Util/ServerParams.php @@ -70,7 +70,7 @@ class ServerParams /** * Returns the content length of the request. * - * @return mixed The request content length. + * @return mixed The request content length */ public function getContentLength() { diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php index ace70db905..10837726cd 100644 --- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php +++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php @@ -194,7 +194,7 @@ class UploadedFile extends File /** * Returns whether the file was uploaded successfully. * - * @return bool True if the file has been uploaded with HTTP and no error occurred. + * @return bool True if the file has been uploaded with HTTP and no error occurred */ public function isValid() { diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php index f2cf356e5c..82461d0159 100644 --- a/src/Symfony/Component/HttpFoundation/IpUtils.php +++ b/src/Symfony/Component/HttpFoundation/IpUtils.php @@ -57,7 +57,7 @@ class IpUtils * @param string $requestIp IPv4 address to check * @param string $ip IPv4 address or subnet in CIDR notation * - * @return bool Whether the request IP matches the IP, or whether the request IP is within the CIDR subnet. + * @return bool Whether the request IP matches the IP, or whether the request IP is within the CIDR subnet */ public static function checkIp4($requestIp, $ip) { diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php index 2cfebfba23..4d082a8d2f 100644 --- a/src/Symfony/Component/HttpFoundation/ParameterBag.php +++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php @@ -242,11 +242,11 @@ class ParameterBag implements \IteratorAggregate, \Countable /** * Filter key. * - * @param string $key Key. - * @param mixed $default Default = null. - * @param bool $deep Default = false. - * @param int $filter FILTER_* constant. - * @param mixed $options Filter options. + * @param string $key Key + * @param mixed $default Default = null + * @param bool $deep Default = false + * @param int $filter FILTER_* constant + * @param mixed $options Filter options * * @see http://php.net/manual/en/function.filter-var.php * diff --git a/src/Symfony/Component/HttpFoundation/RedirectResponse.php b/src/Symfony/Component/HttpFoundation/RedirectResponse.php index 18d5794c0b..8d2608336a 100644 --- a/src/Symfony/Component/HttpFoundation/RedirectResponse.php +++ b/src/Symfony/Component/HttpFoundation/RedirectResponse.php @@ -66,7 +66,7 @@ class RedirectResponse extends Response * * @param string $url The URL to redirect to * - * @return RedirectResponse The current response. + * @return RedirectResponse The current response * * @throws \InvalidArgumentException */ diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index da6244ddb9..242196240b 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -553,7 +553,7 @@ class Request /** * Gets the list of trusted proxies. * - * @return array An array of trusted proxies. + * @return array An array of trusted proxies */ public static function getTrustedProxies() { @@ -579,7 +579,7 @@ class Request /** * Gets the list of trusted host patterns. * - * @return array An array of trusted host patterns. + * @return array An array of trusted host patterns */ public static function getTrustedHosts() { @@ -1396,7 +1396,7 @@ class Request /** * Sets the request format. * - * @param string $format The request format. + * @param string $format The request format */ public function setRequestFormat($format) { @@ -1460,7 +1460,7 @@ class Request /** * Checks if the request method is of specified type. * - * @param string $method Uppercase request method (GET, POST etc). + * @param string $method Uppercase request method (GET, POST etc) * * @return bool */ @@ -1484,7 +1484,7 @@ class Request * * @param bool $asResource If true, a resource will be returned * - * @return string|resource The request body content or a resource to read the body stream. + * @return string|resource The request body content or a resource to read the body stream * * @throws \LogicException */ diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index 2f77858a47..89d151d08a 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -262,7 +262,7 @@ class Response * * @param Request $request A Request instance * - * @return Response The current response. + * @return Response The current response */ public function prepare(Request $request) { diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php index 1d26e86b9b..3223691eb6 100644 --- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php +++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php @@ -230,7 +230,7 @@ class ResponseHeaderBag extends HeaderBag * is semantically equivalent to $filename. If the filename is already ASCII, * it can be omitted, or just copied from $filename * - * @return string A string suitable for use as a Content-Disposition field-value. + * @return string A string suitable for use as a Content-Disposition field-value * * @throws \InvalidArgumentException * diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php index 68cecf63d5..d797a6f238 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php @@ -29,8 +29,8 @@ class NamespacedAttributeBag extends AttributeBag /** * Constructor. * - * @param string $storageKey Session storage key. - * @param string $namespaceCharacter Namespace character to use in keys. + * @param string $storageKey Session storage key + * @param string $namespaceCharacter Namespace character to use in keys */ public function __construct($storageKey = '_sf2_attributes', $namespaceCharacter = '/') { diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php index b9de5ceb38..ddd603fdd1 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php @@ -37,7 +37,7 @@ class AutoExpireFlashBag implements FlashBagInterface /** * Constructor. * - * @param string $storageKey The key used to store flashes in the session. + * @param string $storageKey The key used to store flashes in the session */ public function __construct($storageKey = '_sf2_flashes') { diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php index 0da7715094..1516de7fe9 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php @@ -39,7 +39,7 @@ class FlashBag implements FlashBagInterface, \IteratorAggregate /** * Constructor. * - * @param string $storageKey The key used to store flashes in the session. + * @param string $storageKey The key used to store flashes in the session */ public function __construct($storageKey = '_sf2_flashes') { diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php index be79d9d752..80e97f17cd 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php @@ -39,8 +39,8 @@ interface FlashBagInterface extends SessionBagInterface /** * Gets flash messages for a given type. * - * @param string $type Message category type. - * @param array $default Default value if $type does not exist. + * @param string $type Message category type + * @param array $default Default value if $type does not exist * * @return array */ @@ -57,7 +57,7 @@ interface FlashBagInterface extends SessionBagInterface * Gets and clears flash from the stack. * * @param string $type - * @param array $default Default value if $type does not exist. + * @param array $default Default value if $type does not exist * * @return array */ diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php index b743fe1b19..cdd97375b9 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Session.php +++ b/src/Symfony/Component/HttpFoundation/Session/Session.php @@ -46,7 +46,7 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable /** * Constructor. * - * @param SessionStorageInterface $storage A SessionStorageInterface instance. + * @param SessionStorageInterface $storage A SessionStorageInterface instance * @param AttributeBagInterface $attributes An AttributeBagInterface instance, (defaults null for default AttributeBag) * @param FlashBagInterface $flashes A FlashBagInterface instance (defaults null for default FlashBag) */ diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php index 182a47d96a..aca18aacbf 100644 --- a/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php @@ -42,7 +42,7 @@ interface SessionBagInterface /** * Clears out data from bag. * - * @return mixed Whatever data was contained. + * @return mixed Whatever data was contained */ public function clear(); } diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php index e2b658413d..d3fcd2eec4 100644 --- a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php @@ -23,7 +23,7 @@ interface SessionInterface /** * Starts the session storage. * - * @return bool True if session started. + * @return bool True if session started * * @throws \RuntimeException If session fails to start. */ @@ -32,7 +32,7 @@ interface SessionInterface /** * Returns the session ID. * - * @return string The session ID. + * @return string The session ID */ public function getId(); @@ -46,7 +46,7 @@ interface SessionInterface /** * Returns the session name. * - * @return mixed The session name. + * @return mixed The session name */ public function getName(); @@ -68,7 +68,7 @@ interface SessionInterface * to expire with browser session. Time is in seconds, and is * not a Unix timestamp. * - * @return bool True if session invalidated, false if error. + * @return bool True if session invalidated, false if error */ public function invalidate($lifetime = null); @@ -76,13 +76,13 @@ interface SessionInterface * Migrates the current session to a new session id while maintaining all * session attributes. * - * @param bool $destroy Whether to delete the old session or leave it to garbage collection. + * @param bool $destroy Whether to delete the old session or leave it to garbage collection * @param int $lifetime Sets the cookie lifetime for the session cookie. A null value * will leave the system settings unchanged, 0 sets the cookie * to expire with browser session. Time is in seconds, and is * not a Unix timestamp. * - * @return bool True if session migrated, false if error. + * @return bool True if session migrated, false if error */ public function migrate($destroy = false, $lifetime = null); @@ -108,7 +108,7 @@ interface SessionInterface * Returns an attribute. * * @param string $name The attribute name - * @param mixed $default The default value if not found. + * @param mixed $default The default value if not found * * @return mixed */ diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php index f6f99eda48..a386bdd184 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php @@ -19,7 +19,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; class MemcacheSessionHandler implements \SessionHandlerInterface { /** - * @var \Memcache Memcache driver. + * @var \Memcache Memcache driver */ private $memcache; @@ -29,7 +29,7 @@ class MemcacheSessionHandler implements \SessionHandlerInterface private $ttl; /** - * @var string Key prefix for shared environments. + * @var string Key prefix for shared environments */ private $prefix; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php index d87bef852f..76b08e2db9 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php @@ -24,7 +24,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; class MemcachedSessionHandler implements \SessionHandlerInterface { /** - * @var \Memcached Memcached driver. + * @var \Memcached Memcached driver */ private $memcached; @@ -34,7 +34,7 @@ class MemcachedSessionHandler implements \SessionHandlerInterface private $ttl; /** - * @var string Key prefix for shared environments. + * @var string Key prefix for shared environments */ private $prefix; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php index c00835d797..1be0a39837 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php @@ -23,7 +23,7 @@ class NativeFileSessionHandler extends NativeSessionHandler /** * Constructor. * - * @param string $savePath Path of directory to save session files. + * @param string $savePath Path of directory to save session files * Default null will leave setting as defined by PHP. * '/path', 'N;/path', or 'N;octal-mode;/path * diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php index ec7b26799a..322dd560f8 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php @@ -56,7 +56,7 @@ class MetadataBag implements SessionBagInterface /** * 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 */ public function __construct($storageKey = '_sf2_meta', $updateThreshold = 0) diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php index bc1373755a..c26cc1334d 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php @@ -66,7 +66,7 @@ class MockArraySessionStorage implements SessionStorageInterface * Constructor. * * @param string $name Session name - * @param MetadataBag $metaBag MetadataBag instance. + * @param MetadataBag $metaBag MetadataBag instance */ public function __construct($name = 'MOCKSESSID', MetadataBag $metaBag = null) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php index 00807cfcb7..71f9e55512 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php @@ -32,9 +32,9 @@ class MockFileSessionStorage extends MockArraySessionStorage /** * Constructor. * - * @param string $savePath Path of directory to save session files. - * @param string $name Session name. - * @param MetadataBag $metaBag MetadataBag instance. + * @param string $savePath Path of directory to save session files + * @param string $name Session name + * @param MetadataBag $metaBag MetadataBag instance */ public function __construct($savePath = null, $name = 'MOCKSESSID', MetadataBag $metaBag = null) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php index aa4a237cdd..32979e8b45 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php @@ -92,9 +92,9 @@ class NativeSessionStorage implements SessionStorageInterface * upload_progress.min-freq, "1" * url_rewriter.tags, "a=href,area=href,frame=src,form=,fieldset=" * - * @param array $options Session configuration options. + * @param array $options Session configuration options * @param AbstractProxy|NativeSessionHandler|\SessionHandlerInterface|null $handler - * @param MetadataBag $metaBag MetadataBag. + * @param MetadataBag $metaBag MetadataBag */ public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null) { @@ -323,7 +323,7 @@ class NativeSessionStorage implements SessionStorageInterface * For convenience we omit 'session.' from the beginning of the keys. * Explicitly ignores other ini keys. * - * @param array $options Session ini directives array(key => value). + * @param array $options Session ini directives array(key => value) * * @see http://php.net/session.configuration */ diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php index 5bb2c712e3..0db34aa28d 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php @@ -32,7 +32,7 @@ class NativeProxy extends AbstractProxy /** * Returns true if this handler wraps an internal PHP session save handler using \SessionHandler. * - * @return bool False. + * @return bool False */ public function isWrapper() { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php index 206f18e77f..34f6c4633f 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php @@ -24,7 +24,7 @@ interface SessionStorageInterface /** * Starts the session. * - * @return bool True if started. + * @return bool True if started * * @throws \RuntimeException If something goes wrong starting the session. */ @@ -33,14 +33,14 @@ interface SessionStorageInterface /** * Checks if the session is started. * - * @return bool True if started, false otherwise. + * @return bool True if started, false otherwise */ public function isStarted(); /** * Returns the session ID. * - * @return string The session ID or empty. + * @return string The session ID or empty */ public function getId(); @@ -54,7 +54,7 @@ interface SessionStorageInterface /** * Returns the session name. * - * @return mixed The session name. + * @return mixed The session name */ public function getName(); diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php b/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php index d4a2db3764..675c584234 100644 --- a/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php +++ b/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php @@ -21,7 +21,7 @@ interface CacheClearerInterface /** * Clears any caches necessary. * - * @param string $cacheDir The cache directory. + * @param string $cacheDir The cache directory */ public function clear($cacheDir); } diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php index 81c43b6026..c749c7c0a4 100644 --- a/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php +++ b/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php @@ -26,7 +26,7 @@ class ChainCacheClearer implements CacheClearerInterface /** * Constructs a new instance of ChainCacheClearer. * - * @param array $clearers The initial clearers. + * @param array $clearers The initial clearers */ public function __construct(array $clearers = array()) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php index bccde8eb95..2f302f450f 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php @@ -28,8 +28,8 @@ class DumpListener implements EventSubscriberInterface private $dumper; /** - * @param ClonerInterface $cloner Cloner service. - * @param DataDumperInterface $dumper Dumper service. + * @param ClonerInterface $cloner Cloner service + * @param DataDumperInterface $dumper Dumper service */ public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php index 1a90f1ebe7..1c50ef4aca 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php @@ -96,10 +96,10 @@ class ExceptionListener implements EventSubscriberInterface /** * Clones the request for the exception. * - * @param \Exception $exception The thrown exception. - * @param Request $request The original request. + * @param \Exception $exception The thrown exception + * @param Request $request The original request * - * @return Request $request The cloned request. + * @return Request $request The cloned request */ protected function duplicateRequest(\Exception $exception, Request $request) { diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php index bc344c633f..457793953d 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php @@ -37,7 +37,7 @@ class Esi implements SurrogateInterface /** * Constructor. * - * @param array $contentTypes An array of content-type that should be parsed for ESI information. + * @param array $contentTypes An array of content-type that should be parsed for ESI information * (default: text/html, text/xml, application/xhtml+xml, and application/xml) */ public function __construct(array $contentTypes = array('text/html', 'text/xml', 'application/xhtml+xml', 'application/xml')) diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php index 43311b6dc8..5f7ee10a5b 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php @@ -31,7 +31,7 @@ class Ssi implements SurrogateInterface /** * Constructor. * - * @param array $contentTypes An array of content-type that should be parsed for SSI information. + * @param array $contentTypes An array of content-type that should be parsed for SSI information * (default: text/html, text/xml, application/xhtml+xml, and application/xml) */ public function __construct(array $contentTypes = array('text/html', 'text/xml', 'application/xhtml+xml', 'application/xml')) diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php index ee5d27336f..37ac3af515 100644 --- a/src/Symfony/Component/HttpKernel/KernelInterface.php +++ b/src/Symfony/Component/HttpKernel/KernelInterface.php @@ -27,7 +27,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable /** * Returns an array of bundles to register. * - * @return BundleInterface[] An array of bundle instances. + * @return BundleInterface[] An array of bundle instances */ public function registerBundles(); diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php index 694dc1e5ba..91222c165b 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php +++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php @@ -137,7 +137,7 @@ class RedisMock * @param string $key * @param string $value * - * @return int Size of the value after the append. + * @return int Size of the value after the append */ public function append($key, $value) { diff --git a/src/Symfony/Component/Intl/Collator/Collator.php b/src/Symfony/Component/Intl/Collator/Collator.php index 90fba8d491..e3dca20c8d 100644 --- a/src/Symfony/Component/Intl/Collator/Collator.php +++ b/src/Symfony/Component/Intl/Collator/Collator.php @@ -70,7 +70,7 @@ class Collator /** * Constructor. * - * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en"). + * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en") * * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed */ @@ -84,7 +84,7 @@ class Collator /** * Static constructor. * - * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en"). + * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en") * * @return Collator * diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php index cf8ee1a74b..9a91888cf5 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php @@ -23,14 +23,14 @@ use Symfony\Component\Intl\Exception\RuntimeException; class GenrbCompiler implements BundleCompilerInterface { /** - * @var string The path to the "genrb" executable. + * @var string The path to the "genrb" executable */ private $genrb; /** * Creates a new compiler based on the "genrb" executable. * - * @param string $genrb Optional. The path to the "genrb" executable. + * @param string $genrb Optional. The path to the "genrb" executable * @param string $envVars Optional. Environment variables to be loaded when * running "genrb". * diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php index fede9cdb4a..ff04294683 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php @@ -30,7 +30,7 @@ class BufferedBundleReader implements BundleReaderInterface /** * Buffers a given reader. * - * @param BundleReaderInterface $reader The reader to buffer. + * @param BundleReaderInterface $reader The reader to buffer * @param int $bufferSize The number of entries to store * in the buffer. */ diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php index 5f991bfe28..3cf969bab8 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php @@ -43,7 +43,7 @@ class BundleEntryReader implements BundleEntryReaderInterface /** * Creates an entry reader based on the given resource bundle reader. * - * @param BundleReaderInterface $reader A resource bundle reader to use. + * @param BundleReaderInterface $reader A resource bundle reader to use */ public function __construct(BundleReaderInterface $reader) { diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReaderInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReaderInterface.php index 8a4ecd8e63..e999440190 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReaderInterface.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReaderInterface.php @@ -37,9 +37,9 @@ interface BundleEntryReaderInterface extends BundleReaderInterface * * $reader->readEntry('...', 'en', array('TopLevel', 'NestedLevel', 'Entry')); * - * @param string $path The path to the resource bundle. - * @param string $locale The locale to read. - * @param string[] $indices The indices to read from the bundle. + * @param string $path The path to the resource bundle + * @param string $locale The locale to read + * @param string[] $indices The indices to read from the bundle * @param bool $fallback Whether to merge the value with the value from * the fallback locale (e.g. "en" for "en_GB"). * Only applicable if the result is multivalued diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleReaderInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleReaderInterface.php index 7257b0df7a..8d3da825f7 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleReaderInterface.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleReaderInterface.php @@ -23,8 +23,8 @@ interface BundleReaderInterface /** * Reads a resource bundle. * - * @param string $path The path to the resource bundle. - * @param string $locale The locale to read. + * @param string $path The path to the resource bundle + * @param string $locale The locale to read * * @return mixed Returns an array or {@link \ArrayAccess} instance for * complex data, a scalar value otherwise. diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php index e85376dc64..ea9a66da69 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php @@ -23,9 +23,9 @@ interface BundleWriterInterface /** * Writes data to a resource bundle. * - * @param string $path The path to the resource bundle. - * @param string $locale The locale to (over-)write. - * @param mixed $data The data to write. + * @param string $path The path to the resource bundle + * @param string $locale The locale to (over-)write + * @param mixed $data The data to write */ public function write($path, $locale, $data); } diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php index aa078db5cd..3b7d94f10a 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php @@ -43,9 +43,9 @@ class TextBundleWriter implements BundleWriterInterface /** * Writes a "resourceBundle" node. * - * @param resource $file The file handle to write to. - * @param string $bundleName The name of the bundle. - * @param mixed $value The value of the node. + * @param resource $file The file handle to write to + * @param string $bundleName The name of the bundle + * @param mixed $value The value of the node * @param bool $fallback Whether the resource bundle should be merged * with the fallback locale. * @@ -63,9 +63,9 @@ class TextBundleWriter implements BundleWriterInterface /** * Writes a "resource" node. * - * @param resource $file The file handle to write to. - * @param mixed $value The value of the node. - * @param int $indentation The number of levels to indent. + * @param resource $file The file handle to write to + * @param mixed $value The value of the node + * @param int $indentation The number of levels to indent * @param bool $requireBraces Whether to require braces to be printed * around the value. * @@ -118,8 +118,8 @@ class TextBundleWriter implements BundleWriterInterface /** * Writes an "integer" node. * - * @param resource $file The file handle to write to. - * @param int $value The value of the node. + * @param resource $file The file handle to write to + * @param int $value The value of the node * * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt */ @@ -131,9 +131,9 @@ class TextBundleWriter implements BundleWriterInterface /** * Writes an "intvector" node. * - * @param resource $file The file handle to write to. - * @param array $value The value of the node. - * @param int $indentation The number of levels to indent. + * @param resource $file The file handle to write to + * @param array $value The value of the node + * @param int $indentation The number of levels to indent * * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt */ @@ -151,8 +151,8 @@ class TextBundleWriter implements BundleWriterInterface /** * Writes a "string" node. * - * @param resource $file The file handle to write to. - * @param string $value The value of the node. + * @param resource $file The file handle to write to + * @param string $value The value of the node * @param bool $requireBraces Whether to require braces to be printed * around the value. * @@ -172,9 +172,9 @@ class TextBundleWriter implements BundleWriterInterface /** * Writes an "array" node. * - * @param resource $file The file handle to write to. - * @param array $value The value of the node. - * @param int $indentation The number of levels to indent. + * @param resource $file The file handle to write to + * @param array $value The value of the node + * @param int $indentation The number of levels to indent * * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt */ @@ -196,9 +196,9 @@ class TextBundleWriter implements BundleWriterInterface /** * Writes a "table" node. * - * @param resource $file The file handle to write to. - * @param array|\Traversable $value The value of the node. - * @param int $indentation The number of levels to indent. + * @param resource $file The file handle to write to + * @param array|\Traversable $value The value of the node + * @param int $indentation The number of levels to indent * @param bool $fallback Whether the table should be merged * with the fallback locale. * diff --git a/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php b/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php index 221d3ab4aa..78e16ef4d8 100644 --- a/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php +++ b/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php @@ -68,7 +68,7 @@ class GeneratorConfig * Returns the directory where the source versions of the resource bundles * are stored. * - * @return string An absolute path to a directory. + * @return string An absolute path to a directory */ public function getSourceDir() { @@ -78,7 +78,7 @@ class GeneratorConfig /** * Returns the ICU version of the bundles being converted. * - * @return string The ICU version string. + * @return string The ICU version string */ public function getIcuVersion() { diff --git a/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php index 9c76f2fd92..c2747f0806 100644 --- a/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php +++ b/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php @@ -46,8 +46,8 @@ class CurrencyDataProvider * Creates a data provider that reads currency-related data from a * resource bundle. * - * @param string $path The path to the resource bundle. - * @param BundleEntryReaderInterface $reader The reader for reading the resource bundle. + * @param string $path The path to the resource bundle + * @param BundleEntryReaderInterface $reader The reader for reading the resource bundle */ public function __construct($path, BundleEntryReaderInterface $reader) { diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php index 017a905213..32d77784ac 100644 --- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php +++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php @@ -129,7 +129,7 @@ class IntlDateFormatter /** * Constructor. * - * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en"). + * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en") * @param int $datetype Type of date formatting, one of the format type constants * @param int $timetype Type of time formatting, one of the format type constants * @param mixed $timezone Timezone identifier @@ -163,11 +163,11 @@ class IntlDateFormatter /** * Static constructor. * - * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en"). + * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en") * @param int $datetype Type of date formatting, one of the format type constants * @param int $timetype Type of time formatting, one of the format type constants * @param string $timezone Timezone identifier - * @param int $calendar Calendar to use for formatting or parsing; default is Gregorian. + * @param int $calendar Calendar to use for formatting or parsing; default is Gregorian * One of the calendar constants. * @param string $pattern Optional pattern to use when formatting * @@ -190,7 +190,7 @@ class IntlDateFormatter * @param int|\DateTime $timestamp The timestamp to format. \DateTime objects * are supported as of PHP 5.3.4. * - * @return string|bool The formatted value or false if formatting failed. + * @return string|bool The formatted value or false if formatting failed * * @see http://www.php.net/manual/en/intldateformatter.format.php * @@ -393,7 +393,7 @@ class IntlDateFormatter /** * Returns whether the formatter is lenient. * - * @return bool Currently always returns false. + * @return bool Currently always returns false * * @see http://www.php.net/manual/en/intldateformatter.islenient.php * @@ -408,7 +408,7 @@ class IntlDateFormatter * Not supported. Parse string to a field-based time value. * * @param string $value String to convert to a time value - * @param int $position Position at which to start the parsing in $value (zero-based). + * @param int $position Position at which to start the parsing in $value (zero-based) * If no error occurs before $value is consumed, $parse_pos will * contain -1 otherwise it will contain the position at which parsing * ended. If $parse_pos > strlen($value), the parse fails immediately. @@ -428,7 +428,7 @@ class IntlDateFormatter * Parse string to a timestamp value. * * @param string $value String to convert to a time value - * @param int $position Not supported. Position at which to start the parsing in $value (zero-based). + * @param int $position Not supported. Position at which to start the parsing in $value (zero-based) * If no error occurs before $value is consumed, $parse_pos will * contain -1 otherwise it will contain the position at which parsing * ended. If $parse_pos > strlen($value), the parse fails immediately. @@ -461,7 +461,7 @@ class IntlDateFormatter /** * Not supported. Set the formatter's calendar. * - * @param string $calendar The calendar to use. Default is IntlDateFormatter::GREGORIAN. + * @param string $calendar The calendar to use. Default is IntlDateFormatter::GREGORIAN * * @return bool true on success or false on failure * @@ -524,7 +524,7 @@ class IntlDateFormatter /** * Set the formatter's timezone identifier. * - * @param string $timeZoneId The time zone ID string of the time zone to use. + * @param string $timeZoneId The time zone ID string of the time zone to use * If NULL or the empty string, the default time zone for the * runtime is used. * diff --git a/src/Symfony/Component/Intl/Intl.php b/src/Symfony/Component/Intl/Intl.php index 21031b5bbb..c91d09054a 100644 --- a/src/Symfony/Component/Intl/Intl.php +++ b/src/Symfony/Component/Intl/Intl.php @@ -101,7 +101,7 @@ final class Intl /** * Returns whether the intl extension is installed. * - * @return bool Returns true if the intl extension is installed, false otherwise. + * @return bool Returns true if the intl extension is installed, false otherwise */ public static function isExtensionLoaded() { @@ -111,7 +111,7 @@ final class Intl /** * Returns the bundle containing currency information. * - * @return CurrencyBundleInterface The currency resource bundle. + * @return CurrencyBundleInterface The currency resource bundle */ public static function getCurrencyBundle() { @@ -129,7 +129,7 @@ final class Intl /** * Returns the bundle containing language information. * - * @return LanguageBundleInterface The language resource bundle. + * @return LanguageBundleInterface The language resource bundle */ public static function getLanguageBundle() { @@ -151,7 +151,7 @@ final class Intl /** * Returns the bundle containing locale information. * - * @return LocaleBundleInterface The locale resource bundle. + * @return LocaleBundleInterface The locale resource bundle */ public static function getLocaleBundle() { @@ -168,7 +168,7 @@ final class Intl /** * Returns the bundle containing region information. * - * @return RegionBundleInterface The region resource bundle. + * @return RegionBundleInterface The region resource bundle */ public static function getRegionBundle() { @@ -186,7 +186,7 @@ final class Intl /** * Returns the version of the installed ICU library. * - * @return null|string The ICU version or NULL if it could not be determined. + * @return null|string The ICU version or NULL if it could not be determined */ public static function getIcuVersion() { @@ -216,7 +216,7 @@ final class Intl /** * Returns the version of the installed ICU data. * - * @return string The version of the installed ICU data. + * @return string The version of the installed ICU data */ public static function getIcuDataVersion() { @@ -230,7 +230,7 @@ final class Intl /** * Returns the ICU version that the stub classes mimic. * - * @return string The ICU version of the stub classes. + * @return string The ICU version of the stub classes */ public static function getIcuStubVersion() { diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php index 86d8efee85..30a287dc9d 100644 --- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php +++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php @@ -257,8 +257,8 @@ class NumberFormatter /** * Constructor. * - * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en"). - * @param int $style Style of the formatting, one of the format style constants. + * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en") + * @param int $style Style of the formatting, one of the format style constants * The only supported styles are NumberFormatter::DECIMAL * and NumberFormatter::CURRENCY. * @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or @@ -294,8 +294,8 @@ class NumberFormatter /** * Static constructor. * - * @param string $locale The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en"). - * @param int $style Style of the formatting, one of the format style constants. + * @param string $locale The locale code. The only supported locale is "en" (or null using the default locale, i.e. "en") + * @param int $style Style of the formatting, one of the format style constants * The only currently supported styles are NumberFormatter::DECIMAL * and NumberFormatter::CURRENCY. * @param string $pattern Not supported. A pattern string in case $style is NumberFormat::PATTERN_DECIMAL or @@ -356,7 +356,7 @@ class NumberFormatter * Format a number. * * @param number $value The value to format - * @param int $type Type of the formatting, one of the format type constants. + * @param int $type Type of the formatting, one of the format type constants * Only type NumberFormatter::TYPE_DEFAULT is currently supported. * * @return bool|string The formatted value or false on error @@ -566,10 +566,10 @@ class NumberFormatter /** * Set an attribute. * - * @param int $attr An attribute specifier, one of the numeric attribute constants. + * @param int $attr An attribute specifier, one of the numeric attribute constants * The only currently supported attributes are NumberFormatter::FRACTION_DIGITS, * NumberFormatter::GROUPING_USED and NumberFormatter::ROUNDING_MODE. - * @param int $value The attribute value. + * @param int $value The attribute value * * @return bool true on success or false on failure * diff --git a/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundleInterface.php b/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundleInterface.php index 8029e80347..eb82f6849e 100644 --- a/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundleInterface.php +++ b/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundleInterface.php @@ -21,41 +21,41 @@ interface CurrencyBundleInterface extends ResourceBundleInterface /** * Returns the symbol used for a currency. * - * @param string $currency A currency code (e.g. "EUR"). - * @param string $displayLocale Optional. The locale to return the result in. + * @param string $currency A currency code (e.g. "EUR") + * @param string $displayLocale Optional. The locale to return the result in * Defaults to {@link \Locale::getDefault()}. * - * @return string|null The currency symbol or NULL if not found. + * @return string|null The currency symbol or NULL if not found */ public function getCurrencySymbol($currency, $displayLocale = null); /** * Returns the name of a currency. * - * @param string $currency A currency code (e.g. "EUR"). - * @param string $displayLocale Optional. The locale to return the name in. + * @param string $currency A currency code (e.g. "EUR") + * @param string $displayLocale Optional. The locale to return the name in * Defaults to {@link \Locale::getDefault()}. * - * @return string|null The name of the currency or NULL if not found. + * @return string|null The name of the currency or NULL if not found */ public function getCurrencyName($currency, $displayLocale = null); /** * Returns the names of all known currencies. * - * @param string $displayLocale Optional. The locale to return the names in. + * @param string $displayLocale Optional. The locale to return the names in * Defaults to {@link \Locale::getDefault()}. * - * @return string[] A list of currency names indexed by currency codes. + * @return string[] A list of currency names indexed by currency codes */ public function getCurrencyNames($displayLocale = null); /** * Returns the number of digits after the comma of a currency. * - * @param string $currency A currency code (e.g. "EUR"). + * @param string $currency A currency code (e.g. "EUR") * - * @return int|null The number of digits after the comma or NULL if not found. + * @return int|null The number of digits after the comma or NULL if not found */ public function getFractionDigits($currency); @@ -66,9 +66,9 @@ interface CurrencyBundleInterface extends ResourceBundleInterface * For example, 1230 rounded to the nearest 50 is 1250. 1.234 rounded to the * nearest 0.65 is 1.3. * - * @param string $currency A currency code (e.g. "EUR"). + * @param string $currency A currency code (e.g. "EUR") * - * @return float|int|null The rounding increment or NULL if not found. + * @return float|int|null The rounding increment or NULL if not found */ public function getRoundingIncrement($currency); } diff --git a/src/Symfony/Component/Intl/ResourceBundle/LanguageBundleInterface.php b/src/Symfony/Component/Intl/ResourceBundle/LanguageBundleInterface.php index 65601b92a2..aa0c3e0f2c 100644 --- a/src/Symfony/Component/Intl/ResourceBundle/LanguageBundleInterface.php +++ b/src/Symfony/Component/Intl/ResourceBundle/LanguageBundleInterface.php @@ -21,44 +21,44 @@ interface LanguageBundleInterface extends ResourceBundleInterface /** * Returns the name of a language. * - * @param string $language A language code (e.g. "en"). - * @param string|null $region Optional. A region code (e.g. "US"). - * @param string $displayLocale Optional. The locale to return the name in. + * @param string $language A language code (e.g. "en") + * @param string|null $region Optional. A region code (e.g. "US") + * @param string $displayLocale Optional. The locale to return the name in * Defaults to {@link \Locale::getDefault()}. * - * @return string|null The name of the language or NULL if not found. + * @return string|null The name of the language or NULL if not found */ public function getLanguageName($language, $region = null, $displayLocale = null); /** * Returns the names of all known languages. * - * @param string $displayLocale Optional. The locale to return the names in. + * @param string $displayLocale Optional. The locale to return the names in * Defaults to {@link \Locale::getDefault()}. * - * @return string[] A list of language names indexed by language codes. + * @return string[] A list of language names indexed by language codes */ public function getLanguageNames($displayLocale = null); /** * Returns the name of a script. * - * @param string $script A script code (e.g. "Hans"). - * @param string $language Optional. A language code (e.g. "zh"). - * @param string $displayLocale Optional. The locale to return the name in. + * @param string $script A script code (e.g. "Hans") + * @param string $language Optional. A language code (e.g. "zh") + * @param string $displayLocale Optional. The locale to return the name in * Defaults to {@link \Locale::getDefault()}. * - * @return string|null The name of the script or NULL if not found. + * @return string|null The name of the script or NULL if not found */ public function getScriptName($script, $language = null, $displayLocale = null); /** * Returns the names of all known scripts. * - * @param string $displayLocale Optional. The locale to return the names in. + * @param string $displayLocale Optional. The locale to return the names in * Defaults to {@link \Locale::getDefault()}. * - * @return string[] A list of script names indexed by script codes. + * @return string[] A list of script names indexed by script codes */ public function getScriptNames($displayLocale = null); } diff --git a/src/Symfony/Component/Intl/ResourceBundle/LocaleBundleInterface.php b/src/Symfony/Component/Intl/ResourceBundle/LocaleBundleInterface.php index 28547891c9..6fa4e5c0ab 100644 --- a/src/Symfony/Component/Intl/ResourceBundle/LocaleBundleInterface.php +++ b/src/Symfony/Component/Intl/ResourceBundle/LocaleBundleInterface.php @@ -21,21 +21,21 @@ interface LocaleBundleInterface extends ResourceBundleInterface /** * Returns the name of a locale. * - * @param string $locale The locale to return the name of (e.g. "de_AT"). - * @param string $displayLocale Optional. The locale to return the name in. + * @param string $locale The locale to return the name of (e.g. "de_AT") + * @param string $displayLocale Optional. The locale to return the name in * Defaults to {@link \Locale::getDefault()}. * - * @return string|null The name of the locale or NULL if not found. + * @return string|null The name of the locale or NULL if not found */ public function getLocaleName($locale, $displayLocale = null); /** * Returns the names of all known locales. * - * @param string $displayLocale Optional. The locale to return the names in. + * @param string $displayLocale Optional. The locale to return the names in * Defaults to {@link \Locale::getDefault()}. * - * @return string[] A list of locale names indexed by locale codes. + * @return string[] A list of locale names indexed by locale codes */ public function getLocaleNames($displayLocale = null); } diff --git a/src/Symfony/Component/Intl/ResourceBundle/RegionBundleInterface.php b/src/Symfony/Component/Intl/ResourceBundle/RegionBundleInterface.php index ed7b09536f..12d0dd2408 100644 --- a/src/Symfony/Component/Intl/ResourceBundle/RegionBundleInterface.php +++ b/src/Symfony/Component/Intl/ResourceBundle/RegionBundleInterface.php @@ -21,21 +21,21 @@ interface RegionBundleInterface extends ResourceBundleInterface /** * Returns the name of a country. * - * @param string $country A country code (e.g. "US"). - * @param string $displayLocale Optional. The locale to return the name in. + * @param string $country A country code (e.g. "US") + * @param string $displayLocale Optional. The locale to return the name in * Defaults to {@link \Locale::getDefault()}. * - * @return string|null The name of the country or NULL if not found. + * @return string|null The name of the country or NULL if not found */ public function getCountryName($country, $displayLocale = null); /** * Returns the names of all known countries. * - * @param string $displayLocale Optional. The locale to return the names in. + * @param string $displayLocale Optional. The locale to return the names in * Defaults to {@link \Locale::getDefault()}. * - * @return string[] A list of country names indexed by country codes. + * @return string[] A list of country names indexed by country codes */ public function getCountryNames($displayLocale = null); } diff --git a/src/Symfony/Component/Intl/ResourceBundle/ResourceBundleInterface.php b/src/Symfony/Component/Intl/ResourceBundle/ResourceBundleInterface.php index 497a66a312..5c4c97483d 100644 --- a/src/Symfony/Component/Intl/ResourceBundle/ResourceBundleInterface.php +++ b/src/Symfony/Component/Intl/ResourceBundle/ResourceBundleInterface.php @@ -21,7 +21,7 @@ interface ResourceBundleInterface /** * Returns the list of locales that this bundle supports. * - * @return string[] A list of locale codes. + * @return string[] A list of locale codes */ public function getLocales(); } diff --git a/src/Symfony/Component/Intl/Resources/stubs/functions.php b/src/Symfony/Component/Intl/Resources/stubs/functions.php index 704f0f0c72..64e111e8ab 100644 --- a/src/Symfony/Component/Intl/Resources/stubs/functions.php +++ b/src/Symfony/Component/Intl/Resources/stubs/functions.php @@ -18,9 +18,9 @@ if (!function_exists('intl_is_failure')) { * * @author Bernhard Schussek * - * @param int $errorCode The error code returned by intl_get_error_code(). + * @param int $errorCode The error code returned by intl_get_error_code() * - * @return bool Whether the error code indicates an error. + * @return bool Whether the error code indicates an error * * @see IntlGlobals::isFailure() */ @@ -65,9 +65,9 @@ if (!function_exists('intl_is_failure')) { * Stub implementation for the {@link intl_error_name()} function of the intl * extension. * - * @param int $errorCode The error code. + * @param int $errorCode The error code * - * @return string The name of the error code constant. + * @return string The name of the error code constant * * @see IntlGlobals::getErrorName() */ diff --git a/src/Symfony/Component/Intl/Util/IcuVersion.php b/src/Symfony/Component/Intl/Util/IcuVersion.php index 23818e7bd7..e7324e7fd3 100644 --- a/src/Symfony/Component/Intl/Util/IcuVersion.php +++ b/src/Symfony/Component/Intl/Util/IcuVersion.php @@ -43,13 +43,13 @@ class IcuVersion * IcuVersion::compare('1', '10', '==') * // => true * - * @param string $version1 A version string. - * @param string $version2 A version string to compare. - * @param string $operator The comparison operator. + * @param string $version1 A version string + * @param string $version2 A version string to compare + * @param string $operator The comparison operator * @param int|null $precision The number of components to compare. Pass * NULL to compare the versions unchanged. * - * @return bool Whether the comparison succeeded. + * @return bool Whether the comparison succeeded * * @see normalize() */ @@ -80,7 +80,7 @@ class IcuVersion * IcuVersion::normalize('1.2.3.4', 2); * // => '12.3' * - * @param string $version An ICU version string. + * @param string $version An ICU version string * @param int|null $precision The number of components to include. Pass * NULL to return the version unchanged. * diff --git a/src/Symfony/Component/Intl/Util/SvnCommit.php b/src/Symfony/Component/Intl/Util/SvnCommit.php index 483d92bc93..c5ae1f1d79 100644 --- a/src/Symfony/Component/Intl/Util/SvnCommit.php +++ b/src/Symfony/Component/Intl/Util/SvnCommit.php @@ -37,7 +37,7 @@ class SvnCommit /** * Returns the revision of the commit. * - * @return string The revision of the commit. + * @return string The revision of the commit */ public function getRevision() { @@ -47,7 +47,7 @@ class SvnCommit /** * Returns the author of the commit. * - * @return string The author name. + * @return string The author name */ public function getAuthor() { @@ -57,7 +57,7 @@ class SvnCommit /** * Returns the date of the commit. * - * @return string The commit date. + * @return string The commit date */ public function getDate() { diff --git a/src/Symfony/Component/Intl/Util/SvnRepository.php b/src/Symfony/Component/Intl/Util/SvnRepository.php index 3b891b380c..6e5d87b13f 100644 --- a/src/Symfony/Component/Intl/Util/SvnRepository.php +++ b/src/Symfony/Component/Intl/Util/SvnRepository.php @@ -22,7 +22,7 @@ use Symfony\Component\Intl\Exception\RuntimeException; class SvnRepository { /** - * @var string The path to the repository. + * @var string The path to the repository */ private $path; @@ -39,10 +39,10 @@ class SvnRepository /** * Downloads the ICU data for the given version. * - * @param string $url The URL to download from. - * @param string $targetDir The directory in which to store the repository. + * @param string $url The URL to download from + * @param string $targetDir The directory in which to store the repository * - * @return SvnRepository The directory where the data is stored. + * @return SvnRepository The directory where the data is stored * * @throws RuntimeException If an error occurs during the download. */ @@ -73,7 +73,7 @@ class SvnRepository /** * Reads the SVN repository at the given path. * - * @param string $path The path to the repository. + * @param string $path The path to the repository */ public function __construct($path) { @@ -83,7 +83,7 @@ class SvnRepository /** * Returns the path to the repository. * - * @return string The path to the repository. + * @return string The path to the repository */ public function getPath() { @@ -93,7 +93,7 @@ class SvnRepository /** * Returns the URL of the repository. * - * @return string The URL of the repository. + * @return string The URL of the repository */ public function getUrl() { @@ -103,7 +103,7 @@ class SvnRepository /** * Returns the last commit of the repository. * - * @return SvnCommit The last commit. + * @return SvnCommit The last commit */ public function getLastCommit() { @@ -117,7 +117,7 @@ class SvnRepository /** * Returns information about the SVN repository. * - * @return \SimpleXMLElement The XML result from the "svn info" command. + * @return \SimpleXMLElement The XML result from the "svn info" command * * @throws RuntimeException If the "svn info" command failed. */ diff --git a/src/Symfony/Component/Intl/Util/Version.php b/src/Symfony/Component/Intl/Util/Version.php index 2facc19d53..11e97fe8bd 100644 --- a/src/Symfony/Component/Intl/Util/Version.php +++ b/src/Symfony/Component/Intl/Util/Version.php @@ -33,13 +33,13 @@ class Version * Version::compare('1.2.3', '1.2.4', '==', 2) * // => true * - * @param string $version1 A version string. - * @param string $version2 A version string to compare. - * @param string $operator The comparison operator. + * @param string $version1 A version string + * @param string $version2 A version string to compare + * @param string $operator The comparison operator * @param int|null $precision The number of components to compare. Pass * NULL to compare the versions unchanged. * - * @return bool Whether the comparison succeeded. + * @return bool Whether the comparison succeeded * * @see normalize() */ @@ -63,7 +63,7 @@ class Version * Version::normalize('1.2.3', 2); * // => '1.2' * - * @param string $version A version string. + * @param string $version A version string * @param int|null $precision The number of components to include. Pass * NULL to return the version unchanged. * diff --git a/src/Symfony/Component/Locale/Locale.php b/src/Symfony/Component/Locale/Locale.php index 767f412f03..ebf33f6bdb 100644 --- a/src/Symfony/Component/Locale/Locale.php +++ b/src/Symfony/Component/Locale/Locale.php @@ -180,7 +180,7 @@ class Locale extends \Locale /** * Returns the fallback locale for a given locale, if any. * - * @param string $locale The locale to find the fallback for. + * @param string $locale The locale to find the fallback for * * @return string|null The fallback locale, or null if no parent exists */ diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php b/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php index aebc8df22e..cefba9cabe 100644 --- a/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php +++ b/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php @@ -43,7 +43,7 @@ interface OptionsResolverInterface * @param array $defaultValues A list of option names as keys and default * values or closures as values. * - * @return OptionsResolverInterface The resolver instance. + * @return OptionsResolverInterface The resolver instance */ public function setDefaults(array $defaultValues); @@ -58,7 +58,7 @@ interface OptionsResolverInterface * @param array $defaultValues A list of option names as keys and default * values or closures as values. * - * @return OptionsResolverInterface The resolver instance. + * @return OptionsResolverInterface The resolver instance */ public function replaceDefaults(array $defaultValues); @@ -71,9 +71,9 @@ interface OptionsResolverInterface * if you want to determine whether an option has been set or not because otherwise * {@link resolve()} would trigger an exception for unknown options. * - * @param array $optionNames A list of option names. + * @param array $optionNames A list of option names * - * @return OptionsResolverInterface The resolver instance. + * @return OptionsResolverInterface The resolver instance */ public function setOptional(array $optionNames); @@ -83,9 +83,9 @@ interface OptionsResolverInterface * If these options are not passed to {@link resolve()} and no default has been set for * them, an exception will be thrown. * - * @param array $optionNames A list of option names. + * @param array $optionNames A list of option names * - * @return OptionsResolverInterface The resolver instance. + * @return OptionsResolverInterface The resolver instance */ public function setRequired($optionNames); @@ -96,7 +96,7 @@ interface OptionsResolverInterface * with values acceptable for that option as * values. * - * @return OptionsResolverInterface The resolver instance. + * @return OptionsResolverInterface The resolver instance * * @throws InvalidOptionsException If an option has not been defined * (see {@link isKnown()}) for which @@ -113,7 +113,7 @@ interface OptionsResolverInterface * with values acceptable for that option as * values. * - * @return OptionsResolverInterface The resolver instance. + * @return OptionsResolverInterface The resolver instance * * @throws InvalidOptionsException If an option has not been defined * (see {@link isKnown()}) for which @@ -127,7 +127,7 @@ interface OptionsResolverInterface * @param array $allowedTypes A list of option names as keys and type * names passed as string or array as values. * - * @return OptionsResolverInterface The resolver instance. + * @return OptionsResolverInterface The resolver instance * * @throws InvalidOptionsException If an option has not been defined for * which an allowed type is set. @@ -142,7 +142,7 @@ interface OptionsResolverInterface * @param array $allowedTypes A list of option names as keys and type * names passed as string or array as values. * - * @return OptionsResolverInterface The resolver instance. + * @return OptionsResolverInterface The resolver instance * * @throws InvalidOptionsException If an option has not been defined for * which an allowed type is set. @@ -163,9 +163,9 @@ interface OptionsResolverInterface * * The closure should return the normalized value. * - * @param array $normalizers An array of closures. + * @param array $normalizers An array of closures * - * @return OptionsResolverInterface The resolver instance. + * @return OptionsResolverInterface The resolver instance */ public function setNormalizers(array $normalizers); @@ -175,9 +175,9 @@ interface OptionsResolverInterface * An option is known if it has been passed to either {@link setDefaults()}, * {@link setRequired()} or {@link setOptional()} before. * - * @param string $option The name of the option. + * @param string $option The name of the option * - * @return bool Whether the option is known. + * @return bool Whether the option is known */ public function isKnown($option); @@ -188,18 +188,18 @@ interface OptionsResolverInterface * but not to {@link setDefaults()}. That is, the option has been declared * as required and no default value has been set. * - * @param string $option The name of the option. + * @param string $option The name of the option * - * @return bool Whether the option is required. + * @return bool Whether the option is required */ public function isRequired($option); /** * Returns the combination of the default and the passed options. * - * @param array $options The custom option values. + * @param array $options The custom option values * - * @return array A list of options and their values. + * @return array A list of options and their values * * @throws InvalidOptionsException If any of the passed options has not * been defined or does not contain an diff --git a/src/Symfony/Component/Process/Pipes/PipesInterface.php b/src/Symfony/Component/Process/Pipes/PipesInterface.php index 09d3f61d6e..b91c393d87 100644 --- a/src/Symfony/Component/Process/Pipes/PipesInterface.php +++ b/src/Symfony/Component/Process/Pipes/PipesInterface.php @@ -39,10 +39,10 @@ interface PipesInterface /** * Reads data in file handles and pipes. * - * @param bool $blocking Whether to use blocking calls or not. - * @param bool $close Whether to close pipes if they've reached EOF. + * @param bool $blocking Whether to use blocking calls or not + * @param bool $close Whether to close pipes if they've reached EOF * - * @return string[] An array of read data indexed by their fd. + * @return string[] An array of read data indexed by their fd */ public function readAndWrite($blocking, $close = false); diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index 67ea654589..d6adf21fa9 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -593,7 +593,7 @@ class Process * This method relies on the Unix exit code status standardization * and might not be relevant for other operating systems. * - * @return null|string A string representation for the exit status code, null if the Process is not terminated. + * @return null|string A string representation for the exit status code, null if the Process is not terminated * * @see http://tldp.org/LDP/abs/html/exitcodes.html * @see http://en.wikipedia.org/wiki/Unix_signal @@ -881,7 +881,7 @@ class Process * * @param int|float|null $timeout The timeout in seconds * - * @return self The current Process instance. + * @return self The current Process instance * * @throws LogicException if the output is disabled * @throws InvalidArgumentException if the timeout is negative @@ -1265,7 +1265,7 @@ class Process /** * Updates the status of the process, reads pipes. * - * @param bool $blocking Whether to use a blocking read call. + * @param bool $blocking Whether to use a blocking read call */ protected function updateStatus($blocking) { @@ -1351,8 +1351,8 @@ class Process /** * Reads pipes, executes callback. * - * @param bool $blocking Whether to use blocking calls or not. - * @param bool $close Whether to close file handles or not. + * @param bool $blocking Whether to use blocking calls or not + * @param bool $close Whether to close file handles or not */ private function readPipes($blocking, $close) { @@ -1478,7 +1478,7 @@ class Process /** * Ensures the process is running or terminated, throws a LogicException if the process has a not started. * - * @param string $functionName The function name that was called. + * @param string $functionName The function name that was called * * @throws LogicException If the process has not run. */ @@ -1492,7 +1492,7 @@ class Process /** * Ensures the process is terminated, throws a LogicException if the process has a status different than `terminated`. * - * @param string $functionName The function name that was called. + * @param string $functionName The function name that was called * * @throws LogicException If the process is not yet terminated. */ diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index 23fc68e33d..da0c5da93c 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -328,7 +328,7 @@ class PropertyAccessor implements PropertyAccessorInterface * @param int $lastIndex The index up to which should be read * @param bool $ignoreInvalidIndices Whether to ignore invalid indices or throw an exception * - * @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 NoSuchIndexException If a non-existing index is accessed @@ -444,7 +444,7 @@ class PropertyAccessor implements PropertyAccessorInterface * Reads the a property from an object. * * @param array $zval The array containing the object to read from - * @param string $property The property to read. + * @param string $property The property to read * * @return array The array containing the value of the property * diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php index 39bf2da2e4..57751bf13e 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php @@ -44,10 +44,10 @@ class PropertyPathBuilder /** * Appends a (sub-) path to the current path. * - * @param PropertyPathInterface|string $path The path to append. + * @param PropertyPathInterface|string $path The path to append * @param int $offset The offset where the appended * piece starts in $path. - * @param int $length The length of the appended piece. + * @param int $length The length of the appended piece * If 0, the full path is appended. */ public function append($path, $offset = 0, $length = 0) @@ -110,12 +110,12 @@ class PropertyPathBuilder /** * Replaces a sub-path by a different (sub-) path. * - * @param int $offset The offset at which to replace. - * @param int $length The length of the piece to replace. - * @param PropertyPathInterface|string $path The path to insert. + * @param int $offset The offset at which to replace + * @param int $length The length of the piece to replace + * @param PropertyPathInterface|string $path The path to insert * @param int $pathOffset The offset where the inserted piece * starts in $path. - * @param int $pathLength The length of the inserted piece. + * @param int $pathLength The length of the inserted piece * If 0, the full path is inserted. * * @throws OutOfBoundsException If the offset is invalid @@ -149,7 +149,7 @@ class PropertyPathBuilder * Replaces a property element by an index element. * * @param int $offset The offset at which to replace - * @param string $name The new name of the element. Optional. + * @param string $name The new name of the element. Optional * * @throws OutOfBoundsException If the offset is invalid */ @@ -170,7 +170,7 @@ class PropertyPathBuilder * Replaces an index element by a property element. * * @param int $offset The offset at which to replace - * @param string $name The new name of the element. Optional. + * @param string $name The new name of the element. Optional * * @throws OutOfBoundsException If the offset is invalid */ diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php index 7e7e056bd1..191aa68a57 100644 --- a/src/Symfony/Component/Routing/Annotation/Route.php +++ b/src/Symfony/Component/Routing/Annotation/Route.php @@ -34,7 +34,7 @@ class Route /** * Constructor. * - * @param array $data An array of key/value parameters. + * @param array $data An array of key/value parameters * * @throws \BadMethodCallException */ diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php index b5c24f9871..537a81e9a4 100644 --- a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php @@ -219,7 +219,7 @@ class XmlFileLoader extends FileLoader * @param \DOMElement $node Element to parse that contains the configs * @param string $path Full path of the XML file being processed * - * @return array An array with the defaults as first item, requirements as second and options as third. + * @return array An array with the defaults as first item, requirements as second and options as third * * @throws \InvalidArgumentException When the XML is invalid */ diff --git a/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php b/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php index 4dd89699a2..7c27bc8796 100644 --- a/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php +++ b/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php @@ -21,7 +21,7 @@ interface RedirectableUrlMatcherInterface /** * Redirects the user to another URL. * - * @param string $path The path info to redirect to. + * @param string $path The path info to redirect to * @param string $route The route name that matched * @param string|null $scheme The URL scheme (null to keep the current one) * diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php index 2cbbb2bdad..d43029e706 100644 --- a/src/Symfony/Component/Routing/Router.php +++ b/src/Symfony/Component/Routing/Router.php @@ -219,7 +219,7 @@ class Router implements RouterInterface, RequestMatcherInterface /** * Sets the ConfigCache factory to use. * - * @param ConfigCacheFactoryInterface $configCacheFactory The factory to use. + * @param ConfigCacheFactoryInterface $configCacheFactory The factory to use */ public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory) { diff --git a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php index 742c4e5fbf..f8a09a6197 100644 --- a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php @@ -130,7 +130,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface * @param SecurityIdentityInterface[] $sids An array of SecurityIdentityInterface implementations * @param bool $administrativeMode True turns off audit logging * - * @return bool true, or false; either granting, or denying access respectively. + * @return bool true, or false; either granting, or denying access respectively * * @throws NoAceFoundException */ diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php index 5f3241f20d..0d7dea08aa 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php @@ -26,7 +26,7 @@ class AnonymousToken extends AbstractToken * Constructor. * * @param string $key The key shared with the authentication provider - * @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string. + * @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string * @param RoleInterface[] $roles An array of roles */ public function __construct($key, $user, array $roles = array()) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php index 5a3fc95327..b4b5e70b18 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php @@ -26,7 +26,7 @@ class PreAuthenticatedToken extends AbstractToken /** * Constructor. * - * @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string. + * @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string * @param mixed $credentials The user credentials * @param string $providerKey The provider key * @param RoleInterface[]|string[] $roles An array of roles diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php index be90802a9b..4e1dd7b2fc 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php @@ -33,7 +33,7 @@ interface TokenInterface extends \Serializable /** * Returns the user roles. * - * @return RoleInterface[] An array of RoleInterface instances. + * @return RoleInterface[] An array of RoleInterface instances */ public function getRoles(); diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php index 9248136982..33b00f01f8 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php @@ -26,7 +26,7 @@ class UsernamePasswordToken extends AbstractToken /** * Constructor. * - * @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method. + * @param string|object $user The username (like a nickname, email address, etc.), or a UserInterface instance or an object implementing a __toString method * @param string $credentials This usually is the password of the user * @param string $providerKey The provider key * @param RoleInterface[]|string[] $roles An array of roles diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php index c1981deb96..e09d72e564 100644 --- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php +++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php @@ -97,7 +97,7 @@ class InMemoryUserProvider implements UserProviderInterface /** * Returns the user by given username. * - * @param string $username The username. + * @param string $username The username * * @return User * diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php index f8004d638b..830c00aeb0 100644 --- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php @@ -46,7 +46,7 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle * * @param HttpKernelInterface $httpKernel * @param HttpUtils $httpUtils - * @param array $options Options for processing a failed authentication attempt. + * @param array $options Options for processing a failed authentication attempt * @param LoggerInterface $logger Optional logger */ public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options = array(), LoggerInterface $logger = null) diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php index 5fa7071c64..b6a7df5062 100644 --- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php @@ -39,7 +39,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle * Constructor. * * @param HttpUtils $httpUtils - * @param array $options Options for processing a successful authentication attempt. + * @param array $options Options for processing a successful authentication attempt */ public function __construct(HttpUtils $httpUtils, array $options = array()) { diff --git a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php index 910f4ceb1d..dd89e0faac 100644 --- a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php +++ b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php @@ -25,7 +25,7 @@ interface DecoderInterface * * @param string $data Data to decode * @param string $format Format name - * @param array $context options that decoders have access to. + * @param array $context options that decoders have access to * * The format parameter specifies which format the data is in; valid values * depend on the specific implementation. Authors implementing this interface diff --git a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php index fe7e777daa..05e9b2789b 100644 --- a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php +++ b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php @@ -25,7 +25,7 @@ interface EncoderInterface * * @param mixed $data Data to encode * @param string $format Format name - * @param array $context options that normalizers/encoders have access to. + * @param array $context options that normalizers/encoders have access to * * @return scalar * diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index 4c17fb6b8d..671ab97852 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -508,7 +508,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * Create a DOM document, taking serializer options into account. * - * @param array $context options that the encoder has access to. + * @param array $context options that the encoder has access to * * @return \DOMDocument */ diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php index 5889f0da11..c00981b64f 100644 --- a/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php +++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php @@ -27,7 +27,7 @@ interface ClassMetadataInterface /** * Returns the name of the backing PHP class. * - * @return string The name of the backing class. + * @return string The name of the backing class */ public function getName(); diff --git a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php index 80720fa6ba..d3daf12e46 100644 --- a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php +++ b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php @@ -29,8 +29,8 @@ class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface private $lowerCamelCase; /** - * @param null|array $attributes The list of attributes to rename or null for all attributes. - * @param bool $lowerCamelCase Use lowerCamelCase style. + * @param null|array $attributes The list of attributes to rename or null for all attributes + * @param bool $lowerCamelCase Use lowerCamelCase style */ public function __construct(array $attributes = null, $lowerCamelCase = true) { diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php index e3f09a9436..f64aa4d3e3 100644 --- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php @@ -38,8 +38,8 @@ class CustomNormalizer extends SerializerAwareNormalizer implements NormalizerIn /** * Checks if the given class implements the NormalizableInterface. * - * @param mixed $data Data to normalize. - * @param string $format The format being (de-)serialized from or into. + * @param mixed $data Data to normalize + * @param string $format The format being (de-)serialized from or into * * @return bool */ @@ -51,9 +51,9 @@ class CustomNormalizer extends SerializerAwareNormalizer implements NormalizerIn /** * Checks if the given class implements the NormalizableInterface. * - * @param mixed $data Data to denormalize from. - * @param string $type The class to which the data should be denormalized. - * @param string $format The format being deserialized from. + * @param mixed $data Data to denormalize from + * @param string $type The class to which the data should be denormalized + * @param string $format The format being deserialized from * * @return bool */ diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php index 8ad1386a6c..4fe7a313a1 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php @@ -29,7 +29,7 @@ interface DenormalizableInterface * * @param DenormalizerInterface $denormalizer The denormalizer is given so that you * can use it to denormalize objects contained within this object - * @param array|scalar $data The data from which to re-create the object. + * @param array|scalar $data The data from which to re-create the object * @param string|null $format The format is optionally given to be able to denormalize differently * based on different input formats * @param array $context options for denormalizing diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php index 8b6c233395..23df4829a8 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php @@ -33,9 +33,9 @@ interface DenormalizerInterface /** * Checks whether the given class is supported for denormalization by this normalizer. * - * @param mixed $data Data to denormalize from. - * @param string $type The class to which the data should be denormalized. - * @param string $format The format being deserialized from. + * @param mixed $data Data to denormalize from + * @param string $type The class to which the data should be denormalized + * @param string $format The format being deserialized from * * @return bool */ diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php index 183417c254..a5e5dbf848 100644 --- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php @@ -164,7 +164,7 @@ class GetSetMethodNormalizer extends AbstractNormalizer * * @param \ReflectionMethod $method the method to check * - * @return bool whether the method is a getter or boolean getter. + * @return bool whether the method is a getter or boolean getter */ private function isGetMethod(\ReflectionMethod $method) { diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php index f4bd355232..f7007840da 100644 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php @@ -32,8 +32,8 @@ interface NormalizerInterface /** * Checks whether the given class is supported for normalization by this normalizer. * - * @param mixed $data Data to normalize. - * @param string $format The format being (de-)serialized from or into. + * @param mixed $data Data to normalize + * @param string $format The format being (de-)serialized from or into * * @return bool */ diff --git a/src/Symfony/Component/Stopwatch/Section.php b/src/Symfony/Component/Stopwatch/Section.php index 80e17c8b0a..fb416efedc 100644 --- a/src/Symfony/Component/Stopwatch/Section.php +++ b/src/Symfony/Component/Stopwatch/Section.php @@ -67,7 +67,7 @@ class Section /** * Creates or re-opens a child section. * - * @param string|null $id null to create a new section, the identifier to re-open an existing one. + * @param string|null $id null to create a new section, the identifier to re-open an existing one * * @return Section A child section */ diff --git a/src/Symfony/Component/Translation/Loader/MoFileLoader.php b/src/Symfony/Component/Translation/Loader/MoFileLoader.php index 746fd52904..f6a8fe923a 100644 --- a/src/Symfony/Component/Translation/Loader/MoFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/MoFileLoader.php @@ -39,7 +39,7 @@ class MoFileLoader extends ArrayLoader /** * The size of the header of a MO file in bytes. * - * @var int Number of bytes. + * @var int Number of bytes */ const MO_HEADER_SIZE = 28; diff --git a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php index 5de544e0c1..8ce2c58def 100644 --- a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php +++ b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php @@ -93,7 +93,7 @@ class PluralizationRulesTest extends \PHPUnit_Framework_TestCase * We validate only on the plural coverage. Thus the real rules is not tested. * * @param string $nplural plural expected - * @param array $matrix containing langcodes and their plural index values. + * @param array $matrix containing langcodes and their plural index values * @param bool $expectSuccess */ protected function validateMatrix($nplural, $matrix, $expectSuccess = true) diff --git a/src/Symfony/Component/Validator/ClassBasedInterface.php b/src/Symfony/Component/Validator/ClassBasedInterface.php index 7c2eb8f0f7..c57da274be 100644 --- a/src/Symfony/Component/Validator/ClassBasedInterface.php +++ b/src/Symfony/Component/Validator/ClassBasedInterface.php @@ -24,7 +24,7 @@ interface ClassBasedInterface /** * Returns the name of the backing PHP class. * - * @return string The name of the backing class. + * @return string The name of the backing class */ public function getClassName(); } diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php index 31b44d23cd..516004a7c1 100644 --- a/src/Symfony/Component/Validator/ConstraintViolation.php +++ b/src/Symfony/Component/Validator/ConstraintViolation.php @@ -105,7 +105,7 @@ class ConstraintViolation implements ConstraintViolationInterface /** * Converts the violation into a string for debugging purposes. * - * @return string The violation as string. + * @return string The violation as string */ public function __toString() { diff --git a/src/Symfony/Component/Validator/ConstraintViolationInterface.php b/src/Symfony/Component/Validator/ConstraintViolationInterface.php index ecd07e32b0..363ef27ef0 100644 --- a/src/Symfony/Component/Validator/ConstraintViolationInterface.php +++ b/src/Symfony/Component/Validator/ConstraintViolationInterface.php @@ -38,7 +38,7 @@ interface ConstraintViolationInterface /** * Returns the violation message. * - * @return string The violation message. + * @return string The violation message */ public function getMessage(); @@ -49,7 +49,7 @@ interface ConstraintViolationInterface * returned by {@link getMessageParameters}. Typically you'll pass the * message template and parameters to a translation engine. * - * @return string The raw violation message. + * @return string The raw violation message */ public function getMessageTemplate(); @@ -78,7 +78,7 @@ interface ConstraintViolationInterface * This method returns the value of the parameter for choosing the right * pluralization form (in this case "choices"). * - * @return int|null The number to use to pluralize of the message. + * @return int|null The number to use to pluralize of the message * * @deprecated since version 2.7, to be replaced by getPlural() in 3.0. */ @@ -119,7 +119,7 @@ interface ConstraintViolationInterface /** * Returns a machine-digestible error code for the violation. * - * @return mixed The error code. + * @return mixed The error code */ public function getCode(); } diff --git a/src/Symfony/Component/Validator/ConstraintViolationList.php b/src/Symfony/Component/Validator/ConstraintViolationList.php index d43d5431dd..3490237bc2 100644 --- a/src/Symfony/Component/Validator/ConstraintViolationList.php +++ b/src/Symfony/Component/Validator/ConstraintViolationList.php @@ -38,7 +38,7 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation /** * Converts the violation into a string for debugging purposes. * - * @return string The violation as string. + * @return string The violation as string */ public function __toString() { diff --git a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php index 8d15bd72b8..d96755c9a2 100644 --- a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php +++ b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php @@ -21,23 +21,23 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar /** * Adds a constraint violation to this list. * - * @param ConstraintViolationInterface $violation The violation to add. + * @param ConstraintViolationInterface $violation The violation to add */ public function add(ConstraintViolationInterface $violation); /** * Merges an existing violation list into this list. * - * @param ConstraintViolationListInterface $otherList The list to merge. + * @param ConstraintViolationListInterface $otherList The list to merge */ public function addAll(ConstraintViolationListInterface $otherList); /** * Returns the violation at a given offset. * - * @param int $offset The offset of the violation. + * @param int $offset The offset of the violation * - * @return ConstraintViolationInterface The violation. + * @return ConstraintViolationInterface The violation * * @throws \OutOfBoundsException If the offset does not exist. */ @@ -46,24 +46,24 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar /** * Returns whether the given offset exists. * - * @param int $offset The violation offset. + * @param int $offset The violation offset * - * @return bool Whether the offset exists. + * @return bool Whether the offset exists */ public function has($offset); /** * Sets a violation at a given offset. * - * @param int $offset The violation offset. - * @param ConstraintViolationInterface $violation The violation. + * @param int $offset The violation offset + * @param ConstraintViolationInterface $violation The violation */ public function set($offset, ConstraintViolationInterface $violation); /** * Removes a violation at a given offset. * - * @param int $offset The offset to remove. + * @param int $offset The offset to remove */ public function remove($offset); } diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php index 2ef80b66f0..9c28bde9ea 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php @@ -111,7 +111,7 @@ interface ExecutionContextInterface extends LegacyExecutionContextInterface * * In other cases, null is returned. * - * @return object|null The currently validated object or null. + * @return object|null The currently validated object or null */ public function getObject(); diff --git a/src/Symfony/Component/Validator/ExecutionContext.php b/src/Symfony/Component/Validator/ExecutionContext.php index 5875e94ef4..52cccb2f68 100644 --- a/src/Symfony/Component/Validator/ExecutionContext.php +++ b/src/Symfony/Component/Validator/ExecutionContext.php @@ -66,13 +66,13 @@ class ExecutionContext implements ExecutionContextInterface /** * Creates a new execution context. * - * @param GlobalExecutionContextInterface $globalContext The global context storing node-independent state. - * @param TranslatorInterface $translator The translator for translating violation messages. - * @param null|string $translationDomain The domain of the validation messages. - * @param MetadataInterface $metadata The metadata of the validated node. - * @param mixed $value The value of the validated node. - * @param string $group The current validation group. - * @param string $propertyPath The property path to the current node. + * @param GlobalExecutionContextInterface $globalContext The global context storing node-independent state + * @param TranslatorInterface $translator The translator for translating violation messages + * @param null|string $translationDomain The domain of the validation messages + * @param MetadataInterface $metadata The metadata of the validated node + * @param mixed $value The value of the validated node + * @param string $group The current validation group + * @param string $propertyPath The property path to the current node */ public function __construct(GlobalExecutionContextInterface $globalContext, TranslatorInterface $translator, $translationDomain = null, MetadataInterface $metadata = null, $value = null, $group = null, $propertyPath = '') { @@ -266,8 +266,8 @@ class ExecutionContext implements ExecutionContextInterface /** * Executes the validators of the given constraints for the given value. * - * @param mixed $value The value to validate. - * @param Constraint[] $constraints The constraints to match against. + * @param mixed $value The value to validate + * @param Constraint[] $constraints The constraints to match against */ private function executeConstraintValidators($value, array $constraints) { @@ -286,7 +286,7 @@ class ExecutionContext implements ExecutionContextInterface * is passed, an array containing the current * group of the context is returned. * - * @return array An array of validation groups. + * @return array An array of validation groups */ private function resolveGroups($groups) { diff --git a/src/Symfony/Component/Validator/ExecutionContextInterface.php b/src/Symfony/Component/Validator/ExecutionContextInterface.php index b07e928e2c..075fecb0c5 100644 --- a/src/Symfony/Component/Validator/ExecutionContextInterface.php +++ b/src/Symfony/Component/Validator/ExecutionContextInterface.php @@ -145,8 +145,8 @@ interface ExecutionContextInterface * Any violations generated during the validation will be added to the * violation list that you can access with {@link getViolations}. * - * @param mixed $value The value to validate. - * @param string $subPath The path to append to the context's property path. + * @param mixed $value The value to validate + * @param string $subPath The path to append to the context's property path * @param null|string|string[] $groups The groups to validate in. If you don't pass any * groups here, the current group of the context * will be used. @@ -181,9 +181,9 @@ interface ExecutionContextInterface * $context->validate($address->street, new NotNull(), 'street'); * * - * @param mixed $value The value to validate. - * @param Constraint|Constraint[] $constraints The constraint(s) to validate against. - * @param string $subPath The path to append to the context's property path. + * @param mixed $value The value to validate + * @param Constraint|Constraint[] $constraints The constraint(s) to validate against + * @param string $subPath The path to append to the context's property path * @param null|string|string[] $groups The groups to validate in. If you don't pass any * groups here, the current group of the context * will be used. @@ -197,7 +197,7 @@ interface ExecutionContextInterface /** * Returns the violations generated by the validator so far. * - * @return ConstraintViolationListInterface The constraint violation list. + * @return ConstraintViolationListInterface The constraint violation list */ public function getViolations(); @@ -210,7 +210,7 @@ interface ExecutionContextInterface * * The current value is returned by {@link getValue}. * - * @return mixed The root value of the validation. + * @return mixed The root value of the validation */ public function getRoot(); @@ -220,7 +220,7 @@ interface ExecutionContextInterface * If you want to retrieve the object that was originally passed to the * validator, use {@link getRoot}. * - * @return mixed The currently validated value. + * @return mixed The currently validated value */ public function getValue(); @@ -245,7 +245,7 @@ interface ExecutionContextInterface /** * Returns the used metadata factory. * - * @return MetadataFactoryInterface The metadata factory. + * @return MetadataFactoryInterface The metadata factory * * @deprecated since version 2.5, to be removed in 3.0. * Use {@link Context\ExecutionContextInterface::getValidator()} @@ -258,7 +258,7 @@ interface ExecutionContextInterface /** * Returns the validation group that is currently being validated. * - * @return string The current validation group. + * @return string The current validation group */ public function getGroup(); @@ -269,7 +269,7 @@ interface ExecutionContextInterface * {@link ClassBasedInterface} or if no metadata is available for the * current node, this method returns null. * - * @return string|null The class name or null, if no class name could be found. + * @return string|null The class name or null, if no class name could be found */ public function getClassName(); @@ -280,7 +280,7 @@ interface ExecutionContextInterface * {@link PropertyMetadataInterface} or if no metadata is available for the * current node, this method returns null. * - * @return string|null The property name or null, if no property name could be found. + * @return string|null The property name or null, if no property name could be found */ public function getPropertyName(); diff --git a/src/Symfony/Component/Validator/GlobalExecutionContextInterface.php b/src/Symfony/Component/Validator/GlobalExecutionContextInterface.php index 5c646f294b..d9bd315afd 100644 --- a/src/Symfony/Component/Validator/GlobalExecutionContextInterface.php +++ b/src/Symfony/Component/Validator/GlobalExecutionContextInterface.php @@ -35,14 +35,14 @@ interface GlobalExecutionContextInterface /** * Returns the violations generated by the validator so far. * - * @return ConstraintViolationListInterface A list of constraint violations. + * @return ConstraintViolationListInterface A list of constraint violations */ public function getViolations(); /** * Returns the value at which validation was started in the object graph. * - * @return mixed The root value. + * @return mixed The root value * * @see ExecutionContextInterface::getRoot() */ @@ -51,21 +51,21 @@ interface GlobalExecutionContextInterface /** * Returns the visitor instance used to validate the object graph nodes. * - * @return ValidationVisitorInterface The validation visitor. + * @return ValidationVisitorInterface The validation visitor */ public function getVisitor(); /** * Returns the factory for constraint validators. * - * @return ConstraintValidatorFactoryInterface The constraint validator factory. + * @return ConstraintValidatorFactoryInterface The constraint validator factory */ public function getValidatorFactory(); /** * Returns the factory for validation metadata objects. * - * @return MetadataFactoryInterface The metadata factory. + * @return MetadataFactoryInterface The metadata factory */ public function getMetadataFactory(); } diff --git a/src/Symfony/Component/Validator/PropertyMetadataContainerInterface.php b/src/Symfony/Component/Validator/PropertyMetadataContainerInterface.php index 5441be1c3d..b5c9cf4da9 100644 --- a/src/Symfony/Component/Validator/PropertyMetadataContainerInterface.php +++ b/src/Symfony/Component/Validator/PropertyMetadataContainerInterface.php @@ -24,7 +24,7 @@ interface PropertyMetadataContainerInterface /** * Check if there's any metadata attached to the given named property. * - * @param string $property The property name. + * @param string $property The property name * * @return bool */ @@ -36,7 +36,7 @@ interface PropertyMetadataContainerInterface * If your implementation does not support properties, simply throw an * exception in this method (for example a BadMethodCallException). * - * @param string $property The property name. + * @param string $property The property name * * @return PropertyMetadataInterface[] A list of metadata instances. Empty if * no metadata exists for the property. diff --git a/src/Symfony/Component/Validator/PropertyMetadataInterface.php b/src/Symfony/Component/Validator/PropertyMetadataInterface.php index 46e7c692c8..64ae881e32 100644 --- a/src/Symfony/Component/Validator/PropertyMetadataInterface.php +++ b/src/Symfony/Component/Validator/PropertyMetadataInterface.php @@ -31,16 +31,16 @@ interface PropertyMetadataInterface extends MetadataInterface /** * Returns the name of the property. * - * @return string The property name. + * @return string The property name */ public function getPropertyName(); /** * Extracts the value of the property from the given container. * - * @param mixed $containingValue The container to extract the property value from. + * @param mixed $containingValue The container to extract the property value from * - * @return mixed The value of the property. + * @return mixed The value of the property */ public function getPropertyValue($containingValue); } diff --git a/src/Symfony/Component/Validator/Validation.php b/src/Symfony/Component/Validator/Validation.php index 1693f7311a..94ed62c525 100644 --- a/src/Symfony/Component/Validator/Validation.php +++ b/src/Symfony/Component/Validator/Validation.php @@ -42,7 +42,7 @@ final class Validation * If you want to configure the validator, use * {@link createValidatorBuilder()} instead. * - * @return ValidatorInterface The new validator. + * @return ValidatorInterface The new validator */ public static function createValidator() { @@ -52,7 +52,7 @@ final class Validation /** * Creates a configurable builder for validator objects. * - * @return ValidatorBuilderInterface The new builder. + * @return ValidatorBuilderInterface The new builder */ public static function createValidatorBuilder() { diff --git a/src/Symfony/Component/Validator/ValidationVisitor.php b/src/Symfony/Component/Validator/ValidationVisitor.php index 838646260f..82af6a9e72 100644 --- a/src/Symfony/Component/Validator/ValidationVisitor.php +++ b/src/Symfony/Component/Validator/ValidationVisitor.php @@ -70,12 +70,12 @@ class ValidationVisitor implements ValidationVisitorInterface, GlobalExecutionCo /** * Creates a new validation visitor. * - * @param mixed $root The value passed to the validator. - * @param MetadataFactoryInterface $metadataFactory The factory for obtaining metadata instances. - * @param ConstraintValidatorFactoryInterface $validatorFactory The factory for creating constraint validators. - * @param TranslatorInterface $translator The translator for translating violation messages. - * @param string|null $translationDomain The domain of the translation messages. - * @param ObjectInitializerInterface[] $objectInitializers The initializers for preparing objects before validation. + * @param mixed $root The value passed to the validator + * @param MetadataFactoryInterface $metadataFactory The factory for obtaining metadata instances + * @param ConstraintValidatorFactoryInterface $validatorFactory The factory for creating constraint validators + * @param TranslatorInterface $translator The translator for translating violation messages + * @param string|null $translationDomain The domain of the translation messages + * @param ObjectInitializerInterface[] $objectInitializers The initializers for preparing objects before validation * * @throws UnexpectedTypeException If any of the object initializers is not an instance of ObjectInitializerInterface */ diff --git a/src/Symfony/Component/Validator/ValidationVisitorInterface.php b/src/Symfony/Component/Validator/ValidationVisitorInterface.php index 0ab7b73667..b6c6e9f1cb 100644 --- a/src/Symfony/Component/Validator/ValidationVisitorInterface.php +++ b/src/Symfony/Component/Validator/ValidationVisitorInterface.php @@ -56,11 +56,11 @@ interface ValidationVisitorInterface * does not find metadata for the given value, it will fail with an * exception. * - * @param mixed $value The value to validate. - * @param string $group The validation group to validate. - * @param string $propertyPath The current property path in the validation graph. - * @param bool $traverse Whether to traverse the value if it is traversable. - * @param bool $deep Whether to traverse nested traversable values recursively. + * @param mixed $value The value to validate + * @param string $group The validation group to validate + * @param string $propertyPath The current property path in the validation graph + * @param bool $traverse Whether to traverse the value if it is traversable + * @param bool $deep Whether to traverse nested traversable values recursively * * @throws Exception\NoSuchMetadataException If no metadata can be found for * the given value. @@ -73,10 +73,10 @@ interface ValidationVisitorInterface * This method implements the Visitor design pattern. See also * {@link ValidationVisitorInterface}. * - * @param MetadataInterface $metadata The metadata holding the constraints. - * @param mixed $value The value to validate. - * @param string $group The validation group to validate. - * @param string $propertyPath The current property path in the validation graph. + * @param MetadataInterface $metadata The metadata holding the constraints + * @param mixed $value The value to validate + * @param string $group The validation group to validate + * @param string $propertyPath The current property path in the validation graph */ public function visit(MetadataInterface $metadata, $value, $group, $propertyPath); } diff --git a/src/Symfony/Component/Validator/Validator/ValidatorInterface.php b/src/Symfony/Component/Validator/Validator/ValidatorInterface.php index 3aafa34ea0..1cc9c6dd55 100644 --- a/src/Symfony/Component/Validator/Validator/ValidatorInterface.php +++ b/src/Symfony/Component/Validator/Validator/ValidatorInterface.php @@ -38,7 +38,7 @@ interface ValidatorInterface extends MetadataFactoryInterface * validate. If none is given, * "Default" is assumed * - * @return ConstraintViolationListInterface A list of constraint violations. + * @return ConstraintViolationListInterface A list of constraint violations * If the list is empty, validation * succeeded */ @@ -53,7 +53,7 @@ interface ValidatorInterface extends MetadataFactoryInterface * @param array|null $groups The validation groups to validate. If * none is given, "Default" is assumed * - * @return ConstraintViolationListInterface A list of constraint violations. + * @return ConstraintViolationListInterface A list of constraint violations * If the list is empty, validation * succeeded */ @@ -70,7 +70,7 @@ interface ValidatorInterface extends MetadataFactoryInterface * @param array|null $groups The validation groups to validate. If * none is given, "Default" is assumed * - * @return ConstraintViolationListInterface A list of constraint violations. + * @return ConstraintViolationListInterface A list of constraint violations * If the list is empty, validation * succeeded */ diff --git a/src/Symfony/Component/Validator/ValidatorBuilderInterface.php b/src/Symfony/Component/Validator/ValidatorBuilderInterface.php index e15fb7aa14..690d286789 100644 --- a/src/Symfony/Component/Validator/ValidatorBuilderInterface.php +++ b/src/Symfony/Component/Validator/ValidatorBuilderInterface.php @@ -187,7 +187,7 @@ interface ValidatorBuilderInterface /** * Builds and returns a new validator object. * - * @return ValidatorInterface The built validator. + * @return ValidatorInterface The built validator */ public function getValidator(); } diff --git a/src/Symfony/Component/Validator/ValidatorInterface.php b/src/Symfony/Component/Validator/ValidatorInterface.php index cffc1388d7..58b8cd6e4c 100644 --- a/src/Symfony/Component/Validator/ValidatorInterface.php +++ b/src/Symfony/Component/Validator/ValidatorInterface.php @@ -32,9 +32,9 @@ interface ValidatorInterface * disabled in Symfony 3.0. * * @param mixed $value The value to validate - * @param array|null $groups The validation groups to validate. - * @param bool $traverse Whether to traverse the value if it is traversable. - * @param bool $deep Whether to traverse nested traversable values recursively. + * @param array|null $groups The validation groups to validate + * @param bool $traverse Whether to traverse the value if it is traversable + * @param bool $deep Whether to traverse nested traversable values recursively * * @return ConstraintViolationListInterface A list of constraint violations. If the * list is empty, validation succeeded. @@ -47,9 +47,9 @@ interface ValidatorInterface * The accepted values depend on the {@link MetadataFactoryInterface} * implementation. * - * @param mixed $containingValue The value containing the property. - * @param string $property The name of the property to validate. - * @param array|null $groups The validation groups to validate. + * @param mixed $containingValue The value containing the property + * @param string $property The name of the property to validate + * @param array|null $groups The validation groups to validate * * @return ConstraintViolationListInterface A list of constraint violations. If the * list is empty, validation succeeded. @@ -62,11 +62,11 @@ interface ValidatorInterface * The accepted values depend on the {@link MetadataFactoryInterface} * implementation. * - * @param mixed $containingValue The value containing the property. + * @param mixed $containingValue The value containing the property * @param string $property The name of the property to validate * @param string $value The value to validate against the * constraints of the property. - * @param array|null $groups The validation groups to validate. + * @param array|null $groups The validation groups to validate * * @return ConstraintViolationListInterface A list of constraint violations. If the * list is empty, validation succeeded. @@ -76,9 +76,9 @@ interface ValidatorInterface /** * Validates a value against a constraint or a list of constraints. * - * @param mixed $value The value to validate. - * @param Constraint|Constraint[] $constraints The constraint(s) to validate against. - * @param array|null $groups The validation groups to validate. + * @param mixed $value The value to validate + * @param Constraint|Constraint[] $constraints The constraint(s) to validate against + * @param array|null $groups The validation groups to validate * * @return ConstraintViolationListInterface A list of constraint violations. If the * list is empty, validation succeeded. @@ -92,7 +92,7 @@ interface ValidatorInterface /** * Returns the factory for metadata instances. * - * @return MetadataFactoryInterface The metadata factory. + * @return MetadataFactoryInterface The metadata factory * * @deprecated since version 2.5, to be removed in 3.0. * Use {@link Validator\ValidatorInterface::getMetadataFor()} or diff --git a/src/Symfony/Component/VarDumper/Caster/Caster.php b/src/Symfony/Component/VarDumper/Caster/Caster.php index 23e72e8770..4312e59352 100644 --- a/src/Symfony/Component/VarDumper/Caster/Caster.php +++ b/src/Symfony/Component/VarDumper/Caster/Caster.php @@ -36,10 +36,10 @@ class Caster /** * Casts objects to arrays and adds the dynamic property prefix. * - * @param object $obj The object to cast. - * @param \ReflectionClass $reflector The class reflector to use for inspecting the object definition. + * @param object $obj The object to cast + * @param \ReflectionClass $reflector The class reflector to use for inspecting the object definition * - * @return array The array-cast of the object, with prefixed dynamic properties. + * @return array The array-cast of the object, with prefixed dynamic properties */ public static function castObject($obj, \ReflectionClass $reflector) { @@ -70,9 +70,9 @@ class Caster * By default, a single match in the $filter bit field filters properties out, following an "or" logic. * When EXCLUDE_STRICT is set, an "and" logic is applied: all bits must match for a property to be removed. * - * @param array $a The array containing the properties to filter. - * @param int $filter A bit field of Caster::EXCLUDE_* constants specifying which properties to filter out. - * @param string[] $listedProperties List of properties to exclude when Caster::EXCLUDE_VERBOSE is set, and to preserve when Caster::EXCLUDE_NOT_IMPORTANT is set. + * @param array $a The array containing the properties to filter + * @param int $filter A bit field of Caster::EXCLUDE_* constants specifying which properties to filter out + * @param string[] $listedProperties List of properties to exclude when Caster::EXCLUDE_VERBOSE is set, and to preserve when Caster::EXCLUDE_NOT_IMPORTANT is set * * @return array The filtered array */ diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php index 613faec79f..4f60f21325 100644 --- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php +++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php @@ -107,7 +107,7 @@ abstract class AbstractCloner implements ClonerInterface private $filter = 0; /** - * @param callable[]|null $casters A map of casters. + * @param callable[]|null $casters A map of casters * * @see addCasters */ @@ -128,7 +128,7 @@ abstract class AbstractCloner implements ClonerInterface * Resource types are to be prefixed with a `:`, * see e.g. static::$defaultCasters. * - * @param callable[] $casters A map of casters. + * @param callable[] $casters A map of casters */ public function addCasters(array $casters) { @@ -160,10 +160,10 @@ abstract class AbstractCloner implements ClonerInterface /** * Clones a PHP variable. * - * @param mixed $var Any PHP variable. - * @param int $filter A bit field of Caster::EXCLUDE_* constants. + * @param mixed $var Any PHP variable + * @param int $filter A bit field of Caster::EXCLUDE_* constants * - * @return Data The cloned variable represented by a Data object. + * @return Data The cloned variable represented by a Data object */ public function cloneVar($var, $filter = 0) { @@ -189,19 +189,19 @@ abstract class AbstractCloner implements ClonerInterface /** * Effectively clones the PHP variable. * - * @param mixed $var Any PHP variable. + * @param mixed $var Any PHP variable * - * @return array The cloned variable represented in an array. + * @return array The cloned variable represented in an array */ abstract protected function doClone($var); /** * Casts an object to an array representation. * - * @param Stub $stub The Stub for the casted object. - * @param bool $isNested True if the object is nested in the dumped structure. + * @param Stub $stub The Stub for the casted object + * @param bool $isNested True if the object is nested in the dumped structure * - * @return array The object casted as array. + * @return array The object casted as array */ protected function castObject(Stub $stub, $isNested) { @@ -238,10 +238,10 @@ abstract class AbstractCloner implements ClonerInterface /** * Casts a resource to an array representation. * - * @param Stub $stub The Stub for the casted resource. - * @param bool $isNested True if the object is nested in the dumped structure. + * @param Stub $stub The Stub for the casted resource + * @param bool $isNested True if the object is nested in the dumped structure * - * @return array The resource casted as array. + * @return array The resource casted as array */ protected function castResource(Stub $stub, $isNested) { @@ -261,13 +261,13 @@ abstract class AbstractCloner implements ClonerInterface /** * Calls a custom caster. * - * @param callable $callback The caster. - * @param object|resource $obj The object/resource being casted. - * @param array $a The result of the previous cast for chained casters. - * @param Stub $stub The Stub for the casted object/resource. - * @param bool $isNested True if $obj is nested in the dumped structure. + * @param callable $callback The caster + * @param object|resource $obj The object/resource being casted + * @param array $a The result of the previous cast for chained casters + * @param Stub $stub The Stub for the casted object/resource + * @param bool $isNested True if $obj is nested in the dumped structure * - * @return array The casted object/resource. + * @return array The casted object/resource */ private function callCaster($callback, $obj, $a, $stub, $isNested) { diff --git a/src/Symfony/Component/VarDumper/Cloner/ClonerInterface.php b/src/Symfony/Component/VarDumper/Cloner/ClonerInterface.php index c1df5933db..7ed287a2dd 100644 --- a/src/Symfony/Component/VarDumper/Cloner/ClonerInterface.php +++ b/src/Symfony/Component/VarDumper/Cloner/ClonerInterface.php @@ -19,9 +19,9 @@ interface ClonerInterface /** * Clones a PHP variable. * - * @param mixed $var Any PHP variable. + * @param mixed $var Any PHP variable * - * @return Data The cloned variable represented by a Data object. + * @return Data The cloned variable represented by a Data object */ public function cloneVar($var); } diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php index 0aa13ef1ec..cf21f0e4bc 100644 --- a/src/Symfony/Component/VarDumper/Cloner/Data.php +++ b/src/Symfony/Component/VarDumper/Cloner/Data.php @@ -22,7 +22,7 @@ class Data private $useRefHandles = -1; /** - * @param array $data A array as returned by ClonerInterface::cloneVar(). + * @param array $data A array as returned by ClonerInterface::cloneVar() */ public function __construct(array $data) { @@ -30,7 +30,7 @@ class Data } /** - * @return array The raw data structure. + * @return array The raw data structure */ public function getRawData() { @@ -40,9 +40,9 @@ class Data /** * Returns a depth limited clone of $this. * - * @param int $maxDepth The max dumped depth level. + * @param int $maxDepth The max dumped depth level * - * @return self A clone of $this. + * @return self A clone of $this */ public function withMaxDepth($maxDepth) { @@ -55,9 +55,9 @@ class Data /** * Limits the number of elements per depth level. * - * @param int $maxItemsPerDepth The max number of items dumped per depth level. + * @param int $maxItemsPerDepth The max number of items dumped per depth level * - * @return self A clone of $this. + * @return self A clone of $this */ public function withMaxItemsPerDepth($maxItemsPerDepth) { @@ -70,9 +70,9 @@ class Data /** * Enables/disables objects' identifiers tracking. * - * @param bool $useRefHandles False to hide global ref. handles. + * @param bool $useRefHandles False to hide global ref. handles * - * @return self A clone of $this. + * @return self A clone of $this */ public function withRefHandles($useRefHandles) { @@ -85,11 +85,11 @@ class Data /** * Returns a depth limited clone of $this. * - * @param int $maxDepth The max dumped depth level. - * @param int $maxItemsPerDepth The max number of items dumped per depth level. - * @param bool $useRefHandles False to hide ref. handles. + * @param int $maxDepth The max dumped depth level + * @param int $maxItemsPerDepth The max number of items dumped per depth level + * @param bool $useRefHandles False to hide ref. handles * - * @return self A depth limited clone of $this. + * @return self A depth limited clone of $this * * @deprecated since Symfony 2.7, to be removed in 3.0. Use withMaxDepth, withMaxItemsPerDepth or withRefHandles instead. */ @@ -117,10 +117,10 @@ class Data /** * Depth-first dumping of items. * - * @param DumperInterface $dumper The dumper being used for dumping. - * @param Cursor $cursor A cursor used for tracking dumper state position. - * @param array &$refs A map of all references discovered while dumping. - * @param mixed $item A Stub object or the original value being dumped. + * @param DumperInterface $dumper The dumper being used for dumping + * @param Cursor $cursor A cursor used for tracking dumper state position + * @param array &$refs A map of all references discovered while dumping + * @param mixed $item A Stub object or the original value being dumped */ private function dumpItem($dumper, $cursor, &$refs, $item) { @@ -209,13 +209,13 @@ class Data * Dumps children of hash structures. * * @param DumperInterface $dumper - * @param Cursor $parentCursor The cursor of the parent hash. - * @param array &$refs A map of all references discovered while dumping. - * @param array $children The children to dump. - * @param int $hashCut The number of items removed from the original hash. - * @param string $hashType A Cursor::HASH_* const. + * @param Cursor $parentCursor The cursor of the parent hash + * @param array &$refs A map of all references discovered while dumping + * @param array $children The children to dump + * @param int $hashCut The number of items removed from the original hash + * @param string $hashType A Cursor::HASH_* const * - * @return int The final number of removed items. + * @return int The final number of removed items */ private function dumpChildren($dumper, $parentCursor, &$refs, $children, $hashCut, $hashType) { diff --git a/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php b/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php index eba23d4229..cb7981694f 100644 --- a/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php +++ b/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php @@ -21,40 +21,40 @@ interface DumperInterface /** * Dumps a scalar value. * - * @param Cursor $cursor The Cursor position in the dump. - * @param string $type The PHP type of the value being dumped. - * @param scalar $value The scalar value being dumped. + * @param Cursor $cursor The Cursor position in the dump + * @param string $type The PHP type of the value being dumped + * @param scalar $value The scalar value being dumped */ public function dumpScalar(Cursor $cursor, $type, $value); /** * Dumps a string. * - * @param Cursor $cursor The Cursor position in the dump. - * @param string $str The string being dumped. - * @param bool $bin Whether $str is UTF-8 or binary encoded. - * @param int $cut The number of characters $str has been cut by. + * @param Cursor $cursor The Cursor position in the dump + * @param string $str The string being dumped + * @param bool $bin Whether $str is UTF-8 or binary encoded + * @param int $cut The number of characters $str has been cut by */ public function dumpString(Cursor $cursor, $str, $bin, $cut); /** * Dumps while entering an hash. * - * @param Cursor $cursor The Cursor position in the dump. - * @param int $type A Cursor::HASH_* const for the type of hash. - * @param string $class The object class, resource type or array count. - * @param bool $hasChild When the dump of the hash has child item. + * @param Cursor $cursor The Cursor position in the dump + * @param int $type A Cursor::HASH_* const for the type of hash + * @param string $class The object class, resource type or array count + * @param bool $hasChild When the dump of the hash has child item */ public function enterHash(Cursor $cursor, $type, $class, $hasChild); /** * Dumps while leaving an hash. * - * @param Cursor $cursor The Cursor position in the dump. - * @param int $type A Cursor::HASH_* const for the type of hash. - * @param string $class The object class, resource type or array count. - * @param bool $hasChild When the dump of the hash has child item. - * @param int $cut The number of items the hash has been cut by. + * @param Cursor $cursor The Cursor position in the dump + * @param int $type A Cursor::HASH_* const for the type of hash + * @param string $class The object class, resource type or array count + * @param bool $hasChild When the dump of the hash has child item + * @param int $cut The number of items the hash has been cut by */ public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut); } diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php index 1035bd70c2..7c3d280ca6 100644 --- a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php @@ -33,8 +33,8 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface private $charsetConverter; /** - * @param callable|resource|string|null $output A line dumper callable, an opened stream or an output path, defaults to static::$defaultOutput. - * @param string $charset The default character encoding to use for non-UTF8 strings. + * @param callable|resource|string|null $output A line dumper callable, an opened stream or an output path, defaults to static::$defaultOutput + * @param string $charset The default character encoding to use for non-UTF8 strings */ public function __construct($output = null, $charset = null) { @@ -50,9 +50,9 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface /** * Sets the output destination of the dumps. * - * @param callable|resource|string $output A line dumper callable, an opened stream or an output path. + * @param callable|resource|string $output A line dumper callable, an opened stream or an output path * - * @return callable|resource|string The previous output destination. + * @return callable|resource|string The previous output destination */ public function setOutput($output) { @@ -75,9 +75,9 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface /** * Sets the default character encoding to use for non-UTF8 strings. * - * @param string $charset The default character encoding to use for non-UTF8 strings. + * @param string $charset The default character encoding to use for non-UTF8 strings * - * @return string The previous charset. + * @return string The previous charset */ public function setCharset($charset) { @@ -112,9 +112,9 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface /** * Sets the indentation pad string. * - * @param string $pad A string the will be prepended to dumped lines, repeated by nesting level. + * @param string $pad A string the will be prepended to dumped lines, repeated by nesting level * - * @return string The indent pad. + * @return string The indent pad */ public function setIndentPad($pad) { @@ -127,8 +127,8 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface /** * Dumps a Data object. * - * @param Data $data A Data object. - * @param callable|resource|string|null $output A line dumper callable, an opened stream or an output path. + * @param Data $data A Data object + * @param callable|resource|string|null $output A line dumper callable, an opened stream or an output path */ public function dump(Data $data, $output = null) { @@ -155,7 +155,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface /** * Dumps the current line. * - * @param int $depth The recursive depth in the dumped structure for the line being dumped. + * @param int $depth The recursive depth in the dumped structure for the line being dumped */ protected function dumpLine($depth) { @@ -166,8 +166,8 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface /** * Generic line dumper callback. * - * @param string $line The line to write. - * @param int $depth The recursive depth in the dumped structure. + * @param string $line The line to write + * @param int $depth The recursive depth in the dumped structure */ protected function echoLine($line, $depth, $indentPad) { @@ -179,9 +179,9 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface /** * Converts a non-UTF-8 string to UTF-8. * - * @param string $s The non-UTF-8 string to convert. + * @param string $s The non-UTF-8 string to convert * - * @return string The string converted to UTF-8. + * @return string The string converted to UTF-8 */ protected function utf8Encode($s) { diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php index 5e8a59cce9..d0867311a5 100644 --- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php @@ -99,7 +99,7 @@ class CliDumper extends AbstractDumper /** * Configures styles. * - * @param array $styles A map of style names to style definitions. + * @param array $styles A map of style names to style definitions */ public function setStyles(array $styles) { @@ -282,9 +282,9 @@ class CliDumper extends AbstractDumper /** * Dumps an ellipsis for cut children. * - * @param Cursor $cursor The Cursor position in the dump. - * @param bool $hasChild When the dump of the hash has child item. - * @param int $cut The number of items the hash has been cut by. + * @param Cursor $cursor The Cursor position in the dump + * @param bool $hasChild When the dump of the hash has child item + * @param int $cut The number of items the hash has been cut by */ protected function dumpEllipsis(Cursor $cursor, $hasChild, $cut) { @@ -302,7 +302,7 @@ class CliDumper extends AbstractDumper /** * Dumps a key in a hash structure. * - * @param Cursor $cursor The Cursor position in the dump. + * @param Cursor $cursor The Cursor position in the dump */ protected function dumpKey(Cursor $cursor) { @@ -370,11 +370,11 @@ class CliDumper extends AbstractDumper /** * Decorates a value with some style. * - * @param string $style The type of style being applied. - * @param string $value The value being styled. - * @param array $attr Optional context information. + * @param string $style The type of style being applied + * @param string $value The value being styled + * @param array $attr Optional context information * - * @return string The value with style decoration. + * @return string The value with style decoration */ protected function style($style, $value, $attr = array()) { @@ -414,7 +414,7 @@ class CliDumper extends AbstractDumper } /** - * @return bool Tells if the current output stream supports ANSI colors or not. + * @return bool Tells if the current output stream supports ANSI colors or not */ protected function supportsColors() { diff --git a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php index ee6060cebf..2c3d9db850 100644 --- a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php +++ b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php @@ -23,7 +23,7 @@ interface DataDumperInterface /** * Dumps a Data object. * - * @param Data $data A Data object. + * @param Data $data A Data object */ public function dump(Data $data); } diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php index 1de1801572..43601fe668 100644 --- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php @@ -78,7 +78,7 @@ class HtmlDumper extends CliDumper /** * Sets an HTML header that will be dumped once in the output stream. * - * @param string $header An HTML string. + * @param string $header An HTML string */ public function setDumpHeader($header) { @@ -88,8 +88,8 @@ class HtmlDumper extends CliDumper /** * Sets an HTML prefix and suffix that will encapse every single dump. * - * @param string $prefix The prepended HTML string. - * @param string $suffix The appended HTML string. + * @param string $prefix The prepended HTML string + * @param string $suffix The appended HTML string */ public function setDumpBoundaries($prefix, $suffix) { diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php index 9bd9389c07..05817f5d73 100644 --- a/src/Symfony/Component/Yaml/Dumper.php +++ b/src/Symfony/Component/Yaml/Dumper.php @@ -28,7 +28,7 @@ class Dumper /** * Sets the indentation. * - * @param int $num The amount of spaces to use for indentation of nested nodes. + * @param int $num The amount of spaces to use for indentation of nested nodes */ public function setIndentation($num) { diff --git a/src/Symfony/Component/Yaml/Escaper.php b/src/Symfony/Component/Yaml/Escaper.php index cb676d0059..de93d7986e 100644 --- a/src/Symfony/Component/Yaml/Escaper.php +++ b/src/Symfony/Component/Yaml/Escaper.php @@ -44,7 +44,7 @@ class Escaper * * @param string $value A PHP value * - * @return bool True if the value would require double quotes. + * @return bool True if the value would require double quotes */ public static function requiresDoubleQuoting($value) { @@ -68,7 +68,7 @@ class Escaper * * @param string $value A PHP value * - * @return bool True if the value would require single quotes. + * @return bool True if the value would require single quotes */ public static function requiresSingleQuoting($value) { diff --git a/src/Symfony/Component/Yaml/Unescaper.php b/src/Symfony/Component/Yaml/Unescaper.php index 1b5e5ec2dc..f2eef85a76 100644 --- a/src/Symfony/Component/Yaml/Unescaper.php +++ b/src/Symfony/Component/Yaml/Unescaper.php @@ -37,9 +37,9 @@ class Unescaper /** * Unescapes a single quoted string. * - * @param string $value A single quoted string. + * @param string $value A single quoted string * - * @return string The unescaped string. + * @return string The unescaped string */ public function unescapeSingleQuotedString($value) { @@ -49,9 +49,9 @@ class Unescaper /** * Unescapes a double quoted string. * - * @param string $value A double quoted string. + * @param string $value A double quoted string * - * @return string The unescaped string. + * @return string The unescaped string */ public function unescapeDoubleQuotedString($value) { diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php index 374365492f..d5fbbeeccf 100644 --- a/src/Symfony/Component/Yaml/Yaml.php +++ b/src/Symfony/Component/Yaml/Yaml.php @@ -80,7 +80,7 @@ class Yaml * * @param array $array PHP array * @param int $inline The level where you switch to inline YAML - * @param int $indent The amount of spaces to use for indentation of nested nodes. + * @param int $indent The amount of spaces to use for indentation of nested nodes * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise * @param bool $objectSupport true if object support is enabled, false otherwise * From a27ec000966e342436235209419e06b0749bcb44 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 29 Jun 2016 00:32:04 +0200 Subject: [PATCH 3/7] [Form] fix post max size translation type extension for >= 2.8 --- src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml | 2 +- .../Form/Extension/Validator/Type/UploadValidatorExtension.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml index 477b0f5644..7e86fb0728 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml @@ -193,7 +193,7 @@ - + %validator.translation_domain% diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php index 6f0fa60afd..d89a326f77 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php @@ -53,6 +53,6 @@ class UploadValidatorExtension extends AbstractTypeExtension */ public function getExtendedType() { - return 'form'; + return 'Symfony\Component\Form\Extension\Core\Type\FormType'; } } From 0a53e1de0c512442f2d509856b73c9357710c025 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Sun, 26 Jun 2016 13:21:04 +0200 Subject: [PATCH 4/7] [Console] Fix formatting of SymfonyStyle::comment() Remove decoration from frameworkbundle test (avoid testing the Console behaviour) Set background to default Test output Adapt test for FrameworkBundle Use Helper::strlenWithoutDecoration rather than Helper::strlen(strip_tags(..)) Improve logic for align all lines to the first in block() Tests more block() possible outputs Avoid calling Helper::strlenWithoutDecoration in loop for prefix, assign it instead --- .../Tests/Fixtures/Descriptor/alias_1.txt | 2 +- .../Tests/Fixtures/Descriptor/alias_2.txt | 2 +- .../Component/Console/Style/SymfonyStyle.php | 100 +++++++++--------- .../Style/SymfonyStyle/command/command_13.php | 15 +++ .../Style/SymfonyStyle/command/command_14.php | 17 +++ .../Style/SymfonyStyle/command/command_15.php | 14 +++ .../Style/SymfonyStyle/output/output_13.txt | 7 ++ .../Style/SymfonyStyle/output/output_14.txt | 6 ++ .../Style/SymfonyStyle/output/output_15.txt | 7 ++ 9 files changed, 119 insertions(+), 51 deletions(-) create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_13.php create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_14.php create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_15.php create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_13.txt create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_14.txt create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_15.txt diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.txt index 91ed6790f0..4be149bffb 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.txt @@ -1,3 +1,3 @@ - // This service is an alias for the service service_1 + // This service is an alias for the service service_1 diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.txt index 1ebffe38ac..0dbee6ac67 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.txt @@ -1,3 +1,3 @@ - // This service is an alias for the service service_2 + // This service is an alias for the service service_2 diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php index 53a7951e01..f5012637b4 100644 --- a/src/Symfony/Component/Console/Style/SymfonyStyle.php +++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php @@ -66,53 +66,10 @@ class SymfonyStyle extends OutputStyle */ public function block($messages, $type = null, $style = null, $prefix = ' ', $padding = false) { - $this->autoPrependBlock(); $messages = is_array($messages) ? array_values($messages) : array($messages); - $indentLength = 0; - $lines = array(); - if (null !== $type) { - $typePrefix = sprintf('[%s] ', $type); - $indentLength = strlen($typePrefix); - $lineIndentation = str_repeat(' ', $indentLength); - } - - // wrap and add newlines for each element - foreach ($messages as $key => $message) { - $message = OutputFormatter::escape($message); - $lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix) - $indentLength, PHP_EOL, true))); - - // prefix each line with a number of spaces equivalent to the type length - if (null !== $type) { - foreach ($lines as &$line) { - $line = $lineIndentation === substr($line, 0, $indentLength) ? $line : $lineIndentation.$line; - } - } - - if (count($messages) > 1 && $key < count($messages) - 1) { - $lines[] = ''; - } - } - - if (null !== $type) { - $lines[0] = substr_replace($lines[0], $typePrefix, 0, $indentLength); - } - - if ($padding && $this->isDecorated()) { - array_unshift($lines, ''); - $lines[] = ''; - } - - foreach ($lines as &$line) { - $line = sprintf('%s%s', $prefix, $line); - $line .= str_repeat(' ', $this->lineLength - Helper::strlenWithoutDecoration($this->getFormatter(), $line)); - - if ($style) { - $line = sprintf('<%s>%s', $style, $line); - } - } - - $this->writeln($lines); + $this->autoPrependBlock(); + $this->writeln($this->createBlock($messages, $type, $style, $prefix, $padding, true)); $this->newLine(); } @@ -177,11 +134,10 @@ class SymfonyStyle extends OutputStyle public function comment($message) { $messages = is_array($message) ? array_values($message) : array($message); - foreach ($messages as &$message) { - $message = $this->getFormatter()->format($message); - } - $this->block($messages, null, null, ' // '); + $this->autoPrependBlock(); + $this->writeln($this->createBlock($messages, null, null, ' // ')); + $this->newLine(); } /** @@ -437,4 +393,50 @@ class SymfonyStyle extends OutputStyle return substr($value, -4); }, array_merge(array($this->bufferedOutput->fetch()), (array) $messages)); } + + private function createBlock($messages, $type = null, $style = null, $prefix = ' ', $padding = false, $escape = false) + { + $indentLength = 0; + $prefixLength = Helper::strlenWithoutDecoration($this->getFormatter(), $prefix); + $lines = array(); + + if (null !== $type) { + $type = sprintf('[%s] ', $type); + $indentLength = strlen($type); + $lineIndentation = str_repeat(' ', $indentLength); + } + + // wrap and add newlines for each element + foreach ($messages as $key => $message) { + if ($escape) { + $message = OutputFormatter::escape($message); + } + + $lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - $prefixLength - $indentLength, PHP_EOL, true))); + + if (count($messages) > 1 && $key < count($messages) - 1) { + $lines[] = ''; + } + } + + foreach ($lines as $i => &$line) { + if (null !== $type) { + $line = 0 === $i ? $type.$line : $lineIndentation.$line; + } + + $line = $prefix.$line; + $line .= str_repeat(' ', $this->lineLength - Helper::strlenWithoutDecoration($this->getFormatter(), $line)); + + if ($style) { + $line = sprintf('<%s>%s', $style, $line); + } + } + + if ($padding && $this->isDecorated()) { + array_unshift($lines, ''); + $lines[] = ''; + } + + return $lines; + } } diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_13.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_13.php new file mode 100644 index 0000000000..fe084365f9 --- /dev/null +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_13.php @@ -0,0 +1,15 @@ +setDecorated(true); + $output = new SymfonyStyle($input, $output); + $output->comment( + 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum' + ); +}; diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_14.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_14.php new file mode 100644 index 0000000000..e719f71812 --- /dev/null +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_14.php @@ -0,0 +1,17 @@ +block( + 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum', + null, + null, + '$ ', + true + ); +}; diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_15.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_15.php new file mode 100644 index 0000000000..29e555b047 --- /dev/null +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_15.php @@ -0,0 +1,14 @@ +block( + 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum', + 'TEST' + ); +}; diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_13.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_13.txt new file mode 100644 index 0000000000..0f3704b748 --- /dev/null +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_13.txt @@ -0,0 +1,7 @@ + + // Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et  + // dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea  + // commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla  + // pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim + // id est laborum + diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_14.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_14.txt new file mode 100644 index 0000000000..1d0d37e7fe --- /dev/null +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_14.txt @@ -0,0 +1,6 @@ + +$ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna +$ aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +$ Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint +$ occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum + diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_15.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_15.txt new file mode 100644 index 0000000000..66404b8151 --- /dev/null +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_15.txt @@ -0,0 +1,7 @@ + + [TEST] Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est + laborum + From d0130d946b2ed7622e28486eacb7ab6896693c41 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 29 Jun 2016 06:57:44 +0200 Subject: [PATCH 5/7] fixed form tests --- .../Form/Tests/Extension/Core/Type/ChoiceTypeTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php index 271130f803..a031926f1b 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php @@ -685,7 +685,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase public function testSubmitSingleChoiceWithEmptyData() { - $form = $this->factory->create('choice', null, array( + $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array( 'multiple' => false, 'expanded' => false, 'choices' => array('test'), @@ -700,7 +700,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase public function testSubmitMultipleChoiceWithEmptyData() { - $form = $this->factory->create('choice', null, array( + $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array( 'multiple' => true, 'expanded' => false, 'choices' => array('test'), @@ -715,7 +715,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase public function testSubmitSingleChoiceExpandedWithEmptyData() { - $form = $this->factory->create('choice', null, array( + $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array( 'multiple' => false, 'expanded' => true, 'choices' => array('test'), @@ -730,7 +730,7 @@ class ChoiceTypeTest extends \Symfony\Component\Form\Test\TypeTestCase public function testSubmitMultipleChoiceExpandedWithEmptyData() { - $form = $this->factory->create('choice', null, array( + $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array( 'multiple' => true, 'expanded' => true, 'choices' => array('test'), From 62714464e380a9d2e02be2dfa1d26fc4e03689e5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 29 Jun 2016 07:31:50 +0200 Subject: [PATCH 6/7] fixed CS --- src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php | 2 +- src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php | 2 +- .../Component/Config/ResourceCheckerInterface.php | 6 +++--- .../Console/Exception/CommandNotFoundException.php | 10 +++++----- .../Component/CssSelector/CssSelectorConverter.php | 6 +++--- .../Tests/Fixtures/php/services24.php | 2 +- .../Tests/Fixtures/php/services9.php | 2 +- .../Tests/Fixtures/php/services9_compiled.php | 2 +- src/Symfony/Component/Filesystem/Filesystem.php | 10 +++++----- .../Component/PropertyInfo/Tests/Fixtures/Dummy.php | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php index 330798fa6e..efb2dadc86 100644 --- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php +++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php @@ -32,7 +32,7 @@ class DeprecationErrorHandler * - use a number to define the upper bound of allowed deprecations, * making the test suite fail whenever more notices are trigerred. * - * @param int|string|false $mode The reporting mode. Defaults to not allowing any deprecations. + * @param int|string|false $mode The reporting mode, defaults to not allowing any deprecations */ public static function register($mode = 0) { diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php index 24c17b865f..646a9c2e6f 100644 --- a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php +++ b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php @@ -27,7 +27,7 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener private $isSkipped = array(); /** - * @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive). + * @param array $mockedNamespaces List of namespaces, indexed by mocked features (time-sensitive) */ public function __construct(array $mockedNamespaces = array()) { diff --git a/src/Symfony/Component/Config/ResourceCheckerInterface.php b/src/Symfony/Component/Config/ResourceCheckerInterface.php index 27a04745a8..612d777864 100644 --- a/src/Symfony/Component/Config/ResourceCheckerInterface.php +++ b/src/Symfony/Component/Config/ResourceCheckerInterface.php @@ -39,10 +39,10 @@ interface ResourceCheckerInterface /** * Validates the resource. * - * @param ResourceInterface $resource The resource to be validated. - * @param int $timestamp The timestamp at which the cache associated with this resource was created. + * @param ResourceInterface $resource The resource to be validated + * @param int $timestamp The timestamp at which the cache associated with this resource was created * - * @return bool True if the resource has not changed since the given timestamp, false otherwise. + * @return bool True if the resource has not changed since the given timestamp, false otherwise */ public function isFresh(ResourceInterface $resource, $timestamp); } diff --git a/src/Symfony/Component/Console/Exception/CommandNotFoundException.php b/src/Symfony/Component/Console/Exception/CommandNotFoundException.php index ce6fefe34a..54f1a5b0ce 100644 --- a/src/Symfony/Component/Console/Exception/CommandNotFoundException.php +++ b/src/Symfony/Component/Console/Exception/CommandNotFoundException.php @@ -21,10 +21,10 @@ class CommandNotFoundException extends \InvalidArgumentException implements Exce private $alternatives; /** - * @param string $message Exception message to throw. - * @param array $alternatives List of similar defined names. - * @param int $code Exception code. - * @param Exception $previous previous exception used for the exception chaining. + * @param string $message Exception message to throw + * @param array $alternatives List of similar defined names + * @param int $code Exception code + * @param Exception $previous previous exception used for the exception chaining */ public function __construct($message, array $alternatives = array(), $code = 0, \Exception $previous = null) { @@ -34,7 +34,7 @@ class CommandNotFoundException extends \InvalidArgumentException implements Exce } /** - * @return array A list of similar defined names. + * @return array A list of similar defined names */ public function getAlternatives() { diff --git a/src/Symfony/Component/CssSelector/CssSelectorConverter.php b/src/Symfony/Component/CssSelector/CssSelectorConverter.php index e31ac1917a..8d66dbd0e1 100644 --- a/src/Symfony/Component/CssSelector/CssSelectorConverter.php +++ b/src/Symfony/Component/CssSelector/CssSelectorConverter.php @@ -29,7 +29,7 @@ class CssSelectorConverter private $translator; /** - * @param bool $html Whether HTML support should be enabled. Disable it for XML documents. + * @param bool $html Whether HTML support should be enabled. Disable it for XML documents */ public function __construct($html = true) { @@ -53,8 +53,8 @@ class CssSelectorConverter * Optionally, a prefix can be added to the resulting XPath * expression with the $prefix parameter. * - * @param string $cssExpr The CSS expression. - * @param string $prefix An optional prefix for the XPath expression. + * @param string $cssExpr The CSS expression + * @param string $prefix An optional prefix for the XPath expression * * @return string */ diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php index fb8dd19fd2..aa02494ca0 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php @@ -35,7 +35,7 @@ class ProjectServiceContainer extends Container * * This service is autowired. * - * @return \Foo A Foo instance. + * @return \Foo A Foo instance */ protected function getFooService() { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php index 084d0743f1..e30b809c67 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php @@ -150,7 +150,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance * * @deprecated The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed. */ diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php index 7bb37eeb69..b774c0db91 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php @@ -151,7 +151,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance * * @deprecated The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed. */ diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php index 93c3a6a6fb..7390783de6 100644 --- a/src/Symfony/Component/Filesystem/Filesystem.php +++ b/src/Symfony/Component/Filesystem/Filesystem.php @@ -479,11 +479,11 @@ class Filesystem /** * Creates a temporary file with support for custom stream wrappers. * - * @param string $dir The directory where the temporary filename will be created. - * @param string $prefix The prefix of the generated temporary filename. - * Note: Windows uses only the first three characters of prefix. + * @param string $dir The directory where the temporary filename will be created + * @param string $prefix The prefix of the generated temporary filename + * Note: Windows uses only the first three characters of prefix * - * @return string The new temporary filename (with path), or throw an exception on failure. + * @return string The new temporary filename (with path), or throw an exception on failure */ public function tempnam($dir, $prefix) { @@ -581,7 +581,7 @@ class Filesystem /** * Gets a 2-tuple of scheme (may be null) and hierarchical part of a filename (e.g. file:///tmp -> array(file, tmp)). * - * @param string $filename The filename to be parsed. + * @param string $filename The filename to be parsed * * @return array The filename scheme and hierarchical part */ diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php index 7068722c4b..41a513ac36 100644 --- a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php +++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php @@ -19,14 +19,14 @@ use Symfony\Component\Serializer\Annotation\Groups; class Dummy extends ParentDummy { /** - * @var string This is bar. + * @var string This is bar */ private $bar; /** * Should be used. * - * @var int Should be ignored. + * @var int Should be ignored */ protected $baz; From 8db8f90edc108a18b62f2c773c692f1857a9584d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 29 Jun 2016 07:40:45 +0200 Subject: [PATCH 7/7] fixed CS --- .../Form/ChoiceList/ORMQueryBuilderLoader.php | 2 +- .../Component/Config/Resource/FileResource.php | 2 +- .../Tests/Fixtures/php/services9.php | 8 ++++---- .../Tests/Fixtures/php/services9_compiled.php | 4 ++-- .../Intl/DateFormatter/IntlDateFormatter.php | 2 +- .../Validator/Context/ExecutionContextInterface.php | 12 ++++++------ .../Validator/Mapping/ClassMetadataInterface.php | 6 +++--- .../Validator/Mapping/PropertyMetadataInterface.php | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php index 8253ef65fc..9531b892f2 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php @@ -35,7 +35,7 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface /** * Construct an ORM Query Builder Loader. * - * @param QueryBuilder $queryBuilder The query builder for creating the query builder. + * @param QueryBuilder $queryBuilder The query builder for creating the query builder */ public function __construct(QueryBuilder $queryBuilder) { diff --git a/src/Symfony/Component/Config/Resource/FileResource.php b/src/Symfony/Component/Config/Resource/FileResource.php index 54a974caef..05d59e075c 100644 --- a/src/Symfony/Component/Config/Resource/FileResource.php +++ b/src/Symfony/Component/Config/Resource/FileResource.php @@ -44,7 +44,7 @@ class FileResource implements SelfCheckingResourceInterface, \Serializable } /** - * @return string|false The canonicalized, absolute path to the resource or false if the resource does not exist. + * @return string|false The canonicalized, absolute path to the resource or false if the resource does not exist */ public function getResource() { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php index 4b5a15e8d7..cde6104c86 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php @@ -114,7 +114,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getConfiguredServiceSimpleService() { @@ -200,7 +200,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar A Bar instance. + * @return \Bar A Bar instance */ protected function getFactoryServiceSimpleService() { @@ -378,7 +378,7 @@ class ProjectServiceContainer extends Container * If you want to be able to request this service from the container directly, * make it public, otherwise you might end up with broken code. * - * @return \ConfClass A ConfClass instance. + * @return \ConfClass A ConfClass instance */ protected function getConfiguratorServiceSimpleService() { @@ -395,7 +395,7 @@ class ProjectServiceContainer extends Container * If you want to be able to request this service from the container directly, * make it public, otherwise you might end up with broken code. * - * @return \SimpleFactoryClass A SimpleFactoryClass instance. + * @return \SimpleFactoryClass A SimpleFactoryClass instance */ protected function getFactorySimpleService() { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php index d27a099481..73247e2c75 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php @@ -122,7 +122,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \stdClass A stdClass instance. + * @return \stdClass A stdClass instance */ protected function getConfiguredServiceSimpleService() { @@ -195,7 +195,7 @@ class ProjectServiceContainer extends Container * This service is shared. * This method always returns the same instance of the service. * - * @return \Bar A Bar instance. + * @return \Bar A Bar instance */ protected function getFactoryServiceSimpleService() { diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php index ffced48b0b..7dcb58b289 100644 --- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php +++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php @@ -189,7 +189,7 @@ class IntlDateFormatter /** * Format the date/time value (timestamp) as a string. * - * @param int|\DateTime $timestamp The timestamp to format. + * @param int|\DateTime $timestamp The timestamp to format * * @return string|bool The formatted value or false if formatting failed * diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php index a4fd00d725..2079d22233 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php @@ -237,7 +237,7 @@ interface ExecutionContextInterface /** * Returns the violations generated by the validator so far. * - * @return ConstraintViolationListInterface The constraint violation list. + * @return ConstraintViolationListInterface The constraint violation list */ public function getViolations(); @@ -250,7 +250,7 @@ interface ExecutionContextInterface * * The current value is returned by {@link getValue}. * - * @return mixed The root value of the validation. + * @return mixed The root value of the validation */ public function getRoot(); @@ -260,7 +260,7 @@ interface ExecutionContextInterface * If you want to retrieve the object that was originally passed to the * validator, use {@link getRoot}. * - * @return mixed The currently validated value. + * @return mixed The currently validated value */ public function getValue(); @@ -285,7 +285,7 @@ interface ExecutionContextInterface /** * Returns the validation group that is currently being validated. * - * @return string The current validation group. + * @return string The current validation group */ public function getGroup(); @@ -296,7 +296,7 @@ interface ExecutionContextInterface * {@link Mapping\ClassMetadataInterface} or if no metadata is available for the * current node, this method returns null. * - * @return string|null The class name or null, if no class name could be found. + * @return string|null The class name or null, if no class name could be found */ public function getClassName(); @@ -307,7 +307,7 @@ interface ExecutionContextInterface * {@link PropertyMetadataInterface} or if no metadata is available for the * current node, this method returns null. * - * @return string|null The property name or null, if no property name could be found. + * @return string|null The property name or null, if no property name could be found */ public function getPropertyName(); diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php b/src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php index 0a3f2b1340..f76726f788 100644 --- a/src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php +++ b/src/Symfony/Component/Validator/Mapping/ClassMetadataInterface.php @@ -79,7 +79,7 @@ interface ClassMetadataInterface extends MetadataInterface /** * Check if there's any metadata attached to the given named property. * - * @param string $property The property name. + * @param string $property The property name * * @return bool */ @@ -91,7 +91,7 @@ interface ClassMetadataInterface extends MetadataInterface * If your implementation does not support properties, simply throw an * exception in this method (for example a BadMethodCallException). * - * @param string $property The property name. + * @param string $property The property name * * @return PropertyMetadataInterface[] A list of metadata instances. Empty if * no metadata exists for the property. @@ -101,7 +101,7 @@ interface ClassMetadataInterface extends MetadataInterface /** * Returns the name of the backing PHP class. * - * @return string The name of the backing class. + * @return string The name of the backing class */ public function getClassName(); } diff --git a/src/Symfony/Component/Validator/Mapping/PropertyMetadataInterface.php b/src/Symfony/Component/Validator/Mapping/PropertyMetadataInterface.php index d5983e239d..dcb61cc432 100644 --- a/src/Symfony/Component/Validator/Mapping/PropertyMetadataInterface.php +++ b/src/Symfony/Component/Validator/Mapping/PropertyMetadataInterface.php @@ -34,16 +34,16 @@ interface PropertyMetadataInterface extends MetadataInterface /** * Returns the name of the property. * - * @return string The property name. + * @return string The property name */ public function getPropertyName(); /** * Extracts the value of the property from the given container. * - * @param mixed $containingValue The container to extract the property value from. + * @param mixed $containingValue The container to extract the property value from * - * @return mixed The value of the property. + * @return mixed The value of the property */ public function getPropertyValue($containingValue); }