From 4654a4602f797209fbcf3e0c26ffe30fa991ed64 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Wed, 5 Jun 2019 17:06:13 +0800 Subject: [PATCH] Remove references of App\Access\Generator and substitute with Generator from catalyst auth bundle #194 --- src/Controller/APIRoleController.php | 5 +---- src/Controller/BatteryController.php | 6 +----- src/Controller/BatteryManufacturerController.php | 6 +----- src/Controller/BatteryModelController.php | 6 +----- src/Controller/BatterySizeController.php | 6 +----- src/Controller/CustomerController.php | 5 +---- src/Controller/RoleController.php | 2 +- src/Controller/SearchController.php | 6 +----- src/Controller/TestController.php | 2 +- src/Controller/VehicleManufacturerController.php | 6 +----- 10 files changed, 10 insertions(+), 40 deletions(-) diff --git a/src/Controller/APIRoleController.php b/src/Controller/APIRoleController.php index ee6a1bfd..a00d4ba2 100644 --- a/src/Controller/APIRoleController.php +++ b/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); } diff --git a/src/Controller/BatteryController.php b/src/Controller/BatteryController.php index 48e1dde4..c242a9b6 100644 --- a/src/Controller/BatteryController.php +++ b/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, ACLGenerator $acl_gen) + public function __construct(MenuGenerator $menu_gen) { - $this->acl_gen = $acl_gen; parent::__construct($menu_gen); } diff --git a/src/Controller/BatteryManufacturerController.php b/src/Controller/BatteryManufacturerController.php index 1a78605a..f0461f44 100644 --- a/src/Controller/BatteryManufacturerController.php +++ b/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, ACLGenerator $acl_gen) + public function __construct(MenuGenerator $menu_gen) { - $this->acl_gen = $acl_gen; parent::__construct($menu_gen); } diff --git a/src/Controller/BatteryModelController.php b/src/Controller/BatteryModelController.php index 314617fc..81eaa40a 100644 --- a/src/Controller/BatteryModelController.php +++ b/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, ACLGenerator $acl_gen) + public function __construct(MenuGenerator $menu_gen) { - $this->acl_gen = $acl_gen; parent::__construct($menu_gen); } diff --git a/src/Controller/BatterySizeController.php b/src/Controller/BatterySizeController.php index 6d6179a7..d9eb82d2 100644 --- a/src/Controller/BatterySizeController.php +++ b/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, ACLGenerator $acl_gen) + public function __construct(MenuGenerator $menu_gen) { - $this->acl_gen = $acl_gen; parent::__construct($menu_gen); } diff --git a/src/Controller/CustomerController.php b/src/Controller/CustomerController.php index 8e8e3e72..de95c789 100644 --- a/src/Controller/CustomerController.php +++ b/src/Controller/CustomerController.php @@ -28,11 +28,8 @@ use DateTime; class CustomerController extends BaseController { - protected $acl_gen; - - public function __construct(MenuGenerator $menu_gen, ACLGenerator $acl_gen) + public function __construct(MenuGenerator $menu_gen) { - $this->acl_gen = $acl_gen; parent::__construct($menu_gen); } diff --git a/src/Controller/RoleController.php b/src/Controller/RoleController.php index 3d34eb50..3da8e95f 100644 --- a/src/Controller/RoleController.php +++ b/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 { diff --git a/src/Controller/SearchController.php b/src/Controller/SearchController.php index 9632c0fc..38e2fc42 100644 --- a/src/Controller/SearchController.php +++ b/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, ACLGenerator $acl_gen) + public function __construct(MenuGenerator $menu_gen) { - $this->acl_gen = $acl_gen; parent::__construct($menu_gen); } diff --git a/src/Controller/TestController.php b/src/Controller/TestController.php index f21dc537..a5c1e383 100644 --- a/src/Controller/TestController.php +++ b/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; diff --git a/src/Controller/VehicleManufacturerController.php b/src/Controller/VehicleManufacturerController.php index 86e15ee3..db1a402c 100644 --- a/src/Controller/VehicleManufacturerController.php +++ b/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, ACLGenerator $acl_gen) + public function __construct(MenuGenerator $menu_gen) { - $this->acl_gen = $acl_gen; parent::__construct($menu_gen); }