minor #40643 Use symfony/deprecation-contracts instead of trigger_error (andrew-demb)

nicolas-grekas · nicolas-grekas · commit 11db9cd2503c · 2021-04-01T10:19:34.000+02:00
This PR was merged into the 5.3-dev branch. Discussion ---------- Use symfony/deprecation-contracts instead of trigger_error | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | no | New feature? | no  | Deprecations? | yes  | Tickets | -  | License | MIT | Doc PR | -  As `symfony/deprecation-contracts` added to requirements with PR #40468, we can update `trigger_error` call in favor reusing deprecation abstractions Commits ------- 1acc296 Use symfony/deprecation-contracts instead of trigger_error
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -214,7 +214,7 @@ private function addFormSection(ArrayNodeDefinition $rootNode, callable $enableI
                             ->validate()
                                 ->ifTrue()
                                 ->then(function ($v) {
-                                    @trigger_error('Since symfony/framework-bundle 5.2: Setting the "framework.form.legacy_error_messages" option to "true" is deprecated. It will have no effect as of Symfony 6.0.', \E_USER_DEPRECATED);
+                                    trigger_deprecation('symfony/framework-bundle', '5.2', 'Setting the "framework.form.legacy_error_messages" option to "true" is deprecated. It will have no effect as of Symfony 6.0.');
 
                                     return $v;
                                 })
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php
@@ -137,7 +137,7 @@ private function getPayload(Email $email, Envelope $envelope): array
             } else {
                 // fallback to prefix with "h:" to not break BC
                 $headerName = 'h:'.$name;
-                @trigger_error(sprintf('Not prefixing the Mailgun header name with "h:" is deprecated since Symfony  5.1. Use header name "%s" instead.', $headerName), \E_USER_DEPRECATED);
+                trigger_deprecation('symfony/mailer', '5.1', 'Not prefixing the Mailgun header name with "h:" is deprecated. Use header name "%s" instead.', $headerName);
             }
 
             $payload[$headerName] = $header->getBodyAsString();
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=7.2.5",
+        "symfony/deprecation-contracts": "^2.1",
         "symfony/mailer": "^5.2.6"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ private function getPayload(Email $email, Envelope $envelope): array`
`137`	`137`	`} else {`
`138`	`138`	`// fallback to prefix with "h:" to not break BC`
`139`	`139`	`$headerName = 'h:'.$name;`
`140`		`- @trigger_error(sprintf('Not prefixing the Mailgun header name with "h:" is deprecated since Symfony 5.1. Use header name "%s" instead.', $headerName), \E_USER_DEPRECATED);`
	`140`	`+ trigger_deprecation('symfony/mailer', '5.1', 'Not prefixing the Mailgun header name with "h:" is deprecated. Use header name "%s" instead.', $headerName);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`$payload[$headerName] = $header->getBodyAsString();`