From 2b5882855ba6adbff65c6ed6e1be3a2bb28be903 Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 2 Jan 2025 00:19:08 +0100 Subject: [PATCH] Make PHP-CS even more happy :) --- src/Console/JetstreamDaemon.php | 3 +- src/Core/Console.php | 62 ++++++++++++++++----------------- src/System/Daemon.php | 2 +- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/Console/JetstreamDaemon.php b/src/Console/JetstreamDaemon.php index af54530316..554483b3e3 100644 --- a/src/Console/JetstreamDaemon.php +++ b/src/Console/JetstreamDaemon.php @@ -83,7 +83,8 @@ HELP; $this->config->reload(); if (empty($this->config->get('jetstream', 'pidfile'))) { - throw new RuntimeException(<<< TXT + throw new RuntimeException( + <<< TXT Please set jetstream.pidfile in config/local.config.php. For example: 'jetstream' => [ diff --git a/src/Core/Console.php b/src/Core/Console.php index b639d68bbb..30cae293ab 100644 --- a/src/Core/Console.php +++ b/src/Core/Console.php @@ -17,7 +17,7 @@ use Friendica\App; class Console extends \Asika\SimpleConsole\Console { // Disables the default help handling - protected $helpOptions = []; + protected $helpOptions = []; protected $customHelpOptions = ['h', 'help', '?']; /** @@ -69,36 +69,36 @@ HELP; } protected $subConsoles = [ - 'addon' => Friendica\Console\Addon::class, - 'archivecontact' => Friendica\Console\ArchiveContact::class, - 'autoinstall' => Friendica\Console\AutomaticInstallation::class, - 'cache' => Friendica\Console\Cache::class, - 'clearavatarcache' => Friendica\Console\ClearAvatarCache::class, - 'config' => Friendica\Console\Config::class, - 'contact' => Friendica\Console\Contact::class, - 'createdoxygen' => Friendica\Console\CreateDoxygen::class, - 'daemon' => Friendica\Console\Daemon::class, - 'jetstream' => Friendica\Console\JetstreamDaemon::class, - 'docbloxerrorchecker' => Friendica\Console\DocBloxErrorChecker::class, - 'dbstructure' => Friendica\Console\DatabaseStructure::class, - 'extract' => Friendica\Console\Extract::class, - 'fixapdeliveryworkertaskparameters' => Friendica\Console\FixAPDeliveryWorkerTaskParameters::class, - 'globalcommunityblock' => Friendica\Console\GlobalCommunityBlock::class, - 'globalcommunitysilence' => Friendica\Console\GlobalCommunitySilence::class, - 'lock' => Friendica\Console\Lock::class, - 'maintenance' => Friendica\Console\Maintenance::class, - 'mergecontacts' => Friendica\Console\MergeContacts::class, - 'movetoavatarcache' => Friendica\Console\MoveToAvatarCache::class, - 'php2po' => Friendica\Console\PhpToPo::class, - 'postupdate' => Friendica\Console\PostUpdate::class, - 'po2php' => Friendica\Console\PoToPhp::class, - 'relay' => Friendica\Console\Relay::class, - 'relocate' => Friendica\Console\Relocate::class, - 'serverblock' => Friendica\Console\ServerBlock::class, - 'storage' => Friendica\Console\Storage::class, - 'test' => Friendica\Console\Test::class, - 'typo' => Friendica\Console\Typo::class, - 'user' => Friendica\Console\User::class, + 'addon' => Friendica\Console\Addon::class, + 'archivecontact' => Friendica\Console\ArchiveContact::class, + 'autoinstall' => Friendica\Console\AutomaticInstallation::class, + 'cache' => Friendica\Console\Cache::class, + 'clearavatarcache' => Friendica\Console\ClearAvatarCache::class, + 'config' => Friendica\Console\Config::class, + 'contact' => Friendica\Console\Contact::class, + 'createdoxygen' => Friendica\Console\CreateDoxygen::class, + 'daemon' => Friendica\Console\Daemon::class, + 'jetstream' => Friendica\Console\JetstreamDaemon::class, + 'docbloxerrorchecker' => Friendica\Console\DocBloxErrorChecker::class, + 'dbstructure' => Friendica\Console\DatabaseStructure::class, + 'extract' => Friendica\Console\Extract::class, + 'fixapdeliveryworkertaskparameters' => Friendica\Console\FixAPDeliveryWorkerTaskParameters::class, + 'globalcommunityblock' => Friendica\Console\GlobalCommunityBlock::class, + 'globalcommunitysilence' => Friendica\Console\GlobalCommunitySilence::class, + 'lock' => Friendica\Console\Lock::class, + 'maintenance' => Friendica\Console\Maintenance::class, + 'mergecontacts' => Friendica\Console\MergeContacts::class, + 'movetoavatarcache' => Friendica\Console\MoveToAvatarCache::class, + 'php2po' => Friendica\Console\PhpToPo::class, + 'postupdate' => Friendica\Console\PostUpdate::class, + 'po2php' => Friendica\Console\PoToPhp::class, + 'relay' => Friendica\Console\Relay::class, + 'relocate' => Friendica\Console\Relocate::class, + 'serverblock' => Friendica\Console\ServerBlock::class, + 'storage' => Friendica\Console\Storage::class, + 'test' => Friendica\Console\Test::class, + 'typo' => Friendica\Console\Typo::class, + 'user' => Friendica\Console\User::class, ]; /** diff --git a/src/System/Daemon.php b/src/System/Daemon.php index d8d658453c..166d9400ef 100644 --- a/src/System/Daemon.php +++ b/src/System/Daemon.php @@ -96,7 +96,7 @@ final class Daemon if ($this->pid < 0) { $this->logger->warning('Could not fork daemon'); return false; - } else if ($this->pid) { + } elseif ($this->pid) { // The parent process continues here if (!file_put_contents($this->pidfile, $this->pid)) { $this->logger->warning('Could not store pid file', ['pid' => $this->pid, 'pidfile' => $this->pidfile]);