Browse Source

Merge pull request #38260 from fsamapoor/replace_strpos_calls_in_lib_public

Refactors "strpos" calls in  lib/public to improve code readability.
pull/38519/head
Côme Chilliet 2 years ago
committed by GitHub
parent
commit
91686e014e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      lib/public/AppFramework/Db/Entity.php
  2. 2
      lib/public/Util.php

8
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;
}

2
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);
}

Loading…
Cancel
Save