Merge pull request #4657 from fsamapoor/replace_strpos_usages

nextcloud · May 10, 2023 · c3e2aec · c3e2aec
2 parents b9c8e8f + b8566a3
commit c3e2aec
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/lib/Controller/AttachmentController.php b/lib/Controller/AttachmentController.php
@@ -53,7 +53,7 @@ public function getAll($cardId) {
 	 * @throws \OCA\Deck\NotFoundException
 	 */
 	public function display($cardId, $attachmentId) {
-		if (strpos($attachmentId, ':') === false) {
+		if (!str_contains($attachmentId, ':')) {
 			$type = 'deck_file';
 		} else {
 			[$type, $attachmentId] = explode(':', $attachmentId);
@@ -76,7 +76,7 @@ public function create($cardId) {
 	 * @NoAdminRequired
 	 */
 	public function update($cardId, $attachmentId) {
-		if (strpos($attachmentId, ':') === false) {
+		if (!str_contains($attachmentId, ':')) {
 			$type = 'deck_file';
 		} else {
 			[$type, $attachmentId] = explode(':', $attachmentId);
@@ -88,7 +88,7 @@ public function update($cardId, $attachmentId) {
 	 * @NoAdminRequired
 	 */
 	public function delete($cardId, $attachmentId) {
-		if (strpos($attachmentId, ':') === false) {
+		if (!str_contains($attachmentId, ':')) {
 			$type = 'deck_file';
 		} else {
 			[$type, $attachmentId] = explode(':', $attachmentId);
@@ -100,7 +100,7 @@ public function delete($cardId, $attachmentId) {
 	 * @NoAdminRequired
 	 */
 	public function restore($cardId, $attachmentId) {
-		if (strpos($attachmentId, ':') === false) {
+		if (!str_contains($attachmentId, ':')) {
 			$type = 'deck_file';
 		} else {
 			[$type, $attachmentId] = explode(':', $attachmentId);

diff --git a/lib/Db/RelationalEntity.php b/lib/Db/RelationalEntity.php
@@ -68,7 +68,7 @@ public function jsonSerialize(): array {
 		$reflection = new \ReflectionClass($this);
 		$json = [];
 		foreach ($properties as $property => $value) {
-			if (strpos($property, '_') !== 0 && $reflection->hasProperty($property)) {
+			if (!str_starts_with($property, '_') && $reflection->hasProperty($property)) {
 				$propertyReflection = $reflection->getProperty($property);
 				if (!$propertyReflection->isPrivate() && !in_array($property, $this->_resolvedProperties, true)) {
 					$json[$property] = $this->getter($property);
@@ -129,15 +129,15 @@ public function resolveRelation($property, $resolver) {
 
 	public function __call(string $methodName, array $args) {
 		$attr = lcfirst(substr($methodName, 7));
-		if (array_key_exists($attr, $this->_resolvedProperties) && strpos($methodName, 'resolve') === 0) {
+		if (array_key_exists($attr, $this->_resolvedProperties) && str_starts_with($methodName, 'resolve')) {
 			if ($this->_resolvedProperties[$attr] !== null) {
 				return $this->_resolvedProperties[$attr];
 			}
 			return $this->getter($attr);
 		}
 
 		$attr = lcfirst(substr($methodName, 3));
-		if (array_key_exists($attr, $this->_resolvedProperties) && strpos($methodName, 'set') === 0) {
+		if (array_key_exists($attr, $this->_resolvedProperties) && str_starts_with($methodName, 'set')) {
 			if (!is_scalar($args[0])) {
 				$args[0] = $args[0]['primaryKey'];
 			}

diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php
@@ -51,11 +51,11 @@ public function handle(Event $event): void {
 		Util::addStyle('deck', 'deck');
 
 		$pathInfo = $this->request->getPathInfo();
-		if (strpos($pathInfo, '/apps/calendar') === 0) {
+		if (str_starts_with($pathInfo, '/apps/calendar')) {
 			Util::addScript('deck', 'deck-calendar');
 		}
 
-		if (strpos($pathInfo, '/call/') === 0 || strpos($pathInfo, '/apps/spreed') === 0) {
+		if (str_starts_with($pathInfo, '/call/') || str_starts_with($pathInfo, '/apps/spreed')) {
 			Util::addScript('deck', 'deck-talk');
 		}
 	}

diff --git a/lib/Listeners/ResourceAdditionalScriptsListener.php b/lib/Listeners/ResourceAdditionalScriptsListener.php
@@ -21,7 +21,7 @@ public function handle(Event $event): void {
 			return;
 		}
 
-		if (strpos($this->request->getPathInfo(), '/call/') === 0) {
+		if (str_starts_with($this->request->getPathInfo(), '/call/')) {
 			// Talk integration has its own entrypoint which already includes collections handling
 			return;
 		}

diff --git a/lib/Middleware/ExceptionMiddleware.php b/lib/Middleware/ExceptionMiddleware.php
@@ -109,7 +109,7 @@ public function afterException($controller, $methodName, \Exception $exception)
 			], $exception->getStatus());
 		}
 
-		if (strpos(get_class($controller), 'OCA\\Deck\\Controller\\') === 0) {
+		if (str_starts_with(get_class($controller), 'OCA\\Deck\\Controller\\')) {
 			$response = [
 				'status' => 500,
 				'message' => $exceptionMessage,

diff --git a/lib/Search/FilterStringParser.php b/lib/Search/FilterStringParser.php
@@ -41,7 +41,7 @@ class FilterStringParser {
 	public function __construct(IL10N $l10n) {
 		$this->l10n = $l10n;
 	}
-	
+
 	public function parse(?string $filter): SearchQuery {
 		$query = new SearchQuery();
 		if (empty($filter)) {
@@ -71,7 +71,7 @@ public function parse(?string $filter): SearchQuery {
 	}
 
 	private function parseFilterToken(SearchQuery $query, string $token): bool {
-		if (strpos($token, ':') === false) {
+		if (!str_contains($token, ':')) {
 			return false;
 		}
 

diff --git a/lib/Validators/BaseValidator.php b/lib/Validators/BaseValidator.php
@@ -55,7 +55,7 @@ private function validate($data) {
 					// The format for specifying validation rules and parameters follows an
 					// easy {rule}:{parameters} formatting convention. For instance the
 					// rule "Max:3" states that the value may only be three letters.
-					if (strpos($rule, ':') !== false) {
+					if (str_contains($rule, ':')) {
 						[$rule, $parameter] = explode(':', $rule, 2);
 						if (!$this->{$rule}($value, $parameter)) {
 							throw new BadRequestException(

diff --git a/tests/unit/Activity/ActivityManagerTest.php b/tests/unit/Activity/ActivityManagerTest.php
@@ -98,7 +98,7 @@ public function testGetActivityFormatOwn() {
 			->willReturn($this->l10n);
 
 		foreach ($managerClass->getConstants() as $constant => $value) {
-			if (strpos($constant, 'SUBJECT') === 0) {
+			if (str_starts_with($constant, 'SUBJECT')) {
 				$format = $this->activityManager->getActivityFormat('cz', $value, [], false);
 				if ($format !== '') {
 					$this->assertStringContainsString('{user}', $format);