Merge pull request #63 from laminas/feature/#62-upgrade-coding-standa…

…rd-and-lock-dependencies Feature/#62 upgrade coding standard and lock dependencies
laminas · Dec 30, 2020 · 3ebacd7 · 3ebacd7
2 parents 131153f + 75326b2
commit 3ebacd7
Show file tree

Hide file tree

Showing 87 changed files with 5,278 additions and 1,379 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 /.phpunit.result.cache
 /clover.xml
-/composer.lock
 /coveralls-upload.json
 /docs/html/
 /laminas-mkdoc-theme.tgz

diff --git a/composer.json b/composer.json
@@ -26,11 +26,11 @@
     "require-dev": {
         "ext-phar": "*",
         "doctrine/annotations": "^1.10.4",
-        "laminas/laminas-coding-standard": "^1.0.0",
+        "laminas/laminas-coding-standard": "^2.1.4",
         "laminas/laminas-stdlib": "^3.3.0",
         "phpunit/phpunit": "^9.4.2",
-        "psalm/plugin-phpunit": "^0.13.0",
-        "vimeo/psalm": "^4.2"
+        "psalm/plugin-phpunit": "^0.14.0",
+        "vimeo/psalm": "^4.3.1"
     },
     "conflict": {
         "phpspec/prophecy": "<1.9.0"