diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php index f8382ed2eb..82c1b7c811 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php @@ -22,11 +22,11 @@ use Symfony\Component\Config\Resource\FileResource; */ class DoctrineValidationPass implements CompilerPassInterface { - /** - * @var string - */ private $managerType; + /** + * @param string $managerType + */ public function __construct($managerType) { $this->managerType = $managerType; diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php index cb4a4816db..b9f5114474 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php @@ -26,9 +26,6 @@ use Symfony\Component\DependencyInjection\Reference; */ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface { - /** - * @var string|string[] - */ private $connections; private $eventManagers; private $managerTemplate; diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php index c1d505722a..fff9767540 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php @@ -113,7 +113,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface * present to enable the mapping. Set to false * to not do any check, optional. * @param string $configurationPattern Pattern for the Configuration service name - * @param string $registerAliasMethodName name of Configuration class method to + * @param string $registerAliasMethodName Name of Configuration class method to * register alias * @param string[] $aliasMap Map of alias to namespace */ @@ -178,7 +178,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface /** * Create the service definition for the metadata driver. * - * @param ContainerBuilder $container passed on in case an extending class + * @param ContainerBuilder $container Passed on in case an extending class * needs access to the container * * @return Definition|Reference the metadata driver to add to all chain drivers diff --git a/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php b/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php index 1c0e8cdfee..0aac26dae3 100644 --- a/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php +++ b/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php @@ -20,9 +20,6 @@ use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface; */ class DoctrineParserCache implements ParserCacheInterface { - /** - * @var Cache - */ private $cache; public function __construct(Cache $cache) diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php index 02280c4fe8..bf5890c1e6 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php @@ -23,29 +23,10 @@ use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface; */ class DoctrineChoiceLoader implements ChoiceLoaderInterface { - /** - * @var ChoiceListFactoryInterface - */ private $factory; - - /** - * @var ObjectManager - */ private $manager; - - /** - * @var string - */ private $class; - - /** - * @var IdReader - */ private $idReader; - - /** - * @var null|EntityLoaderInterface - */ private $objectLoader; /** @@ -60,13 +41,10 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface * passed which optimizes the object loading for one of the Doctrine * mapper implementations. * - * @param ChoiceListFactoryInterface $factory The factory for creating - * the loaded choice list + * @param ChoiceListFactoryInterface $factory The factory for creating the loaded choice list * @param ObjectManager $manager The object manager - * @param string $class The class name of the - * loaded objects - * @param IdReader $idReader the reader for the object - * IDs + * @param string $class The class name of the loaded objects + * @param IdReader $idReader The reader for the object IDs * @param null|EntityLoaderInterface $objectLoader The objects loader */ public function __construct(ChoiceListFactoryInterface $factory, ObjectManager $manager, $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null) diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php index 0161adf3b4..ee8ec2ddab 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php @@ -24,29 +24,10 @@ use Symfony\Component\Form\Exception\RuntimeException; */ class IdReader { - /** - * @var ObjectManager - */ private $om; - - /** - * @var ClassMetadata - */ private $classMetadata; - - /** - * @var bool - */ private $singleId; - - /** - * @var bool - */ private $intId; - - /** - * @var string - */ private $idField; /** diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php index ed8e0a7934..469cbea192 100644 --- a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php +++ b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php @@ -25,14 +25,7 @@ class DoctrineOrmExtension extends AbstractExtension { protected $registry; - /** - * @var PropertyAccessorInterface - */ private $propertyAccessor; - - /** - * @var ChoiceListFactoryInterface - */ private $choiceListFactory; public function __construct(ManagerRegistry $registry, PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null) diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php index b0d9534a0e..8c7876eae3 100644 --- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php +++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php @@ -25,9 +25,6 @@ use Symfony\Component\Validator\ConstraintValidator; */ class UniqueEntityValidator extends ConstraintValidator { - /** - * @var ManagerRegistry - */ private $registry; public function __construct(ManagerRegistry $registry) diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php index 629b556c4b..9b44c5ed05 100644 --- a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php +++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php @@ -25,19 +25,8 @@ use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface; */ class ProxyDumper implements DumperInterface { - /** - * @var string - */ private $salt; - - /** - * @var LazyLoadingValueHolderGenerator - */ private $proxyGenerator; - - /** - * @var BaseGeneratorStrategy - */ private $classGenerator; /** diff --git a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php index cb91ff428b..48d99b8c7e 100644 --- a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php @@ -23,10 +23,6 @@ use Twig\Extension\AbstractExtension; class StopwatchExtension extends AbstractExtension { private $stopwatch; - - /** - * @var bool - */ private $enabled; public function __construct(Stopwatch $stopwatch = null, $enabled = true) diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php index c04ce13a18..1a60e67a2f 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php @@ -30,9 +30,6 @@ use Twig\NodeVisitor\AbstractNodeVisitor; */ class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor { - /** - * @var Scope - */ private $scope; public function __construct() diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php index bd35fe5a8b..db388ab70b 100644 --- a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php +++ b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php @@ -42,11 +42,6 @@ class TwigExtractor extends AbstractFileExtractor implements ExtractorInterface */ private $prefix = ''; - /** - * The twig environment. - * - * @var Environment - */ private $twig; public function __construct(Environment $twig) diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php index 6c248d8a42..20f0bbaba0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php +++ b/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php @@ -21,9 +21,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface; */ class SessionListener extends BaseSessionListener { - /** - * @var ContainerInterface - */ private $container; public function __construct(ContainerInterface $container) diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php index b6377863af..16758d2209 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php @@ -43,8 +43,8 @@ class TranslationLoader /** * Loads translation messages from a directory to the catalogue. * - * @param string $directory the directory to look into - * @param MessageCatalogue $catalogue the catalogue + * @param string $directory The directory to look into + * @param MessageCatalogue $catalogue The catalogue */ public function loadMessages($directory, MessageCatalogue $catalogue) { diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index 8dd9cfee03..4a83c842a3 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php @@ -31,12 +31,12 @@ use Twig\Loader\ExistsLoaderInterface; class ExceptionController { protected $twig; - - /** - * @var bool Show error (false) or exception (true) pages by default - */ protected $debug; + /** + * @param Environment $twig + * @param bool $debug Show error (false) or exception (true) pages by default + */ public function __construct(Environment $twig, $debug) { $this->twig = $twig; diff --git a/src/Symfony/Component/ClassLoader/XcacheClassLoader.php b/src/Symfony/Component/ClassLoader/XcacheClassLoader.php index 1dcfbaea6e..b7210343f2 100644 --- a/src/Symfony/Component/ClassLoader/XcacheClassLoader.php +++ b/src/Symfony/Component/ClassLoader/XcacheClassLoader.php @@ -49,12 +49,6 @@ namespace Symfony\Component\ClassLoader; class XcacheClassLoader { private $prefix; - - /** - * A class loader object that implements the findFile() method. - * - * @var object - */ private $decorated; /** diff --git a/src/Symfony/Component/Config/ConfigCacheFactory.php b/src/Symfony/Component/Config/ConfigCacheFactory.php index 5a8f456238..945b155b40 100644 --- a/src/Symfony/Component/Config/ConfigCacheFactory.php +++ b/src/Symfony/Component/Config/ConfigCacheFactory.php @@ -19,9 +19,6 @@ namespace Symfony\Component\Config; */ class ConfigCacheFactory implements ConfigCacheFactoryInterface { - /** - * @var bool Debug flag passed to the ConfigCache - */ private $debug; /** diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php index bd3984b825..2c2738ac4c 100644 --- a/src/Symfony/Component/Config/Definition/ArrayNode.php +++ b/src/Symfony/Component/Config/Definition/ArrayNode.php @@ -81,7 +81,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface /** * Sets the xml remappings that should be performed. * - * @param array $remappings an array of the form array(array(string, string)) + * @param array $remappings An array of the form array(array(string, string)) */ public function setXmlRemappings(array $remappings) { diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index c052c3df43..a0ad77edd0 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -67,7 +67,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition /** * Sets a prototype for child nodes. * - * @param string $type the type of node + * @param string $type The type of node * * @return NodeDefinition */ @@ -97,7 +97,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition * * This method is applicable to prototype nodes only. * - * @param int|string|array|null $children the number of children|The child name|The children names to be added + * @param int|string|array|null $children The number of children|The child name|The children names to be added * * @return $this */ diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php index 9b325f189b..152a497b14 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php @@ -61,7 +61,7 @@ class NodeBuilder implements NodeParentInterface /** * Creates a child scalar node. * - * @param string $name the name of the node + * @param string $name The name of the node * * @return ScalarNodeDefinition The child node */ @@ -85,7 +85,7 @@ class NodeBuilder implements NodeParentInterface /** * Creates a child integer node. * - * @param string $name the name of the node + * @param string $name The name of the node * * @return IntegerNodeDefinition The child node */ @@ -97,7 +97,7 @@ class NodeBuilder implements NodeParentInterface /** * Creates a child float node. * - * @param string $name the name of the node + * @param string $name The name of the node * * @return FloatNodeDefinition The child node */ diff --git a/src/Symfony/Component/Console/ConsoleEvents.php b/src/Symfony/Component/Console/ConsoleEvents.php index 1ed41b7daa..6dae6ce756 100644 --- a/src/Symfony/Component/Console/ConsoleEvents.php +++ b/src/Symfony/Component/Console/ConsoleEvents.php @@ -27,8 +27,6 @@ final class ConsoleEvents * instance. * * @Event - * - * @var string */ const COMMAND = 'console.command'; @@ -40,8 +38,6 @@ final class ConsoleEvents * instance. * * @Event - * - * @var string */ const TERMINATE = 'console.terminate'; @@ -54,8 +50,6 @@ final class ConsoleEvents * instance. * * @Event - * - * @var string */ const EXCEPTION = 'console.exception'; } diff --git a/src/Symfony/Component/Console/Event/ConsoleCommandEvent.php b/src/Symfony/Component/Console/Event/ConsoleCommandEvent.php index 92adf1ef96..2f517c1db3 100644 --- a/src/Symfony/Component/Console/Event/ConsoleCommandEvent.php +++ b/src/Symfony/Component/Console/Event/ConsoleCommandEvent.php @@ -25,8 +25,6 @@ class ConsoleCommandEvent extends ConsoleEvent /** * Indicates if the command should be run or skipped. - * - * @var bool */ private $commandShouldRun = true; diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php index c6aa1a920b..9ce4525d2a 100644 --- a/src/Symfony/Component/Console/Helper/ProgressBar.php +++ b/src/Symfony/Component/Console/Helper/ProgressBar.php @@ -22,7 +22,6 @@ use Symfony\Component\Console\Output\OutputInterface; */ class ProgressBar { - // options private $barWidth = 28; private $barChar; private $emptyBarChar = '-'; @@ -30,10 +29,6 @@ class ProgressBar private $format; private $internalFormat; private $redrawFreq = 1; - - /** - * @var OutputInterface - */ private $output; private $step = 0; private $max; diff --git a/src/Symfony/Component/Console/Helper/TableHelper.php b/src/Symfony/Component/Console/Helper/TableHelper.php index fc29abb370..a6e660892a 100644 --- a/src/Symfony/Component/Console/Helper/TableHelper.php +++ b/src/Symfony/Component/Console/Helper/TableHelper.php @@ -29,9 +29,6 @@ class TableHelper extends Helper const LAYOUT_BORDERLESS = 1; const LAYOUT_COMPACT = 2; - /** - * @var Table - */ private $table; public function __construct($triggerDeprecationError = true) diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php index d7a1f2d0fd..2f63e33cba 100644 --- a/src/Symfony/Component/Console/Input/InputDefinition.php +++ b/src/Symfony/Component/Console/Input/InputDefinition.php @@ -307,7 +307,7 @@ class InputDefinition /** * Gets an InputOption by shortcut. * - * @param string $shortcut the Shortcut name + * @param string $shortcut The Shortcut name * * @return InputOption An InputOption object */ diff --git a/src/Symfony/Component/Console/Output/BufferedOutput.php b/src/Symfony/Component/Console/Output/BufferedOutput.php index 205b02f5fd..8afc8931ed 100644 --- a/src/Symfony/Component/Console/Output/BufferedOutput.php +++ b/src/Symfony/Component/Console/Output/BufferedOutput.php @@ -16,9 +16,6 @@ namespace Symfony\Component\Console\Output; */ class BufferedOutput extends Output { - /** - * @var string - */ private $buffer = ''; /** diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php index 80bea654da..84efb98130 100644 --- a/src/Symfony/Component/Console/Output/ConsoleOutput.php +++ b/src/Symfony/Component/Console/Output/ConsoleOutput.php @@ -28,9 +28,6 @@ use Symfony\Component\Console\Formatter\OutputFormatterInterface; */ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface { - /** - * @var StreamOutput - */ private $stderr; /** diff --git a/src/Symfony/Component/CssSelector/Node/ElementNode.php b/src/Symfony/Component/CssSelector/Node/ElementNode.php index 71ef121741..1597e81a8e 100644 --- a/src/Symfony/Component/CssSelector/Node/ElementNode.php +++ b/src/Symfony/Component/CssSelector/Node/ElementNode.php @@ -21,14 +21,7 @@ namespace Symfony\Component\CssSelector\Node; */ class ElementNode extends AbstractNode { - /** - * @var string|null - */ private $namespace; - - /** - * @var string|null - */ private $element; /** diff --git a/src/Symfony/Component/CssSelector/Parser/Reader.php b/src/Symfony/Component/CssSelector/Parser/Reader.php index 0ba82b4ff6..2487867bab 100644 --- a/src/Symfony/Component/CssSelector/Parser/Reader.php +++ b/src/Symfony/Component/CssSelector/Parser/Reader.php @@ -21,19 +21,8 @@ namespace Symfony\Component\CssSelector\Parser; */ class Reader { - /** - * @var string - */ private $source; - - /** - * @var int - */ private $length; - - /** - * @var int - */ private $position = 0; /** diff --git a/src/Symfony/Component/CssSelector/Parser/Token.php b/src/Symfony/Component/CssSelector/Parser/Token.php index bcc31a23c5..0104da570a 100644 --- a/src/Symfony/Component/CssSelector/Parser/Token.php +++ b/src/Symfony/Component/CssSelector/Parser/Token.php @@ -29,19 +29,8 @@ class Token const TYPE_NUMBER = 'number'; const TYPE_STRING = 'string'; - /** - * @var int - */ private $type; - - /** - * @var string - */ private $value; - - /** - * @var int - */ private $position; /** diff --git a/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php b/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php index 2d0f26ac84..b548905fa2 100644 --- a/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php +++ b/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php @@ -21,64 +21,17 @@ namespace Symfony\Component\CssSelector\Parser\Tokenizer; */ class TokenizerPatterns { - /** - * @var string - */ private $unicodeEscapePattern; - - /** - * @var string - */ private $simpleEscapePattern; - - /** - * @var string - */ private $newLineEscapePattern; - - /** - * @var string - */ private $escapePattern; - - /** - * @var string - */ private $stringEscapePattern; - - /** - * @var string - */ private $nonAsciiPattern; - - /** - * @var string - */ private $nmCharPattern; - - /** - * @var string - */ private $nmStartPattern; - - /** - * @var string - */ private $identifierPattern; - - /** - * @var string - */ private $hashPattern; - - /** - * @var string - */ private $numberPattern; - - /** - * @var string - */ private $quotedStringPattern; public function __construct() diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php index 8a42d7f650..8169d7a95a 100644 --- a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php +++ b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php @@ -29,9 +29,6 @@ class NodeExtension extends AbstractExtension const ATTRIBUTE_NAME_IN_LOWER_CASE = 2; const ATTRIBUTE_VALUE_IN_LOWER_CASE = 4; - /** - * @var int - */ private $flags; /** diff --git a/src/Symfony/Component/CssSelector/XPath/XPathExpr.php b/src/Symfony/Component/CssSelector/XPath/XPathExpr.php index f75214b6f7..c0d2bd55a5 100644 --- a/src/Symfony/Component/CssSelector/XPath/XPathExpr.php +++ b/src/Symfony/Component/CssSelector/XPath/XPathExpr.php @@ -21,19 +21,8 @@ namespace Symfony\Component\CssSelector\XPath; */ class XPathExpr { - /** - * @var string - */ private $path; - - /** - * @var string - */ private $element; - - /** - * @var string - */ private $condition; /** diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php index cdc9ddb507..3da1a0d5be 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php @@ -26,9 +26,6 @@ class RepeatedPass implements CompilerPassInterface */ private $repeat = false; - /** - * @var RepeatablePassInterface[] - */ private $passes; /** diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index b180ad2ad8..65ea1c842c 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -104,7 +104,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface * If you are not using the loaders and therefore don't want * to depend on the Config component, set this flag to false. * - * @param bool $track true if you want to track resources, false otherwise + * @param bool $track True if you want to track resources, false otherwise */ public function setResourceTracking($track) { @@ -114,7 +114,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface /** * Checks if resources are tracked. * - * @return bool true if resources are tracked, false otherwise + * @return bool true If resources are tracked, false otherwise */ public function isTrackingResources() { diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 67bfd053e7..4527028ce0 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -38,15 +38,11 @@ class PhpDumper extends Dumper { /** * Characters that might appear in the generated variable name as first character. - * - * @var string */ const FIRST_CHARS = 'abcdefghijklmnopqrstuvwxyz'; /** * Characters that might appear in the generated variable name as any but the first character. - * - * @var string */ const NON_FIRST_CHARS = 'abcdefghijklmnopqrstuvwxyz0123456789_'; diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php index a8dd5252ed..417ab908a3 100644 --- a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php +++ b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php @@ -25,11 +25,10 @@ interface InstantiatorInterface /** * Instantiates a proxy object. * - * @param ContainerInterface $container the container from which the service is being requested - * @param Definition $definition the definition of the requested service - * @param string $id identifier of the requested service - * @param callable $realInstantiator zero-argument callback that is capable of producing the real - * service instance + * @param ContainerInterface $container The container from which the service is being requested + * @param Definition $definition The definition of the requested service + * @param string $id Identifier of the requested service + * @param callable $realInstantiator Zero-argument callback that is capable of producing the real service instance * * @return object */ diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php index 95c1f038c0..502c72abaf 100644 --- a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php +++ b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php @@ -31,7 +31,7 @@ interface DumperInterface * Generates the code to be used to instantiate a proxy in the dumped factory code. * * @param Definition $definition - * @param string $id service identifier + * @param string $id Service identifier * * @return string */ diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index aa711bf1a4..cccea633dd 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -20,9 +20,6 @@ use Symfony\Component\CssSelector\CssSelector; */ class Crawler extends \SplObjectStorage { - /** - * @var string The current URI - */ protected $uri; /** @@ -41,14 +38,14 @@ class Crawler extends \SplObjectStorage private $baseHref; /** - * @param mixed $node A Node to use as the base for the crawling - * @param string $currentUri The current URI - * @param string $baseHref The base href value + * @param mixed $node A Node to use as the base for the crawling + * @param string $uri The current URI + * @param string $baseHref The base href value */ - public function __construct($node = null, $currentUri = null, $baseHref = null) + public function __construct($node = null, $uri = null, $baseHref = null) { - $this->uri = $currentUri; - $this->baseHref = $baseHref ?: $currentUri; + $this->uri = $uri; + $this->baseHref = $baseHref ?: $uri; $this->add($node); } diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php index c51942c2cd..764517693c 100644 --- a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php +++ b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php @@ -19,19 +19,8 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; */ class RegisterListenersPass implements CompilerPassInterface { - /** - * @var string - */ protected $dispatcherService; - - /** - * @var string - */ protected $listenerTag; - - /** - * @var string - */ protected $subscriberTag; /** diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php index f9be02edc7..60160a90e0 100644 --- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php +++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php @@ -26,7 +26,7 @@ interface EventDispatcherInterface * @param string $eventName The name of the event to dispatch. The name of * the event is the name of the method that is * invoked on listeners. - * @param Event $event the event to pass to the event handlers/listeners + * @param Event $event The event to pass to the event handlers/listeners * If not supplied, an empty Event instance is created * * @return Event diff --git a/src/Symfony/Component/EventDispatcher/GenericEvent.php b/src/Symfony/Component/EventDispatcher/GenericEvent.php index 8907a0c2dc..95c99408de 100644 --- a/src/Symfony/Component/EventDispatcher/GenericEvent.php +++ b/src/Symfony/Component/EventDispatcher/GenericEvent.php @@ -20,22 +20,13 @@ namespace Symfony\Component\EventDispatcher; */ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate { - /** - * Event subject. - * - * @var mixed usually object or callable - */ protected $subject; - - /** - * Array of arguments. - */ protected $arguments; /** * Encapsulate an event with $subject and $args. * - * @param mixed $subject The subject of the event, usually an object + * @param mixed $subject The subject of the event, usually an object or a callable * @param array $arguments Arguments to store in the event */ public function __construct($subject = null, array $arguments = array()) diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php index 444b59a494..fae922b739 100644 --- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php +++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php @@ -21,9 +21,6 @@ use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface; */ class ExpressionLanguage { - /** - * @var ParserCacheInterface - */ private $cache; private $lexer; private $parser; diff --git a/src/Symfony/Component/Filesystem/LockHandler.php b/src/Symfony/Component/Filesystem/LockHandler.php index 3496faae21..517b2f01e6 100644 --- a/src/Symfony/Component/Filesystem/LockHandler.php +++ b/src/Symfony/Component/Filesystem/LockHandler.php @@ -56,7 +56,7 @@ class LockHandler /** * Lock the resource. * - * @param bool $blocking wait until the lock is released + * @param bool $blocking Wait until the lock is released * * @return bool Returns true if the lock was acquired, false otherwise * diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php index 5586a00547..0a1254818d 100644 --- a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php +++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php @@ -66,7 +66,7 @@ class FilesystemTestCase extends TestCase } /** - * @param int $expectedFilePerms expected file permissions as three digits (i.e. 755) + * @param int $expectedFilePerms Expected file permissions as three digits (i.e. 755) * @param string $filePath */ protected function assertFilePermissions($expectedFilePerms, $filePath) diff --git a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php index ca407b9cea..c28f03ce5f 100644 --- a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php +++ b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php @@ -26,9 +26,6 @@ use Symfony\Component\Finder\Comparator\DateComparator; */ abstract class AbstractFindAdapter extends AbstractAdapter { - /** - * @var Shell - */ protected $shell; public function __construct() diff --git a/src/Symfony/Component/Finder/Expression/Glob.php b/src/Symfony/Component/Finder/Expression/Glob.php index 14e8bad4fa..836fbb0acb 100644 --- a/src/Symfony/Component/Finder/Expression/Glob.php +++ b/src/Symfony/Component/Finder/Expression/Glob.php @@ -18,9 +18,6 @@ use Symfony\Component\Finder\Glob as FinderGlob; */ class Glob implements ValueInterface { - /** - * @var string - */ private $pattern; /** diff --git a/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php b/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php index d03a9ac78e..cfe31c90f7 100644 --- a/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php +++ b/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php @@ -13,9 +13,9 @@ namespace Symfony\Component\Finder\Tests\Iterator; class MockSplFileInfo extends \SplFileInfo { - const TYPE_DIRECTORY = 1; - const TYPE_FILE = 2; - const TYPE_UNKNOWN = 3; + const TYPE_DIRECTORY = 1; + const TYPE_FILE = 2; + const TYPE_UNKNOWN = 3; private $contents = null; private $mode = null; diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php index 452e24f1d1..970352ce9a 100644 --- a/src/Symfony/Component/Form/AbstractRendererEngine.php +++ b/src/Symfony/Component/Form/AbstractRendererEngine.php @@ -125,13 +125,13 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface * * @see getResourceForBlockHierarchy() * - * @param string $cacheKey the cache key used for storing the + * @param string $cacheKey The cache key used for storing the * resource - * @param FormView $view the form view for finding the applying + * @param FormView $view The form view for finding the applying * themes - * @param array $blockNameHierarchy the block hierarchy, with the most + * @param array $blockNameHierarchy The block hierarchy, with the most * specific block name at the end - * @param int $hierarchyLevel the level in the block hierarchy that + * @param int $hierarchyLevel The level in the block hierarchy that * should be loaded * * @return bool True if the resource could be loaded, false otherwise diff --git a/src/Symfony/Component/Form/CallbackTransformer.php b/src/Symfony/Component/Form/CallbackTransformer.php index 6f61370d5e..d80c2e9250 100644 --- a/src/Symfony/Component/Form/CallbackTransformer.php +++ b/src/Symfony/Component/Form/CallbackTransformer.php @@ -16,18 +16,7 @@ use Symfony\Component\Form\Exception\TransformationFailedException; class CallbackTransformer implements DataTransformerInterface { - /** - * The callback used for forward transform. - * - * @var callable - */ private $transform; - - /** - * The callback used for reverse transform. - * - * @var callable - */ private $reverseTransform; /** diff --git a/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php b/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php index f691d71330..ee00284bc4 100644 --- a/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php +++ b/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php @@ -27,11 +27,6 @@ use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface; */ class LazyChoiceList implements ChoiceListInterface { - /** - * The choice loader. - * - * @var ChoiceLoaderInterface - */ private $loader; /** @@ -56,8 +51,7 @@ class LazyChoiceList implements ChoiceListInterface * argument. * * @param ChoiceLoaderInterface $loader The choice loader - * @param null|callable $value The callable generating the choice - * values + * @param null|callable $value The callable generating the choice values */ public function __construct(ChoiceLoaderInterface $loader, $value = null) { diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php index 455fa68ac4..10272be7a5 100644 --- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php +++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php @@ -18,26 +18,14 @@ namespace Symfony\Component\Form\ChoiceList\View; */ class ChoiceGroupView implements \IteratorAggregate { - /** - * The label of the group. - * - * @var string - */ public $label; - - /** - * The choice views in the group. - * - * @var ChoiceGroupView[]|ChoiceView[] - */ public $choices; /** * Creates a new choice group view. * * @param string $label The label of the group - * @param ChoiceGroupView[]|ChoiceView[] $choices the choice views in the - * group + * @param ChoiceGroupView[]|ChoiceView[] $choices the choice views in the group */ public function __construct($label, array $choices = array()) { diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php index 05c40a4883..add892aab6 100644 --- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php +++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceListView.php @@ -22,26 +22,14 @@ namespace Symfony\Component\Form\ChoiceList\View; */ class ChoiceListView { - /** - * The choices. - * - * @var ChoiceGroupView[]|ChoiceView[] - */ public $choices; - - /** - * The preferred choices. - * - * @var ChoiceGroupView[]|ChoiceView[] - */ public $preferredChoices; /** * Creates a new choice list view. * * @param ChoiceGroupView[]|ChoiceView[] $choices The choice views - * @param ChoiceGroupView[]|ChoiceView[] $preferredChoices the preferred - * choice views + * @param ChoiceGroupView[]|ChoiceView[] $preferredChoices the preferred choice views */ public function __construct(array $choices = array(), array $preferredChoices = array()) { diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php index 5f32b5bbf4..a6f95db618 100644 --- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php +++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php @@ -21,25 +21,8 @@ namespace Symfony\Component\Form\Extension\Core\View; */ class ChoiceView { - /** - * The label displayed to humans. - * - * @var string - */ public $label; - - /** - * The view representation of the choice. - * - * @var string - */ public $value; - - /** - * The original choice value. - * - * @var mixed - */ public $data; /** diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php index 14860a59f7..f2037fba88 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php @@ -74,7 +74,7 @@ class ChoiceList implements ChoiceListInterface * level of the hierarchy may also be a \Traversable. * @param array $labels The array of labels. The structure of this array * should match the structure of $choices. - * @param array $preferredChoices a flat array of choices that should be + * @param array $preferredChoices A flat array of choices that should be * presented to the user with priority * * @throws UnexpectedTypeException if the choices are not an array or \Traversable @@ -252,10 +252,8 @@ class ChoiceList implements ChoiceListInterface /** * Recursively adds the given choices to the list. * - * @param array $bucketForPreferred the bucket where to store the preferred - * view objects - * @param array $bucketForRemaining the bucket where to store the - * non-preferred view objects + * @param array $bucketForPreferred The bucket where to store the preferred view objects + * @param array $bucketForRemaining The bucket where to store the non-preferred view objects * @param array|\Traversable $choices The list of choices * @param array $labels The labels corresponding to the choices * @param array $preferredChoices The preferred choices @@ -299,10 +297,8 @@ class ChoiceList implements ChoiceListInterface * Recursively adds a choice group. * * @param string $group The name of the group - * @param array $bucketForPreferred the bucket where to store the preferred - * view objects - * @param array $bucketForRemaining the bucket where to store the - * non-preferred view objects + * @param array $bucketForPreferred The bucket where to store the preferred view objects + * @param array $bucketForRemaining The bucket where to store the non-preferred view objects * @param array $choices The list of choices in the group * @param array $labels The labels corresponding to the choices in the group * @param array $preferredChoices The preferred choices @@ -336,10 +332,8 @@ class ChoiceList implements ChoiceListInterface /** * Adds a new choice. * - * @param array $bucketForPreferred the bucket where to store the preferred - * view objects - * @param array $bucketForRemaining the bucket where to store the - * non-preferred view objects + * @param array $bucketForPreferred The bucket where to store the preferred view objects + * @param array $bucketForRemaining The bucket where to store the non-preferred view objects * @param mixed $choice The choice to add * @param string $label The label for the choice * @param array $preferredChoices The preferred choices diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php index 5e2b9a75a2..26d491740a 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php @@ -80,7 +80,7 @@ class ObjectChoiceList extends ChoiceList * by calling the getter on the object. If the * path is NULL, the object's __toString() method * is used instead. - * @param array $preferredChoices a flat array of choices that should be + * @param array $preferredChoices A flat array of choices that should be * presented to the user with priority * @param string $groupPath A property path pointing to the property used * to group the choices. Only allowed if diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php index e5fd865d0d..bc2baa4c18 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php @@ -44,7 +44,7 @@ class SimpleChoiceList extends ChoiceList * as hierarchy of unlimited depth by creating nested * arrays. The title of the sub-hierarchy is stored * in the array key pointing to the nested array. - * @param array $preferredChoices a flat array of choices that should be + * @param array $preferredChoices A flat array of choices that should be * presented to the user with priority */ public function __construct(array $choices, array $preferredChoices = array()) @@ -83,10 +83,8 @@ class SimpleChoiceList extends ChoiceList * Takes care of splitting the single $choices array passed in the * constructor into choices and labels. * - * @param array $bucketForPreferred the bucket where to store the preferred - * view objects - * @param array $bucketForRemaining the bucket where to store the - * non-preferred view objects + * @param array $bucketForPreferred The bucket where to store the preferred view objects + * @param array $bucketForRemaining The bucket where to store the non-preferred view objects * @param array|\Traversable $choices The list of choices * @param array $labels Ignored * @param array $preferredChoices The preferred choices diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php index 231994258e..0c8eaf2344 100644 --- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php +++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php @@ -26,14 +26,7 @@ use Symfony\Component\PropertyAccess\PropertyAccessorInterface; */ class CoreExtension extends AbstractExtension { - /** - * @var PropertyAccessorInterface - */ private $propertyAccessor; - - /** - * @var ChoiceListFactoryInterface - */ private $choiceListFactory; public function __construct(PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null) diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php index f98b787cac..592d90862f 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/BooleanToStringTransformer.php @@ -22,17 +22,10 @@ use Symfony\Component\Form\Exception\TransformationFailedException; */ class BooleanToStringTransformer implements DataTransformerInterface { - /** - * The value emitted upon transform if the input is true. - * - * @var string - */ private $trueValue; /** - * Sets the value emitted upon transform if the input is true. - * - * @param string $trueValue + * @param string $trueValue The value emitted upon transform if the input is true */ public function __construct($trueValue) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php index b04d82fcd8..39635b2bb7 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php @@ -47,8 +47,7 @@ class ChoiceToBooleanArrayTransformer implements DataTransformerInterface * depending on whether a given option is selected. If this field is rendered * as select tag, the value is not modified. * - * @param mixed $choice an array if "multiple" is set to true, a scalar - * value otherwise + * @param mixed $choice An array if "multiple" is set to true, a scalar value otherwise * * @return mixed An array * @@ -87,10 +86,8 @@ class ChoiceToBooleanArrayTransformer implements DataTransformerInterface * * @return mixed A scalar value * - * @throws TransformationFailedException if the given value is not an array, - * if the recuperation of the choices - * fails or if some choice can't be - * found + * @throws TransformationFailedException if the given value is not an array, if the recuperation + * of the choices fails, or if some choice can't be found */ public function reverseTransform($values) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php index 597a141e65..e2c553c507 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php @@ -150,7 +150,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer /** * Returns a preconfigured IntlDateFormatter instance. * - * @param bool $ignoreTimezone use UTC regardless of the configured timezone + * @param bool $ignoreTimezone Use UTC regardless of the configured timezone * * @return \IntlDateFormatter * diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php index fdb142f84e..b843aa1823 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php @@ -32,7 +32,6 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface ); private $type; - private $scale; /** diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php index db9c1e6ff9..edd44108ff 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php @@ -21,27 +21,12 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException; */ class MergeCollectionListener implements EventSubscriberInterface { - /** - * Whether elements may be added to the collection. - * - * @var bool - */ private $allowAdd; - - /** - * Whether elements may be removed from the collection. - * - * @var bool - */ private $allowDelete; /** - * Creates a new listener. - * - * @param bool $allowAdd whether values might be added to the - * collection - * @param bool $allowDelete whether values might be removed from the - * collection + * @param bool $allowAdd Whether values might be added to the collection + * @param bool $allowDelete Whether values might be removed from the collection */ public function __construct($allowAdd = false, $allowDelete = false) { diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php index e61ae5b8a3..ef496b2c8a 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php @@ -34,8 +34,8 @@ class ResizeFormListener implements EventSubscriberInterface /** * @param string $type * @param array $options - * @param bool $allowAdd whether children could be added to the group - * @param bool $allowDelete whether children could be removed from the group + * @param bool $allowAdd Whether children could be added to the group + * @param bool $allowDelete Whether children could be removed from the group * @param bool $deleteEmpty */ public function __construct($type, array $options = array(), $allowAdd = false, $allowDelete = false, $deleteEmpty = false) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php index 6c0c0b4295..a90e7d482e 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php @@ -44,11 +44,6 @@ class ChoiceType extends AbstractType */ const DEPRECATED_EMPTY_VALUE = '__deprecated_empty_value__'; - /** - * Caches created choice lists. - * - * @var ChoiceListFactoryInterface - */ private $choiceListFactory; public function __construct(ChoiceListFactoryInterface $choiceListFactory = null) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php index c500d1552c..9cd25ed778 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php @@ -30,7 +30,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver; class DateTimeType extends AbstractType { const DEFAULT_DATE_FORMAT = \IntlDateFormatter::MEDIUM; - const DEFAULT_TIME_FORMAT = \IntlDateFormatter::MEDIUM; /** diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php index d77cdc8e70..f0a572861e 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php @@ -27,7 +27,6 @@ use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException; class DateType extends AbstractType { const DEFAULT_FORMAT = \IntlDateFormatter::MEDIUM; - const HTML5_FORMAT = 'yyyy-MM-dd'; private static $acceptedFormats = array( diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php index 1a1a3175e6..35c7bc67b2 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php @@ -24,9 +24,6 @@ use Symfony\Component\PropertyAccess\PropertyAccessorInterface; class FormType extends BaseType { - /** - * @var PropertyAccessorInterface - */ private $propertyAccessor; public function __construct(PropertyAccessorInterface $propertyAccessor = null) diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php index b5396669f6..d1e3bdb77a 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php @@ -25,19 +25,8 @@ use Symfony\Component\Translation\TranslatorInterface; */ class CsrfExtension extends AbstractExtension { - /** - * @var CsrfTokenManagerInterface - */ private $tokenManager; - - /** - * @var TranslatorInterface - */ private $translator; - - /** - * @var null|string - */ private $translationDomain; /** diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php index 011d34a680..069852345c 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php @@ -27,9 +27,6 @@ use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface; */ class CsrfProviderAdapter implements CsrfTokenManagerInterface { - /** - * @var CsrfProviderInterface - */ private $csrfProvider; public function __construct(CsrfProviderInterface $csrfProvider) diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php index 93ed314714..c0844da1b8 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php @@ -23,9 +23,6 @@ use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface; */ class CsrfTokenManagerAdapter implements CsrfProviderInterface { - /** - * @var CsrfTokenManagerInterface - */ private $tokenManager; public function __construct(CsrfTokenManagerInterface $tokenManager) diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/DefaultCsrfProvider.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/DefaultCsrfProvider.php index 387f4ccf35..fb32fa3fba 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/DefaultCsrfProvider.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/DefaultCsrfProvider.php @@ -30,11 +30,6 @@ use Symfony\Component\Security\Core\Util\StringUtils; */ class DefaultCsrfProvider implements CsrfProviderInterface { - /** - * A secret value used for generating the CSRF token. - * - * @var string - */ protected $secret; /** diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php index 2bbbde4a30..3ea038fb40 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php @@ -30,11 +30,6 @@ use Symfony\Component\HttpFoundation\Session\Session; */ class SessionCsrfProvider extends DefaultCsrfProvider { - /** - * The user session from which the session ID is returned. - * - * @var Session - */ protected $session; /** @@ -43,7 +38,7 @@ class SessionCsrfProvider extends DefaultCsrfProvider * A recommended value for the secret is a generated value with at least * 32 characters and mixed letters, digits and special characters. * - * @param Session $session The user session + * @param Session $session The user session from which the session ID is returned * @param string $secret A secret value included in the CSRF token */ public function __construct(Session $session, $secret) diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php index b232e4f3b7..96c87d266f 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php +++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php @@ -28,50 +28,12 @@ use Symfony\Component\Translation\TranslatorInterface; */ class CsrfValidationListener implements EventSubscriberInterface { - /** - * The name of the CSRF field. - * - * @var string - */ private $fieldName; - - /** - * The generator for CSRF tokens. - * - * @var CsrfTokenManagerInterface - */ private $tokenManager; - - /** - * A text mentioning the tokenId of the CSRF token. - * - * Validation of the token will only succeed if it was generated in the - * same session and with the same tokenId. - * - * @var string - */ private $tokenId; - - /** - * The message displayed in case of an error. - * - * @var string - */ private $errorMessage; - - /** - * @var TranslatorInterface - */ private $translator; - - /** - * @var null|string - */ private $translationDomain; - - /** - * @var ServerParams - */ private $serverParams; public static function getSubscribedEvents() @@ -81,6 +43,17 @@ class CsrfValidationListener implements EventSubscriberInterface ); } + /** + * @param string $fieldName The name of the CSRF field + * @param CsrfTokenManagerInterface $tokenManager The generator for CSRF tokens + * @param string $tokenId A text mentioning the tokenId of the CSRF token + * Validation of the token will only succeed if it was generated in the + * same session and with the same tokenId + * @param string $errorMessage The message displayed in case of an error + * @param TranslatorInterface $translator + * @param null|string $translationDomain + * @param ServerParams $serverParams + */ public function __construct($fieldName, $tokenManager, $tokenId, $errorMessage, TranslatorInterface $translator = null, $translationDomain = null, ServerParams $serverParams = null) { if ($tokenManager instanceof CsrfProviderInterface) { diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php index 2a34ef0e9e..646728bd1e 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php +++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php @@ -36,31 +36,20 @@ class FormTypeCsrfExtension extends AbstractTypeExtension */ private $defaultTokenManager; - /** - * @var bool - */ private $defaultEnabled; - - /** - * @var string - */ private $defaultFieldName; - - /** - * @var TranslatorInterface - */ private $translator; - - /** - * @var null|string - */ private $translationDomain; - - /** - * @var ServerParams - */ private $serverParams; + /** + * @param CsrfTokenManagerInterface|CsrfProviderInterface $defaultTokenManager + * @param bool $defaultEnabled + * @param string $defaultFieldName + * @param TranslatorInterface $translator + * @param null|string $translationDomain + * @param ServerParams $serverParams + */ public function __construct($defaultTokenManager, $defaultEnabled = true, $defaultFieldName = '_token', TranslatorInterface $translator = null, $translationDomain = null, ServerParams $serverParams = null) { if ($defaultTokenManager instanceof CsrfProviderInterface) { diff --git a/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php b/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php index 2f2e51c090..5b60cfbbcd 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Form\Extension\DataCollector; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Form\AbstractExtension; /** @@ -22,9 +21,6 @@ use Symfony\Component\Form\AbstractExtension; */ class DataCollectorExtension extends AbstractExtension { - /** - * @var EventSubscriberInterface - */ private $dataCollector; public function __construct(FormDataCollectorInterface $dataCollector) diff --git a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php index c80dd67141..1ae6e9f3ec 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php @@ -24,9 +24,6 @@ use Symfony\Component\Form\FormEvents; */ class DataCollectorListener implements EventSubscriberInterface { - /** - * @var FormDataCollectorInterface - */ private $dataCollector; public function __construct(FormDataCollectorInterface $dataCollector) diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php index 4c1d6f0bea..2f02e70f08 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php @@ -25,14 +25,7 @@ use Symfony\Component\Form\ResolvedFormTypeInterface; */ class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface { - /** - * @var ResolvedFormTypeInterface - */ private $proxiedType; - - /** - * @var FormDataCollectorInterface - */ private $dataCollector; public function __construct(ResolvedFormTypeInterface $proxiedType, FormDataCollectorInterface $dataCollector) diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php index 5051d0bb63..068d5cc0bf 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php @@ -24,14 +24,7 @@ use Symfony\Component\Form\ResolvedFormTypeInterface; */ class ResolvedTypeFactoryDataCollectorProxy implements ResolvedFormTypeFactoryInterface { - /** - * @var ResolvedFormTypeFactoryInterface - */ private $proxiedFactory; - - /** - * @var FormDataCollectorInterface - */ private $dataCollector; public function __construct(ResolvedFormTypeFactoryInterface $proxiedFactory, FormDataCollectorInterface $dataCollector) diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php b/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php index 6aa33b589e..4e07e11027 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php @@ -25,7 +25,7 @@ use Symfony\Component\Form\FormBuilderInterface; class DataCollectorTypeExtension extends AbstractTypeExtension { /** - * @var \Symfony\Component\EventDispatcher\EventSubscriberInterface + * @var DataCollectorListener */ private $listener; diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php index 004f4778f9..f65ee33f87 100644 --- a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php +++ b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php @@ -26,9 +26,6 @@ use Symfony\Component\HttpFoundation\Request; */ class HttpFoundationRequestHandler implements RequestHandlerInterface { - /** - * @var ServerParams - */ private $serverParams; /** diff --git a/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php b/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php index 72b0a4f3df..8e2ffa514d 100644 --- a/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php +++ b/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php @@ -20,9 +20,6 @@ use Symfony\Component\Templating\EngineInterface; */ class TemplatingRendererEngine extends AbstractRendererEngine { - /** - * @var EngineInterface - */ private $engine; public function __construct(EngineInterface $engine, array $defaultThemes = array()) diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php index 16030ae03f..99213d61c8 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php @@ -24,14 +24,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver; */ class FormTypeValidatorExtension extends BaseValidatorExtension { - /** - * @var ValidatorInterface - */ private $validator; - - /** - * @var ViolationMapper - */ private $violationMapper; /** diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php index 9f06a75d90..90dadd08d9 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php +++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php @@ -250,7 +250,7 @@ class ValidatorTypeGuesser implements FormTypeGuesserInterface * @param string $property The property for which to find constraints * @param \Closure $closure The closure that returns a guess * for a given constraint - * @param mixed $defaultValue the default value assumed if no other value + * @param mixed $defaultValue The default value assumed if no other value * can be guessed * * @return Guess|null The guessed value with the highest confidence diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php index dc37a15707..1fac736e8c 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php @@ -19,21 +19,15 @@ use Symfony\Component\Form\Exception\ErrorMappingException; */ class MappingRule { - /** - * @var FormInterface - */ private $origin; - - /** - * @var string - */ private $propertyPath; - - /** - * @var string - */ private $targetPath; + /** + * @param FormInterface $origin + * @param string $propertyPath + * @param string $targetPath + */ public function __construct(FormInterface $origin, $propertyPath, $targetPath) { $this->origin = $origin; diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php index ef5c9fad05..658bad5a48 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php @@ -19,9 +19,6 @@ use Symfony\Component\PropertyAccess\PropertyPath; */ class RelativePath extends PropertyPath { - /** - * @var FormInterface - */ private $root; /** diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php index 7f3a4297c3..49b7076b52 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php @@ -24,10 +24,8 @@ interface ViolationMapperInterface * the given form. * * @param ConstraintViolation $violation The violation to map - * @param FormInterface $form the root form of the tree - * to map it to - * @param bool $allowNonSynchronized whether to allow - * mapping to non-synchronized forms + * @param FormInterface $form The root form of the tree to map it to + * @param bool $allowNonSynchronized Whether to allow mapping to non-synchronized forms */ public function mapViolation(ConstraintViolation $violation, FormInterface $form, $allowNonSynchronized = false); } diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php index fcc2b7c103..007968ab4c 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php @@ -48,8 +48,7 @@ class ViolationPath implements \IteratorAggregate, PropertyPathInterface /** * Creates a new violation path from a string. * - * @param string $violationPath the property path of a {@link \Symfony\Component\Validator\ConstraintViolation} - * object + * @param string $violationPath The property path of a {@link \Symfony\Component\Validator\ConstraintViolation} object */ public function __construct($violationPath) { diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php index bd9e8d8de7..31e5a82210 100644 --- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php +++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php @@ -48,7 +48,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface * view to the normalized format. * * @param DataTransformerInterface $viewTransformer - * @param bool $forcePrepend if set to true, prepend instead of appending + * @param bool $forcePrepend If set to true, prepend instead of appending * * @return $this The configuration object */ @@ -70,7 +70,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface * normalized to the model format. * * @param DataTransformerInterface $modelTransformer - * @param bool $forceAppend if set to true, append instead of prepending + * @param bool $forceAppend If set to true, append instead of prepending * * @return $this The configuration object */ @@ -146,7 +146,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface /** * Sets the property path that the form should be mapped to. * - * @param null|string|PropertyPathInterface $propertyPath the property path or null if the path should be set + * @param null|string|PropertyPathInterface $propertyPath The property path or null if the path should be set * automatically based on the form's name * * @return $this The configuration object @@ -166,7 +166,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface /** * Sets whether the form's data should be modified by reference. * - * @param bool $byReference whether the data should be + * @param bool $byReference Whether the data should be * modified by reference * * @return $this The configuration object diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php index f3958e77ae..45032e2407 100644 --- a/src/Symfony/Component/Form/FormErrorIterator.php +++ b/src/Symfony/Component/Form/FormErrorIterator.php @@ -32,26 +32,17 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array { /** * The prefix used for indenting nested error messages. - * - * @var string */ const INDENTATION = ' '; - /** - * @var FormInterface - */ private $form; - - /** - * @var FormError[]|FormErrorIterator[] - */ private $errors; /** * Creates a new iterator. * - * @param FormInterface $form The erroneous form - * @param array $errors The form errors + * @param FormInterface $form The erroneous form + * @param FormError[]|FormErrorIterator[] $errors The form errors * * @throws InvalidArgumentException If the errors are invalid */ diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php index e87e457a7b..c0e9249203 100644 --- a/src/Symfony/Component/Form/FormFactory.php +++ b/src/Symfony/Component/Form/FormFactory.php @@ -15,14 +15,7 @@ use Symfony\Component\Form\Exception\UnexpectedTypeException; class FormFactory implements FormFactoryInterface { - /** - * @var FormRegistryInterface - */ private $registry; - - /** - * @var ResolvedFormTypeFactoryInterface - */ private $resolvedTypeFactory; public function __construct(FormRegistryInterface $registry, ResolvedFormTypeFactoryInterface $resolvedTypeFactory) diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php index fcfbaaf96c..1d94252ff4 100644 --- a/src/Symfony/Component/Form/FormInterface.php +++ b/src/Symfony/Component/Form/FormInterface.php @@ -268,7 +268,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * Submits data to the form, transforms and validates it. * * @param mixed $submittedData The submitted data - * @param bool $clearMissing whether to set fields to NULL when they + * @param bool $clearMissing Whether to set fields to NULL when they * are missing in the submitted data * * @return $this diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php index 9d116b8608..e2300ef5a2 100644 --- a/src/Symfony/Component/Form/FormRendererEngineInterface.php +++ b/src/Symfony/Component/Form/FormRendererEngineInterface.php @@ -40,7 +40,7 @@ interface FormRendererEngineInterface * First the themes attached directly to the * view with {@link setTheme()} are considered, * then the ones of its parent etc. - * @param string $blockName the name of the block to render + * @param string $blockName The name of the block to render * * @return mixed the renderer resource or false, if none was found */ @@ -74,7 +74,7 @@ interface FormRendererEngineInterface * First the themes attached directly to * the view with {@link setTheme()} are * considered, then the ones of its parent etc. - * @param array $blockNameHierarchy the block name hierarchy, with the root block + * @param array $blockNameHierarchy The block name hierarchy, with the root block * at the beginning * @param int $hierarchyLevel The level in the hierarchy at which to start * looking. Level 0 indicates the root block, i.e. @@ -114,7 +114,7 @@ interface FormRendererEngineInterface * First the themes attached directly to * the view with {@link setTheme()} are * considered, then the ones of its parent etc. - * @param array $blockNameHierarchy the block name hierarchy, with the root block + * @param array $blockNameHierarchy The block name hierarchy, with the root block * at the beginning * @param int $hierarchyLevel The level in the hierarchy at which to start * looking. Level 0 indicates the root block, i.e. diff --git a/src/Symfony/Component/Form/Guess/Guess.php b/src/Symfony/Component/Form/Guess/Guess.php index 2576b59437..b216af5d55 100644 --- a/src/Symfony/Component/Form/Guess/Guess.php +++ b/src/Symfony/Component/Form/Guess/Guess.php @@ -26,29 +26,21 @@ abstract class Guess { /** * Marks an instance with a value that is extremely likely to be correct. - * - * @var int */ const VERY_HIGH_CONFIDENCE = 3; /** * Marks an instance with a value that is very likely to be correct. - * - * @var int */ const HIGH_CONFIDENCE = 2; /** * Marks an instance with a value that is likely to be correct. - * - * @var int */ const MEDIUM_CONFIDENCE = 1; /** * Marks an instance with a value that may be correct. - * - * @var int */ const LOW_CONFIDENCE = 0; diff --git a/src/Symfony/Component/Form/PreloadedExtension.php b/src/Symfony/Component/Form/PreloadedExtension.php index 871e8b3791..37b881e0bd 100644 --- a/src/Symfony/Component/Form/PreloadedExtension.php +++ b/src/Symfony/Component/Form/PreloadedExtension.php @@ -20,19 +20,8 @@ use Symfony\Component\Form\Exception\InvalidArgumentException; */ class PreloadedExtension implements FormExtensionInterface { - /** - * @var FormTypeInterface[] - */ private $types = array(); - - /** - * @var array[FormTypeExtensionInterface[]] - */ private $typeExtensions = array(); - - /** - * @var FormTypeGuesserInterface - */ private $typeGuesser; /** diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php index f874e5a439..53243c88f7 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php @@ -29,11 +29,8 @@ use Symfony\Component\Validator\ConstraintViolationInterface; class ViolationMapperTest extends TestCase { const LEVEL_0 = 0; - const LEVEL_1 = 1; - const LEVEL_1B = 2; - const LEVEL_2 = 3; /** diff --git a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php index 11562475d8..d9d874af61 100644 --- a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php +++ b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php @@ -58,9 +58,9 @@ class OrderedHashMapIterator implements \Iterator /** * Creates a new iterator. * - * @param array $elements the elements of the map, indexed by their + * @param array $elements The elements of the map, indexed by their * keys - * @param array $orderedKeys the keys of the map in the order in which + * @param array $orderedKeys The keys of the map in the order in which * they should be iterated * @param array $managedCursors An array from which to reference the * iterator's cursor as long as it is alive. diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php b/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php index e07a48aa95..c69dbbba35 100644 --- a/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php +++ b/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php @@ -18,24 +18,9 @@ namespace Symfony\Component\HttpFoundation; */ class AcceptHeaderItem { - /** - * @var string - */ private $value; - - /** - * @var float - */ private $quality = 1.0; - - /** - * @var int - */ private $index = 0; - - /** - * @var array - */ private $attributes = array(); /** diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php index 9a2d28491a..082d8d534e 100644 --- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php +++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php @@ -24,41 +24,10 @@ use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser; */ class UploadedFile extends File { - /** - * Whether the test mode is activated. - * - * Local files are used in test mode hence the code should not enforce HTTP uploads. - * - * @var bool - */ private $test = false; - - /** - * The original name of the uploaded file. - * - * @var string - */ private $originalName; - - /** - * The mime type provided by the uploader. - * - * @var string - */ private $mimeType; - - /** - * The file size provided by the uploader. - * - * @var int|null - */ private $size; - - /** - * The UPLOAD_ERR_XXX constant provided by the uploader. - * - * @var int - */ private $error; /** @@ -76,11 +45,12 @@ class UploadedFile extends File * Calling any other method on an non-valid instance will cause an unpredictable result. * * @param string $path The full temporary path to the file - * @param string $originalName The original file name + * @param string $originalName The original file name of the uploaded file * @param string|null $mimeType The type of the file as provided by PHP; null defaults to application/octet-stream - * @param int|null $size The file size + * @param int|null $size The file size provided by the uploader * @param int|null $error The error constant of the upload (one of PHP's UPLOAD_ERR_XXX constants); null defaults to UPLOAD_ERR_OK * @param bool $test Whether the test mode is active + * Local files are used in test mode hence the code should not enforce HTTP uploads * * @throws FileException If file_uploads is disabled * @throws FileNotFoundException If the file does not exist diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index b987c5b902..83b62142c9 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -714,9 +714,9 @@ class Request * It is better to explicitly get request parameters from the appropriate * public property instead (query, attributes, request). * - * @param string $key the key - * @param mixed $default the default value if the parameter key does not exist - * @param bool $deep is parameter deep in multidimensional array + * @param string $key The key + * @param mixed $default The default value if the parameter key does not exist + * @param bool $deep Is parameter deep in multidimensional array * * @return mixed */ diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php index e149801aad..abbf37ee7c 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php @@ -19,11 +19,6 @@ namespace Symfony\Component\HttpFoundation\Session\Attribute; */ class NamespacedAttributeBag extends AttributeBag { - /** - * Namespace character. - * - * @var string - */ private $namespaceCharacter; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php index 5a765654c1..d20a4daff9 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Session.php +++ b/src/Symfony/Component/HttpFoundation/Session/Session.php @@ -24,21 +24,9 @@ use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage; */ class Session implements SessionInterface, \IteratorAggregate, \Countable { - /** - * Storage driver. - * - * @var SessionStorageInterface - */ protected $storage; - /** - * @var string - */ private $flashName; - - /** - * @var string - */ private $attributeName; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php index 900fb9f5f2..458bb73b3f 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php @@ -31,9 +31,6 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; */ class LegacyPdoSessionHandler implements \SessionHandlerInterface { - /** - * @var \PDO PDO instance - */ private $pdo; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php index d31aa7667e..89b4dac2c6 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php @@ -16,9 +16,6 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; */ class MemcacheSessionHandler implements \SessionHandlerInterface { - /** - * @var \Memcache Memcache driver - */ private $memcache; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php index 3bbde5420d..6e2c2ee306 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php @@ -21,9 +21,6 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; */ class MemcachedSessionHandler implements \SessionHandlerInterface { - /** - * @var \Memcached Memcached driver - */ private $memcached; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php index f140939dbd..29fc3f529b 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php @@ -16,9 +16,6 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; */ class MongoDbSessionHandler implements \SessionHandlerInterface { - /** - * @var \Mongo|\MongoClient|\MongoDB\Client - */ private $mongo; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php index d49c36cae5..7f4b6bc034 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/WriteCheckSessionHandler.php @@ -18,9 +18,6 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; */ class WriteCheckSessionHandler implements \SessionHandlerInterface { - /** - * @var \SessionHandlerInterface - */ private $wrappedSessionHandler; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php index 8c1bf73cae..0a580d6027 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php @@ -24,9 +24,6 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; */ class MockFileSessionStorage extends MockArraySessionStorage { - /** - * @var string - */ private $savePath; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php index 21ed1ada04..a0f48c1e27 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/NativeProxy.php @@ -12,7 +12,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy; /** - * This proxy is built-in session handlers in PHP 5.3.x + * This proxy is built-in session handlers in PHP 5.3.x. * * @author Drak */ diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php index 8f91f06048..6190d3ed1f 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php @@ -16,9 +16,6 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy; */ class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface { - /** - * @var \SessionHandlerInterface - */ protected $handler; /** diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php index 06193c8bef..75be18beff 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php @@ -22,6 +22,7 @@ class MemcacheSessionHandlerTest extends TestCase { const PREFIX = 'prefix_'; const TTL = 1000; + /** * @var MemcacheSessionHandler */ diff --git a/src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php b/src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php index 71b090cf0b..324e8d65d9 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/Util/ValueExporter.php @@ -20,8 +20,8 @@ class ValueExporter * Converts a PHP value to a string. * * @param mixed $value The PHP value - * @param int $depth only for internal usage - * @param bool $deep only for internal usage + * @param int $depth Only for internal usage + * @param bool $deep Only for internal usage * * @return string The string representation of the given value */ diff --git a/src/Symfony/Component/HttpKernel/Event/KernelEvent.php b/src/Symfony/Component/HttpKernel/Event/KernelEvent.php index 2043a01758..992f6b4dc0 100644 --- a/src/Symfony/Component/HttpKernel/Event/KernelEvent.php +++ b/src/Symfony/Component/HttpKernel/Event/KernelEvent.php @@ -22,28 +22,16 @@ use Symfony\Component\EventDispatcher\Event; */ class KernelEvent extends Event { - /** - * The kernel in which this event was thrown. - * - * @var HttpKernelInterface - */ private $kernel; - - /** - * The request the kernel is currently processing. - * - * @var Request - */ private $request; - - /** - * The request type the kernel is currently processing. One of - * HttpKernelInterface::MASTER_REQUEST and HttpKernelInterface::SUB_REQUEST. - * - * @var int - */ private $requestType; + /** + * @param HttpKernelInterface $kernel The kernel in which this event was thrown + * @param Request $request The request the kernel is currently processing + * @param int $requestType The request type the kernel is currently processing; one of + * HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST + */ public function __construct(HttpKernelInterface $kernel, Request $request, $requestType) { $this->kernel = $kernel; diff --git a/src/Symfony/Component/HttpKernel/Event/PostResponseEvent.php b/src/Symfony/Component/HttpKernel/Event/PostResponseEvent.php index 5d4450b357..85f344749c 100644 --- a/src/Symfony/Component/HttpKernel/Event/PostResponseEvent.php +++ b/src/Symfony/Component/HttpKernel/Event/PostResponseEvent.php @@ -23,15 +23,8 @@ use Symfony\Component\HttpFoundation\Response; */ class PostResponseEvent extends Event { - /** - * The kernel in which this event was thrown. - * - * @var HttpKernelInterface - */ private $kernel; - private $request; - private $response; public function __construct(HttpKernelInterface $kernel, Request $request, Response $response) diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php index 66df1295fc..16622091aa 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php @@ -41,8 +41,8 @@ class ProfilerListener implements EventSubscriberInterface /** * @param Profiler $profiler A Profiler instance * @param RequestMatcherInterface|null $matcher A RequestMatcher instance - * @param bool $onlyException true if the profiler only collects data when an exception occurs, false otherwise - * @param bool $onlyMasterRequests true if the profiler only collects data when the request is a master request, false otherwise + * @param bool $onlyException True if the profiler only collects data when an exception occurs, false otherwise + * @param bool $onlyMasterRequests True if the profiler only collects data when the request is a master request, false otherwise * @param RequestStack|null $requestStack A RequestStack instance */ public function __construct(Profiler $profiler, RequestMatcherInterface $matcher = null, $onlyException = false, $onlyMasterRequests = false, RequestStack $requestStack = null) diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index 7ca29d238a..0166331ff3 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -309,7 +309,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface * it triggers "miss" processing. * * @param Request $request A Request instance - * @param bool $catch whether to process exceptions + * @param bool $catch Whether to process exceptions * * @return Response A Response instance * @@ -426,7 +426,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface * This methods is triggered when the cache missed or a reload is required. * * @param Request $request A Request instance - * @param bool $catch whether to process exceptions + * @param bool $catch Whether to process exceptions * * @return Response A Response instance */ diff --git a/src/Symfony/Component/HttpKernel/KernelEvents.php b/src/Symfony/Component/HttpKernel/KernelEvents.php index abbbfcc004..8f86c56682 100644 --- a/src/Symfony/Component/HttpKernel/KernelEvents.php +++ b/src/Symfony/Component/HttpKernel/KernelEvents.php @@ -28,8 +28,6 @@ final class KernelEvents * instance. * * @Event - * - * @var string */ const REQUEST = 'kernel.request'; @@ -42,8 +40,6 @@ final class KernelEvents * instance. * * @Event - * - * @var string */ const EXCEPTION = 'kernel.exception'; @@ -57,8 +53,6 @@ final class KernelEvents * instance. * * @Event - * - * @var string */ const VIEW = 'kernel.view'; @@ -71,8 +65,6 @@ final class KernelEvents * Symfony\Component\HttpKernel\Event\FilterControllerEvent instance. * * @Event - * - * @var string */ const CONTROLLER = 'kernel.controller'; @@ -85,8 +77,6 @@ final class KernelEvents * Symfony\Component\HttpKernel\Event\FilterResponseEvent instance. * * @Event - * - * @var string */ const RESPONSE = 'kernel.response'; @@ -98,8 +88,6 @@ final class KernelEvents * Symfony\Component\HttpKernel\Event\PostResponseEvent instance. * * @Event - * - * @var string */ const TERMINATE = 'kernel.terminate'; @@ -112,8 +100,6 @@ final class KernelEvents * Symfony\Component\HttpKernel\Event\FinishRequestEvent instance. * * @Event - * - * @var string */ const FINISH_REQUEST = 'kernel.finish_request'; } diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profile.php b/src/Symfony/Component/HttpKernel/Profiler/Profile.php index 024ca28ac9..5ebaae4f8d 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profile.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profile.php @@ -164,7 +164,7 @@ class Profile } /** - * @param int The time + * @param int $time The time */ public function setTime($time) { diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php index b3df7387c2..ef54e402e9 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php @@ -22,17 +22,13 @@ use Symfony\Component\Intl\Exception\RuntimeException; */ class GenrbCompiler implements BundleCompilerInterface { - /** - * @var string The path to the "genrb" executable - */ private $genrb; /** * Creates a new compiler based on the "genrb" executable. * * @param string $genrb Optional. The path to the "genrb" executable - * @param string $envVars Optional. Environment variables to be loaded when - * running "genrb". + * @param string $envVars Optional. Environment variables to be loaded when running "genrb". * * @throws RuntimeException if the "genrb" cannot be found */ diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php index 1826fcd0fa..5fee153259 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php @@ -20,19 +20,14 @@ use Symfony\Component\Intl\Data\Util\RingBuffer; */ class BufferedBundleReader implements BundleReaderInterface { - /** - * @var BundleReaderInterface - */ private $reader; - private $buffer; /** * Buffers a given reader. * * @param BundleReaderInterface $reader The reader to buffer - * @param int $bufferSize the number of entries to store - * in the buffer + * @param int $bufferSize The number of entries to store in the buffer */ public function __construct(BundleReaderInterface $reader, $bufferSize) { diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php index a0fb4334f9..3a444fd350 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php @@ -46,7 +46,7 @@ class TextBundleWriter implements BundleWriterInterface * @param resource $file The file handle to write to * @param string $bundleName The name of the bundle * @param mixed $value The value of the node - * @param bool $fallback whether the resource bundle should be merged + * @param bool $fallback Whether the resource bundle should be merged * with the fallback locale * * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt @@ -66,8 +66,7 @@ class TextBundleWriter implements BundleWriterInterface * @param resource $file The file handle to write to * @param mixed $value The value of the node * @param int $indentation The number of levels to indent - * @param bool $requireBraces whether to require braces to be printed - * around the value + * @param bool $requireBraces Whether to require braces to be printedaround the value * * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt */ @@ -153,7 +152,7 @@ class TextBundleWriter implements BundleWriterInterface * * @param resource $file The file handle to write to * @param string $value The value of the node - * @param bool $requireBraces whether to require braces to be printed + * @param bool $requireBraces Whether to require braces to be printed * around the value * * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt @@ -199,7 +198,7 @@ class TextBundleWriter implements BundleWriterInterface * @param resource $file The file handle to write to * @param array|\Traversable $value The value of the node * @param int $indentation The number of levels to indent - * @param bool $fallback whether the table should be merged + * @param bool $fallback Whether the table should be merged * with the fallback locale * * @throws UnexpectedTypeException when $value is not an array and not a diff --git a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php index 6b7cf5a0ca..68a27c4323 100644 --- a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php @@ -26,20 +26,13 @@ use Symfony\Component\Intl\Data\Bundle\Reader\IntlBundleReader; */ abstract class AbstractDataGenerator { - /** - * @var GenrbCompiler - */ private $compiler; - - /** - * @var string - */ private $dirName; public function __construct(GenrbCompiler $compiler, $dirName) { $this->compiler = $compiler; - $this->dirName = $dirName; + $this->dirName = (string) $dirName; } public function generateData(GeneratorConfig $config) diff --git a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php index cd9da7c13c..bd18664345 100644 --- a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php @@ -26,29 +26,17 @@ use Symfony\Component\Intl\Data\Util\LocaleScanner; class CurrencyDataGenerator extends AbstractDataGenerator { const UNKNOWN_CURRENCY_ID = 'XXX'; - const EUROPEAN_COMPOSITE_UNIT_ID = 'XBA'; - const EUROPEAN_MONETARY_UNIT_ID = 'XBB'; - const EUROPEAN_UNIT_OF_ACCOUNT_XBC_ID = 'XBC'; - const EUROPEAN_UNIT_OF_ACCOUNT_XBD_ID = 'XBD'; - const TESTING_CURRENCY_CODE_ID = 'XTS'; - const ADB_UNIT_OF_ACCOUNT_ID = 'XUA'; - const GOLD_ID = 'XAU'; - const SILVER_ID = 'XAG'; - const PLATINUM_ID = 'XPT'; - const PALLADIUM_ID = 'XPD'; - const SUCRE_ID = 'XSU'; - const SPECIAL_DRAWING_RIGHTS_ID = 'XDR'; /** diff --git a/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php b/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php index 78e16ef4d8..9bb9304db0 100644 --- a/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php +++ b/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php @@ -22,14 +22,7 @@ use Symfony\Component\Intl\Data\Bundle\Writer\BundleWriterInterface; */ class GeneratorConfig { - /** - * @var string - */ private $sourceDir; - - /** - * @var string - */ private $icuVersion; /** @@ -37,6 +30,10 @@ class GeneratorConfig */ private $bundleWriters = array(); + /** + * @param string $sourceDir + * @param string $icuVersion + */ public function __construct($sourceDir, $icuVersion) { $this->sourceDir = $sourceDir; diff --git a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php index e89e5e8757..5951a77043 100644 --- a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php @@ -29,29 +29,14 @@ use Symfony\Component\Intl\Locale; */ class LocaleDataGenerator { - /** - * @var string - */ private $dirName; - - /** - * @var LanguageDataProvider - */ private $languageDataProvider; - - /** - * @var ScriptDataProvider - */ private $scriptDataProvider; - - /** - * @var RegionDataProvider - */ private $regionDataProvider; public function __construct($dirName, LanguageDataProvider $languageDataProvider, ScriptDataProvider $scriptDataProvider, RegionDataProvider $regionDataProvider) { - $this->dirName = $dirName; + $this->dirName = (string) $dirName; $this->languageDataProvider = $languageDataProvider; $this->scriptDataProvider = $scriptDataProvider; $this->regionDataProvider = $regionDataProvider; diff --git a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php index 9c9006d7ba..7ae31bd121 100644 --- a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php @@ -28,17 +28,11 @@ use Symfony\Component\Intl\Data\Util\LocaleScanner; class RegionDataGenerator extends AbstractDataGenerator { const UNKNOWN_REGION_ID = 'ZZ'; - const OUTLYING_OCEANIA_REGION_ID = 'QO'; - const EUROPEAN_UNION_ID = 'EU'; - const NETHERLANDS_ANTILLES_ID = 'AN'; - const BOUVET_ISLAND_ID = 'BV'; - const HEARD_MCDONALD_ISLANDS_ID = 'HM'; - const CLIPPERTON_ISLAND_ID = 'CP'; /** diff --git a/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php index c2747f0806..6818a7948d 100644 --- a/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php +++ b/src/Symfony/Component/Intl/Data/Provider/CurrencyDataProvider.php @@ -25,21 +25,11 @@ use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface; class CurrencyDataProvider { const INDEX_SYMBOL = 0; - const INDEX_NAME = 1; - const INDEX_FRACTION_DIGITS = 0; - const INDEX_ROUNDING_INCREMENT = 1; - /** - * @var string - */ private $path; - - /** - * @var BundleEntryReaderInterface - */ private $reader; /** diff --git a/src/Symfony/Component/Intl/Data/Provider/LanguageDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/LanguageDataProvider.php index b601c91405..0eb5987d10 100644 --- a/src/Symfony/Component/Intl/Data/Provider/LanguageDataProvider.php +++ b/src/Symfony/Component/Intl/Data/Provider/LanguageDataProvider.php @@ -23,23 +23,14 @@ use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface; */ class LanguageDataProvider { - /** - * @var string - */ private $path; - - /** - * @var BundleEntryReaderInterface - */ private $reader; /** * Creates a data provider that reads locale-related data from .res files. * - * @param string $path The path to the directory - * containing the .res files. - * @param BundleEntryReaderInterface $reader The reader for reading the .res - * files. + * @param string $path The path to the directory containing the .res files + * @param BundleEntryReaderInterface $reader The reader for reading the .res files */ public function __construct($path, BundleEntryReaderInterface $reader) { diff --git a/src/Symfony/Component/Intl/Data/Provider/LocaleDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/LocaleDataProvider.php index dc8bd64149..0eb82f621e 100644 --- a/src/Symfony/Component/Intl/Data/Provider/LocaleDataProvider.php +++ b/src/Symfony/Component/Intl/Data/Provider/LocaleDataProvider.php @@ -23,23 +23,14 @@ use Symfony\Component\Intl\Locale; */ class LocaleDataProvider { - /** - * @var string - */ private $path; - - /** - * @var BundleEntryReaderInterface - */ private $reader; /** * Creates a data provider that reads locale-related data from .res files. * - * @param string $path The path to the directory - * containing the .res files. - * @param BundleEntryReaderInterface $reader The reader for reading the .res - * files. + * @param string $path The path to the directory containing the .res files + * @param BundleEntryReaderInterface $reader The reader for reading the .res files */ public function __construct($path, BundleEntryReaderInterface $reader) { diff --git a/src/Symfony/Component/Intl/Data/Provider/RegionDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/RegionDataProvider.php index 6adea143a1..d3c8164158 100644 --- a/src/Symfony/Component/Intl/Data/Provider/RegionDataProvider.php +++ b/src/Symfony/Component/Intl/Data/Provider/RegionDataProvider.php @@ -23,23 +23,14 @@ use Symfony\Component\Intl\Locale; */ class RegionDataProvider { - /** - * @var string - */ private $path; - - /** - * @var BundleEntryReaderInterface - */ private $reader; /** * Creates a data provider that reads locale-related data from .res files. * - * @param string $path The path to the directory - * containing the .res files. - * @param BundleEntryReaderInterface $reader The reader for reading the .res - * files. + * @param string $path The path to the directory containing the .res files + * @param BundleEntryReaderInterface $reader The reader for reading the .res files */ public function __construct($path, BundleEntryReaderInterface $reader) { diff --git a/src/Symfony/Component/Intl/Data/Provider/ScriptDataProvider.php b/src/Symfony/Component/Intl/Data/Provider/ScriptDataProvider.php index 462690d4d4..29ff1d63ae 100644 --- a/src/Symfony/Component/Intl/Data/Provider/ScriptDataProvider.php +++ b/src/Symfony/Component/Intl/Data/Provider/ScriptDataProvider.php @@ -23,23 +23,14 @@ use Symfony\Component\Intl\Locale; */ class ScriptDataProvider { - /** - * @var string - */ private $path; - - /** - * @var BundleEntryReaderInterface - */ private $reader; /** * Creates a data provider that reads locale-related data from .res files. * - * @param string $path The path to the directory - * containing the .res files. - * @param BundleEntryReaderInterface $reader The reader for reading the .res - * files. + * @param string $path The path to the directory containing the .res files + * @param BundleEntryReaderInterface $reader The reader for reading the .res files */ public function __construct($path, BundleEntryReaderInterface $reader) { diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php index c4a69bb9a4..cf5870bc79 100644 --- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php +++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php @@ -92,14 +92,7 @@ class IntlDateFormatter self::SHORT => 'h:mm a', ); - /** - * @var int - */ private $datetype; - - /** - * @var int - */ private $timetype; /** @@ -161,7 +154,7 @@ class IntlDateFormatter * @param int $datetype Type of date formatting, one of the format type constants * @param int $timetype Type of time formatting, one of the format type constants * @param string $timezone Timezone identifier - * @param int $calendar calendar to use for formatting or parsing; default is Gregorian + * @param int $calendar Calendar to use for formatting or parsing; default is Gregorian * One of the calendar constants * @param string $pattern Optional pattern to use when formatting * diff --git a/src/Symfony/Component/Intl/Globals/IntlGlobals.php b/src/Symfony/Component/Intl/Globals/IntlGlobals.php index 2d5d4d3600..8b23fb0868 100644 --- a/src/Symfony/Component/Intl/Globals/IntlGlobals.php +++ b/src/Symfony/Component/Intl/Globals/IntlGlobals.php @@ -20,29 +20,21 @@ abstract class IntlGlobals { /** * Indicates that no error occurred. - * - * @var int */ const U_ZERO_ERROR = 0; /** * Indicates that an invalid argument was passed. - * - * @var int */ const U_ILLEGAL_ARGUMENT_ERROR = 1; /** * Indicates that the parse() operation failed. - * - * @var int */ const U_PARSE_ERROR = 9; /** * All known error codes. - * - * @var array */ private static $errorCodes = array( self::U_ZERO_ERROR => 'U_ZERO_ERROR', @@ -52,15 +44,11 @@ abstract class IntlGlobals /** * The error code of the last operation. - * - * @var int */ private static $errorCode = self::U_ZERO_ERROR; /** * The error code of the last operation. - * - * @var int */ private static $errorMessage = 'U_ZERO_ERROR'; diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php index 64b978d752..f68a60143a 100644 --- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php +++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php @@ -148,8 +148,6 @@ class NumberFormatter /** * Default values for the en locale. - * - * @var array */ private $attributes = array( self::FRACTION_DIGITS => 0, @@ -159,15 +157,11 @@ class NumberFormatter /** * Holds the initialized attributes code. - * - * @var array */ private $initializedAttributes = array(); /** * The supported styles to the constructor $styles argument. - * - * @var array */ private static $supportedStyles = array( 'CURRENCY' => self::CURRENCY, @@ -176,8 +170,6 @@ class NumberFormatter /** * Supported attributes to the setAttribute() $attr argument. - * - * @var array */ private static $supportedAttributes = array( 'FRACTION_DIGITS' => self::FRACTION_DIGITS, @@ -189,8 +181,6 @@ class NumberFormatter * The available rounding modes for setAttribute() usage with * NumberFormatter::ROUNDING_MODE. NumberFormatter::ROUND_DOWN * and NumberFormatter::ROUND_UP does not have a PHP only equivalent. - * - * @var array */ private static $roundingModes = array( 'ROUND_HALFEVEN' => self::ROUND_HALFEVEN, @@ -207,8 +197,6 @@ class NumberFormatter * modes in PHP's round() function. * * @see http://www.php.net/manual/en/function.round.php - * - * @var array */ private static $phpRoundingMap = array( self::ROUND_HALFDOWN => \PHP_ROUND_HALF_DOWN, @@ -220,8 +208,6 @@ class NumberFormatter * The list of supported rounding modes which aren't available modes in * PHP's round() function, but there's an equivalent. Keys are rounding * modes, values does not matter. - * - * @var array */ private static $customRoundingList = array( self::ROUND_CEILING => true, @@ -232,8 +218,6 @@ class NumberFormatter /** * The maximum value of the integer type in 32 bit platforms. - * - * @var int */ private static $int32Max = 2147483647; @@ -353,7 +337,7 @@ class NumberFormatter /** * Format a number. * - * @param int|float $value the value to format + * @param int|float $value The value to format * @param int $type Type of the formatting, one of the format type constants. * Only type NumberFormatter::TYPE_DEFAULT is currently supported. * @@ -514,9 +498,9 @@ class NumberFormatter /** * Parse a number. * - * @param string $value the value to parse + * @param string $value The value to parse * @param int $type Type of the formatting, one of the format type constants. NumberFormatter::TYPE_DOUBLE by default. - * @param int $position offset to begin the parsing on return this value will hold the offset at which the parsing ended + * @param int $position Offset to begin the parsing on return this value will hold the offset at which the parsing ended * * @return int|float|false The parsed value of false on error * @@ -567,7 +551,7 @@ class NumberFormatter * @param int $attr An attribute specifier, one of the numeric attribute constants. * The only currently supported attributes are NumberFormatter::FRACTION_DIGITS, * NumberFormatter::GROUPING_USED and NumberFormatter::ROUNDING_MODE. - * @param int $value the attribute value + * @param int $value The attribute value * * @return bool true on success or false on failure * diff --git a/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php b/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php index 5a4b35519f..b528b3b0a7 100644 --- a/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php +++ b/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php @@ -25,9 +25,6 @@ use Symfony\Component\Intl\Exception\MissingResourceException; */ class CurrencyBundle extends CurrencyDataProvider implements CurrencyBundleInterface { - /** - * @var LocaleDataProvider - */ private $localeProvider; /** diff --git a/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php b/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php index d12b892a10..ee319544e5 100644 --- a/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php +++ b/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php @@ -26,14 +26,7 @@ use Symfony\Component\Intl\Exception\MissingResourceException; */ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInterface { - /** - * @var LocaleDataProvider - */ private $localeProvider; - - /** - * @var ScriptDataProvider - */ private $scriptProvider; /** diff --git a/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php b/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php index 29697d6883..d709ba5562 100644 --- a/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php +++ b/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php @@ -25,9 +25,6 @@ use Symfony\Component\Intl\Exception\MissingResourceException; */ class RegionBundle extends RegionDataProvider implements RegionBundleInterface { - /** - * @var LocaleDataProvider - */ private $localeProvider; /** diff --git a/src/Symfony/Component/Intl/Util/SvnCommit.php b/src/Symfony/Component/Intl/Util/SvnCommit.php index ef90b6f884..f83958fe38 100644 --- a/src/Symfony/Component/Intl/Util/SvnCommit.php +++ b/src/Symfony/Component/Intl/Util/SvnCommit.php @@ -18,16 +18,12 @@ namespace Symfony\Component\Intl\Util; */ class SvnCommit { - /** - * @var \SimpleXMLElement - */ private $svnInfo; /** * Creates a commit from the given "svn info" data. * - * @param \SimpleXMLElement $svnInfo the XML result from the "svn info" - * command + * @param \SimpleXMLElement $svnInfo the XML result from the "svn info" command */ public function __construct(\SimpleXMLElement $svnInfo) { diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php index cba9863053..656374c4d4 100644 --- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php +++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php @@ -35,29 +35,21 @@ class OptionsResolver implements Options, OptionsResolverInterface /** * The names of all defined options. - * - * @var array */ private $defined = array(); /** * The default option values. - * - * @var array */ private $defaults = array(); /** * The names of required options. - * - * @var array */ private $required = array(); /** * The resolved option values. - * - * @var array */ private $resolved = array(); @@ -70,22 +62,16 @@ class OptionsResolver implements Options, OptionsResolverInterface /** * A list of accepted values for each option. - * - * @var array */ private $allowedValues = array(); /** * A list of accepted types for each option. - * - * @var array */ private $allowedTypes = array(); /** * A list of closures for evaluating lazy options. - * - * @var array */ private $lazy = array(); @@ -93,8 +79,6 @@ class OptionsResolver implements Options, OptionsResolverInterface * A list of lazy options whose closure is currently being called. * * This list helps detecting circular dependencies between lazy options. - * - * @var array */ private $calling = array(); @@ -105,8 +89,6 @@ class OptionsResolver implements Options, OptionsResolverInterface * necessary in order to avoid inconsistencies during the resolving * process. If any option is changed after being read, all evaluated * lazy options that depend on this option would become invalid. - * - * @var bool */ private $locked = false; diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php b/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php index 58e499e0ac..24f343e026 100644 --- a/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php +++ b/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php @@ -40,7 +40,7 @@ interface OptionsResolverInterface * * The closures should return the lazily created option value. * - * @param array $defaultValues a list of option names as keys and default + * @param array $defaultValues A list of option names as keys and default * values or closures as values * * @return $this @@ -55,7 +55,7 @@ interface OptionsResolverInterface * performance if the previous default value is calculated by an expensive * closure. * - * @param array $defaultValues a list of option names as keys and default + * @param array $defaultValues A list of option names as keys and default * values or closures as values * * @return $this @@ -92,7 +92,7 @@ interface OptionsResolverInterface /** * Sets allowed values for a list of options. * - * @param array $allowedValues a list of option names as keys and arrays + * @param array $allowedValues A list of option names as keys and arrays * with values acceptable for that option as * values * @@ -109,7 +109,7 @@ interface OptionsResolverInterface * * The values are merged with the allowed values defined previously. * - * @param array $allowedValues a list of option names as keys and arrays + * @param array $allowedValues A list of option names as keys and arrays * with values acceptable for that option as * values * @@ -124,7 +124,7 @@ interface OptionsResolverInterface /** * Sets allowed types for a list of options. * - * @param array $allowedTypes a list of option names as keys and type + * @param array $allowedTypes A list of option names as keys and type * names passed as string or array as values * * @return $this @@ -139,7 +139,7 @@ interface OptionsResolverInterface * * The types are merged with the allowed types defined previously. * - * @param array $allowedTypes a list of option names as keys and type + * @param array $allowedTypes A list of option names as keys and type * names passed as string or array as values * * @return $this diff --git a/src/Symfony/Component/Process/Pipes/AbstractPipes.php b/src/Symfony/Component/Process/Pipes/AbstractPipes.php index 1a94755bd7..d46a861388 100644 --- a/src/Symfony/Component/Process/Pipes/AbstractPipes.php +++ b/src/Symfony/Component/Process/Pipes/AbstractPipes.php @@ -18,16 +18,15 @@ namespace Symfony\Component\Process\Pipes; */ abstract class AbstractPipes implements PipesInterface { - /** @var array */ public $pipes = array(); - /** @var string */ private $inputBuffer = ''; - /** @var resource|null */ private $input; - /** @var bool */ private $blocked = true; + /** + * @param resource|null $input + */ public function __construct($input) { if (is_resource($input)) { diff --git a/src/Symfony/Component/Process/Pipes/UnixPipes.php b/src/Symfony/Component/Process/Pipes/UnixPipes.php index c4babcdf5c..b5b88358a4 100644 --- a/src/Symfony/Component/Process/Pipes/UnixPipes.php +++ b/src/Symfony/Component/Process/Pipes/UnixPipes.php @@ -22,11 +22,8 @@ use Symfony\Component\Process\Process; */ class UnixPipes extends AbstractPipes { - /** @var bool */ private $ttyMode; - /** @var bool */ private $ptyMode; - /** @var bool */ private $disableOutput; public function __construct($ttyMode, $ptyMode, $input, $disableOutput) diff --git a/src/Symfony/Component/Process/Pipes/WindowsPipes.php b/src/Symfony/Component/Process/Pipes/WindowsPipes.php index 87a781ea92..bcf1329f43 100644 --- a/src/Symfony/Component/Process/Pipes/WindowsPipes.php +++ b/src/Symfony/Component/Process/Pipes/WindowsPipes.php @@ -26,16 +26,12 @@ use Symfony\Component\Process\Exception\RuntimeException; */ class WindowsPipes extends AbstractPipes { - /** @var array */ private $files = array(); - /** @var array */ private $fileHandles = array(); - /** @var array */ private $readBytes = array( Process::STDOUT => 0, Process::STDERR => 0, ); - /** @var bool */ private $disableOutput; public function __construct($disableOutput, $input) diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index 720e746b85..05f7ecf833 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -1314,7 +1314,7 @@ class Process /** * Reads pipes for the freshest output. * - * @param $caller The name of the method that needs fresh outputs + * @param string $caller The name of the method that needs fresh outputs * * @throws LogicException in case output has been disabled or process is not started */ diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php index 11e67b091b..4b3ad6930b 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php @@ -18,14 +18,7 @@ namespace Symfony\Component\PropertyAccess; */ class PropertyAccessorBuilder { - /** - * @var bool - */ private $magicCall = false; - - /** - * @var bool - */ private $throwExceptionOnInvalidIndex = false; /** diff --git a/src/Symfony/Component/PropertyAccess/PropertyPath.php b/src/Symfony/Component/PropertyAccess/PropertyPath.php index e020182c34..51b6599bf3 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPath.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPath.php @@ -24,8 +24,6 @@ class PropertyPath implements \IteratorAggregate, PropertyPathInterface { /** * Character used for separating between plural and singular of an element. - * - * @var string */ const SINGULAR_SEPARATOR = '|'; diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php index de80751ce2..cecf67300f 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php @@ -38,9 +38,9 @@ class PropertyPathBuilder * Appends a (sub-) path to the current path. * * @param PropertyPathInterface|string $path The path to append - * @param int $offset the offset where the appended + * @param int $offset The offset where the appended * piece starts in $path - * @param int $length the length of the appended piece + * @param int $length The length of the appended piece * If 0, the full path is appended */ public function append($path, $offset = 0, $length = 0) @@ -106,9 +106,9 @@ class PropertyPathBuilder * @param int $offset The offset at which to replace * @param int $length The length of the piece to replace * @param PropertyPathInterface|string $path The path to insert - * @param int $pathOffset the offset where the inserted piece + * @param int $pathOffset The offset where the inserted piece * starts in $path - * @param int $pathLength the length of the inserted piece + * @param int $pathLength The length of the inserted piece * If 0, the full path is inserted * * @throws OutOfBoundsException If the offset is invalid diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php index 75e9834ae8..44822699a8 100644 --- a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php +++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php @@ -20,9 +20,6 @@ use Symfony\Component\PropertyAccess\PropertyPathBuilder; */ class PropertyPathBuilderTest extends TestCase { - /** - * @var string - */ const PREFIX = 'old1[old2].old3[old4][old5].old6'; /** diff --git a/src/Symfony/Component/Routing/Loader/PhpFileLoader.php b/src/Symfony/Component/Routing/Loader/PhpFileLoader.php index b4ba5fbc7f..b77be26ead 100644 --- a/src/Symfony/Component/Routing/Loader/PhpFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/PhpFileLoader.php @@ -55,7 +55,7 @@ class PhpFileLoader extends FileLoader * Safe include. Used for scope isolation. * * @param string $file File to include - * @param PhpFileLoader $loader the loader variable is exposed to the included file below + * @param PhpFileLoader $loader The loader variable is exposed to the included file below * * @return RouteCollection */ diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php b/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php index c2e2a116d1..c71989a3a1 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php @@ -22,14 +22,7 @@ use Symfony\Component\Routing\Route; */ class DumperRoute { - /** - * @var string - */ private $name; - - /** - * @var Route - */ private $route; /** diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php index 4a8d6b4639..cf65b6fb1d 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php @@ -38,14 +38,7 @@ class AclProvider implements AclProviderInterface { const MAX_BATCH_SIZE = 30; - /** - * @var AclCacheInterface|null - */ protected $cache; - - /** - * @var Connection - */ protected $connection; protected $loadedAces = array(); protected $loadedAcls = array(); diff --git a/src/Symfony/Component/Security/Acl/Dbal/Schema.php b/src/Symfony/Component/Security/Acl/Dbal/Schema.php index a3d219a568..001670a422 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/Schema.php +++ b/src/Symfony/Component/Security/Acl/Dbal/Schema.php @@ -24,7 +24,7 @@ final class Schema extends BaseSchema private $options; /** - * @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/AclCollectionCache.php b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php index 3041600c4b..afef90457b 100644 --- a/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php +++ b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php @@ -38,8 +38,8 @@ class AclCollectionCache * Batch loads ACLs for an entire collection; thus, it reduces the number * of required queries considerably. * - * @param mixed $collection anything that can be passed to foreach() - * @param TokenInterface[] $tokens an array of TokenInterface implementations + * @param mixed $collection Anything that can be passed to foreach() + * @param TokenInterface[] $tokens An array of TokenInterface implementations */ public function cache($collection, array $tokens = array()) { diff --git a/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php b/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php index 95d2887ead..1b65259683 100644 --- a/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php +++ b/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php @@ -24,7 +24,7 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface private $role; /** - * @param mixed $role a Role instance, or its string representation + * @param mixed $role A Role instance, or its string representation */ public function __construct($role) { diff --git a/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php b/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php index 96f3c9fe31..f4abc0bfbb 100644 --- a/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php +++ b/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php @@ -27,8 +27,8 @@ final class UserSecurityIdentity implements SecurityIdentityInterface private $class; /** - * @param string $username the username representation - * @param string $class the user's fully qualified class name + * @param string $username The username representation + * @param string $class The user's fully qualified class name * * @throws \InvalidArgumentException */ diff --git a/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php b/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php index e9ba0ec62c..0523420934 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php @@ -21,7 +21,7 @@ interface AclCacheInterface /** * Removes an ACL from the cache. * - * @param string $primaryKey a serialized primary key + * @param string $primaryKey A serialized primary key */ public function evictFromCacheById($primaryKey); diff --git a/src/Symfony/Component/Security/Acl/Model/AclInterface.php b/src/Symfony/Component/Security/Acl/Model/AclInterface.php index 13a6cf8394..6226c08bb4 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AclInterface.php @@ -106,7 +106,7 @@ interface AclInterface extends \Serializable /** * Whether the ACL has loaded ACEs for all of the passed security identities. * - * @param mixed $securityIdentities an implementation of SecurityIdentityInterface, or an array thereof + * @param mixed $securityIdentities An implementation of SecurityIdentityInterface, or an array thereof * * @return bool */ diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php index 2ba7bd5365..40fdad3a9a 100644 --- a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php @@ -123,7 +123,7 @@ interface MutableAclInterface extends AclInterface * * @param int $index * @param int $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy If null the strategy should not be changed */ public function updateClassAce($index, $mask, $strategy = null); @@ -133,7 +133,7 @@ interface MutableAclInterface extends AclInterface * @param int $index * @param string $field * @param int $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy If null the strategy should not be changed */ public function updateClassFieldAce($index, $field, $mask, $strategy = null); @@ -142,7 +142,7 @@ interface MutableAclInterface extends AclInterface * * @param int $index * @param int $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy If null the strategy should not be changed */ public function updateObjectAce($index, $mask, $strategy = null); @@ -152,7 +152,7 @@ interface MutableAclInterface extends AclInterface * @param int $index * @param string $field * @param int $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy If null the strategy should not be changed */ public function updateObjectFieldAce($index, $field, $mask, $strategy = null); } diff --git a/src/Symfony/Component/Security/Acl/Permission/AbstractMaskBuilder.php b/src/Symfony/Component/Security/Acl/Permission/AbstractMaskBuilder.php index 5c50eb6bf6..0e4a4fd943 100644 --- a/src/Symfony/Component/Security/Acl/Permission/AbstractMaskBuilder.php +++ b/src/Symfony/Component/Security/Acl/Permission/AbstractMaskBuilder.php @@ -16,13 +16,10 @@ namespace Symfony\Component\Security\Acl\Permission; */ abstract class AbstractMaskBuilder implements MaskBuilderInterface { - /** - * @var int - */ protected $mask; /** - * @param int $mask optional; defaults to 0 + * @param int $mask */ public function __construct($mask = 0) { diff --git a/src/Symfony/Component/Security/Core/AuthenticationEvents.php b/src/Symfony/Component/Security/Core/AuthenticationEvents.php index 13bce30768..65d01f497b 100644 --- a/src/Symfony/Component/Security/Core/AuthenticationEvents.php +++ b/src/Symfony/Component/Security/Core/AuthenticationEvents.php @@ -21,8 +21,6 @@ final class AuthenticationEvents * Symfony\Component\Security\Core\Event\AuthenticationEvent instance. * * @Event - * - * @var string */ const AUTHENTICATION_SUCCESS = 'security.authentication.success'; @@ -35,8 +33,6 @@ final class AuthenticationEvents * instance. * * @Event - * - * @var string */ const AUTHENTICATION_FAILURE = 'security.authentication.failure'; } diff --git a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php index f65d1d9d58..bf419433cf 100644 --- a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php +++ b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php @@ -21,9 +21,6 @@ class BCryptPasswordEncoder extends BasePasswordEncoder { const MAX_PASSWORD_LENGTH = 72; - /** - * @var string - */ private $cost; /** diff --git a/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php index fcf2e47088..395c175faf 100644 --- a/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php +++ b/src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php @@ -50,8 +50,8 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface /** * Merges a password and a salt. * - * @param string $password the password to be used - * @param string $salt the salt to be used + * @param string $password The password to be used + * @param string $salt The salt to be used * * @return string a merged password and salt * diff --git a/src/Symfony/Component/Security/Core/SecurityContext.php b/src/Symfony/Component/Security/Core/SecurityContext.php index 027ff49480..6d408373a6 100644 --- a/src/Symfony/Component/Security/Core/SecurityContext.php +++ b/src/Symfony/Component/Security/Core/SecurityContext.php @@ -48,7 +48,7 @@ class SecurityContext implements SecurityContextInterface * * @param TokenStorageInterface|AuthenticationManagerInterface $tokenStorage * @param AuthorizationCheckerInterface|AccessDecisionManagerInterface $authorizationChecker - * @param bool $alwaysAuthenticate only applicable with old signature + * @param bool $alwaysAuthenticate Only applicable with old signature */ public function __construct($tokenStorage, $authorizationChecker, $alwaysAuthenticate = false) { diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php index 942a4a6350..b75bcdde2d 100644 --- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php +++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php @@ -24,7 +24,6 @@ use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTes abstract class UserPasswordValidatorTest extends AbstractConstraintValidatorTest { const PASSWORD = 's3Cr3t'; - const SALT = '^S4lt$'; /** diff --git a/src/Symfony/Component/Security/Core/Util/ClassUtils.php b/src/Symfony/Component/Security/Core/Util/ClassUtils.php index 6c8709668f..6cceac2718 100644 --- a/src/Symfony/Component/Security/Core/Util/ClassUtils.php +++ b/src/Symfony/Component/Security/Core/Util/ClassUtils.php @@ -26,15 +26,11 @@ class ClassUtils { /** * Marker for Proxy class names. - * - * @var string */ const MARKER = '__CG__'; /** * Length of the proxy marker. - * - * @var int */ const MARKER_LENGTH = 6; diff --git a/src/Symfony/Component/Security/Csrf/CsrfToken.php b/src/Symfony/Component/Security/Csrf/CsrfToken.php index 693f37be7d..208fac3dba 100644 --- a/src/Symfony/Component/Security/Csrf/CsrfToken.php +++ b/src/Symfony/Component/Security/Csrf/CsrfToken.php @@ -18,14 +18,7 @@ namespace Symfony\Component\Security\Csrf; */ class CsrfToken { - /** - * @var string - */ private $id; - - /** - * @var string - */ private $value; /** diff --git a/src/Symfony/Component/Security/Csrf/TokenGenerator/UriSafeTokenGenerator.php b/src/Symfony/Component/Security/Csrf/TokenGenerator/UriSafeTokenGenerator.php index 31e82ee5ec..5aa18d8e48 100644 --- a/src/Symfony/Component/Security/Csrf/TokenGenerator/UriSafeTokenGenerator.php +++ b/src/Symfony/Component/Security/Csrf/TokenGenerator/UriSafeTokenGenerator.php @@ -21,27 +21,14 @@ use Symfony\Component\Security\Core\Util\SecureRandom; */ class UriSafeTokenGenerator implements TokenGeneratorInterface { - /** - * The generator for random values. - * - * @var SecureRandomInterface - */ private $random; - - /** - * The amount of entropy collected for each token (in bits). - * - * @var int - */ private $entropy; /** * Generates URI-safe CSRF tokens. * - * @param SecureRandomInterface|null $random The random value generator used for - * generating entropy - * @param int $entropy The amount of entropy collected for - * each token (in bits) + * @param SecureRandomInterface|null $random The random value generator used for generating entropy + * @param int $entropy The amount of entropy collected for each token (in bits) */ public function __construct(SecureRandomInterface $random = null, $entropy = 256) { diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php index 4923576e7c..e817fdb902 100644 --- a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php +++ b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php @@ -22,26 +22,16 @@ class NativeSessionTokenStorage implements TokenStorageInterface { /** * The namespace used to store values in the session. - * - * @var string */ const SESSION_NAMESPACE = '_csrf'; - /** - * @var bool - */ private $sessionStarted = false; - - /** - * @var string - */ private $namespace; /** * Initializes the storage with a session namespace. * - * @param string $namespace The namespace under which the token is stored - * in the session + * @param string $namespace The namespace under which the token is stored in the session */ public function __construct($namespace = self::SESSION_NAMESPACE) { diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php index 37b33e6f21..7b00e3231b 100644 --- a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php +++ b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php @@ -23,29 +23,17 @@ class SessionTokenStorage implements TokenStorageInterface { /** * The namespace used to store values in the session. - * - * @var string */ const SESSION_NAMESPACE = '_csrf'; - /** - * The user session from which the session ID is returned. - * - * @var SessionInterface - */ private $session; - - /** - * @var string - */ private $namespace; /** * Initializes the storage with a Session object and a session namespace. * - * @param SessionInterface $session The user session - * @param string $namespace The namespace under which the token - * is stored in the session + * @param SessionInterface $session The user session from which the session ID is returned + * @param string $namespace The namespace under which the token is stored in the session */ public function __construct(SessionInterface $session, $namespace = self::SESSION_NAMESPACE) { diff --git a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php index e2f12d711d..9c0308b495 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php +++ b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php @@ -30,8 +30,6 @@ interface RememberMeServicesInterface /** * This attribute name can be used by the implementation if it needs to set * a cookie on the Request when there is no actual Response, yet. - * - * @var string */ const COOKIE_ATTR_NAME = '_security_remember_me_cookie'; diff --git a/src/Symfony/Component/Security/Http/SecurityEvents.php b/src/Symfony/Component/Security/Http/SecurityEvents.php index 3bd80723d1..0cbb0aebca 100644 --- a/src/Symfony/Component/Security/Http/SecurityEvents.php +++ b/src/Symfony/Component/Security/Http/SecurityEvents.php @@ -24,8 +24,6 @@ final class SecurityEvents * Symfony\Component\Security\Http\Event\InteractiveLoginEvent instance. * * @Event - * - * @var string */ const INTERACTIVE_LOGIN = 'security.interactive_login'; @@ -37,8 +35,6 @@ final class SecurityEvents * Symfony\Component\Security\Http\Event\SwitchUserEvent instance. * * @Event - * - * @var string */ const SWITCH_USER = 'security.switch_user'; } diff --git a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php index dd89e0faac..0fa578099f 100644 --- a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php +++ b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php @@ -25,7 +25,7 @@ interface DecoderInterface * * @param string $data Data to decode * @param string $format Format name - * @param array $context options that decoders have access to + * @param array $context Options that decoders have access to * * The format parameter specifies which format the data is in; valid values * depend on the specific implementation. Authors implementing this interface @@ -41,7 +41,7 @@ interface DecoderInterface /** * Checks whether the deserializer can decode from given format. * - * @param string $format format name + * @param string $format Format name * * @return bool */ diff --git a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php index 05e9b2789b..f31870e1bf 100644 --- a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php +++ b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php @@ -25,7 +25,7 @@ interface EncoderInterface * * @param mixed $data Data to encode * @param string $format Format name - * @param array $context options that normalizers/encoders have access to + * @param array $context Options that normalizers/encoders have access to * * @return scalar * @@ -36,7 +36,7 @@ interface EncoderInterface /** * Checks whether the serializer can encode to given format. * - * @param string $format format name + * @param string $format Format name * * @return bool */ diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php index 4da7d28814..8858b42755 100644 --- a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php +++ b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php @@ -20,24 +20,12 @@ use Symfony\Component\Serializer\Exception\UnexpectedValueException; */ class JsonDecode implements DecoderInterface { - /** - * Specifies if the returned result should be an associative array or a nested stdClass object hierarchy. - * - * @var bool - */ - private $associative; - - /** - * Specifies the recursion depth. - * - * @var int - */ - private $recursionDepth; - - private $lastError = JSON_ERROR_NONE; - protected $serializer; + private $associative; + private $recursionDepth; + private $lastError = JSON_ERROR_NONE; + /** * Constructs a new JsonDecode instance. * diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php index 284f579a04..304a71b735 100644 --- a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php @@ -20,14 +20,7 @@ class JsonEncoder implements EncoderInterface, DecoderInterface { const FORMAT = 'json'; - /** - * @var JsonEncode - */ protected $encodingImpl; - - /** - * @var JsonDecode - */ protected $decodingImpl; public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null) diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index 19159f1d53..005b565d12 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -154,7 +154,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * Sets the root node name. * - * @param string $name root node name + * @param string $name Root node name */ public function setRootNodeName($name) { @@ -252,8 +252,6 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * Parse the input DOMNode into an array or a string. * - * @param \DOMNode $node xml to parse - * * @return array|string */ private function parseXml(\DOMNode $node) @@ -288,8 +286,6 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * Parse the input DOMNode attributes into an array. * - * @param \DOMNode $node xml to parse - * * @return array */ private function parseXmlAttributes(\DOMNode $node) @@ -322,8 +318,6 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * Parse the input DOMNode value (content and children) into an array or a string. * - * @param \DOMNode $node xml to parse - * * @return array|string */ private function parseXmlValue(\DOMNode $node) @@ -523,7 +517,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * Create a DOM document, taking serializer options into account. * - * @param array $context options that the encoder has access to + * @param array $context Options that the encoder has access to * * @return \DOMDocument */ diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php index 229111b6ff..d1b0dee93e 100644 --- a/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php +++ b/src/Symfony/Component/Serializer/Mapping/Loader/FileLoader.php @@ -20,9 +20,6 @@ use Symfony\Component\Serializer\Exception\MappingException; */ abstract class FileLoader implements LoaderInterface { - /** - * @var string - */ protected $file; /** diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php index 8bf1c17da9..3b0192b7e4 100644 --- a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php +++ b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php @@ -27,9 +27,6 @@ use Symfony\Component\Serializer\Mapping\ClassMetadataInterface; */ class LoaderChain implements LoaderInterface { - /** - * @var LoaderInterface[] - */ private $loaders; /** diff --git a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php index 508881e84c..ca2705cf2a 100644 --- a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php +++ b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php @@ -18,14 +18,7 @@ namespace Symfony\Component\Serializer\NameConverter; */ class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface { - /** - * @var array|null - */ private $attributes; - - /** - * @var bool - */ private $lowerCamelCase; /** diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php index d3a72caefb..37ab24a075 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php @@ -78,7 +78,7 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N /** * Set circular reference limit. * - * @param int $circularReferenceLimit limit of iterations for the same object + * @param int $circularReferenceLimit Limit of iterations for the same object * * @return self */ @@ -112,7 +112,7 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N /** * Set normalization callbacks. * - * @param callable[] $callbacks help normalize the result + * @param callable[] $callbacks Help normalize the result * * @return self * diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php index 4fe7a313a1..702b1bcb59 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php @@ -32,7 +32,7 @@ interface DenormalizableInterface * @param array|scalar $data The data from which to re-create the object * @param string|null $format The format is optionally given to be able to denormalize differently * based on different input formats - * @param array $context options for denormalizing + * @param array $context Options for denormalizing * * @return object */ diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php index 23df4829a8..a739d4f2c0 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php @@ -21,10 +21,10 @@ interface DenormalizerInterface /** * Denormalizes data back into an object of the given class. * - * @param mixed $data data to restore - * @param string $class the expected class to instantiate - * @param string $format format the given data was extracted from - * @param array $context options available to the denormalizer + * @param mixed $data Data to restore + * @param string $class The expected class to instantiate + * @param string $format Format the given data was extracted from + * @param array $context Options available to the denormalizer * * @return object */ diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php index 48fb8b482e..b275228642 100644 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php @@ -27,11 +27,11 @@ interface NormalizableInterface * It is important to understand that the normalize() call should normalize * recursively all child objects of the implementor. * - * @param NormalizerInterface $normalizer the normalizer is given so that you + * @param NormalizerInterface $normalizer The normalizer is given so that you * can use it to normalize objects contained within this object - * @param string|null $format the format is optionally given to be able to normalize differently + * @param string|null $format The format is optionally given to be able to normalize differently * based on different output formats - * @param array $context options for normalizing this object + * @param array $context Options for normalizing this object * * @return array|scalar */ diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php index f7007840da..b1e5bb8599 100644 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php @@ -21,8 +21,8 @@ interface NormalizerInterface /** * Normalizes an object into a set of arrays/scalars. * - * @param object $object object to normalize - * @param string $format format the normalization result will be encoded as + * @param object $object Object to normalize + * @param string $format Format the normalization result will be encoded as * @param array $context Context options for the normalizer * * @return array|scalar diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php index 2c5842d6a5..5c64e156c3 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php @@ -27,9 +27,6 @@ use Symfony\Component\Serializer\NameConverter\NameConverterInterface; */ class ObjectNormalizer extends AbstractNormalizer { - /** - * @var PropertyAccessorInterface - */ protected $propertyAccessor; public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null) diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php index 0259bfeda6..37b49f3493 100644 --- a/src/Symfony/Component/Serializer/Serializer.php +++ b/src/Symfony/Component/Serializer/Serializer.php @@ -180,7 +180,7 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz * Returns a matching normalizer. * * @param mixed $data Data to get the serializer for - * @param string $format format name, present to give the option to normalizers to act differently based on formats + * @param string $format Format name, present to give the option to normalizers to act differently based on formats * * @return NormalizerInterface|null */ @@ -196,9 +196,9 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz /** * Returns a matching denormalizer. * - * @param mixed $data data to restore - * @param string $class the expected class to instantiate - * @param string $format format name, present to give the option to normalizers to act differently based on formats + * @param mixed $data Data to restore + * @param string $class The expected class to instantiate + * @param string $format Format name, present to give the option to normalizers to act differently based on formats * * @return DenormalizerInterface|null */ @@ -230,9 +230,9 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz /** * Denormalizes data back into an object of the given class. * - * @param mixed $data data to restore - * @param string $class the expected class to instantiate - * @param string $format format name, present to give the option to normalizers to act differently based on formats + * @param mixed $data Data to restore + * @param string $class The expected class to instantiate + * @param string $format Format name, present to give the option to normalizers to act differently based on formats * @param array $context The context data for this particular denormalization * * @return object diff --git a/src/Symfony/Component/Serializer/SerializerInterface.php b/src/Symfony/Component/Serializer/SerializerInterface.php index c79db91892..196bff1a21 100644 --- a/src/Symfony/Component/Serializer/SerializerInterface.php +++ b/src/Symfony/Component/Serializer/SerializerInterface.php @@ -21,9 +21,9 @@ interface SerializerInterface /** * Serializes data in the appropriate format. * - * @param mixed $data any data - * @param string $format format name - * @param array $context options normalizers/encoders have access to + * @param mixed $data Any data + * @param string $format Format name + * @param array $context Options normalizers/encoders have access to * * @return string */ diff --git a/src/Symfony/Component/Stopwatch/Section.php b/src/Symfony/Component/Stopwatch/Section.php index f44ae17856..7f3fd924c2 100644 --- a/src/Symfony/Component/Stopwatch/Section.php +++ b/src/Symfony/Component/Stopwatch/Section.php @@ -65,7 +65,7 @@ class Section /** * Creates or re-opens a child section. * - * @param string|null $id null to create a new section, the identifier to re-open an existing one + * @param string|null $id Null to create a new section, the identifier to re-open an existing one * * @return self */ diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php index 0828b78fc2..25005bfcb0 100644 --- a/src/Symfony/Component/Templating/PhpEngine.php +++ b/src/Symfony/Component/Templating/PhpEngine.php @@ -426,7 +426,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess /** * Runs the PHP function htmlspecialchars on the value passed. * - * @param string $value the value to escape + * @param string $value The value to escape * * @return string the escaped value */ @@ -441,7 +441,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess * A function that escape all non-alphanumeric characters * into their \xHH or \uHHHH representations. * - * @param string $value the value to escape + * @param string $value The value to escape * * @return string the escaped value */ diff --git a/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php b/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php index 08005b097d..7642813364 100644 --- a/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php @@ -44,8 +44,8 @@ class CsvFileDumper extends FileDumper /** * Sets the delimiter and escape character for CSV. * - * @param string $delimiter delimiter character - * @param string $enclosure enclosure character + * @param string $delimiter Delimiter character + * @param string $enclosure Enclosure character */ public function setCsvControl($delimiter = ';', $enclosure = '"') { diff --git a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php b/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php index 57fd4938d2..e138e64056 100644 --- a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php +++ b/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php @@ -19,7 +19,7 @@ namespace Symfony\Component\Translation\Extractor; abstract class AbstractFileExtractor { /** - * @param string|array $resource files, a file or a directory + * @param string|array $resource Files, a file or a directory * * @return array */ @@ -75,7 +75,7 @@ abstract class AbstractFileExtractor abstract protected function canBeExtracted($file); /** - * @param string|array $resource files, a file or a directory + * @param string|array $resource Files, a file or a directory * * @return array files to be extracted */ diff --git a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php b/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php index 438f80b32f..b4534fae7e 100644 --- a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php +++ b/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php @@ -24,7 +24,7 @@ interface ExtractorInterface /** * Extracts translation messages from files, a file or a directory to the catalogue. * - * @param string|array $resource files, a file or a directory + * @param string|array $resource Files, a file or a directory * @param MessageCatalogue $catalogue The catalogue */ public function extract($resource, MessageCatalogue $catalogue); diff --git a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php index 22401797ac..22596d8de6 100644 --- a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php @@ -68,9 +68,9 @@ class CsvFileLoader extends ArrayLoader /** * Sets the delimiter, enclosure, and escape character for CSV. * - * @param string $delimiter delimiter character - * @param string $enclosure enclosure character - * @param string $escape escape character + * @param string $delimiter Delimiter character + * @param string $enclosure Enclosure character + * @param string $escape Escape character */ public function setCsvControl($delimiter = ';', $enclosure = '"', $escape = '\\') { diff --git a/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php b/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php index 2f8037fb16..6b5b5e125f 100644 --- a/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/IcuResFileLoader.php @@ -70,9 +70,9 @@ class IcuResFileLoader implements LoaderInterface * * This function takes an array by reference and will modify it * - * @param \ResourceBundle $rb the ResourceBundle that will be flattened - * @param array $messages used internally for recursive calls - * @param string $path current path being parsed, used internally for recursive calls + * @param \ResourceBundle $rb The ResourceBundle that will be flattened + * @param array $messages Used internally for recursive calls + * @param string $path Current path being parsed, used internally for recursive calls * * @return array the flattened ResourceBundle */ diff --git a/src/Symfony/Component/Translation/Loader/MoFileLoader.php b/src/Symfony/Component/Translation/Loader/MoFileLoader.php index 50811d01aa..70d5794981 100644 --- a/src/Symfony/Component/Translation/Loader/MoFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/MoFileLoader.php @@ -23,23 +23,17 @@ class MoFileLoader extends ArrayLoader /** * Magic used for validating the format of a MO file as well as * detecting if the machine used to create that file was little endian. - * - * @var float */ const MO_LITTLE_ENDIAN_MAGIC = 0x950412de; /** * Magic used for validating the format of a MO file as well as * detecting if the machine used to create that file was big endian. - * - * @var float */ const MO_BIG_ENDIAN_MAGIC = 0xde120495; /** * The size of the header of a MO file in bytes. - * - * @var int Number of bytes */ const MO_HEADER_SIZE = 28; diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php index 85ab3c47f5..93237ed3a2 100644 --- a/src/Symfony/Component/Translation/LoggingTranslator.php +++ b/src/Symfony/Component/Translation/LoggingTranslator.php @@ -23,9 +23,6 @@ class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface */ private $translator; - /** - * @var LoggerInterface - */ private $logger; /** diff --git a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php index 8a6723ea9c..a0624e297a 100644 --- a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php +++ b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php @@ -91,8 +91,8 @@ class PluralizationRulesTest extends TestCase /** * We validate only on the plural coverage. Thus the real rules is not tested. * - * @param string $nplural plural expected - * @param array $matrix containing langcodes and their plural index values + * @param string $nplural Plural expected + * @param array $matrix Containing langcodes and their plural index values * @param bool $expectSuccess */ protected function validateMatrix($nplural, $matrix, $expectSuccess = true) diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php index bac99dcfcf..673b12ac00 100644 --- a/src/Symfony/Component/Validator/Constraint.php +++ b/src/Symfony/Component/Validator/Constraint.php @@ -33,29 +33,21 @@ abstract class Constraint { /** * The name of the group given to all constraints with no explicit group. - * - * @var string */ const DEFAULT_GROUP = 'Default'; /** * Marks a constraint that can be put onto classes. - * - * @var string */ const CLASS_CONSTRAINT = 'class'; /** * Marks a constraint that can be put onto properties. - * - * @var string */ const PROPERTY_CONSTRAINT = 'property'; /** * Maps error codes to the names of their constants. - * - * @var array */ protected static $errorNames = array(); diff --git a/src/Symfony/Component/Validator/ConstraintValidator.php b/src/Symfony/Component/Validator/ConstraintValidator.php index b156c6dde9..d356594e16 100644 --- a/src/Symfony/Component/Validator/ConstraintValidator.php +++ b/src/Symfony/Component/Validator/ConstraintValidator.php @@ -25,15 +25,11 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface /** * Whether to format {@link \DateTime} objects as RFC-3339 dates * ("Y-m-d H:i:s"). - * - * @var int */ const PRETTY_DATE = 1; /** * Whether to cast objects with a "__toString()" method to strings. - * - * @var int */ const OBJECT_TO_STRING = 2; diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php index cdd162d816..4063c83ffe 100644 --- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php +++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php @@ -22,11 +22,11 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException; */ class EmailValidator extends ConstraintValidator { - /** - * @var bool - */ private $isStrict; + /** + * @param bool $strict + */ public function __construct($strict = false) { $this->isStrict = $strict; diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php index 15d51f9ff1..360ec5a8d9 100644 --- a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php +++ b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php @@ -27,9 +27,6 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException; */ class ExpressionValidator extends ConstraintValidator { - /** - * @var PropertyAccessorInterface - */ private $propertyAccessor; /** @@ -38,16 +35,10 @@ class ExpressionValidator extends ConstraintValidator private $expressionLanguage; /** - * @param PropertyAccessorInterface|null $propertyAccessor Optional as of Symfony 2.5 - * * @throws UnexpectedTypeException If the property accessor is invalid */ - public function __construct($propertyAccessor = null) + public function __construct(PropertyAccessorInterface $propertyAccessor = null) { - if (null !== $propertyAccessor && !$propertyAccessor instanceof PropertyAccessorInterface) { - throw new UnexpectedTypeException($propertyAccessor, 'null or \Symfony\Component\PropertyAccess\PropertyAccessorInterface'); - } - $this->propertyAccessor = $propertyAccessor; } diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php index 8182c41f8c..cbd9935443 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php @@ -24,14 +24,7 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; */ class ExecutionContextFactory implements ExecutionContextFactoryInterface { - /** - * @var TranslatorInterface - */ private $translator; - - /** - * @var string|null - */ private $translationDomain; /** diff --git a/src/Symfony/Component/Validator/Context/LegacyExecutionContext.php b/src/Symfony/Component/Validator/Context/LegacyExecutionContext.php index 37ca2a1d10..3d5181f09a 100644 --- a/src/Symfony/Component/Validator/Context/LegacyExecutionContext.php +++ b/src/Symfony/Component/Validator/Context/LegacyExecutionContext.php @@ -26,9 +26,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; */ class LegacyExecutionContext extends ExecutionContext { - /** - * @var MetadataFactoryInterface - */ private $metadataFactory; /** diff --git a/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php b/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php index 757eb72a5b..5c541077bf 100644 --- a/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php +++ b/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php @@ -28,19 +28,8 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; */ class LegacyExecutionContextFactory implements ExecutionContextFactoryInterface { - /** - * @var MetadataFactoryInterface - */ private $metadataFactory; - - /** - * @var TranslatorInterface - */ private $translator; - - /** - * @var string|null - */ private $translationDomain; /** diff --git a/src/Symfony/Component/Validator/ExecutionContext.php b/src/Symfony/Component/Validator/ExecutionContext.php index 52cccb2f68..0603ffb62f 100644 --- a/src/Symfony/Component/Validator/ExecutionContext.php +++ b/src/Symfony/Component/Validator/ExecutionContext.php @@ -28,39 +28,12 @@ use Symfony\Component\Translation\TranslatorInterface; */ class ExecutionContext implements ExecutionContextInterface { - /** - * @var GlobalExecutionContextInterface - */ private $globalContext; - - /** - * @var TranslatorInterface - */ private $translator; - - /** - * @var null|string - */ private $translationDomain; - - /** - * @var MetadataInterface - */ private $metadata; - - /** - * @var mixed - */ private $value; - - /** - * @var string - */ private $group; - - /** - * @var string - */ private $propertyPath; /** diff --git a/src/Symfony/Component/Validator/ExecutionContextInterface.php b/src/Symfony/Component/Validator/ExecutionContextInterface.php index d887124e33..2f352fa680 100644 --- a/src/Symfony/Component/Validator/ExecutionContextInterface.php +++ b/src/Symfony/Component/Validator/ExecutionContextInterface.php @@ -150,9 +150,9 @@ interface ExecutionContextInterface * @param null|string|string[] $groups The groups to validate in. If you don't pass any * groups here, the current group of the context * will be used. - * @param bool $traverse whether to traverse the value if it is an array + * @param bool $traverse Whether to traverse the value if it is an array * or an instance of \Traversable - * @param bool $deep whether to traverse the value recursively if + * @param bool $deep Whether to traverse the value recursively if * it is a collection of collections * * @deprecated since version 2.5, to be removed in 3.0. diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php index 82e1cf6bff..1a4f3074b6 100644 --- a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php +++ b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php @@ -40,18 +40,7 @@ use Symfony\Component\Validator\Mapping\Loader\LoaderInterface; */ class LazyLoadingMetadataFactory implements MetadataFactoryInterface { - /** - * The loader for loading the class metadata. - * - * @var LoaderInterface|null - */ protected $loader; - - /** - * The cache for caching class metadata. - * - * @var CacheInterface|null - */ protected $cache; /** diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AnnotationLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AnnotationLoader.php index a3b5f7ee8e..c2d1bdf1cd 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/AnnotationLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/AnnotationLoader.php @@ -26,9 +26,6 @@ use Symfony\Component\Validator\Mapping\ClassMetadata; */ class AnnotationLoader implements LoaderInterface { - /** - * @var Reader - */ protected $reader; public function __construct(Reader $reader) diff --git a/src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php index 326bbdfe75..b8f9490379 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php @@ -23,11 +23,6 @@ use Symfony\Component\Validator\Exception\MappingException; */ abstract class FileLoader extends AbstractLoader { - /** - * The file to load. - * - * @var string - */ protected $file; /** diff --git a/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php b/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php index 970d9068d8..ead415e977 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/LoaderChain.php @@ -25,9 +25,6 @@ use Symfony\Component\Validator\Mapping\ClassMetadata; */ class LoaderChain implements LoaderInterface { - /** - * @var LoaderInterface[] - */ protected $loaders; /** diff --git a/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php index 4ff22573ac..95fc578eb4 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/StaticMethodLoader.php @@ -21,11 +21,6 @@ use Symfony\Component\Validator\Mapping\ClassMetadata; */ class StaticMethodLoader implements LoaderInterface { - /** - * The name of the method to call. - * - * @var string - */ protected $methodName; /** diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php index af2060c2ef..612c45c06c 100644 --- a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php @@ -30,8 +30,6 @@ use Symfony\Component\Validator\ValidationVisitorInterface; abstract class MemberMetadata extends ElementMetadata implements PropertyMetadataInterface { /** - * @var string - * * @internal This property is public in order to reduce the size of the * class' serialized representation. Do not access it. Use * {@link getClassName()} instead. @@ -39,8 +37,6 @@ abstract class MemberMetadata extends ElementMetadata implements PropertyMetadat public $class; /** - * @var string - * * @internal This property is public in order to reduce the size of the * class' serialized representation. Do not access it. Use * {@link getName()} instead. @@ -48,8 +44,6 @@ abstract class MemberMetadata extends ElementMetadata implements PropertyMetadat public $name; /** - * @var string - * * @internal This property is public in order to reduce the size of the * class' serialized representation. Do not access it. Use * {@link getPropertyName()} instead. diff --git a/src/Symfony/Component/Validator/ValidationVisitor.php b/src/Symfony/Component/Validator/ValidationVisitor.php index 82af6a9e72..8f1657083a 100644 --- a/src/Symfony/Component/Validator/ValidationVisitor.php +++ b/src/Symfony/Component/Validator/ValidationVisitor.php @@ -27,44 +27,13 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException; */ class ValidationVisitor implements ValidationVisitorInterface, GlobalExecutionContextInterface { - /** - * @var mixed - */ private $root; - - /** - * @var MetadataFactoryInterface - */ private $metadataFactory; - - /** - * @var ConstraintValidatorFactoryInterface - */ private $validatorFactory; - - /** - * @var TranslatorInterface - */ private $translator; - - /** - * @var null|string - */ private $translationDomain; - - /** - * @var array - */ private $objectInitializers; - - /** - * @var ConstraintViolationList - */ private $violations; - - /** - * @var array - */ private $validatedObjects = array(); /** diff --git a/src/Symfony/Component/Validator/Validator.php b/src/Symfony/Component/Validator/Validator.php index c69c7a86b7..27a2be8ad2 100644 --- a/src/Symfony/Component/Validator/Validator.php +++ b/src/Symfony/Component/Validator/Validator.php @@ -28,29 +28,10 @@ use Symfony\Component\Validator\Exception\ValidatorException; */ class Validator implements ValidatorInterface, Mapping\Factory\MetadataFactoryInterface { - /** - * @var MetadataFactoryInterface - */ private $metadataFactory; - - /** - * @var ConstraintValidatorFactoryInterface - */ private $validatorFactory; - - /** - * @var TranslatorInterface - */ private $translator; - - /** - * @var null|string - */ private $translationDomain; - - /** - * @var array - */ private $objectInitializers; public function __construct( diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php index a9e9f7f0e8..acb4328396 100644 --- a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php +++ b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php @@ -38,34 +38,11 @@ use Symfony\Component\Validator\Util\PropertyPath; */ class RecursiveContextualValidator implements ContextualValidatorInterface { - /** - * @var ExecutionContextInterface - */ private $context; - - /** - * @var string - */ private $defaultPropertyPath; - - /** - * @var array - */ private $defaultGroups; - - /** - * @var MetadataFactoryInterface - */ private $metadataFactory; - - /** - * @var ConstraintValidatorFactoryInterface - */ private $validatorFactory; - - /** - * @var ObjectInitializerInterface[] - */ private $objectInitializers; /** diff --git a/src/Symfony/Component/Validator/Validator/RecursiveValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveValidator.php index abd29087bc..7ab9527a3a 100644 --- a/src/Symfony/Component/Validator/Validator/RecursiveValidator.php +++ b/src/Symfony/Component/Validator/Validator/RecursiveValidator.php @@ -28,24 +28,9 @@ use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface; */ class RecursiveValidator implements ValidatorInterface, LegacyValidatorInterface { - /** - * @var ExecutionContextFactoryInterface - */ protected $contextFactory; - - /** - * @var MetadataFactoryInterface - */ protected $metadataFactory; - - /** - * @var ConstraintValidatorFactoryInterface - */ protected $validatorFactory; - - /** - * @var ObjectInitializerInterface[] - */ protected $objectInitializers; /** diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php index 4a69976ed2..05ccaac4fd 100644 --- a/src/Symfony/Component/Validator/ValidatorBuilder.php +++ b/src/Symfony/Component/Validator/ValidatorBuilder.php @@ -39,24 +39,9 @@ use Symfony\Component\Validator\Validator\RecursiveValidator; */ class ValidatorBuilder implements ValidatorBuilderInterface { - /** - * @var array - */ private $initializers = array(); - - /** - * @var array - */ private $xmlMappings = array(); - - /** - * @var array - */ private $yamlMappings = array(); - - /** - * @var array - */ private $methodMappings = array(); /** diff --git a/src/Symfony/Component/Validator/ValidatorInterface.php b/src/Symfony/Component/Validator/ValidatorInterface.php index fd7785b6ea..570ba99720 100644 --- a/src/Symfony/Component/Validator/ValidatorInterface.php +++ b/src/Symfony/Component/Validator/ValidatorInterface.php @@ -64,7 +64,7 @@ interface ValidatorInterface * * @param mixed $containingValue The value containing the property * @param string $property The name of the property to validate - * @param string $value the value to validate against the + * @param string $value The value to validate against the * constraints of the property * @param array|null $groups The validation groups to validate * diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php index bf887a08ec..284841e2eb 100644 --- a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php +++ b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php @@ -27,59 +27,16 @@ use Symfony\Component\Validator\Util\PropertyPath; */ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface { - /** - * @var ConstraintViolationList - */ private $violations; - - /** - * @var string - */ private $message; - - /** - * @var array - */ private $parameters; - - /** - * @var mixed - */ private $root; - - /** - * @var mixed - */ private $invalidValue; - - /** - * @var string - */ private $propertyPath; - - /** - * @var TranslatorInterface - */ private $translator; - - /** - * @var string|null - */ private $translationDomain; - - /** - * @var int|null - */ private $plural; - - /** - * @var Constraint - */ private $constraint; - - /** - * @var mixed - */ private $code; /** diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php index 05817f5d73..96da91e551 100644 --- a/src/Symfony/Component/Yaml/Dumper.php +++ b/src/Symfony/Component/Yaml/Dumper.php @@ -45,8 +45,8 @@ class Dumper * @param mixed $input The PHP value * @param int $inline The level where you switch to inline YAML * @param int $indent The level of indentation (used internally) - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise * * @return string The YAML representation of the PHP value */ diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index 1dd9761e97..9ff9b89c1c 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -31,9 +31,9 @@ class Inline * Converts a YAML string to a PHP value. * * @param string $value A YAML string - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise - * @param bool $objectForMap true if maps should return a stdClass instead of array() + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise + * @param bool $objectForMap True if maps should return a stdClass instead of array() * @param array $references Mapping of variable names to values * * @return mixed A PHP value @@ -87,8 +87,8 @@ class Inline * Dumps a given PHP variable to a YAML string. * * @param mixed $value The PHP variable to convert - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise * * @return string The YAML string representing the PHP value * @@ -183,8 +183,8 @@ class Inline * Dumps a PHP array to a YAML string. * * @param array $value The PHP array to dump - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise * * @return string The YAML string representing the PHP array */ diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php index 6817e71ea8..8ffa8ccf64 100644 --- a/src/Symfony/Component/Yaml/Parser.php +++ b/src/Symfony/Component/Yaml/Parser.php @@ -49,9 +49,9 @@ class Parser * Parses a YAML string to a PHP value. * * @param string $value A YAML string - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise - * @param bool $objectForMap true if maps should return a stdClass instead of array() + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise + * @param bool $objectForMap True if maps should return a stdClass instead of array() * * @return mixed A PHP value * @@ -497,7 +497,7 @@ class Parser * @param string $value A YAML value * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise * @param bool $objectSupport True if object support is enabled, false otherwise - * @param bool $objectForMap true if maps should return a stdClass instead of array() + * @param bool $objectForMap True if maps should return a stdClass instead of array() * * @return mixed A PHP value * diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php index 62901ec075..7a579432ac 100644 --- a/src/Symfony/Component/Yaml/Yaml.php +++ b/src/Symfony/Component/Yaml/Yaml.php @@ -81,8 +81,8 @@ class Yaml * @param mixed $input The PHP value * @param int $inline The level where you switch to inline YAML * @param int $indent The amount of spaces to use for indentation of nested nodes - * @param bool $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise - * @param bool $objectSupport true if object support is enabled, false otherwise + * @param bool $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise + * @param bool $objectSupport True if object support is enabled, false otherwise * * @return string A YAML string representing the original PHP value */