Commita7d13cf

committed

Merge branch '3.4' into 4.2

* 3.4: Recommend including the package name in messages add blank line before directive

2 parentsf6fcc14 +6434a5b commita7d13cfCopy full SHA for a7d13cf

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -91,7 +91,7 @@ A feature is marked as deprecated by adding a ``@deprecated`` phpdoc to
`91`	`91`	`relevant classes, methods, properties, ...::`
`92`	`92`
`93`	`93`	`/**`
`94`		`- * @deprecated sinceversion 2.8, to be removed in 3.0. Use XXX instead.`
	`94`	`+ * @deprecated sincevendor-name/package-name 2.8, to be removed in 3.0. Use XXX instead.`
`95`	`95`	`*/`
`96`	`96`
`97`	`97`	`The deprecation message should indicate the version when the class/method was`
@@ -102,7 +102,7 @@ A PHP ``E_USER_DEPRECATED`` error must also be triggered to help people with
`102`	`102`	`the migration starting one or two minor versions before the version where the`
`103`	`103`	`feature will be removed (depending on the criticality of the removal)::`
`104`	`104`
`105`		`- @trigger_error('XXX() is deprecated sinceversion 2.8 and will be removed in 3.0. Use XXX instead.', E_USER_DEPRECATED);`
	`105`	`+ @trigger_error('XXX() is deprecated sincevendor-name/package-name 2.8 and will be removed in 3.0. Use XXX instead.', E_USER_DEPRECATED);`
`106`	`106`
`107`	`107`	Without the `@-silencing operator`_, users would need to opt-out from deprecation
`108`	`108`	`notices. Silencing swaps this behavior and allows users to opt-in when they are`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ short example containing most features described below::`
`67`	`67`	`*/`
`68`	`68`	`public function someDeprecatedMethod()`
`69`	`69`	`{`
`70`		`- @trigger_error(sprintf('The %s() method is deprecated sinceversion 2.8 and will be removed in 3.0. Use Acme\Baz::someMethod() instead.', __METHOD__), E_USER_DEPRECATED);`
	`70`	`+ @trigger_error(sprintf('The %s() method is deprecated sincevendor-name/package-name 2.8 and will be removed in 3.0. Use Acme\Baz::someMethod() instead.', __METHOD__), E_USER_DEPRECATED);`
`71`	`71`
`72`	`72`	`return Baz::someMethod();`
`73`	`73`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -722,6 +722,7 @@ There's a lot more to learn and a lot of powerful tricks in the form system.`
`722`	`722`
`723`	`723`	`Learn more`
`724`	`724`	`----------`
	`725`	`+`
`725`	`726`	`..toctree::`
`726`	`727`	`:maxdepth:1`
`727`	`728`	`:glob:`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ or you decided not to maintain it anymore), you can deprecate its definition:`
`230`	`230`
`231`	`231`	`# config/services.yaml`
`232`	`232`	`App\Service\OldService:`
`233`		`-deprecated:The "%service_id%" service is deprecated since 2.8 and will be removed in 3.0.`
	`233`	`+deprecated:The "%service_id%" service is deprecated sincevendor-name/package-name2.8 and will be removed in 3.0.`
`234`	`234`
`235`	`235`	`..code-block::xml`
`236`	`236`
`@@ -242,7 +242,7 @@ or you decided not to maintain it anymore), you can deprecate its definition:`
`242`	`242`
`243`	`243`	`<services>`
`244`	`244`	`<serviceid="App\Service\OldService">`
`245`		`- <deprecated>The "%service_id%" service is deprecated since 2.8 and will be removed in 3.0.</deprecated>`
	`245`	`+ <deprecated>The "%service_id%" service is deprecated sincevendor-name/package-name2.8 and will be removed in 3.0.</deprecated>`
`246`	`246`	`</service>`
`247`	`247`	`</services>`
`248`	`248`	`</container>`
`@@ -256,7 +256,7 @@ or you decided not to maintain it anymore), you can deprecate its definition:`
`256`	`256`	`->register(OldService::class)`
`257`	`257`	`->setDeprecated(`
`258`	`258`	`true,`
`259`		`- 'The "%service_id%" service is deprecated since 2.8 and will be removed in 3.0.'`
	`259`	`+ 'The "%service_id%" service is deprecated sincevendor-name/package-name2.8 and will be removed in 3.0.'`
`260`	`260`	`)`
`261`	`261`	`;`
`262`	`262`

Comments

(0)