Remove references of App\Access\Generator and substitute with Generator from catalyst auth bundle #194

src/Controller/APIRoleController.php

@@ -14,16 +14,13 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException;
 
 use App\Menu\Generator as MenuGenerator;
-use App\Access\Generator as ACLGenerator;
 
 class APIRoleController extends BaseController
 {
-    protected $acl_gen;
     protected $api_acl_gen;
 
-    public function __construct(MenuGenerator $menu_gen, ACLGenerator $acl_gen, APIACLGenerator $api_acl_gen)
+    public function __construct(MenuGenerator $menu_gen, APIACLGenerator $api_acl_gen)
     {
-        $this->acl_gen = $acl_gen;
         $this->api_acl_gen = $api_acl_gen;
         parent::__construct($menu_gen);
     }

src/Controller/BatteryController.php

@@ -17,15 +17,11 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 use App\Menu\Generator as MenuGenerator;
-use App\Access\Generator as ACLGenerator;
 
 class BatteryController extends BaseController
 {
-    protected $acl_gen;
+    public function __construct(MenuGenerator $menu_gen)
-
-    public function __construct(MenuGenerator $menu_gen, ACLGenerator $acl_gen)
     {
-        $this->acl_gen = $acl_gen;
         parent::__construct($menu_gen);
     }
 

src/Controller/BatteryManufacturerController.php

@@ -13,15 +13,11 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 use App\Menu\Generator as MenuGenerator;
-use App\Access\Generator as ACLGenerator;
 
 class BatteryManufacturerController extends BaseController
 {
-    protected $acl_gen;
+    public function __construct(MenuGenerator $menu_gen)
-
-    public function __construct(MenuGenerator $menu_gen, ACLGenerator $acl_gen)
     {
-        $this->acl_gen = $acl_gen;
         parent::__construct($menu_gen);
     }
 

src/Controller/BatteryModelController.php

@@ -11,15 +11,11 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 use App\Menu\Generator as MenuGenerator;
-use App\Access\Generator as ACLGenerator;
 
 class BatteryModelController extends BaseController
 {
-    protected $acl_gen;
+    public function __construct(MenuGenerator $menu_gen)
-
-    public function __construct(MenuGenerator $menu_gen, ACLGenerator $acl_gen)
     {
-        $this->acl_gen = $acl_gen;
         parent::__construct($menu_gen);
     }
 

src/Controller/BatterySizeController.php

@@ -11,15 +11,11 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 use App\Menu\Generator as MenuGenerator;
-use App\Access\Generator as ACLGenerator;
 
 class BatterySizeController extends BaseController
 {
-    protected $acl_gen;
+    public function __construct(MenuGenerator $menu_gen)
-
-    public function __construct(MenuGenerator $menu_gen, ACLGenerator $acl_gen)
     {
-        $this->acl_gen = $acl_gen;
         parent::__construct($menu_gen);
     }
 

src/Controller/CustomerController.php

@@ -28,11 +28,8 @@ use DateTime;
 
 class CustomerController extends BaseController
 {
-    protected $acl_gen;
+    public function __construct(MenuGenerator $menu_gen)
-
-    public function __construct(MenuGenerator $menu_gen, ACLGenerator $acl_gen)
     {
-        $this->acl_gen = $acl_gen;
         parent::__construct($menu_gen);
     }
 

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 App\Access\Generator as ACLGenerator;
+use Catalyst\AuthBundle\Service\Generator as ACLGenerator;
 
 class RoleController extends BaseController
 {

src/Controller/SearchController.php

@@ -13,15 +13,11 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 use App\Menu\Generator as MenuGenerator;
-use App\Access\Generator as ACLGenerator;
 
 class SearchController extends BaseController
 {
-    protected $acl_gen;
+    public function __construct(MenuGenerator $menu_gen)
-
-    public function __construct(MenuGenerator $menu_gen, ACLGenerator $acl_gen)
     {
-        $this->acl_gen = $acl_gen;
         parent::__construct($menu_gen);
     }
 

src/Controller/TestController.php

@@ -3,7 +3,7 @@
 namespace App\Controller;
 
 use App\Ramcar\BaseController;
-use App\Access\Generator;
+use Catalyst\AuthBundle\Service\Generator;
 
 use CrEOF\Spatial\PHP\Types\Geometry\Point;
 

src/Controller/VehicleManufacturerController.php

@@ -11,15 +11,11 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 use App\Menu\Generator as MenuGenerator;
-use App\Access\Generator as ACLGenerator;
 
 class VehicleManufacturerController extends BaseController
 {
-    protected $acl_gen;
+    public function __construct(MenuGenerator $menu_gen)
-
-    public function __construct(MenuGenerator $menu_gen, ACLGenerator $acl_gen)
     {
-        $this->acl_gen = $acl_gen;
         parent::__construct($menu_gen);
     }