| @@ -1,43 +1,22 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | //Classes |
| 3 | -use UserAccessManager\Access\AccessHandler; | |
| 3 | +use UserAccessManager\AccessHandler\AccessHandler; | |
| 4 | 4 | use UserAccessManager\Cache\Cache; |
| 5 | -use UserAccessManager\Command\GroupCommand; | |
| 6 | -use UserAccessManager\Command\ObjectCommand; | |
| 7 | -use UserAccessManager\Config\MainConfig; | |
| 8 | -use UserAccessManager\Config\ConfigFactory; | |
| 9 | -use UserAccessManager\Config\Parameter\ConfigParameterFactory; | |
| 10 | -use UserAccessManager\Config\WordpressConfig; | |
| 11 | -use UserAccessManager\Cache\CacheProviderFactory; | |
| 5 | +use UserAccessManager\Config\Config; | |
| 6 | +use UserAccessManager\Config\ConfigParameterFactory; | |
| 12 | 7 | use UserAccessManager\Controller\ControllerFactory; |
| 13 | -use UserAccessManager\Controller\Backend\ObjectMembership\ObjectInformationFactory; | |
| 14 | -use UserAccessManager\Widget\WidgetFactory; | |
| 15 | 8 | use UserAccessManager\Database\Database; |
| 16 | -use UserAccessManager\File\FileHandler; | |
| 17 | -use UserAccessManager\File\Delivery\FileObjectFactory; | |
| 18 | -use UserAccessManager\File\Protection\FileProtectionFactory; | |
| 19 | -use UserAccessManager\Form\FormFactory; | |
| 20 | -use UserAccessManager\Form\FormHelper; | |
| 21 | -use UserAccessManager\Object\ObjectHandler; | |
| 22 | -use UserAccessManager\Object\ObjectMapHandler; | |
| 23 | -use UserAccessManager\ObjectMembership\ObjectMembershipHandlerFactory; | |
| 24 | -use UserAccessManager\Setup\Database\DatabaseObjectFactory; | |
| 25 | -use UserAccessManager\Setup\Database\DatabaseHandler; | |
| 26 | -use UserAccessManager\Setup\SetupHandler; | |
| 27 | -use UserAccessManager\Setup\Update\UpdateFactory; | |
| 9 | +use UserAccessManager\FileHandler\FileHandler; | |
| 10 | +use UserAccessManager\FileHandler\FileObjectFactory; | |
| 11 | +use UserAccessManager\FileHandler\FileProtectionFactory; | |
| 12 | +use UserAccessManager\ObjectHandler\ObjectHandler; | |
| 13 | +use UserAccessManager\SetupHandler\SetupHandler; | |
| 28 | 14 | use UserAccessManager\UserAccessManager; |
| 29 | -use UserAccessManager\UserGroup\AssignedObjectsLoader; | |
| 30 | -use UserAccessManager\UserGroup\AssignmentInformationFactory; | |
| 31 | -use UserAccessManager\UserGroup\UserGroupAssignmentHandler; | |
| 32 | 15 | use UserAccessManager\UserGroup\UserGroupFactory; |
| 33 | -use UserAccessManager\UserGroup\UserGroupHandler; | |
| 34 | -use UserAccessManager\User\UserHandler; | |
| 35 | 16 | use UserAccessManager\Util\Util; |
| 36 | -use UserAccessManager\Util\DateUtil; | |
| 37 | 17 | use UserAccessManager\Wrapper\Php; |
| 38 | 18 | use UserAccessManager\Wrapper\Wordpress; |
| 39 | -use UserAccessManager\Wrapper\WordpressCli; | |
| 40 | 19 | |
| 41 | 20 | function initUserAccessManger() |
| 42 | 21 | { |
| 43 | 22 | $file = str_replace('init.php', 'user-access-manager.php', __FILE__); |
| @@ -43,115 +22,63 @@ | ||
| 43 | 22 | $file = str_replace('init.php', 'user-access-manager.php', __FILE__); |
| 44 | 23 | $php = new Php(); |
| 45 | 24 | $wordpress = new Wordpress(); |
| 46 | 25 | $util = new Util($php); |
| 47 | - $dateUtil = new DateUtil($wordpress); | |
| 48 | - $configFactory = new ConfigFactory($wordpress); | |
| 26 | + $cache = new Cache(); | |
| 49 | 27 | $configParameterFactory = new ConfigParameterFactory(); |
| 50 | - $cacheProviderFactory = new CacheProviderFactory($php, $wordpress, $util, $configFactory, $configParameterFactory); | |
| 51 | - $cache = new Cache($wordpress, $cacheProviderFactory); | |
| 52 | 28 | $database = new Database($wordpress); |
| 53 | - $objectMapHandler = new ObjectMapHandler($database, $cache); | |
| 54 | - $assignmentInformationFactory = new AssignmentInformationFactory(); | |
| 55 | - $membershipHandlerFactory = new ObjectMembershipHandlerFactory( | |
| 56 | - $php, | |
| 57 | - $wordpress, | |
| 58 | - $database, | |
| 59 | - $objectMapHandler, | |
| 60 | - $assignmentInformationFactory | |
| 61 | - ); | |
| 62 | - $objectHandler = new ObjectHandler($php, $wordpress, $membershipHandlerFactory); | |
| 63 | - $wordpressConfig = new WordpressConfig($wordpress, $file); | |
| 64 | - $mainConfig = new MainConfig($wordpress, $objectHandler, $cache, $configParameterFactory); | |
| 29 | + $objectHandler = new ObjectHandler($wordpress, $database); | |
| 30 | + $config = new Config($wordpress, $objectHandler, $configParameterFactory, $file); | |
| 65 | 31 | $fileObjectFactory = new FileObjectFactory(); |
| 66 | - $formFactory = new FormFactory(); | |
| 67 | - $formHelper = new FormHelper($php, $wordpress, $mainConfig, $formFactory); | |
| 68 | - $assignedObjectsLoader = new AssignedObjectsLoader($wordpress, $database, $assignmentInformationFactory); | |
| 69 | 32 | $userGroupFactory = new UserGroupFactory( |
| 33 | + $php, | |
| 70 | 34 | $wordpress, |
| 71 | 35 | $database, |
| 72 | - $mainConfig, | |
| 73 | - $objectHandler, | |
| 74 | - $assignedObjectsLoader | |
| 75 | - ); | |
| 76 | - $userHandler = new UserHandler( | |
| 77 | - $wordpress, | |
| 78 | - $mainConfig, | |
| 79 | - $database, | |
| 36 | + $config, | |
| 37 | + $util, | |
| 80 | 38 | $objectHandler |
| 81 | 39 | ); |
| 82 | - $userGroupHandler = new UserGroupHandler( | |
| 40 | + $accessHandler = new AccessHandler( | |
| 83 | 41 | $wordpress, |
| 84 | - $wordpressConfig, | |
| 85 | - $mainConfig, | |
| 42 | + $config, | |
| 43 | + $cache, | |
| 86 | 44 | $database, |
| 87 | 45 | $objectHandler, |
| 88 | - $userHandler, | |
| 46 | + $util, | |
| 89 | 47 | $userGroupFactory |
| 90 | 48 | ); |
| 91 | - $accessHandler = new AccessHandler( | |
| 92 | - $wordpress, | |
| 93 | - $mainConfig, | |
| 94 | - $database, | |
| 95 | - $objectHandler, | |
| 96 | - $userHandler, | |
| 97 | - $userGroupHandler | |
| 98 | - ); | |
| 99 | 49 | $fileProtectionFactory = new FileProtectionFactory( |
| 100 | 50 | $php, |
| 101 | 51 | $wordpress, |
| 102 | - $wordpressConfig, | |
| 103 | - $mainConfig, | |
| 52 | + $config, | |
| 104 | 53 | $util |
| 105 | 54 | ); |
| 106 | 55 | $fileHandler = new FileHandler( |
| 107 | 56 | $php, |
| 108 | 57 | $wordpress, |
| 109 | - $wordpressConfig, | |
| 110 | - $mainConfig, | |
| 58 | + $config, | |
| 111 | 59 | $fileProtectionFactory |
| 112 | 60 | ); |
| 113 | - $updateFactory = new UpdateFactory($database, $objectHandler); | |
| 114 | - $databaseObjectFactory = new DatabaseObjectFactory(); | |
| 115 | - $databaseHandler = new DatabaseHandler($wordpress, $database, $databaseObjectFactory, $updateFactory); | |
| 116 | 61 | $setupHandler = new SetupHandler( |
| 117 | 62 | $wordpress, |
| 118 | 63 | $database, |
| 119 | - $databaseHandler, | |
| 120 | - $mainConfig, | |
| 64 | + $objectHandler, | |
| 121 | 65 | $fileHandler |
| 122 | 66 | ); |
| 123 | - $objectInformationFactory = new ObjectInformationFactory(); | |
| 124 | - $userGroupAssignmentHandler = new UserGroupAssignmentHandler( | |
| 125 | - $dateUtil, | |
| 126 | - $userHandler, | |
| 127 | - $userGroupHandler, | |
| 128 | - $userGroupFactory | |
| 129 | - ); | |
| 130 | 67 | $controllerFactory = new ControllerFactory( |
| 131 | 68 | $php, |
| 132 | 69 | $wordpress, |
| 133 | 70 | $database, |
| 134 | - $wordpressConfig, | |
| 135 | - $mainConfig, | |
| 71 | + $config, | |
| 136 | 72 | $util, |
| 137 | - $dateUtil, | |
| 138 | 73 | $cache, |
| 139 | 74 | $objectHandler, |
| 140 | - $objectMapHandler, | |
| 141 | - $userHandler, | |
| 142 | - $userGroupHandler, | |
| 75 | + $accessHandler, | |
| 143 | 76 | $userGroupFactory, |
| 144 | - $userGroupAssignmentHandler, | |
| 145 | - $accessHandler, | |
| 146 | 77 | $fileHandler, |
| 147 | 78 | $fileObjectFactory, |
| 148 | - $setupHandler, | |
| 149 | - $formFactory, | |
| 150 | - $formHelper, | |
| 151 | - $objectInformationFactory | |
| 79 | + $setupHandler | |
| 152 | 80 | ); |
| 153 | - $widgetFactory = new WidgetFactory($php, $wordpress, $wordpressConfig); | |
| 154 | 81 | |
| 155 | 82 | $userAccessManager = new UserAccessManager( |
| 156 | 83 | $php, |
| 157 | 84 | $wordpress, |
| @@ -156,22 +83,16 @@ | ||
| 156 | 83 | $php, |
| 157 | 84 | $wordpress, |
| 158 | 85 | $util, |
| 159 | 86 | $cache, |
| 160 | - $mainConfig, | |
| 87 | + $config, | |
| 161 | 88 | $database, |
| 162 | 89 | $objectHandler, |
| 163 | - $userHandler, | |
| 164 | - $userGroupHandler, | |
| 165 | 90 | $accessHandler, |
| 166 | 91 | $fileHandler, |
| 167 | 92 | $setupHandler, |
| 168 | 93 | $userGroupFactory, |
| 169 | - $membershipHandlerFactory, | |
| 170 | 94 | $controllerFactory, |
| 171 | - $widgetFactory, | |
| 172 | - $cacheProviderFactory, | |
| 173 | - $configFactory, | |
| 174 | 95 | $configParameterFactory, |
| 175 | 96 | $fileProtectionFactory, |
| 176 | 97 | $fileObjectFactory |
| 177 | 98 | ); |
| @@ -190,54 +111,29 @@ | ||
| 190 | 111 | $file = str_replace('init.php', 'user-access-manager.php', __FILE__); |
| 191 | 112 | $php = new Php(); |
| 192 | 113 | $wordpress = new Wordpress(); |
| 193 | 114 | $util = new Util($php); |
| 115 | + $configParameterFactory = new ConfigParameterFactory(); | |
| 194 | 116 | $database = new Database($wordpress); |
| 195 | - $configFactory = new ConfigFactory($wordpress); | |
| 196 | - $configParameterFactory = new ConfigParameterFactory(); | |
| 197 | - $cacheProviderFactory = new CacheProviderFactory( | |
| 198 | - $php, | |
| 199 | - $wordpress, | |
| 200 | - $util, | |
| 201 | - $configFactory, | |
| 202 | - $configParameterFactory | |
| 203 | - ); | |
| 204 | - $cache = new Cache($wordpress, $cacheProviderFactory); | |
| 205 | - $objectMapHandler = new ObjectMapHandler($database, $cache); | |
| 206 | - $assignmentInformationFactory = new AssignmentInformationFactory(); | |
| 207 | - $membershipHandlerFactory = new ObjectMembershipHandlerFactory( | |
| 208 | - $php, | |
| 209 | - $wordpress, | |
| 210 | - $database, | |
| 211 | - $objectMapHandler, | |
| 212 | - $assignmentInformationFactory | |
| 213 | - ); | |
| 214 | - $objectHandler = new ObjectHandler($php, $wordpress, $membershipHandlerFactory); | |
| 215 | - $wordpressConfig = new WordpressConfig($wordpress, $file); | |
| 216 | - $mainConfig = new MainConfig($wordpress, $objectHandler, $cache, $configParameterFactory); | |
| 117 | + $objectHandler = new ObjectHandler($wordpress, $database); | |
| 118 | + $config = new Config($wordpress, $objectHandler, $configParameterFactory, $file); | |
| 217 | 119 | |
| 218 | 120 | $fileProtectionFactory = new FileProtectionFactory( |
| 219 | 121 | $php, |
| 220 | 122 | $wordpress, |
| 221 | - $wordpressConfig, | |
| 222 | - $mainConfig, | |
| 123 | + $config, | |
| 223 | 124 | $util |
| 224 | 125 | ); |
| 225 | 126 | $fileHandler = new FileHandler( |
| 226 | 127 | $php, |
| 227 | 128 | $wordpress, |
| 228 | - $wordpressConfig, | |
| 229 | - $mainConfig, | |
| 129 | + $config, | |
| 230 | 130 | $fileProtectionFactory |
| 231 | 131 | ); |
| 232 | - $updateFactory = new UpdateFactory($database, $objectHandler); | |
| 233 | - $databaseObjectFactory = new DatabaseObjectFactory(); | |
| 234 | - $databaseHandler = new DatabaseHandler($wordpress, $database, $databaseObjectFactory, $updateFactory); | |
| 235 | 132 | $setupHandler = new SetupHandler( |
| 236 | 133 | $wordpress, |
| 237 | 134 | $database, |
| 238 | - $databaseHandler, | |
| 239 | - $mainConfig, | |
| 135 | + $objectHandler, | |
| 240 | 136 | $fileHandler |
| 241 | 137 | ); |
| 242 | 138 | |
| 243 | 139 | $setupHandler->uninstall(); |
| @@ -253,23 +149,16 @@ | ||
| 253 | 149 | |
| 254 | 150 | $userAccessManager->addActionsAndFilters(); |
| 255 | 151 | |
| 256 | 152 | //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(); | |
| 153 | + if (defined('WP_CLI') === true && WP_CLI === true) { | |
| 154 | + $cliWrapper = new \UserAccessManager\Wrapper\WordpressCli(); | |
| 262 | 155 | |
| 263 | - $groupCommand = new GroupCommand($cliWrapper, $userGroupHandler, $userGroupFactory); | |
| 264 | - $objectCommand = new ObjectCommand($cliWrapper, $userGroupHandler); | |
| 156 | + $groupCommand = new \UserAccessManager\Command\GroupCommand($cliWrapper, $accessHandler, $userGroupFactory); | |
| 157 | + \WP_CLI::add_command('uam groups', $groupCommand); | |
| 265 | 158 | |
| 266 | - try { | |
| 267 | - WP_CLI::add_command('uam groups', $groupCommand); | |
| 268 | - WP_CLI::add_command('uam objects', $objectCommand); | |
| 269 | - } catch (Exception $exception) { | |
| 270 | - // Do nothing | |
| 271 | - } | |
| 159 | + $objectCommand = new \UserAccessManager\Command\ObjectCommand($cliWrapper, $accessHandler); | |
| 160 | + \WP_CLI::add_command('uam objects', $objectCommand); | |
| 272 | 161 | } |
| 273 | 162 | |
| 274 | 163 | return $userAccessManager; |
| 275 | 164 | } |
