diff --git a/composer.json b/composer.json index 71cad5ba0d..b85ec6a46c 100755 --- a/composer.json +++ b/composer.json @@ -36,6 +36,10 @@ { "type": "vcs", "url": "https://github.com/ywarnier/iCalcreator" + }, + { + "type": "vcs", + "url": "https://github.com/jmontoyaa/PHPWord" } ], "require": { @@ -70,9 +74,9 @@ "sabre/vobject": "~3.1", "emojione/emojione": "1.3.0", - "zendframework/zend-config": "2.5.1", - "zendframework/zend-feed": "2.5.1", - "zendframework/zend-http": "2.5.1", + "zendframework/zend-config": "2.5.1|~2.6", + "zendframework/zend-feed": "2.5.1|~2.6", + "zendframework/zend-http": "2.5.1|~2.6", "ezyang/htmlpurifier": "4.6.0", "szymach/c-pchart": "2.0.4", @@ -99,7 +103,7 @@ "jeroendesloovere/vcard": "^1.2", "knplabs/doctrine-behaviors": "~1.1", "jimmiw/php-time-ago": "^0.4.14", - "phpoffice/phpword": "^0.12.1", + "phpoffice/phpword": "^0.12.1|dev-master", "facebook/php-sdk-v4" : "~5.0", "kigkonsult/icalcreator" : "0.1.0", "essence/essence": "2.6.1",