diff --git a/composer.json b/composer.json
index d682e4875..c7daf148d 100644
--- a/composer.json
+++ b/composer.json
@@ -41,11 +41,11 @@
},
"require": {
"php": "^7.2 || ~8.0",
- "ezyang/htmlpurifier": "^4.13.0",
- "pear/net_url2": "2.2.2",
- "riimu/kit-pathjoin": "1.2.0",
- "debril/feed-io": "^v4.7.9",
- "arthurhoaro/favicon": "^1.3.2",
+ "ezyang/htmlpurifier": "^4.14.0",
+ "pear/net_url2": "^2.2.2",
+ "riimu/kit-pathjoin": "^1.2.0",
+ "debril/feed-io": "^v4.9.12",
+ "arthurhoaro/favicon": "^1.3.3",
"fivefilters/readability.php": "^2.1",
"ext-json": "*",
"ext-simplexml": "*",
@@ -55,14 +55,14 @@
},
"require-dev": {
"phpunit/phpunit": "9.5.*",
- "squizlabs/php_codesniffer": "^3.6.1",
- "phpstan/phpstan": "^0.12.99",
- "phpstan/phpstan-doctrine": "^0.12.44",
- "phpstan/phpstan-strict-rules": "^0.12.11",
- "phpstan/phpstan-phpunit": "^0.12.22",
+ "squizlabs/php_codesniffer": "^3.6.2",
+ "phpstan/phpstan": "^1.4.0",
+ "phpstan/phpstan-doctrine": "^1.2.11",
+ "phpstan/phpstan-strict-rules": "^1.1.0",
+ "phpstan/phpstan-phpunit": "^1.0.0",
"phpstan/extension-installer": "^1.1.0",
"guzzlehttp/guzzle": "^7.3.0",
- "doctrine/dbal": "^3.1.3",
+ "doctrine/dbal": "^3.3.2",
"symfony/console": "^4.4.19",
"psr/log": "^1.1.0"
},
diff --git a/composer.lock b/composer.lock
index f6cac05cb..fcf02f8e6 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": "ddf72a0063e254fcce2e34df98399bfd",
+ "content-hash": "00457bc6f2ee6370bf0499b07d03eacf",
"packages": [
{
"name": "arthurhoaro/favicon",
@@ -156,12 +156,12 @@
},
"type": "library",
"autoload": {
- "psr-0": {
- "HTMLPurifier": "library/"
- },
"files": [
"library/HTMLPurifier.composer.php"
],
+ "psr-0": {
+ "HTMLPurifier": "library/"
+ },
"exclude-from-classmap": [
"/library/HTMLPurifier/Language/"
]
@@ -1285,16 +1285,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "0.12.99",
+ "version": "1.4.8",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7"
+ "reference": "2a6d6704b17c4db6190cc3104056c0aad740cb15"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b4d40f1d759942f523be267a1bab6884f46ca3f7",
- "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2a6d6704b17c4db6190cc3104056c0aad740cb15",
+ "reference": "2a6d6704b17c4db6190cc3104056c0aad740cb15",
"shasum": ""
},
"require": {
@@ -1310,7 +1310,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.12-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -1325,7 +1325,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
- "source": "https://github.com/phpstan/phpstan/tree/0.12.99"
+ "source": "https://github.com/phpstan/phpstan/tree/1.4.8"
},
"funding": [
{
@@ -1345,25 +1345,25 @@
"type": "tidelift"
}
],
- "time": "2021-09-12T20:09:55+00:00"
+ "time": "2022-03-04T13:03:56+00:00"
},
{
"name": "phpstan/phpstan-doctrine",
- "version": "0.12.44",
+ "version": "1.2.11",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-doctrine.git",
- "reference": "5fe9a9b15707d9bc5178fa7cf0899e904d112ccd"
+ "reference": "580737eff27e48c1924bc019fa43343626242e91"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/5fe9a9b15707d9bc5178fa7cf0899e904d112ccd",
- "reference": "5fe9a9b15707d9bc5178fa7cf0899e904d112ccd",
+ "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/580737eff27e48c1924bc019fa43343626242e91",
+ "reference": "580737eff27e48c1924bc019fa43343626242e91",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0",
- "phpstan/phpstan": "^0.12.85"
+ "phpstan/phpstan": "^1.4.1"
},
"conflict": {
"doctrine/collections": "<1.0",
@@ -1376,21 +1376,24 @@
"doctrine/annotations": "^1.11.0",
"doctrine/collections": "^1.6",
"doctrine/common": "^2.7 || ^3.0",
- "doctrine/dbal": "^2.13.1",
+ "doctrine/dbal": "^2.13.7 || ^3.0",
+ "doctrine/lexer": "^1.2.1",
"doctrine/mongodb-odm": "^1.3 || ^2.1",
- "doctrine/orm": "^2.9.1",
- "doctrine/persistence": "^1.1 || ^2.0",
+ "doctrine/orm": "^2.11.0",
+ "doctrine/persistence": "^1.3.8 || ^2.2.1",
"nesbot/carbon": "^2.49",
+ "nikic/php-parser": "^4.13.2",
"php-parallel-lint/php-parallel-lint": "^1.2",
- "phpstan/phpstan-phpunit": "^0.12.16",
- "phpstan/phpstan-strict-rules": "^0.12.5",
- "phpunit/phpunit": "^9.5",
- "ramsey/uuid-doctrine": "^1.5.0"
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpstan/phpstan-strict-rules": "^1.0",
+ "phpunit/phpunit": "^9.5.10",
+ "ramsey/uuid-doctrine": "^1.5.0",
+ "symfony/cache": "^4.4.35"
},
"type": "phpstan-extension",
"extra": {
"branch-alias": {
- "dev-master": "0.12-dev"
+ "dev-master": "1.2-dev"
},
"phpstan": {
"includes": [
@@ -1411,40 +1414,41 @@
"description": "Doctrine extensions for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-doctrine/issues",
- "source": "https://github.com/phpstan/phpstan-doctrine/tree/0.12.44"
+ "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.2.11"
},
- "time": "2021-09-01T06:46:16+00:00"
+ "time": "2022-02-23T15:14:45+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
- "version": "0.12.22",
+ "version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
- "reference": "7c01ef93bf128b4ac8bdad38c54b2a4fd6b0b3cc"
+ "reference": "9eb88c9f689003a8a2a5ae9e010338ee94dc39b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/7c01ef93bf128b4ac8bdad38c54b2a4fd6b0b3cc",
- "reference": "7c01ef93bf128b4ac8bdad38c54b2a4fd6b0b3cc",
+ "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/9eb88c9f689003a8a2a5ae9e010338ee94dc39b3",
+ "reference": "9eb88c9f689003a8a2a5ae9e010338ee94dc39b3",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0",
- "phpstan/phpstan": "^0.12.92"
+ "phpstan/phpstan": "^1.0"
},
"conflict": {
"phpunit/phpunit": "<7.0"
},
"require-dev": {
+ "nikic/php-parser": "^4.13.0",
"php-parallel-lint/php-parallel-lint": "^1.2",
- "phpstan/phpstan-strict-rules": "^0.12.6",
+ "phpstan/phpstan-strict-rules": "^1.0",
"phpunit/phpunit": "^9.5"
},
"type": "phpstan-extension",
"extra": {
"branch-alias": {
- "dev-master": "0.12-dev"
+ "dev-master": "1.0-dev"
},
"phpstan": {
"includes": [
@@ -1465,37 +1469,38 @@
"description": "PHPUnit extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues",
- "source": "https://github.com/phpstan/phpstan-phpunit/tree/0.12.22"
+ "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.0.0"
},
- "time": "2021-08-12T10:53:43+00:00"
+ "time": "2021-10-14T08:03:54+00:00"
},
{
"name": "phpstan/phpstan-strict-rules",
- "version": "0.12.11",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-strict-rules.git",
- "reference": "2b72e8e17d2034145f239126e876e5fb659675e2"
+ "reference": "e12d55f74a8cca18c6e684c6450767e055ba7717"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/2b72e8e17d2034145f239126e876e5fb659675e2",
- "reference": "2b72e8e17d2034145f239126e876e5fb659675e2",
+ "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/e12d55f74a8cca18c6e684c6450767e055ba7717",
+ "reference": "e12d55f74a8cca18c6e684c6450767e055ba7717",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0",
- "phpstan/phpstan": "^0.12.96"
+ "phpstan/phpstan": "^1.2.0"
},
"require-dev": {
+ "nikic/php-parser": "^4.13.0",
"php-parallel-lint/php-parallel-lint": "^1.2",
- "phpstan/phpstan-phpunit": "^0.12.16",
+ "phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^9.5"
},
"type": "phpstan-extension",
"extra": {
"branch-alias": {
- "dev-master": "0.12-dev"
+ "dev-master": "1.0-dev"
},
"phpstan": {
"includes": [
@@ -1515,9 +1520,9 @@
"description": "Extra strict and opinionated rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
- "source": "https://github.com/phpstan/phpstan-strict-rules/tree/0.12.11"
+ "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.1.0"
},
- "time": "2021-08-21T11:36:27+00:00"
+ "time": "2021-11-18T09:30:29+00:00"
},
{
"name": "phpunit/php-code-coverage",
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 113409c06..c466bff2f 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -3,7 +3,7 @@ parameters:
treatPhpDocTypesAsCertain: false
bootstrapFiles:
- %currentWorkingDirectory%/../../lib/base.php
- excludes_analyse:
+ excludePaths:
- %currentWorkingDirectory%/lib/Migration/*.php
- %currentWorkingDirectory%/lib/AppInfo/Application.php
- %currentWorkingDirectory%/lib/Fetcher/Client/Legacy*.php