wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21502 from owncloud/di_mimetypedetector

Browse source 
Add 'OCP\Files\IMimeTypeDetector' to DI container
This commit is contained in:
Thomas Müller 2016-01-07 16:18:55 +01:00
commit f6f492ba4e
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/appframework/dependencyinjection/dicontainer.php
View file

@ -165,6 +165,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
$this->registerAlias('OCP\\AppFramework\\Utility\\IControllerMethodReflector', 'OC\AppFramework\Utility\ControllerMethodReflector');
$this->registerAlias('ControllerMethodReflector', 'OCP\\AppFramework\\Utility\\IControllerMethodReflector');
$this->registerService('OCP\\Files\\IMimeTypeDetector', function($c) {
return $this->getServer()->getMimeTypeDetector();
});
$this->registerService('OCP\\INavigationManager', function($c) {
return $this->getServer()->getNavigationManager();
});

2
tests/lib/server.php
View file

@ -94,6 +94,8 @@ class Server extends \Test\TestCase {
['HttpClientService', '\OCP\Http\Client\IClientService'],
['IniWrapper', '\bantu\IniGetWrapper\IniGetWrapper'],
['MimeTypeDetector', '\OCP\Files\IMimeTypeDetector'],
['MimeTypeDetector', '\OC\Files\Type\Detection'],
['JobList', '\OC\BackgroundJob\JobList'],
['JobList', '\OCP\BackgroundJob\IJobList'],