dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix undefined variable passed by reference to a hook
[lhc/web/wiklou.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index
489c299
..
6d90d3e
100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-21,16
+21,18
@@
"ext-iconv": "*",
"liuggio/statsd-php-client": "1.0.16",
"mediawiki/at-ease": "1.1.0",
"ext-iconv": "*",
"liuggio/statsd-php-client": "1.0.16",
"mediawiki/at-ease": "1.1.0",
- "oojs/oojs-ui": "0.13.
0
",
+ "oojs/oojs-ui": "0.13.
3
",
"oyejorge/less.php": "1.7.0.9",
"php": ">=5.3.3",
"psr/log": "1.0.0",
"wikimedia/assert": "0.2.2",
"oyejorge/less.php": "1.7.0.9",
"php": ">=5.3.3",
"psr/log": "1.0.0",
"wikimedia/assert": "0.2.2",
+ "wikimedia/base-convert": "1.0.1",
"wikimedia/cdb": "1.3.0",
"wikimedia/cldr-plural-rule-parser": "1.0.0",
"wikimedia/cdb": "1.3.0",
"wikimedia/cldr-plural-rule-parser": "1.0.0",
- "wikimedia/composer-merge-plugin": "1.
2.1
",
+ "wikimedia/composer-merge-plugin": "1.
3.0
",
"wikimedia/ip-set": "1.0.1",
"wikimedia/relpath": "1.0.3",
"wikimedia/ip-set": "1.0.1",
"wikimedia/relpath": "1.0.3",
+ "wikimedia/running-stat": "1.1.0",
"wikimedia/utfnormal": "1.0.3",
"wikimedia/wrappedstring": "2.0.0",
"zordius/lightncandy": "0.21"
"wikimedia/utfnormal": "1.0.3",
"wikimedia/wrappedstring": "2.0.0",
"zordius/lightncandy": "0.21"
@@
-39,7
+41,7
@@
"jakub-onderka/php-parallel-lint": "0.9",
"justinrainbow/json-schema": "~1.3",
"mediawiki/mediawiki-codesniffer": "0.4.0",
"jakub-onderka/php-parallel-lint": "0.9",
"justinrainbow/json-schema": "~1.3",
"mediawiki/mediawiki-codesniffer": "0.4.0",
- "monolog/monolog": "
1.14.0
",
+ "monolog/monolog": "
~1.17.2
",
"nmred/kafka-php": "0.1.4",
"phpunit/phpunit": "3.7.37",
"wikimedia/avro": "1.7.7"
"nmred/kafka-php": "0.1.4",
"phpunit/phpunit": "3.7.37",
"wikimedia/avro": "1.7.7"
@@
-80,7
+82,8
@@
"merge-plugin": {
"include": [
"composer.local.json"
"merge-plugin": {
"include": [
"composer.local.json"
- ]
+ ],
+ "merge-dev": false
}
}
}
}
}
}