Skip to content

Commit

Permalink
bug #436 [Maintenance] Remove php platform from composer (lchrusciel)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.7 branch.

Discussion
----------

I've removed the platform from the composer to let flex detect the current environment based on used CLI PHP. In addition, I've added composer v2

Replacecment for #434 

Commits
-------

5b69107 [Maintenance] Remove php platform from composer
aaa9670 [Maintenance] Update composer (on PHP 7.3)
9fdd1d3 [Maintenance] Switch to composer v2
e48fcea [Migration] Add nullable for product price
  • Loading branch information
Zales0123 authored Oct 30, 2020
2 parents 0199dc0 + e48fcea commit 2710783
Show file tree
Hide file tree
Showing 5 changed files with 1,407 additions and 702 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- echo "memory_limit=4096M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

- composer self-update --1
- composer self-update --preview

install:
- if [ ! -z "${SYMFONY_VERSION}" ]; then bin/require-symfony-version composer.json "${SYMFONY_VERSION}"; fi
Expand Down
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@
]
},
"config": {
"platform": {
"php": "7.3.15"
},
"preferred-install": {
"*": "dist"
},
Expand Down
Loading

0 comments on commit 2710783

Please sign in to comment.