Base: Update psalm definition and dependency list

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
This commit is contained in:
Sean Molenaar 2021-01-26 13:32:17 +01:00 committed by Sean Molenaar
parent ad103f3b44
commit cb10dd1d83
9 changed files with 1409 additions and 130 deletions

View File

@ -7,7 +7,7 @@ jobs:
continue-on-error: true
strategy:
matrix:
ocp-version: [ 'dev-master', 'v20.0.5' ]
ocp-version: [ '21.0.0.x-dev', 'v20.0.5' ]
name: "Psalm: Nextcloud ${{ matrix.ocp-version }}"
steps:
- name: Checkout

View File

@ -13,6 +13,7 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1
- Fetch feed after creation (#1058)
- Update FeedIO Response call and add tests
- Improve Psalm tests and dependency definition
## [15.2.0-beta2] - 2021-01-17

View File

@ -1,7 +1,7 @@
{
"type": "project",
"license": "AGPL-3.0",
"description": "An RSS/Atom feed reader. Requires Nextcloud backgroundjobs or an updater script to be enabled to update your feeds. See the README.md in the apps top directory",
"description": "An RSS/Atom feed reader. Requires Nextcloud background jobs or an updater script to be enabled to update your feeds. See the README.md in the apps top directory",
"homepage": "https://github.com/nextcloud/news",
"authors": [
{
@ -36,7 +36,6 @@
}
],
"support": {
"irc": "irc://irc.freenode.org/nextcloud-news",
"issues": "https://github.com/nextcloud/news/issues",
"source": "https://github.com/nextcloud/news/"
},
@ -58,12 +57,11 @@
"phpunit/phpunit": "9.5.*",
"squizlabs/php_codesniffer": "^3.5.6",
"phpstan/phpstan": "^0.12.43",
"christophwurst/nextcloud": "v20.0.5",
"vimeo/psalm": "^4.0"
},
"replace": {
"guzzlehttp/guzzle": "*",
"symfony/console": "*"
"vimeo/psalm": "^4.0",
"christophwurst/nextcloud": "^v21.0.0-beta6",
"guzzlehttp/guzzle": "^7.2",
"doctrine/dbal": "^3.0",
"symfony/console": "^4.4.18"
},
"autoload": {
"psr-4": {

1400
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -47,11 +47,6 @@ class FeedApiController extends ApiController
*/
private $logger;
/**
* @var EntityApiSerializer
*/
private $serializer;
public function __construct(
IRequest $request,
?IUserSession $userSession,

View File

@ -55,7 +55,7 @@ class ItemApiController extends ApiController
* @param int $batchSize
* @param int $offset
* @param bool $oldestFirst
* @return array|mixed
* @return array|JSONResponse
*/
public function index(
int $type = 3,
@ -87,7 +87,7 @@ class ItemApiController extends ApiController
* @param int $type
* @param int $id
* @param int $lastModified
* @return array|mixed
* @return array|JSONResponse
*/
public function updated(int $type = 3, int $id = 0, int $lastModified = 0)
{

View File

@ -246,7 +246,7 @@ class FeedServiceV2 extends Service
return $feed;
}
// for backwards compability it can be that the location is not set
// for backwards compatibility it can be that the location is not set
// yet, if so use the url
$location = $feed->getLocation() ?? $feed->getUrl();

View File

@ -25,13 +25,10 @@
<referencedClass name="OC" />
</errorLevel>
</UndefinedClass>
<UndefinedDocblockClass>
<UndefinedClass>
<errorLevel type="suppress">
<referencedClass name="Doctrine\DBAL\Schema\Schema" />
<referencedClass name="Doctrine\DBAL\Schema\SchemaException" />
<referencedClass name="Doctrine\DBAL\Driver\Statement" />
<referencedClass name="Doctrine\DBAL\Schema\Table" />
<referencedClass name="OC\Hooks\Emitter" />
</errorLevel>
</UndefinedDocblockClass>
</UndefinedClass>
</issueHandlers>
</psalm>

View File

@ -1,111 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="4.4.1@9fd7a7d885b3a216cff8dec9d8c21a132f275224">
<file src="lib/AppInfo/Application.php">
<MissingDependency occurrences="1">
<MissingDependency occurrences="5">
<code>$fs</code>
<code>$fs</code>
<code>$fs</code>
<code>BeforeUserDeletedEvent</code>
<code>IRootFolder</code>
</MissingDependency>
<UndefinedClass occurrences="8">
<code>ContainerInterface</code>
<code>ContainerInterface</code>
<code>ContainerInterface</code>
<code>ContainerInterface</code>
<code>ContainerInterface</code>
<code>ContainerInterface</code>
<code>ContainerInterface</code>
<code>ContainerInterface</code>
</UndefinedClass>
</file>
<file src="lib/Command/Config/FeedAdd.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/Config/FeedDelete.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/Config/FeedList.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/Config/FolderAdd.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/Config/FolderDelete.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/Config/FolderList.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/Config/OpmlExport.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/ExploreGenerator.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/ShowFeed.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/Updater/AfterUpdate.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/Updater/AllFeeds.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/Updater/BeforeUpdate.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Command/Updater/UpdateFeed.php">
<UndefinedClass occurrences="1">
<code>Command</code>
</UndefinedClass>
</file>
<file src="lib/Config/FetcherConfig.php">
<UndefinedClass occurrences="1">
<code>Client</code>
</UndefinedClass>
</file>
<file src="lib/Controller/FeedApiController.php">
<UndefinedDocblockClass occurrences="1">
<code>EntityApiSerializer</code>
</UndefinedDocblockClass>
</file>
<file src="lib/Controller/ItemApiController.php">
<LessSpecificImplementedReturnType occurrences="1">
<code>array|mixed</code>
</LessSpecificImplementedReturnType>
</file>
<file src="lib/Cron/UpdaterJob.php">
<UndefinedClass occurrences="1">
<code>TimedJob</code>
</UndefinedClass>
</file>
<file src="lib/Fetcher/Client/FeedIoClient.php">
<UndefinedClass occurrences="3">
<code>BadResponseException</code>
</UndefinedClass>
<UndefinedDocblockClass occurrences="1"/>
</file>
<file src="lib/Fetcher/Fetcher.php">
<InvalidReturnStatement occurrences="1"/>
<InvalidReturnType occurrences="1">