refactor: apply Rector

Signed-off-by: Christoph Wurst <[email protected]>

Author: ChristophWurst

lib/Controller/ProxyController.php

@@ -57,9 +57,9 @@ public function __construct(string $appName,
 	public function redirect(string $src): TemplateResponse {
 		$authorizedRedirect = false;
 
-		if (strpos($src, 'http://') !== 0
-			&& strpos($src, 'https://') !== 0
-			&& strpos($src, 'ftp://') !== 0) {
+		if (!str_starts_with($src, 'http://')
+			&& !str_starts_with($src, 'https://')
+			&& !str_starts_with($src, 'ftp://')) {
 			throw new Exception('URL is not valid.', 1);
 		}
 

lib/IMAP/Threading/Message.php

@@ -36,7 +36,7 @@ public function __construct(string $subject,
 	}
 
 	public function hasReSubject(): bool {
-		return strpos($this->getSubject(), 'Re:') === 0;
+		return str_starts_with($this->getSubject(), 'Re:');
 	}
 
 	public function getSubject(): string {

lib/Search/Provider.php

@@ -61,7 +61,7 @@ public function getName(): string {
 
 	#[\Override]
 	public function getOrder(string $route, array $routeParameters): int {
-		if (strpos($route, Application::APP_ID . '.') === 0) {
+		if (str_starts_with($route, Application::APP_ID . '.')) {
 			// Active app, prefer Mail results
 			return -1;
 		}

lib/Service/ContactsIntegration.php

@@ -159,7 +159,7 @@ public function getPhoto(string $email) {
 	 */
 	private function getPhotoUri(string $raw) {
 		$uriPrefix = 'VALUE=uri:';
-		if (substr($raw, 0, strlen($uriPrefix)) === $uriPrefix) {
+		if (str_starts_with($raw, $uriPrefix)) {
 			return substr($raw, strpos($raw, 'http'));
 		} else {
 			// ignore contacts >= 1.0 binary images

lib/Service/HtmlPurify/TransformStyleURLs.php

@@ -33,7 +33,7 @@ public function __construct(IURLGenerator $urlGenerator) {
 	 */
 	#[\Override]
 	public function transform($attr, $config, $context) {
-		if (!isset($attr['style']) || strpos($attr['style'], 'url(') === false) {
+		if (!isset($attr['style']) || !str_contains($attr['style'], 'url(')) {
 			return $attr;
 		}
 
@@ -47,7 +47,7 @@ public function transform($attr, $config, $context) {
 			}
 
 			[$name, $value] = explode(':', $cssAttribute, 2);
-			if (strpos($value, 'url(') !== false) {
+			if (str_contains($value, 'url(')) {
 				// Replace image URL
 				$value = preg_replace('/url\(("|\')?http.*\)/i',
 					'url(' . $this->urlGenerator->imagePath('mail', 'blocked-image.png') . ')',

lib/Service/Search/FilterStringParser.php

@@ -26,7 +26,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;
 		}
 

lib/Sieve/SieveUtils.php

@@ -31,7 +31,7 @@ public static function escapeString(string $subject): string {
 	 * @see https://www.rfc-editor.org/rfc/rfc5228#section-2.4.2.1
 	 */
 	public static function stringList(array $values): string {
-		$values = array_map([__CLASS__, 'escapeString'], $values);
+		$values = array_map([self::class, 'escapeString'], $values);
 
 		return '["' . implode('", "', $values) . '"]';
 	}

tests/Unit/Service/Sync/SyncServiceTest.php

@@ -34,15 +34,9 @@ class SyncServiceTest extends TestCase {
 	/** @var ImapToDbSynchronizer */
 	private $synchronizer;
 
-	/** @var FilterStringParser */
-	private $filterStringParser;
-
 	/** @var MessageMapper */
 	private $messageMapper;
 
-	/** @var PreviewEnhancer */
-	private $previewEnhancer;
-
 	/** @var LoggerInterface */
 	private $loggerInterface;
 
@@ -58,18 +52,18 @@ protected function setUp(): void {
 		$this->clientFactory = $this->createMock(IMAPClientFactory::class);
 		$this->client = $this->createMock(Horde_Imap_Client_Socket::class);
 		$this->synchronizer = $this->createMock(ImapToDbSynchronizer::class);
-		$this->filterStringParser = $this->createMock(FilterStringParser::class);
+		$filterStringParser = $this->createMock(FilterStringParser::class);
 		$this->messageMapper = $this->createMock(MessageMapper::class);
-		$this->previewEnhancer = $this->createMock(PreviewEnhancer::class);
+		$previewEnhancer = $this->createMock(PreviewEnhancer::class);
 		$this->loggerInterface = $this->createMock(LoggerInterface::class);
 		$this->mailboxSync = $this->createMock(MailboxSync::class);
 
 		$this->syncService = new SyncService(
 			$this->clientFactory,
 			$this->synchronizer,
-			$this->filterStringParser,
+			$filterStringParser,
 			$this->messageMapper,
-			$this->previewEnhancer,
+			$previewEnhancer,
 			$this->loggerInterface,
 			$this->mailboxSync
 		);