8000 [Security] Trigger a deprecation when a voter is missing the VoterInterface by linaori · Pull Request #22629 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Security] Trigger a deprecation when a voter is missing the VoterInterface #22629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

[Security] Trigger a deprecation when a voter is missing the VoterInterface #22629

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0df7c95
Trigger deprecation when missing VoterInterface
May 4, 2017
c8b5f80
Fixed phpunit compatibility
May 4, 2017
4a13ef5
Fixed feedback
May 4, 2017
ab0ab44
Rewording in the change- and upgrade-log
May 4, 2017
b187304
LogicException instead of BadMethodCallException
May 5, 2017
40ac4ec
Added a deprecation warning to AccessDecisionManager::vote()
May 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
LogicException instead of BadMethodCallException
  • Loading branch information
Iltar van der Berg committed May 5, 2017
commit b187304e3de8d1bea25a2203d675cde52b450eed
3 changes: 2 additions & 1 deletion src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Exception\LogicException;

/**
* AccessDecisionManager is the base class for all access decision managers
Expand Down Expand Up @@ -209,6 +210,6 @@ private function vote($voter, TokenInterface $token, $subject, $attributes)
return $voter->vote($token, $subject, $attributes);
}

throw new \BadMethodCallException(sprintf('%s should implement the %s interface when used as voter.', get_class($voter), VoterInterface::class));
throw new LogicException(sprintf('%s should implement the %s interface when used as voter.', get_class($voter), VoterInterface::class));
}
}
21 changes: 21 additions & 0 deletions src/Symfony/Component/Security/Core/Exception/LogicException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\Security\Core\Exception;

/**
* Base LogicException for the Security component.
*
* @author Iltar van der Berg <kjarli@gmail.com>
*/
class LogicException extends \LogicException implements ExceptionInterface
{
}
3 changes: 2 additions & 1 deletion src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
use Symfony\Component\Security\Core\Exception\LogicException;
use Symfony\Component\Security\Core\Tests\Authorization\Stub\VoterWithoutInterface;

class AccessDecisionManagerTest extends TestCase
Expand Down Expand Up @@ -143,7 +144,7 @@ protected function getVoter($vote)

public function testVotingWrongTypeNoVoteMethod()
{
$exception = \BadMethodCallException::class;
$exception = LogicException::class;
$message = sprintf('stdClass should implement the %s interface when used as voter.', VoterInterface::class);

if (method_exists($this, 'expectException')) {
Expand Down
0