← All changes | src/Controller/ControllerFactory.php +75 -31 2.3.19 → 2.3.4 View file →

		@@ -7,28 +7,28 @@
7	7	use UserAccessManager\Access\AccessHandler;
8	8	use UserAccessManager\Cache\Cache;
9	9	use UserAccessManager\Config\MainConfig;
10	10	use UserAccessManager\Config\WordpressConfig;
11		-use UserAccessManager\Controller\Backend\Administration\AboutController;
	11	+use UserAccessManager\Controller\Backend\AboutController;
12	12	use UserAccessManager\Controller\Backend\BackendController;
13	13	use UserAccessManager\Controller\Backend\CacheController;
14		-use UserAccessManager\Controller\Backend\ObjectMembership\DynamicGroupsController;
15		-use UserAccessManager\Controller\Backend\ObjectMembership\ObjectController;
16		-use UserAccessManager\Controller\Backend\ObjectMembership\ObjectInformationFactory;
17		-use UserAccessManager\Controller\Backend\ObjectMembership\PostObjectController;
18		-use UserAccessManager\Controller\Backend\Administration\SettingsController;
19		-use UserAccessManager\Controller\Backend\Administration\SetupController;
20		-use UserAccessManager\Controller\Backend\ObjectMembership\TermObjectController;
21		-use UserAccessManager\Controller\Backend\Administration\UserGroupController;
22		-use UserAccessManager\Controller\Backend\ObjectMembership\UserObjectController;
	14	+use UserAccessManager\Controller\Backend\DynamicGroupsController;
	15	+use UserAccessManager\Controller\Backend\ObjectController;
	16	+use UserAccessManager\Controller\Backend\ObjectInformationFactory;
	17	+use UserAccessManager\Controller\Backend\PostObjectController;
	18	+use UserAccessManager\Controller\Backend\SettingsController;
	19	+use UserAccessManager\Controller\Backend\SetupController;
	20	+use UserAccessManager\Controller\Backend\TermObjectController;
	21	+use UserAccessManager\Controller\Backend\UserGroupController;
	22	+use UserAccessManager\Controller\Backend\UserObjectController;
23	23	use UserAccessManager\Controller\Frontend\FrontendController;
24		-use UserAccessManager\Controller\Frontend\Content\PostController;
	24	+use UserAccessManager\Controller\Frontend\PostController;
25	25	use UserAccessManager\Controller\Frontend\RedirectController;
26		-use UserAccessManager\Controller\Frontend\Authentication\ShortCodeController;
27		-use UserAccessManager\Controller\Frontend\Content\TermController;
	26	+use UserAccessManager\Controller\Frontend\ShortCodeController;
	27	+use UserAccessManager\Controller\Frontend\TermController;
28	28	use UserAccessManager\Database\Database;
29	29	use UserAccessManager\File\FileHandler;
30		-use UserAccessManager\File\Delivery\FileObjectFactory;
	30	+use UserAccessManager\File\FileObjectFactory;
31	31	use UserAccessManager\Form\FormFactory;
32	32	use UserAccessManager\Form\FormHelper;
33	33	use UserAccessManager\Object\ObjectHandler;
34	34	use UserAccessManager\Object\ObjectMapHandler;
		@@ -88,16 +88,11 @@
88	88	$this->wordpressConfig
89	89	);
90	90	}
91	91
92		- /**
93		- * @template TController of ObjectController
94		- * @param class-string<TController> $controllerClass
95		- * @return TController
96		- */
97		- private function createObjectController(string $controllerClass): ObjectController
	92	+ public function createBackendObjectController(): ObjectController
98	93	{
99		- return new $controllerClass(
	94	+ return new ObjectController(
100	95	$this->php,
101	96	$this->wordpress,
102	97	$this->wordpressConfig,
103	98	$this->mainConfig,
		@@ -111,36 +106,85 @@
111	106	$this->objectInformationFactory
112	107	);
113	108	}
114	109
115		- public function createBackendObjectController(): ObjectController
116		- {
117		- return $this->createObjectController(ObjectController::class);
118		- }
119		-
120	110	public function createBackendCacheController(): CacheController
121	111	{
122		- return new CacheController($this->cache);
	112	+ return new CacheController(
	113	+ $this->cache
	114	+ );
123	115	}
124	116
125	117	public function createBackendPostObjectController(): PostObjectController
126	118	{
127		- return $this->createObjectController(PostObjectController::class);
	119	+ return new PostObjectController(
	120	+ $this->php,
	121	+ $this->wordpress,
	122	+ $this->wordpressConfig,
	123	+ $this->mainConfig,
	124	+ $this->database,
	125	+ $this->dateUtil,
	126	+ $this->objectHandler,
	127	+ $this->userHandler,
	128	+ $this->userGroupHandler,
	129	+ $this->userGroupAssignmentHandler,
	130	+ $this->accessHandler,
	131	+ $this->objectInformationFactory
	132	+ );
128	133	}
129	134
130	135	public function createBackendTermObjectController(): TermObjectController
131	136	{
132		- return $this->createObjectController(TermObjectController::class);
	137	+ return new TermObjectController(
	138	+ $this->php,
	139	+ $this->wordpress,
	140	+ $this->wordpressConfig,
	141	+ $this->mainConfig,
	142	+ $this->database,
	143	+ $this->dateUtil,
	144	+ $this->objectHandler,
	145	+ $this->userHandler,
	146	+ $this->userGroupHandler,
	147	+ $this->userGroupAssignmentHandler,
	148	+ $this->accessHandler,
	149	+ $this->objectInformationFactory
	150	+ );
133	151	}
134	152
135	153	public function createBackendUserObjectController(): UserObjectController
136	154	{
137		- return $this->createObjectController(UserObjectController::class);
	155	+ return new UserObjectController(
	156	+ $this->php,
	157	+ $this->wordpress,
	158	+ $this->wordpressConfig,
	159	+ $this->mainConfig,
	160	+ $this->database,
	161	+ $this->dateUtil,
	162	+ $this->objectHandler,
	163	+ $this->userHandler,
	164	+ $this->userGroupHandler,
	165	+ $this->userGroupAssignmentHandler,
	166	+ $this->accessHandler,
	167	+ $this->objectInformationFactory
	168	+ );
138	169	}
139	170
140	171	public function createBackendDynamicGroupsController(): DynamicGroupsController
141	172	{
142		- return $this->createObjectController(DynamicGroupsController::class);
	173	+ return new DynamicGroupsController(
	174	+ $this->php,
	175	+ $this->wordpress,
	176	+ $this->wordpressConfig,
	177	+ $this->mainConfig,
	178	+ $this->database,
	179	+ $this->dateUtil,
	180	+ $this->objectHandler,
	181	+ $this->userHandler,
	182	+ $this->userGroupHandler,
	183	+ $this->userGroupAssignmentHandler,
	184	+ $this->accessHandler,
	185	+ $this->objectInformationFactory
	186	+ );
143	187	}
144	188
145	189	public function createBackendSettingsController(): SettingsController
146	190	{