From e173d79e3451730afe00d5cdec840a4edd923f4a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 May 2012 19:37:58 +0200 Subject: [PATCH 1/2] fixed CS --- .../Constraints/UniqueEntityValidator.php | 2 +- .../AbstractDoctrineExtension.php | 6 ++-- .../DependencyInjection/DoctrineExtension.php | 4 +-- .../AbstractDoctrineExtensionTest.php | 6 ++-- .../FrameworkExtension.php | 2 +- .../Templating/Helper/FormHelper.php | 2 +- .../MonologExtensionTest.php | 2 +- .../Security/Factory/AbstractFactory.php | 12 +++---- .../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 +- .../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 +- .../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/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 | 6 ++-- .../RememberMe/AbstractRememberMeServices.php | 2 +- .../TokenBasedRememberMeServices.php | 2 +- .../Serializer/Encoder/XmlEncoder.php | 14 ++++---- .../Serializer/SerializerInterface.php | 4 +-- .../Component/Templating/PhpEngine.php | 2 +- .../Translation/Loader/XliffFileLoader.php | 2 +- .../Component/Validator/GraphWalker.php | 4 +-- .../Validator/ValidatorInterface.php | 6 ++-- src/Symfony/Component/Yaml/Inline.php | 12 +++---- .../Acl/Dbal/MutableAclProviderTest.php | 2 +- 53 files changed, 169 insertions(+), 169 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php index ce2411e00f..4338030cd3 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 * * @return bool diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php index 2010005d0d..fd296f5627 100644 --- a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php @@ -99,7 +99,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 * @return void */ @@ -135,7 +135,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 */ @@ -173,7 +173,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/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php index 2effbe8ed2..d458d2e50a 100644 --- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php +++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php @@ -356,8 +356,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/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php index 8ac279a88b..01c192670e 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php +++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php @@ -704,7 +704,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase * Assertion on the Class of a DIC Service Definition. * * @param \Symfony\Component\DependencyInjection\Definition $definition - * @param string $expectedClass + * @param string $expectedClass */ protected function assertDICDefinitionClass($definition, $expectedClass) { @@ -732,8 +732,8 @@ abstract class AbstractDoctrineExtensionTest extends TestCase * Assertion for the DI Container, check if the given definition contains a method call with the given parameters. * * @param \Symfony\Component\DependencyInjection\Definition $definition - * @param string $methodName - * @param array $params + * @param string $methodName + * @param array $params * @return void */ protected function assertDICDefinitionMethodCallOnce($definition, $methodName, array $params = null) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index db9afddf35..6b6542974e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -305,7 +305,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 e1985d67ca..c296ce627c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -252,7 +252,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/MonologBundle/Tests/DependencyInjection/MonologExtensionTest.php b/src/Symfony/Bundle/MonologBundle/Tests/DependencyInjection/MonologExtensionTest.php index 903217d708..00ae4487b8 100644 --- a/src/Symfony/Bundle/MonologBundle/Tests/DependencyInjection/MonologExtensionTest.php +++ b/src/Symfony/Bundle/MonologBundle/Tests/DependencyInjection/MonologExtensionTest.php @@ -248,7 +248,7 @@ class MonologExtensionTest extends TestCase * Assertion on the Class of a DIC Service Definition. * * @param \Symfony\Component\DependencyInjection\Definition $definition - * @param string $expectedClass + * @param string $expectedClass */ protected function assertDICDefinitionClass($definition, $expectedClass) { 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/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 b23ccb2f3e..b3e81f2588 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php @@ -53,7 +53,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 836d4b0981..6a3f1a6651 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php @@ -68,7 +68,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 c21a5751ff..2799b22f9a 100644 --- a/src/Symfony/Component/DependencyInjection/Definition.php +++ b/src/Symfony/Component/DependencyInjection/Definition.php @@ -236,7 +236,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 d250d5d526..d08f713410 100644 --- a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php +++ b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php @@ -182,7 +182,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 b4fceb9421..2498fa2243 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -150,7 +150,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 @@ -180,7 +180,7 @@ class PhpDumper extends Dumper /** * Generates the inline definition of a service. * - * @param string $id + * @param string $id * @param Definition $definition * * @return string @@ -259,7 +259,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 @@ -276,7 +276,7 @@ class PhpDumper extends Dumper /** * Generates the service instance. * - * @param string $id + * @param string $id * @param Definition $definition * * @return string @@ -339,7 +339,7 @@ class PhpDumper extends Dumper /** * Checks if the definition is a simple instance. * - * @param string $id + * @param string $id * @param Definition $definition * * @return Boolean @@ -362,9 +362,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 */ @@ -396,7 +396,7 @@ class PhpDumper extends Dumper /** * Generates the inline definition setup. * - * @param string $id + * @param string $id * @param Definition $definition * @return string */ @@ -434,9 +434,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 */ @@ -460,7 +460,7 @@ class PhpDumper extends Dumper /** * Adds a service * - * @param string $id + * @param string $id * @param Definition $definition * * @return string @@ -797,8 +797,8 @@ EOF; /** * Exports parameters. * - * @param array $parameters - * @param string $path + * @param array $parameters + * @param string $path * @param integer $indent * * @return string @@ -866,7 +866,7 @@ EOF; /** * Builds service calls from arguments * - * @param array $arguments + * @param array $arguments * @param string &$calls By reference * @param string &$behavior By reference * @@ -947,7 +947,7 @@ EOF; * Checks if a service id has a reference * * @param string $id - * @param array $arguments + * @param array $arguments * * @return Boolean */ @@ -971,7 +971,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 73fb716d01..56977afc4b 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php @@ -85,7 +85,7 @@ class XmlDumper extends Dumper /** * Adds method calls. * - * @param array $methodcalls + * @param array $methodcalls * @param DOMElement $parent * * @return void @@ -106,7 +106,7 @@ class XmlDumper extends Dumper * Adds a service. * * @param Definition $definition - * @param string $id + * @param string $id * @param DOMElement $parent * * @return void @@ -177,8 +177,8 @@ class XmlDumper extends Dumper /** * Adds a service alias. * - * @param string $alias - * @param string $id + * @param string $alias + * @param string $id * @param DOMElement $parent * * @return void diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php index 1311b64c67..fd3b2f750c 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php @@ -42,7 +42,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 e946d6e7b6..76c91576f1 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -75,7 +75,7 @@ class XmlFileLoader extends FileLoader * Parses parameters * * @param SimpleXMLElement $xml - * @param string $file + * @param string $file * * @return void */ @@ -92,7 +92,7 @@ class XmlFileLoader extends FileLoader * Parses imports * * @param SimpleXMLElement $xml - * @param string $file + * @param string $file * * @return void */ @@ -112,7 +112,7 @@ class XmlFileLoader extends FileLoader * Parses multiple definitions * * @param SimpleXMLElement $xml - * @param string $file + * @param string $file * * @return void */ @@ -130,9 +130,9 @@ class XmlFileLoader extends FileLoader /** * Parses an individual Definition * - * @param string $id + * @param string $id * @param SimpleXMLElement $service - * @param string $file + * @param string $file * * @return void */ @@ -228,7 +228,7 @@ class XmlFileLoader extends FileLoader * Processes anonymous services * * @param SimpleXMLElement $xml - * @param string $file + * @param string $file * * @return array An array of anonymous services */ @@ -286,7 +286,7 @@ class XmlFileLoader extends FileLoader * Validates an XML document. * * @param DOMDocument $dom - * @param string $file + * @param string $file */ private function validate(\DOMDocument $dom, $file) { @@ -298,7 +298,7 @@ class XmlFileLoader extends FileLoader * Validates a documents XML schema. * * @param \DOMDocument $dom - * @param string $file + * @param string $file * * @return void * @@ -374,7 +374,7 @@ EOF * Validates an extension. * * @param \DOMDocument $dom - * @param string $file + * @param string $file * * @return void * diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index 7f770fa0f8..3d8fc55e32 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 * * @return void @@ -101,7 +101,7 @@ class YamlFileLoader extends FileLoader /** * Parses definitions * - * @param array $content + * @param array $content * @param string $file * * @return void @@ -121,7 +121,7 @@ class YamlFileLoader extends FileLoader * Parses a definition. * * @param string $id - * @param array $service + * @param array $service * @param string $file * * @return void @@ -245,7 +245,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/Form/Extension/Core/DataMapper/PropertyPathMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php index e2211007c6..c10bedab0d 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 57f4e204cd..1b4994fce0 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -801,7 +801,7 @@ class Form implements \IteratorAggregate, FormInterface /** * Returns whether a child with the given name exists. * - * @param string $name + * @param string $name * * @return Boolean */ @@ -813,7 +813,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 82a8c0eab2..c1649a2d90 100644 --- a/src/Symfony/Component/Form/FormBuilder.php +++ b/src/Symfony/Component/Form/FormBuilder.php @@ -116,10 +116,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) { @@ -620,7 +620,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 5c8ab13da1..8aff1e4b31 100644 --- a/src/Symfony/Component/Form/FormView.php +++ b/src/Symfony/Component/Form/FormView.php @@ -35,7 +35,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 b932f5bf27..96022f0310 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -761,7 +761,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) * * @api */ 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 aa0ec96fc7..302b8a73c5 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 c0a33da1b5..242c2a980f 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 * @return void */ public function propertyChanged($sender, $propertyName, $oldValue, $newValue) @@ -398,16 +398,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) @@ -479,7 +479,7 @@ QUERY; /** * Constructs the SQL for inserting an object identity. * - * @param string $identifier + * @param string $identifier * @param integer $classId * @param Boolean $entriesInheriting * @return string @@ -532,7 +532,7 @@ QUERY; * * @param integer $classId * @param integer $oid - * @param string $field + * @param string $field * @param integer $order * @return string */ @@ -599,7 +599,7 @@ QUERY; * Constructs the SQL for updating an object identity. * * @param integer $pk - * @param array $changes + * @param array $changes * @throws \InvalidArgumentException * @return string */ @@ -621,7 +621,7 @@ QUERY; * Constructs the SQL for updating an ACE. * * @param integer $pk - * @param array $sets + * @param array $sets * @throws \InvalidArgumentException * @return string */ @@ -748,7 +748,7 @@ QUERY; * This processes changes on an ACE related property (classFieldAces, or objectFieldAces). * * @param string $name - * @param array $changes + * @param array $changes * @return void */ private function updateFieldAceProperty($name, array $changes) @@ -805,7 +805,7 @@ QUERY; * This processes changes on an ACE related property (classAces, or objectAces). * * @param string $name - * @param array $changes + * @param array $changes * @return void */ private function updateAceProperty($name, array $changes) diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php index bb088f8c9c..c77dab1e03 100644 --- a/src/Symfony/Component/Security/Acl/Domain/Acl.php +++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php @@ -401,7 +401,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Deletes an ACE * - * @param string $property + * @param string $property * @param integer $index * @throws \OutOfBoundsException * @return void @@ -426,9 +426,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 * @return void */ @@ -559,10 +559,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 * @return void */ @@ -614,11 +614,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 * @return void @@ -649,8 +649,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 * @return void */ 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 1aab00021b..5fb8460cd9 100644 --- a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php @@ -128,10 +128,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 dceb76b10b..f4a83b38c8 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 * @return void */ diff --git a/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php index 2a6d619ceb..8f473ff923 100644 --- a/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php @@ -32,7 +32,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 * @return void @@ -54,7 +54,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 * @return void diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php index 54a3f8ec63..b83c10641f 100644 --- a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php @@ -33,7 +33,7 @@ interface MutableAclInterface extends AclInterface * Deletes a class-field-based ACE * * @param integer $index - * @param string $field + * @param string $field * @return void */ function deleteClassFieldAce($index, $field); @@ -50,7 +50,7 @@ interface MutableAclInterface extends AclInterface * Deletes an object-field-based ACE * * @param integer $index - * @param string $field + * @param string $field * @return void */ function deleteObjectFieldAce($index, $field); @@ -133,7 +133,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 * @return void */ function updateClassAce($index, $mask, $strategy = null); @@ -142,9 +142,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 * @return void */ function updateClassFieldAce($index, $field, $mask, $strategy = null); @@ -154,7 +154,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 * @return void */ function updateObjectAce($index, $mask, $strategy = null); @@ -163,9 +163,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 * @return void */ 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 798e611003..2409c50e47 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 d152262128..9452e29240 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 07d3704ef2..07244f5915 100644 --- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php @@ -37,9 +37,9 @@ class LogoutListener implements ListenerInterface * Constructor * * @param SecurityContextInterface $securityContext - * @param HttpUtils $httpUtils An HttpUtilsInterface instance - * @param string $logoutPath The path that starts the logout process - * @param string $targetUrl The URL to redirect to after logout + * @param HttpUtils $httpUtils An HttpUtilsInterface instance + * @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, HttpUtils $httpUtils, $logoutPath, $targetUrl = '/', LogoutSuccessHandlerInterface $successHandler = null) diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index af401f3c61..94f883064b 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -172,7 +172,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 * * @return void */ diff --git a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php index 3e2a27d815..aa762282a7 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/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index 54fae35917..1d8d7216d2 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -102,7 +102,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * @param DOMNode $node - * @param string $val + * @param string $val * * @return Boolean */ @@ -121,7 +121,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * @param DOMNode $node - * @param string $val + * @param string $val * * @return Boolean */ @@ -135,7 +135,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * @param DOMNode $node - * @param string $val + * @param string $val * * @return Boolean */ @@ -148,7 +148,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec } /** - * @param DOMNode $node + * @param DOMNode $node * @param DOMDocumentFragment $fragment * * @return Boolean @@ -231,8 +231,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 */ @@ -319,7 +319,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 2a6ea358d6..c008163603 100644 --- a/src/Symfony/Component/Serializer/SerializerInterface.php +++ b/src/Symfony/Component/Serializer/SerializerInterface.php @@ -32,7 +32,7 @@ interface SerializerInterface /** * Deserializes data into the given type. * - * @param mixed $data + * @param mixed $data * @param string $type * @param string $format */ @@ -50,7 +50,7 @@ interface SerializerInterface /** * Denormalizes data into the given type. * - * @param mixed $data + * @param mixed $data * @param string $type * @param string $format * @return mixed diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php index ed81ea61c5..ffa982111e 100644 --- a/src/Symfony/Component/Templating/PhpEngine.php +++ b/src/Symfony/Component/Templating/PhpEngine.php @@ -390,7 +390,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess /** * @param string $name - * @param mixed $value + * @param mixed $value * * @api */ diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php index beeb4a1d1e..4bd6b69a4a 100644 --- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php @@ -49,7 +49,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 c268e01d64..0acd64d6cf 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 diff --git a/tests/Symfony/Tests/Component/Security/Acl/Dbal/MutableAclProviderTest.php b/tests/Symfony/Tests/Component/Security/Acl/Dbal/MutableAclProviderTest.php index e96e3fabb3..5789cd0e3f 100644 --- a/tests/Symfony/Tests/Component/Security/Acl/Dbal/MutableAclProviderTest.php +++ b/tests/Symfony/Tests/Component/Security/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 */ From 50140113279bdeed3ab49a09c0986bfd204ab751 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 May 2012 19:40:45 +0200 Subject: [PATCH 2/2] fixed CS --- .../DependencyInjection/AbstractDoctrineExtensionTest.php | 5 +++-- .../Tests/DependencyInjection/MonologExtensionTest.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php index 01c192670e..7e320a2912 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php +++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php @@ -18,6 +18,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass; +use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\Config\FileLocator; abstract class AbstractDoctrineExtensionTest extends TestCase @@ -703,8 +704,8 @@ abstract class AbstractDoctrineExtensionTest extends TestCase /** * Assertion on the Class of a DIC Service Definition. * - * @param \Symfony\Component\DependencyInjection\Definition $definition - * @param string $expectedClass + * @param Definition $definition + * @param string $expectedClass */ protected function assertDICDefinitionClass($definition, $expectedClass) { diff --git a/src/Symfony/Bundle/MonologBundle/Tests/DependencyInjection/MonologExtensionTest.php b/src/Symfony/Bundle/MonologBundle/Tests/DependencyInjection/MonologExtensionTest.php index 00ae4487b8..535f6f1e2a 100644 --- a/src/Symfony/Bundle/MonologBundle/Tests/DependencyInjection/MonologExtensionTest.php +++ b/src/Symfony/Bundle/MonologBundle/Tests/DependencyInjection/MonologExtensionTest.php @@ -15,6 +15,7 @@ use Symfony\Bundle\MonologBundle\Tests\TestCase; use Symfony\Bundle\MonologBundle\DependencyInjection\MonologExtension; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; +use Symfony\Component\DependencyInjection\Definition; class MonologExtensionTest extends TestCase { @@ -247,8 +248,8 @@ class MonologExtensionTest extends TestCase /** * Assertion on the Class of a DIC Service Definition. * - * @param \Symfony\Component\DependencyInjection\Definition $definition - * @param string $expectedClass + * @param Definition $definition + * @param string $expectedClass */ protected function assertDICDefinitionClass($definition, $expectedClass) {