← All changes | init.php +8 -16 2.3.17 → 2.2.2 View file →

		@@ -1,10 +1,8 @@
1	1	<?php
2	2	//Classes
3	3	use UserAccessManager\Access\AccessHandler;
4	4	use UserAccessManager\Cache\Cache;
5		-use UserAccessManager\Command\GroupCommand;
6		-use UserAccessManager\Command\ObjectCommand;
7	5	use UserAccessManager\Config\MainConfig;
8	6	use UserAccessManager\Config\ConfigFactory;
9	7	use UserAccessManager\Config\ConfigParameterFactory;
10	8	use UserAccessManager\Config\WordpressConfig;
		@@ -25,9 +23,8 @@
25	23	use UserAccessManager\Setup\Database\DatabaseHandler;
26	24	use UserAccessManager\Setup\SetupHandler;
27	25	use UserAccessManager\Setup\Update\UpdateFactory;
28	26	use UserAccessManager\UserAccessManager;
29		-use UserAccessManager\UserGroup\AssignedObjectsLoader;
30	27	use UserAccessManager\UserGroup\AssignmentInformationFactory;
31	28	use UserAccessManager\UserGroup\UserGroupAssignmentHandler;
32	29	use UserAccessManager\UserGroup\UserGroupFactory;
33	30	use UserAccessManager\UserGroup\UserGroupHandler;
		@@ -35,9 +32,8 @@
35	32	use UserAccessManager\Util\Util;
36	33	use UserAccessManager\Util\DateUtil;
37	34	use UserAccessManager\Wrapper\Php;
38	35	use UserAccessManager\Wrapper\Wordpress;
39		-use UserAccessManager\Wrapper\WordpressCli;
40	36
41	37	function initUserAccessManger()
42	38	{
43	39	$file = str_replace('init.php', 'user-access-manager.php', __FILE__);
		@@ -64,9 +60,9 @@
64	60	$mainConfig = new MainConfig($wordpress, $objectHandler, $cache, $configParameterFactory);
65	61	$fileObjectFactory = new FileObjectFactory();
66	62	$formFactory = new FormFactory();
67	63	$formHelper = new FormHelper($php, $wordpress, $mainConfig, $formFactory);
68		- $assignedObjectsLoader = new AssignedObjectsLoader($wordpress, $database, $assignmentInformationFactory);
	64	+
69	65	$userGroupFactory = new UserGroupFactory(
70	66	$php,
71	67	$wordpress,
72	68	$database,
		@@ -72,9 +68,9 @@
72	68	$database,
73	69	$mainConfig,
74	70	$util,
75	71	$objectHandler,
76		- $assignedObjectsLoader
	72	+ $assignmentInformationFactory
77	73	);
78	74	$userHandler = new UserHandler(
79	75	$wordpress,
80	76	$mainConfig,
		@@ -83,9 +79,8 @@
83	79	);
84	80	$userGroupHandler = new UserGroupHandler(
85	81	$wordpress,
86	82	$wordpressConfig,
87		- $mainConfig,
88	83	$database,
89	84	$objectHandler,
90	85	$userHandler,
91	86	$userGroupFactory
		@@ -255,20 +250,17 @@
255	250
256	251	$userAccessManager->addActionsAndFilters();
257	252
258	253	//Add the cli interface to the known commands
259		- if (defined('WP_CLI') === true
260		- && WP_CLI === true
261		- && class_exists('WP_CLI_Command')
262		- ) {
263		- $cliWrapper = new WordpressCli();
	254	+ if (defined('WP_CLI') === true && WP_CLI === true) {
	255	+ $cliWrapper = new \UserAccessManager\Wrapper\WordpressCli();
264	256
265		- $groupCommand = new GroupCommand($cliWrapper, $userGroupHandler, $userGroupFactory);
266		- $objectCommand = new ObjectCommand($cliWrapper, $userGroupHandler);
	257	+ $groupCommand = new \UserAccessManager\Command\GroupCommand($cliWrapper, $userGroupHandler, $userGroupFactory);
	258	+ $objectCommand = new \UserAccessManager\Command\ObjectCommand($cliWrapper, $userGroupHandler);
267	259
268	260	try {
269		- WP_CLI::add_command('uam groups', $groupCommand);
270		- WP_CLI::add_command('uam objects', $objectCommand);
	261	+ \WP_CLI::add_command('uam groups', $groupCommand);
	262	+ \WP_CLI::add_command('uam objects', $objectCommand);
271	263	} catch (Exception $exception) {
272	264	// Do nothing
273	265	}
274	266	}