summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornashe <thomas@chauchefoin.fr>2017-07-08 00:08:18 +0100
committernashe <thomas@chauchefoin.fr>2017-07-08 00:08:18 +0100
commita8e83c31b1c2d34a2b9fc755f69703f8e8ffa22f (patch)
tree95b7df85b4e7c8789d33ae298ffac664280e5025
parente4a727590e003460599903fd13f7fdb48796f2d8 (diff)
downloadplanet-a8e83c31b1c2d34a2b9fc755f69703f8e8ffa22f.tar
planet-a8e83c31b1c2d34a2b9fc755f69703f8e8ffa22f.tar.gz
planet-a8e83c31b1c2d34a2b9fc755f69703f8e8ffa22f.tar.bz2
planet-a8e83c31b1c2d34a2b9fc755f69703f8e8ffa22f.tar.xz
planet-a8e83c31b1c2d34a2b9fc755f69703f8e8ffa22f.zip
Tag hhvm requirement as "conflict"
-rw-r--r--composer.json8
1 files changed, 6 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index c2c24e6..957fa34 100644
--- a/composer.json
+++ b/composer.json
@@ -12,9 +12,10 @@
],
"minimum-stability": "stable",
"require": {
- "simplepie/simplepie": "1.3.1",
"php": ">= 5.4",
- "mustangostang/spyc": "0.5.1"
+ "hhvm": "^3.0",
+ "mustangostang/spyc": "0.5.1",
+ "simplepie/simplepie": "1.3.1"
},
"require-dev": {
"guzzlehttp/guzzle": "5.*",
@@ -31,5 +32,8 @@
"app/lib/lib.opml.php",
"app/lib/Cache.php"
]
+ },
+ "conflict": {
+ "hhvm": "*"
}
}