Skip to content

Commit

Permalink
Merge pull request #34550 from owncloud/stable10-05b98dc14170a7fd73d0…
Browse files Browse the repository at this point in the history
…6ec8f7ec3980da82582b

[stable10] fix composer warnings
  • Loading branch information
mmattel authored Feb 19, 2019
2 parents 3969027 + d18012d commit 60f6e2a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ $(composer_deps): $(COMPOSER_BIN) composer.json composer.lock
php $(COMPOSER_BIN) install --no-dev

$(composer_dev_deps): $(COMPOSER_BIN) composer.json composer.lock
php $(COMPOSER_BIN) install --dev
php $(COMPOSER_BIN) install

.PHONY: install-composer-release-deps
install-composer-release-deps: $(composer_deps)
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.2",
"jakub-onderka/php-console-highlighter": "^0.4",
"mikey179/vfsStream": "^1.6",
"mikey179/vfsstream": "^1.6",
"phpunit/phpunit": "^5.7",
"roave/security-advisories": "dev-master"
},
Expand All @@ -41,13 +41,13 @@
"symfony/process": "^3.1",
"pimple/pimple": "3.2.3",
"nikic/php-parser": "1.4.1",
"icewind/Streams": "0.5.2",
"icewind/streams": "0.5.2",
"swiftmailer/swiftmailer": "^5.4",
"guzzlehttp/guzzle": "^5.3",
"league/flysystem": "^1.0",
"pear/pear-core-minimal": "^v1.10",
"interfasys/lognormalizer": "^v1.0",
"deepdiver1975/TarStreamer": "v0.1.0",
"deepdiver1975/tarstreamer": "v0.1.0",
"patchwork/jsqueeze": "^2.0",
"symfony/polyfill-php70": "^1.0",
"lukasreschke/id3parser": "^0.0.3",
Expand Down

0 comments on commit 60f6e2a

Please sign in to comment.