Nicolas Grekas
d994a748dc
Merge branch '2.8'
...
* 2.8: (65 commits)
[VarDumper] Fix tests for HHVM
Update DateTimeToArrayTransformer.php
Mock microtime() and time() in transient tests
Azerbaijani language pluralization rule
Move HHVM tests out of the allowed failures
Fix merge
[2.6] Towards 100% HHVM compat
[Security/Http] Fix test
[Stopwatch] Fix test
Minor fixes
[Validator] Added missing error codes and turned codes into UUIDs
Towards 100% HHVM compat
Warmup twig templates in non-standard paths (closes #12507 )
[Bridge/PhpUnit] Enforce a consistent locale
Fix param order of assertEquals (expected, actual) in test for Finder\Glob
Fix choice translation domain for expanded choice widget
unify default AccessDeniedExeption message
trigger event with right user (add test)
[Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
fixed CS
...
Conflicts:
UPGRADE-2.8.md
src/Symfony/Bridge/ProxyManager/composer.json
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php
src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
src/Symfony/Component/DependencyInjection/Definition.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/legacy-services9.dot
src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services6.xml
src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services9.xml
src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services6.yml
src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services9.yml
src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
src/Symfony/Component/Form/ResolvedFormType.php
src/Symfony/Component/Form/Tests/CompoundFormTest.php
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2015-07-01 22:40:29 +02:00
Abdellatif Ait boudad
05f3c3db7b
Merge remote-tracking branch 'origin/2.7' into 2.8
...
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
2015-07-01 14:16:54 +00:00
Abdellatif Ait boudad
d1de40e036
Merge remote-tracking branch 'origin/2.6' into 2.7
...
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
src/Symfony/Component/Validator/Constraints/EmailValidator.php
2015-06-25 12:52:11 +00:00
Nicolas Grekas
e5763cea54
[DependencyInjection] Allow anonymous DefinitionDecorator resolving
2015-06-25 13:06:10 +02:00
Diego Saint Esteben
6c4a676d09
Add "shared" flag and deprecate scopes concept
2015-06-24 12:32:32 -03:00
Martin Hasoň
0b8b58c586
[DependencyInjection] Fixed decoration of service for service with parent
2015-05-18 11:41:40 +02:00
Fabien Potencier
22c2345cb1
feature #14155 Removed deprecations in DependencyInjection component (dosten)
...
This PR was squashed before being merged into the 3.0-dev branch (closes #14155 ).
Discussion
----------
Removed deprecations in DependencyInjection component
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Commits
-------
76ff5a9
Removed deprecations in DependencyInjection component
2015-05-16 15:13:50 +02:00
Diego Saint Esteben
76ff5a96da
Removed deprecations in DependencyInjection component
2015-05-16 15:12:51 +02:00
Nicolas Grekas
8cf0613ead
Merge branch '2.6' into 2.7
...
* 2.6:
[Routing][DependencyInjection] Support .yaml extension in YAML loaders
[DX] improve file loader error for router/other resources in bundle
[FrameworkBundle] Initialize translator with the default locale.
[FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
[2.6][Translation] remove duplicate code for loading catalogue.
[HttpKernel] Cleanup ExceptionListener
CS fixes
[DependencyInjection] Show better error when the Yaml component is not installed
[2.3] SCA for Components - reference mismatches
[Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions)
[2.3] Static Code Analysis for Components
[WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator
[Translation] LoggingTranslator simplifications
[Translation][fixed test] refresh cache when resources are no longer fresh.
[FrameworkBundle] Fixed server:start --router relative path issue #14124
[FrameworkBundle] improve usage of Table helper
[Validator] Added missing Simplified Chinese (zh_CN) translations
[FrameworkBundle] Workaround php -S ignoring auto_prepend_file
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
src/Symfony/Component/Console/Helper/Table.php
src/Symfony/Component/Translation/LoggingTranslator.php
2015-04-18 17:11:06 +02:00
Nicolas Grekas
0191aa24bb
Merge branch '2.3' into 2.6
...
* 2.3:
[Routing][DependencyInjection] Support .yaml extension in YAML loaders
[DX] improve file loader error for router/other resources in bundle
[FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
[HttpKernel] Cleanup ExceptionListener
CS fixes
[DependencyInjection] Show better error when the Yaml component is not installed
[2.3] SCA for Components - reference mismatches
[2.3] Static Code Analysis for Components
[Translation][fixed test] refresh cache when resources are no longer fresh.
[Validator] Added missing Simplified Chinese (zh_CN) translations
[FrameworkBundle] Workaround php -S ignoring auto_prepend_file
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
src/Symfony/Component/Console/Descriptor/TextDescriptor.php
src/Symfony/Component/Console/Helper/TableHelper.php
src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
src/Symfony/Component/Yaml/Tests/InlineTest.php
2015-04-18 17:02:51 +02:00
Vladimir Reznichenko
78cc93c3b2
[2.3] Static Code Analysis for Components
2015-04-15 16:34:28 +02:00
Nicolas Grekas
998dedf788
[2.7] silence deprecations for getFactory*() BC layer
2015-01-07 08:44:59 +01:00
Nicolas Grekas
2856caed2f
[2.6] cleanup deprecated uses
2015-01-05 09:56:52 +01:00
Nicolas Grekas
f683a7a72c
[DependencyInjection] use/fix newest Definition::setFactory
2014-12-24 07:58:22 +01:00
Fabien Potencier
72c169e8a1
Merge branch '2.5' into 2.6
...
* 2.5:
[2.3] CS And DocBlock Fixes
[2.3] CS Fixes
[FrameworkBundle] Fixed Translation loader and update translation command.
[Console] remove « use » statement for PHP built-in exception classes.
[SecurityBundle] adds unit tests suite for SecurityDataCollector class.
Conflicts:
src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
src/Symfony/Component/Form/Form.php
src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
src/Symfony/Component/OptionsResolver/Options.php
src/Symfony/Component/OptionsResolver/OptionsResolver.php
src/Symfony/Component/Process/ProcessPipes.php
src/Symfony/Component/Stopwatch/Stopwatch.php
src/Symfony/Component/Translation/Loader/XliffFileLoader.php
src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
2014-12-22 17:44:09 +01:00
Graham Campbell
83c15db887
[2.3] CS And DocBlock Fixes
2014-12-22 16:58:09 +01:00
Rouven Weßling
bd8531d2d8
added a new Syntax to define factories as callables.
2014-09-24 08:27:41 +02:00
Fabien Potencier
0555b7f2ab
made types consistent with those defined in Hack
2014-04-13 20:00:14 +02:00
Fabien Potencier
61dd06ea27
fixed CS
2013-10-30 09:30:20 +01:00
bronze1man
970ce2c413
[DependencyInjection] fixed #8570
2013-07-25 13:55:15 +08:00
Fabien Potencier
ff1b990075
merged 2.0
2012-09-17 22:41:57 +02:00
Christophe Coevoet
05f7f78332
Fixed the phpdoc in the DependencyInjection component
2012-09-08 00:56:45 +02:00
Fabien Potencier
3bdf52a16a
fixed CS
2012-05-18 19:42:42 +02:00
Fabien Potencier
e173d79e34
fixed CS
2012-05-18 19:37:58 +02:00
Fabien Potencier
41621e42e9
fixed phpdoc @param alignment
2012-05-15 22:19:31 +02:00
Fabien Potencier
ce9791246b
fixed phpdoc @param alignment
2012-05-15 18:56:32 +02:00
Eriksen Costa
013f998bb8
updated license blocks
2012-03-31 18:00:32 -03:00
Fabien Potencier
142cef21bb
merged 2.0
2011-12-13 16:12:53 +01:00
Fabien Potencier
e3421a0b1d
[DoctrineBridge] fixed some CS
2011-12-13 10:22:12 +01:00
Jeremy Mikola
123f514e06
[DependencyInjection] Use component-specific SPL exceptions
...
This replaces existing use of core SPL exceptions with the equivalent classes defined within the component. Although method documentation has been changed, this change should be BC since the component-specific SPL exceptions extend their core counterpart.
This commit purposely omits any changes to the PhpDumper, which throws several core SPL exceptions.
2011-12-04 22:21:11 -08:00
Fabien Potencier
65200aa86a
added missing license headers
2011-05-31 10:57:06 +02:00
Pascal Borreli
8c0beea677
[Phpdoc] Cleaning/fixing
2011-04-23 15:18:47 +00:00
Kris Wallsmith
cdf706d357
[DependencyInjection] renamed Definition::setArgument() as replaceArgument() to be more specific
2011-04-20 04:47:44 -07:00
Johannes M. Schmitt
6ea9fb16c7
[DependencyInjection] refactored code a bit, added some more logging messages
2011-04-14 21:01:37 +02:00
Fabien Potencier
f321fadad6
[DependencyInjection] moved most protected things to private
2011-03-11 14:50:46 +01:00
Fabien Potencier
a8d05746ff
Merge remote branch 'schmittjoh/propertyAnnotations'
...
* schmittjoh/propertyAnnotations:
[DependencyInjection] added some tests
[DependencyInjection] adds property injection
2011-03-11 13:12:12 +01:00
Amal Raghav
517735e581
fix for ignoring abstract definition
2011-03-11 10:36:48 +01:00
Johannes Schmitt
eb2eb2e47a
[DependencyInjection] adds property injection
2011-03-05 13:03:28 +01:00
Tim Nagel
7173764dc1
[Dependency Injection] PHPDoc
2011-02-14 11:16:04 +01:00
Jeremy Mikola
743f25a287
[DependencyInjection] Create explicit factoryClass property for Definitions
...
Previously, the Definition class was used both for type inference and factory construction (if factoryService was absent). This is fine for cases where classes create instances of themselves (e.g. getInstance() or create()), but leads to ambiguity when we have a separate factory class.
2011-02-05 20:39:42 +01:00
Johannes Schmitt
803dd58002
add definition inheritance support
2011-01-28 09:12:29 +01:00