Merge pull request #14786 from nextcloud/bugfix/noid/remove-unused-me…

…mber Remove unused member "util"
nextcloud · Mar 21, 2019 · 432eb98 · 432eb98
2 parents 0155edc + 494d737
commit 432eb98
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git 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 @@ public function __construct($AppName,
 								IConfig $config,
 								IClientService $clientService,
 								IURLGenerator $urlGenerator,
-								\OC_Util $util,
 								IL10N $l10n,
 								Checker $checker,
 								ILogger $logger,
@@ -110,7 +107,6 @@ public function __construct($AppName,
 		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
@@ -37,7 +37,6 @@
 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 @@ public function setUp() {
 			->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 @@ public function setUp() {
 				$this->config,
 				$this->clientService,
 				$this->urlGenerator,
-				$this->util,
 				$this->l10n,
 				$this->checker,
 				$this->logger,
@@ -590,7 +584,6 @@ public function testIsPHPMailerUsed() {
 				$this->config,
 				$this->clientService,
 				$this->urlGenerator,
-				$this->util,
 				$this->l10n,
 				$this->checker,
 				$this->logger,
@@ -624,7 +617,6 @@ public function testGetCurlVersion() {
 				$this->config,
 				$this->clientService,
 				$this->urlGenerator,
-				$this->util,
 				$this->l10n,
 				$this->checker,
 				$this->logger,
@@ -1393,7 +1385,6 @@ public function testIsMysqlUsedWithoutUTF8MB4(string $db, bool $useUTF8MB4, bool
 				$this->config,
 				$this->clientService,
 				$this->urlGenerator,
-				$this->util,
 				$this->l10n,
 				$this->checker,
 				$this->logger,
@@ -1442,7 +1433,6 @@ public function testIsEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed(string $m
 			$this->config,
 			$this->clientService,
 			$this->urlGenerator,
-			$this->util,
 			$this->l10n,
 			$this->checker,
 			$this->logger,