minor #15922 [Security] Fix trigger_error calls in voters (WouterJ)

Tobion · Tobion · commit 4cc8b7678772 · 2015-09-26T20:56:55.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Security] Fix trigger_error calls in voters Fixes typos found by @weaverryan in #15151 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 69e80be Fix trigger_error calls
diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
@@ -77,7 +77,7 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
      */
     public function supportsAttribute($attribute)
     {
-        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.', E_USER_DEPRECATED);
 
         foreach ($this->voters as $voter) {
             if ($voter->supportsAttribute($attribute)) {
@@ -93,7 +93,7 @@ public function supportsAttribute($attribute)
      */
     public function supportsClass($class)
     {
-        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.', E_USER_DEPRECATED);
 
         foreach ($this->voters as $voter) {
             if ($voter->supportsClass($class)) {
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php
@@ -26,7 +26,7 @@ abstract class AbstractVoter implements VoterInterface
      */
     public function supportsAttribute($attribute)
     {
-        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.', E_USER_DEPRECATED);
 
         return in_array($attribute, $this->getSupportedAttributes());
     }
@@ -36,7 +36,7 @@ public function supportsAttribute($attribute)
      */
     public function supportsClass($class)
     {
-        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.', E_USER_DEPRECATED);
 
         foreach ($this->getSupportedClasses() as $supportedClass) {
             if ($supportedClass === $class || is_subclass_of($class, $supportedClass)) {
@@ -115,7 +115,7 @@ public function vote(TokenInterface $token, $object, array $attributes)
      */
     protected function supports($attribute, $class)
     {
-        @trigger_error('The getSupportedClasses and getSupportedAttributes methods are deprecated since version 2.8 and will be removed in version 3.0. Overwrite supports instead.');
+        @trigger_error('The getSupportedClasses and getSupportedAttributes methods are deprecated since version 2.8 and will be removed in version 3.0. Overwrite supports instead.', E_USER_DEPRECATED);
 
         $classIsSupported = false;
         foreach ($this->getSupportedClasses() as $supportedClass) {
@@ -159,7 +159,7 @@ protected function isClassInstanceOf($actualClass, $expectedClass)
      */
     protected function getSupportedClasses()
     {
-        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.', E_USER_DEPRECATED);
     }
 
     /**
@@ -171,7 +171,7 @@ protected function getSupportedClasses()
      */
     protected function getSupportedAttributes()
     {
-        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.', E_USER_DEPRECATED);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ abstract class AbstractVoter implements VoterInterface`
`26`	`26`	`*/`
`27`	`27`	`public function supportsAttribute($attribute)`
`28`	`28`	`{`
`29`		`- @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');`
	`29`	`+ @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.', E_USER_DEPRECATED);`
`30`	`30`
`31`	`31`	`return in_array($attribute, $this->getSupportedAttributes());`
`32`	`32`	`}`
`@@ -36,7 +36,7 @@ public function supportsAttribute($attribute)`
`36`	`36`	`*/`
`37`	`37`	`public function supportsClass($class)`
`38`	`38`	`{`
`39`		`- @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');`
	`39`	`+ @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.', E_USER_DEPRECATED);`
`40`	`40`
`41`	`41`	`foreach ($this->getSupportedClasses() as $supportedClass) {`
`42`	`42`	`if ($supportedClass === $class \|\| is_subclass_of($class, $supportedClass)) {`
`@@ -115,7 +115,7 @@ public function vote(TokenInterface $token, $object, array $attributes)`
`115`	`115`	`*/`
`116`	`116`	`protected function supports($attribute, $class)`
`117`	`117`	`{`
`118`		`- @trigger_error('The getSupportedClasses and getSupportedAttributes methods are deprecated since version 2.8 and will be removed in version 3.0. Overwrite supports instead.');`
	`118`	`+ @trigger_error('The getSupportedClasses and getSupportedAttributes methods are deprecated since version 2.8 and will be removed in version 3.0. Overwrite supports instead.', E_USER_DEPRECATED);`
`119`	`119`
`120`	`120`	`$classIsSupported = false;`
`121`	`121`	`foreach ($this->getSupportedClasses() as $supportedClass) {`
`@@ -159,7 +159,7 @@ protected function isClassInstanceOf($actualClass, $expectedClass)`
`159`	`159`	`*/`
`160`	`160`	`protected function getSupportedClasses()`
`161`	`161`	`{`
`162`		`- @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');`
	`162`	`+ @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.', E_USER_DEPRECATED);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`/**`
`@@ -171,7 +171,7 @@ protected function getSupportedClasses()`
`171`	`171`	`*/`
`172`	`172`	`protected function getSupportedAttributes()`
`173`	`173`	`{`
`174`		`- @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.');`
	`174`	`+ @trigger_error('The '.__METHOD__.' is deprecated since version 2.8 and will be removed in version 3.0.', E_USER_DEPRECATED);`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`/**`