aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCôme Chilliet <91878298+come-nc@users.noreply.github.com>2023-06-05 14:37:28 +0200
committerGitHub <noreply@github.com>2023-06-05 14:37:28 +0200
commit91686e014e8da3f8eecfe5a6a513e8f2c7b3ee76 (patch)
tree7bb520fb9b7c4806ef99aa731fcc9c0bc29191c6
parentfbf9ac0cd5d18532d82e4d9b9307ad435cbc839f (diff)
parentbf38c0a3d1aaf58486d1a9e7af45f47bdf2e429d (diff)
downloadnextcloud-server-91686e014e8da3f8eecfe5a6a513e8f2c7b3ee76.tar.gz
nextcloud-server-91686e014e8da3f8eecfe5a6a513e8f2c7b3ee76.zip
Merge pull request #38260 from fsamapoor/replace_strpos_calls_in_lib_public
Refactors "strpos" calls in lib/public to improve code readability.
-rw-r--r--lib/public/AppFramework/Db/Entity.php8
-rw-r--r--lib/public/Util.php2
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/public/AppFramework/Db/Entity.php b/lib/public/AppFramework/Db/Entity.php
index 34cd297e57e..1ae938f6e32 100644
--- a/lib/public/AppFramework/Db/Entity.php
+++ b/lib/public/AppFramework/Db/Entity.php
@@ -163,9 +163,9 @@ abstract class Entity {
* @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 @@ abstract class Entity {
* @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
index f73c19e6dcd..5bb126d26b0 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -182,7 +182,7 @@ class Util {
// need separate handling
if ($application !== 'core'
&& $file !== null
- && strpos($file, 'l10n') === false) {
+ && !str_contains($file, 'l10n')) {
self::addTranslations($application);
}