Skip to content

Commit

Permalink
Merge pull request #181 from lemberg/feature/176-composer-deps-update
Browse files Browse the repository at this point in the history
Update Composer dependencies & test with --prefer-lowest
  • Loading branch information
T2L committed Apr 16, 2020
2 parents 9efba1c + cdd405b commit 1759cd6
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 3,679 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,11 @@
# Ignore Composer-managed dependencies.
/vendor

# Ignore Composer lock file (this is not a project).
/composer.lock

# Ignore PHPUnit results cache.
/.phpunit.result.cache

# Ignore local settings.
/vm-settings.local.yml
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ jobs:

php: 7.2

env: PREFER_LOWEST=--prefer-lowest

before_install:
- phpenv config-rm xdebug.ini
- composer self-update

install:
- composer install --no-interaction --no-progress --no-suggest --prefer-dist --optimize-autoloader
- composer update --no-progress --no-suggest --prefer-dist $PREFER_LOWEST --optimize-autoloader

script:
- ./vendor/bin/phpcs
Expand All @@ -46,10 +48,14 @@ jobs:

php: 7.3

env: PREFER_LOWEST=

- <<: *PHP

php: 7.4

env: PREFER_LOWEST=

- &Vagrant

stage: Vagrant
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ Updates:

Fixes:

- [GH-176](https://github.com/lemberg/draft-environment/issues/176) - Make this project less dependent on other packages:
* Support Symfony 5
* Bump Symfony 4 version constraint to `^4.4`
* Remove composer.lock from the repository (as it's does make sense to have it only for projects)
* Run `composer update` on Travis with `--prefer-lowest`, so minimum versions can be tested (on PHP 7.2)
- [GH-172](https://github.com/lemberg/draft-environment/issues/172) - Ensure that composer.json is not broken after running updates; remove Configurer:setUp listener from all events
- [GH-168](https://github.com/lemberg/draft-environment/issues/168) - Ansible role geerlingguy.mysql @ 3.0.0 was failing to install due to incorrect python configuration in certain cases (fixed by setting `ansible_python_interpreter` to `/usr/bin/python3`

Expand Down
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
"require": {
"php": "^7.2",
"composer-plugin-api": "^1.1",
"consolidation/comments": "dev-master",
"consolidation/comments": "dev-patch-1",
"nette/robot-loader": "^3.2",
"symfony/filesystem": "^3.4 || ^4",
"symfony/yaml": "^3.4 || ^4"
"symfony/filesystem": "^3.4 || ^4.4 || ^5",
"symfony/yaml": "^3.4 || ^4.4 || ^5"
},
"require-dev": {
"composer/composer": "^1.9",
"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
"composer/composer": "^1.10",
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.0",
"dg/bypass-finals": "^1.1",
"drupal/coder": "^8.3",
"ergebnis/phpstan-rules": "^0.14.0",
"drupal/coder": "^8.3.8",
"ergebnis/phpstan-rules": "^0.14",
"mikey179/vfsstream": "^1.6",
"php-mock/php-mock-phpunit": "^2.5",
"phpstan/extension-installer": "^1.0",
"phpstan/extension-installer": "^1.0.4",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-deprecation-rules": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12",
"phpunit/phpunit": "^6.5 || ^7",
"slam/phpstan-extensions": "^4.0",
"phpunit/phpunit": "^8.5 || ~9.0.0",
"slam/phpstan-extensions": "^5.0",
"thecodingmachine/phpstan-strict-rules": "^0.12"
},
"config": {
Expand Down

0 comments on commit 1759cd6

Please sign in to comment.