Merge pull request #38619 from fsamapoor/replace_strpos_calls_in_file…

…s_external_app Refactors "strpos" calls in /apps/files_external
nextcloud · Jun 12, 2023 · ac57cf9 · ac57cf9
2 parents c93be18 + 94f2f57
commit ac57cf9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/apps/files_external/lib/Command/Create.php b/apps/files_external/lib/Command/Create.php
@@ -134,7 +134,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$config = [];
 		foreach ($configInput as $configOption) {
-			if (!strpos($configOption, '=')) {
+			if (!str_contains($configOption, '=')) {
 				$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
 				return 1;
 			}

diff --git a/apps/files_external/lib/Lib/Storage/FtpConnection.php b/apps/files_external/lib/Lib/Storage/FtpConnection.php
@@ -110,7 +110,7 @@ public function systype() {
 	public function nlist(string $path) {
 		$files = @ftp_nlist($this->connection, $path);
 		return array_map(function ($name) {
-			if (strpos($name, '/') !== false) {
+			if (str_contains($name, '/')) {
 				$name = basename($name);
 			}
 			return $name;
@@ -122,7 +122,7 @@ public function mlsd(string $path) {
 
 		if ($files !== false) {
 			return array_map(function ($file) {
-				if (strpos($file['name'], '/') !== false) {
+				if (str_contains($file['name'], '/')) {
 					$file['name'] = basename($file['name']);
 				}
 				return $file;

diff --git a/apps/files_external/lib/Lib/Storage/OwnCloud.php b/apps/files_external/lib/Lib/Storage/OwnCloud.php
@@ -60,7 +60,7 @@ public function __construct($params) {
 			$host = substr($host, 0, $hostSlashPos);
 		}
 
-		if (substr($contextPath, -1) !== '/') {
+		if (!str_ends_with($contextPath, '/')) {
 			$contextPath .= '/';
 		}
 

diff --git a/apps/files_external/lib/Lib/Storage/SFTP.php b/apps/files_external/lib/Lib/Storage/SFTP.php
@@ -63,7 +63,7 @@ class SFTP extends \OC\Files\Storage\Common {
 	 */
 	private function splitHost($host) {
 		$input = $host;
-		if (strpos($host, '://') === false) {
+		if (!str_contains($host, '://')) {
 			// add a protocol to fix parse_url behavior with ipv6
 			$host = 'http://' . $host;
 		}

diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -139,13 +139,13 @@ public function __construct($params) {
 	}
 
 	private function splitUser($user) {
-		if (strpos($user, '/')) {
+		if (str_contains($user, '/')) {
 			return explode('/', $user, 2);
-		} elseif (strpos($user, '\\')) {
+		} elseif (str_contains($user, '\\')) {
 			return explode('\\', $user);
-		} else {
-			return [null, $user];
 		}
+
+		return [null, $user];
 	}
 
 	/**