From f1843c8aac9ab959fed7b72d55247bd655b9543a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 1 Apr 2023 08:07:48 -0400 Subject: [PATCH 1/3] Fix Register namespace confusion in Model\User - Address https://github.com/friendica/friendica/issues/12486#issuecomment-1491861831 --- src/Model/User.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Model/User.php b/src/Model/User.php index 66b4cf1ff6..11d55e7f7e 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -35,7 +35,7 @@ use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Module\Register; +use Friendica\Module; use Friendica\Network\HTTPClient\Client\HttpClientAccept; use Friendica\Security\TwoFactor\Model\AppSpecificPassword; use Friendica\Network\HTTPException; @@ -1890,17 +1890,17 @@ class User } $register_policy = DI::config()->get('config', 'register_policy'); - if (!in_array($register_policy, [Register::OPEN, Register::CLOSED])) { + if (!in_array($register_policy, [Module\Register::OPEN, Module\Register::CLOSED])) { Logger::debug('Unsupported register policy.', ['policy' => $register_policy]); return; } $users = DBA::count('user', ['blocked' => false, 'account_removed' => false, 'account_expired' => false]); - if (($users >= $max_registered_users) && ($register_policy == Register::OPEN)) { - DI::config()->set('config', 'register_policy', Register::CLOSED); + if (($users >= $max_registered_users) && ($register_policy == Module\Register::OPEN)) { + DI::config()->set('config', 'register_policy', Module\Register::CLOSED); Logger::notice('Max users reached, registration is closed.', ['users' => $users, 'max' => $max_registered_users]); - } elseif (($users < $max_registered_users) && ($register_policy == Register::CLOSED)) { - DI::config()->set('config', 'register_policy', Register::OPEN); + } elseif (($users < $max_registered_users) && ($register_policy == Module\Register::CLOSED)) { + DI::config()->set('config', 'register_policy', Module\Register::OPEN); Logger::notice('Below maximum users, registration is opened.', ['users' => $users, 'max' => $max_registered_users]); } else { Logger::debug('Unchanged register policy', ['policy' => $register_policy, 'users' => $users, 'max' => $max_registered_users]); From 508807af1c6d8c1c66a73b26e4d5739e554ed451 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 1 Apr 2023 08:11:05 -0400 Subject: [PATCH 2/3] Fix namespace issue with posix function in Worker\Repository\Process - [Composer] Add ext-posix dependency - [Composer] Sort latest added dependencies alphabetically - Address https://github.com/friendica/friendica/issues/12486#issuecomment-1492842672 --- composer.json | 7 ++++--- src/Core/Worker/Repository/Process.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 509605b1ca..bb675c651e 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-openssl": "*", + "ext-posix": "*", "ext-simplexml": "*", "ext-xml": "*", "asika/simple-console": "^1.0", @@ -34,6 +35,7 @@ "friendica/json-ld": "^1.0", "geekwright/po": "^2.0", "guzzlehttp/guzzle": "^6.5", + "kornrunner/blurhash": "^1.2", "league/html-to-markdown": "^4.8", "level-2/dice": "^4", "lightopenid/lightopenid": "dev-master", @@ -49,6 +51,7 @@ "phpseclib/phpseclib": "^3.0", "pragmarx/google2fa": "^5.0", "pragmarx/recovery": "^0.2", + "psr/clock": "^1.0", "psr/container": "^1.0", "psr/log": "^1.1", "seld/cli-prompt": "^1.0", @@ -71,9 +74,7 @@ "npm-asset/moment": "^2.24", "npm-asset/perfect-scrollbar": "0.6.16", "npm-asset/textcomplete": "^0.18.2", - "npm-asset/typeahead.js": "^0.11.1", - "kornrunner/blurhash": "^1.2", - "psr/clock": "^1.0" + "npm-asset/typeahead.js": "^0.11.1" }, "repositories": [ { diff --git a/src/Core/Worker/Repository/Process.php b/src/Core/Worker/Repository/Process.php index eb8fb07e32..b18a5b443d 100644 --- a/src/Core/Worker/Repository/Process.php +++ b/src/Core/Worker/Repository/Process.php @@ -112,7 +112,7 @@ class Process extends BaseRepository try { $processes = $this->db->select(static::$table_name, ['pid'], ['hostname' => $this->currentHost]); while ($process = $this->db->fetch($processes)) { - if (!posix_kill($process['pid'], 0)) { + if (!\posix_kill($process['pid'], 0)) { $this->db->delete(static::$table_name, ['pid' => $process['pid']]); } } From 8cf7743a2365f3c7bcda364229d152bfe86ac92e Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 1 Apr 2023 16:29:46 +0200 Subject: [PATCH 3/3] Update composer.lock --- composer.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 3e8ec70de2..280e979e9e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c9e005c79c8556215c30a66c470659eb", + "content-hash": "456d14e3ad9be265c5c9e6172a0d18d8", "packages": [ { "name": "asika/simple-console", @@ -6474,6 +6474,7 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-openssl": "*", + "ext-posix": "*", "ext-simplexml": "*", "ext-xml": "*" },