Skip to content
This repository has been archived by the owner on Mar 7, 2020. It is now read-only.

Remove composer lock #249

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
###> Monofony ###
### Warning: Remove this composer.lock line from your gitignore
### to enable adding this file on your project
composer.lock
###> Monofony ###

/app/config/parameters.yml
/build/
/phpunit.xml
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
</a>
</h1>

Remove composer.lock from the .gitignore file
Search and replace 'app_name', 'AppName' et 'APP_NAME' with your application name

Installation
Expand Down
13 changes: 7 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
"sylius/resource-bundle": "^1.6",
"sylius/ui-bundle": "^1.6",
"sylius/user-bundle": "^1.6",
"symfony/dotenv": "^4.3.1",
"symfony/dotenv": "4.4.*",
"symfony/flex": "^1.2",
"symfony/monolog-bundle": "^3.3",
"symfony/proxy-manager-bridge": "^4.3",
"symfony/proxy-manager-bridge": "4.4.*",
"symfony/swiftmailer-bundle": "^3.0",
"symfony/twig-bundle": "^4.2",
"symfony/twig-bundle": "4.4.*",
"symfony/webpack-encore-bundle": "^1.6",
"twig/extensions": "^1.5",
"twig/twig": "^2.7",
Expand Down Expand Up @@ -70,8 +70,8 @@
"proget-hq/phpstan-phpspec": "^0.2.0",
"psr/event-dispatcher": "^1.0",
"se/selenium-server-standalone": " ^2.52",
"symfony/debug-bundle": "^4.3.1",
"symfony/web-profiler-bundle": "^4.2",
"symfony/debug-bundle": "4.4.*",
"symfony/web-profiler-bundle": "4.4.*",
"vimeo/psalm": "^3.4"
},
"conflict": {
Expand All @@ -89,7 +89,8 @@
},
"extra": {
"symfony": {
"allow-contrib": true
"allow-contrib": true,
"require": "4.4.*"
}
},
"minimum-stability": "dev",
Expand Down
Loading