From 0c9edaf33628071b74fd86a10f8149b32666b123 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sun, 22 Oct 2017 09:42:21 -0700 Subject: [PATCH] [DI] minor docblock fixes --- .../Doctrine/CacheWarmer/ProxyCacheWarmer.php | 3 - .../Doctrine/ContainerAwareEventManager.php | 2 - .../DataFixtures/ContainerAwareLoader.php | 6 - .../AbstractDoctrineExtension.php | 13 -- .../CompilerPass/RegisterMappingsPass.php | 10 -- .../Form/ChoiceList/EntityChoiceList.php | 4 - .../CollectionToArrayTransformer.php | 2 - .../Bridge/Doctrine/Form/Type/EntityType.php | 2 - .../Bridge/Doctrine/Logger/DbalLogger.php | 4 - .../RememberMe/DoctrineTokenProvider.php | 5 - .../DoctrineExtensionTest.php | 2 - .../Monolog/Handler/ChromePhpHandler.php | 3 - .../Bridge/Monolog/Handler/ConsoleHandler.php | 13 -- .../Bridge/Monolog/Handler/FirePHPHandler.php | 3 - .../Monolog/Handler/SwiftMailerHandler.php | 7 -- .../LazyProxy/PhpDumper/ProxyDumper.php | 4 - .../Twig/Extension/HttpKernelExtension.php | 3 - src/Symfony/Bridge/Twig/NodeVisitor/Scope.php | 14 --- .../NodeVisitor/TranslationNodeVisitor.php | 2 - .../Twig/TokenParser/FormThemeTokenParser.php | 2 - .../TokenParser/TransChoiceTokenParser.php | 2 - .../TransDefaultDomainTokenParser.php | 2 - .../Twig/TokenParser/TransTokenParser.php | 2 - .../CacheWarmer/RouterCacheWarmer.php | 3 - .../CacheWarmer/TemplatePathsCacheWarmer.php | 4 - .../Command/ContainerDebugCommand.php | 2 - .../FrameworkBundle/Console/Application.php | 6 - .../Console/Descriptor/Descriptor.php | 27 ----- .../Console/Descriptor/JsonDescriptor.php | 7 -- .../Console/Descriptor/MarkdownDescriptor.php | 2 - .../Console/Descriptor/TextDescriptor.php | 2 - .../Console/Descriptor/XmlDescriptor.php | 9 -- .../Controller/ControllerNameParser.php | 3 - .../Controller/ControllerResolver.php | 5 - .../FrameworkExtension.php | 111 +----------------- .../Routing/DelegatingLoader.php | 5 - .../Bundle/FrameworkBundle/Routing/Router.php | 2 - .../FrameworkBundle/Templating/Debugger.php | 3 - .../Templating/DelegatingEngine.php | 4 - .../Templating/GlobalVariables.php | 3 - .../Templating/Helper/ActionsHelper.php | 3 - .../Templating/Helper/FormHelper.php | 8 -- .../Templating/Helper/RouterHelper.php | 3 - .../Templating/Helper/TranslatorHelper.php | 3 - .../Templating/Loader/FilesystemLoader.php | 3 - .../Templating/Loader/TemplateLocator.php | 2 - .../FrameworkBundle/Templating/PhpEngine.php | 6 - .../Templating/TemplateNameParser.php | 3 - .../Templating/TimedPhpEngine.php | 7 -- .../FrameworkBundle/Test/KernelTestCase.php | 4 - .../Tests/Routing/RouterTest.php | 2 - .../Translation/PhpExtractor.php | 4 - .../Validator/ConstraintValidatorFactory.php | 2 - .../DataCollector/SecurityDataCollector.php | 4 - .../DependencyInjection/MainConfiguration.php | 4 - .../Security/Factory/AbstractFactory.php | 2 - .../DependencyInjection/SecurityExtension.php | 5 +- .../MainConfigurationTest.php | 2 - .../Form/UserLoginFormType.php | 3 - .../CacheWarmer/TemplateCacheCacheWarmer.php | 4 - .../Controller/ExceptionController.php | 4 - .../DependencyInjection/TwigExtension.php | 3 - .../TwigBundle/Loader/FilesystemLoader.php | 4 - .../TokenParser/RenderTokenParser.php | 2 - .../Controller/ProfilerController.php | 4 - .../Profiler/TemplateManager.php | 4 - src/Symfony/Component/Asset/Packages.php | 5 - src/Symfony/Component/BrowserKit/Client.php | 2 - src/Symfony/Component/BrowserKit/Cookie.php | 2 - .../Component/BrowserKit/CookieJar.php | 5 - src/Symfony/Component/BrowserKit/History.php | 2 - .../ClassLoader/ClassCollectionLoader.php | 2 - .../Component/ClassLoader/Psr4ClassLoader.php | 3 - .../Component/Config/Definition/ArrayNode.php | 2 - .../Builder/ArrayNodeDefinition.php | 8 -- .../Definition/Builder/EnumNodeDefinition.php | 2 - .../Config/Definition/Builder/ExprBuilder.php | 13 -- .../Definition/Builder/MergeBuilder.php | 3 - .../Config/Definition/Builder/NodeBuilder.php | 4 - .../Definition/Builder/NodeDefinition.php | 6 - .../Builder/NormalizationBuilder.php | 5 - .../Definition/Builder/ValidationBuilder.php | 5 - .../Config/Definition/PrototypedArrayNode.php | 4 - .../Config/Loader/DelegatingLoader.php | 3 - .../Component/Config/Loader/FileLoader.php | 9 -- .../Config/Loader/LoaderInterface.php | 2 - .../Config/Loader/LoaderResolver.php | 5 - src/Symfony/Component/Console/Application.php | 30 ----- .../Component/Console/Command/Command.php | 22 ---- .../Component/Console/Command/HelpCommand.php | 5 - .../Descriptor/ApplicationDescription.php | 13 -- .../Console/Descriptor/Descriptor.php | 15 --- .../Console/Descriptor/JsonDescriptor.php | 11 -- .../Console/Descriptor/TextDescriptor.php | 2 +- .../Console/Descriptor/XmlDescriptor.php | 13 -- .../Formatter/OutputFormatterStyle.php | 4 +- .../OutputFormatterStyleInterface.php | 2 - .../Formatter/OutputFormatterStyleStack.php | 12 -- .../Component/Console/Helper/Helper.php | 8 +- .../Console/Helper/HelperInterface.php | 2 - .../Component/Console/Helper/HelperSet.php | 5 - .../Console/Helper/QuestionHelper.php | 13 -- .../Component/Console/Helper/Table.php | 18 +-- .../Component/Console/Helper/TableCell.php | 7 -- .../Component/Console/Helper/TableHelper.php | 2 - .../Console/Helper/TableSeparator.php | 3 - .../Component/Console/Input/ArrayInput.php | 4 - src/Symfony/Component/Console/Input/Input.php | 6 - .../Console/Input/InputDefinition.php | 10 -- .../Console/Input/InputInterface.php | 2 - .../Component/Console/Input/InputOption.php | 2 - .../Console/Logger/ConsoleLogger.php | 14 --- .../Console/Output/ConsoleOutputInterface.php | 5 - .../Console/Output/OutputInterface.php | 5 - src/Symfony/Component/Console/Shell.php | 2 - .../Component/Console/Style/OutputStyle.php | 3 - .../Console/Style/StyleInterface.php | 5 - .../Component/Console/Style/SymfonyStyle.php | 6 - .../Console/Tester/ApplicationTester.php | 3 - .../Console/Tester/CommandTester.php | 3 - .../CssSelector/Node/AttributeNode.php | 19 --- .../Component/CssSelector/Node/ClassNode.php | 7 -- .../CssSelector/Node/CombinedSelectorNode.php | 11 -- .../CssSelector/Node/FunctionNode.php | 11 -- .../Component/CssSelector/Node/HashNode.php | 7 -- .../CssSelector/Node/NegationNode.php | 11 -- .../Component/CssSelector/Node/PseudoNode.php | 7 -- .../CssSelector/Node/SelectorNode.php | 7 -- .../CssSelector/Node/Specificity.php | 15 --- .../Parser/Handler/HandlerInterface.php | 3 - .../Parser/Handler/HashHandler.php | 11 -- .../Parser/Handler/IdentifierHandler.php | 11 -- .../Parser/Handler/NumberHandler.php | 6 - .../Parser/Handler/StringHandler.php | 11 -- .../Component/CssSelector/Parser/Parser.php | 15 --- .../Component/CssSelector/Parser/Token.php | 2 - .../CssSelector/Parser/TokenStream.php | 2 - .../Parser/Tokenizer/Tokenizer.php | 2 - .../Parser/Tokenizer/TokenizerEscaping.php | 6 - .../XPath/Extension/CombinationExtension.php | 12 -- .../XPath/Extension/FunctionExtension.php | 15 --- .../XPath/Extension/HtmlExtension.php | 22 ---- .../XPath/Extension/NodeExtension.php | 26 ---- .../XPath/Extension/PseudoClassExtension.php | 16 --- .../CssSelector/XPath/Translator.php | 33 +----- .../Component/Debug/ExceptionHandler.php | 6 - .../Compiler/AnalyzeServiceReferencesPass.php | 2 - .../Compiler/CheckCircularReferencesPass.php | 2 - .../Compiler/CheckDefinitionValidityPass.php | 2 - .../Compiler/CheckReferenceValidityPass.php | 5 - .../DependencyInjection/Compiler/Compiler.php | 2 - .../Compiler/CompilerPassInterface.php | 2 - .../Compiler/InlineServiceDefinitionsPass.php | 2 - .../Compiler/PassConfig.php | 5 - .../RemoveAbstractDefinitionsPass.php | 2 - .../Compiler/RemovePrivateAliasesPass.php | 2 - .../Compiler/RemoveUnusedDefinitionsPass.php | 2 - .../Compiler/RepeatablePassInterface.php | 5 - .../Compiler/RepeatedPass.php | 2 - .../ReplaceAliasByActualDefinitionPass.php | 2 - .../ResolveDefinitionTemplatesPass.php | 2 - .../Compiler/ResolveInvalidReferencesPass.php | 2 - .../ResolveParameterPlaceHoldersPass.php | 2 - .../ResolveReferencesToAliasesPass.php | 2 - .../Compiler/ServiceReferenceGraph.php | 9 +- .../Compiler/ServiceReferenceGraphEdge.php | 2 +- .../Compiler/ServiceReferenceGraphNode.php | 10 -- .../DependencyInjection/Container.php | 9 -- .../ContainerAwareInterface.php | 5 - .../ContainerAwareTrait.php | 5 - .../DependencyInjection/ContainerBuilder.php | 19 --- .../DependencyInjection/Definition.php | 8 -- .../DependencyInjection/Dumper/Dumper.php | 3 - .../DependencyInjection/Dumper/PhpDumper.php | 20 +--- .../DependencyInjection/Dumper/XmlDumper.php | 20 ---- .../DependencyInjection/Dumper/YamlDumper.php | 8 +- .../ConfigurationExtensionInterface.php | 3 - .../Extension/Extension.php | 3 - .../Extension/ExtensionInterface.php | 3 - .../Extension/PrependExtensionInterface.php | 2 - .../LazyProxy/PhpDumper/DumperInterface.php | 4 - .../Loader/ClosureLoader.php | 3 - .../DependencyInjection/Loader/FileLoader.php | 4 - .../Loader/YamlFileLoader.php | 2 - src/Symfony/Component/DomCrawler/Form.php | 4 - .../DomCrawler/FormFieldRegistry.php | 2 - .../ContainerAwareEventDispatcher.php | 12 -- .../Debug/TraceableEventDispatcher.php | 5 - .../EventDispatcherInterface.php | 7 -- .../EventDispatcher/GenericEvent.php | 2 - .../ImmutableEventDispatcher.php | 10 -- .../Component/ExpressionLanguage/Compiler.php | 2 - .../ExpressionLanguage/Node/ArrayNode.php | 2 - .../ParserCache/ArrayParserCache.php | 3 - .../Finder/Adapter/AdapterInterface.php | 22 ---- .../Exception/AdapterFailureException.php | 3 - .../ShellCommandFailureException.php | 8 -- .../Component/Finder/Expression/Regex.php | 4 +- src/Symfony/Component/Finder/Finder.php | 6 - .../Component/Finder/Shell/Command.php | 18 --- .../Component/Form/AbstractRendererEngine.php | 14 --- .../Component/Form/AbstractTypeExtension.php | 2 - src/Symfony/Component/Form/Button.php | 2 - src/Symfony/Component/Form/ButtonBuilder.php | 10 -- .../Factory/CachingFactoryDecorator.php | 8 -- .../Factory/PropertyAccessDecorator.php | 13 -- .../Form/ChoiceList/View/ChoiceView.php | 2 - .../Extension/Core/ChoiceList/ChoiceList.php | 8 -- .../Core/DataMapper/PropertyPathMapper.php | 8 -- .../ChoiceToValueTransformer.php | 3 - .../ChoicesToValuesTransformer.php | 7 -- .../DataTransformer/DataTransformerChain.php | 7 +- .../ValueToDuplicatesTransformer.php | 2 - .../Core/EventListener/ResizeFormListener.php | 29 ++--- .../EventListener/DataCollectorListener.php | 4 - .../DataCollector/FormDataCollector.php | 3 - .../FormDataCollectorInterface.php | 16 --- .../DataCollector/FormDataExtractor.php | 2 - .../FormDataExtractorInterface.php | 8 -- .../Type/FormTypeHttpFoundationExtension.php | 10 -- .../Validator/Constraints/FormValidator.php | 2 - .../Validator/ValidatorTypeGuesser.php | 8 -- .../ViolationMapper/ViolationMapper.php | 2 - src/Symfony/Component/Form/Form.php | 2 - .../Form/FormConfigBuilderInterface.php | 12 -- src/Symfony/Component/Form/FormError.php | 28 +---- src/Symfony/Component/Form/FormFactory.php | 2 - .../Form/FormFactoryBuilderInterface.php | 10 -- src/Symfony/Component/Form/FormInterface.php | 4 - src/Symfony/Component/Form/FormRenderer.php | 22 ---- .../Form/FormTypeExtensionInterface.php | 11 -- src/Symfony/Component/Form/FormView.php | 4 - .../Component/Form/Guess/TypeGuess.php | 11 -- .../Component/Form/NativeRequestHandler.php | 7 -- .../Component/Form/ReversedTransformer.php | 10 -- .../Component/HttpFoundation/AcceptHeader.php | 2 - .../File/MimeType/ExtensionGuesser.php | 2 - .../MimeType/MimeTypeExtensionGuesser.php | 2 - .../File/MimeType/MimeTypeGuesser.php | 2 - .../Component/HttpFoundation/FileBag.php | 2 - .../Component/HttpFoundation/ParameterBag.php | 2 - .../RequestMatcherInterface.php | 2 - .../Component/HttpFoundation/Response.php | 6 - .../HttpFoundation/ResponseHeaderBag.php | 19 --- .../Session/Attribute/AttributeBag.php | 7 -- .../Session/Flash/AutoExpireFlashBag.php | 12 -- .../HttpFoundation/Session/Flash/FlashBag.php | 12 -- .../Session/Flash/FlashBagInterface.php | 2 - .../Session/SessionBagInterface.php | 2 - .../Session/SessionInterface.php | 2 - .../Storage/MockArraySessionStorage.php | 10 -- .../Session/Storage/NativeSessionStorage.php | 7 -- .../Storage/SessionStorageInterface.php | 2 - .../Session/Attribute/AttributeBagTest.php | 5 +- .../Attribute/NamespacedAttributeBagTest.php | 5 +- .../Session/Flash/AutoExpireFlashBagTest.php | 3 - .../Tests/Session/Flash/FlashBagTest.php | 3 - .../Tests/Session/Storage/MetadataBagTest.php | 3 - .../Storage/NativeSessionStorageTest.php | 2 - .../Component/HttpKernel/Bundle/Bundle.php | 4 - .../HttpKernel/Bundle/BundleInterface.php | 2 - .../CacheClearer/ChainCacheClearer.php | 5 - src/Symfony/Component/HttpKernel/Client.php | 10 -- .../Controller/ControllerResolver.php | 3 - .../ControllerResolverInterface.php | 2 - .../TraceableControllerResolver.php | 4 - .../DataCollector/ConfigDataCollector.php | 2 - .../DataCollector/DataCollectorInterface.php | 4 - .../DataCollector/RouterDataCollector.php | 2 - .../ConfigurableExtension.php | 3 - .../HttpKernel/Event/FilterResponseEvent.php | 7 -- .../HttpKernel/Event/GetResponseEvent.php | 7 -- .../AddRequestFormatsListener.php | 8 -- .../EventListener/DebugHandlersListener.php | 2 - .../HttpKernel/EventListener/DumpListener.php | 4 - .../EventListener/FragmentListener.php | 2 - .../EventListener/ProfilerListener.php | 4 - .../EventListener/ResponseListener.php | 2 - .../StreamedResponseListener.php | 2 - .../EventListener/SurrogateListener.php | 5 - .../EventListener/TestSessionListener.php | 2 - .../EventListener/ValidateRequestListener.php | 2 - .../HttpKernel/Fragment/FragmentHandler.php | 4 - .../Fragment/InlineFragmentRenderer.php | 4 - .../Component/HttpKernel/HttpCache/Esi.php | 11 -- .../HttpKernel/HttpCache/HttpCache.php | 14 --- .../ResponseCacheStrategyInterface.php | 4 - .../Component/HttpKernel/HttpCache/Store.php | 21 ---- .../HttpKernel/HttpCache/StoreInterface.php | 13 -- .../HttpCache/SurrogateInterface.php | 11 -- .../Component/HttpKernel/HttpKernel.php | 5 - src/Symfony/Component/HttpKernel/Kernel.php | 4 - .../Component/HttpKernel/KernelInterface.php | 2 - .../Profiler/MongoDbProfilerStorage.php | 6 - .../Component/HttpKernel/Profiler/Profile.php | 6 - .../HttpKernel/Profiler/Profiler.php | 22 ---- .../Profiler/ProfilerStorageInterface.php | 2 - .../Profiler/RedisProfilerStorage.php | 2 - .../HttpKernel/TerminableInterface.php | 3 - .../Data/Bundle/Reader/BundleEntryReader.php | 7 -- .../Data/Generator/CurrencyDataGenerator.php | 4 - .../Data/Generator/LanguageDataGenerator.php | 2 - .../Data/Generator/RegionDataGenerator.php | 4 - .../DateFormat/FullTransformer.php | 4 - .../DateFormat/MonthTransformer.php | 9 -- .../Intl/DateFormatter/IntlDateFormatter.php | 4 - .../DateFormatter/IntlDateFormatterTest.php | 2 - src/Symfony/Component/Locale/Locale.php | 6 - .../Component/Process/ExecutableFinder.php | 2 - src/Symfony/Component/Process/Process.php | 2 - .../PropertyAccess/PropertyAccessor.php | 16 +-- .../PropertyAccess/PropertyPathBuilder.php | 7 -- .../PropertyAccess/PropertyPathIterator.php | 5 - .../Component/PropertyAccess/StringUtil.php | 2 - .../Exception/MethodNotAllowedException.php | 3 - .../Generator/Dumper/GeneratorDumper.php | 6 - .../Routing/Generator/UrlGenerator.php | 15 --- .../Routing/Loader/AnnotationClassLoader.php | 6 - .../Routing/Loader/AnnotationFileLoader.php | 3 - .../Matcher/Dumper/ApacheMatcherDumper.php | 6 - .../Matcher/Dumper/DumperCollection.php | 2 - .../Matcher/Dumper/DumperPrefixCollection.php | 2 - .../Routing/Matcher/Dumper/MatcherDumper.php | 6 - .../Matcher/Dumper/PhpMatcherDumper.php | 2 - .../Matcher/RequestMatcherInterface.php | 2 - .../Component/Routing/Matcher/UrlMatcher.php | 16 --- .../Component/Routing/RequestContext.php | 6 - .../Routing/RequestContextAwareInterface.php | 2 - src/Symfony/Component/Routing/Route.php | 33 +----- .../Component/Routing/RouteCollection.php | 4 - .../Routing/RouteCompilerInterface.php | 2 - src/Symfony/Component/Routing/Router.php | 2 - .../Security/Acl/Dbal/AclProvider.php | 26 ---- .../Security/Acl/Dbal/MutableAclProvider.php | 16 --- .../Component/Security/Acl/Dbal/Schema.php | 2 - .../Component/Security/Acl/Domain/Acl.php | 5 - .../Acl/Domain/AclCollectionCache.php | 5 - .../Security/Acl/Domain/DoctrineAclCache.php | 2 - .../Acl/Domain/PermissionGrantingStrategy.php | 5 - .../SecurityIdentityRetrievalStrategy.php | 4 - .../Acl/Domain/UserSecurityIdentity.php | 4 - .../Security/Acl/Model/AclCacheInterface.php | 6 - .../Acl/Model/MutableAclProviderInterface.php | 6 - .../Acl/Model/ObjectIdentityInterface.php | 2 - .../Acl/Model/SecurityIdentityInterface.php | 2 - ...rityIdentityRetrievalStrategyInterface.php | 2 - .../Acl/Tests/Dbal/MutableAclProviderTest.php | 3 - .../AuthenticationTrustResolverInterface.php | 6 - .../AuthenticationProviderInterface.php | 2 - ...PreAuthenticatedAuthenticationProvider.php | 5 - .../Provider/UserAuthenticationProvider.php | 6 - .../RememberMe/TokenProviderInterface.php | 2 - .../Voter/AuthenticatedVoter.php | 3 - .../Authorization/Voter/ExpressionVoter.php | 5 - .../Security/Core/Encoder/EncoderFactory.php | 2 - .../Core/Encoder/UserPasswordEncoder.php | 6 - .../Core/Exception/AccountStatusException.php | 5 - .../Exception/AuthenticationException.php | 5 - .../Security/Core/User/EquatableInterface.php | 2 - .../Core/User/InMemoryUserProvider.php | 2 - .../Core/User/UserCheckerInterface.php | 4 - .../Core/User/UserProviderInterface.php | 2 - .../Security/Csrf/CsrfTokenManager.php | 14 --- .../Csrf/CsrfTokenManagerInterface.php | 2 - .../Security/Http/AccessMapInterface.php | 2 - .../AuthenticationFailureHandlerInterface.php | 3 - .../AuthenticationSuccessHandlerInterface.php | 3 - .../Authentication/AuthenticationUtils.php | 6 - .../DefaultAuthenticationFailureHandler.php | 5 - .../DefaultAuthenticationSuccessHandler.php | 7 -- .../AccessDeniedHandlerInterface.php | 3 - .../Http/Event/InteractiveLoginEvent.php | 4 - .../Component/Security/Http/Firewall.php | 9 -- .../AbstractAuthenticationListener.php | 8 -- .../AbstractPreAuthenticatedListener.php | 6 - .../Security/Http/Firewall/AccessListener.php | 2 - .../AnonymousAuthenticationListener.php | 2 - .../Firewall/BasicAuthenticationListener.php | 2 - .../Http/Firewall/ChannelListener.php | 2 - .../Http/Firewall/ContextListener.php | 6 - .../Firewall/DigestAuthenticationListener.php | 2 - .../Http/Firewall/ExceptionListener.php | 12 -- .../Http/Firewall/ListenerInterface.php | 5 - .../Security/Http/Firewall/LogoutListener.php | 9 -- .../Http/Firewall/RememberMeListener.php | 2 - .../SimplePreAuthenticationListener.php | 2 - .../Http/Firewall/SwitchUserListener.php | 8 -- .../Component/Security/Http/FirewallMap.php | 5 - .../Security/Http/FirewallMapInterface.php | 2 - .../Logout/CookieClearingLogoutHandler.php | 4 - .../Http/Logout/LogoutHandlerInterface.php | 4 - .../Logout/LogoutSuccessHandlerInterface.php | 2 - .../Http/Logout/SessionLogoutHandler.php | 4 - .../RememberMe/AbstractRememberMeServices.php | 28 ----- ...PersistentTokenBasedRememberMeServices.php | 5 - .../RememberMeServicesInterface.php | 8 -- .../Http/RememberMe/ResponseListener.php | 3 - ...SessionAuthenticationStrategyInterface.php | 3 - .../Serializer/Annotation/Groups.php | 2 - .../Serializer/Encoder/JsonDecode.php | 2 - .../Serializer/Encoder/JsonEncode.php | 2 - .../Serializer/Encoder/XmlEncoder.php | 2 - .../Serializer/Mapping/AttributeMetadata.php | 4 - .../Mapping/AttributeMetadataInterface.php | 2 - .../Mapping/ClassMetadataInterface.php | 4 - .../Mapping/Factory/ClassMetadataFactory.php | 15 --- .../Mapping/Loader/AnnotationLoader.php | 6 - .../Mapping/Loader/LoaderInterface.php | 4 - .../Normalizer/AbstractNormalizer.php | 5 - .../Serializer/SerializerAwareInterface.php | 2 - .../Component/Templating/DelegatingEngine.php | 5 - .../Templating/Helper/CoreAssetsHelper.php | 5 - .../Templating/Loader/CacheLoader.php | 2 - .../Templating/Loader/ChainLoader.php | 4 - .../Templating/Loader/FilesystemLoader.php | 2 - .../Component/Templating/Loader/Loader.php | 2 - .../Templating/Loader/LoaderInterface.php | 2 - .../Catalogue/AbstractOperation.php | 14 --- .../TranslationDataCollector.php | 6 - .../Translation/DataCollectorTranslator.php | 3 - .../Translation/Loader/PoFileLoader.php | 3 - .../Translation/MessageCatalogueInterface.php | 6 - .../Component/Translation/Translator.php | 5 - .../Translation/Writer/TranslationWriter.php | 5 - .../ConstraintValidatorFactoryInterface.php | 2 - .../Validator/ConstraintViolation.php | 39 ------ .../ConstraintViolationListInterface.php | 4 - .../Validator/Constraints/IbanValidator.php | 2 - .../Mapping/Cache/CacheInterface.php | 2 - .../Validator/Mapping/Cache/DoctrineCache.php | 10 -- .../Validator/Mapping/ClassMetadata.php | 7 -- .../Validator/Mapping/GenericMetadata.php | 2 - .../Mapping/Loader/AbstractLoader.php | 3 - .../Mapping/Loader/LoaderInterface.php | 2 - .../Tests/Validator/Abstract2Dot5ApiTest.php | 3 - .../Validator/ValidatorInterface.php | 2 - .../Validator/ValidatorBuilderInterface.php | 20 +--- .../VarDumper/Dumper/DataDumperInterface.php | 5 - 438 files changed, 41 insertions(+), 2685 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php index 9725fdcc08..9bf22357df 100644 --- a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php +++ b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php @@ -26,9 +26,6 @@ class ProxyCacheWarmer implements CacheWarmerInterface { private $registry; - /** - * @param ManagerRegistry $registry A ManagerRegistry instance - */ public function __construct(ManagerRegistry $registry) { $this->registry = $registry; diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php index 0888f97ca9..895ade5fe7 100644 --- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php +++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php @@ -26,8 +26,6 @@ class ContainerAwareEventManager extends EventManager * Map of registered listeners. * * => - * - * @var array */ private $listeners = array(); private $initialized = array(); diff --git a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php index 93cd2c11f9..7ccd1df106 100644 --- a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php +++ b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php @@ -25,14 +25,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface; */ class ContainerAwareLoader extends Loader { - /** - * @var ContainerInterface - */ private $container; - /** - * @param ContainerInterface $container A ContainerInterface instance - */ public function __construct(ContainerInterface $container) { $this->container = $container; diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php index c0623572ec..8426d307da 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php @@ -27,15 +27,11 @@ abstract class AbstractDoctrineExtension extends Extension { /** * Used inside metadata driver method to simplify aggregation of data. - * - * @var array */ protected $aliasMap = array(); /** * Used inside metadata driver method to simplify aggregation of data. - * - * @var array */ protected $drivers = array(); @@ -142,10 +138,6 @@ abstract class AbstractDoctrineExtension extends Extension * * Returns false when autodetection failed, an array of the completed information otherwise. * - * @param array $bundleConfig - * @param \ReflectionClass $bundle - * @param ContainerBuilder $container A ContainerBuilder instance - * * @return array|false */ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container) @@ -402,9 +394,6 @@ abstract class AbstractDoctrineExtension extends Extension * * The manager called $autoMappedManager will map all bundles that are not mapped by other managers. * - * @param array $managerConfigs - * @param array $bundles - * * @return array The modified version of $managerConfigs */ protected function fixManagersAutoMappings(array $managerConfigs, array $bundles) @@ -464,8 +453,6 @@ abstract class AbstractDoctrineExtension extends Extension /** * Search for a manager that is declared as 'auto_mapping' = true. * - * @param array $managerConfigs - * * @return null|string The name of the manager. If no one manager is found, returns null * * @throws \LogicException diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php index cd7612fe23..c1d505722a 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php @@ -134,8 +134,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface /** * Register mappings and alias with the metadata drivers. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { @@ -167,8 +165,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface * Get the service name of the metadata chain driver that the mappings * should be registered with. * - * @param ContainerBuilder $container - * * @return string The name of the chain driver service * * @throws ParameterNotFoundException if non of the managerParameters has a @@ -195,8 +191,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface /** * Get the service name from the pattern and the configured manager name. * - * @param ContainerBuilder $container - * * @return string a service definition name * * @throws ParameterNotFoundException if none of the managerParameters has a @@ -213,8 +207,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface * The default implementation loops over the managerParameters and returns * the first non-empty parameter. * - * @param ContainerBuilder $container - * * @return string The name of the active manager * * @throws ParameterNotFoundException if none of the managerParameters is found in the container @@ -240,8 +232,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface * This default implementation checks if the class has the enabledParameter * configured and if so if that parameter is present in the container. * - * @param ContainerBuilder $container - * * @return bool whether this compiler pass really should register the mappings */ protected function enabled(ContainerBuilder $container) diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php index 72d7a6f10b..082206f60b 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php @@ -214,8 +214,6 @@ class EntityChoiceList extends ObjectChoiceList /** * Returns the entities corresponding to the given values. * - * @param array $values - * * @return array * * @see ChoiceListInterface @@ -267,8 +265,6 @@ class EntityChoiceList extends ObjectChoiceList /** * Returns the values corresponding to the given entities. * - * @param array $entities - * * @return array * * @see ChoiceListInterface diff --git a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php index e56674be35..307361a52a 100644 --- a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php +++ b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php @@ -24,8 +24,6 @@ class CollectionToArrayTransformer implements DataTransformerInterface /** * Transforms a collection into an array. * - * @param Collection $collection A collection of entities - * * @return mixed An array of entities * * @throws TransformationFailedException diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php index fef097d3ea..aeea242520 100644 --- a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php +++ b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php @@ -84,8 +84,6 @@ class EntityType extends DoctrineType /** * Converts a query parameter to an array. * - * @param Parameter $parameter The query parameter - * * @return array The array representation of the parameter */ private function parameterToArray(Parameter $parameter) diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php index 9fab65a12c..cc07076f9e 100644 --- a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php +++ b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php @@ -26,10 +26,6 @@ class DbalLogger implements SQLLogger protected $logger; protected $stopwatch; - /** - * @param LoggerInterface $logger A LoggerInterface instance - * @param Stopwatch $stopwatch A Stopwatch instance - */ public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch = null) { $this->logger = $logger; diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php index b2216b7ae3..089ec78105 100644 --- a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php +++ b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php @@ -45,11 +45,6 @@ class DoctrineTokenProvider implements TokenProviderInterface */ private $conn; - /** - * new DoctrineTokenProvider for the RememberMe authentication service. - * - * @param Connection $conn - */ public function __construct(Connection $conn) { $this->conn = $conn; diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php index 860162a77d..0a9dae3b20 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php @@ -267,8 +267,6 @@ class DoctrineExtensionTest extends TestCase } /** - * @param array $data - * * @return \Symfony\Component\DependencyInjection\ContainerBuilder */ protected function createContainer(array $data = array()) diff --git a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php index a60a4ec479..1203a0d999 100644 --- a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php @@ -22,9 +22,6 @@ use Symfony\Component\HttpKernel\Event\FilterResponseEvent; */ class ChromePhpHandler extends BaseChromePhpHandler { - /** - * @var array - */ private $headers = array(); /** diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php index 2b3bafa8b7..263b2b7a68 100644 --- a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php @@ -40,14 +40,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; */ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface { - /** - * @var OutputInterface|null - */ private $output; - - /** - * @var array - */ private $verbosityLevelMap = array( OutputInterface::VERBOSITY_NORMAL => Logger::WARNING, OutputInterface::VERBOSITY_VERBOSE => Logger::NOTICE, @@ -92,8 +85,6 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe /** * Sets the console output to use for printing logs. - * - * @param OutputInterface $output The console output to use */ public function setOutput(OutputInterface $output) { @@ -113,8 +104,6 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe /** * Before a command is executed, the handler gets activated and the console output * is set in order to know where to write the logs. - * - * @param ConsoleCommandEvent $event */ public function onCommand(ConsoleCommandEvent $event) { @@ -128,8 +117,6 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe /** * After a command has been executed, it disables the output. - * - * @param ConsoleTerminateEvent $event */ public function onTerminate(ConsoleTerminateEvent $event) { diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php index 339843c1d4..056496ae13 100644 --- a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php @@ -22,9 +22,6 @@ use Symfony\Component\HttpFoundation\Response; */ class FirePHPHandler extends BaseFirePHPHandler { - /** - * @var array - */ private $headers = array(); /** diff --git a/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php index 0412e94f22..fcbd98ac7d 100644 --- a/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php @@ -26,9 +26,6 @@ class SwiftMailerHandler extends BaseSwiftMailerHandler protected $instantFlush = false; - /** - * @param \Swift_Transport $transport - */ public function setTransport(\Swift_Transport $transport) { $this->transport = $transport; @@ -36,8 +33,6 @@ class SwiftMailerHandler extends BaseSwiftMailerHandler /** * After the kernel has been terminated we will always flush messages. - * - * @param PostResponseEvent $event */ public function onKernelTerminate(PostResponseEvent $event) { @@ -46,8 +41,6 @@ class SwiftMailerHandler extends BaseSwiftMailerHandler /** * After the CLI application has been terminated we will always flush messages. - * - * @param ConsoleTerminateEvent $event */ public function onCliTerminate(ConsoleTerminateEvent $event) { diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php index 45509058c0..629b556c4b 100644 --- a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php +++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php @@ -110,8 +110,6 @@ EOF; /** * Produces the proxy class name for the given definition. * - * @param Definition $definition - * * @return string */ private function getProxyClassName(Definition $definition) @@ -120,8 +118,6 @@ EOF; } /** - * @param Definition $definition - * * @return ClassGenerator */ private function generateProxyClass(Definition $definition) diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php index bbf6fea639..7878247edb 100644 --- a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php @@ -25,9 +25,6 @@ class HttpKernelExtension extends AbstractExtension { private $handler; - /** - * @param FragmentHandler $handler A FragmentHandler instance - */ public function __construct(FragmentHandler $handler) { $this->handler = $handler; diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php index 1284cf52a2..1c3451bbeb 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php @@ -16,24 +16,10 @@ namespace Symfony\Bridge\Twig\NodeVisitor; */ class Scope { - /** - * @var Scope|null - */ private $parent; - - /** - * @var array - */ private $data = array(); - - /** - * @var bool - */ private $left = false; - /** - * @param Scope $parent - */ public function __construct(Scope $parent = null) { $this->parent = $parent; diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php index 01f230b9ef..1fbce9c6af 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php @@ -123,8 +123,6 @@ class TranslationNodeVisitor extends AbstractNodeVisitor } /** - * @param Node $node - * * @return string|null */ private function getReadDomainFromNode(Node $node) diff --git a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php index 12c2541851..7301813d59 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php @@ -27,8 +27,6 @@ class FormThemeTokenParser extends AbstractTokenParser /** * Parses a token and returns a node. * - * @param Token $token - * * @return Node */ public function parse(Token $token) diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php index 2b4a9f3fc4..5261d7ad52 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php @@ -29,8 +29,6 @@ class TransChoiceTokenParser extends TransTokenParser /** * Parses a token and returns a node. * - * @param Token $token - * * @return Node * * @throws SyntaxError diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php index 4096a011a3..ee546e05f0 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php @@ -26,8 +26,6 @@ class TransDefaultDomainTokenParser extends AbstractTokenParser /** * Parses a token and returns a node. * - * @param Token $token - * * @return Node */ public function parse(Token $token) diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php index 848a080710..76c8dc0610 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php @@ -30,8 +30,6 @@ class TransTokenParser extends AbstractTokenParser /** * Parses a token and returns a node. * - * @param Token $token - * * @return Node * * @throws SyntaxError diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php index 3515cfc7f3..47c5d2f677 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php @@ -24,9 +24,6 @@ class RouterCacheWarmer implements CacheWarmerInterface { protected $router; - /** - * @param RouterInterface $router A Router instance - */ public function __construct(RouterInterface $router) { $this->router = $router; diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php index 2cb19d9df2..d2a21949a9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php @@ -24,10 +24,6 @@ class TemplatePathsCacheWarmer extends CacheWarmer protected $finder; protected $locator; - /** - * @param TemplateFinderInterface $finder A template finder - * @param TemplateLocator $locator The template locator - */ public function __construct(TemplateFinderInterface $finder, TemplateLocator $locator) { $this->finder = $finder; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php index dd85c2456a..127a75fbcd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php @@ -130,8 +130,6 @@ EOF /** * Validates input arguments and options. * - * @param InputInterface $input - * * @throws \InvalidArgumentException */ protected function validateInput(InputInterface $input) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php index 54cce9a459..54383aad94 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php @@ -29,9 +29,6 @@ class Application extends BaseApplication private $kernel; private $commandsRegistered = false; - /** - * @param KernelInterface $kernel A KernelInterface instance - */ public function __construct(KernelInterface $kernel) { $this->kernel = $kernel; @@ -57,9 +54,6 @@ class Application extends BaseApplication /** * Runs the current application. * - * @param InputInterface $input An Input instance - * @param OutputInterface $output An Output instance - * * @return int 0 if everything went fine, or an error code */ public function doRun(InputInterface $input, OutputInterface $output) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php index 33334e7992..3d1bbd831d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php @@ -120,33 +120,21 @@ abstract class Descriptor implements DescriptorInterface /** * Describes an InputArgument instance. - * - * @param RouteCollection $routes - * @param array $options */ abstract protected function describeRouteCollection(RouteCollection $routes, array $options = array()); /** * Describes an InputOption instance. - * - * @param Route $route - * @param array $options */ abstract protected function describeRoute(Route $route, array $options = array()); /** * Describes container parameters. - * - * @param ParameterBag $parameters - * @param array $options */ abstract protected function describeContainerParameters(ParameterBag $parameters, array $options = array()); /** * Describes container tags. - * - * @param ContainerBuilder $builder - * @param array $options */ abstract protected function describeContainerTags(ContainerBuilder $builder, array $options = array()); @@ -166,33 +154,21 @@ abstract class Descriptor implements DescriptorInterface * * Common options are: * * tag: filters described services by given tag - * - * @param ContainerBuilder $builder - * @param array $options */ abstract protected function describeContainerServices(ContainerBuilder $builder, array $options = array()); /** * Describes a service definition. - * - * @param Definition $definition - * @param array $options */ abstract protected function describeContainerDefinition(Definition $definition, array $options = array()); /** * Describes a service alias. - * - * @param Alias $alias - * @param array $options */ abstract protected function describeContainerAlias(Alias $alias, array $options = array()); /** * Describes a container parameter. - * - * @param string $parameter - * @param array $options */ abstract protected function describeContainerParameter($parameter, array $options = array()); @@ -201,9 +177,6 @@ abstract class Descriptor implements DescriptorInterface * * Common options are: * * name: name of listened event - * - * @param EventDispatcherInterface $eventDispatcher - * @param array $options */ abstract protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = array()); diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php index 791593de07..e50a2fc0b2 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php @@ -163,9 +163,6 @@ class JsonDescriptor extends Descriptor /** * Writes data as json. * - * @param array $data - * @param array $options - * * @return array|string */ private function writeData(array $data, array $options) @@ -180,8 +177,6 @@ class JsonDescriptor extends Descriptor } /** - * @param Route $route - * * @return array */ protected function getRouteData(Route $route) @@ -268,8 +263,6 @@ class JsonDescriptor extends Descriptor } /** - * @param Alias $alias - * * @return array */ private function getContainerAliasData(Alias $alias) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php index 2cefe9f03a..fd522005af 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php @@ -351,8 +351,6 @@ class MarkdownDescriptor extends Descriptor } /** - * @param array $array - * * @return string */ private function formatRouterConfig(array $array) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php index 0fe5fa70f5..388c3e7084 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php @@ -375,8 +375,6 @@ class TextDescriptor extends Descriptor } /** - * @param array $array - * * @return string */ private function formatRouterConfig(array $array) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php index c37a9009fc..e2bf073f6d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php @@ -122,8 +122,6 @@ class XmlDescriptor extends Descriptor /** * Writes DOM document. * - * @param \DOMDocument $dom - * * @return \DOMDocument|string */ private function writeDocument(\DOMDocument $dom) @@ -133,8 +131,6 @@ class XmlDescriptor extends Descriptor } /** - * @param RouteCollection $routes - * * @return \DOMDocument */ private function getRouteCollectionDocument(RouteCollection $routes) @@ -220,8 +216,6 @@ class XmlDescriptor extends Descriptor } /** - * @param ParameterBag $parameters - * * @return \DOMDocument */ private function getContainerParametersDocument(ParameterBag $parameters) @@ -416,9 +410,6 @@ class XmlDescriptor extends Descriptor } /** - * @param string $parameter - * @param array $options - * * @return \DOMDocument */ private function getContainerParameterDocument($parameter, $options = array()) diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php index 8d6203a06f..8de32f1a7b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php @@ -24,9 +24,6 @@ class ControllerNameParser { protected $kernel; - /** - * @param KernelInterface $kernel A KernelInterface instance - */ public function __construct(KernelInterface $kernel) { $this->kernel = $kernel; diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php index 00f4f1ed14..b7bb8abde6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php @@ -24,11 +24,6 @@ class ControllerResolver extends BaseControllerResolver protected $container; protected $parser; - /** - * @param ContainerInterface $container A ContainerInterface instance - * @param ControllerNameParser $parser A ControllerNameParser instance - * @param LoggerInterface $logger A LoggerInterface instance - */ public function __construct(ContainerInterface $container, ControllerNameParser $parser, LoggerInterface $logger = null) { $this->container = $container; diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 85a1a9ba20..10bcf210ad 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -45,9 +45,6 @@ class FrameworkExtension extends Extension /** * Responds to the app.config configuration parameter. * - * @param array $configs - * @param ContainerBuilder $container - * * @throws LogicException */ public function load(array $configs, ContainerBuilder $container) @@ -194,16 +191,7 @@ class FrameworkExtension extends Extension return new Configuration($container->getParameter('kernel.debug')); } - /** - * Loads Form configuration. - * - * @param array $config A configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - * - * @throws \LogicException - */ - private function registerFormConfiguration($config, ContainerBuilder $container, XmlFileLoader $loader) + private function registerFormConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { $loader->load('form.xml'); if (null === $config['form']['csrf_protection']['enabled']) { @@ -225,13 +213,6 @@ class FrameworkExtension extends Extension } } - /** - * Loads the ESI configuration. - * - * @param array $config An ESI configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - */ private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { if (!$this->isConfigEnabled($container, $config)) { @@ -241,13 +222,6 @@ class FrameworkExtension extends Extension $loader->load('esi.xml'); } - /** - * Loads the SSI configuration. - * - * @param array $config An SSI configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - */ private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { if (!$this->isConfigEnabled($container, $config)) { @@ -257,13 +231,6 @@ class FrameworkExtension extends Extension $loader->load('ssi.xml'); } - /** - * Loads the fragments configuration. - * - * @param array $config A fragments configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - */ private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { if (!$this->isConfigEnabled($container, $config)) { @@ -274,15 +241,6 @@ class FrameworkExtension extends Extension $container->setParameter('fragment.path', $config['path']); } - /** - * Loads the profiler configuration. - * - * @param array $config A profiler configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - * - * @throws \LogicException - */ private function registerProfilerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { if (!$this->isConfigEnabled($container, $config)) { @@ -355,13 +313,6 @@ class FrameworkExtension extends Extension } } - /** - * Loads the router configuration. - * - * @param array $config A router configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - */ private function registerRouterConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { $loader->load('routing.xml'); @@ -388,13 +339,6 @@ class FrameworkExtension extends Extension )); } - /** - * Loads the session configuration. - * - * @param array $config A session configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - */ private function registerSessionConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { $loader->load('session.xml'); @@ -447,13 +391,6 @@ class FrameworkExtension extends Extension $container->setParameter('session.metadata.update_threshold', $config['metadata_update_threshold']); } - /** - * Loads the request configuration. - * - * @param array $config A request configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - */ private function registerRequestConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { if ($config['formats']) { @@ -465,14 +402,6 @@ class FrameworkExtension extends Extension } } - /** - * Loads the templating configuration. - * - * @param array $config A templating configuration array - * @param string $ide - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - */ private function registerTemplatingConfiguration(array $config, $ide, ContainerBuilder $container, XmlFileLoader $loader) { $loader->load('templating.xml'); @@ -575,13 +504,6 @@ class FrameworkExtension extends Extension } } - /** - * Loads the assets configuration. - * - * @param array $config A assets configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - */ private function registerAssetsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { $loader->load('assets.xml'); @@ -645,12 +567,6 @@ class FrameworkExtension extends Extension return new Reference('assets._version_'.$name); } - /** - * Loads the translator configuration. - * - * @param array $config A translator configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - */ private function registerTranslatorConfiguration(array $config, ContainerBuilder $container) { if (!$this->isConfigEnabled($container, $config)) { @@ -728,13 +644,6 @@ class FrameworkExtension extends Extension } } - /** - * Loads the validator configuration. - * - * @param array $config A validation configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - */ private function registerValidationConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { if (!$this->isConfigEnabled($container, $config)) { @@ -861,15 +770,6 @@ class FrameworkExtension extends Extension ; } - /** - * Loads the security configuration. - * - * @param array $config A CSRF configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - * - * @throws \LogicException - */ private function registerSecurityCsrfConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { if (!$this->isConfigEnabled($container, $config)) { @@ -884,13 +784,6 @@ class FrameworkExtension extends Extension $loader->load('security_csrf.xml'); } - /** - * Loads the serializer configuration. - * - * @param array $config A serializer configuration array - * @param ContainerBuilder $container A ContainerBuilder instance - * @param XmlFileLoader $loader An XmlFileLoader instance - */ private function registerSerializerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) { if (!$config['enabled']) { @@ -965,8 +858,6 @@ class FrameworkExtension extends Extension /** * Gets a hash of the kernel root directory. * - * @param ContainerBuilder $container - * * @return string */ private function getKernelRootHash(ContainerBuilder $container) diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php index 3bbe82ca26..397528d2b5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php @@ -31,11 +31,6 @@ class DelegatingLoader extends BaseDelegatingLoader protected $logger; private $loading = false; - /** - * @param ControllerNameParser $parser A ControllerNameParser instance - * @param LoggerInterface $logger A LoggerInterface instance - * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance - */ public function __construct(ControllerNameParser $parser, LoggerInterface $logger = null, LoaderResolverInterface $resolver) { $this->parser = $parser; diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index ec37ca3067..47b279ce8f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -79,8 +79,6 @@ class Router extends BaseRouter implements WarmableInterface * - the route host, * - the route schemes, * - the route methods. - * - * @param RouteCollection $collection */ private function resolveParameters(RouteCollection $collection) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php index 7dcdec2b4b..00d422ef38 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php @@ -28,9 +28,6 @@ class Debugger implements DebuggerInterface { protected $logger; - /** - * @param LoggerInterface $logger A LoggerInterface instance - */ public function __construct(LoggerInterface $logger = null) { $this->logger = $logger; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php index a6a0b508fb..0a8e451894 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php @@ -24,10 +24,6 @@ class DelegatingEngine extends BaseDelegatingEngine implements EngineInterface { protected $container; - /** - * @param ContainerInterface $container The DI container - * @param array $engineIds An array of engine Ids - */ public function __construct(ContainerInterface $container, array $engineIds) { $this->container = $container; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php b/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php index 687588b1b9..d387bb17ab 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php @@ -25,9 +25,6 @@ class GlobalVariables { protected $container; - /** - * @param ContainerInterface $container The DI container - */ public function __construct(ContainerInterface $container) { $this->container = $container; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php index 8e1e242f01..c0879c97f0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php @@ -24,9 +24,6 @@ class ActionsHelper extends Helper { private $handler; - /** - * @param FragmentHandler $handler A FragmentHandler instance - */ public function __construct(FragmentHandler $handler) { $this->handler = $handler; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php index 8375fb0235..954878f946 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -23,14 +23,8 @@ use Symfony\Component\Form\FormView; */ class FormHelper extends Helper { - /** - * @var FormRendererInterface - */ private $renderer; - /** - * @param FormRendererInterface $renderer - */ public function __construct(FormRendererInterface $renderer) { $this->renderer = $renderer; @@ -198,8 +192,6 @@ class FormHelper extends Helper /** * Renders the errors of the given view. * - * @param FormView $view The view to render the errors for - * * @return string The HTML markup */ public function errors(FormView $view) diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php index e9d5d03c71..32db60c275 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php @@ -23,9 +23,6 @@ class RouterHelper extends Helper { protected $generator; - /** - * @param UrlGeneratorInterface $router A Router instance - */ public function __construct(UrlGeneratorInterface $router) { $this->generator = $router; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php index 9893c5e35c..5c4a9ae0fa 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php @@ -21,9 +21,6 @@ class TranslatorHelper extends Helper { protected $translator; - /** - * @param TranslatorInterface $translator A TranslatorInterface instance - */ public function __construct(TranslatorInterface $translator) { $this->translator = $translator; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php index 402778bd76..29031d03db 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php @@ -25,9 +25,6 @@ class FilesystemLoader implements LoaderInterface { protected $locator; - /** - * @param FileLocatorInterface $locator A FileLocatorInterface instance - */ public function __construct(FileLocatorInterface $locator) { $this->locator = $locator; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php index c74322d681..01b255ff08 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php @@ -42,8 +42,6 @@ class TemplateLocator implements FileLocatorInterface /** * Returns a full path for a given file. * - * @param TemplateReferenceInterface $template A template - * * @return string The full path for the file */ protected function getCacheKey($template) diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php index 0725e010e9..17651c00a0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php @@ -26,12 +26,6 @@ class PhpEngine extends BasePhpEngine implements EngineInterface { protected $container; - /** - * @param TemplateNameParserInterface $parser A TemplateNameParserInterface instance - * @param ContainerInterface $container The DI container - * @param LoaderInterface $loader A loader instance - * @param GlobalVariables|null $globals A GlobalVariables instance or null - */ public function __construct(TemplateNameParserInterface $parser, ContainerInterface $container, LoaderInterface $loader, GlobalVariables $globals = null) { $this->container = $container; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php index 3ae8fccd20..1b2899291d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php @@ -27,9 +27,6 @@ class TemplateNameParser extends BaseTemplateNameParser protected $kernel; protected $cache = array(); - /** - * @param KernelInterface $kernel A KernelInterface instance - */ public function __construct(KernelInterface $kernel) { $this->kernel = $kernel; diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php b/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php index ccfbcf7408..75f8bc40a6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php @@ -25,13 +25,6 @@ class TimedPhpEngine extends PhpEngine { protected $stopwatch; - /** - * @param TemplateNameParserInterface $parser A TemplateNameParserInterface instance - * @param ContainerInterface $container A ContainerInterface instance - * @param LoaderInterface $loader A LoaderInterface instance - * @param Stopwatch $stopwatch A Stopwatch instance - * @param GlobalVariables $globals A GlobalVariables instance - */ public function __construct(TemplateNameParserInterface $parser, ContainerInterface $container, LoaderInterface $loader, Stopwatch $stopwatch, GlobalVariables $globals = null) { parent::__construct($parser, $container, $loader, $globals); diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php index 6b979c4f36..045e05f534 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php +++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php @@ -135,8 +135,6 @@ abstract class KernelTestCase extends TestCase /** * Boots the Kernel for this test. - * - * @param array $options */ protected static function bootKernel(array $options = array()) { @@ -154,8 +152,6 @@ abstract class KernelTestCase extends TestCase * * environment * * debug * - * @param array $options An array of options - * * @return KernelInterface A KernelInterface instance */ protected static function createKernel(array $options = array()) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php index c9a3b282ce..f16cf15d81 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php @@ -209,8 +209,6 @@ class RouterTest extends TestCase } /** - * @param RouteCollection $routes - * * @return \Symfony\Component\DependencyInjection\Container */ private function getServiceContainer(RouteCollection $routes) diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php index 70658f6723..6258878e50 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php @@ -29,15 +29,11 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface /** * Prefix for new found message. - * - * @var string */ private $prefix = ''; /** * The sequence that captures translation messages. - * - * @var array */ protected $sequences = array( array( diff --git a/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php b/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php index ce4efcbb1b..6634b9e2ab 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php +++ b/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php @@ -56,8 +56,6 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface /** * Returns the validator for the supplied constraint. * - * @param Constraint $constraint A constraint - * * @return ConstraintValidatorInterface A validator for the supplied constraint * * @throws ValidatorException When the validator class does not exist diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php index 285d5993a2..ca2c8d6db3 100644 --- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php +++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php @@ -26,10 +26,6 @@ class SecurityDataCollector extends DataCollector private $tokenStorage; private $roleHierarchy; - /** - * @param TokenStorageInterface|null $tokenStorage - * @param RoleHierarchyInterface|null $roleHierarchy - */ public function __construct(TokenStorageInterface $tokenStorage = null, RoleHierarchyInterface $roleHierarchy = null) { $this->tokenStorage = $tokenStorage; diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php index 2f4ab6891f..43bd560588 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php @@ -36,10 +36,6 @@ class MainConfiguration implements ConfigurationInterface private $factories; private $userProviderFactories; - /** - * @param array $factories - * @param array $userProviderFactories - */ public function __construct(array $factories, array $userProviderFactories) { $this->factories = $factories; diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php index cdb0a96fe4..f415642801 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php @@ -144,8 +144,6 @@ abstract class AbstractFactory implements SecurityFactoryInterface * Subclasses may disable remember-me features for the listener, by * always returning false from this method. * - * @param array $config - * * @return bool Whether a possibly configured RememberMeServices should be set for this listener */ protected function isRememberMeAware($config) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index 2fd12c9436..9b082d6a9b 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -160,11 +160,8 @@ class SecurityExtension extends Extension /** * Loads the web configuration. - * - * @param array $config An array of configuration settings - * @param ContainerBuilder $container A ContainerBuilder instance */ - private function createRoleHierarchy($config, ContainerBuilder $container) + private function createRoleHierarchy(array $config, ContainerBuilder $container) { if (!isset($config['role_hierarchy'])) { $container->removeDefinition('security.access.role_hierarchy_voter'); diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php index 5d2fe28e9e..c56a4d8bcb 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php @@ -20,8 +20,6 @@ class MainConfigurationTest extends TestCase /** * The minimal, required config needed to not have any required validation * issues. - * - * @var array */ protected static $minimalConfig = array( 'providers' => array( diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php index d76d8fd629..ecaf9ed068 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php @@ -31,9 +31,6 @@ class UserLoginFormType extends AbstractType { private $request; - /** - * @param Request $request A request instance - */ public function __construct(Request $request) { $this->request = $request; diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php index 328c7318f5..42fc34ea4d 100644 --- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php +++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php @@ -29,10 +29,6 @@ class TemplateCacheCacheWarmer implements CacheWarmerInterface protected $container; protected $finder; - /** - * @param ContainerInterface $container The dependency injection container - * @param TemplateFinderInterface|null $finder The template paths cache warmer - */ public function __construct(ContainerInterface $container, TemplateFinderInterface $finder = null) { // We don't inject the Twig environment directly as it depends on the diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index 1878204003..8dd9cfee03 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php @@ -50,10 +50,6 @@ class ExceptionController * the exception page (when true). If it is not present, the "debug" value passed into the constructor will * be used. * - * @param Request $request The request - * @param FlattenException $exception A FlattenException instance - * @param DebugLoggerInterface $logger A DebugLoggerInterface instance - * * @return Response * * @throws \InvalidArgumentException When the exception template does not exist diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php index 286c8f6bfa..22fbe70a03 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php @@ -27,9 +27,6 @@ class TwigExtension extends Extension { /** * Responds to the twig configuration parameter. - * - * @param array $configs - * @param ContainerBuilder $container */ public function load(array $configs, ContainerBuilder $container) { diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php index a1e5bbc609..dcd312b30e 100644 --- a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php +++ b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php @@ -28,10 +28,6 @@ class FilesystemLoader extends BaseFilesystemLoader protected $locator; protected $parser; - /** - * @param FileLocatorInterface $locator A FileLocatorInterface instance - * @param TemplateNameParserInterface $parser A TemplateNameParserInterface instance - */ public function __construct(FileLocatorInterface $locator, TemplateNameParserInterface $parser) { parent::__construct(array()); diff --git a/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php b/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php index cef083df3d..347cb66b8b 100644 --- a/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php +++ b/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php @@ -29,8 +29,6 @@ class RenderTokenParser extends AbstractTokenParser /** * Parses a token and returns a node. * - * @param Token $token - * * @return Node */ public function parse(Token $token) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php index ef6624195e..6793a48bf3 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php @@ -206,8 +206,6 @@ class ProfilerController /** * Renders the profiler search bar. * - * @param Request $request The current HTTP Request - * * @return Response A Response instance * * @throws NotFoundHttpException @@ -298,8 +296,6 @@ class ProfilerController /** * Narrows the search bar. * - * @param Request $request The current HTTP Request - * * @return Response A Response instance * * @throws NotFoundHttpException diff --git a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php index 91cd1fb837..1e0b42b13d 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php @@ -63,8 +63,6 @@ class TemplateManager /** * Gets the templates for a given profile. * - * @param Profile $profile - * * @return Template[] * * @deprecated not used anymore internally @@ -82,8 +80,6 @@ class TemplateManager /** * Gets template names of templates that are present in the viewed profile. * - * @param Profile $profile - * * @return array * * @throws \UnexpectedValueException diff --git a/src/Symfony/Component/Asset/Packages.php b/src/Symfony/Component/Asset/Packages.php index 0a8c963549..63808d9078 100644 --- a/src/Symfony/Component/Asset/Packages.php +++ b/src/Symfony/Component/Asset/Packages.php @@ -38,11 +38,6 @@ class Packages } } - /** - * Sets the default package. - * - * @param PackageInterface $defaultPackage The default package - */ public function setDefaultPackage(PackageInterface $defaultPackage) { $this->defaultPackage = $defaultPackage; diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php index ecd6d65ee6..675a608d8d 100644 --- a/src/Symfony/Component/BrowserKit/Client.php +++ b/src/Symfony/Component/BrowserKit/Client.php @@ -212,8 +212,6 @@ abstract class Client /** * Clicks on a given link. * - * @param Link $link A Link instance - * * @return Crawler */ public function click(Link $link) diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php index c042c6a525..4030ae4c62 100644 --- a/src/Symfony/Component/BrowserKit/Cookie.php +++ b/src/Symfony/Component/BrowserKit/Cookie.php @@ -21,8 +21,6 @@ class Cookie /** * Handles dates as defined by RFC 2616 section 3.3.1, and also some other * non-standard, but common formats. - * - * @var array */ private static $dateFormats = array( 'D, d M Y H:i:s T', diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php index 4b9661b63f..232cefc8b6 100644 --- a/src/Symfony/Component/BrowserKit/CookieJar.php +++ b/src/Symfony/Component/BrowserKit/CookieJar.php @@ -20,11 +20,6 @@ class CookieJar { protected $cookieJar = array(); - /** - * Sets a cookie. - * - * @param Cookie $cookie A Cookie instance - */ public function set(Cookie $cookie) { $this->cookieJar[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie; diff --git a/src/Symfony/Component/BrowserKit/History.php b/src/Symfony/Component/BrowserKit/History.php index 13af2b4f37..aeca327734 100644 --- a/src/Symfony/Component/BrowserKit/History.php +++ b/src/Symfony/Component/BrowserKit/History.php @@ -32,8 +32,6 @@ class History /** * Adds a Request to the history. - * - * @param Request $request A Request instance */ public function add(Request $request) { diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php index 3f2a8ab1c9..ec2b075f66 100644 --- a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php +++ b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php @@ -294,8 +294,6 @@ REGEX; /** * Gets an ordered array of passed classes including all their dependencies. * - * @param array $classes - * * @return \ReflectionClass[] An array of sorted \ReflectionClass instances (dependencies added if needed) * * @throws \InvalidArgumentException When a class can't be loaded diff --git a/src/Symfony/Component/ClassLoader/Psr4ClassLoader.php b/src/Symfony/Component/ClassLoader/Psr4ClassLoader.php index a00cf7b83c..d9c4c3abbe 100644 --- a/src/Symfony/Component/ClassLoader/Psr4ClassLoader.php +++ b/src/Symfony/Component/ClassLoader/Psr4ClassLoader.php @@ -20,9 +20,6 @@ namespace Symfony\Component\ClassLoader; */ class Psr4ClassLoader { - /** - * @var array - */ private $prefixes = array(); /** diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php index e5237f8414..bd3984b825 100644 --- a/src/Symfony/Component/Config/Definition/ArrayNode.php +++ b/src/Symfony/Component/Config/Definition/ArrayNode.php @@ -195,8 +195,6 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface /** * Adds a child node. * - * @param NodeInterface $node The child node to add - * * @throws \InvalidArgumentException when the child node has no name * @throws \InvalidArgumentException when the child node's name is not unique */ diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index f2d22fd1f5..c052c3df43 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -48,8 +48,6 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition /** * Sets a custom children builder. - * - * @param NodeBuilder $builder A custom NodeBuilder */ public function setBuilder(NodeBuilder $builder) { @@ -318,8 +316,6 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition * ->append($this->getBarNodeDefinition()) * ; * - * @param NodeDefinition $node A NodeDefinition instance - * * @return $this */ public function append(NodeDefinition $node) @@ -416,8 +412,6 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition /** * Validate the configuration of a concrete node. * - * @param ArrayNode $node The related node - * * @throws InvalidDefinitionException */ protected function validateConcreteNode(ArrayNode $node) @@ -452,8 +446,6 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition /** * Validate the configuration of a prototype node. * - * @param PrototypedArrayNode $node The related node - * * @throws InvalidDefinitionException */ protected function validatePrototypeNode(PrototypedArrayNode $node) diff --git a/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php index 97f6709462..900fb4eba5 100644 --- a/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php @@ -23,8 +23,6 @@ class EnumNodeDefinition extends ScalarNodeDefinition private $values; /** - * @param array $values - * * @return $this */ public function values(array $values) diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php index 3b55958309..004042817a 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php @@ -25,9 +25,6 @@ class ExprBuilder public $ifPart; public $thenPart; - /** - * @param NodeDefinition $node The related node - */ public function __construct(NodeDefinition $node) { $this->node = $node; @@ -36,8 +33,6 @@ class ExprBuilder /** * Marks the expression as being always used. * - * @param \Closure $then - * * @return $this */ public function always(\Closure $then = null) @@ -56,8 +51,6 @@ class ExprBuilder * * The default one tests if the value is true. * - * @param \Closure $closure - * * @return $this */ public function ifTrue(\Closure $closure = null) @@ -110,8 +103,6 @@ class ExprBuilder /** * Tests if the value is in an array. * - * @param array $array - * * @return $this */ public function ifInArray(array $array) @@ -124,8 +115,6 @@ class ExprBuilder /** * Tests if the value is not in an array. * - * @param array $array - * * @return $this */ public function ifNotInArray(array $array) @@ -138,8 +127,6 @@ class ExprBuilder /** * Sets the closure to run if the test pass. * - * @param \Closure $closure - * * @return $this */ public function then(\Closure $closure) diff --git a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php index 09327a6db6..105e2d6470 100644 --- a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php @@ -22,9 +22,6 @@ class MergeBuilder public $allowFalse = false; public $allowOverwrite = true; - /** - * @param NodeDefinition $node The related node - */ public function __construct(NodeDefinition $node) { $this->node = $node; diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php index d795f8ff84..9b325f189b 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php @@ -37,8 +37,6 @@ class NodeBuilder implements NodeParentInterface /** * Set the parent node. * - * @param ParentNodeDefinitionInterface $parent The parent node - * * @return $this */ public function setParent(ParentNodeDefinitionInterface $parent = null) @@ -177,8 +175,6 @@ class NodeBuilder implements NodeParentInterface * ->end() * ; * - * @param NodeDefinition $node - * * @return $this */ public function append(NodeDefinition $node) diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php index 9dcba444ac..3c2610b5d1 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php @@ -32,10 +32,6 @@ abstract class NodeDefinition implements NodeParentInterface protected $nullEquivalent; protected $trueEquivalent = true; protected $falseEquivalent = false; - - /** - * @var NodeParentInterface|null - */ protected $parent; protected $attributes = array(); @@ -52,8 +48,6 @@ abstract class NodeDefinition implements NodeParentInterface /** * Sets the parent node. * - * @param NodeParentInterface $parent The parent - * * @return $this */ public function setParent(NodeParentInterface $parent) diff --git a/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php index 8ff1d8a045..35e30487a6 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php @@ -22,9 +22,6 @@ class NormalizationBuilder public $before = array(); public $remappings = array(); - /** - * @param NodeDefinition $node The related node - */ public function __construct(NodeDefinition $node) { $this->node = $node; @@ -48,8 +45,6 @@ class NormalizationBuilder /** * Registers a closure to run before the normalization or an expression builder to build it if null is provided. * - * @param \Closure $closure - * * @return ExprBuilder|$this */ public function before(\Closure $closure = null) diff --git a/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php index 0acd734391..bb2b9eb339 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php @@ -21,9 +21,6 @@ class ValidationBuilder protected $node; public $rules = array(); - /** - * @param NodeDefinition $node The related node - */ public function __construct(NodeDefinition $node) { $this->node = $node; @@ -32,8 +29,6 @@ class ValidationBuilder /** * Registers a closure to run as normalization or an expression builder to build it if null is provided. * - * @param \Closure $closure - * * @return ExprBuilder|$this */ public function rule(\Closure $closure = null) diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php index 1c3c218832..08f335a015 100644 --- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php +++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php @@ -150,8 +150,6 @@ class PrototypedArrayNode extends ArrayNode /** * Sets the node prototype. - * - * @param PrototypeNodeInterface $node */ public function setPrototype(PrototypeNodeInterface $node) { @@ -171,8 +169,6 @@ class PrototypedArrayNode extends ArrayNode /** * Disable adding concrete children for prototyped nodes. * - * @param NodeInterface $node The child node to add - * * @throws Exception */ public function addChild(NodeInterface $node) diff --git a/src/Symfony/Component/Config/Loader/DelegatingLoader.php b/src/Symfony/Component/Config/Loader/DelegatingLoader.php index 24a00be201..237009d45e 100644 --- a/src/Symfony/Component/Config/Loader/DelegatingLoader.php +++ b/src/Symfony/Component/Config/Loader/DelegatingLoader.php @@ -23,9 +23,6 @@ use Symfony\Component\Config\Exception\FileLoaderLoadException; */ class DelegatingLoader extends Loader { - /** - * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance - */ public function __construct(LoaderResolverInterface $resolver) { $this->resolver = $resolver; diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php index fd6947c75a..b058e485d3 100644 --- a/src/Symfony/Component/Config/Loader/FileLoader.php +++ b/src/Symfony/Component/Config/Loader/FileLoader.php @@ -22,21 +22,12 @@ use Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceExceptio */ abstract class FileLoader extends Loader { - /** - * @var array - */ protected static $loading = array(); - /** - * @var FileLocatorInterface - */ protected $locator; private $currentDir; - /** - * @param FileLocatorInterface $locator A FileLocatorInterface instance - */ public function __construct(FileLocatorInterface $locator) { $this->locator = $locator; diff --git a/src/Symfony/Component/Config/Loader/LoaderInterface.php b/src/Symfony/Component/Config/Loader/LoaderInterface.php index dd0a85a6b0..dfca9dd27b 100644 --- a/src/Symfony/Component/Config/Loader/LoaderInterface.php +++ b/src/Symfony/Component/Config/Loader/LoaderInterface.php @@ -47,8 +47,6 @@ interface LoaderInterface /** * Sets the loader resolver. - * - * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance */ public function setResolver(LoaderResolverInterface $resolver); } diff --git a/src/Symfony/Component/Config/Loader/LoaderResolver.php b/src/Symfony/Component/Config/Loader/LoaderResolver.php index 288feb865b..9299bc000f 100644 --- a/src/Symfony/Component/Config/Loader/LoaderResolver.php +++ b/src/Symfony/Component/Config/Loader/LoaderResolver.php @@ -50,11 +50,6 @@ class LoaderResolver implements LoaderResolverInterface return false; } - /** - * Adds a loader. - * - * @param LoaderInterface $loader A LoaderInterface instance - */ public function addLoader(LoaderInterface $loader) { $this->loaders[] = $loader; diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index 6168929bea..a64543cfa4 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -93,9 +93,6 @@ class Application /** * Runs the current application. * - * @param InputInterface $input An Input instance - * @param OutputInterface $output An Output instance - * * @return int 0 if everything went fine, or an error code * * @throws \Exception When running fails. Bypass this when {@link setCatchExceptions()}. @@ -157,9 +154,6 @@ class Application /** * Runs the current application. * - * @param InputInterface $input An Input instance - * @param OutputInterface $output An Output instance - * * @return int 0 if everything went fine, or an error code */ public function doRun(InputInterface $input, OutputInterface $output) @@ -202,11 +196,6 @@ class Application return $exitCode; } - /** - * Set a helper set to be used with the command. - * - * @param HelperSet $helperSet The helper set - */ public function setHelperSet(HelperSet $helperSet) { $this->helperSet = $helperSet; @@ -226,11 +215,6 @@ class Application return $this->helperSet; } - /** - * Set an input definition to be used with this application. - * - * @param InputDefinition $definition The input definition - */ public function setDefinition(InputDefinition $definition) { $this->definition = $definition; @@ -370,8 +354,6 @@ class Application * If a command with the same name already exists, it will be overridden. * If the command is not enabled it will not be added. * - * @param Command $command A Command object - * * @return Command|null The registered command if enabled or null */ public function add(Command $command) @@ -660,9 +642,6 @@ class Application /** * Renders a caught exception. - * - * @param \Exception $e An exception instance - * @param OutputInterface $output An OutputInterface instance */ public function renderException($e, $output) { @@ -811,9 +790,6 @@ class Application /** * Configures the input and output instances based on the user arguments and options. - * - * @param InputInterface $input An InputInterface instance - * @param OutputInterface $output An OutputInterface instance */ protected function configureIO(InputInterface $input, OutputInterface $output) { @@ -852,10 +828,6 @@ class Application * If an event dispatcher has been attached to the application, * events are also dispatched during the life-cycle of the command. * - * @param Command $command A Command instance - * @param InputInterface $input An Input instance - * @param OutputInterface $output An Output instance - * * @return int 0 if everything went fine, or an error code */ protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output) @@ -908,8 +880,6 @@ class Application /** * Gets the name of the command based on input. * - * @param InputInterface $input The input interface - * * @return string The command name */ protected function getCommandName(InputInterface $input) diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php index ceddc75da7..dfbb1da86e 100644 --- a/src/Symfony/Component/Console/Command/Command.php +++ b/src/Symfony/Component/Console/Command/Command.php @@ -74,11 +74,6 @@ class Command $this->ignoreValidationErrors = true; } - /** - * Sets the application instance for this command. - * - * @param Application $application An Application instance - */ public function setApplication(Application $application = null) { $this->application = $application; @@ -89,11 +84,6 @@ class Command } } - /** - * Sets the helper set. - * - * @param HelperSet $helperSet A HelperSet instance - */ public function setHelperSet(HelperSet $helperSet) { $this->helperSet = $helperSet; @@ -147,9 +137,6 @@ class Command * execute() method, you set the code to execute by passing * a Closure to the setCode() method. * - * @param InputInterface $input An InputInterface instance - * @param OutputInterface $output An OutputInterface instance - * * @return null|int null or 0 if everything went fine, or an error code * * @throws \LogicException When this abstract method is not implemented @@ -167,9 +154,6 @@ class Command * This method is executed before the InputDefinition is validated. * This means that this is the only place where the command can * interactively ask for values of missing required arguments. - * - * @param InputInterface $input An InputInterface instance - * @param OutputInterface $output An OutputInterface instance */ protected function interact(InputInterface $input, OutputInterface $output) { @@ -180,9 +164,6 @@ class Command * * This is mainly useful when a lot of commands extends one main command * where some things need to be initialized based on the input arguments and options. - * - * @param InputInterface $input An InputInterface instance - * @param OutputInterface $output An OutputInterface instance */ protected function initialize(InputInterface $input, OutputInterface $output) { @@ -195,9 +176,6 @@ class Command * setCode() method or by overriding the execute() method * in a sub-class. * - * @param InputInterface $input An InputInterface instance - * @param OutputInterface $output An OutputInterface instance - * * @return int The command exit code * * @throws \Exception When binding input fails. Bypass this by calling {@link ignoreValidationErrors()}. diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php index c0e7b38843..27e23e1af7 100644 --- a/src/Symfony/Component/Console/Command/HelpCommand.php +++ b/src/Symfony/Component/Console/Command/HelpCommand.php @@ -57,11 +57,6 @@ EOF ; } - /** - * Sets the command. - * - * @param Command $command The command to set - */ public function setCommand(Command $command) { $this->command = $command; diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php index 90018a14f3..2100b94034 100644 --- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php +++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php @@ -23,14 +23,7 @@ class ApplicationDescription { const GLOBAL_NAMESPACE = '_global'; - /** - * @var Application - */ private $application; - - /** - * @var null|string - */ private $namespace; /** @@ -48,10 +41,6 @@ class ApplicationDescription */ private $aliases; - /** - * @param Application $application - * @param string|null $namespace - */ public function __construct(Application $application, $namespace = null) { $this->application = $application; @@ -127,8 +116,6 @@ class ApplicationDescription } /** - * @param array $commands - * * @return array */ private function sortCommands(array $commands) diff --git a/src/Symfony/Component/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Console/Descriptor/Descriptor.php index 49e21939f9..469bbd7e38 100644 --- a/src/Symfony/Component/Console/Descriptor/Descriptor.php +++ b/src/Symfony/Component/Console/Descriptor/Descriptor.php @@ -72,9 +72,6 @@ abstract class Descriptor implements DescriptorInterface /** * Describes an InputArgument instance. * - * @param InputArgument $argument - * @param array $options - * * @return string|mixed */ abstract protected function describeInputArgument(InputArgument $argument, array $options = array()); @@ -82,9 +79,6 @@ abstract class Descriptor implements DescriptorInterface /** * Describes an InputOption instance. * - * @param InputOption $option - * @param array $options - * * @return string|mixed */ abstract protected function describeInputOption(InputOption $option, array $options = array()); @@ -92,9 +86,6 @@ abstract class Descriptor implements DescriptorInterface /** * Describes an InputDefinition instance. * - * @param InputDefinition $definition - * @param array $options - * * @return string|mixed */ abstract protected function describeInputDefinition(InputDefinition $definition, array $options = array()); @@ -102,9 +93,6 @@ abstract class Descriptor implements DescriptorInterface /** * Describes a Command instance. * - * @param Command $command - * @param array $options - * * @return string|mixed */ abstract protected function describeCommand(Command $command, array $options = array()); @@ -112,9 +100,6 @@ abstract class Descriptor implements DescriptorInterface /** * Describes an Application instance. * - * @param Application $application - * @param array $options - * * @return string|mixed */ abstract protected function describeApplication(Application $application, array $options = array()); diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php index 942fdc9622..51c4d2ef0e 100644 --- a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php +++ b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php @@ -81,9 +81,6 @@ class JsonDescriptor extends Descriptor /** * Writes data as json. * - * @param array $data - * @param array $options - * * @return array|string */ private function writeData(array $data, array $options) @@ -92,8 +89,6 @@ class JsonDescriptor extends Descriptor } /** - * @param InputArgument $argument - * * @return array */ private function getInputArgumentData(InputArgument $argument) @@ -108,8 +103,6 @@ class JsonDescriptor extends Descriptor } /** - * @param InputOption $option - * * @return array */ private function getInputOptionData(InputOption $option) @@ -126,8 +119,6 @@ class JsonDescriptor extends Descriptor } /** - * @param InputDefinition $definition - * * @return array */ private function getInputDefinitionData(InputDefinition $definition) @@ -146,8 +137,6 @@ class JsonDescriptor extends Descriptor } /** - * @param Command $command - * * @return array */ private function getCommandData(Command $command) diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php index 249eb9cb84..1d6432428c 100644 --- a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php @@ -282,7 +282,7 @@ class TextDescriptor extends Descriptor * * @return int */ - private function calculateTotalWidthForOptions($options) + private function calculateTotalWidthForOptions(array $options) { $totalWidth = 0; foreach ($options as $option) { diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php index 0f1fb472c2..177a054cc1 100644 --- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php +++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php @@ -27,8 +27,6 @@ use Symfony\Component\Console\Input\InputOption; class XmlDescriptor extends Descriptor { /** - * @param InputDefinition $definition - * * @return \DOMDocument */ public function getInputDefinitionDocument(InputDefinition $definition) @@ -50,8 +48,6 @@ class XmlDescriptor extends Descriptor } /** - * @param Command $command - * * @return \DOMDocument */ public function getCommandDocument(Command $command) @@ -172,9 +168,6 @@ class XmlDescriptor extends Descriptor /** * Appends document children to parent node. - * - * @param \DOMNode $parentNode - * @param \DOMNode $importedParent */ private function appendDocument(\DOMNode $parentNode, \DOMNode $importedParent) { @@ -186,8 +179,6 @@ class XmlDescriptor extends Descriptor /** * Writes DOM document. * - * @param \DOMDocument $dom - * * @return \DOMDocument|string */ private function writeDocument(\DOMDocument $dom) @@ -197,8 +188,6 @@ class XmlDescriptor extends Descriptor } /** - * @param InputArgument $argument - * * @return \DOMDocument */ private function getInputArgumentDocument(InputArgument $argument) @@ -223,8 +212,6 @@ class XmlDescriptor extends Descriptor } /** - * @param InputOption $option - * * @return \DOMDocument */ private function getInputOptionDocument(InputOption $option) diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php index 4d3eda3418..e15b13297c 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php @@ -170,9 +170,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface } /** - * Sets multiple style options at once. - * - * @param array $options + * {@inheritdoc} */ public function setOptions(array $options) { diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php index c36fda8070..4c7dc4134d 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php @@ -48,8 +48,6 @@ interface OutputFormatterStyleInterface /** * Sets multiple style options at once. - * - * @param array $options */ public function setOptions(array $options); diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php index c21a569622..b560087080 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php @@ -21,14 +21,8 @@ class OutputFormatterStyleStack */ private $styles; - /** - * @var OutputFormatterStyleInterface - */ private $emptyStyle; - /** - * @param OutputFormatterStyleInterface|null $emptyStyle - */ public function __construct(OutputFormatterStyleInterface $emptyStyle = null) { $this->emptyStyle = $emptyStyle ?: new OutputFormatterStyle(); @@ -45,8 +39,6 @@ class OutputFormatterStyleStack /** * Pushes a style in the stack. - * - * @param OutputFormatterStyleInterface $style */ public function push(OutputFormatterStyleInterface $style) { @@ -56,8 +48,6 @@ class OutputFormatterStyleStack /** * Pops a style from the stack. * - * @param OutputFormatterStyleInterface|null $style - * * @return OutputFormatterStyleInterface * * @throws \InvalidArgumentException When style tags incorrectly nested @@ -98,8 +88,6 @@ class OutputFormatterStyleStack } /** - * @param OutputFormatterStyleInterface $emptyStyle - * * @return $this */ public function setEmptyStyle(OutputFormatterStyleInterface $emptyStyle) diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php index b429e630c7..8bf82a1487 100644 --- a/src/Symfony/Component/Console/Helper/Helper.php +++ b/src/Symfony/Component/Console/Helper/Helper.php @@ -23,9 +23,7 @@ abstract class Helper implements HelperInterface protected $helperSet = null; /** - * Sets the helper set associated with this helper. - * - * @param HelperSet $helperSet A HelperSet instance + * {@inheritdoc} */ public function setHelperSet(HelperSet $helperSet = null) { @@ -33,9 +31,7 @@ abstract class Helper implements HelperInterface } /** - * Gets the helper set associated with this helper. - * - * @return HelperSet|null + * {@inheritdoc} */ public function getHelperSet() { diff --git a/src/Symfony/Component/Console/Helper/HelperInterface.php b/src/Symfony/Component/Console/Helper/HelperInterface.php index 5a923e0a88..1ce823587e 100644 --- a/src/Symfony/Component/Console/Helper/HelperInterface.php +++ b/src/Symfony/Component/Console/Helper/HelperInterface.php @@ -20,8 +20,6 @@ interface HelperInterface { /** * Sets the helper set associated with this helper. - * - * @param HelperSet $helperSet A HelperSet instance */ public function setHelperSet(HelperSet $helperSet = null); diff --git a/src/Symfony/Component/Console/Helper/HelperSet.php b/src/Symfony/Component/Console/Helper/HelperSet.php index 3bf15525a9..86e4a5c997 100644 --- a/src/Symfony/Component/Console/Helper/HelperSet.php +++ b/src/Symfony/Component/Console/Helper/HelperSet.php @@ -90,11 +90,6 @@ class HelperSet implements \IteratorAggregate return $this->helpers[$name]; } - /** - * Sets the command associated with this helper set. - * - * @param Command $command A Command instance - */ public function setCommand(Command $command = null) { $this->command = $command; diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php index 4cdecfd41a..3b10ebf810 100644 --- a/src/Symfony/Component/Console/Helper/QuestionHelper.php +++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php @@ -33,10 +33,6 @@ class QuestionHelper extends Helper /** * Asks a question to the user. * - * @param InputInterface $input An InputInterface instance - * @param OutputInterface $output An OutputInterface instance - * @param Question $question The question to ask - * * @return mixed The user answer * * @throws \RuntimeException If there is no data to read in the input stream @@ -105,9 +101,6 @@ class QuestionHelper extends Helper * * This method is public for PHP 5.3 compatibility, it should be private. * - * @param OutputInterface $output - * @param Question $question - * * @return bool|mixed|null|string * * @throws \Exception @@ -154,9 +147,6 @@ class QuestionHelper extends Helper /** * Outputs the question prompt. - * - * @param OutputInterface $output - * @param Question $question */ protected function writePrompt(OutputInterface $output, Question $question) { @@ -181,9 +171,6 @@ class QuestionHelper extends Helper /** * Outputs an error message. - * - * @param OutputInterface $output - * @param \Exception $error */ protected function writeError(OutputInterface $output, \Exception $error) { diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php index 59a1723b88..f719475670 100644 --- a/src/Symfony/Component/Console/Helper/Table.php +++ b/src/Symfony/Component/Console/Helper/Table.php @@ -24,22 +24,16 @@ class Table { /** * Table headers. - * - * @var array */ private $headers = array(); /** * Table rows. - * - * @var array */ private $rows = array(); /** * Column widths cache. - * - * @var array */ private $columnWidths = array(); @@ -374,7 +368,7 @@ class Table * * @return array */ - private function fillNextRows($rows, $line) + private function fillNextRows(array $rows, $line) { $unmergedRows = array(); foreach ($rows[$line] as $column => $cell) { @@ -425,7 +419,7 @@ class Table /** * fill cells for a row that contains colspan > 1. * - * @param array $row + * @param array|\Traversable $row * * @return array */ @@ -451,7 +445,7 @@ class Table * * @return array */ - private function copyRow($rows, $line) + private function copyRow(array $rows, $line) { $row = $rows[$line]; foreach ($row as $cellKey => $cellValue) { @@ -467,8 +461,6 @@ class Table /** * Gets number of columns by row. * - * @param array $row - * * @return int */ private function getNumberOfColumns(array $row) @@ -484,11 +476,9 @@ class Table /** * Gets list of columns for the given row. * - * @param array $row - * * @return array */ - private function getRowColumns($row) + private function getRowColumns(array $row) { $columns = range(0, $this->numberOfColumns - 1); foreach ($row as $cellKey => $cell) { diff --git a/src/Symfony/Component/Console/Helper/TableCell.php b/src/Symfony/Component/Console/Helper/TableCell.php index 1b34774f26..8562f72fe2 100644 --- a/src/Symfony/Component/Console/Helper/TableCell.php +++ b/src/Symfony/Component/Console/Helper/TableCell.php @@ -16,14 +16,7 @@ namespace Symfony\Component\Console\Helper; */ class TableCell { - /** - * @var string - */ private $value; - - /** - * @var array - */ private $options = array( 'rowspan' => 1, 'colspan' => 1, diff --git a/src/Symfony/Component/Console/Helper/TableHelper.php b/src/Symfony/Component/Console/Helper/TableHelper.php index 52989c5cfc..fc29abb370 100644 --- a/src/Symfony/Component/Console/Helper/TableHelper.php +++ b/src/Symfony/Component/Console/Helper/TableHelper.php @@ -246,8 +246,6 @@ class TableHelper extends Helper * | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | * | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien | * +---------------+-----------------------+------------------+ - * - * @param OutputInterface $output */ public function render(OutputInterface $output) { diff --git a/src/Symfony/Component/Console/Helper/TableSeparator.php b/src/Symfony/Component/Console/Helper/TableSeparator.php index 8cc73e69a2..c7b8dc9c22 100644 --- a/src/Symfony/Component/Console/Helper/TableSeparator.php +++ b/src/Symfony/Component/Console/Helper/TableSeparator.php @@ -18,9 +18,6 @@ namespace Symfony\Component\Console\Helper; */ class TableSeparator extends TableCell { - /** - * @param array $options - */ public function __construct(array $options = array()) { parent::__construct('', $options); diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php index eb91f3690e..bf987f98e1 100644 --- a/src/Symfony/Component/Console/Input/ArrayInput.php +++ b/src/Symfony/Component/Console/Input/ArrayInput.php @@ -24,10 +24,6 @@ class ArrayInput extends Input { private $parameters; - /** - * @param array $parameters An array of parameters - * @param InputDefinition|null $definition A InputDefinition instance - */ public function __construct(array $parameters, InputDefinition $definition = null) { $this->parameters = $parameters; diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php index c9073b9e24..16f82790d2 100644 --- a/src/Symfony/Component/Console/Input/Input.php +++ b/src/Symfony/Component/Console/Input/Input.php @@ -24,17 +24,11 @@ namespace Symfony\Component\Console\Input; */ abstract class Input implements InputInterface { - /** - * @var InputDefinition - */ protected $definition; protected $options = array(); protected $arguments = array(); protected $interactive = true; - /** - * @param InputDefinition|null $definition A InputDefinition instance - */ public function __construct(InputDefinition $definition = null) { if (null === $definition) { diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php index 2fb5e492eb..d7a1f2d0fd 100644 --- a/src/Symfony/Component/Console/Input/InputDefinition.php +++ b/src/Symfony/Component/Console/Input/InputDefinition.php @@ -46,8 +46,6 @@ class InputDefinition /** * Sets the definition of the input. - * - * @param array $definition The definition array */ public function setDefinition(array $definition) { @@ -94,10 +92,6 @@ class InputDefinition } /** - * Adds an InputArgument object. - * - * @param InputArgument $argument An InputArgument object - * * @throws \LogicException When incorrect argument is given */ public function addArgument(InputArgument $argument) @@ -231,10 +225,6 @@ class InputDefinition } /** - * Adds an InputOption object. - * - * @param InputOption $option An InputOption object - * * @throws \LogicException When option given already exist */ public function addOption(InputOption $option) diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php index 5ba1604048..04912e9f59 100644 --- a/src/Symfony/Component/Console/Input/InputInterface.php +++ b/src/Symfony/Component/Console/Input/InputInterface.php @@ -52,8 +52,6 @@ interface InputInterface /** * Binds the current Input instance with the given arguments and options. - * - * @param InputDefinition $definition A InputDefinition instance */ public function bind(InputDefinition $definition); diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php index 6f7d68a9ba..e6ca45aa42 100644 --- a/src/Symfony/Component/Console/Input/InputOption.php +++ b/src/Symfony/Component/Console/Input/InputOption.php @@ -190,8 +190,6 @@ class InputOption /** * Checks whether the given option equals this one. * - * @param InputOption $option option to compare - * * @return bool */ public function equals(InputOption $option) diff --git a/src/Symfony/Component/Console/Logger/ConsoleLogger.php b/src/Symfony/Component/Console/Logger/ConsoleLogger.php index 4b237c17c6..d1aba10ac0 100644 --- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php +++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php @@ -29,13 +29,7 @@ class ConsoleLogger extends AbstractLogger const INFO = 'info'; const ERROR = 'error'; - /** - * @var OutputInterface - */ private $output; - /** - * @var array - */ private $verbosityLevelMap = array( LogLevel::EMERGENCY => OutputInterface::VERBOSITY_NORMAL, LogLevel::ALERT => OutputInterface::VERBOSITY_NORMAL, @@ -46,9 +40,6 @@ class ConsoleLogger extends AbstractLogger LogLevel::INFO => OutputInterface::VERBOSITY_VERY_VERBOSE, LogLevel::DEBUG => OutputInterface::VERBOSITY_DEBUG, ); - /** - * @var array - */ private $formatLevelMap = array( LogLevel::EMERGENCY => self::ERROR, LogLevel::ALERT => self::ERROR, @@ -60,11 +51,6 @@ class ConsoleLogger extends AbstractLogger LogLevel::DEBUG => self::INFO, ); - /** - * @param OutputInterface $output - * @param array $verbosityLevelMap - * @param array $formatLevelMap - */ public function __construct(OutputInterface $output, array $verbosityLevelMap = array(), array $formatLevelMap = array()) { $this->output = $output; diff --git a/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php b/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php index 5eb4fc7acd..b44ea7e058 100644 --- a/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php +++ b/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php @@ -26,10 +26,5 @@ interface ConsoleOutputInterface extends OutputInterface */ public function getErrorOutput(); - /** - * Sets the OutputInterface used for errors. - * - * @param OutputInterface $error - */ public function setErrorOutput(OutputInterface $error); } diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php index 9a956e25db..ff007e6291 100644 --- a/src/Symfony/Component/Console/Output/OutputInterface.php +++ b/src/Symfony/Component/Console/Output/OutputInterface.php @@ -79,11 +79,6 @@ interface OutputInterface */ public function isDecorated(); - /** - * Sets output formatter. - * - * @param OutputFormatterInterface $formatter - */ public function setFormatter(OutputFormatterInterface $formatter); /** diff --git a/src/Symfony/Component/Console/Shell.php b/src/Symfony/Component/Console/Shell.php index c4967236d6..b2e234cd59 100644 --- a/src/Symfony/Component/Console/Shell.php +++ b/src/Symfony/Component/Console/Shell.php @@ -36,8 +36,6 @@ class Shell /** * If there is no readline support for the current PHP executable * a \RuntimeException exception is thrown. - * - * @param Application $application An application instance */ public function __construct(Application $application) { diff --git a/src/Symfony/Component/Console/Style/OutputStyle.php b/src/Symfony/Component/Console/Style/OutputStyle.php index 8371bb5335..f3bf2912c9 100644 --- a/src/Symfony/Component/Console/Style/OutputStyle.php +++ b/src/Symfony/Component/Console/Style/OutputStyle.php @@ -24,9 +24,6 @@ abstract class OutputStyle implements OutputInterface, StyleInterface { private $output; - /** - * @param OutputInterface $output - */ public function __construct(OutputInterface $output) { $this->output = $output; diff --git a/src/Symfony/Component/Console/Style/StyleInterface.php b/src/Symfony/Component/Console/Style/StyleInterface.php index 2448547f85..a9205e5a70 100644 --- a/src/Symfony/Component/Console/Style/StyleInterface.php +++ b/src/Symfony/Component/Console/Style/StyleInterface.php @@ -34,8 +34,6 @@ interface StyleInterface /** * Formats a list. - * - * @param array $elements */ public function listing(array $elements); @@ -83,9 +81,6 @@ interface StyleInterface /** * Formats a table. - * - * @param array $headers - * @param array $rows */ public function table(array $headers, array $rows); diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php index a1a0fb8c2e..bfb23ac8eb 100644 --- a/src/Symfony/Component/Console/Style/SymfonyStyle.php +++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php @@ -39,10 +39,6 @@ class SymfonyStyle extends OutputStyle private $lineLength; private $bufferedOutput; - /** - * @param InputInterface $input - * @param OutputInterface $output - */ public function __construct(InputInterface $input, OutputInterface $output) { $this->input = $input; @@ -318,8 +314,6 @@ class SymfonyStyle extends OutputStyle } /** - * @param Question $question - * * @return string */ public function askQuestion(Question $question) diff --git a/src/Symfony/Component/Console/Tester/ApplicationTester.php b/src/Symfony/Component/Console/Tester/ApplicationTester.php index a8f8dd9702..dc121645e2 100644 --- a/src/Symfony/Component/Console/Tester/ApplicationTester.php +++ b/src/Symfony/Component/Console/Tester/ApplicationTester.php @@ -34,9 +34,6 @@ class ApplicationTester private $output; private $statusCode; - /** - * @param Application $application An Application instance to test - */ public function __construct(Application $application) { $this->application = $application; diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php index 3619281cbb..a194949041 100644 --- a/src/Symfony/Component/Console/Tester/CommandTester.php +++ b/src/Symfony/Component/Console/Tester/CommandTester.php @@ -29,9 +29,6 @@ class CommandTester private $output; private $statusCode; - /** - * @param Command $command A Command instance to test - */ public function __construct(Command $command) { $this->command = $command; diff --git a/src/Symfony/Component/CssSelector/Node/AttributeNode.php b/src/Symfony/Component/CssSelector/Node/AttributeNode.php index b10a4dd5b3..ae327d1f8d 100644 --- a/src/Symfony/Component/CssSelector/Node/AttributeNode.php +++ b/src/Symfony/Component/CssSelector/Node/AttributeNode.php @@ -21,29 +21,10 @@ namespace Symfony\Component\CssSelector\Node; */ class AttributeNode extends AbstractNode { - /** - * @var NodeInterface - */ private $selector; - - /** - * @var string - */ private $namespace; - - /** - * @var string - */ private $attribute; - - /** - * @var string - */ private $operator; - - /** - * @var string - */ private $value; /** diff --git a/src/Symfony/Component/CssSelector/Node/ClassNode.php b/src/Symfony/Component/CssSelector/Node/ClassNode.php index 544342f871..1ff2ee3549 100644 --- a/src/Symfony/Component/CssSelector/Node/ClassNode.php +++ b/src/Symfony/Component/CssSelector/Node/ClassNode.php @@ -21,14 +21,7 @@ namespace Symfony\Component\CssSelector\Node; */ class ClassNode extends AbstractNode { - /** - * @var NodeInterface - */ private $selector; - - /** - * @var string - */ private $name; /** diff --git a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php index 6d00db431c..f29867e49b 100644 --- a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php +++ b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php @@ -21,19 +21,8 @@ namespace Symfony\Component\CssSelector\Node; */ class CombinedSelectorNode extends AbstractNode { - /** - * @var NodeInterface - */ private $selector; - - /** - * @var string - */ private $combinator; - - /** - * @var NodeInterface - */ private $subSelector; /** diff --git a/src/Symfony/Component/CssSelector/Node/FunctionNode.php b/src/Symfony/Component/CssSelector/Node/FunctionNode.php index f94af8dafc..08931d3560 100644 --- a/src/Symfony/Component/CssSelector/Node/FunctionNode.php +++ b/src/Symfony/Component/CssSelector/Node/FunctionNode.php @@ -23,19 +23,8 @@ use Symfony\Component\CssSelector\Parser\Token; */ class FunctionNode extends AbstractNode { - /** - * @var NodeInterface - */ private $selector; - - /** - * @var string - */ private $name; - - /** - * @var Token[] - */ private $arguments; /** diff --git a/src/Symfony/Component/CssSelector/Node/HashNode.php b/src/Symfony/Component/CssSelector/Node/HashNode.php index ddbe76477a..eb24ae2f59 100644 --- a/src/Symfony/Component/CssSelector/Node/HashNode.php +++ b/src/Symfony/Component/CssSelector/Node/HashNode.php @@ -21,14 +21,7 @@ namespace Symfony\Component\CssSelector\Node; */ class HashNode extends AbstractNode { - /** - * @var NodeInterface - */ private $selector; - - /** - * @var string - */ private $id; /** diff --git a/src/Symfony/Component/CssSelector/Node/NegationNode.php b/src/Symfony/Component/CssSelector/Node/NegationNode.php index 0fafb0a120..21deb88fc6 100644 --- a/src/Symfony/Component/CssSelector/Node/NegationNode.php +++ b/src/Symfony/Component/CssSelector/Node/NegationNode.php @@ -21,20 +21,9 @@ namespace Symfony\Component\CssSelector\Node; */ class NegationNode extends AbstractNode { - /** - * @var NodeInterface - */ private $selector; - - /** - * @var NodeInterface - */ private $subSelector; - /** - * @param NodeInterface $selector - * @param NodeInterface $subSelector - */ public function __construct(NodeInterface $selector, NodeInterface $subSelector) { $this->selector = $selector; diff --git a/src/Symfony/Component/CssSelector/Node/PseudoNode.php b/src/Symfony/Component/CssSelector/Node/PseudoNode.php index 0e413adc54..d888c254a1 100644 --- a/src/Symfony/Component/CssSelector/Node/PseudoNode.php +++ b/src/Symfony/Component/CssSelector/Node/PseudoNode.php @@ -21,14 +21,7 @@ namespace Symfony\Component\CssSelector\Node; */ class PseudoNode extends AbstractNode { - /** - * @var NodeInterface - */ private $selector; - - /** - * @var string - */ private $identifier; /** diff --git a/src/Symfony/Component/CssSelector/Node/SelectorNode.php b/src/Symfony/Component/CssSelector/Node/SelectorNode.php index 4958da55af..bb9ef28714 100644 --- a/src/Symfony/Component/CssSelector/Node/SelectorNode.php +++ b/src/Symfony/Component/CssSelector/Node/SelectorNode.php @@ -21,14 +21,7 @@ namespace Symfony\Component\CssSelector\Node; */ class SelectorNode extends AbstractNode { - /** - * @var NodeInterface - */ private $tree; - - /** - * @var null|string - */ private $pseudoElement; /** diff --git a/src/Symfony/Component/CssSelector/Node/Specificity.php b/src/Symfony/Component/CssSelector/Node/Specificity.php index 6adadfb6ff..c7299c8dfa 100644 --- a/src/Symfony/Component/CssSelector/Node/Specificity.php +++ b/src/Symfony/Component/CssSelector/Node/Specificity.php @@ -27,19 +27,8 @@ class Specificity const B_FACTOR = 10; const C_FACTOR = 1; - /** - * @var int - */ private $a; - - /** - * @var int - */ private $b; - - /** - * @var int - */ private $c; /** @@ -55,8 +44,6 @@ class Specificity } /** - * @param Specificity $specificity - * * @return self */ public function plus(Specificity $specificity) @@ -78,8 +65,6 @@ class Specificity * Returns -1 if the object specificity is lower than the argument, * 0 if they are equal, and 1 if the argument is lower. * - * @param Specificity $specificity - * * @return int */ public function compareTo(Specificity $specificity) diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php b/src/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php index 049ddd3ec4..ba6866239b 100644 --- a/src/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php +++ b/src/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php @@ -25,9 +25,6 @@ use Symfony\Component\CssSelector\Parser\TokenStream; interface HandlerInterface { /** - * @param Reader $reader - * @param TokenStream $stream - * * @return bool */ public function handle(Reader $reader, TokenStream $stream); diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php b/src/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php index b144223fbd..67462082b4 100644 --- a/src/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php +++ b/src/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php @@ -27,20 +27,9 @@ use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns; */ class HashHandler implements HandlerInterface { - /** - * @var TokenizerPatterns - */ private $patterns; - - /** - * @var TokenizerEscaping - */ private $escaping; - /** - * @param TokenizerPatterns $patterns - * @param TokenizerEscaping $escaping - */ public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping) { $this->patterns = $patterns; diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php b/src/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php index 86739eab99..d07f7d679d 100644 --- a/src/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php +++ b/src/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php @@ -27,20 +27,9 @@ use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns; */ class IdentifierHandler implements HandlerInterface { - /** - * @var TokenizerPatterns - */ private $patterns; - - /** - * @var TokenizerEscaping - */ private $escaping; - /** - * @param TokenizerPatterns $patterns - * @param TokenizerEscaping $escaping - */ public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping) { $this->patterns = $patterns; diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php b/src/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php index 97a9387b18..121bdff7b8 100644 --- a/src/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php +++ b/src/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php @@ -26,14 +26,8 @@ use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns; */ class NumberHandler implements HandlerInterface { - /** - * @var TokenizerPatterns - */ private $patterns; - /** - * @param TokenizerPatterns $patterns - */ public function __construct(TokenizerPatterns $patterns) { $this->patterns = $patterns; diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php b/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php index 9f7a5946b0..b14dbf3148 100644 --- a/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php +++ b/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php @@ -29,20 +29,9 @@ use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns; */ class StringHandler implements HandlerInterface { - /** - * @var TokenizerPatterns - */ private $patterns; - - /** - * @var TokenizerEscaping - */ private $escaping; - /** - * @param TokenizerPatterns $patterns - * @param TokenizerEscaping $escaping - */ public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping) { $this->patterns = $patterns; diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php index 722a32f22f..861338235a 100644 --- a/src/Symfony/Component/CssSelector/Parser/Parser.php +++ b/src/Symfony/Component/CssSelector/Parser/Parser.php @@ -25,14 +25,8 @@ use Symfony\Component\CssSelector\Parser\Tokenizer\Tokenizer; */ class Parser implements ParserInterface { - /** - * @var Tokenizer - */ private $tokenizer; - /** - * @param null|Tokenizer $tokenizer - */ public function __construct(Tokenizer $tokenizer = null) { $this->tokenizer = $tokenizer ?: new Tokenizer(); @@ -101,8 +95,6 @@ class Parser implements ParserInterface /** * Parses selector nodes. * - * @param TokenStream $stream - * * @return array */ private function parseSelectorList(TokenStream $stream) @@ -127,8 +119,6 @@ class Parser implements ParserInterface /** * Parses next selector or combined node. * - * @param TokenStream $stream - * * @return Node\SelectorNode * * @throws SyntaxErrorException @@ -290,8 +280,6 @@ class Parser implements ParserInterface /** * Parses next element node. * - * @param TokenStream $stream - * * @return Node\ElementNode */ private function parseElementNode(TokenStream $stream) @@ -323,9 +311,6 @@ class Parser implements ParserInterface /** * Parses next attribute node. * - * @param Node\NodeInterface $selector - * @param TokenStream $stream - * * @return Node\AttributeNode * * @throws SyntaxErrorException diff --git a/src/Symfony/Component/CssSelector/Parser/Token.php b/src/Symfony/Component/CssSelector/Parser/Token.php index 6f7586f612..bcc31a23c5 100644 --- a/src/Symfony/Component/CssSelector/Parser/Token.php +++ b/src/Symfony/Component/CssSelector/Parser/Token.php @@ -89,8 +89,6 @@ class Token } /** - * @param array $values - * * @return bool */ public function isDelimiter(array $values = array()) diff --git a/src/Symfony/Component/CssSelector/Parser/TokenStream.php b/src/Symfony/Component/CssSelector/Parser/TokenStream.php index c4dd3375e1..ac87d313c9 100644 --- a/src/Symfony/Component/CssSelector/Parser/TokenStream.php +++ b/src/Symfony/Component/CssSelector/Parser/TokenStream.php @@ -57,8 +57,6 @@ class TokenStream /** * Pushes a token. * - * @param Token $token - * * @return $this */ public function push(Token $token) diff --git a/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php b/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php index d549f9338a..a723b9669c 100644 --- a/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php +++ b/src/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php @@ -49,8 +49,6 @@ class Tokenizer /** * Tokenize selector source code. * - * @param Reader $reader - * * @return TokenStream */ public function tokenize(Reader $reader) diff --git a/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php b/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php index bf5096be9f..186bd4d761 100644 --- a/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php +++ b/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php @@ -21,14 +21,8 @@ namespace Symfony\Component\CssSelector\Parser\Tokenizer; */ class TokenizerEscaping { - /** - * @var TokenizerPatterns - */ private $patterns; - /** - * @param TokenizerPatterns $patterns - */ public function __construct(TokenizerPatterns $patterns) { $this->patterns = $patterns; diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php index 9ce018f13a..619f53eeca 100644 --- a/src/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php +++ b/src/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php @@ -37,9 +37,6 @@ class CombinationExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param XPathExpr $combinedXpath - * * @return XPathExpr */ public function translateDescendant(XPathExpr $xpath, XPathExpr $combinedXpath) @@ -48,9 +45,6 @@ class CombinationExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param XPathExpr $combinedXpath - * * @return XPathExpr */ public function translateChild(XPathExpr $xpath, XPathExpr $combinedXpath) @@ -59,9 +53,6 @@ class CombinationExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param XPathExpr $combinedXpath - * * @return XPathExpr */ public function translateDirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath) @@ -73,9 +64,6 @@ class CombinationExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param XPathExpr $combinedXpath - * * @return XPathExpr */ public function translateIndirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath) diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php index 41ece8a422..73567b27a1 100644 --- a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php +++ b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php @@ -109,9 +109,6 @@ class FunctionExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param FunctionNode $function - * * @return XPathExpr */ public function translateNthLastChild(XPathExpr $xpath, FunctionNode $function) @@ -120,9 +117,6 @@ class FunctionExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param FunctionNode $function - * * @return XPathExpr */ public function translateNthOfType(XPathExpr $xpath, FunctionNode $function) @@ -131,9 +125,6 @@ class FunctionExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param FunctionNode $function - * * @return XPathExpr * * @throws ExpressionErrorException @@ -148,9 +139,6 @@ class FunctionExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param FunctionNode $function - * * @return XPathExpr * * @throws ExpressionErrorException @@ -174,9 +162,6 @@ class FunctionExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param FunctionNode $function - * * @return XPathExpr * * @throws ExpressionErrorException diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php index 1ed05bd6b8..fbfb98792f 100644 --- a/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php +++ b/src/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php @@ -26,9 +26,6 @@ use Symfony\Component\CssSelector\XPath\XPathExpr; */ class HtmlExtension extends AbstractExtension { - /** - * @param Translator $translator - */ public function __construct(Translator $translator) { $translator @@ -65,8 +62,6 @@ class HtmlExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateChecked(XPathExpr $xpath) @@ -79,8 +74,6 @@ class HtmlExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateLink(XPathExpr $xpath) @@ -89,8 +82,6 @@ class HtmlExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateDisabled(XPathExpr $xpath) @@ -120,8 +111,6 @@ class HtmlExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateEnabled(XPathExpr $xpath) @@ -158,9 +147,6 @@ class HtmlExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * @param FunctionNode $function - * * @return XPathExpr * * @throws ExpressionErrorException @@ -187,8 +173,6 @@ class HtmlExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateSelected(XPathExpr $xpath) @@ -197,8 +181,6 @@ class HtmlExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateInvalid(XPathExpr $xpath) @@ -207,8 +189,6 @@ class HtmlExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateHover(XPathExpr $xpath) @@ -217,8 +197,6 @@ class HtmlExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateVisited(XPathExpr $xpath) diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php index 49c77823cf..8a42d7f650 100644 --- a/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php +++ b/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php @@ -90,9 +90,6 @@ class NodeExtension extends AbstractExtension } /** - * @param Node\SelectorNode $node - * @param Translator $translator - * * @return XPathExpr */ public function translateSelector(Node\SelectorNode $node, Translator $translator) @@ -101,9 +98,6 @@ class NodeExtension extends AbstractExtension } /** - * @param Node\CombinedSelectorNode $node - * @param Translator $translator - * * @return XPathExpr */ public function translateCombinedSelector(Node\CombinedSelectorNode $node, Translator $translator) @@ -112,9 +106,6 @@ class NodeExtension extends AbstractExtension } /** - * @param Node\NegationNode $node - * @param Translator $translator - * * @return XPathExpr */ public function translateNegation(Node\NegationNode $node, Translator $translator) @@ -131,9 +122,6 @@ class NodeExtension extends AbstractExtension } /** - * @param Node\FunctionNode $node - * @param Translator $translator - * * @return XPathExpr */ public function translateFunction(Node\FunctionNode $node, Translator $translator) @@ -144,9 +132,6 @@ class NodeExtension extends AbstractExtension } /** - * @param Node\PseudoNode $node - * @param Translator $translator - * * @return XPathExpr */ public function translatePseudo(Node\PseudoNode $node, Translator $translator) @@ -157,9 +142,6 @@ class NodeExtension extends AbstractExtension } /** - * @param Node\AttributeNode $node - * @param Translator $translator - * * @return XPathExpr */ public function translateAttribute(Node\AttributeNode $node, Translator $translator) @@ -188,9 +170,6 @@ class NodeExtension extends AbstractExtension } /** - * @param Node\ClassNode $node - * @param Translator $translator - * * @return XPathExpr */ public function translateClass(Node\ClassNode $node, Translator $translator) @@ -201,9 +180,6 @@ class NodeExtension extends AbstractExtension } /** - * @param Node\HashNode $node - * @param Translator $translator - * * @return XPathExpr */ public function translateHash(Node\HashNode $node, Translator $translator) @@ -214,8 +190,6 @@ class NodeExtension extends AbstractExtension } /** - * @param Node\ElementNode $node - * * @return XPathExpr */ public function translateElement(Node\ElementNode $node) diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php index 008ec2b4b1..31d7af966e 100644 --- a/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php +++ b/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php @@ -42,8 +42,6 @@ class PseudoClassExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateRoot(XPathExpr $xpath) @@ -52,8 +50,6 @@ class PseudoClassExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateFirstChild(XPathExpr $xpath) @@ -65,8 +61,6 @@ class PseudoClassExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateLastChild(XPathExpr $xpath) @@ -78,8 +72,6 @@ class PseudoClassExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr * * @throws ExpressionErrorException @@ -96,8 +88,6 @@ class PseudoClassExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr * * @throws ExpressionErrorException @@ -114,8 +104,6 @@ class PseudoClassExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateOnlyChild(XPathExpr $xpath) @@ -127,8 +115,6 @@ class PseudoClassExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr * * @throws ExpressionErrorException @@ -143,8 +129,6 @@ class PseudoClassExtension extends AbstractExtension } /** - * @param XPathExpr $xpath - * * @return XPathExpr */ public function translateEmpty(XPathExpr $xpath) diff --git a/src/Symfony/Component/CssSelector/XPath/Translator.php b/src/Symfony/Component/CssSelector/XPath/Translator.php index 4158e2e14f..74c30dcbb9 100644 --- a/src/Symfony/Component/CssSelector/XPath/Translator.php +++ b/src/Symfony/Component/CssSelector/XPath/Translator.php @@ -28,9 +28,6 @@ use Symfony\Component\CssSelector\Parser\ParserInterface; */ class Translator implements TranslatorInterface { - /** - * @var ParserInterface - */ private $mainParser; /** @@ -39,33 +36,14 @@ class Translator implements TranslatorInterface private $shortcutParsers = array(); /** - * @var Extension\ExtensionInterface + * @var Extension\ExtensionInterface[] */ private $extensions = array(); - /** - * @var array - */ private $nodeTranslators = array(); - - /** - * @var array - */ private $combinationTranslators = array(); - - /** - * @var array - */ private $functionTranslators = array(); - - /** - * @var array - */ private $pseudoClassTranslators = array(); - - /** - * @var array - */ private $attributeMatchingTranslators = array(); public function __construct(ParserInterface $parser = null) @@ -142,8 +120,6 @@ class Translator implements TranslatorInterface /** * Registers an extension. * - * @param Extension\ExtensionInterface $extension - * * @return $this */ public function registerExtension(Extension\ExtensionInterface $extension) @@ -178,8 +154,6 @@ class Translator implements TranslatorInterface /** * Registers a shortcut parser. * - * @param ParserInterface $shortcut - * * @return $this */ public function registerParserShortcut(ParserInterface $shortcut) @@ -190,8 +164,6 @@ class Translator implements TranslatorInterface } /** - * @param NodeInterface $node - * * @return XPathExpr * * @throws ExpressionErrorException @@ -224,9 +196,6 @@ class Translator implements TranslatorInterface } /** - * @param XPathExpr $xpath - * @param FunctionNode $function - * * @return XPathExpr * * @throws ExpressionErrorException diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php index 51d0fdf3cd..c525830849 100644 --- a/src/Symfony/Component/Debug/ExceptionHandler.php +++ b/src/Symfony/Component/Debug/ExceptionHandler.php @@ -151,8 +151,6 @@ class ExceptionHandler * If you have the Symfony HttpFoundation component installed, * this method will use it to create and send the response. If not, * it will fallback to plain PHP functions. - * - * @param \Exception $exception An \Exception instance */ private function failSafeHandle(\Exception $exception) { @@ -215,8 +213,6 @@ class ExceptionHandler /** * Gets the HTML content associated with the given exception. * - * @param FlattenException $exception A FlattenException instance - * * @return string The content as a string */ public function getContent(FlattenException $exception) @@ -283,8 +279,6 @@ EOF; /** * Gets the stylesheet associated with the given exception. * - * @param FlattenException $exception A FlattenException instance - * * @return string The stylesheet as a string */ public function getStylesheet(FlattenException $exception) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php index 681f8afdde..12e27298a6 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php @@ -51,8 +51,6 @@ class AnalyzeServiceReferencesPass implements RepeatablePassInterface /** * Processes a ContainerBuilder object to populate the service reference graph. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php index 0b9c573acf..1f06fc9660 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php @@ -31,8 +31,6 @@ class CheckCircularReferencesPass implements CompilerPassInterface /** * Checks the ContainerBuilder object for circular references. - * - * @param ContainerBuilder $container The ContainerBuilder instances */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php index 219e66313d..6dbdba5721 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php @@ -33,8 +33,6 @@ class CheckDefinitionValidityPass implements CompilerPassInterface /** * Processes the ContainerBuilder to validate the Definition. * - * @param ContainerBuilder $container - * * @throws RuntimeException When the Definition is invalid */ public function process(ContainerBuilder $container) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php index f8c09d42f0..f545bd0fdc 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php @@ -39,8 +39,6 @@ class CheckReferenceValidityPass implements CompilerPassInterface /** * Processes the ContainerBuilder to validate References. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { @@ -112,9 +110,6 @@ class CheckReferenceValidityPass implements CompilerPassInterface /** * Validates the scope of a single Reference. * - * @param Reference $reference - * @param Definition $definition - * * @throws ScopeWideningInjectionException when the definition references a service of a narrower scope * @throws ScopeCrossingInjectionException when the definition references a service of another scope hierarchy */ diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php index 1f6304ee82..dd9539eeb7 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php @@ -95,8 +95,6 @@ class Compiler /** * Run the Compiler and process all Passes. - * - * @param ContainerBuilder $container */ public function compile(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php b/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php index 30cb1d5d46..3085006058 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php @@ -22,8 +22,6 @@ interface CompilerPassInterface { /** * You can modify the container here before it is dumped to PHP code. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container); } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php index 026700d226..5d7fa1ba63 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php @@ -39,8 +39,6 @@ class InlineServiceDefinitionsPass implements RepeatablePassInterface /** * Processes the ContainerBuilder for inline service definitions. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php index c03ff9deb7..8cf78479ec 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php @@ -161,11 +161,6 @@ class PassConfig return $this->mergePass; } - /** - * Sets the Merge Pass. - * - * @param CompilerPassInterface $pass The merge pass - */ public function setMergePass(CompilerPassInterface $pass) { $this->mergePass = $pass; diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php index 0ef0af05b5..9999214c8b 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php @@ -20,8 +20,6 @@ class RemoveAbstractDefinitionsPass implements CompilerPassInterface { /** * Removes abstract definitions from the ContainerBuilder. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php index 5c53a33949..36abc6159e 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php @@ -24,8 +24,6 @@ class RemovePrivateAliasesPass implements CompilerPassInterface { /** * Removes private aliases from the ContainerBuilder. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php index 9e18a9ebde..61602afd89 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php @@ -32,8 +32,6 @@ class RemoveUnusedDefinitionsPass implements RepeatablePassInterface /** * Processes the ContainerBuilder to remove unused definitions. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php b/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php index d60ae35bc8..2b88bfb917 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php @@ -19,10 +19,5 @@ namespace Symfony\Component\DependencyInjection\Compiler; */ interface RepeatablePassInterface extends CompilerPassInterface { - /** - * Sets the RepeatedPass interface. - * - * @param RepeatedPass $repeatedPass - */ public function setRepeatedPass(RepeatedPass $repeatedPass); } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php index 59d4e0a767..cdc9ddb507 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php @@ -51,8 +51,6 @@ class RepeatedPass implements CompilerPassInterface /** * Process the repeatable passes that run more than once. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php index b7210ee6ee..bb604b9f9c 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php @@ -29,8 +29,6 @@ class ReplaceAliasByActualDefinitionPass implements CompilerPassInterface /** * Process the Container to replace aliases with service definitions. * - * @param ContainerBuilder $container - * * @throws InvalidArgumentException if the service definition does not exist */ public function process(ContainerBuilder $container) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php index 3fc6a11028..e923f01c3e 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php @@ -30,8 +30,6 @@ class ResolveDefinitionTemplatesPass implements CompilerPassInterface /** * Process the ContainerBuilder to replace DefinitionDecorator instances with their real Definition instances. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php index 85dbceb9a6..577707de70 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php @@ -28,8 +28,6 @@ class ResolveInvalidReferencesPass implements CompilerPassInterface /** * Process the ContainerBuilder to resolve invalid references. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php index 905549897f..d3947565b2 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php @@ -24,8 +24,6 @@ class ResolveParameterPlaceHoldersPass implements CompilerPassInterface /** * Processes the ContainerBuilder to resolve parameter placeholders. * - * @param ContainerBuilder $container - * * @throws ParameterNotFoundException */ public function process(ContainerBuilder $container) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php index fed851a88d..aa301b0b73 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php @@ -27,8 +27,6 @@ class ResolveReferencesToAliasesPass implements CompilerPassInterface /** * Processes the ContainerBuilder to replace references to aliases with actual service references. - * - * @param ContainerBuilder $container */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php index e7306ab560..43bac7120b 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php @@ -80,13 +80,16 @@ class ServiceReferenceGraph * Connects 2 nodes together in the Graph. * * @param string $sourceId - * @param string $sourceValue + * @param mixed $sourceValue * @param string $destId - * @param string $destValue + * @param mixed $destValue * @param string $reference */ public function connect($sourceId, $sourceValue, $destId, $destValue = null, $reference = null) { + if (null === $sourceId || null === $destId) { + return; + } $sourceNode = $this->createNode($sourceId, $sourceValue); $destNode = $this->createNode($destId, $destValue); $edge = new ServiceReferenceGraphEdge($sourceNode, $destNode, $reference); @@ -99,7 +102,7 @@ class ServiceReferenceGraph * Creates a graph node. * * @param string $id - * @param string $value + * @param mixed $value * * @return ServiceReferenceGraphNode */ diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php index e3c793c4f4..7e8cf812f7 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php @@ -27,7 +27,7 @@ class ServiceReferenceGraphEdge /** * @param ServiceReferenceGraphNode $sourceNode * @param ServiceReferenceGraphNode $destNode - * @param string $value + * @param mixed $value */ public function __construct(ServiceReferenceGraphNode $sourceNode, ServiceReferenceGraphNode $destNode, $value = null) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php index e5718b2b6d..3219d06e96 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php @@ -38,21 +38,11 @@ class ServiceReferenceGraphNode $this->value = $value; } - /** - * Adds an in edge to this node. - * - * @param ServiceReferenceGraphEdge $edge - */ public function addInEdge(ServiceReferenceGraphEdge $edge) { $this->inEdges[] = $edge; } - /** - * Adds an out edge to this node. - * - * @param ServiceReferenceGraphEdge $edge - */ public function addOutEdge(ServiceReferenceGraphEdge $edge) { $this->outEdges[] = $edge; diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php index 0ba5d646c8..a083e9ab01 100644 --- a/src/Symfony/Component/DependencyInjection/Container.php +++ b/src/Symfony/Component/DependencyInjection/Container.php @@ -50,11 +50,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag; */ class Container implements IntrospectableContainerInterface { - /** - * @var ParameterBagInterface - */ protected $parameterBag; - protected $services = array(); protected $methodMap = array(); protected $aliases = array(); @@ -66,9 +62,6 @@ class Container implements IntrospectableContainerInterface private $underscoreMap = array('_' => '', '.' => '_', '\\' => '_'); - /** - * @param ParameterBagInterface $parameterBag A ParameterBagInterface instance - */ public function __construct(ParameterBagInterface $parameterBag = null) { $this->parameterBag = $parameterBag ?: new ParameterBag(); @@ -454,8 +447,6 @@ class Container implements IntrospectableContainerInterface /** * Adds a scope to the container. * - * @param ScopeInterface $scope - * * @throws InvalidArgumentException */ public function addScope(ScopeInterface $scope) diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php index fe301b6270..d78491bb96 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php +++ b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php @@ -18,10 +18,5 @@ namespace Symfony\Component\DependencyInjection; */ interface ContainerAwareInterface { - /** - * Sets the container. - * - * @param ContainerInterface|null $container A ContainerInterface instance or null - */ public function setContainer(ContainerInterface $container = null); } diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php index ccf064f6f3..ee1ea2cb3d 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php +++ b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php @@ -23,11 +23,6 @@ trait ContainerAwareTrait */ protected $container; - /** - * Sets the container. - * - * @param ContainerInterface|null $container A ContainerInterface instance or null - */ public function setContainer(ContainerInterface $container = null) { $this->container = $container; diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index f9658fcf68..b180ad2ad8 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -123,19 +123,12 @@ class ContainerBuilder extends Container implements TaggedContainerInterface /** * Sets the instantiator to be used when fetching proxies. - * - * @param InstantiatorInterface $proxyInstantiator */ public function setProxyInstantiator(InstantiatorInterface $proxyInstantiator) { $this->proxyInstantiator = $proxyInstantiator; } - /** - * Registers an extension. - * - * @param ExtensionInterface $extension An extension instance - */ public function registerExtension(ExtensionInterface $extension) { $this->extensions[$extension->getAlias()] = $extension; @@ -200,10 +193,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface } /** - * Adds a resource for this configuration. - * - * @param ResourceInterface $resource A resource instance - * * @return $this */ public function addResource(ResourceInterface $resource) @@ -254,8 +243,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface /** * Adds the given class hierarchy as resources. * - * @param \ReflectionClass $class - * * @return $this */ public function addClassResource(\ReflectionClass $class) @@ -492,8 +479,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface * parameter, the value will still be 'bar' as defined in the ContainerBuilder * constructor. * - * @param ContainerBuilder $container The ContainerBuilder instance to merge - * * @throws BadMethodCallException When this ContainerBuilder is frozen */ public function merge(ContainerBuilder $container) @@ -603,8 +588,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface /** * Adds the service aliases. - * - * @param array $aliases An array of aliases */ public function addAliases(array $aliases) { @@ -615,8 +598,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface /** * Sets the service aliases. - * - * @param array $aliases An array of aliases */ public function setAliases(array $aliases) { diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php index 97b4913286..525af31c1c 100644 --- a/src/Symfony/Component/DependencyInjection/Definition.php +++ b/src/Symfony/Component/DependencyInjection/Definition.php @@ -246,8 +246,6 @@ class Definition /** * Sets the arguments to pass to the service constructor/factory method. * - * @param array $arguments An array of arguments - * * @return $this */ public function setArguments(array $arguments) @@ -260,8 +258,6 @@ class Definition /** * Sets the properties to define when creating the service. * - * @param array $properties - * * @return $this */ public function setProperties(array $properties) @@ -366,8 +362,6 @@ class Definition /** * Sets the methods to call after service initialization. * - * @param array $calls An array of method calls - * * @return $this */ public function setMethodCalls(array $calls = array()) @@ -450,8 +444,6 @@ class Definition /** * Sets tags for this definition. * - * @param array $tags - * * @return $this */ public function setTags(array $tags) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/Dumper.php b/src/Symfony/Component/DependencyInjection/Dumper/Dumper.php index a39a5c744b..e7407b0e2a 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/Dumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/Dumper.php @@ -22,9 +22,6 @@ abstract class Dumper implements DumperInterface { protected $container; - /** - * @param ContainerBuilder $container The service container to dump - */ public function __construct(ContainerBuilder $container) { $this->container = $container; diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 01d9ca7192..67bfd053e7 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -82,8 +82,6 @@ class PhpDumper extends Dumper /** * Sets the dumper to be used when dumping proxies in the generated container. - * - * @param ProxyDumper $proxyDumper */ public function setProxyDumper(ProxyDumper $proxyDumper) { @@ -99,8 +97,6 @@ class PhpDumper extends Dumper * * base_class: The base class name * * namespace: The class namespace * - * @param array $options An array of options - * * @return string A PHP class representing of the service container */ public function dump(array $options = array()) @@ -255,11 +251,9 @@ class PhpDumper extends Dumper /** * Generates the require_once statement for service includes. * - * @param Definition $definition - * * @return string */ - private function addServiceInclude($definition) + private function addServiceInclude(Definition $definition) { $template = " require_once %s;\n"; $code = ''; @@ -292,7 +286,7 @@ class PhpDumper extends Dumper * @throws RuntimeException When the factory definition is incomplete * @throws ServiceCircularReferenceException When a circular reference is detected */ - private function addServiceInlinedDefinitions($id, $definition) + private function addServiceInlinedDefinitions($id, Definition $definition) { $code = ''; $variableMap = $this->definitionVariables; @@ -354,7 +348,7 @@ class PhpDumper extends Dumper * * @return string */ - private function addServiceReturn($id, $definition) + private function addServiceReturn($id, Definition $definition) { if ($this->isSimpleInstance($id, $definition)) { return " }\n"; @@ -1148,10 +1142,6 @@ EOF; /** * Builds service calls from arguments. - * - * @param array $arguments - * @param array &$calls By reference - * @param array &$behavior By reference */ private function getServiceCallsFromArguments(array $arguments, array &$calls, array &$behavior) { @@ -1178,8 +1168,6 @@ EOF; /** * Returns the inline definition. * - * @param Definition $definition - * * @return array */ private function getInlinedDefinitions(Definition $definition) @@ -1204,8 +1192,6 @@ EOF; /** * Gets the definition from arguments. * - * @param array $arguments - * * @return array */ private function getDefinitionsFromArguments(array $arguments) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php index 4a4ac00d08..b3e270057f 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php @@ -35,8 +35,6 @@ class XmlDumper extends Dumper /** * Dumps the service container as an XML string. * - * @param array $options An array of options - * * @return string An xml string representing of the service container */ public function dump(array $options = array()) @@ -58,11 +56,6 @@ class XmlDumper extends Dumper return $xml; } - /** - * Adds parameters. - * - * @param \DOMElement $parent - */ private function addParameters(\DOMElement $parent) { $data = $this->container->getParameterBag()->all(); @@ -79,12 +72,6 @@ class XmlDumper extends Dumper $this->convertParameters($data, 'parameter', $parameters); } - /** - * Adds method calls. - * - * @param array $methodcalls - * @param \DOMElement $parent - */ private function addMethodCalls(array $methodcalls, \DOMElement $parent) { foreach ($methodcalls as $methodcall) { @@ -231,11 +218,6 @@ class XmlDumper extends Dumper $parent->appendChild($service); } - /** - * Adds services. - * - * @param \DOMElement $parent - */ private function addServices(\DOMElement $parent) { $definitions = $this->container->getDefinitions(); @@ -311,8 +293,6 @@ class XmlDumper extends Dumper /** * Escapes arguments. * - * @param array $arguments - * * @return array */ private function escape(array $arguments) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php index 9125a97836..882e93f36b 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php @@ -32,8 +32,6 @@ class YamlDumper extends Dumper /** * Dumps the service container as an YAML string. * - * @param array $options An array of options - * * @return string A YAML string representing of the service container */ public function dump(array $options = array()) @@ -57,7 +55,7 @@ class YamlDumper extends Dumper * * @return string */ - private function addService($id, $definition) + private function addService($id, Definition $definition) { $code = " $id:\n"; if ($class = $definition->getClass()) { @@ -163,7 +161,7 @@ class YamlDumper extends Dumper * * @return string */ - private function addServiceAlias($alias, $id) + private function addServiceAlias($alias, Alias $id) { if ($id->isPublic()) { return sprintf(" %s: '@%s'\n", $alias, $id); @@ -327,8 +325,6 @@ class YamlDumper extends Dumper /** * Escapes arguments. * - * @param array $arguments - * * @return array */ private function escape(array $arguments) diff --git a/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php index 705ba38ec9..da590635bc 100644 --- a/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php +++ b/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php @@ -24,9 +24,6 @@ interface ConfigurationExtensionInterface /** * Returns extension configuration. * - * @param array $config An array of configuration values - * @param ContainerBuilder $container A ContainerBuilder instance - * * @return ConfigurationInterface|null The configuration or null */ public function getConfiguration(array $config, ContainerBuilder $container); diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php index 5a6573b70e..224d18a44d 100644 --- a/src/Symfony/Component/DependencyInjection/Extension/Extension.php +++ b/src/Symfony/Component/DependencyInjection/Extension/Extension.php @@ -100,9 +100,6 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn } /** - * @param ContainerBuilder $container - * @param array $config - * * @return bool Whether the configuration is enabled * * @throws InvalidArgumentException When the config is not enableable diff --git a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php index 6e926fa7a8..18de31272f 100644 --- a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php +++ b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php @@ -23,9 +23,6 @@ interface ExtensionInterface /** * Loads a specific configuration. * - * @param array $configs An array of configuration values - * @param ContainerBuilder $container A ContainerBuilder instance - * * @throws \InvalidArgumentException When provided tag is not defined in this extension */ public function load(array $configs, ContainerBuilder $container); diff --git a/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php index c666bdbcf8..5bd18d79fe 100644 --- a/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php +++ b/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php @@ -17,8 +17,6 @@ interface PrependExtensionInterface { /** * Allow an extension to prepend the extension configurations. - * - * @param ContainerBuilder $container */ public function prepend(ContainerBuilder $container); } diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php index 878d965b1c..95c1f038c0 100644 --- a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php +++ b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php @@ -23,8 +23,6 @@ interface DumperInterface /** * Inspects whether the given definitions should produce proxy instantiation logic in the dumped container. * - * @param Definition $definition - * * @return bool */ public function isProxyCandidate(Definition $definition); @@ -42,8 +40,6 @@ interface DumperInterface /** * Generates the code for the lazy proxy. * - * @param Definition $definition - * * @return string */ public function getProxyCode(Definition $definition); diff --git a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php index df70cdf44f..f8f2efe2e9 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php @@ -25,9 +25,6 @@ class ClosureLoader extends Loader { private $container; - /** - * @param ContainerBuilder $container A ContainerBuilder instance - */ public function __construct(ContainerBuilder $container) { $this->container = $container; diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php index 90cd6bcfaf..fc242299ca 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php @@ -24,10 +24,6 @@ abstract class FileLoader extends BaseFileLoader { protected $container; - /** - * @param ContainerBuilder $container A ContainerBuilder instance - * @param FileLocatorInterface $locator A FileLocator instance - */ public function __construct(ContainerBuilder $container, FileLocatorInterface $locator) { $this->container = $container; diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index ba12fdc821..092ec3c332 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -417,8 +417,6 @@ class YamlFileLoader extends FileLoader /** * Loads from Extensions. - * - * @param array $content */ private function loadFromExtensions(array $content) { diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php index 2cff979ed8..ce78964d90 100644 --- a/src/Symfony/Component/DomCrawler/Form.php +++ b/src/Symfony/Component/DomCrawler/Form.php @@ -278,8 +278,6 @@ class Form extends Link implements \ArrayAccess /** * Sets a named field. - * - * @param FormField $field The field */ public function set(FormField $field) { @@ -366,8 +364,6 @@ class Form extends Link implements \ArrayAccess * * Expects a 'submit' button \DOMElement and finds the corresponding form element, or the form element itself. * - * @param \DOMElement $node A \DOMElement instance - * * @throws \LogicException If given node is not a button or input or does not have a form ancestor */ protected function setNode(\DOMElement $node) diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php index 9168dd365a..6ad6d933e4 100644 --- a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php +++ b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php @@ -26,8 +26,6 @@ class FormFieldRegistry /** * Adds a field to the registry. - * - * @param FormField $field The field */ public function add(FormField $field) { diff --git a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php index a0deb39b07..03670bb44c 100644 --- a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php @@ -23,30 +23,18 @@ use Symfony\Component\DependencyInjection\ContainerInterface; */ class ContainerAwareEventDispatcher extends EventDispatcher { - /** - * The container from where services are loaded. - * - * @var ContainerInterface - */ private $container; /** * The service IDs of the event listeners and subscribers. - * - * @var array */ private $listenerIds = array(); /** * The services registered as listeners. - * - * @var array */ private $listeners = array(); - /** - * @param ContainerInterface $container A ContainerInterface instance - */ public function __construct(ContainerInterface $container) { $this->container = $container; diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php index 775b75a4f6..e8e83d3399 100644 --- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php @@ -33,11 +33,6 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface private $dispatcher; private $wrappedListeners; - /** - * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance - * @param Stopwatch $stopwatch A Stopwatch instance - * @param LoggerInterface $logger A LoggerInterface instance - */ public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null) { $this->dispatcher = $dispatcher; diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php index b1f976cdf2..f9be02edc7 100644 --- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php +++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php @@ -48,8 +48,6 @@ interface EventDispatcherInterface * * The subscriber is asked for all the events he is * interested in and added as a listener for these events. - * - * @param EventSubscriberInterface $subscriber The subscriber */ public function addSubscriber(EventSubscriberInterface $subscriber); @@ -61,11 +59,6 @@ interface EventDispatcherInterface */ public function removeListener($eventName, $listener); - /** - * Removes an event subscriber. - * - * @param EventSubscriberInterface $subscriber The subscriber - */ public function removeSubscriber(EventSubscriberInterface $subscriber); /** diff --git a/src/Symfony/Component/EventDispatcher/GenericEvent.php b/src/Symfony/Component/EventDispatcher/GenericEvent.php index a7520a0f34..8907a0c2dc 100644 --- a/src/Symfony/Component/EventDispatcher/GenericEvent.php +++ b/src/Symfony/Component/EventDispatcher/GenericEvent.php @@ -29,8 +29,6 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate /** * Array of arguments. - * - * @var array */ protected $arguments; diff --git a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php index 806cdd9c40..5b06553ead 100644 --- a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php @@ -18,18 +18,8 @@ namespace Symfony\Component\EventDispatcher; */ class ImmutableEventDispatcher implements EventDispatcherInterface { - /** - * The proxied dispatcher. - * - * @var EventDispatcherInterface - */ private $dispatcher; - /** - * Creates an unmodifiable proxy for an event dispatcher. - * - * @param EventDispatcherInterface $dispatcher The proxied event dispatcher - */ public function __construct(EventDispatcherInterface $dispatcher) { $this->dispatcher = $dispatcher; diff --git a/src/Symfony/Component/ExpressionLanguage/Compiler.php b/src/Symfony/Component/ExpressionLanguage/Compiler.php index f32ec36d30..66d106041f 100644 --- a/src/Symfony/Component/ExpressionLanguage/Compiler.php +++ b/src/Symfony/Component/ExpressionLanguage/Compiler.php @@ -51,8 +51,6 @@ class Compiler /** * Compiles a node. * - * @param Node\Node $node The node to compile - * * @return $this */ public function compile(Node\Node $node) diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php index f110f542ad..5d8fb009c7 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php @@ -33,8 +33,6 @@ class ArrayNode extends Node /** * Compiles the node to PHP. - * - * @param Compiler $compiler A Compiler instance */ public function compile(Compiler $compiler) { diff --git a/src/Symfony/Component/ExpressionLanguage/ParserCache/ArrayParserCache.php b/src/Symfony/Component/ExpressionLanguage/ParserCache/ArrayParserCache.php index 1d2aedb514..405a060a94 100644 --- a/src/Symfony/Component/ExpressionLanguage/ParserCache/ArrayParserCache.php +++ b/src/Symfony/Component/ExpressionLanguage/ParserCache/ArrayParserCache.php @@ -18,9 +18,6 @@ use Symfony\Component\ExpressionLanguage\ParsedExpression; */ class ArrayParserCache implements ParserCacheInterface { - /** - * @var array - */ private $cache = array(); /** diff --git a/src/Symfony/Component/Finder/Adapter/AdapterInterface.php b/src/Symfony/Component/Finder/Adapter/AdapterInterface.php index 2f22a81ccb..dbba7bb909 100644 --- a/src/Symfony/Component/Finder/Adapter/AdapterInterface.php +++ b/src/Symfony/Component/Finder/Adapter/AdapterInterface.php @@ -31,64 +31,46 @@ interface AdapterInterface public function setMode($mode); /** - * @param array $exclude - * * @return $this */ public function setExclude(array $exclude); /** - * @param array $depths - * * @return $this */ public function setDepths(array $depths); /** - * @param array $names - * * @return $this */ public function setNames(array $names); /** - * @param array $notNames - * * @return $this */ public function setNotNames(array $notNames); /** - * @param array $contains - * * @return $this */ public function setContains(array $contains); /** - * @param array $notContains - * * @return $this */ public function setNotContains(array $notContains); /** - * @param array $sizes - * * @return $this */ public function setSizes(array $sizes); /** - * @param array $dates - * * @return $this */ public function setDates(array $dates); /** - * @param array $filters - * * @return $this */ public function setFilters(array $filters); @@ -101,15 +83,11 @@ interface AdapterInterface public function setSort($sort); /** - * @param array $paths - * * @return $this */ public function setPath(array $paths); /** - * @param array $notPaths - * * @return $this */ public function setNotPath(array $notPaths); diff --git a/src/Symfony/Component/Finder/Exception/AdapterFailureException.php b/src/Symfony/Component/Finder/Exception/AdapterFailureException.php index 15fa22147d..a560d19450 100644 --- a/src/Symfony/Component/Finder/Exception/AdapterFailureException.php +++ b/src/Symfony/Component/Finder/Exception/AdapterFailureException.php @@ -20,9 +20,6 @@ use Symfony\Component\Finder\Adapter\AdapterInterface; */ class AdapterFailureException extends \RuntimeException implements ExceptionInterface { - /** - * @var \Symfony\Component\Finder\Adapter\AdapterInterface - */ private $adapter; /** diff --git a/src/Symfony/Component/Finder/Exception/ShellCommandFailureException.php b/src/Symfony/Component/Finder/Exception/ShellCommandFailureException.php index 2658f6a508..5384bec399 100644 --- a/src/Symfony/Component/Finder/Exception/ShellCommandFailureException.php +++ b/src/Symfony/Component/Finder/Exception/ShellCommandFailureException.php @@ -19,16 +19,8 @@ use Symfony\Component\Finder\Shell\Command; */ class ShellCommandFailureException extends AdapterFailureException { - /** - * @var Command - */ private $command; - /** - * @param AdapterInterface $adapter - * @param Command $command - * @param \Exception|null $previous - */ public function __construct(AdapterInterface $adapter, Command $command, \Exception $previous = null) { $this->command = $command; diff --git a/src/Symfony/Component/Finder/Expression/Regex.php b/src/Symfony/Component/Finder/Expression/Regex.php index 531a3e2e78..2b31c3664c 100644 --- a/src/Symfony/Component/Finder/Expression/Regex.php +++ b/src/Symfony/Component/Finder/Expression/Regex.php @@ -28,7 +28,7 @@ class Regex implements ValueInterface private $pattern; /** - * @var array + * @var string */ private $options; @@ -277,8 +277,6 @@ class Regex implements ValueInterface } /** - * @param array $replacement - * * @return $this */ public function replaceJokers($replacement) diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php index ccb64328b8..5784df439b 100644 --- a/src/Symfony/Component/Finder/Finder.php +++ b/src/Symfony/Component/Finder/Finder.php @@ -462,8 +462,6 @@ class Finder implements \IteratorAggregate, \Countable * * This can be slow as all the matching files and directories must be retrieved for comparison. * - * @param \Closure $closure An anonymous function - * * @return $this * * @see SortableIterator @@ -569,8 +567,6 @@ class Finder implements \IteratorAggregate, \Countable * The anonymous function receives a \SplFileInfo and must return false * to remove files. * - * @param \Closure $closure An anonymous function - * * @return $this * * @see CustomFilterIterator @@ -757,8 +753,6 @@ class Finder implements \IteratorAggregate, \Countable } /** - * @param AdapterInterface $adapter - * * @return AdapterInterface */ private function buildAdapter(AdapterInterface $adapter) diff --git a/src/Symfony/Component/Finder/Shell/Command.php b/src/Symfony/Component/Finder/Shell/Command.php index 29158d8cac..47f4b42221 100644 --- a/src/Symfony/Component/Finder/Shell/Command.php +++ b/src/Symfony/Component/Finder/Shell/Command.php @@ -16,19 +16,8 @@ namespace Symfony\Component\Finder\Shell; */ class Command { - /** - * @var Command|null - */ private $parent; - - /** - * @var array - */ private $bits = array(); - - /** - * @var array - */ private $labels = array(); /** @@ -36,9 +25,6 @@ class Command */ private $errorHandler; - /** - * @param Command|null $parent Parent command - */ public function __construct(Command $parent = null) { $this->parent = $parent; @@ -57,8 +43,6 @@ class Command /** * Creates a new Command instance. * - * @param Command|null $parent Parent command - * * @return self */ public static function create(Command $parent = null) @@ -216,8 +200,6 @@ class Command } /** - * @param \Closure $errorHandler - * * @return $this */ public function setErrorHandler(\Closure $errorHandler) diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php index 7519011225..452e24f1d1 100644 --- a/src/Symfony/Component/Form/AbstractRendererEngine.php +++ b/src/Symfony/Component/Form/AbstractRendererEngine.php @@ -23,24 +23,10 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface */ const CACHE_KEY_VAR = 'cache_key'; - /** - * @var array - */ protected $defaultThemes; - - /** - * @var array - */ protected $themes = array(); - - /** - * @var array - */ protected $resources = array(); - /** - * @var array - */ private $resourceHierarchyLevels = array(); /** diff --git a/src/Symfony/Component/Form/AbstractTypeExtension.php b/src/Symfony/Component/Form/AbstractTypeExtension.php index 27783a1a4d..268c94354c 100644 --- a/src/Symfony/Component/Form/AbstractTypeExtension.php +++ b/src/Symfony/Component/Form/AbstractTypeExtension.php @@ -54,8 +54,6 @@ abstract class AbstractTypeExtension implements FormTypeExtensionInterface /** * Configures the options for this type. - * - * @param OptionsResolver $resolver The resolver for the options */ public function configureOptions(OptionsResolver $resolver) { diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php index 9a5f8a60bd..3dbe110fcb 100644 --- a/src/Symfony/Component/Form/Button.php +++ b/src/Symfony/Component/Form/Button.php @@ -273,8 +273,6 @@ class Button implements \IteratorAggregate, FormInterface /** * Unsupported method. * - * @param FormError $error - * * @throws BadMethodCallException */ public function addError(FormError $error) diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php index ad311db290..ec3a421d54 100644 --- a/src/Symfony/Component/Form/ButtonBuilder.php +++ b/src/Symfony/Component/Form/ButtonBuilder.php @@ -184,8 +184,6 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface * * This method should not be invoked. * - * @param EventSubscriberInterface $subscriber - * * @throws BadMethodCallException */ public function addEventSubscriber(EventSubscriberInterface $subscriber) @@ -272,8 +270,6 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface * * This method should not be invoked. * - * @param DataMapperInterface $dataMapper - * * @throws BadMethodCallException */ public function setDataMapper(DataMapperInterface $dataMapper = null) @@ -413,8 +409,6 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Sets the type of the button. * - * @param ResolvedFormTypeInterface $type The type of the button - * * @return $this */ public function setType(ResolvedFormTypeInterface $type) @@ -457,8 +451,6 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface * * This method should not be invoked. * - * @param FormFactoryInterface $formFactory - * * @throws BadMethodCallException */ public function setFormFactory(FormFactoryInterface $formFactory) @@ -493,8 +485,6 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface /** * Unsupported method. * - * @param RequestHandlerInterface $requestHandler - * * @throws BadMethodCallException */ public function setRequestHandler(RequestHandlerInterface $requestHandler) diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php index 5ce851096c..d7a62730ef 100644 --- a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php +++ b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php @@ -22,9 +22,6 @@ use Symfony\Component\Form\ChoiceList\View\ChoiceListView; */ class CachingFactoryDecorator implements ChoiceListFactoryInterface { - /** - * @var ChoiceListFactoryInterface - */ private $decoratedFactory; /** @@ -89,11 +86,6 @@ class CachingFactoryDecorator implements ChoiceListFactoryInterface } } - /** - * Decorates the given factory. - * - * @param ChoiceListFactoryInterface $decoratedFactory The decorated factory - */ public function __construct(ChoiceListFactoryInterface $decoratedFactory) { $this->decoratedFactory = $decoratedFactory; diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php index 1b68fd8924..82b2082f33 100644 --- a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php +++ b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php @@ -41,22 +41,9 @@ use Symfony\Component\PropertyAccess\PropertyPath; */ class PropertyAccessDecorator implements ChoiceListFactoryInterface { - /** - * @var ChoiceListFactoryInterface - */ private $decoratedFactory; - - /** - * @var PropertyAccessorInterface - */ private $propertyAccessor; - /** - * Decorates the given factory. - * - * @param ChoiceListFactoryInterface $decoratedFactory The decorated factory - * @param null|PropertyAccessorInterface $propertyAccessor The used property accessor - */ public function __construct(ChoiceListFactoryInterface $decoratedFactory, PropertyAccessorInterface $propertyAccessor = null) { $this->decoratedFactory = $decoratedFactory; diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php index 5078de789a..5f32b5bbf4 100644 --- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php +++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php @@ -70,8 +70,6 @@ class ChoiceView extends LegacyChoiceView { /** * Additional attributes for the HTML tag. - * - * @var array */ public $attr; diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php index 6e0cea5539..14860a59f7 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php @@ -43,31 +43,23 @@ class ChoiceList implements ChoiceListInterface { /** * The choices with their indices as keys. - * - * @var array */ protected $choices = array(); /** * The choice values with the indices of the matching choices as keys. - * - * @var array */ protected $values = array(); /** * The preferred view objects as hierarchy containing also the choice groups * with the indices of the matching choices as bottom-level keys. - * - * @var array */ private $preferredViews = array(); /** * The non-preferred view objects as hierarchy containing also the choice * groups with the indices of the matching choices as bottom-level keys. - * - * @var array */ private $remainingViews = array(); diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php index 736752a41e..25aba9a16d 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php +++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php @@ -23,16 +23,8 @@ use Symfony\Component\PropertyAccess\PropertyAccessorInterface; */ class PropertyPathMapper implements DataMapperInterface { - /** - * @var PropertyAccessorInterface - */ private $propertyAccessor; - /** - * Creates a new property path mapper. - * - * @param PropertyAccessorInterface $propertyAccessor The property accessor - */ public function __construct(PropertyAccessorInterface $propertyAccessor = null) { $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor(); diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php index 369a12343f..e8424b9299 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php @@ -22,9 +22,6 @@ class ChoiceToValueTransformer implements DataTransformerInterface { private $choiceList; - /** - * @param ChoiceListInterface $choiceList - */ public function __construct(ChoiceListInterface $choiceList) { $this->choiceList = $choiceList; diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php index 05da291733..a6b2f3fd58 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php @@ -22,17 +22,12 @@ class ChoicesToValuesTransformer implements DataTransformerInterface { private $choiceList; - /** - * @param ChoiceListInterface $choiceList - */ public function __construct(ChoiceListInterface $choiceList) { $this->choiceList = $choiceList; } /** - * @param array $array - * * @return array * * @throws TransformationFailedException if the given value is not an array @@ -51,8 +46,6 @@ class ChoicesToValuesTransformer implements DataTransformerInterface } /** - * @param array $array - * * @return array * * @throws TransformationFailedException if the given value is not an array diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php index f52bb97eb4..81ffc7e247 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php @@ -21,17 +21,12 @@ use Symfony\Component\Form\Exception\TransformationFailedException; */ class DataTransformerChain implements DataTransformerInterface { - /** - * The value transformers. - * - * @var DataTransformerInterface[] - */ protected $transformers; /** * Uses the given value transformers to transform values. * - * @param array $transformers + * @param DataTransformerInterface[] $transformers */ public function __construct(array $transformers) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php index 2c1d6d0f62..5b851af7dd 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php @@ -47,8 +47,6 @@ class ValueToDuplicatesTransformer implements DataTransformerInterface /** * Extracts the duplicated value from an array. * - * @param array $array - * * @return mixed The value * * @throws TransformationFailedException if the given value is not an array or diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php index 4b339181e9..e61ae5b8a3 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php @@ -24,35 +24,20 @@ use Symfony\Component\Form\FormInterface; */ class ResizeFormListener implements EventSubscriberInterface { - /** - * @var string - */ protected $type; - - /** - * @var array - */ protected $options; - - /** - * Whether children could be added to the group. - * - * @var bool - */ protected $allowAdd; - - /** - * Whether children could be removed from the group. - * - * @var bool - */ protected $allowDelete; - /** - * @var bool - */ private $deleteEmpty; + /** + * @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 $deleteEmpty + */ public function __construct($type, array $options = array(), $allowAdd = false, $allowDelete = false, $deleteEmpty = false) { $this->type = $type; diff --git a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php index 0bd33d36a5..c80dd67141 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php @@ -49,8 +49,6 @@ class DataCollectorListener implements EventSubscriberInterface /** * Listener for the {@link FormEvents::POST_SET_DATA} event. - * - * @param FormEvent $event The event object */ public function postSetData(FormEvent $event) { @@ -65,8 +63,6 @@ class DataCollectorListener implements EventSubscriberInterface /** * Listener for the {@link FormEvents::POST_SUBMIT} event. - * - * @param FormEvent $event The event object */ public function postSubmit(FormEvent $event) { diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php index a408dde230..8e7a3c61f5 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php @@ -25,9 +25,6 @@ use Symfony\Component\HttpKernel\DataCollector\DataCollector; */ class FormDataCollector extends DataCollector implements FormDataCollectorInterface { - /** - * @var FormDataExtractor - */ private $dataExtractor; /** diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php index ee004a09f3..d2a7818cd0 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php @@ -24,37 +24,26 @@ interface FormDataCollectorInterface extends DataCollectorInterface { /** * Stores configuration data of the given form and its children. - * - * @param FormInterface $form A root form */ public function collectConfiguration(FormInterface $form); /** * Stores the default data of the given form and its children. - * - * @param FormInterface $form A root form */ public function collectDefaultData(FormInterface $form); /** * Stores the submitted data of the given form and its children. - * - * @param FormInterface $form A root form */ public function collectSubmittedData(FormInterface $form); /** * Stores the view variables of the given form view and its children. - * - * @param FormView $view A root form view */ public function collectViewVariables(FormView $view); /** * Specifies that the given objects represent the same conceptual form. - * - * @param FormInterface $form A form object - * @param FormView $view A view object */ public function associateFormWithView(FormInterface $form, FormView $view); @@ -63,8 +52,6 @@ interface FormDataCollectorInterface extends DataCollectorInterface * a tree-like data structure. * * The result can be queried using {@link getData()}. - * - * @param FormInterface $form A root form */ public function buildPreliminaryFormTree(FormInterface $form); @@ -85,9 +72,6 @@ interface FormDataCollectorInterface extends DataCollectorInterface * tree, only the view data will be included in the result. If a * corresponding {@link FormInterface} exists otherwise, call * {@link associateFormWithView()} before calling this method. - * - * @param FormInterface $form A root form - * @param FormView $view A root view */ public function buildFinalFormTree(FormInterface $form, FormView $view); diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php index 20b270d845..3e2ffd04f9 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php @@ -180,8 +180,6 @@ class FormDataExtractor implements FormDataExtractorInterface /** * Recursively builds an HTML ID for a form. * - * @param FormInterface $form The form - * * @return string The HTML ID */ private function buildId(FormInterface $form) diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php index e0bc6dc0ca..5fd345fec0 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php @@ -24,8 +24,6 @@ interface FormDataExtractorInterface /** * Extracts the configuration data of a form. * - * @param FormInterface $form The form - * * @return array Information about the form's configuration */ public function extractConfiguration(FormInterface $form); @@ -33,8 +31,6 @@ interface FormDataExtractorInterface /** * Extracts the default data of a form. * - * @param FormInterface $form The form - * * @return array Information about the form's default data */ public function extractDefaultData(FormInterface $form); @@ -42,8 +38,6 @@ interface FormDataExtractorInterface /** * Extracts the submitted data of a form. * - * @param FormInterface $form The form - * * @return array Information about the form's submitted data */ public function extractSubmittedData(FormInterface $form); @@ -51,8 +45,6 @@ interface FormDataExtractorInterface /** * Extracts the view variables of a form. * - * @param FormView $view The form view - * * @return array Information about the view's variables */ public function extractViewVariables(FormView $view); diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php index 9cb0dc4476..59e108673a 100644 --- a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php +++ b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php @@ -22,19 +22,9 @@ use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler */ class FormTypeHttpFoundationExtension extends AbstractTypeExtension { - /** - * @var BindRequestListener - */ private $listener; - - /** - * @var RequestHandlerInterface - */ private $requestHandler; - /** - * @param RequestHandlerInterface $requestHandler - */ public function __construct(RequestHandlerInterface $requestHandler = null) { $this->listener = new BindRequestListener(); diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php index 3bf57df048..bddb8a09e8 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php +++ b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php @@ -194,8 +194,6 @@ class FormValidator extends ConstraintValidator /** * Returns the validation groups of the given form. * - * @param FormInterface $form The form - * * @return array The validation groups */ private static function getValidationGroups(FormInterface $form) diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php index b04a9447fc..9f06a75d90 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php +++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php @@ -81,8 +81,6 @@ class ValidatorTypeGuesser implements FormTypeGuesserInterface /** * Guesses a field class name for a given constraint. * - * @param Constraint $constraint The constraint to guess for - * * @return TypeGuess|null The guessed field class and options */ public function guessTypeForConstraint(Constraint $constraint) @@ -167,8 +165,6 @@ class ValidatorTypeGuesser implements FormTypeGuesserInterface /** * Guesses whether a field is required based on the given constraint. * - * @param Constraint $constraint The constraint to guess for - * * @return ValueGuess|null The guess whether the field is required */ public function guessRequiredForConstraint(Constraint $constraint) @@ -185,8 +181,6 @@ class ValidatorTypeGuesser implements FormTypeGuesserInterface /** * Guesses a field's maximum length based on the given constraint. * - * @param Constraint $constraint The constraint to guess for - * * @return ValueGuess|null The guess for the maximum length */ public function guessMaxLengthForConstraint(Constraint $constraint) @@ -215,8 +209,6 @@ class ValidatorTypeGuesser implements FormTypeGuesserInterface /** * Guesses a field's pattern based on the given constraint. * - * @param Constraint $constraint The constraint to guess for - * * @return ValueGuess|null The guess for the pattern */ public function guessPatternForConstraint(Constraint $constraint) diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php index 14e7b521f1..8a3602e701 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php @@ -269,8 +269,6 @@ class ViolationMapper implements ViolationMapperInterface } /** - * @param FormInterface $form - * * @return bool */ private function acceptsErrors(FormInterface $form) diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index 7e662f8f1e..83f0055e0c 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -162,8 +162,6 @@ class Form implements \IteratorAggregate, FormInterface /** * Creates a new form based on the given configuration. * - * @param FormConfigInterface $config The form configuration - * * @throws LogicException if a data mapper is not provided for a compound form */ public function __construct(FormConfigInterface $config) diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php index 3cb4e38482..bd9e8d8de7 100644 --- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php +++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php @@ -35,8 +35,6 @@ interface FormConfigBuilderInterface extends FormConfigInterface /** * Adds an event subscriber for events on this form. * - * @param EventSubscriberInterface $subscriber The subscriber to attach - * * @return $this The configuration object */ public function addEventSubscriber(EventSubscriberInterface $subscriber); @@ -98,8 +96,6 @@ interface FormConfigBuilderInterface extends FormConfigInterface /** * Sets the attributes. * - * @param array $attributes The attributes - * * @return $this The configuration object */ public function setAttributes(array $attributes); @@ -107,8 +103,6 @@ interface FormConfigBuilderInterface extends FormConfigInterface /** * Sets the data mapper used by the form. * - * @param DataMapperInterface $dataMapper - * * @return $this The configuration object */ public function setDataMapper(DataMapperInterface $dataMapper = null); @@ -202,8 +196,6 @@ interface FormConfigBuilderInterface extends FormConfigInterface /** * Set the types. * - * @param ResolvedFormTypeInterface $type The type of the form - * * @return $this The configuration object */ public function setType(ResolvedFormTypeInterface $type); @@ -232,8 +224,6 @@ interface FormConfigBuilderInterface extends FormConfigInterface /** * Sets the form factory used for creating new forms. - * - * @param FormFactoryInterface $formFactory The form factory */ public function setFormFactory(FormFactoryInterface $formFactory); @@ -258,8 +248,6 @@ interface FormConfigBuilderInterface extends FormConfigInterface /** * Sets the request handler used by the form. * - * @param RequestHandlerInterface $requestHandler - * * @return $this The configuration object */ public function setRequestHandler(RequestHandlerInterface $requestHandler); diff --git a/src/Symfony/Component/Form/FormError.php b/src/Symfony/Component/Form/FormError.php index c35a26f5a3..4bfd853d57 100644 --- a/src/Symfony/Component/Form/FormError.php +++ b/src/Symfony/Component/Form/FormError.php @@ -20,37 +20,11 @@ use Symfony\Component\Form\Exception\BadMethodCallException; */ class FormError implements \Serializable { - /** - * @var string - */ - private $message; - - /** - * The template for the error message. - * - * @var string - */ protected $messageTemplate; - - /** - * The parameters that should be substituted in the message template. - * - * @var array - */ protected $messageParameters; - - /** - * The value for error message pluralization. - * - * @var int|null - */ protected $messagePluralization; - /** - * The cause for this error. - * - * @var mixed - */ + private $message; private $cause; /** diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php index 34e3666dbd..e87e457a7b 100644 --- a/src/Symfony/Component/Form/FormFactory.php +++ b/src/Symfony/Component/Form/FormFactory.php @@ -142,8 +142,6 @@ class FormFactory implements FormFactoryInterface * Wraps a type into a ResolvedFormTypeInterface implementation and connects * it with its parent type. * - * @param FormTypeInterface $type The type to resolve - * * @return ResolvedFormTypeInterface The resolved type */ private function resolveType(FormTypeInterface $type) diff --git a/src/Symfony/Component/Form/FormFactoryBuilderInterface.php b/src/Symfony/Component/Form/FormFactoryBuilderInterface.php index c1e55dcc60..35cdc44d9d 100644 --- a/src/Symfony/Component/Form/FormFactoryBuilderInterface.php +++ b/src/Symfony/Component/Form/FormFactoryBuilderInterface.php @@ -21,8 +21,6 @@ interface FormFactoryBuilderInterface /** * Sets the factory for creating ResolvedFormTypeInterface instances. * - * @param ResolvedFormTypeFactoryInterface $resolvedTypeFactory - * * @return $this */ public function setResolvedTypeFactory(ResolvedFormTypeFactoryInterface $resolvedTypeFactory); @@ -30,8 +28,6 @@ interface FormFactoryBuilderInterface /** * Adds an extension to be loaded by the factory. * - * @param FormExtensionInterface $extension The extension - * * @return $this */ public function addExtension(FormExtensionInterface $extension); @@ -48,8 +44,6 @@ interface FormFactoryBuilderInterface /** * Adds a form type to the factory. * - * @param FormTypeInterface $type The form type - * * @return $this */ public function addType(FormTypeInterface $type); @@ -66,8 +60,6 @@ interface FormFactoryBuilderInterface /** * Adds a form type extension to the factory. * - * @param FormTypeExtensionInterface $typeExtension The form type extension - * * @return $this */ public function addTypeExtension(FormTypeExtensionInterface $typeExtension); @@ -84,8 +76,6 @@ interface FormFactoryBuilderInterface /** * Adds a type guesser to the factory. * - * @param FormTypeGuesserInterface $typeGuesser The type guesser - * * @return $this */ public function addTypeGuesser(FormTypeGuesserInterface $typeGuesser); diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php index e28d1a102d..fcfbaaf96c 100644 --- a/src/Symfony/Component/Form/FormInterface.php +++ b/src/Symfony/Component/Form/FormInterface.php @@ -23,8 +23,6 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable /** * Sets the parent form. * - * @param FormInterface|null $parent The parent form or null if it's the root - * * @return self * * @throws Exception\AlreadySubmittedException if the form has already been submitted @@ -296,8 +294,6 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable /** * Creates a view. * - * @param FormView $parent The parent view - * * @return FormView The view */ public function createView(FormView $parent = null); diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php index b731b740df..342a64d503 100644 --- a/src/Symfony/Component/Form/FormRenderer.php +++ b/src/Symfony/Component/Form/FormRenderer.php @@ -27,35 +27,13 @@ class FormRenderer implements FormRendererInterface { const CACHE_KEY_VAR = 'unique_block_prefix'; - /** - * @var FormRendererEngineInterface - */ private $engine; - - /** - * @var CsrfTokenManagerInterface - */ private $csrfTokenManager; - - /** - * @var array - */ private $blockNameHierarchyMap = array(); - - /** - * @var array - */ private $hierarchyLevelMap = array(); - - /** - * @var array - */ private $variableStack = array(); /** - * @param FormRendererEngineInterface $engine - * @param CsrfTokenManagerInterface|null $csrfTokenManager - * * @throws UnexpectedTypeException */ public function __construct(FormRendererEngineInterface $engine, $csrfTokenManager = null) diff --git a/src/Symfony/Component/Form/FormTypeExtensionInterface.php b/src/Symfony/Component/Form/FormTypeExtensionInterface.php index 095813d211..cc46b0a324 100644 --- a/src/Symfony/Component/Form/FormTypeExtensionInterface.php +++ b/src/Symfony/Component/Form/FormTypeExtensionInterface.php @@ -25,9 +25,6 @@ interface FormTypeExtensionInterface * further modify it. * * @see FormTypeInterface::buildForm() - * - * @param FormBuilderInterface $builder The form builder - * @param array $options The options */ public function buildForm(FormBuilderInterface $builder, array $options); @@ -38,10 +35,6 @@ interface FormTypeExtensionInterface * further modify it. * * @see FormTypeInterface::buildView() - * - * @param FormView $view The view - * @param FormInterface $form The form - * @param array $options The options */ public function buildView(FormView $view, FormInterface $form, array $options); @@ -52,10 +45,6 @@ interface FormTypeExtensionInterface * further modify it. * * @see FormTypeInterface::finishView() - * - * @param FormView $view The view - * @param FormInterface $form The form - * @param array $options The options */ public function finishView(FormView $view, FormInterface $form, array $options); diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php index 8655bedf6e..21a3d5036a 100644 --- a/src/Symfony/Component/Form/FormView.php +++ b/src/Symfony/Component/Form/FormView.php @@ -20,8 +20,6 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable { /** * The variables assigned to this view. - * - * @var array */ public $vars = array( 'value' => null, @@ -30,8 +28,6 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable /** * The parent view. - * - * @var FormView */ public $parent; diff --git a/src/Symfony/Component/Form/Guess/TypeGuess.php b/src/Symfony/Component/Form/Guess/TypeGuess.php index a190d5bc03..1431b5e400 100644 --- a/src/Symfony/Component/Form/Guess/TypeGuess.php +++ b/src/Symfony/Component/Form/Guess/TypeGuess.php @@ -19,18 +19,7 @@ namespace Symfony\Component\Form\Guess; */ class TypeGuess extends Guess { - /** - * The guessed field type. - * - * @var string - */ private $type; - - /** - * The guessed options for creating an instance of the guessed class. - * - * @var array - */ private $options; /** diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php index 3607feb99c..e28c2b4b10 100644 --- a/src/Symfony/Component/Form/NativeRequestHandler.php +++ b/src/Symfony/Component/Form/NativeRequestHandler.php @@ -21,9 +21,6 @@ use Symfony\Component\Form\Util\ServerParams; */ class NativeRequestHandler implements RequestHandlerInterface { - /** - * @var ServerParams - */ private $serverParams; /** @@ -36,8 +33,6 @@ class NativeRequestHandler implements RequestHandlerInterface /** * The allowed keys of the $_FILES array. - * - * @var array */ private static $fileKeys = array( 'error', @@ -159,8 +154,6 @@ class NativeRequestHandler implements RequestHandlerInterface * This method is identical to {@link \Symfony\Component\HttpFoundation\FileBag::fixPhpFilesArray} * and should be kept as such in order to port fixes quickly and easily. * - * @param array $data - * * @return array */ private static function fixPhpFilesArray($data) diff --git a/src/Symfony/Component/Form/ReversedTransformer.php b/src/Symfony/Component/Form/ReversedTransformer.php index fc5cd12bc3..8089e47bf0 100644 --- a/src/Symfony/Component/Form/ReversedTransformer.php +++ b/src/Symfony/Component/Form/ReversedTransformer.php @@ -21,18 +21,8 @@ namespace Symfony\Component\Form; */ class ReversedTransformer implements DataTransformerInterface { - /** - * The reversed transformer. - * - * @var DataTransformerInterface - */ protected $reversedTransformer; - /** - * Reverses this transformer. - * - * @param DataTransformerInterface $reversedTransformer - */ public function __construct(DataTransformerInterface $reversedTransformer) { $this->reversedTransformer = $reversedTransformer; diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeader.php b/src/Symfony/Component/HttpFoundation/AcceptHeader.php index c6fd85f947..d1740266b7 100644 --- a/src/Symfony/Component/HttpFoundation/AcceptHeader.php +++ b/src/Symfony/Component/HttpFoundation/AcceptHeader.php @@ -97,8 +97,6 @@ class AcceptHeader /** * Adds an item. * - * @param AcceptHeaderItem $item - * * @return $this */ public function add(AcceptHeaderItem $item) diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php index 921751f6b5..263fb321c5 100644 --- a/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php +++ b/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php @@ -65,8 +65,6 @@ class ExtensionGuesser implements ExtensionGuesserInterface * Registers a new extension guesser. * * When guessing, this guesser is preferred over previously registered ones. - * - * @param ExtensionGuesserInterface $guesser */ public function register(ExtensionGuesserInterface $guesser) { diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php index 17fd344b84..49c323c1f5 100644 --- a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php +++ b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php @@ -23,8 +23,6 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface * This list has been updated from upstream on 2013-04-23. * * @see http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types - * - * @var array */ protected $defaultExtensions = array( 'application/andrew-inset' => 'ez', diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php index 69c803b499..e3ef45ef67 100644 --- a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php +++ b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php @@ -93,8 +93,6 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface * Registers a new mime type guesser. * * When guessing, this guesser is preferred over previously registered ones. - * - * @param MimeTypeGuesserInterface $guesser */ public function register(MimeTypeGuesserInterface $guesser) { diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php index 722ec2a9c4..a43ea14766 100644 --- a/src/Symfony/Component/HttpFoundation/FileBag.php +++ b/src/Symfony/Component/HttpFoundation/FileBag.php @@ -106,8 +106,6 @@ class FileBag extends ParameterBag * It's safe to pass an already converted array, in which case this method * just returns the original array unmodified. * - * @param array $data - * * @return array */ protected function fixPhpFilesArray($data) diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php index 77b05a9000..4b58d1c372 100644 --- a/src/Symfony/Component/HttpFoundation/ParameterBag.php +++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php @@ -20,8 +20,6 @@ class ParameterBag implements \IteratorAggregate, \Countable { /** * Parameter storage. - * - * @var array */ protected $parameters; diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcherInterface.php b/src/Symfony/Component/HttpFoundation/RequestMatcherInterface.php index 066e7e8bf1..c26db3e6f4 100644 --- a/src/Symfony/Component/HttpFoundation/RequestMatcherInterface.php +++ b/src/Symfony/Component/HttpFoundation/RequestMatcherInterface.php @@ -21,8 +21,6 @@ interface RequestMatcherInterface /** * Decides whether the rule(s) implemented by the strategy matches the supplied request. * - * @param Request $request The request to check for a match - * * @return bool true if the request matches, false otherwise */ public function matches(Request $request); diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index 4c94ea2e36..a98a377235 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -258,8 +258,6 @@ class Response * compliant with RFC 2616. Most of the changes are based on * the Request that is "associated" with this Response. * - * @param Request $request A Request instance - * * @return $this */ public function prepare(Request $request) @@ -616,8 +614,6 @@ class Response /** * Sets the Date header. * - * @param \DateTime $date A \DateTime instance - * * @return $this */ public function setDate(\DateTime $date) @@ -992,8 +988,6 @@ class Response * If the Response is not modified, it sets the status code to 304 and * removes the actual content by calling the setNotModified() method. * - * @param Request $request A Request instance - * * @return bool true if the Response validators match the Request, false otherwise */ public function isNotModified(Request $request) diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php index 32e7187853..a042328ca5 100644 --- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php +++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php @@ -24,24 +24,10 @@ class ResponseHeaderBag extends HeaderBag const DISPOSITION_ATTACHMENT = 'attachment'; const DISPOSITION_INLINE = 'inline'; - /** - * @var array - */ protected $computedCacheControl = array(); - - /** - * @var array - */ protected $cookies = array(); - - /** - * @var array - */ protected $headerNames = array(); - /** - * @param array $headers An array of HTTP headers - */ public function __construct(array $headers = array()) { parent::__construct($headers); @@ -140,11 +126,6 @@ class ResponseHeaderBag extends HeaderBag return array_key_exists($key, $this->computedCacheControl) ? $this->computedCacheControl[$key] : null; } - /** - * Sets a cookie. - * - * @param Cookie $cookie - */ public function setCookie(Cookie $cookie) { $this->cookies[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie; diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php index 57c297197b..ea1fda290f 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php @@ -17,15 +17,8 @@ namespace Symfony\Component\HttpFoundation\Session\Attribute; class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Countable { private $name = 'attributes'; - - /** - * @var string - */ private $storageKey; - /** - * @var array - */ protected $attributes = array(); /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php index 8110aee0cf..59ba309005 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php @@ -19,19 +19,7 @@ namespace Symfony\Component\HttpFoundation\Session\Flash; class AutoExpireFlashBag implements FlashBagInterface { private $name = 'flashes'; - - /** - * Flash messages. - * - * @var array - */ private $flashes = array('display' => array(), 'new' => array()); - - /** - * The storage key for flashes in the session. - * - * @var string - */ private $storageKey; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php index a4159cd822..f533a755db 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php +++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php @@ -21,19 +21,7 @@ namespace Symfony\Component\HttpFoundation\Session\Flash; class FlashBag implements FlashBagInterface, \IteratorAggregate { private $name = 'flashes'; - - /** - * Flash messages. - * - * @var array - */ private $flashes = array(); - - /** - * The storage key for flashes in the session. - * - * @var string - */ private $storageKey; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php index 25f3d57b54..80e97f17cd 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php @@ -72,8 +72,6 @@ interface FlashBagInterface extends SessionBagInterface /** * Sets all flash messages. - * - * @param array $messages */ public function setAll(array $messages); diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php index aca18aacbf..8e37d06d65 100644 --- a/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php @@ -27,8 +27,6 @@ interface SessionBagInterface /** * Initializes the Bag. - * - * @param array $array */ public function initialize(array &$array); diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php index 172c9b457f..95fca857e2 100644 --- a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php @@ -159,8 +159,6 @@ interface SessionInterface /** * Registers a SessionBagInterface with the session. - * - * @param SessionBagInterface $bag */ public function registerBag(SessionBagInterface $bag); diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php index 0349a43367..027f4efffc 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php @@ -72,11 +72,6 @@ class MockArraySessionStorage implements SessionStorageInterface $this->setMetadataBag($metaBag); } - /** - * Sets the session data. - * - * @param array $array - */ public function setSessionData(array $array) { $this->data = $array; @@ -213,11 +208,6 @@ class MockArraySessionStorage implements SessionStorageInterface return $this->started; } - /** - * Sets the MetadataBag. - * - * @param MetadataBag $bag - */ public function setMetadataBag(MetadataBag $bag = null) { if (null === $bag) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php index 93c223436f..76654d26fd 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php @@ -296,11 +296,6 @@ class NativeSessionStorage implements SessionStorageInterface return $this->bags[$name]; } - /** - * Sets the MetadataBag. - * - * @param MetadataBag $metaBag - */ public function setMetadataBag(MetadataBag $metaBag = null) { if (null === $metaBag) { @@ -431,8 +426,6 @@ class NativeSessionStorage implements SessionStorageInterface * are set to (either PHP's internal, or a custom save handler set with session_set_save_handler()). * PHP takes the return value from the read() handler, unserializes it * and populates $_SESSION with the result automatically. - * - * @param array|null $session */ protected function loadSession(array &$session = null) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php index 097583d5a5..66e8b33dd2 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php @@ -127,8 +127,6 @@ interface SessionStorageInterface /** * Registers a SessionBagInterface for use. - * - * @param SessionBagInterface $bag */ public function registerBag(SessionBagInterface $bag); diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php index 8c148b58f0..655c26a9c2 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php @@ -21,10 +21,7 @@ use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag; */ class AttributeBagTest extends TestCase { - /** - * @var array - */ - private $array; + private $array = array(); /** * @var AttributeBag diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php index d9d9eb7fbe..f074ce1b26 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php @@ -21,10 +21,7 @@ use Symfony\Component\HttpFoundation\Session\Attribute\NamespacedAttributeBag; */ class NamespacedAttributeBagTest extends TestCase { - /** - * @var array - */ - private $array; + private $array = array(); /** * @var NamespacedAttributeBag diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php index 4eb200afa3..18b71a5021 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/AutoExpireFlashBagTest.php @@ -26,9 +26,6 @@ class AutoExpireFlashBagTest extends TestCase */ private $bag; - /** - * @var array - */ protected $array = array(); protected function setUp() diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php index 3de2246035..b44429d898 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php @@ -26,9 +26,6 @@ class FlashBagTest extends TestCase */ private $bag; - /** - * @var array - */ protected $array = array(); protected function setUp() diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php index 159e62114e..69cf6163c1 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetadataBagTest.php @@ -26,9 +26,6 @@ class MetadataBagTest extends TestCase */ protected $bag; - /** - * @var array - */ protected $array = array(); protected function setUp() diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php index 20f9ca060b..7eda5b3a3d 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php @@ -55,8 +55,6 @@ class NativeSessionStorageTest extends TestCase } /** - * @param array $options - * * @return NativeSessionStorage */ protected function getStorage(array $options = array()) diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php index 35594e706c..1782ab982d 100644 --- a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php +++ b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php @@ -51,8 +51,6 @@ abstract class Bundle extends ContainerAware implements BundleInterface * * This method can be overridden to register compilation passes, * other extensions, ... - * - * @param ContainerBuilder $container A ContainerBuilder instance */ public function build(ContainerBuilder $container) { @@ -157,8 +155,6 @@ abstract class Bundle extends ContainerAware implements BundleInterface * * * Commands are in the 'Command' sub-directory * * Commands extend Symfony\Component\Console\Command\Command - * - * @param Application $application An Application instance */ public function registerCommands(Application $application) { diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php index 25eea1d76d..ade098f4ce 100644 --- a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php +++ b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php @@ -36,8 +36,6 @@ interface BundleInterface extends ContainerAwareInterface * Builds the bundle. * * It is only ever called once when the cache is empty. - * - * @param ContainerBuilder $container A ContainerBuilder instance */ public function build(ContainerBuilder $container); diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php index c749c7c0a4..231653119f 100644 --- a/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php +++ b/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php @@ -18,9 +18,6 @@ namespace Symfony\Component\HttpKernel\CacheClearer; */ class ChainCacheClearer implements CacheClearerInterface { - /** - * @var array - */ protected $clearers; /** @@ -45,8 +42,6 @@ class ChainCacheClearer implements CacheClearerInterface /** * Adds a cache clearer to the aggregate. - * - * @param CacheClearerInterface $clearer */ public function add(CacheClearerInterface $clearer) { diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php index d89fb85dbb..05fb6e8de0 100644 --- a/src/Symfony/Component/HttpKernel/Client.php +++ b/src/Symfony/Component/HttpKernel/Client.php @@ -51,8 +51,6 @@ class Client extends BaseClient /** * Makes a request. * - * @param Request $request A Request instance - * * @return Response A Response instance */ protected function doRequest($request) @@ -69,8 +67,6 @@ class Client extends BaseClient /** * Returns the script to execute when the request must be insulated. * - * @param Request $request A Request instance - * * @return string */ protected function getScript($request) @@ -117,8 +113,6 @@ EOF; /** * Converts the BrowserKit request to a HttpKernel request. * - * @param DomRequest $request A DomRequest instance - * * @return Request A Request instance */ protected function filterRequest(DomRequest $request) @@ -143,8 +137,6 @@ EOF; * * @see UploadedFile * - * @param array $files An array of files - * * @return array An array with all uploaded files marked as already moved */ protected function filterFiles(array $files) @@ -182,8 +174,6 @@ EOF; /** * Converts the HttpKernel response to a BrowserKit response. * - * @param Response $response A Response instance - * * @return DomResponse A DomResponse instance */ protected function filterResponse($response) diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php index 5d288a4a11..8a3ea1b840 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php @@ -41,9 +41,6 @@ class ControllerResolver implements ControllerResolverInterface */ private $supportsScalarTypes; - /** - * @param LoggerInterface $logger A LoggerInterface instance - */ public function __construct(LoggerInterface $logger = null) { $this->logger = $logger; diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php index f7b19ed1bd..7adda4e420 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php +++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php @@ -34,8 +34,6 @@ interface ControllerResolverInterface * The resolver must only throw an exception when it should be able to load * controller but cannot because of some errors made by the developer. * - * @param Request $request A Request instance - * * @return callable|false A PHP callable representing the Controller, * or false if this resolver is not able to determine the controller * diff --git a/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php index 2d3d03b231..2f27fe5c70 100644 --- a/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php @@ -22,10 +22,6 @@ class TraceableControllerResolver implements ControllerResolverInterface private $resolver; private $stopwatch; - /** - * @param ControllerResolverInterface $resolver A ControllerResolverInterface instance - * @param Stopwatch $stopwatch A Stopwatch instance - */ public function __construct(ControllerResolverInterface $resolver, Stopwatch $stopwatch) { $this->resolver = $resolver; diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php index d17e32687a..c1c085cbed 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php @@ -41,8 +41,6 @@ class ConfigDataCollector extends DataCollector /** * Sets the Kernel associated with this Request. - * - * @param KernelInterface $kernel A KernelInterface instance */ public function setKernel(KernelInterface $kernel = null) { diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php index 2820ad5b28..963732ba6a 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php @@ -23,10 +23,6 @@ interface DataCollectorInterface { /** * Collects data for the given Request and Response. - * - * @param Request $request A Request instance - * @param Response $response A Response instance - * @param \Exception $exception An Exception instance */ public function collect(Request $request, Response $response, \Exception $exception = null); diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php index 76d9623461..b0a1417b6f 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php @@ -60,8 +60,6 @@ class RouterDataCollector extends DataCollector /** * Remembers the controller associated to each request. - * - * @param FilterControllerEvent $event The filter controller event */ public function onKernelController(FilterControllerEvent $event) { diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php index c7eca3063c..072c35f1c1 100644 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php @@ -37,9 +37,6 @@ abstract class ConfigurableExtension extends Extension /** * Configures the passed container according to the merged configuration. - * - * @param array $mergedConfig - * @param ContainerBuilder $container */ abstract protected function loadInternal(array $mergedConfig, ContainerBuilder $container); } diff --git a/src/Symfony/Component/HttpKernel/Event/FilterResponseEvent.php b/src/Symfony/Component/HttpKernel/Event/FilterResponseEvent.php index ed816a9d32..53a7efce76 100644 --- a/src/Symfony/Component/HttpKernel/Event/FilterResponseEvent.php +++ b/src/Symfony/Component/HttpKernel/Event/FilterResponseEvent.php @@ -26,11 +26,6 @@ use Symfony\Component\HttpFoundation\Response; */ class FilterResponseEvent extends KernelEvent { - /** - * The current response object. - * - * @var Response - */ private $response; public function __construct(HttpKernelInterface $kernel, Request $request, $requestType, Response $response) @@ -52,8 +47,6 @@ class FilterResponseEvent extends KernelEvent /** * Sets a new response object. - * - * @param Response $response */ public function setResponse(Response $response) { diff --git a/src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php b/src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php index 4c96a4b7d9..f7745ea3dc 100644 --- a/src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php +++ b/src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php @@ -24,11 +24,6 @@ use Symfony\Component\HttpFoundation\Response; */ class GetResponseEvent extends KernelEvent { - /** - * The response object. - * - * @var Response - */ private $response; /** @@ -43,8 +38,6 @@ class GetResponseEvent extends KernelEvent /** * Sets a response and stops event propagation. - * - * @param Response $response */ public function setResponse(Response $response) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php b/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php index 280844c183..ecf6f59190 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php @@ -22,14 +22,8 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent; */ class AddRequestFormatsListener implements EventSubscriberInterface { - /** - * @var array - */ protected $formats; - /** - * @param array $formats - */ public function __construct(array $formats) { $this->formats = $formats; @@ -37,8 +31,6 @@ class AddRequestFormatsListener implements EventSubscriberInterface /** * Adds request formats. - * - * @param GetResponseEvent $event */ public function onKernelRequest(GetResponseEvent $event) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php index 2f523a54db..6ce295b0fd 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php @@ -57,8 +57,6 @@ class DebugHandlersListener implements EventSubscriberInterface /** * Configures the error handler. - * - * @param Event|null $event The triggering event */ public function configure(Event $event = null) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php index 06b8a030cf..783ae2581d 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php @@ -27,10 +27,6 @@ class DumpListener implements EventSubscriberInterface private $cloner; private $dumper; - /** - * @param ClonerInterface $cloner Cloner service - * @param DataDumperInterface $dumper Dumper service - */ public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper) { $this->cloner = $cloner; diff --git a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php index c68bd69fc5..aea2eb1651 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php @@ -47,8 +47,6 @@ class FragmentListener implements EventSubscriberInterface /** * Fixes request attributes when the path is '/_fragment'. * - * @param GetResponseEvent $event A GetResponseEvent instance - * * @throws AccessDeniedHttpException if the request does not come from a trusted IP */ public function onKernelRequest(GetResponseEvent $event) diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php index d4c515e293..66df1295fc 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php @@ -65,8 +65,6 @@ class ProfilerListener implements EventSubscriberInterface /** * Handles the onKernelException event. - * - * @param GetResponseForExceptionEvent $event A GetResponseForExceptionEvent instance */ public function onKernelException(GetResponseForExceptionEvent $event) { @@ -89,8 +87,6 @@ class ProfilerListener implements EventSubscriberInterface /** * Handles the onKernelResponse event. - * - * @param FilterResponseEvent $event A FilterResponseEvent instance */ public function onKernelResponse(FilterResponseEvent $event) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php index eeb2b0fcb2..6d56197a73 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php @@ -31,8 +31,6 @@ class ResponseListener implements EventSubscriberInterface /** * Filters the Response. - * - * @param FilterResponseEvent $event A FilterResponseEvent instance */ public function onKernelResponse(FilterResponseEvent $event) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php b/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php index 571cd74e34..671db5d827 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php @@ -26,8 +26,6 @@ class StreamedResponseListener implements EventSubscriberInterface { /** * Filters the Response. - * - * @param FilterResponseEvent $event A FilterResponseEvent instance */ public function onKernelResponse(FilterResponseEvent $event) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php index b68019a627..2f4e8449fb 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php @@ -25,9 +25,6 @@ class SurrogateListener implements EventSubscriberInterface { private $surrogate; - /** - * @param SurrogateInterface $surrogate An SurrogateInterface instance - */ public function __construct(SurrogateInterface $surrogate = null) { $this->surrogate = $surrogate; @@ -35,8 +32,6 @@ class SurrogateListener implements EventSubscriberInterface /** * Filters the Response. - * - * @param FilterResponseEvent $event A FilterResponseEvent instance */ public function onKernelResponse(FilterResponseEvent $event) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php index 19a61f169b..445caacd8a 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php @@ -50,8 +50,6 @@ abstract class TestSessionListener implements EventSubscriberInterface /** * Checks if session was initialized and saves if current request is master * Runs on 'kernel.response' in test environment. - * - * @param FilterResponseEvent $event */ public function onKernelResponse(FilterResponseEvent $event) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php b/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php index 00096ccf9e..cbeee3f5e5 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php @@ -25,8 +25,6 @@ class ValidateRequestListener implements EventSubscriberInterface { /** * Performs the validation. - * - * @param GetResponseEvent $event */ public function onKernelRequest(GetResponseEvent $event) { diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php index 108ebd5388..1e29d04a53 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php +++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php @@ -57,8 +57,6 @@ class FragmentHandler /** * Adds a renderer. - * - * @param FragmentRendererInterface $renderer A FragmentRendererInterface instance */ public function addRenderer(FragmentRendererInterface $renderer) { @@ -122,8 +120,6 @@ class FragmentHandler * When the Response is a StreamedResponse, the content is streamed immediately * instead of being returned. * - * @param Response $response A Response instance - * * @return string|null The Response content or null when the Response is streamed * * @throws \RuntimeException when the Response is not successful diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php index 8170ceeb91..17ed967fb5 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php @@ -29,10 +29,6 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer private $kernel; private $dispatcher; - /** - * @param HttpKernelInterface $kernel A HttpKernelInterface instance - * @param EventDispatcherInterface $dispatcher A EventDispatcherInterface instance - */ public function __construct(HttpKernelInterface $kernel, EventDispatcherInterface $dispatcher = null) { $this->kernel = $kernel; diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php index 9b17b4fc54..716b904630 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php @@ -61,8 +61,6 @@ class Esi implements SurrogateInterface /** * Checks that at least one surrogate has ESI/1.0 capability. * - * @param Request $request A Request instance - * * @return bool true if one surrogate has ESI/1.0 capability, false otherwise */ public function hasSurrogateCapability(Request $request) @@ -92,8 +90,6 @@ class Esi implements SurrogateInterface /** * Adds ESI/1.0 capability to the given Request. - * - * @param Request $request A Request instance */ public function addSurrogateCapability(Request $request) { @@ -121,8 +117,6 @@ class Esi implements SurrogateInterface * Adds HTTP headers to specify that the Response needs to be parsed for ESI. * * This method only adds an ESI HTTP header if the Response has some ESI tags. - * - * @param Response $response A Response instance */ public function addSurrogateControl(Response $response) { @@ -134,8 +128,6 @@ class Esi implements SurrogateInterface /** * Checks that the Response needs to be parsed for ESI tags. * - * @param Response $response A Response instance - * * @return bool true if the Response needs to be parsed, false otherwise */ public function needsParsing(Response $response) @@ -191,9 +183,6 @@ class Esi implements SurrogateInterface /** * Replaces a Response ESI tags with the included resource content. * - * @param Request $request A Request instance - * @param Response $response A Response instance - * * @return Response */ public function process(Request $request, Response $response) diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index 32cf95480e..7ca29d238a 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -516,9 +516,6 @@ class HttpCache implements HttpKernelInterface, TerminableInterface /** * Checks whether the cache entry is "fresh enough" to satisfy the Request. * - * @param Request $request A Request instance - * @param Response $entry A Response instance - * * @return bool true if the cache entry if fresh enough, false otherwise */ protected function isFreshEnough(Request $request, Response $entry) @@ -537,9 +534,6 @@ class HttpCache implements HttpKernelInterface, TerminableInterface /** * Locks a Request during the call to the backend. * - * @param Request $request A Request instance - * @param Response $entry A Response instance - * * @return bool true if the cache entry can be returned even if it is staled, false otherwise */ protected function lock(Request $request, Response $entry) @@ -595,9 +589,6 @@ class HttpCache implements HttpKernelInterface, TerminableInterface /** * Writes the Response to the cache. * - * @param Request $request A Request instance - * @param Response $response A Response instance - * * @throws \Exception */ protected function store(Request $request, Response $response) @@ -625,9 +616,6 @@ class HttpCache implements HttpKernelInterface, TerminableInterface /** * Restores the Response body. - * - * @param Request $request A Request instance - * @param Response $response A Response instance */ private function restoreResponseBody(Request $request, Response $response) { @@ -669,8 +657,6 @@ class HttpCache implements HttpKernelInterface, TerminableInterface * Checks if the Request includes authorization or other sensitive information * that should cause the Response to be considered private by default. * - * @param Request $request A Request instance - * * @return bool true if the Request is private, false otherwise */ private function isPrivateRequest(Request $request) diff --git a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php index d70c2e06ec..e282299aee 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php @@ -27,15 +27,11 @@ interface ResponseCacheStrategyInterface { /** * Adds a Response. - * - * @param Response $response */ public function add(Response $response); /** * Updates the Response HTTP headers based on the embedded Responses. - * - * @param Response $response */ public function update(Response $response); } diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php index 83c3a9ae13..8eeb93192c 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php @@ -60,8 +60,6 @@ class Store implements StoreInterface /** * Tries to lock the cache for a given Request, without blocking. * - * @param Request $request A Request instance - * * @return bool|string true if the lock is acquired, the path to the current lock otherwise */ public function lock(Request $request) @@ -89,8 +87,6 @@ class Store implements StoreInterface /** * Releases the lock for the given Request. * - * @param Request $request A Request instance - * * @return bool False if the lock file does not exist or cannot be unlocked, true otherwise */ public function unlock(Request $request) @@ -131,8 +127,6 @@ class Store implements StoreInterface /** * Locates a cached Response for the Request provided. * - * @param Request $request A Request instance - * * @return Response|null A Response instance, or null if no cache entry was found */ public function lookup(Request $request) @@ -173,9 +167,6 @@ class Store implements StoreInterface * Existing entries are read and any that match the response are removed. This * method calls write with the new list of cache entries. * - * @param Request $request A Request instance - * @param Response $response A Response instance - * * @return string The key under which the response is stored * * @throws \RuntimeException @@ -228,8 +219,6 @@ class Store implements StoreInterface /** * Returns content digest for $response. * - * @param Response $response - * * @return string */ protected function generateContentDigest(Response $response) @@ -240,8 +229,6 @@ class Store implements StoreInterface /** * Invalidates all cache entries that match the request. * - * @param Request $request A Request instance - * * @throws \RuntimeException */ public function invalidate(Request $request) @@ -432,8 +419,6 @@ class Store implements StoreInterface * headers, use a Vary header to indicate them, and each representation will * be stored independently under the same cache key. * - * @param Request $request A Request instance - * * @return string A key for the given Request */ protected function generateCacheKey(Request $request) @@ -444,8 +429,6 @@ class Store implements StoreInterface /** * Returns a cache key for the given Request. * - * @param Request $request A Request instance - * * @return string A key for the given Request */ private function getCacheKey(Request $request) @@ -460,8 +443,6 @@ class Store implements StoreInterface /** * Persists the Request HTTP headers. * - * @param Request $request A Request instance - * * @return array An array of HTTP headers */ private function persistRequest(Request $request) @@ -472,8 +453,6 @@ class Store implements StoreInterface /** * Persists the Response HTTP headers. * - * @param Response $response A Response instance - * * @return array An array of HTTP headers */ private function persistResponse(Response $response) diff --git a/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php index ddc0c04ee3..8f1cf4409e 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php @@ -27,8 +27,6 @@ interface StoreInterface /** * Locates a cached Response for the Request provided. * - * @param Request $request A Request instance - * * @return Response|null A Response instance, or null if no cache entry was found */ public function lookup(Request $request); @@ -39,25 +37,18 @@ interface StoreInterface * Existing entries are read and any that match the response are removed. This * method calls write with the new list of cache entries. * - * @param Request $request A Request instance - * @param Response $response A Response instance - * * @return string The key under which the response is stored */ public function write(Request $request, Response $response); /** * Invalidates all cache entries that match the request. - * - * @param Request $request A Request instance */ public function invalidate(Request $request); /** * Locks the cache for a given Request. * - * @param Request $request A Request instance - * * @return bool|string true if the lock is acquired, the path to the current lock otherwise */ public function lock(Request $request); @@ -65,8 +56,6 @@ interface StoreInterface /** * Releases the lock for the given Request. * - * @param Request $request A Request instance - * * @return bool False if the lock file does not exist or cannot be unlocked, true otherwise */ public function unlock(Request $request); @@ -74,8 +63,6 @@ interface StoreInterface /** * Returns whether or not a lock exists. * - * @param Request $request A Request instance - * * @return bool true if lock exists, false otherwise */ public function isLocked(Request $request); diff --git a/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php index 5d65fd65a4..85391f8f36 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php @@ -33,16 +33,12 @@ interface SurrogateInterface /** * Checks that at least one surrogate has Surrogate capability. * - * @param Request $request A Request instance - * * @return bool true if one surrogate has Surrogate capability, false otherwise */ public function hasSurrogateCapability(Request $request); /** * Adds Surrogate-capability to the given Request. - * - * @param Request $request A Request instance */ public function addSurrogateCapability(Request $request); @@ -50,16 +46,12 @@ interface SurrogateInterface * Adds HTTP headers to specify that the Response needs to be parsed for Surrogate. * * This method only adds an Surrogate HTTP header if the Response has some Surrogate tags. - * - * @param Response $response A Response instance */ public function addSurrogateControl(Response $response); /** * Checks that the Response needs to be parsed for Surrogate tags. * - * @param Response $response A Response instance - * * @return bool true if the Response needs to be parsed, false otherwise */ public function needsParsing(Response $response); @@ -79,9 +71,6 @@ interface SurrogateInterface /** * Replaces a Response Surrogate tags with the included resource content. * - * @param Request $request A Request instance - * @param Response $response A Response instance - * * @return Response */ public function process(Request $request, Response $response); diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php index cb32e597bd..f1114bf632 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpKernel.php @@ -39,11 +39,6 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface protected $resolver; protected $requestStack; - /** - * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance - * @param ControllerResolverInterface $resolver A ControllerResolverInterface instance - * @param RequestStack $requestStack A stack for master/sub requests - */ public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null) { $this->dispatcher = $dispatcher; diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 404fbaaacb..edea2a9c07 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -614,8 +614,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface /** * Prepares the ContainerBuilder before it is compiled. - * - * @param ContainerBuilder $container A ContainerBuilder instance */ protected function prepareContainer(ContainerBuilder $container) { @@ -679,8 +677,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface /** * Returns a loader for the container. * - * @param ContainerInterface $container The service container - * * @return DelegatingLoader The loader */ protected function getContainerLoader(ContainerInterface $container) diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php index 37ac3af515..3e2ffe2fb3 100644 --- a/src/Symfony/Component/HttpKernel/KernelInterface.php +++ b/src/Symfony/Component/HttpKernel/KernelInterface.php @@ -33,8 +33,6 @@ interface KernelInterface extends HttpKernelInterface, \Serializable /** * Loads the container configuration. - * - * @param LoaderInterface $loader A LoaderInterface instance */ public function registerContainerConfiguration(LoaderInterface $loader); diff --git a/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php index 3a4fa7b79a..045d55a7ae 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php @@ -114,8 +114,6 @@ class MongoDbProfilerStorage implements ProfilerStorageInterface } /** - * @param array $data - * * @return Profile */ protected function createProfileFromData(array $data) @@ -197,8 +195,6 @@ class MongoDbProfilerStorage implements ProfilerStorageInterface } /** - * @param array $data - * * @return array */ private function getData(array $data) @@ -216,8 +212,6 @@ class MongoDbProfilerStorage implements ProfilerStorageInterface } /** - * @param array $data - * * @return Profile */ private function getProfile(array $data) diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profile.php b/src/Symfony/Component/HttpKernel/Profiler/Profile.php index ad42652d5d..024ca28ac9 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profile.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profile.php @@ -73,8 +73,6 @@ class Profile /** * Sets the parent token. - * - * @param Profile $parent */ public function setParent(Profile $parent) { @@ -214,8 +212,6 @@ class Profile /** * Adds the child token. - * - * @param Profile $child */ public function addChild(Profile $child) { @@ -266,8 +262,6 @@ class Profile /** * Adds a Collector. - * - * @param DataCollectorInterface $collector A DataCollectorInterface instance */ public function addCollector(DataCollectorInterface $collector) { diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php index 2ff0beaf62..92c447bab9 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php @@ -25,9 +25,6 @@ use Psr\Log\LoggerInterface; */ class Profiler { - /** - * @var ProfilerStorageInterface - */ private $storage; /** @@ -35,9 +32,6 @@ class Profiler */ private $collectors = array(); - /** - * @var LoggerInterface - */ private $logger; /** @@ -45,10 +39,6 @@ class Profiler */ private $enabled = true; - /** - * @param ProfilerStorageInterface $storage A ProfilerStorageInterface instance - * @param LoggerInterface $logger A LoggerInterface instance - */ public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = null) { $this->storage = $storage; @@ -74,8 +64,6 @@ class Profiler /** * Loads the Profile for the given Response. * - * @param Response $response A Response instance - * * @return Profile|false A Profile instance */ public function loadProfileFromResponse(Response $response) @@ -102,8 +90,6 @@ class Profiler /** * Saves a Profile. * - * @param Profile $profile A Profile instance - * * @return bool */ public function saveProfile(Profile $profile) @@ -133,8 +119,6 @@ class Profiler /** * Exports the current profiler data. * - * @param Profile $profile A Profile instance - * * @return string The exported data */ public function export(Profile $profile) @@ -184,10 +168,6 @@ class Profiler /** * Collects data for the given Response. * - * @param Request $request A Request instance - * @param Response $response A Response instance - * @param \Exception $exception An exception instance if the request threw one - * * @return Profile|null A Profile instance or null if the profiler is disabled */ public function collect(Request $request, Response $response, \Exception $exception = null) @@ -244,8 +224,6 @@ class Profiler /** * Adds a Collector. - * - * @param DataCollectorInterface $collector A DataCollectorInterface instance */ public function add(DataCollectorInterface $collector) { diff --git a/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php b/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php index ea72af2314..544fb1fef6 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php +++ b/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php @@ -46,8 +46,6 @@ interface ProfilerStorageInterface /** * Saves a Profile. * - * @param Profile $profile A Profile instance - * * @return bool Write operation successful */ public function write(Profile $profile); diff --git a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php index 7b9bfd4cfd..e9e90d4006 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php @@ -381,8 +381,6 @@ class RedisProfilerStorage implements ProfilerStorageInterface /** * Removes the specified keys. * - * @param array $keys - * * @return bool */ private function delete(array $keys) diff --git a/src/Symfony/Component/HttpKernel/TerminableInterface.php b/src/Symfony/Component/HttpKernel/TerminableInterface.php index d55a15b87e..8aa3319793 100644 --- a/src/Symfony/Component/HttpKernel/TerminableInterface.php +++ b/src/Symfony/Component/HttpKernel/TerminableInterface.php @@ -27,9 +27,6 @@ interface TerminableInterface * Terminates a request/response cycle. * * Should be called after sending the response and before shutting down the kernel. - * - * @param Request $request A Request instance - * @param Response $response A Response instance */ public function terminate(Request $request, Response $response); } diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php index 3cf969bab8..aedcac9185 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php @@ -28,22 +28,15 @@ use Symfony\Component\Intl\Data\Util\RecursiveArrayAccess; */ class BundleEntryReader implements BundleEntryReaderInterface { - /** - * @var BundleReaderInterface - */ private $reader; /** * A mapping of locale aliases to locales. - * - * @var array */ private $localeAliases = array(); /** * Creates an entry reader based on the given resource bundle reader. - * - * @param BundleReaderInterface $reader A resource bundle reader to use */ public function __construct(BundleReaderInterface $reader) { diff --git a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php index 19cf6eab00..cd9da7c13c 100644 --- a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php @@ -53,8 +53,6 @@ class CurrencyDataGenerator extends AbstractDataGenerator /** * Monetary units excluded from generation. - * - * @var array */ private static $blacklist = array( self::UNKNOWN_CURRENCY_ID => true, @@ -162,8 +160,6 @@ class CurrencyDataGenerator extends AbstractDataGenerator } /** - * @param ArrayAccessibleResourceBundle $rootBundle - * * @return array */ private function generateSymbolNamePairs(ArrayAccessibleResourceBundle $rootBundle) diff --git a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php index 5998759423..77bcb00c85 100644 --- a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php @@ -28,8 +28,6 @@ class LanguageDataGenerator extends AbstractDataGenerator { /** * Source: http://www-01.sil.org/iso639-3/codes.asp. - * - * @var array */ private static $preferredAlpha2ToAlpha3Mapping = array( 'ak' => 'aka', diff --git a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php index 28c90a5ed9..9c9006d7ba 100644 --- a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php @@ -43,8 +43,6 @@ class RegionDataGenerator extends AbstractDataGenerator /** * Regions excluded from generation. - * - * @var array */ private static $blacklist = array( self::UNKNOWN_REGION_ID => true, @@ -135,8 +133,6 @@ class RegionDataGenerator extends AbstractDataGenerator } /** - * @param ArrayAccessibleResourceBundle $localeBundle - * * @return array */ protected function generateRegionNames(ArrayAccessibleResourceBundle $localeBundle) diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php index 35373bb6c3..b931cd756a 100644 --- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php +++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php @@ -253,8 +253,6 @@ class FullTransformer * Normalize a preg_replace match array, removing the numeric keys and returning an associative array * with the value and pattern values for the matched Transformer. * - * @param array $data - * * @return array */ protected function normalizeArray(array $data) @@ -332,8 +330,6 @@ class FullTransformer * Add sensible default values for missing items in the extracted date/time options array. The values * are base in the beginning of the Unix era. * - * @param array $options - * * @return array */ private function getDefaultValueForOptions(array $options) diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php index 3cb7fd162e..0740be905f 100644 --- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php +++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php @@ -18,9 +18,6 @@ namespace Symfony\Component\Intl\DateFormatter\DateFormat; */ class MonthTransformer extends Transformer { - /** - * @var array - */ protected static $months = array( 'January', 'February', @@ -38,22 +35,16 @@ class MonthTransformer extends Transformer /** * Short months names (first 3 letters). - * - * @var array */ protected static $shortMonths = array(); /** * Flipped $months array, $name => $index. - * - * @var array */ protected static $flippedMonths = array(); /** * Flipped $shortMonths array, $name => $index. - * - * @var array */ protected static $flippedShortMonths = array(); diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php index fe58f4904c..c4a69bb9a4 100644 --- a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php +++ b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php @@ -73,8 +73,6 @@ class IntlDateFormatter /** * Patterns used to format the date when no pattern is provided. - * - * @var array */ private $defaultDateFormats = array( self::NONE => '', @@ -86,8 +84,6 @@ class IntlDateFormatter /** * Patterns used to format the time when no pattern is provided. - * - * @var array */ private $defaultTimeFormats = array( self::FULL => 'h:mm:ss a zzzz', diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php index 1a2c35ffb7..88af2e775b 100644 --- a/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php +++ b/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php @@ -215,8 +215,6 @@ class IntlDateFormatterTest extends AbstractIntlDateFormatterTest * + 10 seconds) are added, then we have 86,400 seconds (24h * 60min * 60s) * + 10 seconds * - * @param array $dataSets - * * @return array */ private function notImplemented(array $dataSets) diff --git a/src/Symfony/Component/Locale/Locale.php b/src/Symfony/Component/Locale/Locale.php index ebf33f6bdb..06dc05ae4d 100644 --- a/src/Symfony/Component/Locale/Locale.php +++ b/src/Symfony/Component/Locale/Locale.php @@ -27,22 +27,16 @@ class Locale extends \Locale { /** * Caches the countries in different locales. - * - * @var array */ protected static $countries = array(); /** * Caches the languages in different locales. - * - * @var array */ protected static $languages = array(); /** * Caches the different locales. - * - * @var array */ protected static $locales = array(); diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php index d8e689622a..d042a5b13a 100644 --- a/src/Symfony/Component/Process/ExecutableFinder.php +++ b/src/Symfony/Component/Process/ExecutableFinder.php @@ -23,8 +23,6 @@ class ExecutableFinder /** * Replaces default suffixes of executable. - * - * @param array $suffixes */ public function setSuffixes(array $suffixes) { diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index 72b055d818..720e746b85 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -80,8 +80,6 @@ class Process * Exit codes translation table. * * User-defined errors must use exit codes in the 64-113 range. - * - * @var array */ public static $exitCodes = array( 0 => 'OK', diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index 03dc617782..101754b06b 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -96,25 +96,11 @@ class PropertyAccessor implements PropertyAccessorInterface */ const ACCESS_TYPE_NOT_FOUND = 4; - /** - * @var bool - */ private $magicCall; - - /** - * @var bool - */ private $ignoreInvalidIndices; - - /** - * @var array - */ private $readPropertyCache = array(); - - /** - * @var array - */ private $writePropertyCache = array(); + private static $previousErrorHandler = false; private static $errorHandler = array(__CLASS__, 'handleError'); private static $resultProto = array(self::VALUE => null); diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php index 9d1e087071..de80751ce2 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php @@ -18,14 +18,7 @@ use Symfony\Component\PropertyAccess\Exception\OutOfBoundsException; */ class PropertyPathBuilder { - /** - * @var array - */ private $elements = array(); - - /** - * @var array - */ private $isIndex = array(); /** diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathIterator.php b/src/Symfony/Component/PropertyAccess/PropertyPathIterator.php index 7ea0fa2455..02fa26e1fc 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPathIterator.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPathIterator.php @@ -19,11 +19,6 @@ namespace Symfony\Component\PropertyAccess; */ class PropertyPathIterator extends \ArrayIterator implements PropertyPathIteratorInterface { - /** - * The traversed property path. - * - * @var PropertyPathInterface - */ protected $path; /** diff --git a/src/Symfony/Component/PropertyAccess/StringUtil.php b/src/Symfony/Component/PropertyAccess/StringUtil.php index d4df676ec0..1918763db6 100644 --- a/src/Symfony/Component/PropertyAccess/StringUtil.php +++ b/src/Symfony/Component/PropertyAccess/StringUtil.php @@ -21,8 +21,6 @@ class StringUtil /** * Map english plural to singular suffixes. * - * @var array - * * @see http://english-zone.com/spelling/plurals.html */ private static $pluralMap = array( diff --git a/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php b/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php index f684c74916..712412fece 100644 --- a/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php +++ b/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php @@ -20,9 +20,6 @@ namespace Symfony\Component\Routing\Exception; */ class MethodNotAllowedException extends \RuntimeException implements ExceptionInterface { - /** - * @var array - */ protected $allowedMethods = array(); public function __construct(array $allowedMethods, $message = null, $code = 0, \Exception $previous = null) diff --git a/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php b/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php index 4a7051b5ae..659c5ba1c8 100644 --- a/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php +++ b/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php @@ -20,14 +20,8 @@ use Symfony\Component\Routing\RouteCollection; */ abstract class GeneratorDumper implements GeneratorDumperInterface { - /** - * @var RouteCollection - */ private $routes; - /** - * @param RouteCollection $routes The RouteCollection to dump - */ public function __construct(RouteCollection $routes) { $this->routes = $routes; diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php index 11e068fec1..ce62106465 100644 --- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php +++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php @@ -27,14 +27,7 @@ use Psr\Log\LoggerInterface; */ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInterface { - /** - * @var RouteCollection - */ protected $routes; - - /** - * @var RequestContext - */ protected $context; /** @@ -42,9 +35,6 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt */ protected $strictRequirements = true; - /** - * @var LoggerInterface|null - */ protected $logger; /** @@ -75,11 +65,6 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt '%7C' => '|', ); - /** - * @param RouteCollection $routes A RouteCollection instance - * @param RequestContext $context The context - * @param LoggerInterface|null $logger A logger instance - */ public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null) { $this->routes = $routes; diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php index 8d6e1c19ba..d84b1405e4 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php @@ -57,9 +57,6 @@ use Symfony\Component\Config\Loader\LoaderResolverInterface; */ abstract class AnnotationClassLoader implements LoaderInterface { - /** - * @var Reader - */ protected $reader; /** @@ -72,9 +69,6 @@ abstract class AnnotationClassLoader implements LoaderInterface */ protected $defaultRouteIndex = 0; - /** - * @param Reader $reader - */ public function __construct(Reader $reader) { $this->reader = $reader; diff --git a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php index 376ad3c585..9c5ab1b6ae 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationFileLoader.php @@ -27,9 +27,6 @@ class AnnotationFileLoader extends FileLoader protected $loader; /** - * @param FileLocatorInterface $locator A FileLocator instance - * @param AnnotationClassLoader $loader An AnnotationClassLoader instance - * * @throws \RuntimeException */ public function __construct(FileLocatorInterface $locator, AnnotationClassLoader $loader) diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php index 1eb51852a0..9b66014d6c 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php @@ -35,8 +35,6 @@ class ApacheMatcherDumper extends MatcherDumper * * script_name: The script name (app.php by default) * * base_uri: The base URI ("" by default) * - * @param array $options An array of options - * * @return string A string to be used as Apache rewrite rules * * @throws \LogicException When the route regex is invalid @@ -191,8 +189,6 @@ class ApacheMatcherDumper extends MatcherDumper /** * Returns methods allowed for a route. * - * @param Route $route The route - * * @return array The methods */ private function getRouteMethods(Route $route) @@ -256,8 +252,6 @@ class ApacheMatcherDumper extends MatcherDumper /** * Normalizes an array of values. * - * @param array $values - * * @return string[] */ private function normalizeValues(array $values) diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php index 2bfdb2e882..aa256fc9a9 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php @@ -105,8 +105,6 @@ class DumperCollection implements \IteratorAggregate /** * Sets the parent collection. - * - * @param DumperCollection $parent The parent collection */ protected function setParent(DumperCollection $parent) { diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php index 5ea622c7d4..19800fb331 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php @@ -48,8 +48,6 @@ class DumperPrefixCollection extends DumperCollection /** * Adds a route in the tree. * - * @param DumperRoute $route The route - * * @return self * * @throws \LogicException diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php index 70c23f647d..ea51ab4063 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php @@ -20,14 +20,8 @@ use Symfony\Component\Routing\RouteCollection; */ abstract class MatcherDumper implements MatcherDumperInterface { - /** - * @var RouteCollection - */ private $routes; - /** - * @param RouteCollection $routes The RouteCollection to dump - */ public function __construct(RouteCollection $routes) { $this->routes = $routes; diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php index 2855371b84..48187c0e3f 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php @@ -372,8 +372,6 @@ EOF; * Routes order is preserved such that traversing the tree will traverse the * routes in the origin order. * - * @param DumperCollection $collection A collection of routes - * * @return DumperPrefixCollection */ private function buildPrefixTree(DumperCollection $collection) diff --git a/src/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php b/src/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php index b5def3d468..a1925c0a4b 100644 --- a/src/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php +++ b/src/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php @@ -28,8 +28,6 @@ interface RequestMatcherInterface * If the matcher can not find information, it must throw one of the exceptions documented * below. * - * @param Request $request The request to match - * * @return array An array of parameters * * @throws ResourceNotFoundException If no matching resource could be found diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php index 62bb74a8d6..1ef92827dc 100644 --- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php @@ -31,21 +31,9 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface const REQUIREMENT_MISMATCH = 1; const ROUTE_MATCH = 2; - /** - * @var RequestContext - */ protected $context; - - /** - * @var array - */ protected $allow = array(); - - /** - * @var RouteCollection - */ protected $routes; - protected $request; protected $expressionLanguage; @@ -54,10 +42,6 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface */ protected $expressionLanguageProviders = array(); - /** - * @param RouteCollection $routes A RouteCollection instance - * @param RequestContext $context The context - */ public function __construct(RouteCollection $routes, RequestContext $context) { $this->routes = $routes; diff --git a/src/Symfony/Component/Routing/RequestContext.php b/src/Symfony/Component/Routing/RequestContext.php index d522189cb0..d62a7766ef 100644 --- a/src/Symfony/Component/Routing/RequestContext.php +++ b/src/Symfony/Component/Routing/RequestContext.php @@ -31,10 +31,6 @@ class RequestContext private $httpPort; private $httpsPort; private $queryString; - - /** - * @var array - */ private $parameters = array(); /** @@ -62,8 +58,6 @@ class RequestContext /** * Updates the RequestContext information based on a HttpFoundation Request. * - * @param Request $request A Request instance - * * @return $this */ public function fromRequest(Request $request) diff --git a/src/Symfony/Component/Routing/RequestContextAwareInterface.php b/src/Symfony/Component/Routing/RequestContextAwareInterface.php index ebb0ef46ed..df5b9fcd47 100644 --- a/src/Symfony/Component/Routing/RequestContextAwareInterface.php +++ b/src/Symfony/Component/Routing/RequestContextAwareInterface.php @@ -15,8 +15,6 @@ interface RequestContextAwareInterface { /** * Sets the request context. - * - * @param RequestContext $context The context */ public function setContext(RequestContext $context); diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php index cc0db84a70..57a1c29faf 100644 --- a/src/Symfony/Component/Routing/Route.php +++ b/src/Symfony/Component/Routing/Route.php @@ -19,51 +19,20 @@ namespace Symfony\Component\Routing; */ class Route implements \Serializable { - /** - * @var string - */ private $path = '/'; - - /** - * @var string - */ private $host = ''; - - /** - * @var string[] - */ private $schemes = array(); - - /** - * @var string[] - */ private $methods = array(); - - /** - * @var array - */ private $defaults = array(); - - /** - * @var array - */ private $requirements = array(); - - /** - * @var array - */ private $options = array(); + private $condition = ''; /** * @var null|CompiledRoute */ private $compiled; - /** - * @var string - */ - private $condition = ''; - /** * Available options: * diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php index f8b18084be..3ae7b4147d 100644 --- a/src/Symfony/Component/Routing/RouteCollection.php +++ b/src/Symfony/Component/Routing/RouteCollection.php @@ -116,8 +116,6 @@ class RouteCollection implements \IteratorAggregate, \Countable /** * Adds a route collection at the end of the current set by appending all * routes of the added collection. - * - * @param RouteCollection $collection A RouteCollection instance */ public function addCollection(RouteCollection $collection) { @@ -267,8 +265,6 @@ class RouteCollection implements \IteratorAggregate, \Countable /** * Adds a resource for this collection. - * - * @param ResourceInterface $resource A resource instance */ public function addResource(ResourceInterface $resource) { diff --git a/src/Symfony/Component/Routing/RouteCompilerInterface.php b/src/Symfony/Component/Routing/RouteCompilerInterface.php index e6f8ee6dea..ddfa7ca492 100644 --- a/src/Symfony/Component/Routing/RouteCompilerInterface.php +++ b/src/Symfony/Component/Routing/RouteCompilerInterface.php @@ -21,8 +21,6 @@ interface RouteCompilerInterface /** * Compiles the current route instance. * - * @param Route $route A Route instance - * * @return CompiledRoute A CompiledRoute instance * * @throws \LogicException If the Route cannot be compiled because the diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php index afec0f5ed5..52d7c35080 100644 --- a/src/Symfony/Component/Routing/Router.php +++ b/src/Symfony/Component/Routing/Router.php @@ -226,8 +226,6 @@ class Router implements RouterInterface, RequestMatcherInterface /** * Sets the ConfigCache factory to use. - * - * @param ConfigCacheFactoryInterface $configCacheFactory The factory to use */ public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory) { diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php index d60b82ce9d..4a8d6b4639 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php @@ -56,12 +56,6 @@ class AclProvider implements AclProviderInterface */ private $permissionGrantingStrategy; - /** - * @param Connection $connection - * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy - * @param array $options - * @param AclCacheInterface $cache - */ public function __construct(Connection $connection, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $options, AclCacheInterface $cache = null) { $this->cache = $cache; @@ -222,8 +216,6 @@ class AclProvider implements AclProviderInterface * Constructs the query used for looking up object identities and associated * ACEs, and security identities. * - * @param array $ancestorIds - * * @return string */ protected function getLookupSql(array $ancestorIds) @@ -361,8 +353,6 @@ FINDCHILDREN; * Constructs the SQL for retrieving the primary key of the given object * identity. * - * @param ObjectIdentityInterface $oid - * * @return string */ protected function getSelectObjectIdentityIdSql(ObjectIdentityInterface $oid) @@ -386,8 +376,6 @@ QUERY; /** * Returns the primary key of the passed object identity. * - * @param ObjectIdentityInterface $oid - * * @return int */ final protected function retrieveObjectIdentityPrimaryKey(ObjectIdentityInterface $oid) @@ -397,8 +385,6 @@ QUERY; /** * This method is called when an ACL instance is retrieved from the cache. - * - * @param AclInterface $acl */ private function updateAceIdentityMap(AclInterface $acl) { @@ -424,8 +410,6 @@ QUERY; * Retrieves all the ids which need to be queried from the database * including the ids of parent ACLs. * - * @param array $batch - * * @return array */ private function getAncestorIds(array $batch) @@ -445,8 +429,6 @@ QUERY; /** * Does either overwrite the passed ACE, or saves it in the global identity * map to ensure every ACE only gets instantiated once. - * - * @param array &$aces */ private function doUpdateAceIdentityMap(array &$aces) { @@ -463,10 +445,6 @@ QUERY; * This method is called for object identities which could not be retrieved * from the cache, and for which thus a database query is required. * - * @param array $batch - * @param array $sids - * @param array $oidLookup - * * @return \SplObjectStorage mapping object identities to ACL instances * * @throws AclNotFoundException @@ -493,10 +471,6 @@ QUERY; * Keep in mind that changes to this method might severely reduce the * performance of the entire ACL system. * - * @param Statement $stmt - * @param array $oidLookup - * @param array $sids - * * @return \SplObjectStorage * * @throws \RuntimeException diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php index 2555c15044..d7e87ec3ca 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php @@ -113,8 +113,6 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf * Deletes the security identity from the database. * ACL entries have the CASCADE option on their foreign key so they will also get deleted. * - * @param SecurityIdentityInterface $sid - * * @throws \InvalidArgumentException */ public function deleteSecurityIdentity(SecurityIdentityInterface $sid) @@ -552,8 +550,6 @@ QUERY; /** * Constructs the SQL for inserting a security identity. * - * @param SecurityIdentityInterface $sid - * * @return string * * @throws \InvalidArgumentException @@ -624,8 +620,6 @@ QUERY; /** * Constructs the SQL for selecting the primary key of a security identity. * - * @param SecurityIdentityInterface $sid - * * @return string * * @throws \InvalidArgumentException @@ -653,8 +647,6 @@ QUERY; /** * Constructs the SQL to delete a security identity. * - * @param SecurityIdentityInterface $sid - * * @return string * * @throws \InvalidArgumentException @@ -742,8 +734,6 @@ QUERY; /** * Creates the ACL for the passed object identity. - * - * @param ObjectIdentityInterface $oid */ private function createObjectIdentity(ObjectIdentityInterface $oid) { @@ -778,8 +768,6 @@ QUERY; * If the security identity does not yet exist in the database, it will be * created. * - * @param SecurityIdentityInterface $sid - * * @return int */ private function createOrRetrieveSecurityIdentityId(SecurityIdentityInterface $sid) @@ -825,8 +813,6 @@ QUERY; /** * This regenerates the ancestor table which is used for fast read access. - * - * @param AclInterface $acl */ private function regenerateAncestorRelations(AclInterface $acl) { @@ -988,8 +974,6 @@ QUERY; /** * Persists the changes which were made to ACEs to the database. - * - * @param \SplObjectStorage $aces */ private function updateAces(\SplObjectStorage $aces) { diff --git a/src/Symfony/Component/Security/Acl/Dbal/Schema.php b/src/Symfony/Component/Security/Acl/Dbal/Schema.php index b98423cbc8..a3d219a568 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/Schema.php +++ b/src/Symfony/Component/Security/Acl/Dbal/Schema.php @@ -44,8 +44,6 @@ final class Schema extends BaseSchema /** * Merges ACL schema with the given schema. - * - * @param BaseSchema $schema */ public function addToSchema(BaseSchema $schema) { diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php index a759d5f047..eee8d4df95 100644 --- a/src/Symfony/Component/Security/Acl/Domain/Acl.php +++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php @@ -63,11 +63,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged $this->entriesInheriting = $entriesInheriting; } - /** - * Adds a property changed listener. - * - * @param PropertyChangedListener $listener - */ public function addPropertyChangedListener(PropertyChangedListener $listener) { $this->listeners[] = $listener; diff --git a/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php index 97ec20f210..3041600c4b 100644 --- a/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php +++ b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php @@ -27,11 +27,6 @@ class AclCollectionCache private $objectIdentityRetrievalStrategy; private $securityIdentityRetrievalStrategy; - /** - * @param AclProviderInterface $aclProvider - * @param ObjectIdentityRetrievalStrategyInterface $oidRetrievalStrategy - * @param SecurityIdentityRetrievalStrategyInterface $sidRetrievalStrategy - */ public function __construct(AclProviderInterface $aclProvider, ObjectIdentityRetrievalStrategyInterface $oidRetrievalStrategy, SecurityIdentityRetrievalStrategyInterface $sidRetrievalStrategy) { $this->aclProvider = $aclProvider; diff --git a/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php b/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php index a72622f519..4ff22eacce 100644 --- a/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php +++ b/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php @@ -203,8 +203,6 @@ class DoctrineAclCache implements AclCacheInterface /** * Returns the key for the object identity. * - * @param ObjectIdentityInterface $oid - * * @return string */ private function getDataKeyByIdentity(ObjectIdentityInterface $oid) diff --git a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php index f8a09a6197..6710a1b922 100644 --- a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php @@ -31,11 +31,6 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface private $auditLogger; - /** - * Sets the audit logger. - * - * @param AuditLoggerInterface $auditLogger - */ public function setAuditLogger(AuditLoggerInterface $auditLogger) { $this->auditLogger = $auditLogger; diff --git a/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php index cad892f7dc..387d432886 100644 --- a/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php @@ -28,10 +28,6 @@ class SecurityIdentityRetrievalStrategy implements SecurityIdentityRetrievalStra private $roleHierarchy; private $authenticationTrustResolver; - /** - * @param RoleHierarchyInterface $roleHierarchy - * @param AuthenticationTrustResolver $authenticationTrustResolver - */ public function __construct(RoleHierarchyInterface $roleHierarchy, AuthenticationTrustResolver $authenticationTrustResolver) { $this->roleHierarchy = $roleHierarchy; diff --git a/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php b/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php index d6b3d3fcfc..96f3c9fe31 100644 --- a/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php +++ b/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php @@ -48,8 +48,6 @@ final class UserSecurityIdentity implements SecurityIdentityInterface /** * Creates a user security identity from a UserInterface. * - * @param UserInterface $user - * * @return self */ public static function fromAccount(UserInterface $user) @@ -60,8 +58,6 @@ final class UserSecurityIdentity implements SecurityIdentityInterface /** * Creates a user security identity from a TokenInterface. * - * @param TokenInterface $token - * * @return self */ public static function fromToken(TokenInterface $token) diff --git a/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php b/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php index 1e7458540b..e9ba0ec62c 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php @@ -29,8 +29,6 @@ interface AclCacheInterface * Removes an ACL from the cache. * * The ACL which is returned, must reference the passed object identity. - * - * @param ObjectIdentityInterface $oid */ public function evictFromCacheByIdentity(ObjectIdentityInterface $oid); @@ -46,16 +44,12 @@ interface AclCacheInterface /** * Retrieves an ACL for the given object identity from the cache. * - * @param ObjectIdentityInterface $oid - * * @return AclInterface */ public function getFromCacheByIdentity(ObjectIdentityInterface $oid); /** * Stores a new ACL in the cache. - * - * @param AclInterface $acl */ public function putInCache(AclInterface $acl); diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php index ee6d7c406e..be5794aaab 100644 --- a/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php @@ -23,8 +23,6 @@ interface MutableAclProviderInterface extends AclProviderInterface /** * Creates a new ACL for the given object identity. * - * @param ObjectIdentityInterface $oid - * * @return MutableAclInterface * * @throws AclAlreadyExistsException when there already is an ACL for the given @@ -37,8 +35,6 @@ interface MutableAclProviderInterface extends AclProviderInterface * * This will automatically trigger a delete for any child ACLs. If you don't * want child ACLs to be deleted, you will have to set their parent ACL to null. - * - * @param ObjectIdentityInterface $oid */ public function deleteAcl(ObjectIdentityInterface $oid); @@ -47,8 +43,6 @@ interface MutableAclProviderInterface extends AclProviderInterface * access control entries. * * Changes to parent ACLs are not persisted. - * - * @param MutableAclInterface $acl */ public function updateAcl(MutableAclInterface $acl); } diff --git a/src/Symfony/Component/Security/Acl/Model/ObjectIdentityInterface.php b/src/Symfony/Component/Security/Acl/Model/ObjectIdentityInterface.php index 6574b49313..5c1a6de7bf 100644 --- a/src/Symfony/Component/Security/Acl/Model/ObjectIdentityInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/ObjectIdentityInterface.php @@ -27,8 +27,6 @@ interface ObjectIdentityInterface * Referential Equality: $object1 === $object2 * Example for Object Equality: $object1->getId() === $object2->getId() * - * @param ObjectIdentityInterface $identity - * * @return bool */ public function equals(ObjectIdentityInterface $identity); diff --git a/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php b/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php index 0a24a543d2..8a89e24694 100644 --- a/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php @@ -23,8 +23,6 @@ interface SecurityIdentityInterface /** * This method is used to compare two security identities in order to * not rely on referential equality. - * - * @param SecurityIdentityInterface $identity */ public function equals(SecurityIdentityInterface $identity); } diff --git a/src/Symfony/Component/Security/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php b/src/Symfony/Component/Security/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php index b5fcb752f9..cf0f13652b 100644 --- a/src/Symfony/Component/Security/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php @@ -27,8 +27,6 @@ interface SecurityIdentityRetrievalStrategyInterface * Typically, security identities should be ordered from most specific to * least specific. * - * @param TokenInterface $token - * * @return SecurityIdentityInterface[] An array of SecurityIdentityInterface implementations */ public function getSecurityIdentities(TokenInterface $token); diff --git a/src/Symfony/Component/Security/Acl/Tests/Dbal/MutableAclProviderTest.php b/src/Symfony/Component/Security/Acl/Tests/Dbal/MutableAclProviderTest.php index f119168221..56aff2ff40 100644 --- a/src/Symfony/Component/Security/Acl/Tests/Dbal/MutableAclProviderTest.php +++ b/src/Symfony/Component/Security/Acl/Tests/Dbal/MutableAclProviderTest.php @@ -455,9 +455,6 @@ class MutableAclProviderTest extends TestCase * ), * ) * - * @param AclProvider $provider - * @param array $data - * * @throws \InvalidArgumentException * @throws \Exception */ diff --git a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php index 03b48e9eb6..6c9c4cbb37 100644 --- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php @@ -26,8 +26,6 @@ interface AuthenticationTrustResolverInterface * * If null is passed, the method must return false. * - * @param TokenInterface $token - * * @return bool */ public function isAnonymous(TokenInterface $token = null); @@ -36,8 +34,6 @@ interface AuthenticationTrustResolverInterface * Resolves whether the passed token implementation is authenticated * using remember-me capabilities. * - * @param TokenInterface $token - * * @return bool */ public function isRememberMe(TokenInterface $token = null); @@ -45,8 +41,6 @@ interface AuthenticationTrustResolverInterface /** * Resolves whether the passed token implementation is fully authenticated. * - * @param TokenInterface $token - * * @return bool */ public function isFullFledged(TokenInterface $token = null); diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/AuthenticationProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/Provider/AuthenticationProviderInterface.php index adad258ee0..b4f710fd08 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/AuthenticationProviderInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/AuthenticationProviderInterface.php @@ -27,8 +27,6 @@ interface AuthenticationProviderInterface extends AuthenticationManagerInterface /** * Checks whether this provider supports the given token. * - * @param TokenInterface $token A TokenInterface instance - * * @return bool true if the implementation supports the Token, false otherwise */ public function supports(TokenInterface $token); diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php index d03fcb460f..2ed4d8fc95 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php @@ -34,11 +34,6 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn private $userChecker; private $providerKey; - /** - * @param UserProviderInterface $userProvider An UserProviderInterface instance - * @param UserCheckerInterface $userChecker An UserCheckerInterface instance - * @param string $providerKey The provider key - */ public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey) { $this->userProvider = $userProvider; diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php index 28d057ef3b..3f70b4718b 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php @@ -108,9 +108,6 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter /** * Retrieves roles from user and appends SwitchUserRole if original token contained one. * - * @param UserInterface $user The user - * @param TokenInterface $token The token - * * @return array The user roles */ private function getRoles(UserInterface $user, TokenInterface $token) @@ -144,9 +141,6 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter * Does additional checks on the user and token (like validating the * credentials). * - * @param UserInterface $user The retrieved UserInterface instance - * @param UsernamePasswordToken $token The UsernamePasswordToken token to be authenticated - * * @throws AuthenticationException if the credentials could not be validated */ abstract protected function checkAuthentication(UserInterface $user, UsernamePasswordToken $token); diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php index c2d860e905..58ac22c2ec 100644 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php @@ -51,8 +51,6 @@ interface TokenProviderInterface /** * Creates a new token. - * - * @param PersistentTokenInterface $token */ public function createNewToken(PersistentTokenInterface $token); } diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php index 7f449bee1c..06f0d0ddfb 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php @@ -31,9 +31,6 @@ class AuthenticatedVoter implements VoterInterface private $authenticationTrustResolver; - /** - * @param AuthenticationTrustResolverInterface $authenticationTrustResolver - */ public function __construct(AuthenticationTrustResolverInterface $authenticationTrustResolver) { $this->authenticationTrustResolver = $authenticationTrustResolver; diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php index 8dd00bfb73..7007e1fb22 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php @@ -30,11 +30,6 @@ class ExpressionVoter implements VoterInterface private $trustResolver; private $roleHierarchy; - /** - * @param ExpressionLanguage $expressionLanguage - * @param AuthenticationTrustResolverInterface $trustResolver - * @param RoleHierarchyInterface|null $roleHierarchy - */ public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null) { $this->expressionLanguage = $expressionLanguage; diff --git a/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php b/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php index 0568d41c9b..bf3ad6f423 100644 --- a/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php +++ b/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php @@ -61,8 +61,6 @@ class EncoderFactory implements EncoderFactoryInterface /** * Creates the actual encoder instance. * - * @param array $config - * * @return PasswordEncoderInterface * * @throws \InvalidArgumentException diff --git a/src/Symfony/Component/Security/Core/Encoder/UserPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/UserPasswordEncoder.php index b09604952e..3efc8c6d48 100644 --- a/src/Symfony/Component/Security/Core/Encoder/UserPasswordEncoder.php +++ b/src/Symfony/Component/Security/Core/Encoder/UserPasswordEncoder.php @@ -20,14 +20,8 @@ use Symfony\Component\Security\Core\User\UserInterface; */ class UserPasswordEncoder implements UserPasswordEncoderInterface { - /** - * @var EncoderFactoryInterface - */ private $encoderFactory; - /** - * @param EncoderFactoryInterface $encoderFactory The encoder factory - */ public function __construct(EncoderFactoryInterface $encoderFactory) { $this->encoderFactory = $encoderFactory; diff --git a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php index 9b29f634b4..034ab792ee 100644 --- a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php +++ b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php @@ -34,11 +34,6 @@ abstract class AccountStatusException extends AuthenticationException return $this->user; } - /** - * Set the user. - * - * @param UserInterface $user - */ public function setUser(UserInterface $user) { $this->user = $user; diff --git a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php index 2b897c2513..8beb87bdb8 100644 --- a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php +++ b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php @@ -33,11 +33,6 @@ class AuthenticationException extends \RuntimeException implements \Serializable return $this->token; } - /** - * Set the token. - * - * @param TokenInterface $token - */ public function setToken(TokenInterface $token) { $this->token = $token; diff --git a/src/Symfony/Component/Security/Core/User/EquatableInterface.php b/src/Symfony/Component/Security/Core/User/EquatableInterface.php index c6082ce501..4878637454 100644 --- a/src/Symfony/Component/Security/Core/User/EquatableInterface.php +++ b/src/Symfony/Component/Security/Core/User/EquatableInterface.php @@ -29,8 +29,6 @@ interface EquatableInterface * Also implementation should consider that $user instance may implement * the extended user interface `AdvancedUserInterface`. * - * @param UserInterface $user - * * @return bool */ public function isEqualTo(UserInterface $user); diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php index ff68389c88..0af14e6a46 100644 --- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php +++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php @@ -47,8 +47,6 @@ class InMemoryUserProvider implements UserProviderInterface /** * Adds a new User to the provider. * - * @param UserInterface $user A UserInterface instance - * * @throws \LogicException */ public function createUser(UserInterface $user) diff --git a/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php b/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php index 3dd8d51bf5..d2174b6f57 100644 --- a/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php +++ b/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php @@ -22,15 +22,11 @@ interface UserCheckerInterface { /** * Checks the user account before authentication. - * - * @param UserInterface $user a UserInterface instance */ public function checkPreAuth(UserInterface $user); /** * Checks the user account after authentication. - * - * @param UserInterface $user a UserInterface instance */ public function checkPostAuth(UserInterface $user); } diff --git a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php b/src/Symfony/Component/Security/Core/User/UserProviderInterface.php index 03f38f0884..be1cd8a34a 100644 --- a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php +++ b/src/Symfony/Component/Security/Core/User/UserProviderInterface.php @@ -57,8 +57,6 @@ interface UserProviderInterface * object can just be merged into some internal array of users / identity * map. * - * @param UserInterface $user - * * @return UserInterface * * @throws UnsupportedUserException if the user is not supported diff --git a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php index e1295029ac..ec8cc75b08 100644 --- a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php +++ b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php @@ -24,23 +24,9 @@ use Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface; */ class CsrfTokenManager implements CsrfTokenManagerInterface { - /** - * @var TokenGeneratorInterface - */ private $generator; - - /** - * @var TokenStorageInterface - */ private $storage; - /** - * Creates a new CSRF provider using PHP's native session storage. - * - * @param TokenGeneratorInterface|null $generator The token generator - * @param TokenStorageInterface|null $storage The storage for storing - * generated CSRF tokens - */ public function __construct(TokenGeneratorInterface $generator = null, TokenStorageInterface $storage = null) { $this->generator = $generator ?: new UriSafeTokenGenerator(); diff --git a/src/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.php b/src/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.php index 5936b6440e..a29c04fa7a 100644 --- a/src/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.php +++ b/src/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.php @@ -59,8 +59,6 @@ interface CsrfTokenManagerInterface /** * Returns whether the given CSRF token is valid. * - * @param CsrfToken $token A CSRF token - * * @return bool Returns true if the token is valid, false otherwise */ public function isTokenValid(CsrfToken $token); diff --git a/src/Symfony/Component/Security/Http/AccessMapInterface.php b/src/Symfony/Component/Security/Http/AccessMapInterface.php index 7d15feeb0c..6b1e5c9383 100644 --- a/src/Symfony/Component/Security/Http/AccessMapInterface.php +++ b/src/Symfony/Component/Security/Http/AccessMapInterface.php @@ -25,8 +25,6 @@ interface AccessMapInterface /** * Returns security attributes and required channel for the supplied request. * - * @param Request $request The current request - * * @return array A tuple of security attributes and the required channel */ public function getPatterns(Request $request); diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php index e2d375e754..de7a1ca5eb 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php @@ -31,9 +31,6 @@ interface AuthenticationFailureHandlerInterface * called by authentication listeners inheriting from * AbstractAuthenticationListener. * - * @param Request $request - * @param AuthenticationException $exception - * * @return Response The response to return, never null */ public function onAuthenticationFailure(Request $request, AuthenticationException $exception); diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php index d0b3cb6f21..9ef863b134 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php @@ -31,9 +31,6 @@ interface AuthenticationSuccessHandlerInterface * is called by authentication listeners inheriting from * AbstractAuthenticationListener. * - * @param Request $request - * @param TokenInterface $token - * * @return Response never null */ public function onAuthenticationSuccess(Request $request, TokenInterface $token); diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php index 0012d36a1f..32ea2b1c30 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php @@ -23,14 +23,8 @@ use Symfony\Component\Security\Core\Security; */ class AuthenticationUtils { - /** - * @var RequestStack - */ private $requestStack; - /** - * @param RequestStack $requestStack - */ public function __construct(RequestStack $requestStack) { $this->requestStack = $requestStack; diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php index 08b5faee39..957101b153 100644 --- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php @@ -65,11 +65,6 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle return $this->options; } - /** - * Sets the options. - * - * @param array $options An array of options - */ public function setOptions(array $options) { $this->options = array_merge($this->defaultOptions, $options); diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php index 5b907f682c..0099e792f8 100644 --- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php @@ -63,11 +63,6 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle return $this->options; } - /** - * Sets the options. - * - * @param array $options An array of options - */ public function setOptions(array $options) { $this->options = array_merge($this->defaultOptions, $options); @@ -96,8 +91,6 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle /** * Builds the target URL according to the defined options. * - * @param Request $request - * * @return string */ protected function determineTargetUrl(Request $request) diff --git a/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php b/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php index a5ea9db631..aea901181f 100644 --- a/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php @@ -26,9 +26,6 @@ interface AccessDeniedHandlerInterface /** * Handles an access denied failure. * - * @param Request $request - * @param AccessDeniedException $accessDeniedException - * * @return Response may return null */ public function handle(Request $request, AccessDeniedException $accessDeniedException); diff --git a/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php b/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php index 17c6d9e8f7..d46b1d522e 100644 --- a/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php +++ b/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php @@ -23,10 +23,6 @@ class InteractiveLoginEvent extends Event private $request; private $authenticationToken; - /** - * @param Request $request A Request instance - * @param TokenInterface $authenticationToken A TokenInterface instance - */ public function __construct(Request $request, TokenInterface $authenticationToken) { $this->request = $request; diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php index 12fb2b5452..62b0071212 100644 --- a/src/Symfony/Component/Security/Http/Firewall.php +++ b/src/Symfony/Component/Security/Http/Firewall.php @@ -33,10 +33,6 @@ class Firewall implements EventSubscriberInterface private $dispatcher; private $exceptionListeners; - /** - * @param FirewallMapInterface $map A FirewallMapInterface instance - * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance - */ public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher) { $this->map = $map; @@ -44,11 +40,6 @@ class Firewall implements EventSubscriberInterface $this->exceptionListeners = new \SplObjectStorage(); } - /** - * Handles security. - * - * @param GetResponseEvent $event An GetResponseEvent instance - */ public function onKernelRequest(GetResponseEvent $event) { if (!$event->isMasterRequest()) { diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php index 1056879e34..71a9311a93 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php @@ -108,8 +108,6 @@ abstract class AbstractAuthenticationListener implements ListenerInterface /** * Sets the RememberMeServices implementation to use. - * - * @param RememberMeServicesInterface $rememberMeServices */ public function setRememberMeServices(RememberMeServicesInterface $rememberMeServices) { @@ -119,8 +117,6 @@ abstract class AbstractAuthenticationListener implements ListenerInterface /** * Handles form based authentication. * - * @param GetResponseEvent $event A GetResponseEvent instance - * * @throws \RuntimeException * @throws SessionUnavailableException */ @@ -168,8 +164,6 @@ abstract class AbstractAuthenticationListener implements ListenerInterface * but a subclass could change this to only authenticate requests where a * certain parameters is present. * - * @param Request $request - * * @return bool */ protected function requiresAuthentication(Request $request) @@ -180,8 +174,6 @@ abstract class AbstractAuthenticationListener implements ListenerInterface /** * Performs authentication. * - * @param Request $request A Request instance - * * @return TokenInterface|Response|null The authenticated token, null if full authentication is not possible, or a Response * * @throws AuthenticationException if the authentication fails diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php index b793310d9b..0065fe8237 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php @@ -49,8 +49,6 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface /** * Handles pre-authentication. - * - * @param GetResponseEvent $event A GetResponseEvent instance */ final public function handle(GetResponseEvent $event) { @@ -97,8 +95,6 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface /** * Clears a PreAuthenticatedToken for this provider (if present). - * - * @param AuthenticationException $exception */ private function clearToken(AuthenticationException $exception) { @@ -115,8 +111,6 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface /** * Gets the user and credentials from the Request. * - * @param Request $request A Request instance - * * @return array An array composed of the user and the credentials */ abstract protected function getPreAuthenticatedData(Request $request); diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php index c234317e77..ae09b514fa 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php @@ -42,8 +42,6 @@ class AccessListener implements ListenerInterface /** * Handles access authorization. * - * @param GetResponseEvent $event A GetResponseEvent instance - * * @throws AccessDeniedException * @throws AuthenticationCredentialsNotFoundException */ diff --git a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php index f7feee8f8e..e5183cc201 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php @@ -41,8 +41,6 @@ class AnonymousAuthenticationListener implements ListenerInterface /** * Handles anonymous authentication. - * - * @param GetResponseEvent $event A GetResponseEvent instance */ public function handle(GetResponseEvent $event) { diff --git a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php index 5bbf13d9b8..1ddc416434 100644 --- a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php @@ -49,8 +49,6 @@ class BasicAuthenticationListener implements ListenerInterface /** * Handles basic authentication. - * - * @param GetResponseEvent $event A GetResponseEvent instance */ public function handle(GetResponseEvent $event) { diff --git a/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php b/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php index 637a7f5492..d0fff21574 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php @@ -37,8 +37,6 @@ class ChannelListener implements ListenerInterface /** * Handles channel management. - * - * @param GetResponseEvent $event A GetResponseEvent instance */ public function handle(GetResponseEvent $event) { diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index 6a9ba672b2..b446f57e49 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -60,8 +60,6 @@ class ContextListener implements ListenerInterface /** * Reads the Security Token from the session. - * - * @param GetResponseEvent $event A GetResponseEvent instance */ public function handle(GetResponseEvent $event) { @@ -100,8 +98,6 @@ class ContextListener implements ListenerInterface /** * Writes the security token into the session. - * - * @param FilterResponseEvent $event A FilterResponseEvent instance */ public function onKernelResponse(FilterResponseEvent $event) { @@ -135,8 +131,6 @@ class ContextListener implements ListenerInterface /** * Refreshes the user by reloading it from the user provider. * - * @param TokenInterface $token - * * @return TokenInterface|null * * @throws \RuntimeException diff --git a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php index d89111f6ae..070d61a674 100644 --- a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php @@ -54,8 +54,6 @@ class DigestAuthenticationListener implements ListenerInterface /** * Handles digest authentication. * - * @param GetResponseEvent $event A GetResponseEvent instance - * * @throws AuthenticationServiceException */ public function handle(GetResponseEvent $event) diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php index 4e8066b7e1..a6029bb89c 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php @@ -64,8 +64,6 @@ class ExceptionListener /** * Registers a onKernelException listener to take care of security exceptions. - * - * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance */ public function register(EventDispatcherInterface $dispatcher) { @@ -74,8 +72,6 @@ class ExceptionListener /** * Unregisters the dispatcher. - * - * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance */ public function unregister(EventDispatcherInterface $dispatcher) { @@ -84,8 +80,6 @@ class ExceptionListener /** * Handles security related exceptions. - * - * @param GetResponseForExceptionEvent $event An GetResponseForExceptionEvent instance */ public function onKernelException(GetResponseForExceptionEvent $event) { @@ -170,9 +164,6 @@ class ExceptionListener } /** - * @param Request $request - * @param AuthenticationException $authException - * * @return Response * * @throws AuthenticationException @@ -203,9 +194,6 @@ class ExceptionListener return $this->authenticationEntryPoint->start($request, $authException); } - /** - * @param Request $request - */ protected function setTargetPath(Request $request) { // session isn't required when using HTTP basic authentication mechanism for example diff --git a/src/Symfony/Component/Security/Http/Firewall/ListenerInterface.php b/src/Symfony/Component/Security/Http/Firewall/ListenerInterface.php index 0fc8d11c3a..d881badd01 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ListenerInterface.php +++ b/src/Symfony/Component/Security/Http/Firewall/ListenerInterface.php @@ -20,10 +20,5 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent; */ interface ListenerInterface { - /** - * This interface must be implemented by firewall listeners. - * - * @param GetResponseEvent $event - */ public function handle(GetResponseEvent $event); } diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php index 5b5ccbff10..907d298b4a 100644 --- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php @@ -66,11 +66,6 @@ class LogoutListener implements ListenerInterface $this->handlers = array(); } - /** - * Adds a logout handler. - * - * @param LogoutHandlerInterface $handler - */ public function addHandler(LogoutHandlerInterface $handler) { $this->handlers[] = $handler; @@ -82,8 +77,6 @@ class LogoutListener implements ListenerInterface * If a CsrfTokenManagerInterface instance is available, it will be used to * validate the request. * - * @param GetResponseEvent $event A GetResponseEvent instance - * * @throws LogoutException if the CSRF token is invalid * @throws \RuntimeException if the LogoutSuccessHandlerInterface instance does not return a response */ @@ -127,8 +120,6 @@ class LogoutListener implements ListenerInterface * but a subclass could change this to logout requests where * certain parameters is present. * - * @param Request $request - * * @return bool */ protected function requiresLogout(Request $request) diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php index 1802dd8787..fe670f3de1 100644 --- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php @@ -60,8 +60,6 @@ class RememberMeListener implements ListenerInterface /** * Handles remember-me cookie based authentication. - * - * @param GetResponseEvent $event A GetResponseEvent instance */ public function handle(GetResponseEvent $event) { diff --git a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php index 59385e17e7..dd51869405 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php @@ -63,8 +63,6 @@ class SimplePreAuthenticationListener implements ListenerInterface /** * Handles basic authentication. - * - * @param GetResponseEvent $event A GetResponseEvent instance */ public function handle(GetResponseEvent $event) { diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php index 606392de8a..f5113aa0c9 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php @@ -68,8 +68,6 @@ class SwitchUserListener implements ListenerInterface /** * Handles the switch to another user. * - * @param GetResponseEvent $event A GetResponseEvent instance - * * @throws \LogicException if switching to a user failed */ public function handle(GetResponseEvent $event) @@ -101,8 +99,6 @@ class SwitchUserListener implements ListenerInterface /** * Attempts to switch to another user. * - * @param Request $request A Request instance - * * @return TokenInterface|null The new TokenInterface if successfully switched, null otherwise * * @throws \LogicException @@ -150,8 +146,6 @@ class SwitchUserListener implements ListenerInterface /** * Attempts to exit from an already switched user. * - * @param Request $request A Request instance - * * @return TokenInterface The original TokenInterface instance * * @throws AuthenticationCredentialsNotFoundException @@ -174,8 +168,6 @@ class SwitchUserListener implements ListenerInterface /** * Gets the original Token from a switched one. * - * @param TokenInterface $token A switched TokenInterface instance - * * @return TokenInterface|false The original TokenInterface instance, false if the current TokenInterface is not switched */ private function getOriginalToken(TokenInterface $token) diff --git a/src/Symfony/Component/Security/Http/FirewallMap.php b/src/Symfony/Component/Security/Http/FirewallMap.php index 1bb73bd293..e767d123cb 100644 --- a/src/Symfony/Component/Security/Http/FirewallMap.php +++ b/src/Symfony/Component/Security/Http/FirewallMap.php @@ -25,11 +25,6 @@ class FirewallMap implements FirewallMapInterface { private $map = array(); - /** - * @param RequestMatcherInterface $requestMatcher - * @param array $listeners - * @param ExceptionListener $exceptionListener - */ public function add(RequestMatcherInterface $requestMatcher = null, array $listeners = array(), ExceptionListener $exceptionListener = null) { $this->map[] = array($requestMatcher, $listeners, $exceptionListener); diff --git a/src/Symfony/Component/Security/Http/FirewallMapInterface.php b/src/Symfony/Component/Security/Http/FirewallMapInterface.php index 1627ab5956..ebdd498123 100644 --- a/src/Symfony/Component/Security/Http/FirewallMapInterface.php +++ b/src/Symfony/Component/Security/Http/FirewallMapInterface.php @@ -30,8 +30,6 @@ interface FirewallMapInterface * If there is no exception listener, the second element of the outer array * must be null. * - * @param Request $request - * * @return array of the format array(array(AuthenticationListener), ExceptionListener) */ public function getListeners(Request $request); diff --git a/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php b/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php index a78b25f0c3..b96bc43a78 100644 --- a/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php +++ b/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php @@ -34,10 +34,6 @@ class CookieClearingLogoutHandler implements LogoutHandlerInterface /** * Implementation for the LogoutHandlerInterface. Deletes all requested cookies. - * - * @param Request $request - * @param Response $response - * @param TokenInterface $token */ public function logout(Request $request, Response $response, TokenInterface $token) { diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php b/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php index 5e1cea81df..363bc4abe1 100644 --- a/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php @@ -26,10 +26,6 @@ interface LogoutHandlerInterface * This method is called by the LogoutListener when a user has requested * to be logged out. Usually, you would unset session variables, or remove * cookies, etc. - * - * @param Request $request - * @param Response $response - * @param TokenInterface $token */ public function logout(Request $request, Response $response, TokenInterface $token); } diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php b/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php index 4246fa4414..c320ad655f 100644 --- a/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php @@ -30,8 +30,6 @@ interface LogoutSuccessHandlerInterface /** * Creates a Response object to send upon a successful logout. * - * @param Request $request - * * @return Response never null */ public function onLogoutSuccess(Request $request); diff --git a/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php b/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php index e036c5fa6b..7f362de9d7 100644 --- a/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php +++ b/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php @@ -24,10 +24,6 @@ class SessionLogoutHandler implements LogoutHandlerInterface { /** * Invalidate the current session. - * - * @param Request $request - * @param Response $response - * @param TokenInterface $token */ public function logout(Request $request, Response $response, TokenInterface $token) { diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index dd37517548..c895342d3a 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -93,8 +93,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * Implementation of RememberMeServicesInterface. Detects whether a remember-me * cookie was set, decodes it, and hands it to subclasses for further processing. * - * @param Request $request - * * @return TokenInterface|null * * @throws CookieTheftException @@ -147,10 +145,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface /** * Implementation for LogoutHandlerInterface. Deletes the cookie. - * - * @param Request $request - * @param Response $response - * @param TokenInterface $token */ public function logout(Request $request, Response $response, TokenInterface $token) { @@ -160,8 +154,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface /** * Implementation for RememberMeServicesInterface. Deletes the cookie when * an attempted authentication fails. - * - * @param Request $request */ final public function loginFail(Request $request) { @@ -172,10 +164,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface /** * Implementation for RememberMeServicesInterface. This is called when an * authentication is successful. - * - * @param Request $request - * @param Response $response - * @param TokenInterface $token The token that resulted in a successful authentication */ final public function loginSuccess(Request $request, Response $response, TokenInterface $token) { @@ -215,16 +203,10 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * Subclasses should validate the cookie and do any additional processing * that is required. This is called from autoLogin(). * - * @param array $cookieParts - * @param Request $request - * * @return UserInterface */ abstract protected function processAutoLoginCookie(array $cookieParts, Request $request); - /** - * @param Request $request - */ protected function onLoginFail(Request $request) { } @@ -233,10 +215,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * This is called after a user has been logged in successfully, and has * requested remember-me capabilities. The implementation usually sets a * cookie and possibly stores a persistent record of it. - * - * @param Request $request - * @param Response $response - * @param TokenInterface $token */ abstract protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token); @@ -266,8 +244,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface /** * Encodes the cookie parts. * - * @param array $cookieParts - * * @return string * * @throws \InvalidArgumentException When $cookieParts contain the cookie delimiter. Extending class should either remove or escape it. @@ -285,8 +261,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface /** * Deletes the remember-me cookie. - * - * @param Request $request */ protected function cancelCookie(Request $request) { @@ -300,8 +274,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface /** * Checks whether remember-me capabilities were requested. * - * @param Request $request - * * @return bool */ protected function isRememberMeRequested(Request $request) diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index 5b97d7302f..8c56d6a808 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -50,11 +50,6 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices $this->secureRandom = $secureRandom; } - /** - * Sets the token provider. - * - * @param TokenProviderInterface $tokenProvider - */ public function setTokenProvider(TokenProviderInterface $tokenProvider) { $this->tokenProvider = $tokenProvider; diff --git a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php index 5750a8c9d4..e2f12d711d 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php +++ b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php @@ -48,8 +48,6 @@ interface RememberMeServicesInterface * make sure to throw an AuthenticationException as this will consequentially * result in a call to loginFail() and therefore an invalidation of the cookie. * - * @param Request $request - * * @return TokenInterface */ public function autoLogin(Request $request); @@ -59,8 +57,6 @@ interface RememberMeServicesInterface * credentials supplied by the user were missing or otherwise invalid. * * This method needs to take care of invalidating the cookie. - * - * @param Request $request */ public function loginFail(Request $request); @@ -74,10 +70,6 @@ interface RememberMeServicesInterface * Instead, implementations should typically look for a request parameter * (such as a HTTP POST parameter) that indicates the browser has explicitly * requested for the authentication to be remembered. - * - * @param Request $request - * @param Response $response - * @param TokenInterface $token */ public function loginSuccess(Request $request, Response $response, TokenInterface $token); } diff --git a/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php b/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php index 4149fb6d85..e8c4424ac7 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php +++ b/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php @@ -22,9 +22,6 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; */ class ResponseListener implements EventSubscriberInterface { - /** - * @param FilterResponseEvent $event - */ public function onKernelResponse(FilterResponseEvent $event) { if (!$event->isMasterRequest()) { diff --git a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php index dd0c38184e..9b05f15134 100644 --- a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php +++ b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php @@ -29,9 +29,6 @@ interface SessionAuthenticationStrategyInterface * * This method is called before the TokenStorage is populated with a * Token, and only by classes inheriting from AbstractAuthenticationListener. - * - * @param Request $request - * @param TokenInterface $token */ public function onAuthentication(Request $request, TokenInterface $token); } diff --git a/src/Symfony/Component/Serializer/Annotation/Groups.php b/src/Symfony/Component/Serializer/Annotation/Groups.php index 519837a55b..d0339552a7 100644 --- a/src/Symfony/Component/Serializer/Annotation/Groups.php +++ b/src/Symfony/Component/Serializer/Annotation/Groups.php @@ -29,8 +29,6 @@ class Groups private $groups; /** - * @param array $data - * * @throws InvalidArgumentException */ public function __construct(array $data) diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php index a7a11caf2e..4da7d28814 100644 --- a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php +++ b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php @@ -125,8 +125,6 @@ class JsonDecode implements DecoderInterface /** * Merges the default options of the Json Decoder with the passed context. * - * @param array $context - * * @return array */ private function resolveContext(array $context) diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php index 3a6b2fdbbb..d68929c3d9 100644 --- a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php +++ b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php @@ -73,8 +73,6 @@ class JsonEncode implements EncoderInterface /** * Merge default json encode options with context. * - * @param array $context - * * @return array */ private function resolveContext(array $context = array()) diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index b363401f23..19159f1d53 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -511,8 +511,6 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec /** * Get real XML root node name, taking serializer options into account. * - * @param array $context - * * @return string */ private function resolveXmlRootName(array $context = array()) diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php index 7a1d3db94a..600e17be4f 100644 --- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php +++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php @@ -19,8 +19,6 @@ namespace Symfony\Component\Serializer\Mapping; class AttributeMetadata implements AttributeMetadataInterface { /** - * @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. @@ -28,8 +26,6 @@ class AttributeMetadata implements AttributeMetadataInterface public $name; /** - * @var array - * * @internal This property is public in order to reduce the size of the * class' serialized representation. Do not access it. Use * {@link getGroups()} instead. diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php index 6bb30274e3..b70bdd0966 100644 --- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php +++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php @@ -45,8 +45,6 @@ interface AttributeMetadataInterface /** * Merges an {@see AttributeMetadataInterface} with in the current one. - * - * @param AttributeMetadataInterface $attributeMetadata */ public function merge(AttributeMetadataInterface $attributeMetadata); } diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php index c00981b64f..3811e56548 100644 --- a/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php +++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php @@ -33,8 +33,6 @@ interface ClassMetadataInterface /** * Adds an {@link AttributeMetadataInterface}. - * - * @param AttributeMetadataInterface $attributeMetadata */ public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata); @@ -47,8 +45,6 @@ interface ClassMetadataInterface /** * Merges a {@link ClassMetadataInterface} in the current one. - * - * @param ClassMetadataInterface $classMetadata */ public function merge(ClassMetadataInterface $classMetadata); diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php b/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php index 601342ee61..2babf7e27d 100644 --- a/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php +++ b/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php @@ -23,25 +23,10 @@ use Symfony\Component\Serializer\Mapping\Loader\LoaderInterface; */ class ClassMetadataFactory implements ClassMetadataFactoryInterface { - /** - * @var LoaderInterface - */ private $loader; - - /** - * @var Cache - */ private $cache; - - /** - * @var array - */ private $loadedClasses; - /** - * @param LoaderInterface $loader - * @param Cache|null $cache - */ public function __construct(LoaderInterface $loader, Cache $cache = null) { $this->loader = $loader; diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php index 6c563b44e9..b6fbd36f01 100644 --- a/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php +++ b/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php @@ -24,14 +24,8 @@ use Symfony\Component\Serializer\Mapping\ClassMetadataInterface; */ class AnnotationLoader implements LoaderInterface { - /** - * @var Reader - */ private $reader; - /** - * @param Reader $reader - */ public function __construct(Reader $reader) { $this->reader = $reader; diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderInterface.php b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderInterface.php index ebf84b6a96..1310a71698 100644 --- a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderInterface.php +++ b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderInterface.php @@ -21,10 +21,6 @@ use Symfony\Component\Serializer\Mapping\ClassMetadataInterface; interface LoaderInterface { /** - * Load class metadata. - * - * @param ClassMetadataInterface $classMetadata A metadata - * * @return bool */ public function loadClassMetadata(ClassMetadataInterface $classMetadata); diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php index 85b9c83d52..d3a72caefb 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php @@ -68,9 +68,6 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N /** * Sets the {@link ClassMetadataFactoryInterface} to use. - * - * @param ClassMetadataFactoryInterface|null $classMetadataFactory - * @param NameConverterInterface|null $nameConverter */ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null) { @@ -139,8 +136,6 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N /** * Set ignored attributes for normalization and denormalization. * - * @param array $ignoredAttributes - * * @return self */ public function setIgnoredAttributes(array $ignoredAttributes) diff --git a/src/Symfony/Component/Serializer/SerializerAwareInterface.php b/src/Symfony/Component/Serializer/SerializerAwareInterface.php index dd0a62e7fa..13dfb392e9 100644 --- a/src/Symfony/Component/Serializer/SerializerAwareInterface.php +++ b/src/Symfony/Component/Serializer/SerializerAwareInterface.php @@ -20,8 +20,6 @@ interface SerializerAwareInterface { /** * Sets the owning Serializer object. - * - * @param SerializerInterface $serializer */ public function setSerializer(SerializerInterface $serializer); } diff --git a/src/Symfony/Component/Templating/DelegatingEngine.php b/src/Symfony/Component/Templating/DelegatingEngine.php index bef82af7bd..b47a0f0620 100644 --- a/src/Symfony/Component/Templating/DelegatingEngine.php +++ b/src/Symfony/Component/Templating/DelegatingEngine.php @@ -62,11 +62,6 @@ class DelegatingEngine implements EngineInterface, StreamingEngineInterface return $this->getEngine($name)->exists($name); } - /** - * Adds an engine. - * - * @param EngineInterface $engine An EngineInterface instance - */ public function addEngine(EngineInterface $engine) { $this->engines[] = $engine; diff --git a/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php b/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php index 689b17b401..be161a40e3 100644 --- a/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php +++ b/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php @@ -47,11 +47,6 @@ class CoreAssetsHelper extends Helper implements PackageInterface } } - /** - * Sets the default package. - * - * @param PackageInterface $defaultPackage The default package - */ public function setDefaultPackage(PackageInterface $defaultPackage) { $this->defaultPackage = $defaultPackage; diff --git a/src/Symfony/Component/Templating/Loader/CacheLoader.php b/src/Symfony/Component/Templating/Loader/CacheLoader.php index 9ee24f1daa..d23c6b5837 100644 --- a/src/Symfony/Component/Templating/Loader/CacheLoader.php +++ b/src/Symfony/Component/Templating/Loader/CacheLoader.php @@ -42,8 +42,6 @@ class CacheLoader extends Loader /** * Loads a template. * - * @param TemplateReferenceInterface $template A template - * * @return Storage|bool false if the template cannot be loaded, a Storage instance otherwise */ public function load(TemplateReferenceInterface $template) diff --git a/src/Symfony/Component/Templating/Loader/ChainLoader.php b/src/Symfony/Component/Templating/Loader/ChainLoader.php index ea9aac5f77..d66139e0b3 100644 --- a/src/Symfony/Component/Templating/Loader/ChainLoader.php +++ b/src/Symfony/Component/Templating/Loader/ChainLoader.php @@ -35,8 +35,6 @@ class ChainLoader extends Loader /** * Adds a loader instance. - * - * @param LoaderInterface $loader A Loader instance */ public function addLoader(LoaderInterface $loader) { @@ -46,8 +44,6 @@ class ChainLoader extends Loader /** * Loads a template. * - * @param TemplateReferenceInterface $template A template - * * @return Storage|bool false if the template cannot be loaded, a Storage instance otherwise */ public function load(TemplateReferenceInterface $template) diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php index d6605b1c64..139a953232 100644 --- a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php +++ b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php @@ -35,8 +35,6 @@ class FilesystemLoader extends Loader /** * Loads a template. * - * @param TemplateReferenceInterface $template A template - * * @return Storage|bool false if the template cannot be loaded, a Storage instance otherwise */ public function load(TemplateReferenceInterface $template) diff --git a/src/Symfony/Component/Templating/Loader/Loader.php b/src/Symfony/Component/Templating/Loader/Loader.php index b35eccfb09..e50106f03b 100644 --- a/src/Symfony/Component/Templating/Loader/Loader.php +++ b/src/Symfony/Component/Templating/Loader/Loader.php @@ -33,8 +33,6 @@ abstract class Loader implements LoaderInterface /** * Sets the debug logger to use for this loader. - * - * @param LoggerInterface $logger A logger instance */ public function setLogger(LoggerInterface $logger) { diff --git a/src/Symfony/Component/Templating/Loader/LoaderInterface.php b/src/Symfony/Component/Templating/Loader/LoaderInterface.php index 0795dcbd19..d2897e5c20 100644 --- a/src/Symfony/Component/Templating/Loader/LoaderInterface.php +++ b/src/Symfony/Component/Templating/Loader/LoaderInterface.php @@ -24,8 +24,6 @@ interface LoaderInterface /** * Loads a template. * - * @param TemplateReferenceInterface $template A template - * * @return Storage|bool false if the template cannot be loaded, a Storage instance otherwise */ public function load(TemplateReferenceInterface $template); diff --git a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php index c0ca6bb9b4..271ee81714 100644 --- a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php +++ b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php @@ -21,19 +21,8 @@ use Symfony\Component\Translation\MessageCatalogueInterface; */ abstract class AbstractOperation implements OperationInterface { - /** - * @var MessageCatalogueInterface - */ protected $source; - - /** - * @var MessageCatalogueInterface - */ protected $target; - - /** - * @var MessageCatalogue - */ protected $result; /** @@ -47,9 +36,6 @@ abstract class AbstractOperation implements OperationInterface protected $messages; /** - * @param MessageCatalogueInterface $source - * @param MessageCatalogueInterface $target - * * @throws \LogicException */ public function __construct(MessageCatalogueInterface $source, MessageCatalogueInterface $target) diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php index c3c140f4a9..9061efd16c 100644 --- a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php +++ b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php @@ -22,14 +22,8 @@ use Symfony\Component\Translation\DataCollectorTranslator; */ class TranslationDataCollector extends DataCollector implements LateDataCollectorInterface { - /** - * @var DataCollectorTranslator - */ private $translator; - /** - * @param DataCollectorTranslator $translator - */ public function __construct(DataCollectorTranslator $translator) { $this->translator = $translator; diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php index 0243d8aa21..44b9afd655 100644 --- a/src/Symfony/Component/Translation/DataCollectorTranslator.php +++ b/src/Symfony/Component/Translation/DataCollectorTranslator.php @@ -25,9 +25,6 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter */ private $translator; - /** - * @var array - */ private $messages = array(); /** diff --git a/src/Symfony/Component/Translation/Loader/PoFileLoader.php b/src/Symfony/Component/Translation/Loader/PoFileLoader.php index c2d0ce2b99..62595f2a87 100644 --- a/src/Symfony/Component/Translation/Loader/PoFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/PoFileLoader.php @@ -160,9 +160,6 @@ class PoFileLoader extends ArrayLoader * * A .po file could contain by error missing plural indexes. We need to * fix these before saving them. - * - * @param array $messages - * @param array $item */ private function addMessage(array &$messages, array $item) { diff --git a/src/Symfony/Component/Translation/MessageCatalogueInterface.php b/src/Symfony/Component/Translation/MessageCatalogueInterface.php index 40054f05c4..4dad27fbf6 100644 --- a/src/Symfony/Component/Translation/MessageCatalogueInterface.php +++ b/src/Symfony/Component/Translation/MessageCatalogueInterface.php @@ -104,8 +104,6 @@ interface MessageCatalogueInterface * Merges translations from the given Catalogue into the current one. * * The two catalogues must have the same locale. - * - * @param self $catalogue */ public function addCatalogue(MessageCatalogueInterface $catalogue); @@ -114,8 +112,6 @@ interface MessageCatalogueInterface * only when the translation does not exist. * * This is used to provide default translations when they do not exist for the current locale. - * - * @param self $catalogue */ public function addFallbackCatalogue(MessageCatalogueInterface $catalogue); @@ -135,8 +131,6 @@ interface MessageCatalogueInterface /** * Adds a resource for this collection. - * - * @param ResourceInterface $resource A resource instance */ public function addResource(ResourceInterface $resource); } diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php index 2ec83f4fd4..73274b967d 100644 --- a/src/Symfony/Component/Translation/Translator.php +++ b/src/Symfony/Component/Translation/Translator.php @@ -83,11 +83,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface $this->debug = $debug; } - /** - * Sets the ConfigCache factory to use. - * - * @param ConfigCacheFactoryInterface $configCacheFactory - */ public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory) { $this->configCacheFactory = $configCacheFactory; diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriter.php b/src/Symfony/Component/Translation/Writer/TranslationWriter.php index 2f5eaa1edf..d34a93f282 100644 --- a/src/Symfony/Component/Translation/Writer/TranslationWriter.php +++ b/src/Symfony/Component/Translation/Writer/TranslationWriter.php @@ -21,11 +21,6 @@ use Symfony\Component\Translation\Dumper\DumperInterface; */ class TranslationWriter { - /** - * Dumpers used for export. - * - * @var array - */ private $dumpers = array(); /** diff --git a/src/Symfony/Component/Validator/ConstraintValidatorFactoryInterface.php b/src/Symfony/Component/Validator/ConstraintValidatorFactoryInterface.php index 5e216275b4..b647645621 100644 --- a/src/Symfony/Component/Validator/ConstraintValidatorFactoryInterface.php +++ b/src/Symfony/Component/Validator/ConstraintValidatorFactoryInterface.php @@ -21,8 +21,6 @@ interface ConstraintValidatorFactoryInterface * Given a Constraint, this returns the ConstraintValidatorInterface * object that should be used to verify its validity. * - * @param Constraint $constraint The source constraint - * * @return ConstraintValidatorInterface */ public function getInstance(Constraint $constraint); diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php index 516004a7c1..804b6a8ccf 100644 --- a/src/Symfony/Component/Validator/ConstraintViolation.php +++ b/src/Symfony/Component/Validator/ConstraintViolation.php @@ -18,54 +18,15 @@ namespace Symfony\Component\Validator; */ class ConstraintViolation implements ConstraintViolationInterface { - /** - * @var string - */ private $message; - - /** - * @var string - */ private $messageTemplate; - - /** - * @var array - */ private $parameters; - - /** - * @var int|null - */ private $plural; - - /** - * @var mixed - */ private $root; - - /** - * @var string - */ private $propertyPath; - - /** - * @var mixed - */ private $invalidValue; - - /** - * @var Constraint|null - */ private $constraint; - - /** - * @var mixed - */ private $code; - - /** - * @var mixed - */ private $cause; /** diff --git a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php index bc7dc9ee46..0489ab500a 100644 --- a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php +++ b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php @@ -20,15 +20,11 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar { /** * Adds a constraint violation to this list. - * - * @param ConstraintViolationInterface $violation The violation to add */ public function add(ConstraintViolationInterface $violation); /** * Merges an existing violation list into this list. - * - * @param ConstraintViolationListInterface $otherList The list to merge */ public function addAll(ConstraintViolationListInterface $otherList); diff --git a/src/Symfony/Component/Validator/Constraints/IbanValidator.php b/src/Symfony/Component/Validator/Constraints/IbanValidator.php index 20300b00ab..329d630a5a 100644 --- a/src/Symfony/Component/Validator/Constraints/IbanValidator.php +++ b/src/Symfony/Component/Validator/Constraints/IbanValidator.php @@ -35,8 +35,6 @@ class IbanValidator extends ConstraintValidator * included within it, a bank identifier with a fixed position and a fixed length per country * * @see https://www.swift.com/sites/default/files/resources/iban_registry.pdf - * - * @var array */ private static $formats = array( 'AD' => 'AD\d{2}\d{4}\d{4}[\dA-Z]{12}', // Andorra diff --git a/src/Symfony/Component/Validator/Mapping/Cache/CacheInterface.php b/src/Symfony/Component/Validator/Mapping/Cache/CacheInterface.php index e8047c60ca..f770f46154 100644 --- a/src/Symfony/Component/Validator/Mapping/Cache/CacheInterface.php +++ b/src/Symfony/Component/Validator/Mapping/Cache/CacheInterface.php @@ -38,8 +38,6 @@ interface CacheInterface /** * Stores a class metadata in the cache. - * - * @param ClassMetadata $metadata A Class Metadata */ public function write(ClassMetadata $metadata); } diff --git a/src/Symfony/Component/Validator/Mapping/Cache/DoctrineCache.php b/src/Symfony/Component/Validator/Mapping/Cache/DoctrineCache.php index 6dd5447fed..36f1febc5a 100644 --- a/src/Symfony/Component/Validator/Mapping/Cache/DoctrineCache.php +++ b/src/Symfony/Component/Validator/Mapping/Cache/DoctrineCache.php @@ -23,21 +23,11 @@ final class DoctrineCache implements CacheInterface { private $cache; - /** - * Creates a new Doctrine cache. - * - * @param Cache $cache The cache to adapt - */ public function __construct(Cache $cache) { $this->cache = $cache; } - /** - * Sets the cache to adapt. - * - * @param Cache $cache The cache to adapt - */ public function setCache(Cache $cache) { $this->cache = $cache; diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php index 5b82cf6d5d..abaefcab29 100644 --- a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php @@ -376,8 +376,6 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface /** * Merges the constraints of the given metadata into this object. - * - * @param ClassMetadata $source The source metadata */ public function mergeConstraints(ClassMetadata $source) { @@ -590,11 +588,6 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface return CascadingStrategy::NONE; } - /** - * Adds a property metadata. - * - * @param PropertyMetadataInterface $metadata - */ private function addPropertyMetadata(PropertyMetadataInterface $metadata) { $property = $metadata->getPropertyName(); diff --git a/src/Symfony/Component/Validator/Mapping/GenericMetadata.php b/src/Symfony/Component/Validator/Mapping/GenericMetadata.php index 97915ac713..ae69d9b66d 100644 --- a/src/Symfony/Component/Validator/Mapping/GenericMetadata.php +++ b/src/Symfony/Component/Validator/Mapping/GenericMetadata.php @@ -119,8 +119,6 @@ class GenericMetadata implements MetadataInterface * if $traverse is enabled, but $deep is disabled * - {@link TraversalStrategy::NONE} if $traverse is disabled * - * @param Constraint $constraint The constraint to add - * * @return $this * * @throws ConstraintDefinitionException When trying to add the diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php index 0d61e9aa43..9d92de348a 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php @@ -32,9 +32,6 @@ abstract class AbstractLoader implements LoaderInterface */ const DEFAULT_NAMESPACE = '\\Symfony\\Component\\Validator\\Constraints\\'; - /** - * @var array - */ protected $namespaces = array(); /** diff --git a/src/Symfony/Component/Validator/Mapping/Loader/LoaderInterface.php b/src/Symfony/Component/Validator/Mapping/Loader/LoaderInterface.php index 5dadc82eb8..d988309f81 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/LoaderInterface.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/LoaderInterface.php @@ -23,8 +23,6 @@ interface LoaderInterface /** * Loads validation metadata into a {@link ClassMetadata} instance. * - * @param ClassMetadata $metadata The metadata to load - * * @return bool Whether the loader succeeded */ public function loadClassMetadata(ClassMetadata $metadata); diff --git a/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php index 5e97d523bf..da4ef197ad 100644 --- a/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php +++ b/src/Symfony/Component/Validator/Tests/Validator/Abstract2Dot5ApiTest.php @@ -40,9 +40,6 @@ abstract class Abstract2Dot5ApiTest extends AbstractValidatorTest protected $validator; /** - * @param MetadataFactoryInterface $metadataFactory - * @param array $objectInitializers - * * @return ValidatorInterface */ abstract protected function createValidator(MetadataFactoryInterface $metadataFactory, array $objectInitializers = array()); diff --git a/src/Symfony/Component/Validator/Validator/ValidatorInterface.php b/src/Symfony/Component/Validator/Validator/ValidatorInterface.php index e9576f5ece..5bac2e8898 100644 --- a/src/Symfony/Component/Validator/Validator/ValidatorInterface.php +++ b/src/Symfony/Component/Validator/Validator/ValidatorInterface.php @@ -91,8 +91,6 @@ interface ValidatorInterface extends MetadataFactoryInterface * The returned validator adds all generated violations to the given * context. * - * @param ExecutionContextInterface $context The execution context - * * @return ContextualValidatorInterface The validator for that context */ public function inContext(ExecutionContextInterface $context); diff --git a/src/Symfony/Component/Validator/ValidatorBuilderInterface.php b/src/Symfony/Component/Validator/ValidatorBuilderInterface.php index b9b33e4fbc..1b0bd72996 100644 --- a/src/Symfony/Component/Validator/ValidatorBuilderInterface.php +++ b/src/Symfony/Component/Validator/ValidatorBuilderInterface.php @@ -26,8 +26,6 @@ interface ValidatorBuilderInterface /** * Adds an object initializer to the validator. * - * @param ObjectInitializerInterface $initializer The initializer - * * @return $this */ public function addObjectInitializer(ObjectInitializerInterface $initializer); @@ -35,7 +33,7 @@ interface ValidatorBuilderInterface /** * Adds a list of object initializers to the validator. * - * @param array $initializers The initializer + * @param ObjectInitializerInterface[] $initializers * * @return $this */ @@ -53,7 +51,7 @@ interface ValidatorBuilderInterface /** * Adds a list of XML constraint mapping files to the validator. * - * @param array $paths The paths to the mapping files + * @param string[] $paths The paths to the mapping files * * @return $this */ @@ -71,7 +69,7 @@ interface ValidatorBuilderInterface /** * Adds a list of YAML constraint mappings file to the validator. * - * @param array $paths The paths to the mapping files + * @param string[] $paths The paths to the mapping files * * @return $this */ @@ -89,7 +87,7 @@ interface ValidatorBuilderInterface /** * Enables constraint mapping using the given static methods. * - * @param array $methodNames The names of the methods + * @param string[] $methodNames The names of the methods * * @return $this */ @@ -98,8 +96,6 @@ interface ValidatorBuilderInterface /** * Enables annotation based constraint mapping. * - * @param Reader $annotationReader The annotation reader to be used - * * @return $this */ public function enableAnnotationMapping(Reader $annotationReader = null); @@ -114,8 +110,6 @@ interface ValidatorBuilderInterface /** * Sets the class metadata factory used by the validator. * - * @param MetadataFactoryInterface $metadataFactory The metadata factory - * * @return $this */ public function setMetadataFactory(MetadataFactoryInterface $metadataFactory); @@ -123,8 +117,6 @@ interface ValidatorBuilderInterface /** * Sets the cache for caching class metadata. * - * @param CacheInterface $cache The cache instance - * * @return $this */ public function setMetadataCache(CacheInterface $cache); @@ -132,8 +124,6 @@ interface ValidatorBuilderInterface /** * Sets the constraint validator factory used by the validator. * - * @param ConstraintValidatorFactoryInterface $validatorFactory The validator factory - * * @return $this */ public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $validatorFactory); @@ -141,8 +131,6 @@ interface ValidatorBuilderInterface /** * Sets the translator used for translating violation messages. * - * @param TranslatorInterface $translator The translator instance - * * @return $this */ public function setTranslator(TranslatorInterface $translator); diff --git a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php index 2c3d9db850..b173bccf38 100644 --- a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php +++ b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php @@ -20,10 +20,5 @@ use Symfony\Component\VarDumper\Cloner\Data; */ interface DataDumperInterface { - /** - * Dumps a Data object. - * - * @param Data $data A Data object - */ public function dump(Data $data); }