Browse Source

Style fixes

rpm
J. King 4 years ago
parent
commit
e16df90bae
  1. 1
      lib/Database.php
  2. 5
      lib/REST/Miniflux/V1.php
  3. 1
      lib/User.php
  4. 2
      tests/cases/Database/SeriesUser.php
  5. 3
      tests/cases/Db/BaseUpdate.php
  6. 1
      tests/cases/User/TestUser.php
  7. 2
      tests/docroot/Icon/SVG1.php
  8. 2
      tests/docroot/Icon/SVG2.php

1
lib/Database.php

@ -325,7 +325,6 @@ class Database {
return false; return false;
} }
return (bool) $this->db->prepare("UPDATE arsse_users set $setClause where id = ?", $setTypes, "str")->run($setValues, $user)->changes(); return (bool) $this->db->prepare("UPDATE arsse_users set $setClause where id = ?", $setTypes, "str")->run($setValues, $user)->changes();
} }
/** Creates a new session for the given user and returns the session identifier */ /** Creates a new session for the given user and returns the session identifier */

5
lib/REST/Miniflux/V1.php

@ -7,19 +7,14 @@ declare(strict_types=1);
namespace JKingWeb\Arsse\REST\Miniflux; namespace JKingWeb\Arsse\REST\Miniflux;
use JKingWeb\Arsse\Arsse; use JKingWeb\Arsse\Arsse;
use JKingWeb\Arsse\Service;
use JKingWeb\Arsse\Context\Context;
use JKingWeb\Arsse\Misc\ValueInfo; use JKingWeb\Arsse\Misc\ValueInfo;
use JKingWeb\Arsse\AbstractException; use JKingWeb\Arsse\AbstractException;
use JKingWeb\Arsse\Db\ExceptionInput;
use JKingWeb\Arsse\Feed\Exception as FeedException;
use JKingWeb\Arsse\Misc\HTTP; use JKingWeb\Arsse\Misc\HTTP;
use JKingWeb\Arsse\REST\Exception; use JKingWeb\Arsse\REST\Exception;
use JKingWeb\Arsse\REST\Exception404; use JKingWeb\Arsse\REST\Exception404;
use JKingWeb\Arsse\REST\Exception405; use JKingWeb\Arsse\REST\Exception405;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Laminas\Diactoros\Response\JsonResponse as Response;
use Laminas\Diactoros\Response\EmptyResponse; use Laminas\Diactoros\Response\EmptyResponse;
class V1 extends \JKingWeb\Arsse\REST\AbstractHandler { class V1 extends \JKingWeb\Arsse\REST\AbstractHandler {

1
lib/User.php

@ -70,7 +70,6 @@ class User {
return $out; return $out;
} }
public function remove(string $user): bool { public function remove(string $user): bool {
try { try {
$out = $this->u->userRemove($user); $out = $this->u->userRemove($user);

2
tests/cases/Database/SeriesUser.php

@ -139,7 +139,7 @@ trait SeriesUser {
public function testSetNoMetadata(): void { public function testSetNoMetadata(): void {
$in = [ $in = [
'num' => 2112, 'num' => 2112,
'blah' => "bloo" 'blah' => "bloo",
]; ];
$this->assertFalse(Arsse::$db->userPropertiesSet("john.doe@example.com", $in)); $this->assertFalse(Arsse::$db->userPropertiesSet("john.doe@example.com", $in));
$state = $this->primeExpectations($this->data, ['arsse_users' => ['id', 'num', 'admin', 'lang', 'tz', 'sort_asc']]); $state = $this->primeExpectations($this->data, ['arsse_users' => ['id', 'num', 'admin', 'lang', 'tz', 'sort_asc']]);

3
tests/cases/Db/BaseUpdate.php

@ -137,7 +137,8 @@ class BaseUpdate extends \JKingWeb\Arsse\Test\AbstractTest {
public function testUpdateTo7(): void { public function testUpdateTo7(): void {
$this->drv->schemaUpdate(6); $this->drv->schemaUpdate(6);
$this->drv->exec(<<<QUERY_TEXT $this->drv->exec(
<<<QUERY_TEXT
INSERT INTO arsse_users values('a', 'xyz'); INSERT INTO arsse_users values('a', 'xyz');
INSERT INTO arsse_users values('b', 'abc'); INSERT INTO arsse_users values('b', 'abc');
INSERT INTO arsse_folders(owner,name) values('a', '1'); INSERT INTO arsse_folders(owner,name) values('a', '1');

1
tests/cases/User/TestUser.php

@ -9,7 +9,6 @@ namespace JKingWeb\Arsse\TestCase\User;
use JKingWeb\Arsse\Arsse; use JKingWeb\Arsse\Arsse;
use JKingWeb\Arsse\Database; use JKingWeb\Arsse\Database;
use JKingWeb\Arsse\User; use JKingWeb\Arsse\User;
use JKingWeb\Arsse\AbstractException as Exception;
use JKingWeb\Arsse\User\ExceptionConflict; use JKingWeb\Arsse\User\ExceptionConflict;
use JKingWeb\Arsse\User\ExceptionInput; use JKingWeb\Arsse\User\ExceptionInput;
use JKingWeb\Arsse\User\Driver; use JKingWeb\Arsse\User\Driver;

2
tests/docroot/Icon/SVG1.php

@ -1,4 +1,4 @@
<?php return [ <?php return [
'mime' => "image/svg+xml", 'mime' => "image/svg+xml",
'content' => '<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600"><rect fill="#fff" height="600" width="900"/><circle fill="#bc002d" cx="450" cy="300" r="180"/></svg>' 'content' => '<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600"><rect fill="#fff" height="600" width="900"/><circle fill="#bc002d" cx="450" cy="300" r="180"/></svg>',
]; ];

2
tests/docroot/Icon/SVG2.php

@ -1,4 +1,4 @@
<?php return [ <?php return [
'mime' => "image/svg+xml", 'mime' => "image/svg+xml",
'content' => '<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600"><rect width="900" height="600" fill="#ED2939"/><rect width="600" height="600" fill="#fff"/><rect width="300" height="600" fill="#002395"/></svg>' 'content' => '<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600"><rect width="900" height="600" fill="#ED2939"/><rect width="600" height="600" fill="#fff"/><rect width="300" height="600" fill="#002395"/></svg>',
]; ];

Loading…
Cancel
Save