← All changes | init.php +6 -13 2.3.14 → 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;
		@@ -34,9 +32,8 @@
34	32	use UserAccessManager\Util\Util;
35	33	use UserAccessManager\Util\DateUtil;
36	34	use UserAccessManager\Wrapper\Php;
37	35	use UserAccessManager\Wrapper\Wordpress;
38		-use UserAccessManager\Wrapper\WordpressCli;
39	36
40	37	function initUserAccessManger()
41	38	{
42	39	$file = str_replace('init.php', 'user-access-manager.php', __FILE__);
		@@ -82,9 +79,8 @@
82	79	);
83	80	$userGroupHandler = new UserGroupHandler(
84	81	$wordpress,
85	82	$wordpressConfig,
86		- $mainConfig,
87	83	$database,
88	84	$objectHandler,
89	85	$userHandler,
90	86	$userGroupFactory
		@@ -254,20 +250,17 @@
254	250
255	251	$userAccessManager->addActionsAndFilters();
256	252
257	253	//Add the cli interface to the known commands
258		- if (defined('WP_CLI') === true
259		- && WP_CLI === true
260		- && class_exists('WP_CLI_Command')
261		- ) {
262		- $cliWrapper = new WordpressCli();
	254	+ if (defined('WP_CLI') === true && WP_CLI === true) {
	255	+ $cliWrapper = new \UserAccessManager\Wrapper\WordpressCli();
263	256
264		- $groupCommand = new GroupCommand($cliWrapper, $userGroupHandler, $userGroupFactory);
265		- $objectCommand = new ObjectCommand($cliWrapper, $userGroupHandler);
	257	+ $groupCommand = new \UserAccessManager\Command\GroupCommand($cliWrapper, $userGroupHandler, $userGroupFactory);
	258	+ $objectCommand = new \UserAccessManager\Command\ObjectCommand($cliWrapper, $userGroupHandler);
266	259
267	260	try {
268		- WP_CLI::add_command('uam groups', $groupCommand);
269		- WP_CLI::add_command('uam objects', $objectCommand);
	261	+ \WP_CLI::add_command('uam groups', $groupCommand);
	262	+ \WP_CLI::add_command('uam objects', $objectCommand);
270	263	} catch (Exception $exception) {
271	264	// Do nothing
272	265	}
273	266	}