From 220ebffc44e33af88daa3e8734bb0eda95c5e4ff Mon Sep 17 00:00:00 2001 From: Marcos Passos Date: Fri, 28 Oct 2022 10:08:39 -0300 Subject: [PATCH 1/2] Update deps --- .github/workflows/branch-validations.yaml | 8 +- composer.lock | 171 ++++++++++------------ 2 files changed, 83 insertions(+), 96 deletions(-) diff --git a/.github/workflows/branch-validations.yaml b/.github/workflows/branch-validations.yaml index 5d67b20..0406cbb 100644 --- a/.github/workflows/branch-validations.yaml +++ b/.github/workflows/branch-validations.yaml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: symfonycorp/security-checker-action@v2 + - uses: symfonycorp/security-checker-action@v3 composer: runs-on: ubuntu-latest @@ -27,16 +27,19 @@ jobs: with: php-version: '8.1' tools: composer:v2 + - name: Composer cache uses: actions/cache@v2 with: key: composer-${{ hashFiles('**/composer.lock') }} path: ${{ github.workspace }}/.cache + - name: Vendor cache uses: actions/cache@v2 with: key: vendor-${{ hashFiles('**/composer.lock') }} path: ${{ github.workspace }}/vendor + - name: Tools cache uses: actions/cache@v2 with: @@ -68,16 +71,19 @@ jobs: with: php-version: '8.1' tools: composer:v2 + - name: Composer cache uses: actions/cache@v2 with: key: composer-${{ hashFiles('**/composer.lock') }} path: ${{ github.workspace }}/.cache + - name: Vendor cache uses: actions/cache@v2 with: key: vendor-${{ hashFiles('**/composer.lock') }} path: ${{ github.workspace }}/vendor + - name: Tools cache uses: actions/cache@v2 with: diff --git a/composer.lock b/composer.lock index 43b0285..69e923e 100644 --- a/composer.lock +++ b/composer.lock @@ -84,35 +84,35 @@ }, { "name": "ergebnis/composer-normalize", - "version": "2.24.0", + "version": "2.28.3", "source": { "type": "git", "url": "https://github.com/ergebnis/composer-normalize.git", - "reference": "0492b8de602ac601f5d53a5ef9c9558701a18f31" + "reference": "ec75a2bf751f6fec165e9ea0262655b8ca397e5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/0492b8de602ac601f5d53a5ef9c9558701a18f31", - "reference": "0492b8de602ac601f5d53a5ef9c9558701a18f31", + "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/ec75a2bf751f6fec165e9ea0262655b8ca397e5c", + "reference": "ec75a2bf751f6fec165e9ea0262655b8ca397e5c", "shasum": "" }, "require": { "composer-plugin-api": "^2.0.0", "ergebnis/json-normalizer": "~2.1.0", "ergebnis/json-printer": "^3.2.0", - "justinrainbow/json-schema": "^5.2.11", + "justinrainbow/json-schema": "^5.2.12", "localheinz/diff": "^1.1.1", "php": "^7.4 || ^8.0" }, "require-dev": { - "composer/composer": "^2.2.5", + "composer/composer": "^2.3.9", "ergebnis/license": "^1.2.0", - "ergebnis/php-cs-fixer-config": "^3.4.0", + "ergebnis/php-cs-fixer-config": "^4.4.0", "fakerphp/faker": "^1.19.0", - "phpunit/phpunit": "^9.5.17", - "psalm/plugin-phpunit": "~0.16.1", - "symfony/filesystem": "^5.4.6", - "vimeo/psalm": "^4.22.0" + "phpunit/phpunit": "^9.5.21", + "psalm/plugin-phpunit": "~0.17.0", + "symfony/filesystem": "^5.4.9", + "vimeo/psalm": "^4.24.0" }, "type": "composer-plugin", "extra": { @@ -149,13 +149,7 @@ "issues": "https://github.com/ergebnis/composer-normalize/issues", "source": "https://github.com/ergebnis/composer-normalize" }, - "funding": [ - { - "url": "https://github.com/localheinz", - "type": "github" - } - ], - "time": "2022-03-09T08:15:05+00:00" + "time": "2022-07-05T16:09:10+00:00" }, { "name": "ergebnis/json-normalizer", @@ -358,16 +352,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.11", + "version": "5.2.12", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa" + "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa", - "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", "shasum": "" }, "require": { @@ -422,9 +416,9 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11" + "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" }, - "time": "2021-07-22T09:24:00+00:00" + "time": "2022-04-13T08:02:27+00:00" }, { "name": "localheinz/diff", @@ -488,28 +482,27 @@ }, { "name": "phpstan/extension-installer", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/phpstan/extension-installer.git", - "reference": "66c7adc9dfa38b6b5838a9fb728b68a7d8348051" + "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/66c7adc9dfa38b6b5838a9fb728b68a7d8348051", - "reference": "66c7adc9dfa38b6b5838a9fb728b68a7d8348051", + "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f06dbb052ddc394e7896fcd1cfcd533f9f6ace40", + "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40", "shasum": "" }, "require": { - "composer-plugin-api": "^1.1 || ^2.0", - "php": "^7.1 || ^8.0", - "phpstan/phpstan": ">=0.11.6" + "composer-plugin-api": "^2.0", + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.8.0" }, "require-dev": { - "composer/composer": "^1.8", - "phing/phing": "^2.16.3", + "composer/composer": "^2.0", "php-parallel-lint/php-parallel-lint": "^1.2.0", - "phpstan/phpstan-strict-rules": "^0.11 || ^0.12" + "phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0" }, "type": "composer-plugin", "extra": { @@ -527,41 +520,37 @@ "description": "Composer plugin for automatic installation of PHPStan extensions", "support": { "issues": "https://github.com/phpstan/extension-installer/issues", - "source": "https://github.com/phpstan/extension-installer/tree/1.1.0" + "source": "https://github.com/phpstan/extension-installer/tree/1.2.0" }, - "time": "2020-12-13T13:06:13+00:00" + "time": "2022-10-17T12:59:16+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.2.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e" + "reference": "33aefcdab42900e36366d0feab6206e2dd68f947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/dbc093d7af60eff5cd575d2ed761b15ed40bd08e", - "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/33aefcdab42900e36366d0feab6206e2dd68f947", + "reference": "33aefcdab42900e36366d0feab6206e2dd68f947", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.0", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5", "symfony/process": "^5.2" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "autoload": { "psr-4": { "PHPStan\\PhpDocParser\\": [ @@ -576,26 +565,26 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.2.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.13.0" }, - "time": "2021-09-16T20:46:02+00:00" + "time": "2022-10-21T09:57:39+00:00" }, { "name": "phpstan/phpstan", - "version": "1.4.9", + "version": "1.8.11", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1a45f44d319cf000a8c960af6b7435741e944771" + "reference": "46e223dd68a620da18855c23046ddb00940b4014" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1a45f44d319cf000a8c960af6b7435741e944771", - "reference": "1a45f44d319cf000a8c960af6b7435741e944771", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46e223dd68a620da18855c23046ddb00940b4014", + "reference": "46e223dd68a620da18855c23046ddb00940b4014", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.2|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -605,11 +594,6 @@ "phpstan.phar" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, "autoload": { "files": [ "bootstrap.php" @@ -620,9 +604,13 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.4.9" + "source": "https://github.com/phpstan/phpstan/tree/1.8.11" }, "funding": [ { @@ -633,16 +621,12 @@ "url": "https://github.com/phpstan", "type": "github" }, - { - "url": "https://www.patreon.com/phpstan", - "type": "patreon" - }, { "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", "type": "tidelift" } ], - "time": "2022-03-10T08:52:08+00:00" + "time": "2022-10-24T15:45:13+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -696,21 +680,21 @@ }, { "name": "phpstan/phpstan-strict-rules", - "version": "1.1.0", + "version": "1.4.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-strict-rules.git", - "reference": "e12d55f74a8cca18c6e684c6450767e055ba7717" + "reference": "23e5f377ee6395a1a04842d3d6ed4bd25e7b44a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/e12d55f74a8cca18c6e684c6450767e055ba7717", - "reference": "e12d55f74a8cca18c6e684c6450767e055ba7717", + "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/23e5f377ee6395a1a04842d3d6ed4bd25e7b44a6", + "reference": "23e5f377ee6395a1a04842d3d6ed4bd25e7b44a6", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0", - "phpstan/phpstan": "^1.2.0" + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.8.6" }, "require-dev": { "nikic/php-parser": "^4.13.0", @@ -720,9 +704,6 @@ }, "type": "phpstan-extension", "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, "phpstan": { "includes": [ "rules.neon" @@ -741,38 +722,38 @@ "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/1.1.0" + "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.4.4" }, - "time": "2021-11-18T09:30:29+00:00" + "time": "2022-09-21T11:38:17+00:00" }, { "name": "slevomat/coding-standard", - "version": "7.0.19", + "version": "7.2.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "bef66a43815bbf9b5f49775e9ded3f7c6ba0cc37" + "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/bef66a43815bbf9b5f49775e9ded3f7c6ba0cc37", - "reference": "bef66a43815bbf9b5f49775e9ded3f7c6ba0cc37", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/aff06ae7a84e4534bf6f821dc982a93a5d477c90", + "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", - "php": "^7.1 || ^8.0", - "phpstan/phpdoc-parser": "^1.0.0", + "php": "^7.2 || ^8.0", + "phpstan/phpdoc-parser": "^1.5.1", "squizlabs/php_codesniffer": "^3.6.2" }, "require-dev": { - "phing/phing": "2.17.2", + "phing/phing": "2.17.3", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.6", + "phpstan/phpstan": "1.4.10|1.7.1", "phpstan/phpstan-deprecation-rules": "1.0.0", - "phpstan/phpstan-phpunit": "1.0.0", - "phpstan/phpstan-strict-rules": "1.1.0", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.16" + "phpstan/phpstan-phpunit": "1.0.0|1.1.1", + "phpstan/phpstan-strict-rules": "1.2.3", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.20" }, "type": "phpcodesniffer-standard", "extra": { @@ -792,7 +773,7 @@ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/7.0.19" + "source": "https://github.com/slevomat/coding-standard/tree/7.2.1" }, "funding": [ { @@ -804,20 +785,20 @@ "type": "tidelift" } ], - "time": "2022-03-01T18:01:41+00:00" + "time": "2022-05-25T10:58:12+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.6.2", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a" + "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a", - "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", + "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", "shasum": "" }, "require": { @@ -860,7 +841,7 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2021-12-12T21:44:58+00:00" + "time": "2022-06-18T07:21:10+00:00" } ], "aliases": [], @@ -873,5 +854,5 @@ "ext-mbstring": "*" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } From 678d7151075c1056908c6b3ccd1297e0d316faed Mon Sep 17 00:00:00 2001 From: Marcos Passos Date: Fri, 28 Oct 2022 10:12:02 -0300 Subject: [PATCH 2/2] Fix PHPStan issues --- phpstan.neon.dist | 9 --------- 1 file changed, 9 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index e4ce2f4..0c0bb88 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -16,18 +16,9 @@ parameters: missingCheckedExceptionInThrows: true tooWideThrowType: true ignoreErrors: - - - path: src/Dfa/DFA.php - message: '#^Property Antlr\\Antlr4\\Runtime\\Dfa\\DFAState\:\:\$edges \(SplFixedArray\\|null\) does not accept SplFixedArray\.$#' - - - path: src/Atn/ParserATNSimulator.php - message: '#^Property Antlr\\Antlr4\\Runtime\\Dfa\\DFAState\:\:\$edges \(SplFixedArray\\|null\) does not accept SplFixedArray\.$#' - path: src/Atn/ParserATNSimulator.php message: '#^Property Antlr\\Antlr4\\Runtime\\Dfa\\DFAState\:\:\$edges \(SplFixedArray\\|null\) does not accept non\-empty\-array\, Antlr\\Antlr4\\Runtime\\Dfa\\DFAState\>\|SplFixedArray\\.$#' - - - path: src/Atn/LexerATNSimulator.php - message: '#^Property Antlr\\Antlr4\\Runtime\\Dfa\\DFAState\:\:\$edges \(SplFixedArray\\|null\) does not accept SplFixedArray\\.$#' - path: src/Atn/LexerATNSimulator.php message: '#^Property Antlr\\Antlr4\\Runtime\\Dfa\\DFAState\:\:\$edges \(SplFixedArray\\|null\) does not accept non\-empty\-array\, Antlr\\Antlr4\\Runtime\\Dfa\\DFAState\>\|SplFixedArray\\.$#' \ No newline at end of file