From 3bdf52a16ab97d44389ea3809cb02e5147820f28 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 May 2012 19:41:48 +0200 Subject: [PATCH] fixed CS --- .../Doctrine/ContainerAwareEventManager.php | 2 +- .../DataCollector/DoctrineDataCollector.php | 2 +- .../AbstractDoctrineExtension.php | 6 ++-- .../CompilerPass/DoctrineValidationPass.php | 4 +-- .../Form/ChoiceList/ORMQueryBuilderLoader.php | 4 +-- .../Doctrine/Form/Type/DoctrineType.php | 4 +-- .../Bridge/Doctrine/Form/Type/EntityType.php | 4 +-- .../Constraints/UniqueEntityValidator.php | 2 +- .../DataCollector/PropelDataCollector.php | 4 +-- .../Form/ChoiceList/ModelChoiceList.php | 8 ++--- .../Command/ConfigDumpReferenceCommand.php | 4 +-- .../FrameworkExtension.php | 2 +- .../Templating/Helper/FormHelper.php | 2 +- .../Translation/PhpExtractor.php | 2 +- .../Translation/TranslationLoader.php | 2 +- .../Security/Factory/AbstractFactory.php | 12 +++---- .../Controller/ExceptionController.php | 2 +- .../CssSelector/Node/FunctionNode.php | 6 ++-- .../ResolveDefinitionTemplatesPass.php | 2 +- .../Compiler/ResolveInvalidReferencesPass.php | 2 +- .../Compiler/ServiceReferenceGraphEdge.php | 2 +- .../DependencyInjection/Definition.php | 2 +- .../DefinitionDecorator.php | 2 +- .../Dumper/GraphvizDumper.php | 6 ++-- .../DependencyInjection/Dumper/PhpDumper.php | 32 ++++++++--------- .../DependencyInjection/Dumper/XmlDumper.php | 8 ++--- .../DependencyInjection/Dumper/YamlDumper.php | 2 +- .../Loader/XmlFileLoader.php | 18 +++++----- .../Loader/YamlFileLoader.php | 8 ++--- src/Symfony/Component/Finder/Glob.php | 2 +- .../Component/Finder/Tests/FinderTest.php | 2 +- .../Core/DataMapper/PropertyPathMapper.php | 2 +- src/Symfony/Component/Form/Form.php | 4 +-- src/Symfony/Component/Form/FormBuilder.php | 10 +++--- src/Symfony/Component/Form/FormView.php | 2 +- .../Component/HttpFoundation/FileBag.php | 2 +- .../Component/HttpFoundation/Response.php | 2 +- .../Session/Flash/FlashBagInterface.php | 2 +- .../ConfigurableExtension.php | 2 +- .../Profiler/BaseMemcacheProfilerStorage.php | 10 +++--- .../Tests/Profiler/Mock/MemcacheMock.php | 34 +++++++++--------- .../Tests/Profiler/Mock/MemcachedMock.php | 20 +++++------ .../Tests/Profiler/Mock/RedisMock.php | 10 +++--- .../Stub/DateFormat/FullTransformer.php | 4 +-- .../Locale/Stub/StubIntlDateFormatter.php | 2 +- .../Component/Locale/Stub/StubLocale.php | 6 ++-- .../Routing/Loader/AnnotationClassLoader.php | 2 +- .../Security/Acl/Dbal/MutableAclProvider.php | 36 +++++++++---------- .../Component/Security/Acl/Dbal/Schema.php | 2 +- .../Component/Security/Acl/Domain/Acl.php | 20 +++++------ .../Acl/Domain/PermissionGrantingStrategy.php | 8 ++--- .../Acl/Model/AclProviderInterface.php | 4 +-- .../Acl/Model/AuditLoggerInterface.php | 2 +- .../Acl/Model/AuditableAclInterface.php | 4 +-- .../Acl/Model/MutableAclInterface.php | 16 ++++----- .../Security/Core/SecurityContext.php | 2 +- .../AccessDeniedHandlerInterface.php | 4 +-- .../FormAuthenticationEntryPoint.php | 6 ++-- .../AbstractAuthenticationListener.php | 16 ++++----- .../Security/Http/Firewall/LogoutListener.php | 8 ++--- .../RememberMe/AbstractRememberMeServices.php | 2 +- .../TokenBasedRememberMeServices.php | 2 +- .../Tests/Acl/Dbal/MutableAclProviderTest.php | 2 +- .../Serializer/Encoder/XmlEncoder.php | 14 ++++---- .../Serializer/SerializerInterface.php | 2 +- .../Component/Templating/PhpEngine.php | 2 +- .../Translation/Loader/MoFileLoader.php | 2 +- .../Translation/Loader/XliffFileLoader.php | 2 +- .../Component/Validator/GraphWalker.php | 4 +-- .../Validator/ValidatorInterface.php | 6 ++-- src/Symfony/Component/Yaml/Inline.php | 12 +++---- 71 files changed, 226 insertions(+), 226 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php index b56aad2ee2..eb0dc059ba 100644 --- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php +++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php @@ -115,7 +115,7 @@ class ContainerAwareEventManager extends EventManager /** * Removes an event listener from the specified events. * - * @param string|array $events + * @param string|array $events * @param object|string $listener */ public function removeEventListener($events, $listener) diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php index e6f7b52edb..35979afff7 100644 --- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php +++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php @@ -40,7 +40,7 @@ class DoctrineDataCollector extends DataCollector /** * Adds the stack logger for a connection. * - * @param string $name + * @param string $name * @param DebugStack $logger */ public function addLogger($name, DebugStack $logger) diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php index 2ec7113d6f..e9294f96e0 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php @@ -102,7 +102,7 @@ abstract class AbstractDoctrineExtension extends Extension * * Aliases can be used in the Query languages of all the Doctrine object managers to simplify writing tasks. * - * @param array $mappingConfig + * @param array $mappingConfig * @param string $mappingName */ protected function setMappingDriverAlias($mappingConfig, $mappingName) @@ -136,7 +136,7 @@ abstract class AbstractDoctrineExtension extends Extension * * @param array $bundleConfig * @param \ReflectionClass $bundle - * @param ContainerBuilder $container A ContainerBuilder instance + * @param ContainerBuilder $container A ContainerBuilder instance * * @return array|false */ @@ -174,7 +174,7 @@ abstract class AbstractDoctrineExtension extends Extension * Register all the collected mapping information with the object manager by registering the appropriate mapping drivers. * * @param array $objectManager - * @param ContainerBuilder $container A ContainerBuilder instance + * @param ContainerBuilder $container A ContainerBuilder instance */ protected function registerMappingDrivers($objectManager, ContainerBuilder $container) { diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php index 7d4fc71fd7..756b790b41 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php @@ -46,8 +46,8 @@ class DoctrineValidationPass implements CompilerPassInterface * files matching a doctrine search pattern (Resources/config/validation.orm.xml) * * @param ContainerBuilder $container - * @param string $mapping - * @param type $extension + * @param string $mapping + * @param type $extension */ private function updateValidatorMappingFiles(ContainerBuilder $container, $mapping, $extension) { diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php index 2d92b03784..5d9b5e225e 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php @@ -33,9 +33,9 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface /** * Construct an ORM Query Builder Loader * - * @param QueryBuilder $queryBuilder + * @param QueryBuilder $queryBuilder * @param EntityManager $manager - * @param string $class + * @param string $class */ public function __construct($queryBuilder, $manager = null, $class = null) { diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php index c4b6b8a518..da3ce52964 100644 --- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php +++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php @@ -87,8 +87,8 @@ abstract class DoctrineType extends AbstractType * Return the default loader object. * * @param ObjectManager $manager - * @param mixed $queryBuilder - * @param string $class + * @param mixed $queryBuilder + * @param string $class * @return EntityLoaderInterface */ abstract public function getLoader(ObjectManager $manager, $queryBuilder, $class); diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php index aae3040483..51b47be4dc 100644 --- a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php +++ b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php @@ -20,8 +20,8 @@ class EntityType extends DoctrineType * Return the default loader object. * * @param ObjectManager $manager - * @param mixed $queryBuilder - * @param string $class + * @param mixed $queryBuilder + * @param string $class * @return ORMQueryBuilderLoader */ public function getLoader(ObjectManager $manager, $queryBuilder, $class) diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php index 023d82d339..38929b02b9 100644 --- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php +++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php @@ -38,7 +38,7 @@ class UniqueEntityValidator extends ConstraintValidator } /** - * @param object $entity + * @param object $entity * @param Constraint $constraint */ public function validate($entity, Constraint $constraint) diff --git a/src/Symfony/Bridge/Propel1/DataCollector/PropelDataCollector.php b/src/Symfony/Bridge/Propel1/DataCollector/PropelDataCollector.php index 7c6899f323..40f3687f4e 100644 --- a/src/Symfony/Bridge/Propel1/DataCollector/PropelDataCollector.php +++ b/src/Symfony/Bridge/Propel1/DataCollector/PropelDataCollector.php @@ -38,8 +38,8 @@ class PropelDataCollector extends DataCollector /** * Constructor * - * @param \Symfony\Bridge\Propel1\Logger\PropelLogger $logger A Propel logger. - * @param \PropelConfiguration $propelConfiguration The Propel configuration object. + * @param PropelLogger $logger A Propel logger. + * @param \PropelConfiguration $propelConfiguration The Propel configuration object. */ public function __construct(PropelLogger $logger, \PropelConfiguration $propelConfiguration) { diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php index 7a0544c0b3..bc0867a859 100644 --- a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php +++ b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php @@ -46,11 +46,11 @@ class ModelChoiceList extends ObjectChoiceList private $loaded = false; /** - * @param string $class - * @param string $labelPath - * @param array $choices + * @param string $class + * @param string $labelPath + * @param array $choices * @param \ModelCriteria $queryObject - * @param string $groupPath + * @param string $groupPath */ public function __construct($class, $labelPath = null, $choices = null, $queryObject = null, $groupPath = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php index 92eb9f3aec..5d9d06b32a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php @@ -114,7 +114,7 @@ EOF * Outputs a single config reference line * * @param string $text - * @param int $indent + * @param int $indent */ private function outputLine($text, $indent = 0) { @@ -150,7 +150,7 @@ EOF /** * @param NodeInterface $node - * @param int $depth + * @param int $depth */ private function outputNode(NodeInterface $node, $depth = 0) { diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 6e46587be6..6fd52fa15c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -336,7 +336,7 @@ class FrameworkExtension extends Extension /** * Loads the templating configuration. * - * @param array $config A templating configuration array + * @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/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php index 04f8909760..3d9026d5fb 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -290,7 +290,7 @@ class FormHelper extends Helper * Render a block from a form element. * * @param string $name - * @param array $variables Additional variables (those would override the current context) + * @param array $variables Additional variables (those would override the current context) * * @throws FormException if the block is not found * @throws FormException if the method is called out of a form element (no context) diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php index 258a306f75..1eb36052b3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php @@ -90,7 +90,7 @@ class PhpExtractor implements ExtractorInterface /** * Extracts trans message from php tokens. * - * @param array $tokens + * @param array $tokens * @param MessageCatalogue $catalog */ protected function parseTokens($tokens, MessageCatalogue $catalog) diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php index 67e8272f02..aea1ec4e22 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php @@ -31,7 +31,7 @@ class TranslationLoader /** * Adds a loader to the translation extractor. - * @param string $format The format of the loader + * @param string $format The format of the loader * @param LoaderInterface $loader */ public function addLoader($format, LoaderInterface $loader) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php index 179f9d663c..611b0285c0 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php @@ -90,9 +90,9 @@ abstract class AbstractFactory implements SecurityFactoryInterface * AuthenticationProviderInterface. * * @param ContainerBuilder $container - * @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 + * @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 */ @@ -120,9 +120,9 @@ abstract class AbstractFactory implements SecurityFactoryInterface * default implementation does not change the default entry point. * * @param ContainerBuilder $container - * @param string $id - * @param array $config - * @param string $defaultEntryPointId + * @param string $id + * @param array $config + * @param string $defaultEntryPointId * * @return string the entry point id */ diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index b3fc85c28e..9454887c43 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php @@ -85,7 +85,7 @@ class ExceptionController extends ContainerAware /** * @param EngineInterface $templating * @param string $format - * @param integer $code An HTTP response status code + * @param integer $code An HTTP response status code * @param Boolean $debug * * @return TemplateReference diff --git a/src/Symfony/Component/CssSelector/Node/FunctionNode.php b/src/Symfony/Component/CssSelector/Node/FunctionNode.php index 8293264fee..959f29df37 100644 --- a/src/Symfony/Component/CssSelector/Node/FunctionNode.php +++ b/src/Symfony/Component/CssSelector/Node/FunctionNode.php @@ -35,9 +35,9 @@ class FunctionNode implements NodeInterface * Constructor. * * @param NodeInterface $selector The XPath expression - * @param string $type - * @param string $name - * @param XPathExpr $expr + * @param string $type + * @param string $name + * @param XPathExpr $expr */ public function __construct($selector, $type, $name, $expr) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php index 38c9cc5761..53c6f52ddd 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php @@ -54,7 +54,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/Compiler/ResolveInvalidReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php index 4ea8acecf9..996199cf1b 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php @@ -69,7 +69,7 @@ class ResolveInvalidReferencesPass implements CompilerPassInterface /** * Processes arguments to determine invalid references. * - * @param array $arguments An array of Reference objects + * @param array $arguments An array of Reference objects * @param Boolean $inMethodCall */ private function processArguments(array $arguments, $inMethodCall = false) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php index 60a9295f0c..19da234ece 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php @@ -29,7 +29,7 @@ class ServiceReferenceGraphEdge * * @param ServiceReferenceGraphNode $sourceNode * @param ServiceReferenceGraphNode $destNode - * @param string $value + * @param string $value */ public function __construct(ServiceReferenceGraphNode $sourceNode, ServiceReferenceGraphNode $destNode, $value = null) { diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php index 59b4c06ecd..e7265f2a70 100644 --- a/src/Symfony/Component/DependencyInjection/Definition.php +++ b/src/Symfony/Component/DependencyInjection/Definition.php @@ -237,7 +237,7 @@ class Definition * Sets a specific argument * * @param integer $index - * @param mixed $argument + * @param mixed $argument * * @return Definition The current instance * diff --git a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php index 8652d80fe3..0306f75b8e 100644 --- a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php +++ b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php @@ -185,7 +185,7 @@ class DefinitionDecorator extends Definition * parent definition, otherwise your arguments will only be appended. * * @param integer $index - * @param mixed $value + * @param mixed $value * * @return DefinitionDecorator the current instance * @throws InvalidArgumentException when $index isn't an integer diff --git a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php index e59e20460c..debdc52709 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php @@ -119,10 +119,10 @@ class GraphvizDumper extends Dumper /** * Finds all edges belonging to a specific service id. * - * @param string $id The service id used to find edges - * @param array $arguments An array of arguments + * @param string $id The service id used to find edges + * @param array $arguments An array of arguments * @param Boolean $required - * @param string $name + * @param string $name * * @return array An array of edges */ diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index db858a7a26..f9554640ef 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -152,7 +152,7 @@ class PhpDumper extends Dumper /** * Generates the require_once statement for service includes. * - * @param string $id The service id + * @param string $id The service id * @param Definition $definition * * @return string @@ -182,7 +182,7 @@ class PhpDumper extends Dumper /** * Generates the inline definition of a service. * - * @param string $id + * @param string $id * @param Definition $definition * * @return string @@ -261,7 +261,7 @@ class PhpDumper extends Dumper /** * Adds the service return statement. * - * @param string $id Service id + * @param string $id Service id * @param Definition $definition * * @return string @@ -278,7 +278,7 @@ class PhpDumper extends Dumper /** * Generates the service instance. * - * @param string $id + * @param string $id * @param Definition $definition * * @return string @@ -341,7 +341,7 @@ class PhpDumper extends Dumper /** * Checks if the definition is a simple instance. * - * @param string $id + * @param string $id * @param Definition $definition * * @return Boolean @@ -364,9 +364,9 @@ class PhpDumper extends Dumper /** * Adds method calls to a service definition. * - * @param string $id + * @param string $id * @param Definition $definition - * @param string $variableName + * @param string $variableName * * @return string */ @@ -398,7 +398,7 @@ class PhpDumper extends Dumper /** * Generates the inline definition setup. * - * @param string $id + * @param string $id * @param Definition $definition * @return string */ @@ -436,9 +436,9 @@ class PhpDumper extends Dumper /** * Adds configurator definition * - * @param string $id + * @param string $id * @param Definition $definition - * @param string $variableName + * @param string $variableName * * @return string */ @@ -462,7 +462,7 @@ class PhpDumper extends Dumper /** * Adds a service * - * @param string $id + * @param string $id * @param Definition $definition * * @return string @@ -802,8 +802,8 @@ EOF; /** * Exports parameters. * - * @param array $parameters - * @param string $path + * @param array $parameters + * @param string $path * @param integer $indent * * @return string @@ -871,7 +871,7 @@ EOF; /** * Builds service calls from arguments * - * @param array $arguments + * @param array $arguments * @param string &$calls By reference * @param string &$behavior By reference */ @@ -950,7 +950,7 @@ EOF; * Checks if a service id has a reference * * @param string $id - * @param array $arguments + * @param array $arguments * * @return Boolean */ @@ -974,7 +974,7 @@ EOF; /** * Dumps values. * - * @param array $value + * @param array $value * @param Boolean $interpolate * * @return string diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php index 7797b4e4c7..113a242019 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php @@ -84,7 +84,7 @@ class XmlDumper extends Dumper /** * Adds method calls. * - * @param array $methodcalls + * @param array $methodcalls * @param DOMElement $parent */ private function addMethodCalls(array $methodcalls, \DOMElement $parent) @@ -103,7 +103,7 @@ class XmlDumper extends Dumper * Adds a service. * * @param Definition $definition - * @param string $id + * @param string $id * @param DOMElement $parent */ private function addService($definition, $id, \DOMElement $parent) @@ -172,8 +172,8 @@ class XmlDumper extends Dumper /** * Adds a service alias. * - * @param string $alias - * @param string $id + * @param string $alias + * @param string $id * @param DOMElement $parent */ private function addServiceAlias($alias, $id, \DOMElement $parent) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php index f541ac886f..9717a25937 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php @@ -60,7 +60,7 @@ class YamlDumper extends Dumper /** * Adds a service * - * @param string $id + * @param string $id * @param Definition $definition * * @return string diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index 8bcbb8dc0d..3a27d372de 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -76,7 +76,7 @@ class XmlFileLoader extends FileLoader * Parses parameters * * @param SimpleXMLElement $xml - * @param string $file + * @param string $file */ private function parseParameters(SimpleXMLElement $xml, $file) { @@ -91,7 +91,7 @@ class XmlFileLoader extends FileLoader * Parses imports * * @param SimpleXMLElement $xml - * @param string $file + * @param string $file */ private function parseImports(SimpleXMLElement $xml, $file) { @@ -109,7 +109,7 @@ class XmlFileLoader extends FileLoader * Parses multiple definitions * * @param SimpleXMLElement $xml - * @param string $file + * @param string $file */ private function parseDefinitions(SimpleXMLElement $xml, $file) { @@ -125,9 +125,9 @@ class XmlFileLoader extends FileLoader /** * Parses an individual Definition * - * @param string $id + * @param string $id * @param SimpleXMLElement $service - * @param string $file + * @param string $file */ private function parseDefinition($id, $service, $file) { @@ -221,7 +221,7 @@ class XmlFileLoader extends FileLoader * Processes anonymous services * * @param SimpleXMLElement $xml - * @param string $file + * @param string $file */ private function processAnonymousServices(SimpleXMLElement $xml, $file) { @@ -273,7 +273,7 @@ class XmlFileLoader extends FileLoader * Validates an XML document. * * @param DOMDocument $dom - * @param string $file + * @param string $file */ private function validate(\DOMDocument $dom, $file) { @@ -285,7 +285,7 @@ class XmlFileLoader extends FileLoader * Validates a documents XML schema. * * @param \DOMDocument $dom - * @param string $file + * @param string $file * * @throws RuntimeException When extension references a non-existent XSD file * @throws InvalidArgumentException When XML doesn't validate its XSD schema @@ -359,7 +359,7 @@ EOF * Validates an extension. * * @param \DOMDocument $dom - * @param string $file + * @param string $file * * @throws InvalidArgumentException When no extension is found corresponding to a tag */ diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index e163219211..63f3893ab6 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -81,7 +81,7 @@ class YamlFileLoader extends FileLoader /** * Parses all imports * - * @param array $content + * @param array $content * @param string $file */ private function parseImports($content, $file) @@ -99,7 +99,7 @@ class YamlFileLoader extends FileLoader /** * Parses definitions * - * @param array $content + * @param array $content * @param string $file */ private function parseDefinitions($content, $file) @@ -117,7 +117,7 @@ class YamlFileLoader extends FileLoader * Parses a definition. * * @param string $id - * @param array $service + * @param array $service * @param string $file */ private function parseDefinition($id, $service, $file) @@ -239,7 +239,7 @@ class YamlFileLoader extends FileLoader /** * Validates a YAML file. * - * @param mixed $content + * @param mixed $content * @param string $file * * @return array diff --git a/src/Symfony/Component/Finder/Glob.php b/src/Symfony/Component/Finder/Glob.php index 499e6e3e91..5e31b75dbd 100644 --- a/src/Symfony/Component/Finder/Glob.php +++ b/src/Symfony/Component/Finder/Glob.php @@ -38,7 +38,7 @@ 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 * diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php index 2c0c363527..fda06079ca 100644 --- a/src/Symfony/Component/Finder/Tests/FinderTest.php +++ b/src/Symfony/Component/Finder/Tests/FinderTest.php @@ -147,7 +147,7 @@ class FinderTest extends Iterator\RealIteratorTestCase $finder = new Finder(); $this->assertSame($finder, $finder->ignoreDotFiles(false)->ignoreVCS(false)); $this->assertIterator($this->toAbsolute(array('.git', '.bar', '.foo', '.foo/.bar', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); - + $finder = new Finder(); $finder->ignoreDotFiles(false)->ignoreDotFiles(false)->ignoreVCS(false); $this->assertIterator($this->toAbsolute(array('.git', '.bar', '.foo', '.foo/.bar', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php index 60b0efc12c..c557d4a639 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php +++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php @@ -32,7 +32,7 @@ class PropertyPathMapper implements DataMapperInterface /** * @param dataClass $data - * @param array $forms + * @param array $forms * * @throws UnexpectedTypeException if the type of the data parameter is not supported */ diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index d6adc61060..94accae0bd 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -869,7 +869,7 @@ class Form implements \IteratorAggregate, FormInterface /** * Returns whether a child with the given name exists. * - * @param string $name + * @param string $name * * @return Boolean */ @@ -881,7 +881,7 @@ class Form implements \IteratorAggregate, FormInterface /** * Returns the child with the given name. * - * @param string $name + * @param string $name * * @return FormInterface * diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php index 0e98961913..01173e9a4b 100644 --- a/src/Symfony/Component/Form/FormBuilder.php +++ b/src/Symfony/Component/Form/FormBuilder.php @@ -125,10 +125,10 @@ class FormBuilder /** * Constructor. * - * @param string $name - * @param FormFactoryInterface $factory - * @param EventDispatcherInterface $dispatcher - * @param string $dataClass + * @param string $name + * @param FormFactoryInterface $factory + * @param EventDispatcherInterface $dispatcher + * @param string $dataClass */ public function __construct($name, FormFactoryInterface $factory, EventDispatcherInterface $dispatcher, $dataClass = null) { @@ -641,7 +641,7 @@ class FormBuilder /** * Returns whether a field with the given name exists. * - * @param string $name + * @param string $name * * @return Boolean */ diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php index 5bd4b281a3..2e5b6c7a61 100644 --- a/src/Symfony/Component/Form/FormView.php +++ b/src/Symfony/Component/Form/FormView.php @@ -54,7 +54,7 @@ class FormView implements ArrayAccess, IteratorAggregate, Countable /** * @param string $name - * @param mixed $value + * @param mixed $value * * @return FormView The current view */ diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php index f77a4b35bd..0f85eb05b3 100644 --- a/src/Symfony/Component/HttpFoundation/FileBag.php +++ b/src/Symfony/Component/HttpFoundation/FileBag.php @@ -121,7 +121,7 @@ class FileBag extends ParameterBag * It's safe to pass an already converted array, in which case this method * just returns the original array unmodified. * - * @param array $data + * @param array $data * * @return array */ diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index ceda45fce5..8f81fab192 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -937,7 +937,7 @@ class Response * Sets the Vary header. * * @param string|array $headers - * @param Boolean $replace Whether to replace the actual value of not (true by default) + * @param Boolean $replace Whether to replace the actual value of not (true by default) * * @return Response * diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php index a133bb70f2..2fab8bddb8 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php @@ -57,7 +57,7 @@ interface FlashBagInterface extends SessionBagInterface * Gets and clears flash from the stack. * * @param string $type - * @param array $default Default value if $type doee not exist. + * @param array $default Default value if $type doee not exist. * * @return string */ diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php index 4f6f6a3dd5..8388ccfd6a 100755 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php @@ -38,7 +38,7 @@ abstract class ConfigurableExtension extends Extension /** * Configures the passed container according to the merged configuration. * - * @param array $mergedConfig + * @param array $mergedConfig * @param ContainerBuilder $container */ abstract protected function loadInternal(array $mergedConfig, ContainerBuilder $container); diff --git a/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php index 19de33ac25..ebf19127f2 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/BaseMemcacheProfilerStorage.php @@ -26,10 +26,10 @@ abstract class BaseMemcacheProfilerStorage implements ProfilerStorageInterface /** * Constructor. * - * @param string $dsn A data source name + * @param string $dsn A data source name * @param string $username * @param string $password - * @param int $lifetime The lifetime to use for the purge + * @param int $lifetime The lifetime to use for the purge */ public function __construct($dsn, $username = '', $password = '', $lifetime = 86400) { @@ -185,8 +185,8 @@ abstract class BaseMemcacheProfilerStorage implements ProfilerStorageInterface * Store an item on the memcache server under the specified key * * @param string $key - * @param mixed $value - * @param int $expiration + * @param mixed $value + * @param int $expiration * * @return boolean */ @@ -205,7 +205,7 @@ abstract class BaseMemcacheProfilerStorage implements ProfilerStorageInterface * Append data to an existing item on the memcache server * @param string $key * @param string $value - * @param int $expiration + * @param int $expiration * * @return boolean */ diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php index 2985389a48..014f5492fc 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php +++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcacheMock.php @@ -30,7 +30,7 @@ class MemcacheMock /** * Open memcached server connection * - * @param string $host + * @param string $host * @param integer $port * @param integer $timeout * @@ -50,7 +50,7 @@ class MemcacheMock /** * Open memcached server persistent connection * - * @param string $host + * @param string $host * @param integer $port * @param integer $timeout * @@ -70,15 +70,15 @@ class MemcacheMock /** * Add a memcached server to connection pool * - * @param string $host - * @param integer $port - * @param boolean $persistent - * @param integer $weight - * @param integer $timeout - * @param integer $retry_interval - * @param boolean $status + * @param string $host + * @param integer $port + * @param boolean $persistent + * @param integer $weight + * @param integer $timeout + * @param integer $retry_interval + * @param boolean $status * @param callable $failure_callback - * @param integer $timeoutms + * @param integer $timeoutms * * @return boolean */ @@ -96,8 +96,8 @@ class MemcacheMock /** * Add an item to the server only if such key doesn't exist at the server yet. * - * @param string $key - * @param mixed $var + * @param string $key + * @param mixed $var * @param integer $flag * @param integer $expire * @@ -121,8 +121,8 @@ class MemcacheMock /** * Store data at the server. * - * @param string $key - * @param string $var + * @param string $key + * @param string $var * @param integer $flag * @param integer $expire * @@ -142,8 +142,8 @@ class MemcacheMock /** * Replace value of the existing item. * - * @param string $key - * @param mixed $var + * @param string $key + * @param mixed $var * @param integer $flag * @param integer $expire * @@ -167,7 +167,7 @@ class MemcacheMock /** * Retrieve item from the server. * - * @param string|array $key + * @param string|array $key * @param integer|array $flags * * @return mixed diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php index 4971de1982..2b17d70d28 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php +++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/MemcachedMock.php @@ -31,7 +31,7 @@ class MemcachedMock * Set a Memcached option * * @param integer $option - * @param mixed $value + * @param mixed $value * * @return boolean */ @@ -43,7 +43,7 @@ class MemcachedMock /** * Add a memcached server to connection pool * - * @param string $host + * @param string $host * @param integer $port * @param integer $weight * @@ -63,8 +63,8 @@ class MemcachedMock /** * Add an item to the server only if such key doesn't exist at the server yet. * - * @param string $key - * @param mixed $value + * @param string $key + * @param mixed $value * @param integer $expiration * * @return boolean @@ -87,8 +87,8 @@ class MemcachedMock /** * Store data at the server. * - * @param string $key - * @param mixed $value + * @param string $key + * @param mixed $value * @param integer $expiration * * @return boolean @@ -107,8 +107,8 @@ class MemcachedMock /** * Replace value of the existing item. * - * @param string $key - * @param mixed $value + * @param string $key + * @param mixed $value * @param integer $expiration * * @return boolean @@ -131,9 +131,9 @@ class MemcachedMock /** * Retrieve item from the server. * - * @param string $key + * @param string $key * @param callable $cache_cb - * @param float $cas_token + * @param float $cas_token * * @return boolean */ diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php index 9db2492815..b79e097fec 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php +++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php @@ -31,9 +31,9 @@ class RedisMock /** * Add a memcached server to connection pool * - * @param string $host + * @param string $host * @param integer $port - * @param float $timeout + * @param float $timeout * * @return boolean */ @@ -84,9 +84,9 @@ class RedisMock /** * Store data at the server with expiration time. * - * @param string $key + * @param string $key * @param integer $ttl - * @param mixed $value + * @param mixed $value * * @return boolean */ @@ -104,7 +104,7 @@ class RedisMock /** * Sets an expiration time on an item. * - * @param string $key + * @param string $key * @param integer $ttl * * @return boolean diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php index bc7f41178c..7d64464a76 100644 --- a/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php +++ b/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php @@ -245,7 +245,7 @@ class FullTransformer * Normalize a preg_replace match array, removing the numeric keys and returning an associative array * with the value and pattern values for the matched Transformer * - * @param array $data + * @param array $data * * @return array */ @@ -324,7 +324,7 @@ class FullTransformer * Add sensible default values for missing items in the extracted date/time options array. The values * are base in the beginning of the Unix era * - * @param array $options + * @param array $options * * @return array */ diff --git a/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php b/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php index d457440e01..a448a588e2 100644 --- a/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php +++ b/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php @@ -487,7 +487,7 @@ class StubIntlDateFormatter * Create and returns a DateTime object with the specified timestamp and with the * current time zone * - * @param int $timestamp + * @param int $timestamp * * @return DateTime */ diff --git a/src/Symfony/Component/Locale/Stub/StubLocale.php b/src/Symfony/Component/Locale/Stub/StubLocale.php index 4adf276ca2..5563d1304e 100644 --- a/src/Symfony/Component/Locale/Stub/StubLocale.php +++ b/src/Symfony/Component/Locale/Stub/StubLocale.php @@ -224,9 +224,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 Boolean $canonicalize + * @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 * diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php index 28fa896b9c..a7d6a42627 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php @@ -194,7 +194,7 @@ abstract class AnnotationClassLoader implements LoaderInterface /** * Gets the default route name for a class method. * - * @param \ReflectionClass $class + * @param \ReflectionClass $class * @param \ReflectionMethod $method * * @return string diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php index 3ae08d3315..0d46f3a872 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php @@ -144,10 +144,10 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf * This allows us to keep track of which values have been changed, so we don't * have to do a full introspection when ->updateAcl() is called. * - * @param mixed $sender + * @param mixed $sender * @param string $propertyName - * @param mixed $oldValue - * @param mixed $newValue + * @param mixed $oldValue + * @param mixed $newValue */ public function propertyChanged($sender, $propertyName, $oldValue, $newValue) { @@ -397,16 +397,16 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf /** * Constructs the SQL for inserting an ACE. * - * @param integer $classId + * @param integer $classId * @param integer|null $objectIdentityId - * @param string|null $field - * @param integer $aceOrder - * @param integer $securityIdentityId - * @param string $strategy - * @param integer $mask - * @param Boolean $granting - * @param Boolean $auditSuccess - * @param Boolean $auditFailure + * @param string|null $field + * @param integer $aceOrder + * @param integer $securityIdentityId + * @param string $strategy + * @param integer $mask + * @param Boolean $granting + * @param Boolean $auditSuccess + * @param Boolean $auditFailure * @return string */ protected function getInsertAccessControlEntrySql($classId, $objectIdentityId, $field, $aceOrder, $securityIdentityId, $strategy, $mask, $granting, $auditSuccess, $auditFailure) @@ -478,7 +478,7 @@ QUERY; /** * Constructs the SQL for inserting an object identity. * - * @param string $identifier + * @param string $identifier * @param integer $classId * @param Boolean $entriesInheriting * @return string @@ -531,7 +531,7 @@ QUERY; * * @param integer $classId * @param integer $oid - * @param string $field + * @param string $field * @param integer $order * @return string */ @@ -598,7 +598,7 @@ QUERY; * Constructs the SQL for updating an object identity. * * @param integer $pk - * @param array $changes + * @param array $changes * @throws \InvalidArgumentException * @return string */ @@ -620,7 +620,7 @@ QUERY; * Constructs the SQL for updating an ACE. * * @param integer $pk - * @param array $sets + * @param array $sets * @throws \InvalidArgumentException * @return string */ @@ -742,7 +742,7 @@ QUERY; * This processes changes on an ACE related property (classFieldAces, or objectFieldAces). * * @param string $name - * @param array $changes + * @param array $changes */ private function updateFieldAceProperty($name, array $changes) { @@ -798,7 +798,7 @@ QUERY; * This processes changes on an ACE related property (classAces, or objectAces). * * @param string $name - * @param array $changes + * @param array $changes */ private function updateAceProperty($name, array $changes) { diff --git a/src/Symfony/Component/Security/Acl/Dbal/Schema.php b/src/Symfony/Component/Security/Acl/Dbal/Schema.php index 0cb875581d..fd25926eb2 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/Schema.php +++ b/src/Symfony/Component/Security/Acl/Dbal/Schema.php @@ -26,7 +26,7 @@ final class Schema extends BaseSchema /** * Constructor * - * @param array $options the names for tables + * @param array $options the names for tables * @param Connection $connection */ public function __construct(array $options, Connection $connection = null) diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php index a890bbec03..6d5313177c 100644 --- a/src/Symfony/Component/Security/Acl/Domain/Acl.php +++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php @@ -398,7 +398,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Deletes an ACE * - * @param string $property + * @param string $property * @param integer $index * @throws \OutOfBoundsException */ @@ -422,9 +422,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Deletes a field-based ACE * - * @param string $property + * @param string $property * @param integer $index - * @param string $field + * @param string $field * @throws \OutOfBoundsException */ private function deleteFieldAce($property, $index, $field) @@ -552,10 +552,10 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Updates an ACE * - * @param string $property + * @param string $property * @param integer $index * @param integer $mask - * @param string $strategy + * @param string $strategy * @throws \OutOfBoundsException */ private function updateAce($property, $index, $mask, $strategy = null) @@ -605,11 +605,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Updates a field-based ACE * - * @param string $property + * @param string $property * @param integer $index - * @param string $field + * @param string $field * @param integer $mask - * @param string $strategy + * @param string $strategy * @throws \InvalidArgumentException * @throws \OutOfBoundsException */ @@ -639,8 +639,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * Called when a property of the ACL changes * * @param string $name - * @param mixed $oldValue - * @param mixed $newValue + * @param mixed $oldValue + * @param mixed $newValue */ private function onPropertyChanged($name, $oldValue, $newValue) { diff --git a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php index c9464cf2e3..c34db2a76b 100644 --- a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php @@ -127,10 +127,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) diff --git a/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php b/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php index 12f55e0a70..2f878e1a92 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php @@ -22,7 +22,7 @@ interface AclProviderInterface * Retrieves all child object identities from the database * * @param ObjectIdentityInterface $parentOid - * @param Boolean $directChildrenOnly + * @param Boolean $directChildrenOnly * @return array returns an array of child 'ObjectIdentity's */ function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly = false); @@ -32,7 +32,7 @@ interface AclProviderInterface * * @throws AclNotFoundException when there is no ACL * @param ObjectIdentityInterface $oid - * @param array $sids + * @param array $sids * @return AclInterface */ function findAcl(ObjectIdentityInterface $oid, array $sids = array()); diff --git a/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php b/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php index 56fd12e79c..7cab6f19ea 100644 --- a/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php @@ -22,7 +22,7 @@ interface AuditLoggerInterface * This method is called whenever access is granted, or denied, and * administrative mode is turned off. * - * @param Boolean $granted + * @param Boolean $granted * @param EntryInterface $ace */ function logIfNeeded($granted, EntryInterface $ace); diff --git a/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php index 9a9510662d..5da593e85a 100644 --- a/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php @@ -31,7 +31,7 @@ interface AuditableAclInterface extends MutableAclInterface * Updates auditing for class-field-based ACE * * @param integer $index - * @param string $field + * @param string $field * @param Boolean $auditSuccess * @param Boolean $auditFailure */ @@ -50,7 +50,7 @@ interface AuditableAclInterface extends MutableAclInterface * Updates auditing for object-field-based ACE * * @param integer $index - * @param string $field + * @param string $field * @param Boolean $auditSuccess * @param Boolean $auditFailure */ diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php index a846a9f161..f84e8176f0 100644 --- a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php @@ -32,7 +32,7 @@ interface MutableAclInterface extends AclInterface * Deletes a class-field-based ACE * * @param integer $index - * @param string $field + * @param string $field */ function deleteClassFieldAce($index, $field); @@ -47,7 +47,7 @@ interface MutableAclInterface extends AclInterface * Deletes an object-field-based ACE * * @param integer $index - * @param string $field + * @param string $field */ function deleteObjectFieldAce($index, $field); @@ -124,7 +124,7 @@ interface MutableAclInterface extends AclInterface * * @param integer $index * @param integer $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy if null the strategy should not be changed */ function updateClassAce($index, $mask, $strategy = null); @@ -132,9 +132,9 @@ interface MutableAclInterface extends AclInterface * Updates a class-field-based ACE * * @param integer $index - * @param string $field + * @param string $field * @param integer $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy if null the strategy should not be changed */ function updateClassFieldAce($index, $field, $mask, $strategy = null); @@ -143,7 +143,7 @@ interface MutableAclInterface extends AclInterface * * @param integer $index * @param integer $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy if null the strategy should not be changed */ function updateObjectAce($index, $mask, $strategy = null); @@ -151,9 +151,9 @@ interface MutableAclInterface extends AclInterface * Updates an object-field-based ACE * * @param integer $index - * @param string $field + * @param string $field * @param integer $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy if null the strategy should not be changed */ function updateObjectFieldAce($index, $field, $mask, $strategy = null); } diff --git a/src/Symfony/Component/Security/Core/SecurityContext.php b/src/Symfony/Component/Security/Core/SecurityContext.php index 0623140a9b..bc6493b01d 100644 --- a/src/Symfony/Component/Security/Core/SecurityContext.php +++ b/src/Symfony/Component/Security/Core/SecurityContext.php @@ -50,7 +50,7 @@ class SecurityContext implements SecurityContextInterface * * @throws AuthenticationCredentialsNotFoundException when the security context has no authentication token. * - * @param mixed $attributes + * @param mixed $attributes * @param mixed|null $object * * @return Boolean diff --git a/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php b/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php index ae5b634600..8670cbb809 100644 --- a/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php @@ -25,8 +25,8 @@ interface AccessDeniedHandlerInterface /** * Handles an access denied failure. * - * @param Request $request - * @param AccessDeniedException $accessDeniedException + * @param Request $request + * @param AccessDeniedException $accessDeniedException * * @return Response may return null */ diff --git a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php index 2e269312d7..2170e9ede7 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php @@ -33,9 +33,9 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface * Constructor * * @param HttpKernelInterface $kernel - * @param HttpUtils $httpUtils An HttpUtils instance - * @param string $loginPath The path to the login form - * @param Boolean $useForward Whether to forward or redirect to the login form + * @param HttpUtils $httpUtils An HttpUtils instance + * @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, HttpUtils $httpUtils, $loginPath, $useForward = false) { diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php index c8fa581d41..6d9531427f 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php @@ -65,17 +65,17 @@ abstract class AbstractAuthenticationListener implements ListenerInterface /** * Constructor. * - * @param SecurityContextInterface $securityContext A SecurityContext instance - * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance + * @param SecurityContextInterface $securityContext A SecurityContext instance + * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance * @param SessionAuthenticationStrategyInterface $sessionStrategy - * @param HttpUtils $httpUtils An HttpUtilsInterface instance + * @param HttpUtils $httpUtils An HttpUtilsInterface instance * @param string $providerKey - * @param array $options An array of options for the processing of a + * @param array $options An array of options for the processing of a * successful, or failed authentication attempt - * @param AuthenticationSuccessHandlerInterface $successHandler - * @param AuthenticationFailureHandlerInterface $failureHandler - * @param LoggerInterface $logger A LoggerInterface instance - * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance + * @param AuthenticationSuccessHandlerInterface $successHandler + * @param AuthenticationFailureHandlerInterface $failureHandler + * @param LoggerInterface $logger A LoggerInterface instance + * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance */ public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, $providerKey, array $options = array(), AuthenticationSuccessHandlerInterface $successHandler = null, AuthenticationFailureHandlerInterface $failureHandler = null, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null) { diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php index 5a0d0d62bb..d145fa17f6 100644 --- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php @@ -39,10 +39,10 @@ class LogoutListener implements ListenerInterface * Constructor * * @param SecurityContextInterface $securityContext - * @param HttpUtils $httpUtils An HttpUtilsInterface instance - * @param array $options An array of options to process a logout attempt - * @param LogoutSuccessHandlerInterface $successHandler A LogoutSuccessHandlerInterface instance - * @param CsrfProviderInterface $csrfProvider A CsrfProviderInterface instance + * @param HttpUtils $httpUtils An HttpUtilsInterface instance + * @param array $options An array of options to process a logout attempt + * @param LogoutSuccessHandlerInterface $successHandler A LogoutSuccessHandlerInterface instance + * @param CsrfProviderInterface $csrfProvider A CsrfProviderInterface instance */ public function __construct(SecurityContextInterface $securityContext, HttpUtils $httpUtils, array $options = array(), LogoutSuccessHandlerInterface $successHandler = null, CsrfProviderInterface $csrfProvider = null) { diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index 71f103e4a8..d61a6cec51 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -168,7 +168,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * * @param Request $request * @param Response $response - * @param TokenInterface $token The token that resulted in a successful authentication + * @param TokenInterface $token The token that resulted in a successful authentication */ public final function loginSuccess(Request $request, Response $response, TokenInterface $token) { diff --git a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php index 1f831d0899..bd828f265c 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php @@ -136,7 +136,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices /** * Generates a hash for the cookie to ensure it is not being tempered with * - * @param string $class + * @param string $class * @param string $username The username * @param integer $expires The unixtime when the cookie expires * @param string $password The encoded password diff --git a/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php b/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php index df6a1cf61d..e264b6d92c 100644 --- a/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php +++ b/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php @@ -370,7 +370,7 @@ class MutableAclProviderTest extends \PHPUnit_Framework_TestCase * ) * * @param AclProvider $provider - * @param array $data + * @param array $data * @throws \InvalidArgumentException * @throws Exception */ diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index 13cb48660d..1e94a9721d 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -124,7 +124,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * @param DOMNode $node - * @param string $val + * @param string $val * * @return Boolean */ @@ -143,7 +143,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * @param DOMNode $node - * @param string $val + * @param string $val * * @return Boolean */ @@ -157,7 +157,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * @param DOMNode $node - * @param string $val + * @param string $val * * @return Boolean */ @@ -170,7 +170,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec } /** - * @param DOMNode $node + * @param DOMNode $node * @param DOMDocumentFragment $fragment * * @return Boolean @@ -250,8 +250,8 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * Parse the data and convert it to DOMElements * - * @param DOMNode $parentNode - * @param array|object $data data + * @param DOMNode $parentNode + * @param array|object $data data * * @return Boolean */ @@ -350,7 +350,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec * Tests the value being passed and decide what sort of element to create * * @param DOMNode $node - * @param mixed $val + * @param mixed $val * * @return Boolean */ diff --git a/src/Symfony/Component/Serializer/SerializerInterface.php b/src/Symfony/Component/Serializer/SerializerInterface.php index 546232b48d..9e2ac98721 100644 --- a/src/Symfony/Component/Serializer/SerializerInterface.php +++ b/src/Symfony/Component/Serializer/SerializerInterface.php @@ -30,7 +30,7 @@ interface SerializerInterface /** * Deserializes data into the given type. * - * @param mixed $data + * @param mixed $data * @param string $type * @param string $format */ diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php index b39c1f152e..2a06480677 100644 --- a/src/Symfony/Component/Templating/PhpEngine.php +++ b/src/Symfony/Component/Templating/PhpEngine.php @@ -394,7 +394,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess /** * @param string $name - * @param mixed $value + * @param mixed $value * * @api */ diff --git a/src/Symfony/Component/Translation/Loader/MoFileLoader.php b/src/Symfony/Component/Translation/Loader/MoFileLoader.php index 104dedc725..2363bb543f 100644 --- a/src/Symfony/Component/Translation/Loader/MoFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/MoFileLoader.php @@ -161,7 +161,7 @@ class MoFileLoader extends ArrayLoader implements LoaderInterface * Reads an unsigned long from stream respecting endianess. * * @param resource $stream - * @param boolean $isBigEndian + * @param boolean $isBigEndian * @return integer */ private function readLong($stream, $isBigEndian) diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php index b01ac7247a..a61ed66a2b 100644 --- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php @@ -52,7 +52,7 @@ class XliffFileLoader implements LoaderInterface /** * Validates and parses the given file into a SimpleXMLElement * - * @param string $file + * @param string $file * * @return SimpleXMLElement */ diff --git a/src/Symfony/Component/Validator/GraphWalker.php b/src/Symfony/Component/Validator/GraphWalker.php index d70fd3e929..887d82cf88 100644 --- a/src/Symfony/Component/Validator/GraphWalker.php +++ b/src/Symfony/Component/Validator/GraphWalker.php @@ -54,8 +54,8 @@ 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 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/ValidatorInterface.php b/src/Symfony/Component/Validator/ValidatorInterface.php index adfac91952..9585af0547 100644 --- a/src/Symfony/Component/Validator/ValidatorInterface.php +++ b/src/Symfony/Component/Validator/ValidatorInterface.php @@ -50,10 +50,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 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 + * @param array|null $groups The validator groups to use for validating * * @return ConstraintViolationList * diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index 5933ac79c7..20305728ec 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -146,9 +146,9 @@ class Inline /** * Parses a scalar to a YAML string. * - * @param scalar $scalar - * @param string $delimiters - * @param array $stringDelimiters + * @param scalar $scalar + * @param string $delimiters + * @param array $stringDelimiters * @param integer &$i * @param Boolean $evaluate * @@ -187,7 +187,7 @@ class Inline /** * Parses a quoted scalar to YAML. * - * @param string $scalar + * @param string $scalar * @param integer &$i * * @return string A YAML string @@ -217,7 +217,7 @@ class Inline /** * Parses a sequence to a YAML string. * - * @param string $sequence + * @param string $sequence * @param integer &$i * * @return string A YAML string @@ -273,7 +273,7 @@ class Inline /** * Parses a mapping to a YAML string. * - * @param string $mapping + * @param string $mapping * @param integer &$i * * @return string A YAML string