Merge pull request #4464 from nicwortel/remove-composer-lock

Remove composer.lock from version control
doctrine · Jan 7, 2021 · ce3421e · ce3421e
2 parents 5ffd105 + 02fbb3d
commit ce3421e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3,887 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,5 @@
 /.appveyor.yml export-ignore
 /ci export-ignore
-/composer.lock export-ignore
 /docs export-ignore
 /.doctrine-project.json export-ignore
 /.gitattributes export-ignore

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -28,7 +28,7 @@ jobs:
           - "7.4"
           - "8.0"
         dependencies:
-          - "locked"
+          - "highest"
         include:
           - dependencies: "lowest"
             php-version: "7.3"

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/composer.lock
 /.phpunit.result.cache
 build/
 logs/

diff --git a/composer.json b/composer.json
@@ -38,13 +38,13 @@
         "doctrine/event-manager": "^1.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^8.1",
-        "jetbrains/phpstorm-stubs": "^2019.1",
-        "phpstan/phpstan": "^0.12.55",
-        "phpunit/phpunit": "^9.5",
-        "psalm/plugin-phpunit": "^0.13.0",
+        "doctrine/coding-standard": "8.2.0",
+        "jetbrains/phpstorm-stubs": "2019.3",
+        "phpstan/phpstan": "0.12.55",
+        "phpunit/phpunit": "9.5.0",
+        "psalm/plugin-phpunit": "0.13.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
-        "vimeo/psalm": "^4.1"
+        "vimeo/psalm": "4.3.1"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."