Rename auth bundle generator and voter #194

catalyst/api-bundle/Access/Generator.php

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

catalyst/api-bundle/Access/Voter.php

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

catalyst/auth-bundle/Service/ACLGenerator.php

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

catalyst/auth-bundle/Service/ACLVoter.php

@@ -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\Security;
 
-class Voter extends BaseVoter
+class ACLVoter extends BaseVoter
 {
     protected $acl_gen;
     protected $user_class;
     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->user_class = $user_class;

config/services.yaml

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

src/Controller/RoleController.php

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

src/Controller/TestController.php

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