From 34f45d985fd790517184fca03855a982da6ac44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 28 Dec 2020 13:59:36 +0100 Subject: [PATCH] Fix more issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- composer.json | 6 +-- composer.lock | 128 ++++++++++++++++++++++++++------------------------ psalm.xml | 7 +++ 3 files changed, 76 insertions(+), 65 deletions(-) diff --git a/composer.json b/composer.json index 116ec1412..57655fbbb 100644 --- a/composer.json +++ b/composer.json @@ -13,12 +13,12 @@ }, "require-dev": { "roave/security-advisories": "dev-master", - "christophwurst/nextcloud": "^17", - "jakub-onderka/php-parallel-lint": "^1.0.0", + "christophwurst/nextcloud": "^20", "phpunit/phpunit": "^8", "nextcloud/coding-standard": "^0.4.0", "symfony/event-dispatcher": "^4.0", - "vimeo/psalm": "^4.3" + "vimeo/psalm": "^4.3", + "php-parallel-lint/php-parallel-lint": "^1.2" }, "config": { "optimize-autoloader": true, diff --git a/composer.lock b/composer.lock index c48fe1c68..0f37ef988 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "991369f912a370449c4bdd7fea2ae81a", + "content-hash": "4a3d65807490679a4de897a8643385bb", "packages": [ { "name": "cogpowered/finediff", @@ -225,25 +225,25 @@ }, { "name": "christophwurst/nextcloud", - "version": "v17.0.6", + "version": "v20.0.4", "source": { "type": "git", "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "5977d037f9d885713312016db3a9019ed6853955" + "reference": "a207b55848d1ac4c83a954eac90c07714bbdaaed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/5977d037f9d885713312016db3a9019ed6853955", - "reference": "5977d037f9d885713312016db3a9019ed6853955", + "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/a207b55848d1ac4c83a954eac90c07714bbdaaed", + "reference": "a207b55848d1ac4c83a954eac90c07714bbdaaed", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "17.0.0-dev" + "dev-master": "20.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -259,9 +259,9 @@ "description": "Composer package containing Nextcloud's public API (classes, interfaces)", "support": { "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues", - "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/v17.0.6" + "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/v20.0.4" }, - "time": "2020-04-27T12:43:22+00:00" + "time": "2020-12-23T12:42:07+00:00" }, { "name": "composer/package-versions-deprecated", @@ -946,59 +946,6 @@ ], "time": "2020-12-24T11:14:44+00:00" }, - { - "name": "jakub-onderka/php-parallel-lint", - "version": "v1.0.0", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git", - "reference": "04fbd3f5fb1c83f08724aa58a23db90bd9086ee8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/04fbd3f5fb1c83f08724aa58a23db90bd9086ee8", - "reference": "04fbd3f5fb1c83f08724aa58a23db90bd9086ee8", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "jakub-onderka/php-console-highlighter": "~0.3", - "nette/tester": "~1.3", - "squizlabs/php_codesniffer": "~2.7" - }, - "suggest": { - "jakub-onderka/php-console-highlighter": "Highlight syntax in code snippet" - }, - "bin": [ - "parallel-lint" - ], - "type": "library", - "autoload": { - "classmap": [ - "./" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "ahoj@jakubonderka.cz" - } - ], - "description": "This tool check syntax of PHP files about 20x faster than serial check.", - "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint", - "support": { - "issues": "https://github.com/JakubOnderka/PHP-Parallel-Lint/issues", - "source": "https://github.com/JakubOnderka/PHP-Parallel-Lint/tree/master" - }, - "abandoned": "php-parallel-lint/php-parallel-lint", - "time": "2018-02-24T15:31:20+00:00" - }, { "name": "myclabs/deep-copy", "version": "1.10.2", @@ -1424,6 +1371,63 @@ }, "time": "2020-10-14T08:39:05+00:00" }, + { + "name": "php-parallel-lint/php-parallel-lint", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", + "reference": "474f18bc6cc6aca61ca40bfab55139de614e51ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/474f18bc6cc6aca61ca40bfab55139de614e51ca", + "reference": "474f18bc6cc6aca61ca40bfab55139de614e51ca", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=5.4.0" + }, + "replace": { + "grogy/php-parallel-lint": "*", + "jakub-onderka/php-parallel-lint": "*" + }, + "require-dev": { + "nette/tester": "^1.3 || ^2.0", + "php-parallel-lint/php-console-highlighter": "~0.3", + "squizlabs/php_codesniffer": "~3.0" + }, + "suggest": { + "php-parallel-lint/php-console-highlighter": "Highlight syntax in code snippet" + }, + "bin": [ + "parallel-lint" + ], + "type": "library", + "autoload": { + "classmap": [ + "./" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "ahoj@jakubonderka.cz" + } + ], + "description": "This tool check syntax of PHP files about 20x faster than serial check.", + "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint", + "support": { + "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues", + "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/master" + }, + "time": "2020-04-04T12:18:32+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "2.2.0", diff --git a/psalm.xml b/psalm.xml index a2a07bc64..60aae76d9 100644 --- a/psalm.xml +++ b/psalm.xml @@ -21,14 +21,21 @@ + + + + + + +