From 549c7bdc721002400b047a3ed33dc4a7f1fa2acb Mon Sep 17 00:00:00 2001 From: "J. King" Date: Fri, 8 Jan 2021 15:47:19 -0500 Subject: [PATCH] Style fixes --- lib/Database.php | 2 +- lib/REST/Miniflux/V1.php | 4 ++-- lib/Rule/Exception.php | 2 +- lib/Rule/Rule.php | 2 +- lib/User.php | 8 ++++---- lib/User/Driver.php | 6 +++--- tests/cases/Database/SeriesUser.php | 4 ++-- tests/cases/Misc/TestRule.php | 8 +------- tests/cases/REST/Miniflux/TestV1.php | 2 +- tests/cases/User/TestInternal.php | 1 - tests/cases/User/TestUser.php | 4 ++-- 11 files changed, 18 insertions(+), 25 deletions(-) diff --git a/lib/Database.php b/lib/Database.php index f748aa7c..5e44d384 100644 --- a/lib/Database.php +++ b/lib/Database.php @@ -1209,7 +1209,7 @@ class Database { * * The result is an associative array whose keys are usernames, values * being an array in turn with the following keys: - * + * * - "keep": The "keep" rule as a prepared pattern; any articles which fail to match this rule are hidden * - "block": The block rule as a prepared pattern; any articles which match this rule are hidden */ diff --git a/lib/REST/Miniflux/V1.php b/lib/REST/Miniflux/V1.php index 9ad2882c..f048e798 100644 --- a/lib/REST/Miniflux/V1.php +++ b/lib/REST/Miniflux/V1.php @@ -265,7 +265,7 @@ class V1 extends \JKingWeb\Arsse\REST\AbstractHandler { } } //normalize user-specific input - foreach (self::USER_META_MAP as $k => [,$d,]) { + foreach (self::USER_META_MAP as $k => [,$d]) { $t = gettype($d); if (!isset($body[$k])) { $body[$k] = null; @@ -343,7 +343,7 @@ class V1 extends \JKingWeb\Arsse\REST\AbstractHandler { protected function editUser(string $user, array $data): array { // map Miniflux properties to internal metadata properties $in = []; - foreach (self::USER_META_MAP as $i => [$o,,]) { + foreach (self::USER_META_MAP as $i => [$o,]) { if (isset($data[$i])) { if ($i === "entry_sorting_direction") { $in[$o] = $data[$i] === "asc"; diff --git a/lib/Rule/Exception.php b/lib/Rule/Exception.php index e3c66645..1239e378 100644 --- a/lib/Rule/Exception.php +++ b/lib/Rule/Exception.php @@ -7,4 +7,4 @@ declare(strict_types=1); namespace JKingWeb\Arsse\Rule; class Exception extends \JKingWeb\Arsse\AbstractException { -} \ No newline at end of file +} diff --git a/lib/Rule/Rule.php b/lib/Rule/Rule.php index ee3c4a65..c8d41898 100644 --- a/lib/Rule/Rule.php +++ b/lib/Rule/Rule.php @@ -42,7 +42,7 @@ abstract class Rule { } /** applies keep and block rules against the title and categories of an article - * + * * Returns true if the article is to be kept, and false if it is to be suppressed */ public static function apply(string $keepPattern, string $blockPattern, string $title, array $categories = []): bool { diff --git a/lib/User.php b/lib/User.php index accec103..04748962 100644 --- a/lib/User.php +++ b/lib/User.php @@ -44,12 +44,12 @@ class User { public function begin(): Db\Transaction { /* TODO: A proper implementation of this would return a meta-transaction - object which would contain both a user-manager transaction (when + object which would contain both a user-manager transaction (when applicable) and a database transaction, and commit or roll back both - as the situation calls. + as the situation calls. In theory, an external user driver would probably have to implement its - own approximation of atomic transactions and rollback. In practice the + own approximation of atomic transactions and rollback. In practice the only driver is the internal one, which is always backed by an ACID database; the added complexity is thus being deferred until such time as it is actually needed for a concrete implementation. @@ -106,7 +106,7 @@ class User { } public function rename(string $user, string $newName): bool { - // ensure the new user name does not contain any U+003A COLON or + // ensure the new user name does not contain any U+003A COLON or // control characters, as this is incompatible with HTTP Basic authentication if (preg_match("/[\x{00}-\x{1F}\x{7F}:]/", $newName, $m)) { $c = ord($m[0]); diff --git a/lib/User/Driver.php b/lib/User/Driver.php index d4b73706..87668791 100644 --- a/lib/User/Driver.php +++ b/lib/User/Driver.php @@ -28,10 +28,10 @@ interface Driver { public function userAdd(string $user, string $password = null): ?string; /** Renames a user - * - * The implementation must retain all user metadata as well as the + * + * The implementation must retain all user metadata as well as the * user's password - */ + */ public function userRename(string $user, string $newName): bool; /** Removes a user */ diff --git a/tests/cases/Database/SeriesUser.php b/tests/cases/Database/SeriesUser.php index 0cd4ffb7..b56a64d8 100644 --- a/tests/cases/Database/SeriesUser.php +++ b/tests/cases/Database/SeriesUser.php @@ -184,8 +184,8 @@ trait SeriesUser { public function testRenameAUser(): void { $this->assertTrue(Arsse::$db->userRename("john.doe@example.com", "juan.doe@example.com")); $state = $this->primeExpectations($this->data, [ - 'arsse_users' => ['id', 'num'], - 'arsse_user_meta' => ["owner", "key", "value"] + 'arsse_users' => ['id', 'num'], + 'arsse_user_meta' => ["owner", "key", "value"], ]); $state['arsse_users']['rows'][2][0] = "juan.doe@example.com"; $state['arsse_user_meta']['rows'][6][0] = "juan.doe@example.com"; diff --git a/tests/cases/Misc/TestRule.php b/tests/cases/Misc/TestRule.php index 0d72f5fd..88503292 100644 --- a/tests/cases/Misc/TestRule.php +++ b/tests/cases/Misc/TestRule.php @@ -7,7 +7,6 @@ declare(strict_types=1); namespace JKingWeb\Arsse\TestCase\Misc; use JKingWeb\Arsse\Rule\Rule; -use JKingWeb\Arsse\Rule\Exception; /** @covers \JKingWeb\Arsse\Rule\Rule */ class TestRule extends \JKingWeb\Arsse\Test\AbstractTest { @@ -32,12 +31,7 @@ class TestRule extends \JKingWeb\Arsse\Test\AbstractTest { public function testApplyRules(string $keepRule, string $blockRule, string $title, array $categories, $exp): void { $keepRule = Rule::prep($keepRule); $blockRule = Rule::prep($blockRule); - if ($exp instanceof \Exception) { - $this->assertException($exp); - Rule::apply($keepRule, $blockRule, $title, $categories); - } else { - $this->assertSame($exp, Rule::apply($keepRule, $blockRule, $title, $categories)); - } + $this->assertSame($exp, Rule::apply($keepRule, $blockRule, $title, $categories)); } public function provideApplications(): iterable { diff --git a/tests/cases/REST/Miniflux/TestV1.php b/tests/cases/REST/Miniflux/TestV1.php index 255d9a55..496df378 100644 --- a/tests/cases/REST/Miniflux/TestV1.php +++ b/tests/cases/REST/Miniflux/TestV1.php @@ -451,7 +451,7 @@ class TestV1 extends \JKingWeb\Arsse\Test\AbstractTest { ["", new ErrorResponse(["InvalidCategory", 'title' => ""], 422)], [" ", new ErrorResponse(["InvalidCategory", 'title' => " "], 422)], [null, new ErrorResponse(["MissingInputValue", 'field' => "title"], 422)], - [false, new ErrorResponse(["InvalidInputType", 'field' => "title", 'actual' => "boolean", 'expected' => "string"],422)], + [false, new ErrorResponse(["InvalidInputType", 'field' => "title", 'actual' => "boolean", 'expected' => "string"], 422)], ]; } diff --git a/tests/cases/User/TestInternal.php b/tests/cases/User/TestInternal.php index 858a8765..fa42de17 100644 --- a/tests/cases/User/TestInternal.php +++ b/tests/cases/User/TestInternal.php @@ -9,7 +9,6 @@ namespace JKingWeb\Arsse\TestCase\User; use JKingWeb\Arsse\Arsse; use JKingWeb\Arsse\Database; use JKingWeb\Arsse\User\Driver as DriverInterface; -use JKingWeb\Arsse\User\ExceptionConflict; use JKingWeb\Arsse\User\Internal\Driver; /** @covers \JKingWeb\Arsse\User\Internal\Driver */ diff --git a/tests/cases/User/TestUser.php b/tests/cases/User/TestUser.php index 7c87e0c3..e9a45c9f 100644 --- a/tests/cases/User/TestUser.php +++ b/tests/cases/User/TestUser.php @@ -200,7 +200,7 @@ class TestUser extends \JKingWeb\Arsse\Test\AbstractTest { \Phake::when($this->drv)->userRename->thenReturn(true); $u = new User($this->drv); $old = "john.doe@example.com"; - $new = "jane.doe@example.com"; + $new = "jane.doe@example.com"; $this->assertTrue($u->rename($old, $new)); \Phake::inOrder( \Phake::verify($this->drv)->userRename($old, $new), @@ -222,7 +222,7 @@ class TestUser extends \JKingWeb\Arsse\Test\AbstractTest { \Phake::when($this->drv)->userRename->thenReturn(true); $u = new User($this->drv); $old = "john.doe@example.com"; - $new = "jane.doe@example.com"; + $new = "jane.doe@example.com"; $this->assertTrue($u->rename($old, $new)); \Phake::inOrder( \Phake::verify($this->drv)->userRename($old, $new),