bit-badger/feed-reader-central
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 12 Activity

Use custom Result/Option types

Browse Source
This commit is contained in:
Daniel J. Summers 2024-07-26 23:53:11 -04:00
parent 6dc264d34c
commit 8cf84f1450
15 changed files with 157 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/composer.json
View File

@ -3,6 +3,7 @@
"minimum-stability": "beta",
"require": {
"php": ">=8.2",
"bit-badger/inspired-by-fsharp": "@dev",
"bit-badger/pdo-document": "^1",
"ext-curl": "*",
"ext-dom": "*",

51
src/composer.lock generated
View File

@ -4,8 +4,53 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "d5b7f01ef79cdce09364eed3dca3281d",
"content-hash": "2caacda2b3694b265db846cd539e1ca3",
"packages": [
{
"name": "bit-badger/inspired-by-fsharp",
"version": "dev-main",
"source": {
"type": "git",
"url": "https://git.bitbadger.solutions/bit-badger/inspired-by-fsharp",
"reference": "193147cfb32f423dceb1619f091445efa1a2f13e"
},
"require": {
"php": "^8"
},
"require-dev": {
"phpunit/phpunit": "^11"
},
"default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
"BitBadger\\InspiredByFSharp\\": "./src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Daniel J. Summers",
"email": "daniel@bitbadger.solutions",
"homepage": "https://bitbadger.solutions",
"role": "Developer"
}
],
"description": "PHP utility classes whose functionality is inspired by their F# counterparts",
"keywords": [
"option",
"result"
],
"support": {
"email": "daniel@bitbadger.solutions",
"rss": "https://git.bitbadger.solutions/bit-badger/inspired-by-fsharp.rss",
"source": "https://git.bitbadger.solutions/bit-badger/inspired-by-fsharp"
},
"time": "2024-07-27T02:55:02+00:00"
},
{
"name": "bit-badger/pdo-document",
"version": "v1.0.0-beta7",
@ -252,7 +297,9 @@
"packages-dev": [],
"aliases": [],
"minimum-stability": "beta",
"stability-flags": [],
"stability-flags": {
"bit-badger/inspired-by-fsharp": 20
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {

68
src/lib/Feed.php
View File

@ -8,12 +8,11 @@ declare(strict_types=1);
namespace FeedReaderCentral;
use BitBadger\InspiredByFSharp\{Option, Result};
use BitBadger\PDODocument\{
Configuration, Custom, Document, DocumentException, DocumentList, Exists, Field, Find, Parameters, Patch, Query
};
use DateTimeInterface;
use GrahamCampbell\ResultType\{Error, Result, Success};
use PhpOption\Option;
/**
* An RSS or Atom feed
@ -114,15 +113,14 @@ class Feed
} else {
Item::add($feedId, $item);
}
return Success::create(true);
return Result::OK(true);
} catch (DocumentException $ex) {
return Error::create("$ex");
return Result::Error("$ex");
}
}, array_filter($parsed->items,
fn(ParsedItem $it) => date_create_immutable($it->updatedOn ?? $it->publishedOn) >= $lastChecked));
$errors = array_map(fn(Result $it) => $it->error()->get(),
array_filter($results, fn(Result $it) => $it->error()->isDefined()));
return sizeof($errors) > 0 ? Error::create(implode("\n", $errors)) : Success::create(true);
$errors = array_map(fn(Result $it) => $it->getError(), array_filter($results, Result::isError(...)));
return sizeof($errors) > 0 ? Result::Error(implode("\n", $errors)) : Result::OK(true);
}
/**
@ -161,13 +159,13 @@ class Feed
SQL;
break;
default:
return Error::create('Unrecognized purge type ' . PURGE_TYPE);
return Result::Error('Unrecognized purge type ' . PURGE_TYPE);
}
try {
Custom::nonQuery($sql, Parameters::addFields($fields, []));
return Success::create(true);
return Result::OK(true);
} catch (DocumentException $ex) {
return Error::create("$ex");
return Result::Error("$ex");
}
}
@ -182,16 +180,16 @@ class Feed
public static function refreshFeed(int $feedId, string $url): Result
{
$tryRetrieve = ParsedFeed::retrieve($url);
if ($tryRetrieve->error()->isDefined()) return $tryRetrieve->error()->get();
$feed = $tryRetrieve->success()->get();
if (Result::isError($tryRetrieve)) return $tryRetrieve;
$feed = $tryRetrieve->getOK();
try {
$feedDoc = Find::byId(Table::Feed, $feedId, self::class);
if ($feedDoc->isEmpty()) return Error::create('Could not derive date last checked for feed');
if ($feedDoc->isEmpty()) return Result::Error('Could not derive date last checked for feed');
$lastChecked = date_create_immutable($feedDoc->get()->checked_on ?? WWW_EPOCH);
$itemUpdate = self::updateItems($feedId, $feed, $lastChecked);
if ($itemUpdate->error()->isDefined()) return $itemUpdate->error()->get();
if (Result::isError($itemUpdate)) return $itemUpdate;
$patch = [
'title' => $feed->title,
@ -201,10 +199,10 @@ class Feed
if ($url !== $feed->url) $patch['url'] = $feed->url;
Patch::byId(Table::Feed, $feedId, $patch);
} catch (DocumentException $ex) {
return Error::create("$ex");
return Result::Error("$ex");
}
return PURGE_TYPE === self::PurgeNone ? Success::create(true) : self::purgeItems($feedId);
return PURGE_TYPE === self::PurgeNone ? Result::OK(true) : self::purgeItems($feedId);
}
/**
@ -216,25 +214,25 @@ class Feed
public static function add(string $url): Result
{
$tryRetrieve = ParsedFeed::retrieve($url);
if ($tryRetrieve->error()->isDefined()) return $tryRetrieve->error()->get();
$feed = $tryRetrieve->success()->get();
if (Result::isError($tryRetrieve)) return $tryRetrieve;
$feed = $tryRetrieve->getOK();
try {
$fields = [Field::EQ('user_id', $_SESSION[Key::UserId]), Field::EQ('url', $feed->url)];
if (Exists::byFields(Table::Feed, $fields)) {
return Error::create("Already subscribed to feed $feed->url");
return Result::Error("Already subscribed to feed $feed->url");
}
Document::insert(Table::Feed, self::fromParsed($feed));
$tryDoc = Find::firstByFields(Table::Feed, $fields, self::class);
if ($tryDoc->isEmpty()) return Error::create('Could not retrieve inserted feed');
if ($tryDoc->isEmpty()) return Result::Error('Could not retrieve inserted feed');
$doc = $tryDoc->get();
$result = self::updateItems($doc->id, $feed, date_create_immutable(WWW_EPOCH));
return $result->error()->isDefined() ? $result->error()->get() : Success::create($doc->id);
return Result::isError($result) ? $result : Result::OK($doc->id);
} catch (DocumentException $ex) {
return Error::create("$ex");
return Result::Error("$ex");
}
}
@ -253,7 +251,7 @@ class Feed
['url' => $url]);
return self::refreshFeed($existing->id, $url);
} catch (DocumentException $ex) {
return Error::create("$ex");
return Result::Error("$ex");
}
}
@ -278,31 +276,31 @@ class Feed
*/
public static function refreshAll(): Result
{
try {
$feeds = self::retrieveAll($_SESSION[Key::UserId]);
$errors = [];
$errors = [];
foreach ($feeds->items() as $feed) {
$result = self::refreshFeed($feed->id, $feed->url);
if ($result->error()->isDefined()) $errors[] = $result->error()->get();
}
try {
self::retrieveAll($_SESSION[Key::UserId])->iter(function (Feed $feed) use (&$errors) {
Result::mapError(function (string $err) use (&$errors) { $errors[] = $err; },
self::refreshFeed($feed->id, $feed->url));
});
} catch (DocumentException $ex) {
return Error::create("$ex");
return Result::Error("$ex");
}
return empty($errors) ? Success::create(true) : Error::create(implode("\n", $errors));
return empty($errors) ? Result::OK(true) : Result::Error(implode("\n", $errors));
}
/**
* Retrieve a feed by its ID for the current user
*
* @param int $feedId The ID of the feed to retrieve
* @return Option<static> A `Some` value with the data for the feed if found, `None` otherwise
* @return Option<Feed> A `Some` value with the data for the feed if found, `None` otherwise
* @throws DocumentException If any is encountered
*/
public static function retrieveById(int $feedId): Option
{
return Find::byId(Table::Feed, $feedId, static::class)
->filter(fn($it) => $it->user_id === $_SESSION[Key::UserId]);
return to_option(
Find::byId(Table::Feed, $feedId, static::class)
->filter(fn($it) => $it->user_id === $_SESSION[Key::UserId]));
}
}

7
src/lib/ItemWithFeed.php
View File

@ -8,9 +8,9 @@ declare(strict_types=1);
namespace FeedReaderCentral;
use BitBadger\InspiredByFSharp\Option;
use BitBadger\PDODocument\{Configuration, Custom, DocumentException, Field, Parameters, Query};
use BitBadger\PDODocument\Mapper\{DocumentMapper, ExistsMapper};
use PhpOption\Option;
/**
* A combined item and feed (used for lists)
@ -68,7 +68,8 @@ class ItemWithFeed extends Item
public static function retrieveById(int $id): Option
{
$fields = self::idAndUserFields($id);
return Custom::single(self::SELECT_WITH_FEED . ' WHERE ' . Query::whereByFields($fields),
Parameters::addFields($fields, []), new DocumentMapper(self::class));
return to_option(
Custom::single(self::SELECT_WITH_FEED . ' WHERE ' . Query::whereByFields($fields),
Parameters::addFields($fields, []), new DocumentMapper(self::class)));
}
}

44
src/lib/ParsedFeed.php
View File

@ -8,13 +8,11 @@ declare(strict_types=1);
namespace FeedReaderCentral;
use BitBadger\InspiredByFSharp\Result;
use DOMDocument;
use DOMElement;
use DOMException;
use DOMNode;
use GrahamCampbell\ResultType\Error;
use GrahamCampbell\ResultType\Result;
use GrahamCampbell\ResultType\Success;
/**
* A feed, as parsed from the Atom or RSS XML
@ -73,9 +71,9 @@ readonly class ParsedFeed
try {
$feed = new DOMDocument();
$feed->loadXML($content);
return Success::create($feed);
return Result::OK($feed);
} catch (DOMException $ex) {
return Error::create($ex->getMessage());
return Result::Error($ex->getMessage());
} finally {
restore_error_handler();
}
@ -106,7 +104,7 @@ readonly class ParsedFeed
$channel = $xml->getElementsByTagName('channel')->item(0);
if (!($channel instanceof DOMElement)) {
$type = $channel?->nodeType ?? -1;
return Error::create("Channel element not found ($type)");
return Result::Error("Channel element not found ($type)");
}
// The Atom namespace provides a lastBuildDate, which contains the last time an item in the feed was updated; if
@ -117,7 +115,7 @@ readonly class ParsedFeed
}
}
return Success::create(new self(
return Result::OK(new self(
url: $url,
title: self::rssValue($channel, 'title'),
updatedOn: Data::formatDate($updatedOn),
@ -172,7 +170,7 @@ readonly class ParsedFeed
$root = $xml->getElementsByTagNameNS(self::ATOM_NS, 'feed')->item(0);
if (($updatedOn = self::atomValue($root, 'updated')) == 'pubDate not found') $updatedOn = null;
return Success::create(new self(
return Result::OK(new self(
url: $url,
title: self::atomValue($root, 'title'),
updatedOn: Data::formatDate($updatedOn),
@ -197,9 +195,9 @@ readonly class ParsedFeed
curl_setopt($docReq, CURLOPT_USERAGENT, self::USER_AGENT);
$error = curl_error($docReq);
if ($error !== '') return Error::create($error);
if ($error !== '') return Result::Error($error);
return Success::create([
return Result::OK([
'content' => curl_exec($docReq),
'code' => curl_getinfo($docReq, CURLINFO_RESPONSE_CODE),
'url' => curl_getinfo($docReq, CURLINFO_EFFECTIVE_URL)
@ -220,17 +218,17 @@ readonly class ParsedFeed
$html = new DOMDocument();
$html->loadHTML(substr($content, 0, strpos($content, '</head>') + 7));
$headTags = $html->getElementsByTagName('head');
if ($headTags->length < 1) return Error::create('Cannot find feed at this URL');
if ($headTags->length < 1) return Result::Error('Cannot find feed at this URL');
$head = $headTags->item(0);
foreach ($head->getElementsByTagName('link') as $link) {
if (self::attrValue($link, 'rel') === 'alternate') {
$type = self::attrValue($link, 'type');
if ($type === 'application/rss+xml' || $type === 'application/atom+xml') {
return Success::create(self::attrValue($link, 'href'));
return Result::OK(self::attrValue($link, 'href'));
}
}
}
return Error::create('Cannot find feed at this URL');
return Result::Error('Cannot find feed at this URL');
}
/**
@ -242,18 +240,18 @@ readonly class ParsedFeed
public static function retrieve(string $url): Result
{
$tryDoc = self::retrieveDocument($url);
if (Result::isError($tryDoc)) return $tryDoc;
if ($tryDoc->error()->isDefined()) return $tryDoc->error()->get();
$doc = $tryDoc->success()->get();
$doc = $tryDoc->getOK();
if ($doc['code'] !== 200) {
return Error::create("Prospective feed URL $url returned HTTP Code {$doc['code']}: {$doc['content']}");
return Result::Error("Prospective feed URL $url returned HTTP Code {$doc['code']}: {$doc['content']}");
}
$start = strtolower(strlen($doc['content']) >= 9 ? substr($doc['content'], 0, 9) : $doc['content']);
if ($start === '<!doctype' || str_starts_with($start, '<html')) {
$derivedURL = self::deriveFeedFromHTML($doc['content']);
if ($derivedURL->error()->isDefined()) return $derivedURL->error()->get();
$feedURL = $derivedURL->success()->get();
if (Result::isError($derivedURL)) return $derivedURL;
$feedURL = $derivedURL->getOK();
if (!str_starts_with($feedURL, 'http')) {
// Relative URL; feed should be retrieved in the context of the original URL
$original = parse_url($url);
@ -261,17 +259,17 @@ readonly class ParsedFeed
$feedURL = $original['scheme'] . '://' . $original['host'] . $port . $feedURL;
}
$tryDoc = self::retrieveDocument($feedURL);
if ($tryDoc->error()->isDefined()) return $tryDoc->error()->get();
$doc = $tryDoc->success()->get();
if (Result::isError($tryDoc)) return $tryDoc;
$doc = $tryDoc->getOK();
if ($doc['code'] !== 200) {
return Error::create("Derived feed URL $url returned HTTP Code {$doc['code']}: {$doc['content']}");
return Result::Error("Derived feed URL $url returned HTTP Code {$doc['code']}: {$doc['content']}");
}
}
$tryParse = self::parseFeed($doc['content']);
if ($tryParse->error()->isDefined()) return $tryParse->error()->get();
if (Result::isError($tryParse)) return $tryParse;
$parsed = $tryParse->success()->get();
$parsed = $tryParse->getOK();
$extract = $parsed->getElementsByTagNameNS(self::ATOM_NS, 'feed')->length > 0
? self::fromAtom(...) : self::fromRSS(...);
return $extract($parsed, $doc['url']);

6
src/lib/Security.php
View File

@ -8,6 +8,7 @@ declare(strict_types=1);
namespace FeedReaderCentral;
use BitBadger\InspiredByFSharp\Option;
use BitBadger\PDODocument\{DocumentException, Field, Patch};
/**
@ -93,8 +94,7 @@ readonly class Security
}
$dbEmail = $email;
}
$user = User::findByEmail($dbEmail);
if ($user->isDefined()) self::verifyPassword($user->get(), $password, $returnTo);
Option::iter(fn(User $it) => self::verifyPassword($it, $password, $returnTo), User::findByEmail($dbEmail));
add_error('Invalid credentials; log on unsuccessful');
}
@ -119,7 +119,7 @@ readonly class Security
private static function logOnSingleUser(): void
{
$user = User::findByEmail(self::SingleUserEmail);
if ($user->isEmpty()) {
if (Option::isNone($user)) {
User::add(self::SingleUserEmail, self::SingleUserPassword);
$user = User::findByEmail(self::SingleUserEmail);
}

4
src/lib/User.php
View File

@ -8,9 +8,9 @@ declare(strict_types=1);
namespace FeedReaderCentral;
use BitBadger\InspiredByFSharp\Option;
use BitBadger\PDODocument\{Custom, Document, DocumentException, Field, Find, Parameters, Query};
use BitBadger\PDODocument\Mapper\ExistsMapper;
use PhpOption\Option;
/**
* A user of Feed Reader Central
@ -35,7 +35,7 @@ class User
*/
public static function findByEmail(string $email): Option
{
return Find::firstByFields(Table::User, [Field::EQ('email', $email)], User::class);
return to_option(Find::firstByFields(Table::User, [Field::EQ('email', $email)], User::class));
}
/**

16
src/public/bookmark.php
View File

@ -10,6 +10,7 @@
declare(strict_types=1);
use BitBadger\InspiredByFSharp\Option;
use BitBadger\PDODocument\{DocumentException, Patch};
use FeedReaderCentral\{ItemWithFeed, Table};
@ -18,22 +19,21 @@ include '../start.php';
FeedReaderCentral\Security::verifyUser();
$id = key_exists('id', $_GET) ? (int)$_GET['id'] : -1;
$item = ItemWithFeed::retrieveById($id)->getOrCall(not_found(...));
$item = Option::getOrCall(not_found(...), ItemWithFeed::retrieveById($id));
if (key_exists('action', $_GET)) {
$flag = match ($_GET['action']) {
'add' => 1,
'remove' => 0,
default => null
};
if (isset($flag)) {
Option::iter(function (int $flag) use ($id, &$item) {
try {
Patch::byId(Table::Item, $id, ['is_bookmarked' => $flag]);
$item->is_bookmarked = $flag;
} catch (DocumentException $ex) {
add_error("$ex");
}
}
}, match ($_GET['action']) {
'add' => Option::Some(1),
'remove' => Option::Some(0),
default => Option::None(),
});
}
$action = $item->isBookmarked() ? 'remove' : 'add';

14
src/public/feed/index.php
View File

@ -10,9 +10,9 @@
declare(strict_types=1);
use BitBadger\InspiredByFSharp\{Option, Result};
use BitBadger\PDODocument\{Delete, DocumentException, Field};
use FeedReaderCentral\{Feed, Security, Table};
use GrahamCampbell\ResultType\Error;
include '../../start.php';
@ -23,7 +23,7 @@ $feedId = key_exists('id', $_GET) ? (int)$_GET['id'] : -1;
switch ($_SERVER['REQUEST_METHOD']) {
case 'DELETE':
try {
$feed = Feed::retrieveById($feedId)->getOrCall(not_found(...));
$feed = Option::getOrCall(not_found(...), Feed::retrieveById($feedId));
Delete::byFields(Table::Item, [Field::EQ('feed_id', $feed->id)]);
Delete::byId(Table::Feed, $feed->id);
add_info('Feed &ldquo;' . htmlentities($feed->title) . '&rdquo; deleted successfully');
@ -40,15 +40,15 @@ switch ($_SERVER['REQUEST_METHOD']) {
} else {
$feedId = (int)$_POST['id'];
$toEdit = Feed::retrieveById($feedId);
$result = $toEdit->isDefined()
$result = Option::isSome($toEdit)
? Feed::update($toEdit->get(), $_POST['url'])
: Error::create("Feed $feedId not found");
: Result::Error("Feed $feedId not found");
}
if ($result->success()->isDefined()) {
if (Result::isOK($result)) {
add_info('Feed saved successfully');
frc_redirect('/feeds');
}
add_error($result->error()->get());
add_error($result->getError());
$feedId = 'error';
} catch (DocumentException $ex) {
add_error("$ex");
@ -63,7 +63,7 @@ if ($feedId == -1) {
$title = 'Edit RSS Feed';
$feed = $feedId == 'error'
? new Feed(id: (int)$_POST['id'], url: $_POST['url'] ?? '')
: Feed::retrieveById((int)$feedId)->getOrCall(not_found(...));
: Option::getOrCall(not_found(...), Feed::retrieveById((int)$feedId));
}
page_head($title); ?>

3
src/public/feed/items.php
View File

@ -10,6 +10,7 @@
declare(strict_types=1);
use BitBadger\InspiredByFSharp\Option;
use FeedReaderCentral\{Feed, ItemList};
include '../../start.php';
@ -17,7 +18,7 @@ include '../../start.php';
FeedReaderCentral\Security::verifyUser();
$id = key_exists('id', $_GET) ? (int)$_GET['id'] : -1;
$feed = Feed::retrieveById($id)->getOrCall(not_found(...));
$feed = Option::getOrCall(not_found(...), Feed::retrieveById($id));
$list = match (true) {
key_exists('unread', $_GET) => ItemList::unreadForFeed($feed->id),

7
src/public/index.php
View File

@ -10,6 +10,7 @@
declare(strict_types=1);
use BitBadger\InspiredByFSharp\Result;
use FeedReaderCentral\{Feed, ItemList};
include '../start.php';
@ -18,16 +19,16 @@ FeedReaderCentral\Security::verifyUser();
if (key_exists('refresh', $_GET)) {
$refreshResult = Feed::refreshAll();
if ($refreshResult->success()->isDefined()) {
if (Result::isOK($refreshResult)) {
add_info('All feeds refreshed successfully');
} else {
add_error(nl2br($refreshResult->error()->get()));
add_error(nl2br($refreshResult->getError()));
}
}
$list = match (true) {
key_exists('bookmarked', $_GET) => ItemList::allBookmarked(),
default => ItemList::allUnread()
default => ItemList::allUnread(),
};
$title = "Your $list->itemType Items";

3
src/public/item.php
View File

@ -10,6 +10,7 @@
declare(strict_types=1);
use BitBadger\InspiredByFSharp\Option;
use BitBadger\PDODocument\{Delete, DocumentException, Patch};
use FeedReaderCentral\{ItemWithFeed, Table};
@ -49,7 +50,7 @@ switch ($_SERVER['REQUEST_METHOD']) {
frc_redirect($from);
}
!$item = ItemWithFeed::retrieveById($id)->getOrCall(not_found(...));
!$item = Option::getOrCall(not_found(...), ItemWithFeed::retrieveById($id));
try {
Patch::byId(Table::Item, $id, ['is_read' => 1]);
} catch (DocumentException $ex) {

12
src/start.php
View File

@ -10,6 +10,7 @@
declare(strict_types=1);
use BitBadger\InspiredByFSharp\Option;
use BitBadger\PDODocument\Configuration;
use FeedReaderCentral\{Key, Security, User};
@ -186,3 +187,14 @@ function not_found(): never
http_response_code(404);
die('Not Found');
}
/**
* Transform a `PhpOption` into the option we use
*
* @param \PhpOption\Option $option The option to be transformed
* @return Option An option in the form Feed Reader Central uses
*/
function to_option(PhpOption\Option $option): Option
{
return $option->isDefined() ? Option::Some($option->get()) : Option::None();
}

5
src/util/refresh.php
View File

@ -10,6 +10,7 @@
declare(strict_types=1);
use BitBadger\InspiredByFSharp\Result;
use BitBadger\PDODocument\{DocumentException, Find};
use FeedReaderCentral\{Feed, Table, User};
@ -51,9 +52,9 @@ function refresh_all(): void
$users[$userKey] = Find::byId(Table::User, $feed->user_id, User::class)
->getOrElse(new User(email: 'user-not-found'));
}
if ($result->error()->isDefined()) {
if (Result::isError($result)) {
printfn('ERR (%s) %s', $users[$userKey]->email, $feed->url);
printfn(' %s', $result->error()->get());
printfn(' %s', $result->getError());
} else {
printfn('OK (%s) %s', $users[$userKey]->email, $feed->url);
}

11
src/util/user.php
View File

@ -11,6 +11,7 @@
declare(strict_types=1);
use BitBadger\InspiredByFSharp\Option;
use BitBadger\PDODocument\{Count, Custom, Delete, DocumentException, Field, Parameters, Patch, Query};
use FeedReaderCentral\{Security, Table, User};
@ -103,7 +104,7 @@ function add_user(): void
try {
// Ensure there is not already a user with this e-mail address
$user = User::findByEmail($argv[2]);
if ($user->isDefined()) {
if (Option::isSome($user)) {
printfn('A user with e-mail address "%s" already exists', $argv[2]);
return;
}
@ -124,7 +125,7 @@ function add_user(): void
*/
function display_user(string $email): string
{
return $email == Security::SingleUserEmail ? 'single-user mode user' : "user \"$email\"";
return $email === Security::SingleUserEmail ? 'single-user mode user' : "user \"$email\"";
}
/**
@ -137,7 +138,7 @@ function set_password(string $email, string $password): void
// Ensure this user exists
$user = User::findByEmail($email);
if ($user->isEmpty()) {
if (Option::isNone($user)) {
printfn('No %s exists', $displayUser);
return;
}
@ -164,7 +165,7 @@ function delete_user(string $email): void
// Get the user for the provided e-mail address
$tryUser = User::findByEmail($email);
if ($tryUser->isEmpty()) {
if (Option::isNone($tryUser)) {
printfn('No %s exists', $displayUser);
return;
}
@ -209,7 +210,7 @@ function migrate_single_user(): void
try {
$single = User::findByEmail(Security::SingleUserEmail);
if ($single->isEmpty()) {
if (Option::isNone($single)) {
printfn('There is no single-user mode user to be migrated');
return;
}