rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Rename auth bundle generator and voter #194

Browse source
This commit is contained in:
Kendrick Chan 2019-06-05 19:43:45 +08:00
parent 3994355cf0
commit 93bc1c6c23
7 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
catalyst/api-bundle/Access/Generator.php
View file

@ -2,7 +2,7 @@
namespace Catalyst\APIBundle\Access; namespace Catalyst\APIBundle\Access;
use Catalyst\AuthBundle\Service\Generator as BaseGenerator; use Catalyst\AuthBundle\Service\ACLGenerator as BaseGenerator;
class Generator extends BaseGenerator class Generator extends BaseGenerator
{ {

2
catalyst/api-bundle/Access/Voter.php
View file

@ -2,7 +2,7 @@
namespace Catalyst\APIBundle\Access; namespace Catalyst\APIBundle\Access;
use Catalyst\AuthBundle\Service\Voter as BaseVoter; use Catalyst\AuthBundle\Service\ACLVoter as BaseVoter;
class Voter extends BaseVoter class Voter extends BaseVoter
{ {

2
catalyst/auth-bundle/Service/Generator.php → catalyst/auth-bundle/Service/ACLGenerator.php
View file

@ -9,7 +9,7 @@ use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Routing\RouterInterface;
class Generator class ACLGenerator
{ {
protected $router; protected $router;
protected $cache_dir; protected $cache_dir;

4
catalyst/auth-bundle/Service/Voter.php → catalyst/auth-bundle/Service/ACLVoter.php
View file

@ -6,13 +6,13 @@ use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authorization\Voter\Voter as BaseVoter; use Symfony\Component\Security\Core\Authorization\Voter\Voter as BaseVoter;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
class Voter extends BaseVoter class ACLVoter extends BaseVoter
{ {
protected $acl_gen; protected $acl_gen;
protected $user_class; protected $user_class;
protected $security; protected $security;
public function __construct(Security $security, Generator $acl_gen, $user_class) public function __construct(Security $security, ACLGenerator $acl_gen, $user_class)
{ {
$this->acl_gen = $acl_gen; $this->acl_gen = $acl_gen;
$this->user_class = $user_class; $this->user_class = $user_class;

5
config/services.yaml
View file

@ -40,7 +40,7 @@ services:
$cache_dir: "%kernel.cache_dir%" $cache_dir: "%kernel.cache_dir%"
$config_dir: "%kernel.root_dir%/../config" $config_dir: "%kernel.root_dir%/../config"
Catalyst\AuthBundle\Service\Generator: Catalyst\AuthBundle\Service\ACLGenerator:
arguments: arguments:
$router: "@router.default" $router: "@router.default"
$cache_dir: "%kernel.cache_dir%" $cache_dir: "%kernel.cache_dir%"
@ -48,9 +48,8 @@ services:
$acl_file: "%app_acl_file%" $acl_file: "%app_acl_file%"
$acl_key: "%app_access_key%" $acl_key: "%app_access_key%"
Catalyst\AuthBundle\Service\Voter: Catalyst\AuthBundle\Service\ACLVoter:
arguments: arguments:
$acl_gen: "@Catalyst\\AuthBundle\\Service\\Generator"
$user_class: "App\\Entity\\User" $user_class: "App\\Entity\\User"
tags: ['security.voter'] tags: ['security.voter']

2
src/Controller/RoleController.php
View file

@ -12,7 +12,7 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException; use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException;
use App\Menu\Generator as MenuGenerator; use App\Menu\Generator as MenuGenerator;
use Catalyst\AuthBundle\Service\Generator as ACLGenerator; use Catalyst\AuthBundle\Service\ACLGenerator;
class RoleController extends BaseController class RoleController extends BaseController
{ {

4
src/Controller/TestController.php
View file

@ -3,7 +3,7 @@
namespace App\Controller; namespace App\Controller;
use App\Ramcar\BaseController; use App\Ramcar\BaseController;
use Catalyst\AuthBundle\Service\Generator; use Catalyst\AuthBundle\Service\ACLGenerator;
use CrEOF\Spatial\PHP\Types\Geometry\Point; use CrEOF\Spatial\PHP\Types\Geometry\Point;
@ -14,7 +14,7 @@ use Doctrine\Common\Util\Debug;
class TestController extends BaseController class TestController extends BaseController
{ {
public function index(Generator $acl_gen) public function index(ACLGenerator $acl_gen)
{ {
$params = $this->initParameters('home'); $params = $this->initParameters('home');