minor #13461 [Validator] fixed deprecation notice for ElementMetadata (fabpot)

fabpot · fabpot · commit 26323bc349a2 · 2015-01-20T01:40:55.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Validator] fixed deprecation notice for ElementMetadata | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 2606a6d [Validator] fixed deprecation notice for ElementMetadata
diff --git a/src/Symfony/Component/Validator/Mapping/ElementMetadata.php b/src/Symfony/Component/Validator/Mapping/ElementMetadata.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Validator\Mapping;
 
-trigger_error('The '.__NAMESPACE__.'\ElementMetadata class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\GenericMetadata class instead.', E_USER_DEPRECATED);
-
 /**
  * Contains the metadata of a structural element.
  *
@@ -23,4 +21,10 @@
  */
 abstract class ElementMetadata extends GenericMetadata
 {
+    public function __construct()
+    {
+        if (__CLASS__ === get_class($this) || !in_array(get_parent_class($this), array('Symfony\Component\Validator\Mapping\MemberMetadata', 'Symfony\Component\Validator\Mapping\ClassMetadata'))) {
+            trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\GenericMetadata class instead.', E_USER_DEPRECATED);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Validator\Mapping;`
`13`	`13`
`14`		`-trigger_error('The '.__NAMESPACE__.'\ElementMetadata class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\GenericMetadata class instead.', E_USER_DEPRECATED);`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* Contains the metadata of a structural element.`
`18`	`16`	`*`
`@@ -23,4 +21,10 @@`
`23`	`21`	`*/`
`24`	`22`	`abstract class ElementMetadata extends GenericMetadata`
`25`	`23`	`{`
	`24`	`+ public function __construct()`
	`25`	`+ {`
	`26`	`+ if (__CLASS__ === get_class($this) \|\| !in_array(get_parent_class($this), array('Symfony\Component\Validator\Mapping\MemberMetadata', 'Symfony\Component\Validator\Mapping\ClassMetadata'))) {`
	`27`	`+ trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\GenericMetadata class instead.', E_USER_DEPRECATED);`
	`28`	`+ }`
	`29`	`+ }`
`26`	`30`	`}`