diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-03-21 15:00:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-21 15:00:08 +0100 |
| commit | 432eb98516f5b8b4761da86afc6b232a71e4f1e5 (patch) | |
| tree | 5e59f29347c96ee8d03c48831644a46b1a8a0fae | |
| parent | 0155edc195ed278a2a4d06c15295433ae0ae8445 (diff) | |
| parent | 494d737f7eb1c0c6a5407d73c15acd31ac7a87c1 (diff) | |
| download | nextcloud-server-432eb98516f5b8b4761da86afc6b232a71e4f1e5.tar.gz nextcloud-server-432eb98516f5b8b4761da86afc6b232a71e4f1e5.zip | |
Merge pull request #14786 from nextcloud/bugfix/noid/remove-unused-member
Remove unused member "util"
| -rw-r--r-- | settings/Controller/CheckSetupController.php | 4 | ||||
| -rw-r--r-- | tests/Settings/Controller/CheckSetupControllerTest.php | 10 |
2 files changed, 0 insertions, 14 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index 9b4dc1c0956..5f355d0ec2f 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -69,8 +69,6 @@ class CheckSetupController extends Controller { private $config; /** @var IClientService */ private $clientService; - /** @var \OC_Util */ - private $util; /** @var IURLGenerator */ private $urlGenerator; /** @var IL10N */ @@ -97,7 +95,6 @@ class CheckSetupController extends Controller { IConfig $config, IClientService $clientService, IURLGenerator $urlGenerator, - \OC_Util $util, IL10N $l10n, Checker $checker, ILogger $logger, @@ -110,7 +107,6 @@ class CheckSetupController extends Controller { parent::__construct($AppName, $request); $this->config = $config; $this->clientService = $clientService; - $this->util = $util; $this->urlGenerator = $urlGenerator; $this->l10n = $l10n; $this->checker = $checker; diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php index 521cadfcd3b..173c0a1f85f 100644 --- a/tests/Settings/Controller/CheckSetupControllerTest.php +++ b/tests/Settings/Controller/CheckSetupControllerTest.php @@ -37,7 +37,6 @@ use OCP\IL10N; use OCP\ILogger; use OCP\IRequest; use OCP\IURLGenerator; -use OC_Util; use OCP\Lock\ILockingProvider; use PHPUnit\Framework\MockObject\MockObject; use Psr\Http\Message\ResponseInterface; @@ -62,8 +61,6 @@ class CheckSetupControllerTest extends TestCase { private $clientService; /** @var IURLGenerator | \PHPUnit_Framework_MockObject_MockObject */ private $urlGenerator; - /** @var OC_Util */ - private $util; /** @var IL10N | \PHPUnit_Framework_MockObject_MockObject */ private $l10n; /** @var ILogger */ @@ -99,8 +96,6 @@ class CheckSetupControllerTest extends TestCase { ->disableOriginalConstructor()->getMock(); $this->clientService = $this->getMockBuilder(IClientService::class) ->disableOriginalConstructor()->getMock(); - $this->util = $this->getMockBuilder('\OC_Util') - ->disableOriginalConstructor()->getMock(); $this->urlGenerator = $this->getMockBuilder(IURLGenerator::class) ->disableOriginalConstructor()->getMock(); $this->l10n = $this->getMockBuilder(IL10N::class) @@ -130,7 +125,6 @@ class CheckSetupControllerTest extends TestCase { $this->config, $this->clientService, $this->urlGenerator, - $this->util, $this->l10n, $this->checker, $this->logger, @@ -590,7 +584,6 @@ class CheckSetupControllerTest extends TestCase { $this->config, $this->clientService, $this->urlGenerator, - $this->util, $this->l10n, $this->checker, $this->logger, @@ -624,7 +617,6 @@ class CheckSetupControllerTest extends TestCase { $this->config, $this->clientService, $this->urlGenerator, - $this->util, $this->l10n, $this->checker, $this->logger, @@ -1393,7 +1385,6 @@ Array $this->config, $this->clientService, $this->urlGenerator, - $this->util, $this->l10n, $this->checker, $this->logger, @@ -1442,7 +1433,6 @@ Array $this->config, $this->clientService, $this->urlGenerator, - $this->util, $this->l10n, $this->checker, $this->logger, |