← All changes | init.php +9 -11 2.3.18 → 2.3.4 View file →

		@@ -5,18 +5,18 @@
5	5	use UserAccessManager\Command\GroupCommand;
6	6	use UserAccessManager\Command\ObjectCommand;
7	7	use UserAccessManager\Config\MainConfig;
8	8	use UserAccessManager\Config\ConfigFactory;
9		-use UserAccessManager\Config\Parameter\ConfigParameterFactory;
	9	+use UserAccessManager\Config\ConfigParameterFactory;
10	10	use UserAccessManager\Config\WordpressConfig;
11	11	use UserAccessManager\Cache\CacheProviderFactory;
12	12	use UserAccessManager\Controller\ControllerFactory;
13		-use UserAccessManager\Controller\Backend\ObjectMembership\ObjectInformationFactory;
	13	+use UserAccessManager\Controller\Backend\ObjectInformationFactory;
14	14	use UserAccessManager\Widget\WidgetFactory;
15	15	use UserAccessManager\Database\Database;
16	16	use UserAccessManager\File\FileHandler;
17		-use UserAccessManager\File\Delivery\FileObjectFactory;
18		-use UserAccessManager\File\Protection\FileProtectionFactory;
	17	+use UserAccessManager\File\FileObjectFactory;
	18	+use UserAccessManager\File\FileProtectionFactory;
19	19	use UserAccessManager\Form\FormFactory;
20	20	use UserAccessManager\Form\FormHelper;
21	21	use UserAccessManager\Object\ObjectHandler;
22	22	use UserAccessManager\Object\ObjectMapHandler;
		@@ -25,9 +25,8 @@
25	25	use UserAccessManager\Setup\Database\DatabaseHandler;
26	26	use UserAccessManager\Setup\SetupHandler;
27	27	use UserAccessManager\Setup\Update\UpdateFactory;
28	28	use UserAccessManager\UserAccessManager;
29		-use UserAccessManager\UserGroup\AssignedObjectsLoader;
30	29	use UserAccessManager\UserGroup\AssignmentInformationFactory;
31	30	use UserAccessManager\UserGroup\UserGroupAssignmentHandler;
32	31	use UserAccessManager\UserGroup\UserGroupFactory;
33	32	use UserAccessManager\UserGroup\UserGroupHandler;
		@@ -64,15 +63,17 @@
64	63	$mainConfig = new MainConfig($wordpress, $objectHandler, $cache, $configParameterFactory);
65	64	$fileObjectFactory = new FileObjectFactory();
66	65	$formFactory = new FormFactory();
67	66	$formHelper = new FormHelper($php, $wordpress, $mainConfig, $formFactory);
68		- $assignedObjectsLoader = new AssignedObjectsLoader($wordpress, $database, $assignmentInformationFactory);
	67	+
69	68	$userGroupFactory = new UserGroupFactory(
	69	+ $php,
70	70	$wordpress,
71	71	$database,
72	72	$mainConfig,
	73	+ $util,
73	74	$objectHandler,
74		- $assignedObjectsLoader
	75	+ $assignmentInformationFactory
75	76	);
76	77	$userHandler = new UserHandler(
77	78	$wordpress,
78	79	$mainConfig,
		@@ -253,12 +254,9 @@
253	254
254	255	$userAccessManager->addActionsAndFilters();
255	256
256	257	//Add the cli interface to the known commands
257		- if (defined('WP_CLI') === true
258		- && WP_CLI === true
259		- && class_exists('WP_CLI_Command')
260		- ) {
	258	+ if (defined('WP_CLI') === true && WP_CLI === true) {
261	259	$cliWrapper = new WordpressCli();
262	260
263	261	$groupCommand = new GroupCommand($cliWrapper, $userGroupHandler, $userGroupFactory);
264	262	$objectCommand = new ObjectCommand($cliWrapper, $userGroupHandler);