From b90aba14e65702db9ec96bd48ef21c5d5faa7ddd Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Sat, 23 Apr 2011 11:17:42 +0000 Subject: [PATCH 1/2] [FrameworkBundle] Fixed typo in css --- .../Bundle/FrameworkBundle/Resources/public/css/exception.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css index c3bc37a4af..921b42c23a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css @@ -255,7 +255,7 @@ build: 56 .sf-exceptionreset ol li { list-style: decimal; margin-left: 20px; - padding: 2px, + padding: 2px; padding-bottom: 20px; } From 8c0beea6770eb508ef69d4e274049e7de2864c47 Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Sat, 23 Apr 2011 15:05:44 +0000 Subject: [PATCH 2/2] [Phpdoc] Cleaning/fixing --- .../EntitiesToArrayTransformer.php | 7 ++-- .../DataTransformer/EntityToIdTransformer.php | 7 ++-- .../Bridge/Twig/Extension/FormExtension.php | 16 ++++----- .../Bridge/Twig/Node/FormThemeNode.php | 2 +- src/Symfony/Bridge/Twig/Node/TransNode.php | 2 +- .../Twig/TokenParser/FormThemeTokenParser.php | 2 +- .../TokenParser/TransChoiceTokenParser.php | 2 +- .../Twig/TokenParser/TransTokenParser.php | 2 +- .../AsseticBundle/Command/DumpCommand.php | 6 ++-- .../Command/DoctrineCommand.php | 2 +- .../DoctrineBundle/ConnectionFactory.php | 8 +++-- .../DependencyInjection/DoctrineExtension.php | 22 ++++++------ .../CacheWarmer/ClassMapCacheWarmer.php | 3 +- .../CacheWarmer/RouterCacheWarmer.php | 2 +- .../CacheWarmer/TemplatePathsCacheWarmer.php | 8 ++--- .../FrameworkBundle/Console/Application.php | 2 ++ .../FrameworkBundle/Controller/Controller.php | 6 ++-- .../FrameworkExtension.php | 5 +-- .../FrameworkBundle/HttpCache/HttpCache.php | 6 ++-- .../Profiler/ProfilerListener.php | 8 ++--- .../Resources/public/css/exception.css | 2 +- .../Resources/public/css/exception_layout.css | 5 ++- .../Templating/DelegatingEngine.php | 1 + .../Templating/Helper/FormHelper.php | 4 ++- .../Templating/Helper/RouterHelper.php | 6 ++-- .../Loader/CachedTemplateLocator.php | 1 - .../Templating/Loader/FilesystemLoader.php | 4 +-- .../Templating/Loader/TemplateLocator.php | 6 ++-- .../FrameworkBundle/Templating/PhpEngine.php | 1 + .../Translation/Translator.php | 1 + .../Validator/ConstraintValidatorFactory.php | 3 +- .../Security/Factory/AbstractFactory.php | 4 +-- .../Templating/Helper/SecurityHelper.php | 2 +- .../SwiftmailerExtension.php | 2 +- .../CacheWarmer/TemplateCacheCacheWarmer.php | 4 +-- .../TwigBundle/Loader/FilesystemLoader.php | 3 +- .../Bundle/TwigBundle/Node/RenderNode.php | 2 +- .../Controller/ProfilerController.php | 1 + .../WebProfilerExtension.php | 2 +- .../Resources/public/css/profiler.css | 10 +++--- .../Component/BrowserKit/CookieJar.php | 2 +- .../Builder/ArrayNodeDefinition.php | 4 +-- .../Config/Definition/Builder/ExprBuilder.php | 2 +- .../Definition/Builder/NodeDefinition.php | 2 +- .../Config/Definition/PrototypedArrayNode.php | 2 +- .../Component/Config/Loader/FileLoader.php | 2 ++ src/Symfony/Component/Console/Application.php | 4 +-- .../Console/Formatter/OutputFormatter.php | 4 +-- .../Formatter/OutputFormatterInterface.php | 4 +-- .../Component/Console/Helper/HelperSet.php | 2 +- .../Component/Console/Input/ArgvInput.php | 2 +- .../Component/Console/Input/ArrayInput.php | 4 +-- .../Console/Output/ConsoleOutput.php | 7 ++-- .../Component/Console/Output/Output.php | 8 ++--- .../Console/Output/OutputInterface.php | 2 +- .../Component/Console/Output/StreamOutput.php | 9 ++--- .../Console/Tester/ApplicationTester.php | 2 +- .../CssSelector/Node/FunctionNode.php | 6 ++-- src/Symfony/Component/CssSelector/Parser.php | 2 +- .../Compiler/AnalyzeServiceReferencesPass.php | 2 +- .../Compiler/CheckReferenceValidityPass.php | 2 +- .../DependencyInjection/Compiler/Compiler.php | 2 +- .../Compiler/InlineServiceDefinitionsPass.php | 6 ++-- .../ResolveDefinitionTemplatesPass.php | 2 +- .../DependencyInjection/Container.php | 8 ++--- .../DependencyInjection/ContainerBuilder.php | 6 ++-- .../ContainerInterface.php | 4 +-- .../DependencyInjection/Definition.php | 2 +- .../DependencyInjection/Dumper/PhpDumper.php | 6 ++-- .../DependencyInjection/Dumper/YamlDumper.php | 2 +- .../Extension/ExtensionInterface.php | 2 +- .../Loader/ClosureLoader.php | 4 +-- .../DependencyInjection/Loader/FileLoader.php | 2 +- .../Loader/PhpFileLoader.php | 2 +- .../Loader/YamlFileLoader.php | 4 +-- .../ParameterBag/ParameterBag.php | 4 +-- .../ParameterBag/ParameterBagInterface.php | 4 +-- .../DependencyInjection/SimpleXMLElement.php | 4 ++- src/Symfony/Component/DomCrawler/Crawler.php | 4 +-- src/Symfony/Component/DomCrawler/Form.php | 2 +- src/Symfony/Component/Finder/Glob.php | 4 ++- src/Symfony/Component/Finder/SplFileInfo.php | 6 ++-- .../Core/ChoiceList/PaddedChoiceList.php | 8 ++--- .../ArrayToBooleanChoicesTransformer.php | 2 +- .../Csrf/CsrfProvider/SessionCsrfProvider.php | 4 +-- .../Validator/DelegatingValidator.php | 8 +++-- src/Symfony/Component/Form/Form.php | 4 +-- src/Symfony/Component/Form/FormBuilder.php | 6 ++-- .../Component/Form/ReversedTransformer.php | 2 +- .../Component/Form/Util/PropertyPath.php | 8 +++-- .../Component/HttpFoundation/FileBag.php | 2 +- .../HttpFoundation/RequestMatcher.php | 2 +- .../Component/HttpFoundation/Session.php | 2 +- .../SessionStorage/NativeSessionStorage.php | 3 +- .../SessionStorage/PdoSessionStorage.php | 2 +- src/Symfony/Component/HttpKernel/Client.php | 2 +- .../HttpKernel/Config/FileLocator.php | 2 +- .../HttpKernel/HttpCache/EsiListener.php | 2 +- .../HttpKernel/HttpCache/HttpCache.php | 26 +++++++------- .../Component/HttpKernel/HttpKernel.php | 6 ++-- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++--- .../Component/HttpKernel/Test/WebTestCase.php | 5 ++- .../Component/HttpKernel/Util/Filesystem.php | 12 +++---- .../MethodNotImplementedException.php | 2 +- .../Stub/DateFormat/FullTransformer.php | 6 ++-- .../Component/Locale/Stub/StubLocale.php | 7 ++-- .../Routing/Generator/UrlGenerator.php | 6 ++-- .../Generator/UrlGeneratorInterface.php | 6 ++-- .../Routing/Loader/AnnotationFileLoader.php | 5 +-- .../Routing/Loader/PhpFileLoader.php | 4 +-- .../Component/Routing/Matcher/UrlMatcher.php | 4 +-- src/Symfony/Component/Routing/Route.php | 5 +-- src/Symfony/Component/Routing/Router.php | 4 +-- .../Security/Acl/Dbal/AclProvider.php | 14 ++++---- .../Component/Security/Acl/Domain/Acl.php | 36 +++++++++---------- .../Acl/Domain/AclCollectionCache.php | 6 ++-- .../Security/Acl/Domain/AuditLogger.php | 2 +- .../Security/Acl/Domain/DoctrineAclCache.php | 5 +-- .../Component/Security/Acl/Domain/Entry.php | 14 ++++---- .../Security/Acl/Domain/FieldEntry.php | 16 ++++----- .../Security/Acl/Domain/ObjectIdentity.php | 2 +- .../Acl/Domain/PermissionGrantingStrategy.php | 10 +++--- .../SecurityIdentityRetrievalStrategy.php | 3 +- .../Security/Acl/Model/AclInterface.php | 10 +++--- .../Acl/Model/MutableAclInterface.php | 36 +++++++++---------- .../PermissionGrantingStrategyInterface.php | 9 ++--- .../Component/Security/Acl/Voter/AclVoter.php | 2 ++ .../Provider/DaoAuthenticationProvider.php | 8 +++-- ...PreAuthenticatedAuthenticationProvider.php | 5 +-- .../Provider/UserAuthenticationProvider.php | 9 ++--- .../RememberMe/PersistentToken.php | 8 ++--- .../RememberMe/TokenProviderInterface.php | 4 +-- .../Token/UsernamePasswordToken.php | 6 +++- .../Authorization/AccessDecisionManager.php | 7 ++-- .../Security/Core/SecurityContext.php | 2 ++ .../Core/User/InMemoryUserProvider.php | 1 - .../FormAuthenticationEntryPoint.php | 4 +-- .../Component/Security/Http/Firewall.php | 3 +- .../Security/Http/Firewall/LogoutListener.php | 7 ++-- .../Http/Firewall/RememberMeListener.php | 8 ++--- .../Logout/CookieClearingLogoutHandler.php | 4 +-- .../Http/Logout/LogoutHandlerInterface.php | 4 +-- .../Http/Logout/SessionLogoutHandler.php | 4 +-- .../RememberMe/AbstractRememberMeServices.php | 22 ++++++------ .../RememberMeServicesInterface.php | 4 +-- .../Serializer/Encoder/XmlEncoder.php | 7 ++-- .../Normalizer/CustomNormalizer.php | 6 ++-- .../Normalizer/GetSetMethodNormalizer.php | 6 ++-- .../Normalizer/NormalizerInterface.php | 4 ++- .../Serializer/SerializerInterface.php | 3 +- .../Templating/Helper/AssetsHelper.php | 5 +-- .../Templating/Loader/CacheLoader.php | 4 +-- .../Templating/Loader/ChainLoader.php | 6 ++-- .../Templating/Loader/FilesystemLoader.php | 4 +-- .../Templating/Loader/LoaderInterface.php | 4 +-- .../Component/Templating/PhpEngine.php | 12 +++---- .../Component/Validator/GraphWalker.php | 6 ++-- .../Validator/ValidatorContextInterface.php | 4 +-- .../Validator/ValidatorInterface.php | 7 ++-- src/Symfony/Component/Yaml/Inline.php | 4 +-- src/Symfony/Component/Yaml/Unescaper.php | 6 ++-- 161 files changed, 458 insertions(+), 406 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntitiesToArrayTransformer.php b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntitiesToArrayTransformer.php index 73741861f8..286b61fd07 100644 --- a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntitiesToArrayTransformer.php +++ b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntitiesToArrayTransformer.php @@ -30,10 +30,9 @@ class EntitiesToArrayTransformer implements DataTransformerInterface /** * Transforms entities into choice keys * - * @param Collection|object A collection of entities, a single entity or - * NULL - * @return mixed An array of choice keys, a single key or - * NULL + * @param Collection|object $collection A collection of entities, a single entity or + * NULL + * @return mixed An array of choice keys, a single key or NULL */ public function transform($collection) { diff --git a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntityToIdTransformer.php b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntityToIdTransformer.php index 6787655c39..6d66ca1e01 100644 --- a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntityToIdTransformer.php +++ b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntityToIdTransformer.php @@ -28,10 +28,9 @@ class EntityToIdTransformer implements DataTransformerInterface /** * Transforms entities into choice keys * - * @param Collection|object A collection of entities, a single entity or - * NULL - * @return mixed An array of choice keys, a single key or - * NULL + * @param Collection|object $entity A collection of entities, a single entity or + * NULL + * @return mixed An array of choice keys, a single key or NULL */ public function transform($entity) { diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php index 6630805098..7c2f7f5551 100644 --- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php @@ -45,8 +45,8 @@ class FormExtension extends \Twig_Extension /** * Sets a theme for a given view. * - * @param FormView $view A FormView instance - * @param array $resources An array of resources + * @param FormView $view A FormView instance + * @param array $resources An array of resources */ public function setTheme(FormView $view, array $resources) { @@ -95,7 +95,8 @@ class FormExtension extends \Twig_Extension /** * Renders a row for the view. * - * @param FormView $view The view to render as a row + * @param FormView $view The view to render as a row + * @param array $variables An array of variables */ public function renderRow(FormView $view, array $variables = array()) { @@ -122,9 +123,8 @@ class FormExtension extends \Twig_Extension * * {{ form_widget(view, {}, {'separator': '+++++'}) }} * - * @param FormView $view The view to render - * @param array $attributes HTML attributes passed to the template - * @param array $parameters Additional variables passed to the template + * @param FormView $view The view to render + * @param array $variables Additional variables passed to the template * @param array|string $resources A resource or array of resources */ public function renderWidget(FormView $view, array $variables = array(), $resources = null) @@ -140,7 +140,6 @@ class FormExtension extends \Twig_Extension * Renders the errors of the given view * * @param FormView $view The view to render the errors for - * @param array $params Additional variables passed to the template */ public function renderErrors(FormView $view) { @@ -150,7 +149,8 @@ class FormExtension extends \Twig_Extension /** * Renders the label of the given view * - * @param FormView $view The view to render the label for + * @param FormView $view The view to render the label for + * @param string $label Label name */ public function renderLabel(FormView $view, $label = null) { diff --git a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php index c4ad0205c0..7872a63609 100644 --- a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php +++ b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php @@ -26,7 +26,7 @@ class FormThemeNode extends \Twig_Node /** * Compiles the node to PHP. * - * @param \Twig_Compiler A Twig_Compiler instance + * @param \Twig_Compiler $compiler A Twig_Compiler instance */ public function compile(\Twig_Compiler $compiler) { diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php index 6ee554078c..b7b790a99c 100644 --- a/src/Symfony/Bridge/Twig/Node/TransNode.php +++ b/src/Symfony/Bridge/Twig/Node/TransNode.php @@ -26,7 +26,7 @@ class TransNode extends \Twig_Node /** * Compiles the node to PHP. * - * @param \Twig_Compiler A Twig_Compiler instance + * @param \Twig_Compiler $compiler A Twig_Compiler instance */ public function compile(\Twig_Compiler $compiler) { diff --git a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php index 83da6e37b1..583d8800dd 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php @@ -46,7 +46,7 @@ class FormThemeTokenParser extends \Twig_TokenParser /** * Gets the tag name associated with this token parser. * - * @param string The tag name + * @return string The tag name */ public function getTag() { diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php index 351e660ccd..7b718817ae 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php @@ -80,7 +80,7 @@ class TransChoiceTokenParser extends TransTokenParser /** * Gets the tag name associated with this token parser. * - * @param string The tag name + * @return string The tag name */ public function getTag() { diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php index c3450f67ab..f792cc3a9b 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php @@ -72,7 +72,7 @@ class TransTokenParser extends \Twig_TokenParser /** * Gets the tag name associated with this token parser. * - * @param string The tag name + * @return string The tag name */ public function getTag() { diff --git a/src/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php b/src/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php index a2ae7ff759..6a79edf9a7 100644 --- a/src/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php +++ b/src/Symfony/Bundle/AsseticBundle/Command/DumpCommand.php @@ -110,9 +110,9 @@ class DumpCommand extends Command /** * Checks if an asset should be dumped. * - * @param LazyAssetManager $am The asset manager - * @param string $name The asset name - * @param array $previously An array of previous visits + * @param LazyAssetManager $am The asset manager + * @param string $name The asset name + * @param array &$previously An array of previous visits * * @return AssetInterface|Boolean The asset if it should be dumped */ diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php index 041f7b472a..99ce333845 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php @@ -41,7 +41,7 @@ abstract class DoctrineCommand extends Command * Convenience method to push the helper sets of a given entity manager into the application. * * @param Application $application - * @param string $emName + * @param string $emName */ public static function setApplicationEntityManager(Application $application, $emName) { diff --git a/src/Symfony/Bundle/DoctrineBundle/ConnectionFactory.php b/src/Symfony/Bundle/DoctrineBundle/ConnectionFactory.php index 2f485d1b7f..81aa518e23 100644 --- a/src/Symfony/Bundle/DoctrineBundle/ConnectionFactory.php +++ b/src/Symfony/Bundle/DoctrineBundle/ConnectionFactory.php @@ -26,7 +26,8 @@ class ConnectionFactory private $initialized = false; /** - * @param ContainerInterface $container + * Construct. + * * @param array $typesConfig */ public function __construct(array $typesConfig) @@ -37,7 +38,10 @@ class ConnectionFactory /** * Create a connection by name. * - * @param string $connectionName + * @param string $connectionName + * @param Configuration $config + * @param EventManager $eventManager + * * @return Doctrine\DBAL\Connection */ public function createConnection(array $params, Configuration $config = null, EventManager $eventManager = null) diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php index fcfe01091a..c8b4467094 100755 --- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php +++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php @@ -51,7 +51,7 @@ class DoctrineExtension extends AbstractDoctrineExtension * * * - * @param array $config An array of configuration settings + * @param array $config An array of configuration settings * @param ContainerBuilder $container A ContainerBuilder instance */ protected function dbalLoad(array $config, ContainerBuilder $container) @@ -77,9 +77,9 @@ class DoctrineExtension extends AbstractDoctrineExtension /** * Loads a configured DBAL connection. * - * @param string $name The name of the connection - * @param array $connection A dbal connection configuration. - * @param ContainerBuilder $container A ContainerBuilder instance + * @param string $name The name of the connection + * @param array $connection A dbal connection configuration. + * @param ContainerBuilder $container A ContainerBuilder instance */ protected function loadDbalConnection($name, array $connection, ContainerBuilder $container) { @@ -137,7 +137,7 @@ class DoctrineExtension extends AbstractDoctrineExtension * * * - * @param array $config An array of configuration settings + * @param array $config An array of configuration settings * @param ContainerBuilder $container A ContainerBuilder instance */ protected function ormLoad(array $config, ContainerBuilder $container) @@ -295,8 +295,8 @@ class DoctrineExtension extends AbstractDoctrineExtension /** * Loads a configured entity managers cache drivers. * - * @param array $entityManager A configured ORM entity manager. - * @param ContainerBuilder $container A ContainerBuilder instance + * @param array $entityManager A configured ORM entity manager. + * @param ContainerBuilder $container A ContainerBuilder instance */ protected function loadOrmCacheDrivers(array $entityManager, ContainerBuilder $container) { @@ -308,9 +308,9 @@ class DoctrineExtension extends AbstractDoctrineExtension /** * Loads a configured entity managers metadata, query or result cache driver. * - * @param array $entityManager A configured ORM entity manager. + * @param array $entityManager A configured ORM entity manager. * @param ContainerBuilder $container A ContainerBuilder instance - * @param string $cacheName + * @param string $cacheName */ protected function loadOrmEntityManagerCacheDriver(array $entityManager, ContainerBuilder $container, $cacheName) { @@ -324,8 +324,8 @@ class DoctrineExtension extends AbstractDoctrineExtension /** * Gets an entity manager cache driver definition for metadata, query and result caches. * - * @param array $entityManager The array configuring an entity manager. - * @param array $cacheDriver The cache driver configuration. + * @param array $entityManager The array configuring an entity manager. + * @param array $cacheDriver The cache driver configuration. * @param ContainerBuilder $container * @return Definition $cacheDef */ diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ClassMapCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ClassMapCacheWarmer.php index 1f31ab243e..c6671e2201 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ClassMapCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ClassMapCacheWarmer.php @@ -26,8 +26,7 @@ class ClassMapCacheWarmer extends CacheWarmer /** * Constructor. * - * @param KernelInterface $kernel A KernelInterface instance - * @param string $rootDir The directory where global templates can be stored + * @param ContainerInterface $container The container */ public function __construct(ContainerInterface $container) { diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php index 261f9f2dc9..00e788e62a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php @@ -26,7 +26,7 @@ class RouterCacheWarmer extends CacheWarmer /** * Constructor. * - * @param router $router A Router instance + * @param Router $router A Router instance */ public function __construct(Router $router) { diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php index b8a142f03c..aeb7f232ba 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php @@ -32,10 +32,10 @@ class TemplatePathsCacheWarmer extends CacheWarmer /** * Constructor. * - * @param KernelInterface $kernel A KernelInterface instance - * @param TemplateNameParser $parser A TemplateNameParser instance - * @param TemplateLocator $locator The template locator - * @param string $rootDir The directory where global templates can be stored + * @param KernelInterface $kernel A KernelInterface instance + * @param TemplateNameParser $parser A TemplateNameParser instance + * @param TemplateLocator $locator The template locator + * @param string $rootDir The directory where global templates can be stored */ public function __construct(KernelInterface $kernel, TemplateNameParser $parser, TemplateLocator $locator, $rootDir) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php index 59c5faf9f8..90707a6026 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php @@ -29,6 +29,8 @@ class Application extends BaseApplication /** * Constructor. + * + * @param KernelInterface $kernel A KernelInterface instance */ public function __construct(KernelInterface $kernel) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php index 4e15c163ad..59bfc0245e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php @@ -28,9 +28,9 @@ class Controller extends ContainerAware /** * Generates a URL from the given parameters. * - * @param string $name The name of the route - * @param array $parameters An array of parameters - * @param Boolean $absolute Whether to generate an absolute URL + * @param string $name The name of the route + * @param array $parameters An array of parameters + * @param Boolean $absolute Whether to generate an absolute URL * * @return string The generated URL */ diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 08436546ff..c3cd5899b7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -171,8 +171,8 @@ class FrameworkExtension extends Extension /** * Loads the ESI configuration. * - * @param array $config An ESI configuration array - * @param XmlFileLoader $loader An XmlFileLoader instance + * @param array $config An ESI configuration array + * @param XmlFileLoader $loader An XmlFileLoader instance */ private function registerEsiConfiguration(array $config, XmlFileLoader $loader) { @@ -312,6 +312,7 @@ class FrameworkExtension extends Extension * Loads the templating configuration. * * @param array $config A templating configuration array + * @param string $ide * @param ContainerBuilder $container A ContainerBuilder instance * @param XmlFileLoader $loader An XmlFileLoader instance */ diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php index 6c95052648..6f748a7c82 100644 --- a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php +++ b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php @@ -41,9 +41,9 @@ abstract class HttpCache extends BaseHttpCache /** * Forwards the Request to the backend and returns the Response. * - * @param Request $request A Request instance - * @param Boolean $raw Whether to catch exceptions or not - * @param Response $response A Response instance (the stale entry if present, null otherwise) + * @param Request $request A Request instance + * @param Boolean $raw Whether to catch exceptions or not + * @param Response $entry A Response instance (the stale entry if present, null otherwise) * * @return Response A Response instance */ diff --git a/src/Symfony/Bundle/FrameworkBundle/Profiler/ProfilerListener.php b/src/Symfony/Bundle/FrameworkBundle/Profiler/ProfilerListener.php index 08bd16d48f..2519e9551d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Profiler/ProfilerListener.php +++ b/src/Symfony/Bundle/FrameworkBundle/Profiler/ProfilerListener.php @@ -35,10 +35,10 @@ class ProfilerListener /** * Constructor. * - * @param ContainerInterface $container A ContainerInterface instance - * @param RequestMatcherInterface $matcher A RequestMatcher instance - * @param Boolean $onlyException true if the profiler only collects data when an exception occurs, false otherwise - * @param Boolean $onlyMaster true if the profiler only collects data when the request is a master request, false otherwise + * @param ContainerInterface $container A ContainerInterface instance + * @param RequestMatcherInterface $matcher A RequestMatcher instance + * @param Boolean $onlyException true if the profiler only collects data when an exception occurs, false otherwise + * @param Boolean $onlyMasterRequests true if the profiler only collects data when the request is a master request, false otherwise */ public function __construct(ContainerInterface $container, RequestMatcherInterface $matcher = null, $onlyException = false, $onlyMasterRequests = false) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css index 921b42c23a..d8a8e080a6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css @@ -265,7 +265,7 @@ build: 56 margin-left: 0; white-space: nowrap; font-size: 12px; - padding-bottom: 0px; + padding-bottom: 0; } .sf-exceptionreset li .selected { diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css index 571815baaf..23ee3081bf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css @@ -22,7 +22,7 @@ img .clear { clear:both; - height:0px; + height:0; font-size:0; line-height:0; } @@ -97,7 +97,6 @@ img { -webkit-appearance: button-bevel; float: none; - text-align: left; padding: 0; margin: 0; overflow: visible; @@ -148,7 +147,7 @@ img .search button span span span { - padding: 0px 7px; + padding: 0 7px; font: bold 11px Arial, Helvetica, sans-serif; color: #6b6b6b; line-height: 28px; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php index 2df2e4878f..d7a62c15e7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php @@ -29,6 +29,7 @@ class DelegatingEngine extends BaseDelegatingEngine implements EngineInterface * Constructor. * * @param ContainerInterface $container The DI container + * @param array $engineIds An array of engine Ids */ public function __construct(ContainerInterface $container, array $engineIds) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php index fc60b604cb..d0eef43c95 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -72,7 +72,9 @@ class FormHelper extends Helper /** * Renders the entire form field "row". * - * @param FieldInterface $field + * @param FormView $view + * @param array $variables + * * @return string */ public function row(FormView $view, array $variables = array()) diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php index 7f55288c19..22576b8efa 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php @@ -36,9 +36,9 @@ class RouterHelper extends Helper /** * Generates a URL from the given parameters. * - * @param string $name The name of the route - * @param array $parameters An array of parameters - * @param Boolean $absolute Whether to generate an absolute URL + * @param string $name The name of the route + * @param array $parameters An array of parameters + * @param Boolean $absolute Whether to generate an absolute URL * * @return string The generated URL */ diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/CachedTemplateLocator.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/CachedTemplateLocator.php index 49d8f6f51b..63eca12fca 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/CachedTemplateLocator.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/CachedTemplateLocator.php @@ -28,7 +28,6 @@ class CachedTemplateLocator extends TemplateLocator * * @param string $cacheDir The cache path * @param FileLocatorInterface $locator A FileLocatorInterface instance - * @param string $path A global fallback path */ public function __construct($cacheDir, FileLocatorInterface $locator) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php index 61af63c243..80ada573f8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php @@ -56,8 +56,8 @@ class FilesystemLoader implements LoaderInterface /** * Returns true if the template is still fresh. * - * @param TemplateReferenceInterface $template The template name as an array - * @param integer $time The last modification time of the cached template (timestamp) + * @param TemplateReferenceInterface $template The template name as an array + * @param integer $time The last modification time of the cached template (timestamp) */ public function isFresh(TemplateReferenceInterface $template, $time) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php index eee7d246e2..26c51dd0b7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php @@ -39,9 +39,9 @@ class TemplateLocator implements FileLocatorInterface /** * Returns a full path for a given file. * - * @param TemplateReferenceInterface $template A template - * @param string $currentPath Unused - * @param Boolean $first Unused + * @param TemplateReferenceInterface $template A template + * @param string $currentPath Unused + * @param Boolean $first Unused * * @return string The full path for the file * diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php index 64d89aadc5..b9ffe03797 100755 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php @@ -32,6 +32,7 @@ class PhpEngine extends BasePhpEngine implements EngineInterface * @param TemplateNameParserInterface $parser A TemplateNameParserInterface instance * @param ContainerInterface $container The DI container * @param LoaderInterface $loader A loader instance + * @param GlobalVariables $globals A GlobalVariables instance */ public function __construct(TemplateNameParserInterface $parser, ContainerInterface $container, LoaderInterface $loader, GlobalVariables $globals) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php index 8692b8489a..87049b616a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php +++ b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php @@ -40,6 +40,7 @@ class Translator extends BaseTranslator * * @param ContainerInterface $container A ContainerInterface instance * @param MessageSelector $selector The message selector for pluralization + * @param array $loaderIds An array of loader Ids * @param array $options An array of options * @param Session $session A Session instance */ diff --git a/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php b/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php index 7416abf1d8..328a2f6d49 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php +++ b/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php @@ -44,7 +44,8 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface /** * Constructor. * - * @param ContainerInterface $container The service container + * @param ContainerInterface $container The service container + * @param array $validators An array of validators */ public function __construct(ContainerInterface $container, array $validators = array()) { diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php index 703821fdaf..a6c59f81f7 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php @@ -90,8 +90,8 @@ abstract class AbstractFactory implements SecurityFactoryInterface * AuthenticationProviderInterface. * * @param ContainerBuilder $container - * @param string $id The unique id of the firewall - * @param array $options The options array for this listener + * @param string $id The unique id of the firewall + * @param array $config The options array for this listener * @param string $userProviderId The id of the user provider * * @return string never null, the id of the authentication provider diff --git a/src/Symfony/Bundle/SecurityBundle/Templating/Helper/SecurityHelper.php b/src/Symfony/Bundle/SecurityBundle/Templating/Helper/SecurityHelper.php index 1ccc37c568..7ca0e7bb66 100644 --- a/src/Symfony/Bundle/SecurityBundle/Templating/Helper/SecurityHelper.php +++ b/src/Symfony/Bundle/SecurityBundle/Templating/Helper/SecurityHelper.php @@ -27,7 +27,7 @@ class SecurityHelper extends Helper /** * Constructor. * - * @param SecurityContext $context A SecurityContext instance + * @param SecurityContextInterface $context A SecurityContext instance */ public function __construct(SecurityContextInterface $context = null) { diff --git a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php index 76bd58468f..ff4f7db882 100644 --- a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php +++ b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php @@ -36,7 +36,7 @@ class SwiftmailerExtension extends Extension * * * - * @param array $config An array of configuration settings + * @param array $configs An array of configuration settings * @param ContainerBuilder $container A ContainerBuilder instance */ public function load(array $configs, ContainerBuilder $container) diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php index aaefc69950..0758c75c6c 100644 --- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php +++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php @@ -32,8 +32,8 @@ class TemplateCacheCacheWarmer extends CacheWarmer /** * Constructor. * - * @param ContainerInterface $container The dependency injection container - * @param string $rootDir The directory where global templates can be stored + * @param ContainerInterface $container The dependency injection container + * @param string $rootDir The directory where global templates can be stored */ public function __construct(ContainerInterface $container, $rootDir) { diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php index 292b4cfa37..6c844cb8ab 100644 --- a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php +++ b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php @@ -30,7 +30,8 @@ class FilesystemLoader implements \Twig_LoaderInterface /** * Constructor. * - * @param FileLocatorInterface $locator A FileLocatorInterface instance + * @param FileLocatorInterface $locator A FileLocatorInterface instance + * @param TemplateNameParserInterface $parser A TemplateNameParserInterface instance */ public function __construct(FileLocatorInterface $locator, TemplateNameParserInterface $parser) { diff --git a/src/Symfony/Bundle/TwigBundle/Node/RenderNode.php b/src/Symfony/Bundle/TwigBundle/Node/RenderNode.php index b55bc7652c..f4018e457c 100644 --- a/src/Symfony/Bundle/TwigBundle/Node/RenderNode.php +++ b/src/Symfony/Bundle/TwigBundle/Node/RenderNode.php @@ -26,7 +26,7 @@ class RenderNode extends \Twig_Node /** * Compiles the node to PHP. * - * @param \Twig_Compiler A Twig_Compiler instance + * @param \Twig_Compiler $compiler A Twig_Compiler instance */ public function compile(\Twig_Compiler $compiler) { diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php index 8f944190a8..b4aee5a7b8 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php @@ -200,6 +200,7 @@ class ProfilerController extends ContainerAware /** * Search results. * + * @param string $token The token * @return Response A Response instance */ public function searchResultsAction($token) diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php index 2217e72679..77c81c8a9e 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php +++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php @@ -34,7 +34,7 @@ class WebProfilerExtension extends Extension /** * Loads the web profiler configuration. * - * @param array $config An array of configuration settings + * @param array $configs An array of configuration settings * @param ContainerBuilder $container A ContainerBuilder instance */ public function load(array $configs, ContainerBuilder $container) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css index 6dc81a5518..89f0ae128c 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css @@ -109,7 +109,7 @@ abbr .clear { clear:both; - height:0px; + height:0; font-size:0; line-height:0; } @@ -192,7 +192,7 @@ abbr { display: block; position: absolute; - left: 0px; + left: 0; top: 12px; width: 60px; text-align: center; @@ -394,10 +394,9 @@ td.main, td.menu { { -webkit-appearance: button-bevel; float: none; - display: block; padding: 0; margin: 0; - border: 0px solid #000000; + border: 0 solid #000; text-decoration: none; cursor: pointer; background-color: transparent; @@ -405,7 +404,6 @@ td.main, td.menu { display: inline-block; text-align: center; vertical-align: middle; - border: 0; background: none; } @@ -439,7 +437,7 @@ td.main, td.menu { .search button span span span { - padding: 0px 7px; + padding: 0 7px; font: bold 11px Arial, Helvetica, sans-serif; color: #6b6b6b; line-height: 28px; diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php index 8d6797504f..3ac81f8a6b 100644 --- a/src/Symfony/Component/BrowserKit/CookieJar.php +++ b/src/Symfony/Component/BrowserKit/CookieJar.php @@ -76,7 +76,7 @@ class CookieJar * Updates the cookie jar from a Response object. * * @param Response $response A Response object - * @param string $url The base URL + * @param string $uri The base URL */ public function updateFromResponse(Response $response, $uri = null) { diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index bede6e991b..155c46e872 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -53,7 +53,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition /** * Set a custom children builder * - * @param NodeBuilder $class A custom NodeBuilder + * @param NodeBuilder $builder A custom NodeBuilder */ public function setBuilder(NodeBuilder $builder) { @@ -160,7 +160,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition * If you'd like "'id' => 'my_name'" to still be present in the resulting * array, then you can set the second argument of this method to false. * - * @param string $name The name of the key + * @param string $name The name of the key * @param Boolean $removeKeyItem Whether or not the key item should be removed. * * @return ArrayNodeDefinition diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php index 5d833049c5..342de2cc3c 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php @@ -27,7 +27,7 @@ class ExprBuilder /** * Constructor * - * @param NodeDefinition $parent The related node + * @param NodeDefinition $node The related node */ public function __construct(NodeDefinition $node) { diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php index 17dca86109..649d0aa09c 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php @@ -74,7 +74,7 @@ abstract class NodeDefinition implements NodeParentInterface /** * Creates the node. * - * @param Boolean $forceRootNode Wether to force this node as the root node + * @param Boolean $forceRootNode Whether to force this node as the root node * * @return NodeInterface */ diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php index 842d7093fb..23a4ff81de 100644 --- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php +++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php @@ -70,7 +70,7 @@ class PrototypedArrayNode extends ArrayNode * If $remove is false, the resulting array will still have the * "'id' => 'my_name'" item in it. * - * @param string $attribute The name of the attribute which value is to be used as a key + * @param string $attribute The name of the attribute which value is to be used as a key * @param Boolean $remove Whether or not to remove the key */ public function setKeyAttribute($attribute, $remove = true) diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php index ad4f7c403d..2ed0aecbfe 100644 --- a/src/Symfony/Component/Config/Loader/FileLoader.php +++ b/src/Symfony/Component/Config/Loader/FileLoader.php @@ -27,6 +27,8 @@ abstract class FileLoader extends Loader /** * Constructor. + * + * @param FileLocatorInterface $locator A FileLocatorInterface instance */ public function __construct(FileLocatorInterface $locator) { diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index 1ad936321a..d068518f59 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -640,8 +640,8 @@ class Application /** * Returns an XML representation of the Application. * - * @param string $namespace An optional namespace name - * @param Boolean $asDom Whether to return a DOM or an XML string + * @param string $namespace An optional namespace name + * @param Boolean $asDom Whether to return a DOM or an XML string * * @return string|DOMDocument An XML string representing the Application */ diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php index 1d637b89e9..59f247d03a 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php @@ -72,8 +72,8 @@ class OutputFormatter implements OutputFormatterInterface /** * Sets a new style. * - * @param string $name The style name - * @param OutputFormatterStyleInterface $options The style instance + * @param string $name The style name + * @param OutputFormatterStyleInterface $style The style instance * * @api */ diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php index 0fe05abc94..b83e050062 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php @@ -41,8 +41,8 @@ interface OutputFormatterInterface /** * Sets a new style. * - * @param string $name The style name - * @param OutputFormatterStyleInterface $options The style instance + * @param string $name The style name + * @param OutputFormatterStyleInterface $style The style instance * * @api */ diff --git a/src/Symfony/Component/Console/Helper/HelperSet.php b/src/Symfony/Component/Console/Helper/HelperSet.php index 193af3997b..b0b936efb6 100644 --- a/src/Symfony/Component/Console/Helper/HelperSet.php +++ b/src/Symfony/Component/Console/Helper/HelperSet.php @@ -38,7 +38,7 @@ class HelperSet * Sets a helper. * * @param HelperInterface $value The helper instance - * @param string $alias An alias + * @param string $alias An alias */ public function set(HelperInterface $helper, $alias = null) { diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php index 064b073f24..0bc0dfd307 100644 --- a/src/Symfony/Component/Console/Input/ArgvInput.php +++ b/src/Symfony/Component/Console/Input/ArgvInput.php @@ -111,7 +111,7 @@ class ArgvInput extends Input /** * Parses a short option set. * - * @param string $token The current token + * @param string $name The current token * * @throws \RuntimeException When option given doesn't exist */ diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php index 5995a5e568..639f995a61 100644 --- a/src/Symfony/Component/Console/Input/ArrayInput.php +++ b/src/Symfony/Component/Console/Input/ArrayInput.php @@ -29,7 +29,7 @@ class ArrayInput extends Input /** * Constructor. * - * @param array $param An array of parameters + * @param array $parameters An array of parameters * @param InputDefinition $definition A InputDefinition instance * * @api @@ -63,7 +63,7 @@ class ArrayInput extends Input * This method is to be used to introspect the input parameters * before it has been validated. It must be used carefully. * - * @param string|array $value The values to look for in the raw parameters (can be an array) + * @param string|array $values The values to look for in the raw parameters (can be an array) * * @return Boolean true if the value is contained in the raw parameters */ diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php index 3a6c3bb76e..ccf7901d6e 100644 --- a/src/Symfony/Component/Console/Output/ConsoleOutput.php +++ b/src/Symfony/Component/Console/Output/ConsoleOutput.php @@ -33,9 +33,10 @@ class ConsoleOutput extends StreamOutput /** * Constructor. * - * @param integer $verbosity The verbosity level (self::VERBOSITY_QUIET, self::VERBOSITY_NORMAL, self::VERBOSITY_VERBOSE) - * @param Boolean $decorated Whether to decorate messages or not (null for auto-guessing) - * @param OutputFormatter $formatter Output formatter instance + * @param integer $verbosity The verbosity level (self::VERBOSITY_QUIET, self::VERBOSITY_NORMAL, + * self::VERBOSITY_VERBOSE) + * @param Boolean $decorated Whether to decorate messages or not (null for auto-guessing) + * @param OutputFormatter $formatter Output formatter instance * * @api */ diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php index 69611b7349..5f333d4894 100644 --- a/src/Symfony/Component/Console/Output/Output.php +++ b/src/Symfony/Component/Console/Output/Output.php @@ -35,9 +35,9 @@ abstract class Output implements OutputInterface /** * Constructor. * - * @param integer $verbosity The verbosity level (self::VERBOSITY_QUIET, self::VERBOSITY_NORMAL, self::VERBOSITY_VERBOSE) - * @param Boolean $decorated Whether to decorate messages or not (null for auto-guessing) - * @param OutputFormatterInterface $formatter Output formatter instance + * @param integer $verbosity The verbosity level (self::VERBOSITY_QUIET, self::VERBOSITY_NORMAL, self::VERBOSITY_VERBOSE) + * @param Boolean $decorated Whether to decorate messages or not (null for auto-guessing) + * @param OutputFormatterInterface $formatter Output formatter instance * * @api */ @@ -55,7 +55,7 @@ abstract class Output implements OutputInterface /** * Sets output formatter. * - * @param OutputFormatterInterface $formatter + * @param OutputFormatterInterface $formatter * * @api */ diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php index 24e71da65d..88851179aa 100644 --- a/src/Symfony/Component/Console/Output/OutputInterface.php +++ b/src/Symfony/Component/Console/Output/OutputInterface.php @@ -90,7 +90,7 @@ interface OutputInterface /** * Sets output formatter. * - * @param OutputFormatterInterface $formatter + * @param OutputFormatterInterface $formatter * * @api */ diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php index 20a25780c9..fa3214cd72 100644 --- a/src/Symfony/Component/Console/Output/StreamOutput.php +++ b/src/Symfony/Component/Console/Output/StreamOutput.php @@ -35,10 +35,11 @@ class StreamOutput extends Output /** * Constructor. * - * @param mixed $stream A stream resource - * @param integer $verbosity The verbosity level (self::VERBOSITY_QUIET, self::VERBOSITY_NORMAL, self::VERBOSITY_VERBOSE) - * @param Boolean $decorated Whether to decorate messages or not (null for auto-guessing) - * @param OutputFormatter $formatter Output formatter instance + * @param mixed $stream A stream resource + * @param integer $verbosity The verbosity level (self::VERBOSITY_QUIET, self::VERBOSITY_NORMAL, + * self::VERBOSITY_VERBOSE) + * @param Boolean $decorated Whether to decorate messages or not (null for auto-guessing) + * @param OutputFormatter $formatter Output formatter instance * * @throws \InvalidArgumentException When first argument is not a real stream * diff --git a/src/Symfony/Component/Console/Tester/ApplicationTester.php b/src/Symfony/Component/Console/Tester/ApplicationTester.php index 0e96e31031..e3093cade2 100644 --- a/src/Symfony/Component/Console/Tester/ApplicationTester.php +++ b/src/Symfony/Component/Console/Tester/ApplicationTester.php @@ -27,7 +27,7 @@ class ApplicationTester /** * Constructor. * - * @param Application $application A Application instance to test. + * @param Application $application An Application instance to test. */ public function __construct(Application $application) { diff --git a/src/Symfony/Component/CssSelector/Node/FunctionNode.php b/src/Symfony/Component/CssSelector/Node/FunctionNode.php index c8b0b76a59..1d285c9460 100644 --- a/src/Symfony/Component/CssSelector/Node/FunctionNode.php +++ b/src/Symfony/Component/CssSelector/Node/FunctionNode.php @@ -77,9 +77,9 @@ class FunctionNode implements NodeInterface * undocumented function * * @param XPathExpr $xpath - * @param mixed $expr - * @param string $last - * @param string $addNameTest + * @param mixed $expr + * @param Boolean $last + * @param Boolean $addNameTest * @return XPathExpr */ protected function _xpath_nth_child($xpath, $expr, $last = false, $addNameTest = true) diff --git a/src/Symfony/Component/CssSelector/Parser.php b/src/Symfony/Component/CssSelector/Parser.php index 8b499e1a0d..66033c5043 100644 --- a/src/Symfony/Component/CssSelector/Parser.php +++ b/src/Symfony/Component/CssSelector/Parser.php @@ -168,7 +168,7 @@ class Parser * * @throws SyntaxError When expected symbol but got something else * - * @param TokenStream The stream containing the selector. + * @param TokenStream $stream The stream containing the selector. * * @return Node\NodeInterface */ diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php index 3bc133268b..791bdfe6d8 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php @@ -36,7 +36,7 @@ class AnalyzeServiceReferencesPass implements RepeatablePassInterface /** * Constructor. * - * @param boolean $ignoreMethodCalls Sets this Service Reference pass to ignore method calls + * @param boolean $onlyConstructorArguments Sets this Service Reference pass to ignore method calls */ public function __construct($onlyConstructorArguments = false) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php index fc632e7909..bb09da32ef 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php @@ -103,7 +103,7 @@ class CheckReferenceValidityPass implements CompilerPassInterface /** * Validates the scope of a single Reference. * - * @param Reference $reference + * @param Reference $reference * @param Definition $definition * @throws \RuntimeException when there is an issue with the Reference scope */ diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php index 9158d41f68..ab48179139 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php @@ -71,7 +71,7 @@ class Compiler * Adds a pass to the PassConfig. * * @param CompilerPassInterface $pass A compiler pass - * @param string $type The type of the pass + * @param string $type The type of the pass */ public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php index 1341745119..dd15cfe7d5 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php @@ -69,7 +69,7 @@ class InlineServiceDefinitionsPass implements RepeatablePassInterface * Processes inline arguments. * * @param ContainerBuilder $container The ContainerBuilder - * @param array $arguments An array of arguments + * @param array $arguments An array of arguments */ private function inlineArguments(ContainerBuilder $container, array $arguments) { @@ -104,8 +104,8 @@ class InlineServiceDefinitionsPass implements RepeatablePassInterface * Checks if the definition is inlineable. * * @param ContainerBuilder $container - * @param string $id - * @param Definition $definition + * @param string $id + * @param Definition $definition * @return boolean If the definition is inlineable */ private function isInlinableDefinition(ContainerBuilder $container, $id, Definition $definition) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php index ca263d3a5c..9473b788c0 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php @@ -44,7 +44,7 @@ class ResolveDefinitionTemplatesPass implements CompilerPassInterface /** * Resolves the definition * - * @param string $id The definition identifier + * @param string $id The definition identifier * @param DefinitionDecorator $definition * @return Definition */ diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php index 2a0af61409..84d2bd5b39 100644 --- a/src/Symfony/Component/DependencyInjection/Container.php +++ b/src/Symfony/Component/DependencyInjection/Container.php @@ -147,8 +147,8 @@ class Container implements ContainerInterface /** * Sets a parameter. * - * @param string $name The parameter name - * @param mixed $parameters The parameter value + * @param string $name The parameter name + * @param mixed $value The parameter value */ public function setParameter($name, $value) { @@ -201,8 +201,8 @@ class Container implements ContainerInterface * If a service is both defined through a set() method and * with a set*Service() method, the former has always precedence. * - * @param string $id The service identifier - * @param int $invalidBehavior The behavior when the service does not exist + * @param string $id The service identifier + * @param integer $invalidBehavior The behavior when the service does not exist * * @return object The associated service * diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index ae3043d529..a6c317313b 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -266,8 +266,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface /** * Gets a service. * - * @param string $id The service identifier - * @param int $invalidBehavior The behavior when the service does not exist + * @param string $id The service identifier + * @param integer $invalidBehavior The behavior when the service does not exist * * @return object The associated service * @@ -427,7 +427,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface /** * Sets the service aliases. * - * @param array $definitions An array of service definitions + * @param array $aliases An array of service definitions */ public function setAliases(array $aliases) { diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php index 8719a16a9b..e7255703b4 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php +++ b/src/Symfony/Component/DependencyInjection/ContainerInterface.php @@ -80,8 +80,8 @@ interface ContainerInterface /** * Sets a parameter. * - * @param string $name The parameter name - * @param mixed $parameters The parameter value + * @param string $name The parameter name + * @param mixed $value The parameter value */ function setParameter($name, $value); diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php index b44983d61d..09393ccc37 100644 --- a/src/Symfony/Component/DependencyInjection/Definition.php +++ b/src/Symfony/Component/DependencyInjection/Definition.php @@ -411,7 +411,7 @@ class Definition /** * Sets the scope of the service * - * @param string $string Whether the service must be shared or not + * @param string $scope Whether the service must be shared or not * * @return Definition The current instance */ diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index a65447758c..c3270404da 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -834,8 +834,8 @@ EOF; /** * Builds service calls from arguments * - * @param array $arguments - * @param string $calls By reference + * @param array $arguments + * @param string $calls By reference * @param string $behavior By reference * @return void */ @@ -1034,7 +1034,7 @@ EOF; /** * Gets a service call * - * @param string $id + * @param string $id * @param Reference $reference * @return string */ diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php index 1667a967d5..0bdf1dd4e9 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php @@ -196,7 +196,7 @@ class YamlDumper extends Dumper /** * Gets the service call. * - * @param string $id + * @param string $id * @param Reference $reference * @return string */ diff --git a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php index e9ed18975b..928556d486 100644 --- a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php +++ b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php @@ -23,7 +23,7 @@ interface ExtensionInterface /** * Loads a specific configuration. * - * @param array $config An array of configuration values + * @param array $config An array of configuration values * @param ContainerBuilder $container A ContainerBuilder instance * * @throws \InvalidArgumentException When provided tag is not defined in this extension diff --git a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php index 7d319fb27f..fa2456572a 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php @@ -38,8 +38,8 @@ class ClosureLoader extends Loader /** * Loads a Closure. * - * @param \Closure $resource The resource - * @param string $type The resource type + * @param \Closure $closure The resource + * @param string $type The resource type */ public function load($closure, $type = null) { diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php index 34f21b936f..0699ab9817 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php @@ -28,7 +28,7 @@ abstract class FileLoader extends BaseFileLoader * Constructor. * * @param ContainerBuilder $container A ContainerBuilder instance - * @param FileLocator $locator A FileLocator instance + * @param FileLocator $locator A FileLocator instance */ public function __construct(ContainerBuilder $container, FileLocator $locator) { diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php index c1a575bbad..f2bf441d25 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php @@ -26,7 +26,7 @@ class PhpFileLoader extends FileLoader /** * Loads a PHP file. * - * @param mixed $resource The resource + * @param mixed $file The resource * @param string $type The resource type */ public function load($file, $type = null) diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index e203b99998..7885421a5d 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -32,8 +32,8 @@ class YamlFileLoader extends FileLoader /** * Loads a Yaml file. * - * @param mixed $resource The resource - * @param string $type The resource type + * @param mixed $file The resource + * @param string $type The resource type */ public function load($file, $type = null) { diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php index 75d862d5b4..6948ac38f9 100644 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php @@ -83,8 +83,8 @@ class ParameterBag implements ParameterBagInterface /** * Sets a service container parameter. * - * @param string $name The parameter name - * @param mixed $parameters The parameter value + * @param string $name The parameter name + * @param mixed $value The parameter value */ public function set($name, $value) { diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php index fc4a2fa9b2..603f414da9 100644 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php @@ -51,8 +51,8 @@ interface ParameterBagInterface /** * Sets a service container parameter. * - * @param string $name The parameter name - * @param mixed $parameters The parameter value + * @param string $name The parameter name + * @param mixed $value The parameter value */ function set($name, $value); diff --git a/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php b/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php index 19603aec7f..a3cd8011a7 100644 --- a/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php +++ b/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php @@ -32,7 +32,9 @@ class SimpleXMLElement extends \SimpleXMLElement /** * Returns arguments as valid php types. * - * @param string $name + * @param string $name + * @param Boolean $lowercase + * * @return mixed */ public function getArgumentsAsPhp($name, $lowercase = true) diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index 0a269206ec..2120c5bd3a 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -602,8 +602,8 @@ class Crawler extends \SplObjectStorage /** * Returns a Form object for the first node in the list. * - * @param array $arguments An array of values for the form fields - * @param string $method The method for the form + * @param array $values An array of values for the form fields + * @param string $method The method for the form * * @return Form A Form instance * diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php index 10efb7f2a4..9c1f92f6ae 100644 --- a/src/Symfony/Component/DomCrawler/Form.php +++ b/src/Symfony/Component/DomCrawler/Form.php @@ -288,7 +288,7 @@ class Form implements \ArrayAccess /** * Sets a named field. * - * @param string $name The field name + * @param Field\FormField $field The field * * @return FormField The field instance * diff --git a/src/Symfony/Component/Finder/Glob.php b/src/Symfony/Component/Finder/Glob.php index 1d01481473..5e31b75dbd 100644 --- a/src/Symfony/Component/Finder/Glob.php +++ b/src/Symfony/Component/Finder/Glob.php @@ -38,7 +38,9 @@ class Glob /** * Returns a regexp which is the equivalent of the glob pattern. * - * @param string $glob The glob pattern + * @param string $glob The glob pattern + * @param Boolean $strictLeadingDot + * @param Boolean $strictWildcardSlash * * @return string regex The regexp */ diff --git a/src/Symfony/Component/Finder/SplFileInfo.php b/src/Symfony/Component/Finder/SplFileInfo.php index b57d3e057d..6fe003a79c 100644 --- a/src/Symfony/Component/Finder/SplFileInfo.php +++ b/src/Symfony/Component/Finder/SplFileInfo.php @@ -24,9 +24,9 @@ class SplFileInfo extends \SplFileInfo /** * Constructor * - * @param string $fileInfo The file name - * @param string $relativePath The relative path - * @param string $relativePathname The relative path name + * @param string $file The file name + * @param string $relativePath The relative path + * @param string $relativePathname The relative path name */ public function __construct($file, $relativePath, $relativePathname) { diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/PaddedChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/PaddedChoiceList.php index 1b69fded23..5e03e7cdaa 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/PaddedChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/PaddedChoiceList.php @@ -25,10 +25,10 @@ class PaddedChoiceList extends ArrayChoiceList * If the values are shorter than $padLength characters, they are padded with * zeros on the left side. * - * @param array $values The available choices - * @param integer $padLength The length to pad the choices - * @return array An array with the input values as keys and the - * padded values as values + * @param array $values The available choices + * @param integer $padLength The length to pad the choices + * @param string $padString The padding character + * @param integer $padType The direction of padding */ public function __construct($values, $padLength, $padString, $padType = STR_PAD_LEFT) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToBooleanChoicesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToBooleanChoicesTransformer.php index 695cb3e4e0..b6b407b97c 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToBooleanChoicesTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ArrayToBooleanChoicesTransformer.php @@ -33,7 +33,7 @@ class ArrayToBooleanChoicesTransformer implements DataTransformerInterface * depending on whether a given option is selected. If this field is rendered * as select tag, the value is not modified. * - * @param mixed $value An array if "multiple" is set to true, a scalar + * @param mixed $array An array if "multiple" is set to true, a scalar * value otherwise. * @return mixed An array if "expanded" or "multiple" is set to true, * a scalar value otherwise. diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php index bf4d9e05eb..ef65b60d7a 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php @@ -34,8 +34,8 @@ class SessionCsrfProvider extends DefaultCsrfProvider * A recommended value for the secret is a generated value with at least * 32 characters and mixed letters, digits and special characters. * - * @param Session $session The user session - * @param string $secret A secret value included in the CSRF token + * @param Session $session The user session + * @param string $secret A secret value included in the CSRF token */ public function __construct(Session $session, $secret) { diff --git a/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php b/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php index 259d02d5f5..dd672dc75d 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php +++ b/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php @@ -29,7 +29,9 @@ class DelegatingValidator implements FormValidatorInterface } /** - * Validates the form and its domain object + * Validates the form and its domain object. + * + * @param FormInterface $form A FormInterface instance */ public function validate(FormInterface $form) { @@ -184,8 +186,8 @@ class DelegatingValidator implements FormValidatorInterface * * This method is called automatically during the validation process. * - * @param FormInterface $form The validated form - * @param ExecutionContext $context The current validation context + * @param FormInterface $form The validated form + * @param ExecutionContext $context The current validation context */ public static function validateFormData(FormInterface $form, ExecutionContext $context) { diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index f855650b99..7aa000bdaa 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -387,7 +387,7 @@ class Form implements \IteratorAggregate, FormInterface /** * Binds POST data to the field, transforms and validates it. * - * @param string|array $data The POST data + * @param string|array $clientData The POST data */ public function bind($clientData) { @@ -503,8 +503,6 @@ class Form implements \IteratorAggregate, FormInterface * constructor. * * @param Request $request The request to bind to the form - * @param array|object $data The data from which to read default values - * and where to write bound values */ public function bindRequest(Request $request) { diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php index b5399ec9da..f5158b0925 100644 --- a/src/Symfony/Component/Form/FormBuilder.php +++ b/src/Symfony/Component/Form/FormBuilder.php @@ -191,7 +191,7 @@ class FormBuilder /** * Prepends a transformer to the client transformer chain * - * @param DataTransformerInterface $clientTransformer + * @param DataTransformerInterface $normTransformer */ public function prependNormTransformer(DataTransformerInterface $normTransformer = null) { @@ -336,7 +336,9 @@ class FormBuilder * $form->add($locationGroup); * * - * @param FormInterface|string $form + * @param string $name + * @param string|FormTypeInterface $type + * @param array $options * @return FormInterface */ public function add($name, $type = null, array $options = array()) diff --git a/src/Symfony/Component/Form/ReversedTransformer.php b/src/Symfony/Component/Form/ReversedTransformer.php index 0be9946b9d..e966cf5b4a 100644 --- a/src/Symfony/Component/Form/ReversedTransformer.php +++ b/src/Symfony/Component/Form/ReversedTransformer.php @@ -30,7 +30,7 @@ class ReversedTransformer implements DataTransformerInterface /** * Reverses this transformer * - * @param DataTransformerInterface $innerTransformer + * @param DataTransformerInterface $reversedTransformer */ public function __construct(DataTransformerInterface $reversedTransformer) { diff --git a/src/Symfony/Component/Form/Util/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php index bab7c67327..998638341e 100644 --- a/src/Symfony/Component/Form/Util/PropertyPath.php +++ b/src/Symfony/Component/Form/Util/PropertyPath.php @@ -51,7 +51,7 @@ class PropertyPath implements \IteratorAggregate /** * Parses the given property path * - * @param string $this + * @param string $propertyPath */ public function __construct($propertyPath) { @@ -125,6 +125,8 @@ class PropertyPath implements \IteratorAggregate /** * Returns the element at the given index in the property path * + * @param $index The index key + * * @return string A property or index name */ public function getElement($index) @@ -208,7 +210,7 @@ class PropertyPath implements \IteratorAggregate * If neither is found, an exception is thrown. * * @param object|array $objectOrArray The object or array to traverse - * @return mixed The value at the end of the + * @param mixed $value The value at the end of the * property path * @throws InvalidPropertyException If the property/setter does not * exist @@ -346,7 +348,7 @@ class PropertyPath implements \IteratorAggregate /** * Sets the value of the property at the given index in the path * - * @param object $object The object or array to traverse + * @param object $objectOrArray The object or array to traverse * @param integer $currentIndex The index of the modified property in the * path * @param mixed $value The value to set diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php index bf5433984c..4cd4d02dcf 100644 --- a/src/Symfony/Component/HttpFoundation/FileBag.php +++ b/src/Symfony/Component/HttpFoundation/FileBag.php @@ -26,7 +26,7 @@ class FileBag extends ParameterBag /** * Constructor. * - * @param array $headers An array of HTTP files + * @param array $parameters An array of HTTP files */ public function __construct(array $parameters = array()) { diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php index 9b1e476461..43825dae9e 100644 --- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php +++ b/src/Symfony/Component/HttpFoundation/RequestMatcher.php @@ -66,7 +66,7 @@ class RequestMatcher implements RequestMatcherInterface /** * Adds a check for the HTTP method. * - * @param string|array An HTTP method or an array of HTTP methods + * @param string|array $method An HTTP method or an array of HTTP methods */ public function matchMethod($method) { diff --git a/src/Symfony/Component/HttpFoundation/Session.php b/src/Symfony/Component/HttpFoundation/Session.php index cde811c0ae..6d78949958 100644 --- a/src/Symfony/Component/HttpFoundation/Session.php +++ b/src/Symfony/Component/HttpFoundation/Session.php @@ -29,7 +29,7 @@ class Session implements \Serializable /** * Constructor. * - * @param SessionStorageInterface $session A SessionStorageInterface instance + * @param SessionStorageInterface $storage A SessionStorageInterface instance * @param string $defaultLocale The default locale */ public function __construct(SessionStorageInterface $storage, $defaultLocale = 'en') diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php index 8d6fc3cd54..f4fdc5aace 100644 --- a/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php @@ -100,7 +100,8 @@ class NativeSessionStorage implements SessionStorageInterface * * The preferred format for a key is directory style so naming conflicts can be avoided. * - * @param string $key A unique key identifying your data + * @param string $key A unique key identifying your data + * @param string $default Default value * * @return mixed Data associated with the key */ diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php index 3985d4bdd9..dd78f8f865 100644 --- a/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php @@ -25,7 +25,7 @@ class PdoSessionStorage extends NativeSessionStorage /** * Constructor. * - * @param \PDO $pdo A PDO instance + * @param \PDO $db A PDO instance * @param array $options An associative array of session options * @param array $dbOptions An associative array of DB options * diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php index 2c6ad0e885..2ad1ff9f87 100644 --- a/src/Symfony/Component/HttpKernel/Client.php +++ b/src/Symfony/Component/HttpKernel/Client.php @@ -91,7 +91,7 @@ EOF; /** * Converts the BrowserKit request to a HttpKernel request. * - * @param Request $request A Request instance + * @param DomRequest $request A Request instance * * @return Request A Request instance */ diff --git a/src/Symfony/Component/HttpKernel/Config/FileLocator.php b/src/Symfony/Component/HttpKernel/Config/FileLocator.php index 387a4a9428..6cc615ca94 100644 --- a/src/Symfony/Component/HttpKernel/Config/FileLocator.php +++ b/src/Symfony/Component/HttpKernel/Config/FileLocator.php @@ -29,7 +29,7 @@ class FileLocator extends BaseFileLocator * * @param KernelInterface $kernel A KernelInterface instance * @param string $path The path the global resource directory - * @param string|array $paths A path or an array of paths where to look for resources + * @param string|array $paths A path or an array of paths where to look for resources */ public function __construct(KernelInterface $kernel, $path = null, array $paths = array()) { diff --git a/src/Symfony/Component/HttpKernel/HttpCache/EsiListener.php b/src/Symfony/Component/HttpKernel/HttpCache/EsiListener.php index 95dea40830..3fe1d11b8f 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/EsiListener.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/EsiListener.php @@ -38,7 +38,7 @@ class EsiListener /** * Filters the Response. * - * @param FilterResponseEvent $event A FilterResponseEvent instance + * @param FilterResponseEvent $event A FilterResponseEvent instance */ public function onCoreResponse(FilterResponseEvent $event) { diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index d27e85da73..6beaeb0a6a 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -68,10 +68,10 @@ class HttpCache implements HttpKernelInterface * This setting is overridden by the stale-if-error HTTP Cache-Control extension * (see RFC 5861). * - * @param HttpKernelInterface $kernel An HttpKernelInterface instance - * @param StoreInterface $store A Store instance - * @param Esi $esi An Esi instance - * @param array $options An array of options + * @param HttpKernelInterface $kernel An HttpKernelInterface instance + * @param StoreInterface $store A Store instance + * @param Esi $esi An Esi instance + * @param array $options An array of options */ public function __construct(HttpKernelInterface $kernel, StoreInterface $store, Esi $esi = null, array $options = array()) { @@ -201,7 +201,7 @@ class HttpCache implements HttpKernelInterface * Forwards the Request to the backend without storing the Response in the cache. * * @param Request $request A Request instance - * @param Boolean $catch whether to process exceptions + * @param Boolean $catch Whether to process exceptions * * @return Response A Response instance */ @@ -216,7 +216,7 @@ class HttpCache implements HttpKernelInterface * Invalidates non-safe methods (like POST, PUT, and DELETE). * * @param Request $request A Request instance - * @param Boolean $catch whether to process exceptions + * @param Boolean $catch Whether to process exceptions * * @return Response A Response instance * @@ -364,8 +364,8 @@ class HttpCache implements HttpKernelInterface * * This methods is triggered when the cache missed or a reload is required. * - * @param Request $request A Request instance - * @param Boolean $catch whether to process exceptions + * @param Request $request A Request instance + * @param Boolean $catch whether to process exceptions * * @return Response A Response instance */ @@ -398,9 +398,9 @@ class HttpCache implements HttpKernelInterface /** * Forwards the Request to the backend and returns the Response. * - * @param Request $request A Request instance - * @param Boolean $catch Whether to catch exceptions or not - * @param Response $response A Response instance (the stale entry if present, null otherwise) + * @param Request $request A Request instance + * @param Boolean $catch Whether to catch exceptions or not + * @param Response $entry A Response instance (the stale entry if present, null otherwise) * * @return Response A Response instance */ @@ -537,6 +537,7 @@ class HttpCache implements HttpKernelInterface /** * Restores the Response body. * + * @param Request $request A Request instance * @param Response $response A Response instance * * @return Response A Response instance @@ -610,7 +611,8 @@ class HttpCache implements HttpKernelInterface /** * Records that an event took place. * - * @param string $event The event name + * @param Request $request A Request instance + * @param string $event The event name */ private function record(Request $request, $event) { diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php index 26d013874c..2c4a43454a 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpKernel.php @@ -35,8 +35,8 @@ class HttpKernel implements HttpKernelInterface /** * Constructor * - * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance - * @param ControllerResolverInterface $resolver A ControllerResolverInterface instance + * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance + * @param ControllerResolverInterface $resolver A ControllerResolverInterface instance */ public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver) { @@ -78,7 +78,7 @@ class HttpKernel implements HttpKernelInterface * Exceptions are not caught. * * @param Request $request A Request instance - * @param integer $type The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST) + * @param integer $type The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST) * * @return Response A Response instance * diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 8a2da2f19f..d996da2f3f 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -565,10 +565,10 @@ abstract class Kernel implements KernelInterface /** * Dumps the service container to PHP code in the cache. * - * @param ConfigCache $cache The config cache - * @param ContainerBuilder $container The service container - * @param string $class The name of the class to generate - * @param string $baseClass The name of the container's base class + * @param ConfigCache $cache The config cache + * @param ContainerBuilder $container The service container + * @param string $class The name of the class to generate + * @param string $baseClass The name of the container's base class */ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container, $class, $baseClass) { diff --git a/src/Symfony/Component/HttpKernel/Test/WebTestCase.php b/src/Symfony/Component/HttpKernel/Test/WebTestCase.php index 59e69a71a4..06dfffd363 100644 --- a/src/Symfony/Component/HttpKernel/Test/WebTestCase.php +++ b/src/Symfony/Component/HttpKernel/Test/WebTestCase.php @@ -24,9 +24,8 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase /** * Creates a Client. * - * @param array $options An array of options to pass to the createKernel class - * @param Boolean $debug The debug flag - * @param array $server An array of server parameters + * @param array $options An array of options to pass to the createKernel class + * @param array $server An array of server parameters * * @return Client A Client instance */ diff --git a/src/Symfony/Component/HttpKernel/Util/Filesystem.php b/src/Symfony/Component/HttpKernel/Util/Filesystem.php index 7273273487..e025fb1481 100644 --- a/src/Symfony/Component/HttpKernel/Util/Filesystem.php +++ b/src/Symfony/Component/HttpKernel/Util/Filesystem.php @@ -25,9 +25,9 @@ class Filesystem * * By default, if the target already exists, it is not overridden. * - * @param string $originFile The original filename - * @param string $targetFile The target filename - * @param array $override Whether to override an existing file or not + * @param string $originFile The original filename + * @param string $targetFile The target filename + * @param array $override Whether to override an existing file or not */ public function copy($originFile, $targetFile, $override = false) { @@ -143,9 +143,9 @@ class Filesystem /** * Creates a symbolic link or copy a directory. * - * @param string $originDir The origin directory path - * @param string $targetDir The symbolic link name - * @param Boolean $copyOnWindows Whether to copy files if on windows + * @param string $originDir The origin directory path + * @param string $targetDir The symbolic link name + * @param Boolean $copyOnWindows Whether to copy files if on windows */ public function symlink($originDir, $targetDir, $copyOnWindows = false) { diff --git a/src/Symfony/Component/Locale/Exception/MethodNotImplementedException.php b/src/Symfony/Component/Locale/Exception/MethodNotImplementedException.php index 3d598681e5..4c3ec97611 100644 --- a/src/Symfony/Component/Locale/Exception/MethodNotImplementedException.php +++ b/src/Symfony/Component/Locale/Exception/MethodNotImplementedException.php @@ -19,7 +19,7 @@ class MethodNotImplementedException extends NotImplementedException /** * Constructor * - * @param string $message The exception message. A note to install the intl extension is appended to this string + * @param string $methodName The name of the method */ public function __construct($methodName) { diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php index 5a8e6c27ca..33814787e7 100644 --- a/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php +++ b/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php @@ -255,9 +255,9 @@ class FullTransformer * Calculates the Unix timestamp based on the matched values by the reverse matching regular * expression of parse() * - * @param DateTime $dateTime The DateTime object to be used to calculate the timestamp - * @param array $options An array with the matched values to be used to calculate the timestamp - * @return bool|int The calculated timestamp or false if matched date is invalid + * @param DateTime $dateTime The DateTime object to be used to calculate the timestamp + * @param array $options An array with the matched values to be used to calculate the timestamp + * @return bool|int The calculated timestamp or false if matched date is invalid */ protected function calculateUnixTimestamp(\DateTime $dateTime, array $options) { diff --git a/src/Symfony/Component/Locale/Stub/StubLocale.php b/src/Symfony/Component/Locale/Stub/StubLocale.php index 810da014de..c8bef57bfd 100644 --- a/src/Symfony/Component/Locale/Stub/StubLocale.php +++ b/src/Symfony/Component/Locale/Stub/StubLocale.php @@ -135,6 +135,8 @@ class StubLocale /** * Returns the currencies data * + * @param string $locale + * * @return array The currencies data */ static public function getCurrenciesData($locale) @@ -203,8 +205,9 @@ class StubLocale /** * Checks if a language tag filter matches with locale * - * @param string $langtag The language tag to check - * @param string $locale The language range to check against + * @param string $langtag The language tag to check + * @param string $locale The language range to check against + * @param Boolean $canonicalize * @return string The corresponding locale code * @see http://www.php.net/manual/en/locale.filtermatches.php * @throws MethodNotImplementedException diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php index 5c02f2f69d..095fcf127c 100644 --- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php +++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php @@ -30,8 +30,8 @@ class UrlGenerator implements UrlGeneratorInterface /** * Constructor. * - * @param RouteCollection $routes A RouteCollection instance - * @param RequestContext $context The context + * @param RouteCollection $routes A RouteCollection instance + * @param RequestContext $context The context */ public function __construct(RouteCollection $routes, RequestContext $context) { @@ -43,7 +43,7 @@ class UrlGenerator implements UrlGeneratorInterface /** * Sets the request context. * - * @param RequestContext $context The context + * @param RequestContext $context The context */ public function setContext(RequestContext $context) { diff --git a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php index e229fa71ea..16b9d4af6b 100644 --- a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php +++ b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php @@ -21,9 +21,9 @@ interface UrlGeneratorInterface /** * Generates a URL from the given parameters. * - * @param string $name The name of the route - * @param array $parameters An array of parameters - * @param Boolean $absolute Whether to generate an absolute URL + * @param string $name The name of the route + * @param array $parameters An array of parameters + * @param Boolean $absolute Whether to generate an absolute URL * * @return string The generated URL */ diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php index 3d7dbac5c6..be49873c71 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php @@ -29,8 +29,9 @@ class AnnotationFileLoader extends FileLoader /** * Constructor. * - * @param AnnotationClassLoader $loader An AnnotationClassLoader instance - * @param string|array $paths A path or an array of paths where to look for resources + * @param FileLocator $locator A FileLocator instance + * @param AnnotationClassLoader $loader An AnnotationClassLoader instance + * @param string|array $paths A path or an array of paths where to look for resources */ public function __construct(FileLocator $locator, AnnotationClassLoader $loader, $paths = array()) { diff --git a/src/Symfony/Component/Routing/Loader/PhpFileLoader.php b/src/Symfony/Component/Routing/Loader/PhpFileLoader.php index 146dd633ac..d72d4de927 100644 --- a/src/Symfony/Component/Routing/Loader/PhpFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/PhpFileLoader.php @@ -26,8 +26,8 @@ class PhpFileLoader extends FileLoader /** * Loads a PHP file. * - * @param mixed $resource A PHP file path - * @param string $type The resource type + * @param mixed $file A PHP file path + * @param string $type The resource type */ public function load($file, $type = null) { diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php index aa1ddf4db6..52c9dfceba 100644 --- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php @@ -31,8 +31,8 @@ class UrlMatcher implements UrlMatcherInterface /** * Constructor. * - * @param RouteCollection $routes A RouteCollection instance - * @param RequestContext $context The context + * @param RouteCollection $routes A RouteCollection instance + * @param RequestContext $context The context */ public function __construct(RouteCollection $routes, RequestContext $context) { diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php index bcd54e506e..7525f728b6 100644 --- a/src/Symfony/Component/Routing/Route.php +++ b/src/Symfony/Component/Routing/Route.php @@ -214,6 +214,7 @@ class Route /** * Returns the requirement for the given key. * + * @param string $key The key * @return string The regex */ public function getRequirement($key) @@ -224,8 +225,8 @@ class Route /** * Sets a requirement for the given key. * - * @param string The key - * @param string The regex + * @param string $key The key + * @param string $regex The regex */ public function setRequirement($key, $regex) { diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php index 6459fc658e..003e46d3c1 100644 --- a/src/Symfony/Component/Routing/Router.php +++ b/src/Symfony/Component/Routing/Router.php @@ -40,10 +40,10 @@ class Router implements RouterInterface * * debug: Whether to enable debugging or not (false by default) * * resource_type: Type hint for the main resource (optional) * - * @param LoaderInterface $loader A LoaderInterface instance + * @param LoaderInterface $loader A LoaderInterface instance * @param mixed $resource The main resource to load * @param array $options An array of options - * @param array $context The context + * @param RequestContext $context The context * @param array $defaults The default values * * @throws \InvalidArgumentException When unsupported option is provided diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php index 210c7f131a..956fdd77f8 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php @@ -46,12 +46,12 @@ class AclProvider implements AclProviderInterface private $permissionGrantingStrategy; /** - * Constructor + * Constructor. * - * @param Connection $connection + * @param Connection $connection * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy - * @param array $options - * @param AclCacheInterface $cache + * @param array $options + * @param AclCacheInterface $cache */ public function __construct(Connection $connection, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $options, AclCacheInterface $cache = null) { @@ -280,7 +280,7 @@ SELECTCLAUSE; * object identities. * * @param ObjectIdentityInterface $oid - * @param Boolean $directChildrenOnly + * @param Boolean $directChildrenOnly * @return string */ protected function getFindChildrenSql(ObjectIdentityInterface $oid, $directChildrenOnly) @@ -441,8 +441,8 @@ QUERY; * performance of the entire ACL system. * * @param Statement $stmt - * @param array $oidLookup - * @param array $sids + * @param array $oidLookup + * @param array $sids * @throws \RuntimeException * @return \SplObjectStorage */ diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php index 09bcb34390..661b892d0f 100644 --- a/src/Symfony/Component/Security/Acl/Domain/Acl.php +++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php @@ -51,11 +51,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Constructor * - * @param integer $id - * @param ObjectIdentityInterface $objectIdentity + * @param integer $id + * @param ObjectIdentityInterface $objectIdentity * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy - * @param array $loadedSids - * @param Boolean $entriesInheriting + * @param array $loadedSids + * @param Boolean $entriesInheriting * @return void */ public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids = array(), $entriesInheriting) @@ -453,12 +453,12 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Inserts an ACE * - * @param string $property - * @param integer $index - * @param integer $mask + * @param string $property + * @param integer $index + * @param integer $mask * @param SecurityIdentityInterface $sid - * @param Boolean $granting - * @param string $strategy + * @param Boolean $granting + * @param string $strategy * @throws \OutOfBoundsException * @throws \InvalidArgumentException * @return void @@ -502,13 +502,13 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Inserts a field-based ACE * - * @param string $property - * @param integer $index - * @param string $field - * @param integer $mask + * @param string $property + * @param integer $index + * @param string $field + * @param integer $mask * @param SecurityIdentityInterface $sid - * @param Boolean $granting - * @param string $strategy + * @param Boolean $granting + * @param string $strategy * @throws \InvalidArgumentException * @throws \OutOfBoundsException * @return void @@ -665,9 +665,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * Called when a property of an ACE associated with this ACL changes * * @param EntryInterface $entry - * @param string $name - * @param mixed $oldValue - * @param mixed $newValue + * @param string $name + * @param mixed $oldValue + * @param mixed $newValue * @return void */ private function onEntryPropertyChanged(EntryInterface $entry, $name, $oldValue, $newValue) diff --git a/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php index f3fe6f0b09..6614724d94 100644 --- a/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php +++ b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php @@ -27,10 +27,10 @@ class AclCollectionCache private $securityIdentityRetrievalStrategy; /** - * Constructor + * Constructor. * - * @param AclProviderInterface $aclProvider - * @param ObjectIdentityRetrievalStrategy $oidRetrievalStrategy + * @param AclProviderInterface $aclProvider + * @param ObjectIdentityRetrievalStrategy $oidRetrievalStrategy * @param SecurityIdentityRetrievalStrategy $sidRetrievalStrategy * @return void */ diff --git a/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php b/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php index 0a4773fee7..9f95d06a67 100644 --- a/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php +++ b/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php @@ -25,7 +25,7 @@ abstract class AuditLogger implements AuditLoggerInterface /** * Performs some checks if logging was requested * - * @param Boolean $granted + * @param Boolean $granted * @param EntryInterface $ace * @return void */ diff --git a/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php b/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php index eb18986a8c..64241e2b87 100644 --- a/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php +++ b/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php @@ -33,9 +33,10 @@ class DoctrineAclCache implements AclCacheInterface /** * Constructor * - * @param Cache $cache + * @param Cache $cache * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy - * @param string $prefix + * @param string $prefix + * * @return void */ public function __construct(Cache $cache, PermissionGrantingStrategyInterface $permissionGrantingStrategy, $prefix = self::PREFIX) diff --git a/src/Symfony/Component/Security/Acl/Domain/Entry.php b/src/Symfony/Component/Security/Acl/Domain/Entry.php index 7498b035d6..c5226a450e 100644 --- a/src/Symfony/Component/Security/Acl/Domain/Entry.php +++ b/src/Symfony/Component/Security/Acl/Domain/Entry.php @@ -35,14 +35,14 @@ class Entry implements AuditableEntryInterface /** * Constructor * - * @param integer $id - * @param AclInterface $acl + * @param integer $id + * @param AclInterface $acl * @param SecurityIdentityInterface $sid - * @param string $strategy - * @param integer $mask - * @param Boolean $granting - * @param Boolean $auditFailure - * @param Boolean $auditSuccess + * @param string $strategy + * @param integer $mask + * @param Boolean $granting + * @param Boolean $auditFailure + * @param Boolean $auditSuccess */ public function __construct($id, AclInterface $acl, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess) { diff --git a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php b/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php index 1510df2411..5ff69217fb 100644 --- a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php +++ b/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php @@ -27,15 +27,15 @@ class FieldEntry extends Entry implements FieldEntryInterface /** * Constructor * - * @param integer $id - * @param AclInterface $acl - * @param string $field + * @param integer $id + * @param AclInterface $acl + * @param string $field * @param SecurityIdentityInterface $sid - * @param string $strategy - * @param integer $mask - * @param Boolean $granting - * @param Boolean $auditFailure - * @param Boolean $auditSuccess + * @param string $strategy + * @param integer $mask + * @param Boolean $granting + * @param Boolean $auditFailure + * @param Boolean $auditSuccess * @return void */ public function __construct($id, AclInterface $acl, $field, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess) diff --git a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php index 2cb1352bf7..f55f8a51e0 100644 --- a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php +++ b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php @@ -26,7 +26,7 @@ class ObjectIdentity implements ObjectIdentityInterface private $type; /** - * Constructor + * Constructor. * * @param string $identifier * @param string $type diff --git a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php index 37bbe4eb0f..2cc23bd079 100644 --- a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php @@ -129,10 +129,10 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface * access finally. * * @param AclInterface $acl - * @param array $aces an array of ACE to check against - * @param array $masks an array of permission masks - * @param array $sids an array of SecurityIdentityInterface implementations - * @param Boolean $administrativeMode true turns off audit logging + * @param array $aces An array of ACE to check against + * @param array $masks An array of permission masks + * @param array $sids An array of SecurityIdentityInterface implementations + * @param Boolean $administrativeMode True turns off audit logging * @return Boolean true, or false; either granting, or denying access respectively. */ private function hasSufficientPermissions(AclInterface $acl, array $aces, array $masks, array $sids, $administrativeMode) @@ -189,7 +189,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface * Strategy EQUAL: * The ACE will be considered applicable when the bitmasks are equal. * - * @param integer $requiredMask + * @param integer $requiredMask * @param EntryInterface $ace * @return Boolean */ diff --git a/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php index 1252a0f7e9..d16a978338 100644 --- a/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php @@ -33,8 +33,9 @@ class SecurityIdentityRetrievalStrategy implements SecurityIdentityRetrievalStra /** * Constructor * - * @param RoleHierarchyInterface $roleHierarchy + * @param RoleHierarchyInterface $roleHierarchy * @param AuthenticationTrustResolver $authenticationTrustResolver + * * @return void */ public function __construct(RoleHierarchyInterface $roleHierarchy, AuthenticationTrustResolver $authenticationTrustResolver) diff --git a/src/Symfony/Component/Security/Acl/Model/AclInterface.php b/src/Symfony/Component/Security/Acl/Model/AclInterface.php index a9cfc5a19a..e8119fea5c 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AclInterface.php @@ -77,9 +77,9 @@ interface AclInterface extends \Serializable /** * Determines whether field access is granted * - * @param string $field - * @param array $masks - * @param array $securityIdentities + * @param string $field + * @param array $masks + * @param array $securityIdentities * @param Boolean $administrativeMode * @return Boolean */ @@ -89,8 +89,8 @@ interface AclInterface extends \Serializable * Determines whether access is granted * * @throws NoAceFoundException when no ACE was applicable for this request - * @param array $masks - * @param array $securityIdentities + * @param array $masks + * @param array $securityIdentities * @param Boolean $administrativeMode * @return Boolean */ diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php index fdd671236b..9a64709eda 100644 --- a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php @@ -66,10 +66,10 @@ interface MutableAclInterface extends AclInterface * Inserts a class-based ACE * * @param SecurityIdentityInterface $sid - * @param integer $mask - * @param integer $index - * @param Boolean $granting - * @param string $strategy + * @param integer $mask + * @param integer $index + * @param Boolean $granting + * @param string $strategy * @return void */ function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -77,12 +77,12 @@ interface MutableAclInterface extends AclInterface /** * Inserts a class-field-based ACE * - * @param string $field + * @param string $field * @param SecurityIdentityInterface $sid - * @param integer $mask - * @param integer $index - * @param Boolean $granting - * @param string $strategy + * @param integer $mask + * @param integer $index + * @param Boolean $granting + * @param string $strategy * @return void */ function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -91,10 +91,10 @@ interface MutableAclInterface extends AclInterface * Inserts an object-based ACE * * @param SecurityIdentityInterface $sid - * @param integer $mask - * @param integer $index - * @param Boolean $granting - * @param string $strategy + * @param integer $mask + * @param integer $index + * @param Boolean $granting + * @param string $strategy * @return void */ function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -102,12 +102,12 @@ interface MutableAclInterface extends AclInterface /** * Inserts an object-field-based ACE * - * @param string $field + * @param string $field * @param SecurityIdentityInterface $sid - * @param integer $mask - * @param integer $index - * @param Boolean $granting - * @param string $strategy + * @param integer $mask + * @param integer $index + * @param Boolean $granting + * @param string $strategy * @return void */ function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); diff --git a/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php b/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php index 5cf10e6cc3..882eb0854b 100644 --- a/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php @@ -33,10 +33,11 @@ interface PermissionGrantingStrategyInterface * Determines whether access to a domain object's field is to be granted * * @param AclInterface $acl - * @param string $field - * @param array $masks - * @param array $sids - * @param Boolean $administrativeMode + * @param string $field + * @param array $masks + * @param array $sids + * @param Boolean $administrativeMode + * * @return Boolean */ function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false); diff --git a/src/Symfony/Component/Security/Acl/Voter/AclVoter.php b/src/Symfony/Component/Security/Acl/Voter/AclVoter.php index 9ae4c04529..7bd8610f24 100644 --- a/src/Symfony/Component/Security/Acl/Voter/AclVoter.php +++ b/src/Symfony/Component/Security/Acl/Voter/AclVoter.php @@ -138,6 +138,8 @@ class AclVoter implements VoterInterface * You can override this method when writing a voter for a specific domain * class. * + * @param string $class The class name + * * @return Boolean */ public function supportsClass($class) diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php index fa08955969..f9e8b385d3 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php @@ -35,9 +35,11 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider /** * Constructor. * - * @param UserProviderInterface $userProvider A UserProviderInterface instance - * @param UserCheckerInterface $userChecker An UserCheckerInterface instance - * @param EncoderFactoryInterface $encoderFactory A EncoderFactoryInterface instance + * @param UserProviderInterface $userProvider An UserProviderInterface instance + * @param UserCheckerInterface $userChecker An UserCheckerInterface instance + * @param string $providerKey The provider key + * @param EncoderFactoryInterface $encoderFactory An EncoderFactoryInterface instance + * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not */ public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey, EncoderFactoryInterface $encoderFactory, $hideUserNotFoundExceptions = true) { diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php index bf2df864ae..e4bf963e96 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php @@ -37,8 +37,9 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn /** * Constructor. * - * @param UserProviderInterface $userProvider A UserProviderInterface instance - * @param UserCheckerInterface $userChecker An UserCheckerInterface instance + * @param UserProviderInterface $userProvider An UserProviderInterface instance + * @param UserCheckerInterface $userChecker An UserCheckerInterface instance + * @param string $providerKey The provider key */ public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey) { diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php index 7b6079d83d..8183c622da 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php @@ -34,8 +34,9 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter /** * Constructor. * - * @param UserCheckerInterface $userChecker An UserCheckerInterface interface - * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not + * @param UserCheckerInterface $userChecker An UserCheckerInterface interface + * @param string $providerKey A provider key + * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not */ public function __construct(UserCheckerInterface $userChecker, $providerKey, $hideUserNotFoundExceptions = true) { @@ -110,8 +111,8 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter * Does additional checks on the user and token (like validating the * credentials). * - * @param UserInterface $user The retrieved UserInterface instance - * @param UsernamePasswordToken $token The UsernamePasswordToken token to be authenticated + * @param UserInterface $user The retrieved UserInterface instance + * @param UsernamePasswordToken $token The UsernamePasswordToken token to be authenticated * * @throws AuthenticationException if the credentials could not be validated */ diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php index 0e8f7d26a0..55e6b89fe7 100644 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php @@ -27,10 +27,10 @@ final class PersistentToken implements PersistentTokenInterface /** * Constructor * - * @param string $class - * @param string $username - * @param string $series - * @param string $tokenValue + * @param string $class + * @param string $username + * @param string $series + * @param string $tokenValue * @param DateTime $lastUsed */ public function __construct($class, $username, $series, $tokenValue, \DateTime $lastUsed) diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php index 780a5447c7..1ec9c8026b 100644 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php @@ -37,8 +37,8 @@ interface TokenProviderInterface /** * Updates the token according to this data * - * @param string $series - * @param string $tokenValue + * @param string $series + * @param string $tokenValue * @param DateTime $lastUsed */ function updateToken($series, $tokenValue, \DateTime $lastUsed); diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php index 67311db3e4..6c6ed5b693 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php @@ -24,8 +24,12 @@ class UsernamePasswordToken extends AbstractToken /** * Constructor. * - * @param string $user The username (like a nickname, email address, etc.) + * @param string $user The username (like a nickname, email address, etc.) * @param string $credentials This usually is the password of the user + * @param string $providerKey The provider key + * @param array $roles An array of roles + * + * @throws \InvalidArgumentException */ public function __construct($user, $credentials, $providerKey, array $roles = array()) { diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php index c1b643e643..a8bb5cfec7 100644 --- a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php +++ b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php @@ -30,9 +30,10 @@ class AccessDecisionManager implements AccessDecisionManagerInterface /** * Constructor. * - * @param VoterInterface[] $voters An array of VoterInterface instances - * @param string $strategy The vote strategy - * @param Boolean $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not + * @param VoterInterface[] $voters An array of VoterInterface instances + * @param string $strategy The vote strategy + * @param Boolean $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not + * @param Boolean $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals */ public function __construct(array $voters, $strategy = 'affirmative', $allowIfAllAbstainDecisions = false, $allowIfEqualGrantedDeniedDecisions = true) { diff --git a/src/Symfony/Component/Security/Core/SecurityContext.php b/src/Symfony/Component/Security/Core/SecurityContext.php index 2910e3b44c..c88f54fee7 100644 --- a/src/Symfony/Component/Security/Core/SecurityContext.php +++ b/src/Symfony/Component/Security/Core/SecurityContext.php @@ -36,7 +36,9 @@ class SecurityContext implements SecurityContextInterface /** * Constructor. * + * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManager instance * @param AccessDecisionManagerInterface|null $accessDecisionManager An AccessDecisionManager instance + * @param Boolean $alwaysAuthenticate */ public function __construct(AuthenticationManagerInterface $authenticationManager, AccessDecisionManagerInterface $accessDecisionManager, $alwaysAuthenticate = false) { diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php index 26b4080700..e73eb9522b 100644 --- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php +++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php @@ -33,7 +33,6 @@ class InMemoryUserProvider implements UserProviderInterface * an array of attributes: 'password', 'enabled', and 'roles'. * * @param array $users An array of users - * @param string $name */ public function __construct(array $users = array()) { diff --git a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php index 2650a07ef4..12f077fc0f 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php @@ -33,8 +33,8 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface * Constructor * * @param HttpKernelInterface $kernel - * @param string $loginPath The path to the login form - * @param Boolean $useForward Whether to forward or redirect to the login form + * @param string $loginPath The path to the login form + * @param Boolean $useForward Whether to forward or redirect to the login form */ public function __construct(HttpKernelInterface $kernel, $loginPath, $useForward = false) { diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php index d5af39b5c6..774303dc5a 100644 --- a/src/Symfony/Component/Security/Http/Firewall.php +++ b/src/Symfony/Component/Security/Http/Firewall.php @@ -35,7 +35,8 @@ class Firewall /** * Constructor. * - * @param FirewallMap $map A FirewallMap instance + * @param FirewallMap $map A FirewallMap instance + * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance */ public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher) { diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php index 67c43d5349..8ff9c8b351 100644 --- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php @@ -36,9 +36,10 @@ class LogoutListener implements ListenerInterface /** * Constructor * - * @param SecurityContextInterface $securityContext - * @param string $logoutPath The path that starts the logout process - * @param string $targetUrl The URL to redirect to after logout + * @param SecurityContextInterface $securityContext + * @param string $logoutPath The path that starts the logout process + * @param string $targetUrl The URL to redirect to after logout + * @param LogoutSuccessHandlerInterface $successHandler */ public function __construct(SecurityContextInterface $securityContext, $logoutPath, $targetUrl = '/', LogoutSuccessHandlerInterface $successHandler = null) { diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php index db8910bf04..10ed8c66b6 100644 --- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php @@ -43,11 +43,11 @@ class RememberMeListener implements ListenerInterface /** * Constructor * - * @param SecurityContext $securityContext - * @param RememberMeServicesInterface $rememberMeServices + * @param SecurityContext $securityContext + * @param RememberMeServicesInterface $rememberMeServices * @param AuthenticationManagerInterface $authenticationManager - * @param LoggerInterface $logger - * @param EventDispatcherInterface $dispatcher + * @param LoggerInterface $logger + * @param EventDispatcherInterface $dispatcher */ public function __construct(SecurityContext $securityContext, RememberMeServicesInterface $rememberMeServices, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null) { diff --git a/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php b/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php index ebdcbed2c8..65b45f2db6 100644 --- a/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php +++ b/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php @@ -36,8 +36,8 @@ class CookieClearingLogoutHandler implements LogoutHandlerInterface /** * Implementation for the LogoutHandlerInterface. Deletes all requested cookies. * - * @param Request $request - * @param Response $response + * @param Request $request + * @param Response $response * @param TokenInterface $token * @return void */ diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php b/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php index 1d420b05c8..e3f09958f6 100644 --- a/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php @@ -27,8 +27,8 @@ interface LogoutHandlerInterface * to be logged out. Usually, you would unset session variables, or remove * cookies, etc. * - * @param Request $request - * @param Response $response + * @param Request $request + * @param Response $response * @param TokenInterface $token * @return void */ diff --git a/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php b/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php index fad77da5af..bfb5ecd75f 100644 --- a/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php +++ b/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php @@ -25,8 +25,8 @@ class SessionLogoutHandler implements LogoutHandlerInterface /** * Invalidate the current session * - * @param Request $request - * @param Response $response + * @param Request $request + * @param Response $response * @param TokenInterface $token * @return void */ diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index b090e24f6b..a7c63efea2 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -44,8 +44,10 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface /** * Constructor * - * @param array $userProviders - * @param array $options + * @param array $userProviders + * @param string $key + * @param string $providerKey + * @param array $options * @param LoggerInterface $logger */ public function __construct(array $userProviders, $key, $providerKey, array $options = array(), LoggerInterface $logger = null) @@ -140,8 +142,8 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface /** * Implementation for LogoutHandlerInterface. Deletes the cookie. * - * @param Request $request - * @param Response $response + * @param Request $request + * @param Response $response * @param TokenInterface $token * @return void */ @@ -167,9 +169,9 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * Implementation for RememberMeServicesInterface. This is called when an * authentication is successful. * - * @param Request $request - * @param Response $response - * @param TokenInterface $token The token that resulted in a successful authentication + * @param Request $request + * @param Response $response + * @param TokenInterface $token The token that resulted in a successful authentication * @return void */ public final function loginSuccess(Request $request, Response $response, TokenInterface $token) @@ -201,7 +203,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * Subclasses should validate the cookie and do any additional processing * that is required. This is called from autoLogin(). * - * @param array $cookieParts + * @param array $cookieParts * @param Request $request * @return TokenInterface */ @@ -216,8 +218,8 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * requested remember-me capabilities. The implementation usually sets a * cookie and possibly stores a persistent record of it. * - * @param Request $request - * @param Response $response + * @param Request $request + * @param Response $response * @param TokenInterface $token * @return void */ diff --git a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php index c740d28d81..5c56c18077 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php +++ b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php @@ -74,8 +74,8 @@ interface RememberMeServicesInterface * (such as a HTTP POST parameter) that indicates the browser has explicitly * requested for the authentication to be remembered. * - * @param Request $request - * @param Response $response + * @param Request $request + * @param Response $response * @param TokenInterface $token * @return void */ diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index 0b941ad712..0a0ea5d84b 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -257,9 +257,10 @@ class XmlEncoder extends AbstractEncoder implements DecoderInterface /** * Selects the type of node to create and appends it to the parent. * - * @param $parentNode - * @param $data - * @param $nodename + * @param DOMNode $parentNode + * @param array|object $data + * @param string $nodename + * @param string $key * @return void */ private function appendNode($parentNode, $data, $nodeName, $key = null) diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php index 7a1d306c98..ecbf5f061e 100644 --- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php @@ -39,9 +39,9 @@ class CustomNormalizer extends AbstractNormalizer /** * Checks if the given class implements the NormalizableInterface. * - * @param ReflectionClass $class A ReflectionClass instance of the class - * to serialize into or from. - * @param string $format The format being (de-)serialized from or into. + * @param ReflectionClass $class A ReflectionClass instance of the class + * to serialize into or from. + * @param string $format The format being (de-)serialized from or into. * @return Boolean */ public function supports(\ReflectionClass $class, $format = null) diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php index da41892bcf..b4bf69e3df 100644 --- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php @@ -110,9 +110,9 @@ class GetSetMethodNormalizer extends AbstractNormalizer /** * Checks if the given class has any get{Property} method. * - * @param ReflectionClass $class A ReflectionClass instance of the class - * to serialize into or from. - * @param string $format The format being (de-)serialized from or into. + * @param ReflectionClass $class A ReflectionClass instance of the class + * to serialize into or from. + * @param string $format The format being (de-)serialized from or into. * @return Boolean Whether the class has any getters. */ public function supports(\ReflectionClass $class, $format = null) diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php index 2cbae9ccaa..9a33861084 100644 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php @@ -46,8 +46,10 @@ interface NormalizerInterface * Checks whether the given class is supported by this normalizer * * @param ReflectionClass $class - * @param string $format format the given data was extracted from + * @param string $format format the given data was extracted from + * * @return Boolean + * * @api */ function supports(\ReflectionClass $class, $format = null); diff --git a/src/Symfony/Component/Serializer/SerializerInterface.php b/src/Symfony/Component/Serializer/SerializerInterface.php index a3488894cf..7f557221c5 100644 --- a/src/Symfony/Component/Serializer/SerializerInterface.php +++ b/src/Symfony/Component/Serializer/SerializerInterface.php @@ -97,13 +97,12 @@ interface SerializerInterface function removeNormalizer(NormalizerInterface $normalizer); /** - * @param string $format format name + * @param string $format format name * @param EncoderInterface $encoder */ function setEncoder($format, EncoderInterface $encoder); /** - * @param string $format format name * @return EncoderInterface */ function getEncoders(); diff --git a/src/Symfony/Component/Templating/Helper/AssetsHelper.php b/src/Symfony/Component/Templating/Helper/AssetsHelper.php index 20439f6950..9a27b47e8c 100644 --- a/src/Symfony/Component/Templating/Helper/AssetsHelper.php +++ b/src/Symfony/Component/Templating/Helper/AssetsHelper.php @@ -86,7 +86,7 @@ class AssetsHelper extends Helper implements AssetPackageInterface /** * Gets the version to add to public URL. * - * @param string $package A package name + * @param string $packageName A package name * * @return string The current version */ @@ -125,7 +125,8 @@ class AssetsHelper extends Helper implements AssetPackageInterface * If multiple base URLs have been defined a random one will be picked for each asset. * In other words: for one asset path the same base URL will always be picked among the available base URLs. * - * @param string $path The path + * @param string $path The path + * @param string $packageName The package name * * @return string The base URL */ diff --git a/src/Symfony/Component/Templating/Loader/CacheLoader.php b/src/Symfony/Component/Templating/Loader/CacheLoader.php index ba694b647c..984944f70a 100644 --- a/src/Symfony/Component/Templating/Loader/CacheLoader.php +++ b/src/Symfony/Component/Templating/Loader/CacheLoader.php @@ -85,8 +85,8 @@ class CacheLoader extends Loader /** * Returns true if the template is still fresh. * - * @param TemplateReferenceInterface $template A template - * @param integer $time The last modification time of the cached template (timestamp) + * @param TemplateReferenceInterface $template A template + * @param integer $time The last modification time of the cached template (timestamp) */ public function isFresh(TemplateReferenceInterface $template, $time) { diff --git a/src/Symfony/Component/Templating/Loader/ChainLoader.php b/src/Symfony/Component/Templating/Loader/ChainLoader.php index f4560140ea..9338d297b5 100644 --- a/src/Symfony/Component/Templating/Loader/ChainLoader.php +++ b/src/Symfony/Component/Templating/Loader/ChainLoader.php @@ -67,8 +67,10 @@ class ChainLoader extends Loader /** * Returns true if the template is still fresh. * - * @param TemplateReferenceInterface $template A template - * @param integer $time The last modification time of the cached template (timestamp) + * @param TemplateReferenceInterface $template A template + * @param integer $time The last modification time of the cached template (timestamp) + * + * @return Boolean */ public function isFresh(TemplateReferenceInterface $template, $time) { diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php index 3007a0e4f0..4e0b47b65b 100644 --- a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php +++ b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php @@ -85,8 +85,8 @@ class FilesystemLoader extends Loader /** * Returns true if the template is still fresh. * - * @param TemplateReferenceInterface $template A template - * @param integer $time The last modification time of the cached template (timestamp) + * @param TemplateReferenceInterface $template A template + * @param integer $time The last modification time of the cached template (timestamp) */ public function isFresh(TemplateReferenceInterface $template, $time) { diff --git a/src/Symfony/Component/Templating/Loader/LoaderInterface.php b/src/Symfony/Component/Templating/Loader/LoaderInterface.php index 8ec69719ae..836f4d9ce5 100644 --- a/src/Symfony/Component/Templating/Loader/LoaderInterface.php +++ b/src/Symfony/Component/Templating/Loader/LoaderInterface.php @@ -32,8 +32,8 @@ interface LoaderInterface /** * Returns true if the template is still fresh. * - * @param TemplateReferenceInterface $template A template - * @param integer $time The last modification time of the cached template (timestamp) + * @param TemplateReferenceInterface $template A template + * @param integer $time The last modification time of the cached template (timestamp) */ function isFresh(TemplateReferenceInterface $template, $time); } diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php index c5b2d47305..3cb9d2a5b5 100644 --- a/src/Symfony/Component/Templating/PhpEngine.php +++ b/src/Symfony/Component/Templating/PhpEngine.php @@ -190,8 +190,8 @@ class PhpEngine implements EngineInterface, \ArrayAccess /** * Sets a helper. * - * @param HelperInterface $value The helper instance - * @param string $alias An alias + * @param HelperInterface $name The helper instance + * @param string $value An alias */ public function offsetSet($name, $value) { @@ -232,8 +232,8 @@ class PhpEngine implements EngineInterface, \ArrayAccess /** * Sets a helper. * - * @param HelperInterface $value The helper instance - * @param string $alias An alias + * @param HelperInterface $helper The helper instance + * @param string $alias An alias */ public function set(HelperInterface $helper, $alias = null) { @@ -321,7 +321,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess /** * Adds an escaper for the given context. * - * @param string $name The escaper context (html, js, ...) + * @param string $context The escaper context (html, js, ...) * @param mixed $escaper A PHP callable */ public function setEscaper($context, $escaper) @@ -332,7 +332,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess /** * Gets an escaper for a given context. * - * @param string $name The context name + * @param string $context The context name * * @return mixed $escaper A PHP callable */ diff --git a/src/Symfony/Component/Validator/GraphWalker.php b/src/Symfony/Component/Validator/GraphWalker.php index 24067e76ab..c55e4e842e 100644 --- a/src/Symfony/Component/Validator/GraphWalker.php +++ b/src/Symfony/Component/Validator/GraphWalker.php @@ -54,9 +54,9 @@ class GraphWalker * instance and validation group. * * @param ClassMetadata $metadata - * @param object $object The object to validate - * @param string $group The validator group to use for validation - * @param string $propertyPath + * @param object $object The object to validate + * @param string $group The validator group to use for validation + * @param string $propertyPath */ public function walkObject(ClassMetadata $metadata, $object, $group, $propertyPath) { diff --git a/src/Symfony/Component/Validator/ValidatorContextInterface.php b/src/Symfony/Component/Validator/ValidatorContextInterface.php index 4a550857f3..15fc4c93f5 100644 --- a/src/Symfony/Component/Validator/ValidatorContextInterface.php +++ b/src/Symfony/Component/Validator/ValidatorContextInterface.php @@ -33,14 +33,14 @@ interface ValidatorContextInterface /** * Sets the class metadata factory used in the new validator * - * @param ClassMetadataFactoryInterface $classMetadataFactory The factory instance + * @param ClassMetadataFactoryInterface $classMetadataFactory The factory instance */ function setClassMetadataFactory(ClassMetadataFactoryInterface $classMetadataFactory); /** * Sets the constraint validator factory used in the new validator * - * @param ConstraintValidatorFactoryInterface $constraintValidatorFactory The factory instance + * @param ConstraintValidatorFactoryInterface $constraintValidatorFactory The factory instance */ function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $constraintValidatorFactory); diff --git a/src/Symfony/Component/Validator/ValidatorInterface.php b/src/Symfony/Component/Validator/ValidatorInterface.php index 2b5140d3c9..16d4f135ca 100644 --- a/src/Symfony/Component/Validator/ValidatorInterface.php +++ b/src/Symfony/Component/Validator/ValidatorInterface.php @@ -42,9 +42,10 @@ interface ValidatorInterface /** * Validate a single property of an object against the given value. * - * @param string $class The class on which the property belongs - * @param string $property The name of the property to validate - * @param array|null $groups The validator groups to use for validating + * @param string $class The class on which the property belongs + * @param string $property The name of the property to validate + * @param string $value + * @param array|null $groups The validator groups to use for validating * @return ConstraintViolationList */ function validatePropertyValue($class, $property, $value, $groups = null); diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index 89562f8d0e..43202901d2 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -143,8 +143,8 @@ class Inline * * @param scalar $scalar * @param string $delimiters - * @param array $stringDelimiter - * @param integer $i + * @param array $stringDelimiters + * @param integer &$i * @param Boolean $evaluate * * @return string A YAML string diff --git a/src/Symfony/Component/Yaml/Unescaper.php b/src/Symfony/Component/Yaml/Unescaper.php index c7cf501047..014804b6a8 100644 --- a/src/Symfony/Component/Yaml/Unescaper.php +++ b/src/Symfony/Component/Yaml/Unescaper.php @@ -121,9 +121,9 @@ class Unescaper /** * Convert a string from one encoding to another. * - * @param string $string The string to convert - * @param string $to The input encoding - * @param string $from The output encoding + * @param string $value The string to convert + * @param string $to The input encoding + * @param string $from The output encoding * * @return string The string with the new encoding *