← All changes | init.php +14 -20 trunk → 2.2.13 View file →

		@@ -1,22 +1,20 @@
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		-use UserAccessManager\Config\Parameter\ConfigParameterFactory;
	7	+use UserAccessManager\Config\ConfigParameterFactory;
10	8	use UserAccessManager\Config\WordpressConfig;
11	9	use UserAccessManager\Cache\CacheProviderFactory;
12	10	use UserAccessManager\Controller\ControllerFactory;
13		-use UserAccessManager\Controller\Backend\ObjectMembership\ObjectInformationFactory;
	11	+use UserAccessManager\Controller\Backend\ObjectInformationFactory;
14	12	use UserAccessManager\Widget\WidgetFactory;
15	13	use UserAccessManager\Database\Database;
16	14	use UserAccessManager\File\FileHandler;
17		-use UserAccessManager\File\Delivery\FileObjectFactory;
18		-use UserAccessManager\File\Protection\FileProtectionFactory;
	15	+use UserAccessManager\File\FileObjectFactory;
	16	+use UserAccessManager\File\FileProtectionFactory;
19	17	use UserAccessManager\Form\FormFactory;
20	18	use UserAccessManager\Form\FormHelper;
21	19	use UserAccessManager\Object\ObjectHandler;
22	20	use UserAccessManager\Object\ObjectMapHandler;
		@@ -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,15 +60,17 @@
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(
	66	+ $php,
70	67	$wordpress,
71	68	$database,
72	69	$mainConfig,
	70	+ $util,
73	71	$objectHandler,
74		- $assignedObjectsLoader
	72	+ $assignmentInformationFactory
75	73	);
76	74	$userHandler = new UserHandler(
77	75	$wordpress,
78	76	$mainConfig,
		@@ -81,9 +79,8 @@
81	79	);
82	80	$userGroupHandler = new UserGroupHandler(
83	81	$wordpress,
84	82	$wordpressConfig,
85		- $mainConfig,
86	83	$database,
87	84	$objectHandler,
88	85	$userHandler,
89	86	$userGroupFactory
		@@ -253,20 +250,17 @@
253	250
254	251	$userAccessManager->addActionsAndFilters();
255	252
256	253	//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		- ) {
261		- $cliWrapper = new WordpressCli();
	254	+ if (defined('WP_CLI') === true && WP_CLI === true) {
	255	+ $cliWrapper = new \UserAccessManager\Wrapper\WordpressCli();
262	256
263		- $groupCommand = new GroupCommand($cliWrapper, $userGroupHandler, $userGroupFactory);
264		- $objectCommand = new ObjectCommand($cliWrapper, $userGroupHandler);
	257	+ $groupCommand = new \UserAccessManager\Command\GroupCommand($cliWrapper, $userGroupHandler, $userGroupFactory);
	258	+ $objectCommand = new \UserAccessManager\Command\ObjectCommand($cliWrapper, $userGroupHandler);
265	259
266	260	try {
267		- WP_CLI::add_command('uam groups', $groupCommand);
268		- WP_CLI::add_command('uam objects', $objectCommand);
	261	+ \WP_CLI::add_command('uam groups', $groupCommand);
	262	+ \WP_CLI::add_command('uam objects', $objectCommand);
269	263	} catch (Exception $exception) {
270	264	// Do nothing
271	265	}
272	266	}