nextcloud / server

lib/public/Federation/Events/TrustedServerRemovedEvent.php

Indentation +22 added lines, -22 removed lines

@@ -15,28 +15,28 @@
  */
 class TrustedServerRemovedEvent extends Event {
 
-	/**
-	 * @since 25.0.0
-	 * @since 32.0.0 Added $url argument
-	 */
-	public function __construct(
-		private readonly string $urlHash,
-		private readonly ?string $url = null,
-	) {
-		parent::__construct();
-	}
+    /**
+     * @since 25.0.0
+     * @since 32.0.0 Added $url argument
+     */
+    public function __construct(
+        private readonly string $urlHash,
+        private readonly ?string $url = null,
+    ) {
+        parent::__construct();
+    }
 
-	/**
-	 * @since 25.0.0
-	 */
-	public function getUrlHash(): string {
-		return $this->urlHash;
-	}
+    /**
+     * @since 25.0.0
+     */
+    public function getUrlHash(): string {
+        return $this->urlHash;
+    }
 
-	/**
-	 * @since 32.0.0
-	 */
-	public function getUrl(): ?string {
-		return $this->url;
-	}
+    /**
+     * @since 32.0.0
+     */
+    public function getUrl(): ?string {
+        return $this->url;
+    }
 }

apps/federation/lib/AppInfo/Application.php

Indentation +12 added lines, -12 removed lines

@@ -18,18 +18,18 @@
 
 class Application extends App implements IBootstrap {
 
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct($urlParams = []) {
-		parent::__construct('federation', $urlParams);
-	}
+    /**
+     * @param array $urlParams
+     */
+    public function __construct($urlParams = []) {
+        parent::__construct('federation', $urlParams);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(SabrePluginAuthInitEvent::class, SabrePluginAuthInitListener::class);
-		$context->registerEventListener(TrustedServerRemovedEvent::class, TrustedServerRemovedListener::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerEventListener(SabrePluginAuthInitEvent::class, SabrePluginAuthInitListener::class);
+        $context->registerEventListener(TrustedServerRemovedEvent::class, TrustedServerRemovedListener::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

apps/federation/lib/Listener/TrustedServerRemovedListener.php

Indentation +36 added lines, -36 removed lines

@@ -18,40 +18,40 @@
 
 /** @template-implements IEventListener<TrustedServerRemovedEvent> */
 class TrustedServerRemovedListener implements IEventListener {
-	public function __construct(
-		private readonly IJobList $jobList,
-	) {
-	}
-
-	public function handle(Event $event): void {
-		if (!$event instanceof TrustedServerRemovedEvent) {
-			return;
-		}
-
-		if ($event->getUrl() === null) {
-			return; // safe guard
-		}
-
-		$this->removeJobsByUrl(RequestSharedSecret::class, $event->getUrl());
-		$this->removeJobsByUrl(GetSharedSecret::class, $event->getUrl());
-	}
-
-	/**
-	 * Remove RequestSharedSecret or GetSharedSecret jobs from the job list by their URL.
-	 * The jobs are scheduled with url, token, and created as arguments.
-	 * Thus, we have to loop over the jobs here and cannot use IJobList.remove.
-	 */
-	private function removeJobsByUrl(string $class, string $url): void {
-		foreach ($this->jobList->getJobsIterator($class, null, 0) as $job) {
-			$arguments = $job->getArgument();
-			if (isset($arguments['url']) && $arguments['url'] === $url) {
-				try {
-					$this->jobList->removeById($job->getId());
-				} catch (\Exception) {
-					// Removing the background jobs is optional because they will expire sometime.
-					// Therefore, we are using catch and ignore.
-				}
-			}
-		}
-	}
+    public function __construct(
+        private readonly IJobList $jobList,
+    ) {
+    }
+
+    public function handle(Event $event): void {
+        if (!$event instanceof TrustedServerRemovedEvent) {
+            return;
+        }
+
+        if ($event->getUrl() === null) {
+            return; // safe guard
+        }
+
+        $this->removeJobsByUrl(RequestSharedSecret::class, $event->getUrl());
+        $this->removeJobsByUrl(GetSharedSecret::class, $event->getUrl());
+    }
+
+    /**
+     * Remove RequestSharedSecret or GetSharedSecret jobs from the job list by their URL.
+     * The jobs are scheduled with url, token, and created as arguments.
+     * Thus, we have to loop over the jobs here and cannot use IJobList.remove.
+     */
+    private function removeJobsByUrl(string $class, string $url): void {
+        foreach ($this->jobList->getJobsIterator($class, null, 0) as $job) {
+            $arguments = $job->getArgument();
+            if (isset($arguments['url']) && $arguments['url'] === $url) {
+                try {
+                    $this->jobList->removeById($job->getId());
+                } catch (\Exception) {
+                    // Removing the background jobs is optional because they will expire sometime.
+                    // Therefore, we are using catch and ignore.
+                }
+            }
+        }
+    }
 }

apps/federation/lib/TrustedServers.php

Indentation +184 added lines, -184 removed lines

@@ -22,188 +22,188 @@
 
 class TrustedServers {
 
-	/** after a user list was exchanged at least once successfully */
-	public const STATUS_OK = 1;
-	/** waiting for shared secret or initial user list exchange */
-	public const STATUS_PENDING = 2;
-	/** something went wrong, misconfigured server, software bug,... user interaction needed */
-	public const STATUS_FAILURE = 3;
-	/** remote server revoked access */
-	public const STATUS_ACCESS_REVOKED = 4;
-
-	/** @var list<array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}>|null */
-	private ?array $trustedServersCache = null;
-
-	public function __construct(
-		private DbHandler $dbHandler,
-		private IClientService $httpClientService,
-		private LoggerInterface $logger,
-		private IJobList $jobList,
-		private ISecureRandom $secureRandom,
-		private IConfig $config,
-		private IEventDispatcher $dispatcher,
-		private ITimeFactory $timeFactory,
-	) {
-	}
-
-	/**
-	 * Add server to the list of trusted servers
-	 */
-	public function addServer(string $url): int {
-		$url = $this->updateProtocol($url);
-		$result = $this->dbHandler->addServer($url);
-		if ($result) {
-			$token = $this->secureRandom->generate(16);
-			$this->dbHandler->addToken($url, $token);
-			$this->jobList->add(
-				RequestSharedSecret::class,
-				[
-					'url' => $url,
-					'token' => $token,
-					'created' => $this->timeFactory->getTime()
-				]
-			);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get shared secret for the given server
-	 */
-	public function getSharedSecret(string $url): string {
-		return $this->dbHandler->getSharedSecret($url);
-	}
-
-	/**
-	 * Add shared secret for the given server
-	 */
-	public function addSharedSecret(string $url, string $sharedSecret): void {
-		$this->dbHandler->addSharedSecret($url, $sharedSecret);
-	}
-
-	/**
-	 * Remove server from the list of trusted servers
-	 */
-	public function removeServer(int $id): void {
-		$server = $this->dbHandler->getServerById($id);
-		$this->dbHandler->removeServer($id);
-		$this->dispatcher->dispatchTyped(new TrustedServerRemovedEvent($server['url_hash'], $server['url']));
-
-	}
-
-	/**
-	 * Get all trusted servers
-	 *
-	 * @return list<array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}>
-	 * @throws \Exception
-	 */
-	public function getServers(): ?array {
-		if ($this->trustedServersCache === null) {
-			$this->trustedServersCache = $this->dbHandler->getAllServer();
-		}
-		return $this->trustedServersCache;
-	}
-
-	/**
-	 * Get a trusted server
-	 *
-	 * @return array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}
-	 * @throws Exception
-	 */
-	public function getServer(int $id): ?array {
-		if ($this->trustedServersCache === null) {
-			$this->trustedServersCache = $this->dbHandler->getAllServer();
-		}
-
-		foreach ($this->trustedServersCache as $server) {
-			if ($server['id'] === $id) {
-				return $server;
-			}
-		}
-
-		throw new \Exception('No server found with ID: ' . $id);
-	}
-
-	/**
-	 * Check if given server is a trusted Nextcloud server
-	 */
-	public function isTrustedServer(string $url): bool {
-		return $this->dbHandler->serverExists($url);
-	}
-
-	/**
-	 * Set server status
-	 */
-	public function setServerStatus(string $url, int $status): void {
-		$this->dbHandler->setServerStatus($url, $status);
-	}
-
-	/**
-	 * Get server status
-	 */
-	public function getServerStatus(string $url): int {
-		return $this->dbHandler->getServerStatus($url);
-	}
-
-	/**
-	 * Check if URL point to a ownCloud/Nextcloud server
-	 */
-	public function isNextcloudServer(string $url): bool {
-		$isValidNextcloud = false;
-		$client = $this->httpClientService->newClient();
-		try {
-			$result = $client->get(
-				$url . '/status.php',
-				[
-					'timeout' => 3,
-					'connect_timeout' => 3,
-					'verify' => !$this->config->getSystemValue('sharing.federation.allowSelfSignedCertificates', false),
-				]
-			);
-			if ($result->getStatusCode() === Http::STATUS_OK) {
-				$body = $result->getBody();
-				if (is_resource($body)) {
-					$body = stream_get_contents($body) ?: '';
-				}
-				$isValidNextcloud = $this->checkNextcloudVersion($body);
-			}
-		} catch (\Exception $e) {
-			$this->logger->error('No Nextcloud server.', [
-				'exception' => $e,
-			]);
-			return false;
-		}
-
-		return $isValidNextcloud;
-	}
-
-	/**
-	 * Check if ownCloud/Nextcloud version is >= 9.0
-	 * @throws HintException
-	 */
-	protected function checkNextcloudVersion(string $status): bool {
-		$decoded = json_decode($status, true);
-		if (!empty($decoded) && isset($decoded['version'])) {
-			if (!version_compare($decoded['version'], '9.0.0', '>=')) {
-				throw new HintException('Remote server version is too low. 9.0 is required.');
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Check if the URL contain a protocol, if not add https
-	 */
-	protected function updateProtocol(string $url): string {
-		if (
-			strpos($url, 'https://') === 0
-			|| strpos($url, 'http://') === 0
-		) {
-			return $url;
-		}
-
-		return 'https://' . $url;
-	}
+    /** after a user list was exchanged at least once successfully */
+    public const STATUS_OK = 1;
+    /** waiting for shared secret or initial user list exchange */
+    public const STATUS_PENDING = 2;
+    /** something went wrong, misconfigured server, software bug,... user interaction needed */
+    public const STATUS_FAILURE = 3;
+    /** remote server revoked access */
+    public const STATUS_ACCESS_REVOKED = 4;
+
+    /** @var list<array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}>|null */
+    private ?array $trustedServersCache = null;
+
+    public function __construct(
+        private DbHandler $dbHandler,
+        private IClientService $httpClientService,
+        private LoggerInterface $logger,
+        private IJobList $jobList,
+        private ISecureRandom $secureRandom,
+        private IConfig $config,
+        private IEventDispatcher $dispatcher,
+        private ITimeFactory $timeFactory,
+    ) {
+    }
+
+    /**
+     * Add server to the list of trusted servers
+     */
+    public function addServer(string $url): int {
+        $url = $this->updateProtocol($url);
+        $result = $this->dbHandler->addServer($url);
+        if ($result) {
+            $token = $this->secureRandom->generate(16);
+            $this->dbHandler->addToken($url, $token);
+            $this->jobList->add(
+                RequestSharedSecret::class,
+                [
+                    'url' => $url,
+                    'token' => $token,
+                    'created' => $this->timeFactory->getTime()
+                ]
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get shared secret for the given server
+     */
+    public function getSharedSecret(string $url): string {
+        return $this->dbHandler->getSharedSecret($url);
+    }
+
+    /**
+     * Add shared secret for the given server
+     */
+    public function addSharedSecret(string $url, string $sharedSecret): void {
+        $this->dbHandler->addSharedSecret($url, $sharedSecret);
+    }
+
+    /**
+     * Remove server from the list of trusted servers
+     */
+    public function removeServer(int $id): void {
+        $server = $this->dbHandler->getServerById($id);
+        $this->dbHandler->removeServer($id);
+        $this->dispatcher->dispatchTyped(new TrustedServerRemovedEvent($server['url_hash'], $server['url']));
+
+    }
+
+    /**
+     * Get all trusted servers
+     *
+     * @return list<array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}>
+     * @throws \Exception
+     */
+    public function getServers(): ?array {
+        if ($this->trustedServersCache === null) {
+            $this->trustedServersCache = $this->dbHandler->getAllServer();
+        }
+        return $this->trustedServersCache;
+    }
+
+    /**
+     * Get a trusted server
+     *
+     * @return array{id: int, url: string, url_hash: string, shared_secret: ?string, status: int, sync_token: ?string}
+     * @throws Exception
+     */
+    public function getServer(int $id): ?array {
+        if ($this->trustedServersCache === null) {
+            $this->trustedServersCache = $this->dbHandler->getAllServer();
+        }
+
+        foreach ($this->trustedServersCache as $server) {
+            if ($server['id'] === $id) {
+                return $server;
+            }
+        }
+
+        throw new \Exception('No server found with ID: ' . $id);
+    }
+
+    /**
+     * Check if given server is a trusted Nextcloud server
+     */
+    public function isTrustedServer(string $url): bool {
+        return $this->dbHandler->serverExists($url);
+    }
+
+    /**
+     * Set server status
+     */
+    public function setServerStatus(string $url, int $status): void {
+        $this->dbHandler->setServerStatus($url, $status);
+    }
+
+    /**
+     * Get server status
+     */
+    public function getServerStatus(string $url): int {
+        return $this->dbHandler->getServerStatus($url);
+    }
+
+    /**
+     * Check if URL point to a ownCloud/Nextcloud server
+     */
+    public function isNextcloudServer(string $url): bool {
+        $isValidNextcloud = false;
+        $client = $this->httpClientService->newClient();
+        try {
+            $result = $client->get(
+                $url . '/status.php',
+                [
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                    'verify' => !$this->config->getSystemValue('sharing.federation.allowSelfSignedCertificates', false),
+                ]
+            );
+            if ($result->getStatusCode() === Http::STATUS_OK) {
+                $body = $result->getBody();
+                if (is_resource($body)) {
+                    $body = stream_get_contents($body) ?: '';
+                }
+                $isValidNextcloud = $this->checkNextcloudVersion($body);
+            }
+        } catch (\Exception $e) {
+            $this->logger->error('No Nextcloud server.', [
+                'exception' => $e,
+            ]);
+            return false;
+        }
+
+        return $isValidNextcloud;
+    }
+
+    /**
+     * Check if ownCloud/Nextcloud version is >= 9.0
+     * @throws HintException
+     */
+    protected function checkNextcloudVersion(string $status): bool {
+        $decoded = json_decode($status, true);
+        if (!empty($decoded) && isset($decoded['version'])) {
+            if (!version_compare($decoded['version'], '9.0.0', '>=')) {
+                throw new HintException('Remote server version is too low. 9.0 is required.');
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Check if the URL contain a protocol, if not add https
+     */
+    protected function updateProtocol(string $url): string {
+        if (
+            strpos($url, 'https://') === 0
+            || strpos($url, 'http://') === 0
+        ) {
+            return $url;
+        }
+
+        return 'https://' . $url;
+    }
 }

apps/federation/composer/composer/autoload_static.php

Spacing +23 added lines, -23 removed lines

@@ -6,42 +6,42 @@
 
 class ComposerStaticInitFederation
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Federation\\' => 15,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Federation\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Federation\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Federation\\BackgroundJob\\GetSharedSecret' => __DIR__ . '/..' . '/../lib/BackgroundJob/GetSharedSecret.php',
-        'OCA\\Federation\\BackgroundJob\\RequestSharedSecret' => __DIR__ . '/..' . '/../lib/BackgroundJob/RequestSharedSecret.php',
-        'OCA\\Federation\\Command\\SyncFederationAddressBooks' => __DIR__ . '/..' . '/../lib/Command/SyncFederationAddressBooks.php',
-        'OCA\\Federation\\Controller\\OCSAuthAPIController' => __DIR__ . '/..' . '/../lib/Controller/OCSAuthAPIController.php',
-        'OCA\\Federation\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
-        'OCA\\Federation\\DAV\\FedAuth' => __DIR__ . '/..' . '/../lib/DAV/FedAuth.php',
-        'OCA\\Federation\\DbHandler' => __DIR__ . '/..' . '/../lib/DbHandler.php',
-        'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => __DIR__ . '/..' . '/../lib/Listener/SabrePluginAuthInitListener.php',
-        'OCA\\Federation\\Listener\\TrustedServerRemovedListener' => __DIR__ . '/..' . '/../lib/Listener/TrustedServerRemovedListener.php',
-        'OCA\\Federation\\Migration\\Version1010Date20200630191302' => __DIR__ . '/..' . '/../lib/Migration/Version1010Date20200630191302.php',
-        'OCA\\Federation\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\Federation\\SyncFederationAddressBooks' => __DIR__ . '/..' . '/../lib/SyncFederationAddressBooks.php',
-        'OCA\\Federation\\SyncJob' => __DIR__ . '/..' . '/../lib/SyncJob.php',
-        'OCA\\Federation\\TrustedServers' => __DIR__ . '/..' . '/../lib/TrustedServers.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Federation\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Federation\\BackgroundJob\\GetSharedSecret' => __DIR__.'/..'.'/../lib/BackgroundJob/GetSharedSecret.php',
+        'OCA\\Federation\\BackgroundJob\\RequestSharedSecret' => __DIR__.'/..'.'/../lib/BackgroundJob/RequestSharedSecret.php',
+        'OCA\\Federation\\Command\\SyncFederationAddressBooks' => __DIR__.'/..'.'/../lib/Command/SyncFederationAddressBooks.php',
+        'OCA\\Federation\\Controller\\OCSAuthAPIController' => __DIR__.'/..'.'/../lib/Controller/OCSAuthAPIController.php',
+        'OCA\\Federation\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
+        'OCA\\Federation\\DAV\\FedAuth' => __DIR__.'/..'.'/../lib/DAV/FedAuth.php',
+        'OCA\\Federation\\DbHandler' => __DIR__.'/..'.'/../lib/DbHandler.php',
+        'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => __DIR__.'/..'.'/../lib/Listener/SabrePluginAuthInitListener.php',
+        'OCA\\Federation\\Listener\\TrustedServerRemovedListener' => __DIR__.'/..'.'/../lib/Listener/TrustedServerRemovedListener.php',
+        'OCA\\Federation\\Migration\\Version1010Date20200630191302' => __DIR__.'/..'.'/../lib/Migration/Version1010Date20200630191302.php',
+        'OCA\\Federation\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\Federation\\SyncFederationAddressBooks' => __DIR__.'/..'.'/../lib/SyncFederationAddressBooks.php',
+        'OCA\\Federation\\SyncJob' => __DIR__.'/..'.'/../lib/SyncJob.php',
+        'OCA\\Federation\\TrustedServers' => __DIR__.'/..'.'/../lib/TrustedServers.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFederation::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFederation::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFederation::$classMap;

apps/federation/composer/composer/autoload_classmap.php

Spacing +16 added lines, -16 removed lines

@@ -6,20 +6,20 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\Federation\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Federation\\BackgroundJob\\GetSharedSecret' => $baseDir . '/../lib/BackgroundJob/GetSharedSecret.php',
-    'OCA\\Federation\\BackgroundJob\\RequestSharedSecret' => $baseDir . '/../lib/BackgroundJob/RequestSharedSecret.php',
-    'OCA\\Federation\\Command\\SyncFederationAddressBooks' => $baseDir . '/../lib/Command/SyncFederationAddressBooks.php',
-    'OCA\\Federation\\Controller\\OCSAuthAPIController' => $baseDir . '/../lib/Controller/OCSAuthAPIController.php',
-    'OCA\\Federation\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
-    'OCA\\Federation\\DAV\\FedAuth' => $baseDir . '/../lib/DAV/FedAuth.php',
-    'OCA\\Federation\\DbHandler' => $baseDir . '/../lib/DbHandler.php',
-    'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => $baseDir . '/../lib/Listener/SabrePluginAuthInitListener.php',
-    'OCA\\Federation\\Listener\\TrustedServerRemovedListener' => $baseDir . '/../lib/Listener/TrustedServerRemovedListener.php',
-    'OCA\\Federation\\Migration\\Version1010Date20200630191302' => $baseDir . '/../lib/Migration/Version1010Date20200630191302.php',
-    'OCA\\Federation\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\Federation\\SyncFederationAddressBooks' => $baseDir . '/../lib/SyncFederationAddressBooks.php',
-    'OCA\\Federation\\SyncJob' => $baseDir . '/../lib/SyncJob.php',
-    'OCA\\Federation\\TrustedServers' => $baseDir . '/../lib/TrustedServers.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\Federation\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Federation\\BackgroundJob\\GetSharedSecret' => $baseDir.'/../lib/BackgroundJob/GetSharedSecret.php',
+    'OCA\\Federation\\BackgroundJob\\RequestSharedSecret' => $baseDir.'/../lib/BackgroundJob/RequestSharedSecret.php',
+    'OCA\\Federation\\Command\\SyncFederationAddressBooks' => $baseDir.'/../lib/Command/SyncFederationAddressBooks.php',
+    'OCA\\Federation\\Controller\\OCSAuthAPIController' => $baseDir.'/../lib/Controller/OCSAuthAPIController.php',
+    'OCA\\Federation\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
+    'OCA\\Federation\\DAV\\FedAuth' => $baseDir.'/../lib/DAV/FedAuth.php',
+    'OCA\\Federation\\DbHandler' => $baseDir.'/../lib/DbHandler.php',
+    'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => $baseDir.'/../lib/Listener/SabrePluginAuthInitListener.php',
+    'OCA\\Federation\\Listener\\TrustedServerRemovedListener' => $baseDir.'/../lib/Listener/TrustedServerRemovedListener.php',
+    'OCA\\Federation\\Migration\\Version1010Date20200630191302' => $baseDir.'/../lib/Migration/Version1010Date20200630191302.php',
+    'OCA\\Federation\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\Federation\\SyncFederationAddressBooks' => $baseDir.'/../lib/SyncFederationAddressBooks.php',
+    'OCA\\Federation\\SyncJob' => $baseDir.'/../lib/SyncJob.php',
+    'OCA\\Federation\\TrustedServers' => $baseDir.'/../lib/TrustedServers.php',
 );

apps/federation/tests/TrustedServersTest.php

Indentation +310 added lines, -310 removed lines

@@ -26,314 +26,314 @@
 use Test\TestCase;
 
 class TrustedServersTest extends TestCase {
-	private TrustedServers $trustedServers;
-	private DbHandler&MockObject $dbHandler;
-	private IClientService&MockObject $httpClientService;
-	private IClient&MockObject $httpClient;
-	private IResponse&MockObject $response;
-	private LoggerInterface&MockObject $logger;
-	private IJobList&MockObject $jobList;
-	private ISecureRandom&MockObject $secureRandom;
-	private IConfig&MockObject $config;
-	private IEventDispatcher&MockObject $dispatcher;
-	private ITimeFactory&MockObject $timeFactory;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->dbHandler = $this->createMock(DbHandler::class);
-		$this->dispatcher = $this->createMock(IEventDispatcher::class);
-		$this->httpClientService = $this->createMock(IClientService::class);
-		$this->httpClient = $this->createMock(IClient::class);
-		$this->response = $this->createMock(IResponse::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->jobList = $this->createMock(IJobList::class);
-		$this->secureRandom = $this->createMock(ISecureRandom::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-
-		$this->trustedServers = new TrustedServers(
-			$this->dbHandler,
-			$this->httpClientService,
-			$this->logger,
-			$this->jobList,
-			$this->secureRandom,
-			$this->config,
-			$this->dispatcher,
-			$this->timeFactory
-		);
-	}
-
-	public function testAddServer(): void {
-		/** @var TrustedServers&MockObject $trustedServers */
-		$trustedServers = $this->getMockBuilder(TrustedServers::class)
-			->setConstructorArgs(
-				[
-					$this->dbHandler,
-					$this->httpClientService,
-					$this->logger,
-					$this->jobList,
-					$this->secureRandom,
-					$this->config,
-					$this->dispatcher,
-					$this->timeFactory
-				]
-			)
-			->onlyMethods(['updateProtocol'])
-			->getMock();
-		$trustedServers->expects($this->once())->method('updateProtocol')
-			->with('url')->willReturn('https://url');
-		$this->timeFactory->method('getTime')
-			->willReturn(1234567);
-		$this->dbHandler->expects($this->once())->method('addServer')->with('https://url')
-			->willReturn(1);
-
-		$this->secureRandom->expects($this->once())->method('generate')
-			->willReturn('token');
-		$this->dbHandler->expects($this->once())->method('addToken')->with('https://url', 'token');
-		$this->jobList->expects($this->once())->method('add')
-			->with(RequestSharedSecret::class,
-				['url' => 'https://url', 'token' => 'token', 'created' => 1234567]);
-
-		$this->assertSame(
-			1,
-			$trustedServers->addServer('url')
-		);
-	}
-
-	public function testAddSharedSecret(): void {
-		$this->dbHandler->expects($this->once())->method('addSharedSecret')
-			->with('url', 'secret');
-		$this->trustedServers->addSharedSecret('url', 'secret');
-	}
-
-	public function testGetSharedSecret(): void {
-		$this->dbHandler->expects($this->once())
-			->method('getSharedSecret')
-			->with('url')
-			->willReturn('secret');
-		$this->assertSame(
-			$this->trustedServers->getSharedSecret('url'),
-			'secret'
-		);
-	}
-
-	public function testRemoveServer(): void {
-		$id = 42;
-		$server = ['url' => 'url', 'url_hash' => 'url_hash'];
-		$this->dbHandler->expects($this->once())->method('removeServer')->with($id);
-		$this->dbHandler->expects($this->once())->method('getServerById')->with($id)
-			->willReturn($server);
-		$this->dispatcher->expects($this->once())->method('dispatchTyped')
-			->willReturnCallback(
-				function ($event): void {
-					$this->assertInstanceOf(TrustedServerRemovedEvent::class, $event);
-					$this->assertSame('url', $event->getUrl());
-					$this->assertSame('url_hash', $event->getUrlHash());
-				}
-			);
-		$this->trustedServers->removeServer($id);
-	}
-
-	public function testGetServers(): void {
-		$this->dbHandler->expects($this->once())->method('getAllServer')->willReturn(['servers']);
-
-		$this->assertEquals(
-			['servers'],
-			$this->trustedServers->getServers()
-		);
-	}
-
-	public static function dataTestGetServer() {
-		return [
-			[
-				15,
-				[
-					'id' => 15,
-					'otherData' => 'first server',
-				]
-			],
-			[
-				16,
-				[
-					'id' => 16,
-					'otherData' => 'second server',
-				]
-			],
-			[
-				42,
-				[
-					'id' => 42,
-					'otherData' => 'last server',
-				]
-			],
-			[
-				108,
-				null
-			],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetServer')]
-	public function testGetServer(int $id, ?array $expectedServer): void {
-		$servers = [
-			[
-				'id' => 15,
-				'otherData' => 'first server',
-			],
-			[
-				'id' => 16,
-				'otherData' => 'second server',
-			],
-			[
-				'id' => 42,
-				'otherData' => 'last server',
-			],
-		];
-		$this->dbHandler->expects($this->once())->method('getAllServer')->willReturn($servers);
-
-		if ($expectedServer === null) {
-			$this->expectException(\Exception::class);
-			$this->expectExceptionMessage('No server found with ID: ' . $id);
-		}
-
-		$this->assertEquals(
-			$expectedServer,
-			$this->trustedServers->getServer($id)
-		);
-	}
-
-	public function testIsTrustedServer(): void {
-		$this->dbHandler->expects($this->once())
-			->method('serverExists')->with('url')
-			->willReturn(true);
-
-		$this->assertTrue(
-			$this->trustedServers->isTrustedServer('url')
-		);
-	}
-
-	public function testSetServerStatus(): void {
-		$this->dbHandler->expects($this->once())->method('setServerStatus')
-			->with('url', 1);
-		$this->trustedServers->setServerStatus('url', 1);
-	}
-
-	public function testGetServerStatus(): void {
-		$this->dbHandler->expects($this->once())->method('getServerStatus')
-			->with('url')->willReturn(1);
-		$this->assertSame(
-			$this->trustedServers->getServerStatus('url'),
-			1
-		);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsNextcloudServer')]
-	public function testIsNextcloudServer(int $statusCode, bool $isValidNextcloudVersion, bool $expected): void {
-		$server = 'server1';
-
-		/** @var TrustedServers&MockObject $trustedServers */
-		$trustedServers = $this->getMockBuilder(TrustedServers::class)
-			->setConstructorArgs(
-				[
-					$this->dbHandler,
-					$this->httpClientService,
-					$this->logger,
-					$this->jobList,
-					$this->secureRandom,
-					$this->config,
-					$this->dispatcher,
-					$this->timeFactory
-				]
-			)
-			->onlyMethods(['checkNextcloudVersion'])
-			->getMock();
-
-		$this->httpClientService->expects($this->once())->method('newClient')
-			->willReturn($this->httpClient);
-
-		$this->httpClient->expects($this->once())->method('get')->with($server . '/status.php')
-			->willReturn($this->response);
-
-		$this->response->expects($this->once())->method('getStatusCode')
-			->willReturn($statusCode);
-
-		if ($statusCode === 200) {
-			$this->response->expects($this->once())->method('getBody')
-				->willReturn('');
-			$trustedServers->expects($this->once())->method('checkNextcloudVersion')
-				->willReturn($isValidNextcloudVersion);
-		} else {
-			$trustedServers->expects($this->never())->method('checkNextcloudVersion');
-		}
-
-		$this->assertSame($expected,
-			$trustedServers->isNextcloudServer($server)
-		);
-	}
-
-	public static function dataTestIsNextcloudServer(): array {
-		return [
-			[200, true, true],
-			[200, false, false],
-			[404, true, false],
-		];
-	}
-
-	public function testIsNextcloudServerFail(): void {
-		$server = 'server1';
-
-		$this->httpClientService->expects($this->once())
-			->method('newClient')
-			->willReturn($this->httpClient);
-
-		$this->httpClient->expects($this->once())
-			->method('get')
-			->with($server . '/status.php')
-			->willThrowException(new \Exception('simulated exception'));
-
-		$this->assertFalse($this->trustedServers->isNextcloudServer($server));
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestCheckNextcloudVersion')]
-	public function testCheckNextcloudVersion(string $status): void {
-		$this->assertTrue(self::invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]));
-	}
-
-	public static function dataTestCheckNextcloudVersion(): array {
-		return [
-			['{"version":"9.0.0"}'],
-			['{"version":"9.1.0"}']
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestCheckNextcloudVersionTooLow')]
-	public function testCheckNextcloudVersionTooLow(string $status): void {
-		$this->expectException(HintException::class);
-		$this->expectExceptionMessage('Remote server version is too low. 9.0 is required.');
-
-		self::invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]);
-	}
-
-	public static function dataTestCheckNextcloudVersionTooLow(): array {
-		return [
-			['{"version":"8.2.3"}'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestUpdateProtocol')]
-	public function testUpdateProtocol(string $url, string $expected): void {
-		$this->assertSame($expected,
-			self::invokePrivate($this->trustedServers, 'updateProtocol', [$url])
-		);
-	}
-
-	public static function dataTestUpdateProtocol(): array {
-		return [
-			['http://owncloud.org', 'http://owncloud.org'],
-			['https://owncloud.org', 'https://owncloud.org'],
-			['owncloud.org', 'https://owncloud.org'],
-			['httpserver', 'https://httpserver'],
-		];
-	}
+    private TrustedServers $trustedServers;
+    private DbHandler&MockObject $dbHandler;
+    private IClientService&MockObject $httpClientService;
+    private IClient&MockObject $httpClient;
+    private IResponse&MockObject $response;
+    private LoggerInterface&MockObject $logger;
+    private IJobList&MockObject $jobList;
+    private ISecureRandom&MockObject $secureRandom;
+    private IConfig&MockObject $config;
+    private IEventDispatcher&MockObject $dispatcher;
+    private ITimeFactory&MockObject $timeFactory;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->dbHandler = $this->createMock(DbHandler::class);
+        $this->dispatcher = $this->createMock(IEventDispatcher::class);
+        $this->httpClientService = $this->createMock(IClientService::class);
+        $this->httpClient = $this->createMock(IClient::class);
+        $this->response = $this->createMock(IResponse::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->jobList = $this->createMock(IJobList::class);
+        $this->secureRandom = $this->createMock(ISecureRandom::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+
+        $this->trustedServers = new TrustedServers(
+            $this->dbHandler,
+            $this->httpClientService,
+            $this->logger,
+            $this->jobList,
+            $this->secureRandom,
+            $this->config,
+            $this->dispatcher,
+            $this->timeFactory
+        );
+    }
+
+    public function testAddServer(): void {
+        /** @var TrustedServers&MockObject $trustedServers */
+        $trustedServers = $this->getMockBuilder(TrustedServers::class)
+            ->setConstructorArgs(
+                [
+                    $this->dbHandler,
+                    $this->httpClientService,
+                    $this->logger,
+                    $this->jobList,
+                    $this->secureRandom,
+                    $this->config,
+                    $this->dispatcher,
+                    $this->timeFactory
+                ]
+            )
+            ->onlyMethods(['updateProtocol'])
+            ->getMock();
+        $trustedServers->expects($this->once())->method('updateProtocol')
+            ->with('url')->willReturn('https://url');
+        $this->timeFactory->method('getTime')
+            ->willReturn(1234567);
+        $this->dbHandler->expects($this->once())->method('addServer')->with('https://url')
+            ->willReturn(1);
+
+        $this->secureRandom->expects($this->once())->method('generate')
+            ->willReturn('token');
+        $this->dbHandler->expects($this->once())->method('addToken')->with('https://url', 'token');
+        $this->jobList->expects($this->once())->method('add')
+            ->with(RequestSharedSecret::class,
+                ['url' => 'https://url', 'token' => 'token', 'created' => 1234567]);
+
+        $this->assertSame(
+            1,
+            $trustedServers->addServer('url')
+        );
+    }
+
+    public function testAddSharedSecret(): void {
+        $this->dbHandler->expects($this->once())->method('addSharedSecret')
+            ->with('url', 'secret');
+        $this->trustedServers->addSharedSecret('url', 'secret');
+    }
+
+    public function testGetSharedSecret(): void {
+        $this->dbHandler->expects($this->once())
+            ->method('getSharedSecret')
+            ->with('url')
+            ->willReturn('secret');
+        $this->assertSame(
+            $this->trustedServers->getSharedSecret('url'),
+            'secret'
+        );
+    }
+
+    public function testRemoveServer(): void {
+        $id = 42;
+        $server = ['url' => 'url', 'url_hash' => 'url_hash'];
+        $this->dbHandler->expects($this->once())->method('removeServer')->with($id);
+        $this->dbHandler->expects($this->once())->method('getServerById')->with($id)
+            ->willReturn($server);
+        $this->dispatcher->expects($this->once())->method('dispatchTyped')
+            ->willReturnCallback(
+                function ($event): void {
+                    $this->assertInstanceOf(TrustedServerRemovedEvent::class, $event);
+                    $this->assertSame('url', $event->getUrl());
+                    $this->assertSame('url_hash', $event->getUrlHash());
+                }
+            );
+        $this->trustedServers->removeServer($id);
+    }
+
+    public function testGetServers(): void {
+        $this->dbHandler->expects($this->once())->method('getAllServer')->willReturn(['servers']);
+
+        $this->assertEquals(
+            ['servers'],
+            $this->trustedServers->getServers()
+        );
+    }
+
+    public static function dataTestGetServer() {
+        return [
+            [
+                15,
+                [
+                    'id' => 15,
+                    'otherData' => 'first server',
+                ]
+            ],
+            [
+                16,
+                [
+                    'id' => 16,
+                    'otherData' => 'second server',
+                ]
+            ],
+            [
+                42,
+                [
+                    'id' => 42,
+                    'otherData' => 'last server',
+                ]
+            ],
+            [
+                108,
+                null
+            ],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetServer')]
+    public function testGetServer(int $id, ?array $expectedServer): void {
+        $servers = [
+            [
+                'id' => 15,
+                'otherData' => 'first server',
+            ],
+            [
+                'id' => 16,
+                'otherData' => 'second server',
+            ],
+            [
+                'id' => 42,
+                'otherData' => 'last server',
+            ],
+        ];
+        $this->dbHandler->expects($this->once())->method('getAllServer')->willReturn($servers);
+
+        if ($expectedServer === null) {
+            $this->expectException(\Exception::class);
+            $this->expectExceptionMessage('No server found with ID: ' . $id);
+        }
+
+        $this->assertEquals(
+            $expectedServer,
+            $this->trustedServers->getServer($id)
+        );
+    }
+
+    public function testIsTrustedServer(): void {
+        $this->dbHandler->expects($this->once())
+            ->method('serverExists')->with('url')
+            ->willReturn(true);
+
+        $this->assertTrue(
+            $this->trustedServers->isTrustedServer('url')
+        );
+    }
+
+    public function testSetServerStatus(): void {
+        $this->dbHandler->expects($this->once())->method('setServerStatus')
+            ->with('url', 1);
+        $this->trustedServers->setServerStatus('url', 1);
+    }
+
+    public function testGetServerStatus(): void {
+        $this->dbHandler->expects($this->once())->method('getServerStatus')
+            ->with('url')->willReturn(1);
+        $this->assertSame(
+            $this->trustedServers->getServerStatus('url'),
+            1
+        );
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestIsNextcloudServer')]
+    public function testIsNextcloudServer(int $statusCode, bool $isValidNextcloudVersion, bool $expected): void {
+        $server = 'server1';
+
+        /** @var TrustedServers&MockObject $trustedServers */
+        $trustedServers = $this->getMockBuilder(TrustedServers::class)
+            ->setConstructorArgs(
+                [
+                    $this->dbHandler,
+                    $this->httpClientService,
+                    $this->logger,
+                    $this->jobList,
+                    $this->secureRandom,
+                    $this->config,
+                    $this->dispatcher,
+                    $this->timeFactory
+                ]
+            )
+            ->onlyMethods(['checkNextcloudVersion'])
+            ->getMock();
+
+        $this->httpClientService->expects($this->once())->method('newClient')
+            ->willReturn($this->httpClient);
+
+        $this->httpClient->expects($this->once())->method('get')->with($server . '/status.php')
+            ->willReturn($this->response);
+
+        $this->response->expects($this->once())->method('getStatusCode')
+            ->willReturn($statusCode);
+
+        if ($statusCode === 200) {
+            $this->response->expects($this->once())->method('getBody')
+                ->willReturn('');
+            $trustedServers->expects($this->once())->method('checkNextcloudVersion')
+                ->willReturn($isValidNextcloudVersion);
+        } else {
+            $trustedServers->expects($this->never())->method('checkNextcloudVersion');
+        }
+
+        $this->assertSame($expected,
+            $trustedServers->isNextcloudServer($server)
+        );
+    }
+
+    public static function dataTestIsNextcloudServer(): array {
+        return [
+            [200, true, true],
+            [200, false, false],
+            [404, true, false],
+        ];
+    }
+
+    public function testIsNextcloudServerFail(): void {
+        $server = 'server1';
+
+        $this->httpClientService->expects($this->once())
+            ->method('newClient')
+            ->willReturn($this->httpClient);
+
+        $this->httpClient->expects($this->once())
+            ->method('get')
+            ->with($server . '/status.php')
+            ->willThrowException(new \Exception('simulated exception'));
+
+        $this->assertFalse($this->trustedServers->isNextcloudServer($server));
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestCheckNextcloudVersion')]
+    public function testCheckNextcloudVersion(string $status): void {
+        $this->assertTrue(self::invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]));
+    }
+
+    public static function dataTestCheckNextcloudVersion(): array {
+        return [
+            ['{"version":"9.0.0"}'],
+            ['{"version":"9.1.0"}']
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestCheckNextcloudVersionTooLow')]
+    public function testCheckNextcloudVersionTooLow(string $status): void {
+        $this->expectException(HintException::class);
+        $this->expectExceptionMessage('Remote server version is too low. 9.0 is required.');
+
+        self::invokePrivate($this->trustedServers, 'checkNextcloudVersion', [$status]);
+    }
+
+    public static function dataTestCheckNextcloudVersionTooLow(): array {
+        return [
+            ['{"version":"8.2.3"}'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestUpdateProtocol')]
+    public function testUpdateProtocol(string $url, string $expected): void {
+        $this->assertSame($expected,
+            self::invokePrivate($this->trustedServers, 'updateProtocol', [$url])
+        );
+    }
+
+    public static function dataTestUpdateProtocol(): array {
+        return [
+            ['http://owncloud.org', 'http://owncloud.org'],
+            ['https://owncloud.org', 'https://owncloud.org'],
+            ['owncloud.org', 'https://owncloud.org'],
+            ['httpserver', 'https://httpserver'],
+        ];
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -126,7 +126,7 @@ 
 			->willReturn($server);
 		$this->dispatcher->expects($this->once())->method('dispatchTyped')
 			->willReturnCallback(
-				function ($event): void {
+				function($event): void {
 					$this->assertInstanceOf(TrustedServerRemovedEvent::class, $event);
 					$this->assertSame('url', $event->getUrl());
 					$this->assertSame('url_hash', $event->getUrlHash());
@@ -194,7 +194,7 @@ 
 
 		if ($expectedServer === null) {
 			$this->expectException(\Exception::class);
-			$this->expectExceptionMessage('No server found with ID: ' . $id);
+			$this->expectExceptionMessage('No server found with ID: '.$id);
 		}
 
 		$this->assertEquals(
@@ -252,7 +252,7 @@ 
 		$this->httpClientService->expects($this->once())->method('newClient')
 			->willReturn($this->httpClient);
 
-		$this->httpClient->expects($this->once())->method('get')->with($server . '/status.php')
+		$this->httpClient->expects($this->once())->method('get')->with($server.'/status.php')
 			->willReturn($this->response);
 
 		$this->response->expects($this->once())->method('getStatusCode')
@@ -289,7 +289,7 @@ 
 
 		$this->httpClient->expects($this->once())
 			->method('get')
-			->with($server . '/status.php')
+			->with($server.'/status.php')
 			->willThrowException(new \Exception('simulated exception'));
 
 		$this->assertFalse($this->trustedServers->isNextcloudServer($server));

apps/federation/tests/Listener/TrustedServerRemovedListenerTest.php

Indentation +37 added lines, -37 removed lines

@@ -25,47 +25,47 @@
 
 class TrustedServerRemovedListenerTest extends TestCase {
 
-	private IJobList $jobList;
-	private TrustedServerRemovedListener $listener;
+    private IJobList $jobList;
+    private TrustedServerRemovedListener $listener;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->jobList = new DummyJobList();
-		$this->listener = new TrustedServerRemovedListener($this->jobList);
-	}
+        $this->jobList = new DummyJobList();
+        $this->listener = new TrustedServerRemovedListener($this->jobList);
+    }
 
-	public function testHandle(): void {
-		// Arrange
-		$url = 'https://example.com';
-		$event = new TrustedServerRemovedEvent(md5($url), $url); // we are using a different hashing in the tests.
-		$job1 = $this->createGetSharedSecretMock();
-		$job2 = $this->createGetSharedSecretMock();
-		$job3 = $this->createGetSharedSecretMock();
-		$job4 = $this->createGetSharedSecretMock();
-		$this->jobList->add($job1, ['url' => 'https://example.org', 'token' => 'nei0dooX', 'created' => 0]);
-		$this->jobList->add($job2, ['url' => 'https://example.net', 'token' => 'ci6Shah7', 'created' => 0]);
-		$this->jobList->add($job3, ['url' => $url, 'token' => 'ieXie6Me', 'created' => 0]);
-		$this->jobList->add($job4, ['url' => $url, 'token' => 'thoQu8th', 'created' => 0]);
+    public function testHandle(): void {
+        // Arrange
+        $url = 'https://example.com';
+        $event = new TrustedServerRemovedEvent(md5($url), $url); // we are using a different hashing in the tests.
+        $job1 = $this->createGetSharedSecretMock();
+        $job2 = $this->createGetSharedSecretMock();
+        $job3 = $this->createGetSharedSecretMock();
+        $job4 = $this->createGetSharedSecretMock();
+        $this->jobList->add($job1, ['url' => 'https://example.org', 'token' => 'nei0dooX', 'created' => 0]);
+        $this->jobList->add($job2, ['url' => 'https://example.net', 'token' => 'ci6Shah7', 'created' => 0]);
+        $this->jobList->add($job3, ['url' => $url, 'token' => 'ieXie6Me', 'created' => 0]);
+        $this->jobList->add($job4, ['url' => $url, 'token' => 'thoQu8th', 'created' => 0]);
 
-		// Act
-		$this->listener->handle($event);
-		$jobs = iterator_to_array($this->jobList->getJobsIterator(GetSharedSecret::class, null, 0), false);
+        // Act
+        $this->listener->handle($event);
+        $jobs = iterator_to_array($this->jobList->getJobsIterator(GetSharedSecret::class, null, 0), false);
 
-		// Assert
-		$this->assertCount(2, $jobs);
-	}
+        // Assert
+        $this->assertCount(2, $jobs);
+    }
 
-	private function createGetSharedSecretMock(): GetSharedSecret {
-		return new GetSharedSecret(
-			$this->createMock(IClientService::class),
-			$this->createMock(IURLGenerator::class),
-			$this->jobList,
-			$this->createMock(TrustedServers::class),
-			new NullLogger(),
-			$this->createMock(IDiscoveryService::class),
-			new TimeFactory(),
-			$this->createMock(IConfig::class),
-		);
-	}
+    private function createGetSharedSecretMock(): GetSharedSecret {
+        return new GetSharedSecret(
+            $this->createMock(IClientService::class),
+            $this->createMock(IURLGenerator::class),
+            $this->jobList,
+            $this->createMock(TrustedServers::class),
+            new NullLogger(),
+            $this->createMock(IDiscoveryService::class),
+            new TimeFactory(),
+            $this->createMock(IConfig::class),
+        );
+    }
 }

tests/lib/BackgroundJob/DummyJobList.php

Indentation +158 added lines, -158 removed lines

@@ -20,162 +20,162 @@
  * in memory job list for testing purposes
  */
 class DummyJobList extends JobList {
-	/**
-	 * @var IJob[]
-	 */
-	private array $jobs = [];
-
-	/**
-	 * @var bool[]
-	 */
-	private array $reserved = [];
-
-	private int $last = 0;
-	private int $lastId = 0;
-
-	public function __construct() {
-	}
-
-	/**
-	 * @param IJob|class-string<IJob> $job
-	 * @param mixed $argument
-	 */
-	public function add($job, $argument = null, ?int $firstCheck = null): void {
-		if (is_string($job)) {
-			/** @var IJob $job */
-			$job = Server::get($job);
-		}
-		$job->setArgument($argument);
-		$job->setId($this->lastId);
-		$this->lastId++;
-		if (!$this->has($job, null)) {
-			$this->jobs[] = $job;
-		}
-	}
-
-	public function scheduleAfter(string $job, int $runAfter, $argument = null): void {
-		$this->add($job, $argument, $runAfter);
-	}
-
-	/**
-	 * @param IJob|string $job
-	 * @param mixed $argument
-	 */
-	public function remove($job, $argument = null): void {
-		foreach ($this->jobs as $index => $listJob) {
-			if (get_class($job) === get_class($listJob) && $job->getArgument() == $listJob->getArgument()) {
-				unset($this->jobs[$index]);
-				return;
-			}
-		}
-	}
-
-	public function removeById(int $id): void {
-		foreach ($this->jobs as $index => $listJob) {
-			if ($listJob->getId() === $id) {
-				unset($this->jobs[$index]);
-				return;
-			}
-		}
-	}
-
-	/**
-	 * check if a job is in the list
-	 *
-	 * @param $job
-	 * @param mixed $argument
-	 * @return bool
-	 */
-	public function has($job, $argument): bool {
-		return array_search($job, $this->jobs) !== false;
-	}
-
-	/**
-	 * get all jobs in the list
-	 *
-	 * @return IJob[]
-	 */
-	public function getAll(): array {
-		return $this->jobs;
-	}
-
-	public function getJobsIterator($job, ?int $limit, int $offset): iterable {
-		if ($job instanceof IJob) {
-			$jobClass = get_class($job);
-		} else {
-			$jobClass = $job;
-		}
-
-		$jobs = array_slice(
-			array_filter(
-				$this->jobs,
-				fn ($job) => ($jobClass === null) || (get_class($job) === $jobClass)
-			),
-			$offset,
-			$limit
-		);
-
-		return new ArrayIterator($jobs);
-	}
-
-	/**
-	 * get the next job in the list
-	 */
-	public function getNext(bool $onlyTimeSensitive = false, ?array $jobClasses = null): ?IJob {
-		if (count($this->jobs) > 0) {
-			if ($this->last < (count($this->jobs) - 1)) {
-				$i = $this->last + 1;
-			} else {
-				$i = 0;
-			}
-			return $this->jobs[$i];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * set the job that was last ran
-	 *
-	 * @param Job $job
-	 */
-	public function setLastJob(IJob $job): void {
-		$i = array_search($job, $this->jobs);
-		if ($i !== false) {
-			$this->last = $i;
-		} else {
-			$this->last = 0;
-		}
-	}
-
-	public function getById(int $id): ?IJob {
-		foreach ($this->jobs as $job) {
-			if ($job->getId() === $id) {
-				return $job;
-			}
-		}
-		return null;
-	}
-
-	public function getDetailsById(int $id): ?array {
-		return null;
-	}
-
-	public function setLastRun(IJob $job): void {
-		$job->setLastRun(time());
-	}
-
-	public function hasReservedJob(?string $className = null): bool {
-		return isset($this->reserved[$className ?? '']) && $this->reserved[$className ?? ''];
-	}
-
-	public function setHasReservedJob(?string $className, bool $hasReserved): void {
-		$this->reserved[$className ?? ''] = $hasReserved;
-	}
-
-	public function setExecutionTime(IJob $job, $timeTaken): void {
-	}
-
-	public function resetBackgroundJob(IJob $job): void {
-	}
+    /**
+     * @var IJob[]
+     */
+    private array $jobs = [];
+
+    /**
+     * @var bool[]
+     */
+    private array $reserved = [];
+
+    private int $last = 0;
+    private int $lastId = 0;
+
+    public function __construct() {
+    }
+
+    /**
+     * @param IJob|class-string<IJob> $job
+     * @param mixed $argument
+     */
+    public function add($job, $argument = null, ?int $firstCheck = null): void {
+        if (is_string($job)) {
+            /** @var IJob $job */
+            $job = Server::get($job);
+        }
+        $job->setArgument($argument);
+        $job->setId($this->lastId);
+        $this->lastId++;
+        if (!$this->has($job, null)) {
+            $this->jobs[] = $job;
+        }
+    }
+
+    public function scheduleAfter(string $job, int $runAfter, $argument = null): void {
+        $this->add($job, $argument, $runAfter);
+    }
+
+    /**
+     * @param IJob|string $job
+     * @param mixed $argument
+     */
+    public function remove($job, $argument = null): void {
+        foreach ($this->jobs as $index => $listJob) {
+            if (get_class($job) === get_class($listJob) && $job->getArgument() == $listJob->getArgument()) {
+                unset($this->jobs[$index]);
+                return;
+            }
+        }
+    }
+
+    public function removeById(int $id): void {
+        foreach ($this->jobs as $index => $listJob) {
+            if ($listJob->getId() === $id) {
+                unset($this->jobs[$index]);
+                return;
+            }
+        }
+    }
+
+    /**
+     * check if a job is in the list
+     *
+     * @param $job
+     * @param mixed $argument
+     * @return bool
+     */
+    public function has($job, $argument): bool {
+        return array_search($job, $this->jobs) !== false;
+    }
+
+    /**
+     * get all jobs in the list
+     *
+     * @return IJob[]
+     */
+    public function getAll(): array {
+        return $this->jobs;
+    }
+
+    public function getJobsIterator($job, ?int $limit, int $offset): iterable {
+        if ($job instanceof IJob) {
+            $jobClass = get_class($job);
+        } else {
+            $jobClass = $job;
+        }
+
+        $jobs = array_slice(
+            array_filter(
+                $this->jobs,
+                fn ($job) => ($jobClass === null) || (get_class($job) === $jobClass)
+            ),
+            $offset,
+            $limit
+        );
+
+        return new ArrayIterator($jobs);
+    }
+
+    /**
+     * get the next job in the list
+     */
+    public function getNext(bool $onlyTimeSensitive = false, ?array $jobClasses = null): ?IJob {
+        if (count($this->jobs) > 0) {
+            if ($this->last < (count($this->jobs) - 1)) {
+                $i = $this->last + 1;
+            } else {
+                $i = 0;
+            }
+            return $this->jobs[$i];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * set the job that was last ran
+     *
+     * @param Job $job
+     */
+    public function setLastJob(IJob $job): void {
+        $i = array_search($job, $this->jobs);
+        if ($i !== false) {
+            $this->last = $i;
+        } else {
+            $this->last = 0;
+        }
+    }
+
+    public function getById(int $id): ?IJob {
+        foreach ($this->jobs as $job) {
+            if ($job->getId() === $id) {
+                return $job;
+            }
+        }
+        return null;
+    }
+
+    public function getDetailsById(int $id): ?array {
+        return null;
+    }
+
+    public function setLastRun(IJob $job): void {
+        $job->setLastRun(time());
+    }
+
+    public function hasReservedJob(?string $className = null): bool {
+        return isset($this->reserved[$className ?? '']) && $this->reserved[$className ?? ''];
+    }
+
+    public function setHasReservedJob(?string $className, bool $hasReserved): void {
+        $this->reserved[$className ?? ''] = $hasReserved;
+    }
+
+    public function setExecutionTime(IJob $job, $timeTaken): void {
+    }
+
+    public function resetBackgroundJob(IJob $job): void {
+    }
 }