Commit the composer.lock file #196
Merged
+1,051
−17
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR does a few related things:
composer.lock
file. This is recommended by Composer, and should improve build times, and help when switching branches with different dependencies..gitignore
file, removing thecomposer.lock
entry, and a bunch of entries that should really be in a global .gitignore file, such as.DS_Store
and.idea
..gitignore
where appropriate.composer.json
to use the platform config option, so that dependencies get locked at appropriate versions for our minimum PHP constraint.In regards to committing the lock file, there is the small downside that parallel changes to
composer.lock
always cause merge conflicts, but this is simple to fix, and the benefits outweigh the problems.