fixup! Move to more generic way of parsing wopi discovery

nextcloud · Jan 5, 2023 · 6f9402c · 6f9402c
1 parent 05893fe
commit 6f9402c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/Command/ActivateConfig.php b/lib/Command/ActivateConfig.php
@@ -65,7 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			$this->discoveryManager->refetch();
 			$this->capabilitiesService->clear();
 			$capaUrlSrc = $this->wopiParser->getUrlSrc('Capabilities');
-			if (is_array($capaUrlSrc) && $capaUrlSrc['action'] === 'getinfo') {
+			if ($capaUrlSrc['action'] === 'getinfo') {
 				$public_wopi_url = str_replace('/hosting/capabilities', '', $capaUrlSrc['urlsrc']);
 				if ($public_wopi_url !== null) {
 					$this->appConfig->setAppValue('public_wopi_url', $public_wopi_url);

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -195,7 +195,7 @@ public function setSettings($wopi_url,
 		$this->capabilitiesService->clear();
 		try {
 			$capaUrlSrc = $this->wopiParser->getUrlSrc('Capabilities');
-			if (is_array($capaUrlSrc) && $capaUrlSrc['action'] === 'getinfo') {
+			if ($capaUrlSrc['action'] === 'getinfo') {
 				$public_wopi_url = str_replace('/hosting/capabilities', '', $capaUrlSrc['urlsrc']);
 				if ($public_wopi_url !== null) {
 					$this->appConfig->setAppValue('public_wopi_url', $public_wopi_url);

diff --git a/lib/WOPI/Parser.php b/lib/WOPI/Parser.php
@@ -224,7 +224,7 @@ private function getUrlSrcByExtension(string $netZoneName, string $actionExt, $a
 			$netZoneName, $actionExt, $actionName
 		));
 
-		if (!$result || count($result) === 0) {
+		if (!$result) {
 			return null;
 		}
 
@@ -237,7 +237,7 @@ private function getUrlSrcByMimetype(string $netZoneName, string $mimetype): ?st
 			$netZoneName, $mimetype
 		));
 
-		if (!$result || count($result) === 0) {
+		if (!$result) {
 			return null;
 		}