From fcf59dc245c07c4a7b74ef569d602b5b62010162 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Mon, 20 Feb 2023 08:05:01 -0500 Subject: [PATCH] Fix binary_operator_spaces errors --- src/Module/Api/Mastodon/InstanceV2.php | 2 +- src/Object/Api/Mastodon/InstanceV2.php | 26 +++++++++---------- .../Api/Mastodon/InstanceV2/Contact.php | 2 +- .../InstanceV2/FriendicaExtensions.php | 4 +-- .../Api/Mastodon/InstanceV2/Registrations.php | 6 ++--- .../Mastodon/InstanceV2/StatusesConfig.php | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Module/Api/Mastodon/InstanceV2.php b/src/Module/Api/Mastodon/InstanceV2.php index e5af34b67..3177570c9 100644 --- a/src/Module/Api/Mastodon/InstanceV2.php +++ b/src/Module/Api/Mastodon/InstanceV2.php @@ -59,7 +59,7 @@ class InstanceV2 extends BaseApi parent::__construct($app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); $this->database = $database; - $this->config = $config; + $this->config = $config; } /** diff --git a/src/Object/Api/Mastodon/InstanceV2.php b/src/Object/Api/Mastodon/InstanceV2.php index f3551c564..20ea45ba3 100644 --- a/src/Object/Api/Mastodon/InstanceV2.php +++ b/src/Object/Api/Mastodon/InstanceV2.php @@ -79,18 +79,18 @@ class InstanceV2 extends BaseDataTransferObject */ public function __construct(IManageConfigValues $config, BaseURL $baseUrl, Database $database, array $rules = []) { - $this->domain = $baseUrl->getHostname(); - $this->title = $config->get('config', 'sitename'); - $this->version = '2.8.0 (compatible; Friendica ' . App::VERSION . ')'; - $this->source_url = null; //not supported yet - $this->description = $config->get('config', 'info'); - $this->usage = new Usage($config); - $this->thumbnail = new Thumbnail($baseUrl); - $this->languages = [$config->get('system', 'language')]; - $this->configuration = new Configuration(); - $this->registrations = new Registrations(); - $this->contact = new Contact($database); - $this->rules = $rules; - $this->friendica = new FriendicaExtensions(); + $this->domain = $baseUrl->getHostname(); + $this->title = $config->get('config', 'sitename'); + $this->version = '2.8.0 (compatible; Friendica ' . App::VERSION . ')'; + $this->source_url = null; //not supported yet + $this->description = $config->get('config', 'info'); + $this->usage = new Usage($config); + $this->thumbnail = new Thumbnail($baseUrl); + $this->languages = [$config->get('system', 'language')]; + $this->configuration = new Configuration(); + $this->registrations = new Registrations(); + $this->contact = new Contact($database); + $this->rules = $rules; + $this->friendica = new FriendicaExtensions(); } } diff --git a/src/Object/Api/Mastodon/InstanceV2/Contact.php b/src/Object/Api/Mastodon/InstanceV2/Contact.php index 45631b0fb..007c0495b 100644 --- a/src/Object/Api/Mastodon/InstanceV2/Contact.php +++ b/src/Object/Api/Mastodon/InstanceV2/Contact.php @@ -42,7 +42,7 @@ class Contact extends BaseDataTransferObject public function __construct(Database $database) { - $this->email = implode(',', User::getAdminEmailList()); + $this->email = implode(',', User::getAdminEmailList()); $administrator = User::getFirstAdmin(); if ($administrator) { $adminContact = $database->selectFirst( diff --git a/src/Object/Api/Mastodon/InstanceV2/FriendicaExtensions.php b/src/Object/Api/Mastodon/InstanceV2/FriendicaExtensions.php index b69b5c026..2805e4866 100644 --- a/src/Object/Api/Mastodon/InstanceV2/FriendicaExtensions.php +++ b/src/Object/Api/Mastodon/InstanceV2/FriendicaExtensions.php @@ -24,8 +24,8 @@ class FriendicaExtensions extends BaseDataTransferObject public function __construct() { - $this->version = App::VERSION; - $this->codename = App::CODENAME; + $this->version = App::VERSION; + $this->codename = App::CODENAME; $this->db_version = DI::config()->get('system', 'build'); } } diff --git a/src/Object/Api/Mastodon/InstanceV2/Registrations.php b/src/Object/Api/Mastodon/InstanceV2/Registrations.php index 78c5713ea..c1e7769e8 100644 --- a/src/Object/Api/Mastodon/InstanceV2/Registrations.php +++ b/src/Object/Api/Mastodon/InstanceV2/Registrations.php @@ -39,9 +39,9 @@ class Registrations extends BaseDataTransferObject public function __construct() { - $config = DI::config(); - $register_policy = intval($config->get('config', 'register_policy')); - $this->enabled = ($register_policy != Register::CLOSED); + $config = DI::config(); + $register_policy = intval($config->get('config', 'register_policy')); + $this->enabled = ($register_policy != Register::CLOSED); $this->approval_required = ($register_policy == Register::APPROVE); } } diff --git a/src/Object/Api/Mastodon/InstanceV2/StatusesConfig.php b/src/Object/Api/Mastodon/InstanceV2/StatusesConfig.php index 5bf20ec97..fb74b1d5b 100644 --- a/src/Object/Api/Mastodon/InstanceV2/StatusesConfig.php +++ b/src/Object/Api/Mastodon/InstanceV2/StatusesConfig.php @@ -36,7 +36,7 @@ class StatusesConfig extends BaseDataTransferObject public function __construct() { - $config = DI::config(); + $config = DI::config(); $this->max_characters = (int)$config->get( 'config', 'api_import_size',