Skip to content

Commit 50323df

Browse files
committed
Merge branch 'AC-2841' into Hammer_PlatForm_Health_246_Scope_14102022
Conflicts: composer.json composer.lock
2 parents 671654e + 6c73f31 commit 50323df

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"laminas/laminas-dependency-plugin": "^2.2.0",
1414
"laminas/laminas-stdlib": "~3.6.0",
1515
"nikic/php-parser": "^4.15",
16-
"phpstan/phpdoc-parser": "^1.11",
16+
"phpstan/phpdoc-parser": "^0.5.5",
1717
"sabre/xml": "~2.2.3",
1818
"symfony/console": "~4.4.0||~5.4.0",
1919
"tomzx/php-semver-checker": "^0.15.0",

composer.lock

Lines changed: 15 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)