Merge pull request #32 from badges/fixup/freeze-docker-compose-versio…

…n-and-fix-security-alert Freeze docker-composer version and fixup security alert
badges · Jun 4, 2020 · b7d1fc8 · b7d1fc8
2 parents 9f2caf1 + 245655c
commit b7d1fc8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2,384 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 /bin/php-cs-fixer
 /bin/phpspec
 /vendor
+composer.lock
 docker-compose.yml
diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ We provide a `docker-compose.yml.dist` file to allow you to run tests in a Docke
 ```bash
 cp docker-compose.yml.dist docker-compose.yml
 docker-compose up -d
-docker-compose exec fpm composer update
+docker-compose exec fpm composer install
 docker-compose exec fpm bin/phpspec run --format=pretty
 docker-compose exec fpm bin/behat
 ```

diff --git a/composer.json b/composer.json
@@ -28,8 +28,8 @@
         "symfony/console": "~2.0|~3.0|~4.0"
     },
     "require-dev": {
-        "phpspec/phpspec": "2.*",
-        "behat/behat": "3.*",
+        "phpspec/phpspec": "^2.5",
+        "behat/behat": "^3.4",
         "friendsofphp/php-cs-fixer": "@stable",
         "coduo/phpspec-data-provider-extension": "^1.0"
     },