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
Graham Campbell
35e0845f23
[3.0] Removed some old hacks
2014-12-30 11:17:11 +01:00
Graham Campbell
443307edc1
Docblock fixes
2014-11-30 13:33:44 +00:00
Christian Flothmann
367ed3ce85
compare version using PHP_VERSION_ID
...
To let opcode caches optimize cached code, the `PHP_VERSION_ID`
constant is used to detect the current PHP version instead of calling
`version_compare()` with `PHP_VERSION`.
2014-11-17 17:27:42 +01:00
Christian Flothmann
376cc0332d
don't override internal PHP constants
2014-11-16 18:59:41 +01:00
Fabien Potencier
e96b018805
fixed types in phpdocs
2014-04-16 12:30:19 +02:00
Fabien Potencier
3c9c10f3a0
made phpdoc types consistent with those defined in Hack
2014-04-15 07:41:45 +02:00
Fabien Potencier
8552aa4834
fixed PHP 5.3 compatibility
2013-09-19 18:27:31 +02:00
Fabien Potencier
38f7ef0539
[Yaml] reverted previous merge partially (refs #8897 )
2013-09-19 18:24:31 +02:00
Nikita Konstantinov
da44651dc0
[Yaml] Fixed filename in the ParseException message
2013-08-31 03:32:21 +04:00
Romain Neutron
f2e4802565
[Yaml] Normalize exceptions
2012-08-30 21:55:18 +02:00
Fabien Potencier
7ee2f6da75
fixed some phpdoc
2012-01-11 15:46:50 +01:00
Fabien Potencier
e3421a0b1d
[DoctrineBridge] fixed some CS
2011-12-13 10:22:12 +01:00
Fabien Potencier
06614cd6ca
[Yaml] moved exceptions to their own sub-namespace (added a specific exception for the dump)
2011-06-14 16:25:26 +02:00