Remove unused member "util"

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 9b4dc1c0956b7bf75dacbd60361fc7d7146f4d23..5f355d0ec2fb3016812174e6a9a8422ea520bc34 100644 (file)
--- 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 521cadfcd3b8207c16860b660c013522ea6a0dc1..173c0a1f85fd4de0ece69db6396298d65d76fd7e 100644 (file)
--- 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,