Merge branch '4.4'

* 4.4: Adding .gitattributes to remove Tests directory from "dist" [Messenger] Don't deep merge routing.senders config option
2019-09-16 10:16:50 +02:00 · 2019-09-16 10:16:50 +02:00 · 21d9320be2
commit 21d9320be2
parent 0354395ee9 5b531b6f76
64 changed files with 127 additions and 1 deletions
--- a/src/Symfony/Bridge/Doctrine/.gitattributes
+++ b/src/Symfony/Bridge/Doctrine/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Bridge/Monolog/.gitattributes
+++ b/src/Symfony/Bridge/Monolog/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Bridge/ProxyManager/.gitattributes
+++ b/src/Symfony/Bridge/ProxyManager/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Bridge/Twig/.gitattributes
+++ b/src/Symfony/Bridge/Twig/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Bundle/DebugBundle/.gitattributes
+++ b/src/Symfony/Bundle/DebugBundle/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Bundle/FrameworkBundle/.gitattributes
+++ b/src/Symfony/Bundle/FrameworkBundle/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@ -35,7 +35,8 @@ CHANGELOG
 * Overriding the methods `KernelTestCase::tearDown()` and `WebTestCase::tearDown()` without the `void` return-type is deprecated.
 * Added new `error_controller` configuration to handle system exceptions
 * Added sort option for `translation:update` command.
- 
+ * [BC Break] The `framework.messenger.routing.senders` config key is not deep merged anymore.
+
 4.3.0
 -----

--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@ -1031,6 +1031,7 @@ class Configuration implements ConfigurationInterface
                                })
                            ->end()
                            ->prototype('array')
+                                ->performNoDeepMerging()
                                ->children()
                                    ->arrayNode('senders')
                                        ->requiresAtLeastOneElement()
--- a/src/Symfony/Bundle/SecurityBundle/.gitattributes
+++ b/src/Symfony/Bundle/SecurityBundle/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Bundle/TwigBundle/.gitattributes
+++ b/src/Symfony/Bundle/TwigBundle/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Bundle/WebProfilerBundle/.gitattributes
+++ b/src/Symfony/Bundle/WebProfilerBundle/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Bundle/WebServerBundle/.gitattributes
+++ b/src/Symfony/Bundle/WebServerBundle/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Asset/.gitattributes
+++ b/src/Symfony/Component/Asset/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/BrowserKit/.gitattributes
+++ b/src/Symfony/Component/BrowserKit/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Cache/.gitattributes
+++ b/src/Symfony/Component/Cache/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Config/.gitattributes
+++ b/src/Symfony/Component/Config/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Console/.gitattributes
+++ b/src/Symfony/Component/Console/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/CssSelector/.gitattributes
+++ b/src/Symfony/Component/CssSelector/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Debug/.gitattributes
+++ b/src/Symfony/Component/Debug/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/DependencyInjection/.gitattributes
+++ b/src/Symfony/Component/DependencyInjection/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/DomCrawler/.gitattributes
+++ b/src/Symfony/Component/DomCrawler/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Dotenv/.gitattributes
+++ b/src/Symfony/Component/Dotenv/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/ErrorHandler/.gitattributes
+++ b/src/Symfony/Component/ErrorHandler/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/ErrorRenderer/.gitattributes
+++ b/src/Symfony/Component/ErrorRenderer/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/EventDispatcher/.gitattributes
+++ b/src/Symfony/Component/EventDispatcher/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/ExpressionLanguage/.gitattributes
+++ b/src/Symfony/Component/ExpressionLanguage/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Filesystem/.gitattributes
+++ b/src/Symfony/Component/Filesystem/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Finder/.gitattributes
+++ b/src/Symfony/Component/Finder/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Form/.gitattributes
+++ b/src/Symfony/Component/Form/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/HttpClient/.gitattributes
+++ b/src/Symfony/Component/HttpClient/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/HttpFoundation/.gitattributes
+++ b/src/Symfony/Component/HttpFoundation/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/HttpKernel/.gitattributes
+++ b/src/Symfony/Component/HttpKernel/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Inflector/.gitattributes
+++ b/src/Symfony/Component/Inflector/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Intl/.gitattributes
+++ b/src/Symfony/Component/Intl/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Ldap/.gitattributes
+++ b/src/Symfony/Component/Ldap/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Lock/.gitattributes
+++ b/src/Symfony/Component/Lock/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Mailer/.gitattributes
+++ b/src/Symfony/Component/Mailer/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/.gitattributes
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Mailer/Bridge/Google/.gitattributes
+++ b/src/Symfony/Component/Mailer/Bridge/Google/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/.gitattributes
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/.gitattributes
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/.gitattributes
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/.gitattributes
+++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Messenger/.gitattributes
+++ b/src/Symfony/Component/Messenger/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Mime/.gitattributes
+++ b/src/Symfony/Component/Mime/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/OptionsResolver/.gitattributes
+++ b/src/Symfony/Component/OptionsResolver/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Process/.gitattributes
+++ b/src/Symfony/Component/Process/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/PropertyAccess/.gitattributes
+++ b/src/Symfony/Component/PropertyAccess/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/PropertyInfo/.gitattributes
+++ b/src/Symfony/Component/PropertyInfo/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Routing/.gitattributes
+++ b/src/Symfony/Component/Routing/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Security/Core/.gitattributes
+++ b/src/Symfony/Component/Security/Core/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Security/Csrf/.gitattributes
+++ b/src/Symfony/Component/Security/Csrf/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Security/Guard/.gitattributes
+++ b/src/Symfony/Component/Security/Guard/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Security/Http/.gitattributes
+++ b/src/Symfony/Component/Security/Http/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Serializer/.gitattributes
+++ b/src/Symfony/Component/Serializer/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Stopwatch/.gitattributes
+++ b/src/Symfony/Component/Stopwatch/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Templating/.gitattributes
+++ b/src/Symfony/Component/Templating/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Translation/.gitattributes
+++ b/src/Symfony/Component/Translation/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Validator/.gitattributes
+++ b/src/Symfony/Component/Validator/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/VarDumper/.gitattributes
+++ b/src/Symfony/Component/VarDumper/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/VarExporter/.gitattributes
+++ b/src/Symfony/Component/VarExporter/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/WebLink/.gitattributes
+++ b/src/Symfony/Component/WebLink/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Workflow/.gitattributes
+++ b/src/Symfony/Component/Workflow/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
--- a/src/Symfony/Component/Yaml/.gitattributes
+++ b/src/Symfony/Component/Yaml/.gitattributes
@ -0,0 +1,2 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore