From d07db994686975f4052fe6bf771b8c6ab92d667b Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Mon, 20 May 2013 21:15:55 +0400 Subject: [PATCH 1/2] "vendor-dir": "vendor" is default, removed --- apps/bootstrap/composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/bootstrap/composer.json b/apps/bootstrap/composer.json index 86e399b..b2300b2 100644 --- a/apps/bootstrap/composer.json +++ b/apps/bootstrap/composer.json @@ -12,9 +12,6 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "config": { - "vendor-dir": "vendor" - }, "minimum-stability": "dev", "require": { "php": ">=5.3.0", From a856ddb613cb5a0070c583bc4d6d3f0f36ef7808 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Mon, 20 May 2013 21:37:14 +0400 Subject: [PATCH 2/2] moved optional packages to "suggest", updated platform requirements --- yii/composer.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/yii/composer.json b/yii/composer.json index eb4c734..c8c0dd3 100644 --- a/yii/composer.json +++ b/yii/composer.json @@ -64,10 +64,14 @@ "source": "https://github.com/yiisoft/yii2" }, "require": { - "php": ">=5.3.0", - "michelf/php-markdown": "1.3", - "twig/twig": "1.12.*", - "smarty/smarty": "3.1.*", - "ezyang/htmlpurifier": "v4.5.0" + "php": ">=5.3.11", + "ext-mbstring": "*", + "lib-pcre": "*" + }, + "suggest": { + "michelf/php-markdown": "Required for Markdown helper.", + "twig/twig": "Required for TwigViewRenderer.", + "smarty/smarty": "Required for SmartyViewRenderer.", + "ezyang/htmlpurifier": "Required for Purifier helper." } }