Tobias Schultze
|
a2a4967167
|
Merge branch '2.7' into 2.8
Conflicts:
src/Symfony/Component/Console/Application.php
src/Symfony/Component/Console/Command/Command.php
src/Symfony/Component/Console/Formatter/OutputFormatter.php
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
src/Symfony/Component/Console/Input/Input.php
src/Symfony/Component/Console/Input/InputArgument.php
src/Symfony/Component/Console/Input/InputDefinition.php
src/Symfony/Component/Console/Input/InputOption.php
src/Symfony/Component/Console/Output/OutputInterface.php
src/Symfony/Component/Console/Output/StreamOutput.php
src/Symfony/Component/CssSelector/CssSelector.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/Scope.php
src/Symfony/Component/DependencyInjection/ScopeInterface.php
src/Symfony/Component/Validator/Constraints/Currency.php
src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
|
2015-09-29 14:32:55 +02:00 |
|
Tobias Schultze
|
f1c7c657a7
|
remove api tags from code
|
2015-09-28 19:11:22 +02:00 |
|
Diego Saint Esteben
|
6c4a676d09
|
Add "shared" flag and deprecate scopes concept
|
2015-06-24 12:32:32 -03:00 |
|
Eriksen Costa
|
013f998bb8
|
updated license blocks
|
2012-03-31 18:00:32 -03:00 |
|
Fabien Potencier
|
97cb35b47a
|
[DependencyInjection] tagged the public @api
|
2011-07-20 10:50:27 +02:00 |
|
Fabien Potencier
|
1aabc5da64
|
fixed CS
|
2011-06-08 12:16:48 +02:00 |
|
Fabien Potencier
|
65200aa86a
|
added missing license headers
|
2011-05-31 10:57:06 +02:00 |
|
Fabien Potencier
|
f321fadad6
|
[DependencyInjection] moved most protected things to private
|
2011-03-11 14:50:46 +01:00 |
|
Christophe Coevoet
|
92bfbf575c
|
Fixed CS
|
2011-02-27 20:56:29 +01:00 |
|
Johannes M. Schmitt
|
d4d2d60f7b
|
[DependencyInjection] minor interface change
|
2011-02-13 10:38:10 +01:00 |
|