Refactors "strpos" calls in lib/public to improve code readability.

Signed-off-by: Faraz Samapoor <fsamapoor@gmail.com>
nextcloud · May 15, 2023 · 1622ce7 · 1622ce7
1 parent 8bdb50f
commit 1622ce7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/public/AppFramework/Db/Entity.php b/lib/public/AppFramework/Db/Entity.php
@@ -163,9 +163,9 @@ protected function getter(string $name): mixed {
 	 * @since 7.0.0
 	 */
 	public function __call(string $methodName, array $args) {
-		if (strpos($methodName, 'set') === 0) {
+		if (str_starts_with($methodName, 'set')) {
 			$this->setter(lcfirst(substr($methodName, 3)), $args);
-		} elseif (strpos($methodName, 'get') === 0) {
+		} elseif (str_starts_with($methodName, 'get')) {
 			return $this->getter(lcfirst(substr($methodName, 3)));
 		} elseif ($this->isGetterForBoolProperty($methodName)) {
 			return $this->getter(lcfirst(substr($methodName, 2)));
@@ -181,9 +181,9 @@ public function __call(string $methodName, array $args) {
 	 * @since 18.0.0
 	 */
 	protected function isGetterForBoolProperty(string $methodName): bool {
-		if (strpos($methodName, 'is') === 0) {
+		if (str_starts_with($methodName, 'is')) {
 			$fieldName = lcfirst(substr($methodName, 2));
-			return isset($this->_fieldTypes[$fieldName]) && strpos($this->_fieldTypes[$fieldName], 'bool') === 0;
+			return isset($this->_fieldTypes[$fieldName]) && str_starts_with($this->_fieldTypes[$fieldName], 'bool');
 		}
 		return false;
 	}

diff --git a/lib/public/Util.php b/lib/public/Util.php
@@ -182,7 +182,7 @@ public static function addScript(string $application, string $file = null, strin
 		// need separate handling
 		if ($application !== 'core'
 			&& $file !== null
-			&& strpos($file, 'l10n') === false) {
+			&& !str_contains($file, 'l10n')) {
 			self::addTranslations($application);
 		}