diff options
| author | VicDeo <dubiniuk@owncloud.com> | 2016-06-22 14:12:36 +0300 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-06-22 14:12:36 +0300 |
| commit | 854352d9a064a1e469ede207493bce44fd41d96c (patch) | |
| tree | eb882140fe0ed3ac64014c8825fe52f8d375b2f4 /core/Application.php | |
| parent | c49ff83f18dba22f4a2e04a4df3d1e6a6623a0f7 (diff) | |
occ web executor (#24957)
* Initial web executor
* Fix PHPDoc
Fix broken integration test
OccControllerTests do not require database access - moch them all!
Kill unused sprintf
Diffstat (limited to 'core/Application.php')
| -rw-r--r-- | core/Application.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/Application.php b/core/Application.php index a87917b626a..8ea2672e54e 100644 --- a/core/Application.php +++ b/core/Application.php @@ -32,6 +32,7 @@ use OC\AppFramework\Utility\TimeFactory; use OC\Core\Controller\AvatarController; use OC\Core\Controller\LoginController; use OC\Core\Controller\LostController; +use OC\Core\Controller\OccController; use OC\Core\Controller\TokenController; use OC\Core\Controller\TwoFactorChallengeController; use OC\Core\Controller\UserController; @@ -125,6 +126,18 @@ class Application extends App { $c->query('SecureRandom') ); }); + $container->registerService('OccController', function(SimpleContainer $c) { + return new OccController( + $c->query('AppName'), + $c->query('Request'), + $c->query('Config'), + new \OC\Console\Application( + $c->query('Config'), + $c->query('ServerContainer')->getEventDispatcher(), + $c->query('Request') + ) + ); + }); /** * Core class wrappers |