mirror/Arsse
1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 21:22:40 +00:00
Code Issues Activity

Style fixes

Browse source
This commit is contained in:
J. King 2021-01-08 15:47:19 -05:00
parent 4f34b4ff29
commit 549c7bdc72
11 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/REST/Miniflux/V1.php
View file

@ -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";

2
lib/User/Driver.php
View file

@ -31,7 +31,7 @@ interface Driver {
*
* 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 */

2
tests/cases/Database/SeriesUser.php
View file

@ -185,7 +185,7 @@ trait SeriesUser {
$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_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";

8
tests/cases/Misc/TestRule.php
View file

@ -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 {

2
tests/cases/REST/Miniflux/TestV1.php
View file

@ -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)],
];
}

1
tests/cases/User/TestInternal.php
View file

@ -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 */

4
tests/cases/User/TestUser.php
View file

@ -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),