Tobias Schultze
63c77aae53
Merge branch '2.8'
...
Conflicts:
composer.json
src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
src/Symfony/Component/ClassLoader/DebugClassLoader.php
src/Symfony/Component/ClassLoader/UniversalClassLoader.php
src/Symfony/Component/Console/Input/StringInput.php
src/Symfony/Component/Debug/DebugClassLoader.php
src/Symfony/Component/DependencyInjection/Container.php
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/DependencyInjection/ContainerInterface.php
src/Symfony/Component/DependencyInjection/Definition.php
src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
src/Symfony/Component/DependencyInjection/Scope.php
src/Symfony/Component/DependencyInjection/ScopeInterface.php
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/Event.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/Security/Core/composer.json
src/Symfony/Component/Security/Resources/translations/security.tr.xlf
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Translation/Translator.php
2015-09-29 16:08:28 +02:00
Tobias Schultze
f1c7c657a7
remove api tags from code
2015-09-28 19:11:22 +02:00
Nicolas Grekas
dda085e8c4
Merge branch '2.8'
...
* 2.8: (63 commits)
[Debug] Deprecate ExceptionHandler::createResponse
[Debug] cleanup ExceptionHandlerTest
Reordered the toolbar elements via service priorities
bumped Symfony version to 2.7.4
Increased the z-index of .sf-toolbar-info
Removed an unused media query
updated VERSION for 2.7.3
updated CHANGELOG for 2.7.3
Redesigned "abbr" elements
Restored the old behavior for toolbars with lots of elements
Tweaks and bug fixes
Added some upgrade notes about the new toolbar design
fixed typo in translation keys
Fix the return value on error for intl methods returning arrays
Removed an useless CSS class and added styles for <hr>
Added a new profiler_markup_version to improve BC of the new toolbar
Fix merge
Removed an unused import
Reverted the feature to display different toolbar versions
Minor JavaScript optimizations
...
Conflicts:
CHANGELOG-2.7.md
UPGRADE-2.8.md
src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
2015-08-01 08:48:35 +02:00
Tomaz Ahlin
3ad0794aa1
[DependencyInjection] fixed FrozenParameterBag and improved Parameter…
2015-07-26 20:10:26 +02:00
Grégoire Pineau
c13a4ff855
[DependencyInjection] Added ParameterBagInterface::remove
2015-07-07 14:33:24 +02:00
Graham Campbell
83c15db887
[2.3] CS And DocBlock Fixes
2014-12-22 16:58:09 +01:00
Graham Campbell
443307edc1
Docblock fixes
2014-11-30 13:33:44 +00:00
Fabien Potencier
e96b018805
fixed types in phpdocs
2014-04-16 12:30:19 +02:00
Fabien Potencier
d100ffaf76
fixed CS
2012-07-09 14:54:20 +02:00
avorobiev
19bdae1b90
[DependencyInjection] Fixed unescaping of class arguments
2012-07-02 18:10:38 +04:00
Sergey Linnik
1227cc2a8a
add escapeValue to ParameterBagInterface
2012-05-30 21:50:31 +04:00
Fabien Potencier
41621e42e9
fixed phpdoc @param alignment
2012-05-15 22:19:31 +02:00
Fabien Potencier
97cb35b47a
[DependencyInjection] tagged the public @api
2011-07-20 10:50:27 +02:00
Fabien Potencier
0168241014
[DependencyInjection] renamed NonExistentParameterException and NonExistentServiceException to ParameterNotFoundException and ServiceNotFoundException
2011-05-17 16:26:08 +02:00
Christophe Coevoet
a54d6b7e58
[DependencyInjection] Removed the public keyword from interface
2011-05-10 13:55:08 +02:00
Christophe Coevoet
1bb6b97c1c
[DependencyInjection] Added missing methods in the ParameterBagInterface
...
The Container relies on the resolve() value which was not part of
the interface.
2011-05-10 02:34:02 +02:00
Fabien Potencier
175f944f93
[DependencyInjection] added NonExistentParameterException that indicates where a non-existent parameter is being used
2011-04-26 12:36:25 +02:00
Pascal Borreli
8c0beea677
[Phpdoc] Cleaning/fixing
2011-04-23 15:18:47 +00:00
Fabien Potencier
8c423edfef
replaced symfony-project.org by symfony.com
2011-03-06 12:40:06 +01:00
Dominique Bongiraud
64fb94c725
normalized license messages in PHP files
2011-01-18 08:07:46 +01:00
Kris Wallsmith
f79e23ffb5
Removed all those spaces after @author that were bothering me so…
2010-10-18 16:55:41 +02:00
Kris Wallsmith
0b1f3145ae
Removed unnecessary "public" from interface method signatures.
2010-10-18 16:55:09 +02:00
Fabien Potencier
bf82cf42dd
renamed Symfony\Components to Symfony\Component
2010-08-20 23:09:55 +02:00