minor #15922 [Security] Fix trigger_error calls in voters (WouterJ)
This PR was merged into the 2.8 branch.
Discussion
----------
[Security] Fix trigger_error calls in voters
Fixes typos found by @weaverryan in https://github.com/symfony/symfony/pull/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
This commit is contained in:
commit
4cc8b76787
@ -77,7 +77,7 @@ class AccessDecisionManager implements AccessDecisionManagerInterface
|
|||||||
*/
|
*/
|
||||||
public function supportsAttribute($attribute)
|
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) {
|
foreach ($this->voters as $voter) {
|
||||||
if ($voter->supportsAttribute($attribute)) {
|
if ($voter->supportsAttribute($attribute)) {
|
||||||
@ -93,7 +93,7 @@ class AccessDecisionManager implements AccessDecisionManagerInterface
|
|||||||
*/
|
*/
|
||||||
public function supportsClass($class)
|
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) {
|
foreach ($this->voters as $voter) {
|
||||||
if ($voter->supportsClass($class)) {
|
if ($voter->supportsClass($class)) {
|
||||||
|
@ -26,7 +26,7 @@ abstract class AbstractVoter implements VoterInterface
|
|||||||
*/
|
*/
|
||||||
public function supportsAttribute($attribute)
|
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());
|
return in_array($attribute, $this->getSupportedAttributes());
|
||||||
}
|
}
|
||||||
@ -36,7 +36,7 @@ abstract class AbstractVoter implements VoterInterface
|
|||||||
*/
|
*/
|
||||||
public function supportsClass($class)
|
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) {
|
foreach ($this->getSupportedClasses() as $supportedClass) {
|
||||||
if ($supportedClass === $class || is_subclass_of($class, $supportedClass)) {
|
if ($supportedClass === $class || is_subclass_of($class, $supportedClass)) {
|
||||||
@ -115,7 +115,7 @@ abstract class AbstractVoter implements VoterInterface
|
|||||||
*/
|
*/
|
||||||
protected function supports($attribute, $class)
|
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;
|
$classIsSupported = false;
|
||||||
foreach ($this->getSupportedClasses() as $supportedClass) {
|
foreach ($this->getSupportedClasses() as $supportedClass) {
|
||||||
@ -159,7 +159,7 @@ abstract class AbstractVoter implements VoterInterface
|
|||||||
*/
|
*/
|
||||||
protected function getSupportedClasses()
|
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 @@ abstract class AbstractVoter implements VoterInterface
|
|||||||
*/
|
*/
|
||||||
protected function getSupportedAttributes()
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user