Tobias Schultze
|
8573385a83
|
Merge branch '2.3' into 2.7
Conflicts:
src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
src/Symfony/Component/ClassLoader/DebugClassLoader.php
src/Symfony/Component/ClassLoader/UniversalClassLoader.php
src/Symfony/Component/Console/Command/Command.php
src/Symfony/Component/DependencyInjection/Definition.php
src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
src/Symfony/Component/EventDispatcher/Event.php
src/Symfony/Component/Filesystem/Exception/IOException.php
src/Symfony/Component/HttpFoundation/File/File.php
src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
src/Symfony/Component/HttpFoundation/StreamedResponse.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
src/Symfony/Component/HttpKernel/HttpKernel.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/KernelInterface.php
src/Symfony/Component/HttpKernel/Log/LoggerInterface.php
src/Symfony/Component/HttpKernel/Log/NullLogger.php
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Routing/RequestContext.php
src/Symfony/Component/Routing/Route.php
src/Symfony/Component/Templating/EngineInterface.php
src/Symfony/Component/Templating/PhpEngine.php
src/Symfony/Component/Templating/TemplateNameParser.php
src/Symfony/Component/Templating/TemplateReference.php
src/Symfony/Component/Templating/TemplateReferenceInterface.php
src/Symfony/Component/Translation/IdentityTranslator.php
src/Symfony/Component/Translation/Translator.php
src/Symfony/Component/Validator/ConstraintViolationInterface.php
src/Symfony/Component/Validator/Constraints/False.php
src/Symfony/Component/Validator/Constraints/FalseValidator.php
src/Symfony/Component/Validator/Constraints/GroupSequence.php
src/Symfony/Component/Validator/Constraints/Image.php
src/Symfony/Component/Validator/Constraints/Null.php
src/Symfony/Component/Validator/Constraints/NullValidator.php
src/Symfony/Component/Validator/Constraints/True.php
src/Symfony/Component/Validator/Constraints/TrueValidator.php
src/Symfony/Component/Validator/ExecutionContextInterface.php
src/Symfony/Component/Validator/ValidatorInterface.php
|
2015-09-29 14:06:14 +02:00 |
|
Tobias Schultze
|
f1c7c657a7
|
remove api tags from code
|
2015-09-28 19:11:22 +02:00 |
|
Graham Campbell
|
443307edc1
|
Docblock fixes
|
2014-11-30 13:33:44 +00:00 |
|
Fabien Potencier
|
b5b12a54f7
|
Merge branch '2.3' into 2.5
* 2.3:
Remove aligned '=>' and '='
Break infinite loop while resolving aliases
[Security][listener] change priority of switchuser
Improved the phpdoc for security token classes
bumped Symfony version to 2.3.22
updated VERSION for 2.3.21
update CONTRIBUTORS for 2.3.21
updated CHANGELOG for 2.3.21
Conflicts:
src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
src/Symfony/Bridge/Propel1/Form/Type/ModelType.php
src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
src/Symfony/Component/Console/Helper/ProgressHelper.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/DependencyInjection/Container.php
src/Symfony/Component/Finder/Shell/Command.php
src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
src/Symfony/Component/Form/Extension/Core/Type/FormType.php
src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
src/Symfony/Component/HttpFoundation/File/UploadedFile.php
src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
src/Symfony/Component/Routing/Route.php
src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
src/Symfony/Component/Templating/PhpEngine.php
src/Symfony/Component/Validator/Constraints/ImageValidator.php
src/Symfony/Component/Validator/Constraints/TypeValidator.php
|
2014-10-26 08:41:27 +01:00 |
|
Disquedur
|
51312d31cc
|
Remove aligned '=>' and '='
|
2014-10-26 08:30:58 +01:00 |
|
Tobias Schultze
|
f6c12bd6de
|
[Templating] fix logic regarding template references and many phpdocs
|
2013-10-01 14:37:05 +02:00 |
|
Fabien Potencier
|
41621e42e9
|
fixed phpdoc @param alignment
|
2012-05-15 22:19:31 +02:00 |
|
Fabien Potencier
|
5c06b3cfeb
|
[Templating] tagged the public @api
|
2011-07-20 10:27:25 +02:00 |
|
Fabien Potencier
|
5be0bafe7f
|
removed TemplateReferenceInterface::getSignature() (replaced by the existing getLogicalName() which already acts as a unique identifier)
|
2011-06-07 10:12:38 +02:00 |
|
Martin Hason
|
185144bc46
|
[Templating] changed __toString method (synonym for getLogicalName method)
|
2011-04-08 11:33:35 +02:00 |
|
Martin Hason
|
20c5db2197
|
[Templating] fixed phpdoc a test
|
2011-04-08 11:24:28 +02:00 |
|
Martin Hason
|
6b5d991685
|
[Templating] added method to return the template logical name, added test
|
2011-04-08 10:31:47 +02:00 |
|
Fabien Potencier
|
8c423edfef
|
replaced symfony-project.org by symfony.com
|
2011-03-06 12:40:06 +01:00 |
|
Pascal Borreli
|
5a922dae22
|
[Templating] Removed useless else
|
2011-02-27 18:36:38 +01:00 |
|
Fabien Potencier
|
e8144e473e
|
[Templating] added getPath() to TemplateReferenceInterface as it's used in the child class in FrameworkBundle
|
2011-02-21 19:24:27 +01:00 |
|
Victor Berchet
|
af81bcabf0
|
[Templating] Refactor the component
|
2011-02-14 21:11:44 +01:00 |
|