Updated dependency to cebe/markdown to version 1.0.x.

chameleon82 · Mar 6, 2015 · fc0d322 · fc0d322
1 parent e2d9131
commit fc0d322
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -77,7 +77,7 @@
         "lib-pcre": "*",
         "yiisoft/yii2-composer": "*",
         "ezyang/htmlpurifier": "4.6.*",
-        "cebe/markdown": "~1.0.0",
+        "cebe/markdown": "~1.0.0 | ~1.1.0",
         "bower-asset/jquery": "2.1.*@stable | 1.11.*@stable",
         "bower-asset/jquery.inputmask": "3.1.*",
         "bower-asset/punycode": "1.3.*",

diff --git a/extensions/apidoc/composer.json b/extensions/apidoc/composer.json
@@ -25,7 +25,7 @@
         "phpdocumentor/reflection-docblock": ">2.0.1",
         "nikic/php-parser": "0.9.*",
         "cebe/js-search": "*",
-        "cebe/markdown": "~1.0.0",
+        "cebe/markdown": "~1.0.0 | ~1.1.0",
         "cebe/markdown-latex": "~1.0.0"
     },
     "autoload": {

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -8,7 +8,7 @@ Yii Framework 2 Change Log
 - Enh #7488: Added `StringHelper::explode` to perform explode with trimming and skipping of empty elements (SilverFire, nineinchnick, creocoder, samdark)
 - Enh #7562: `yii help` now lists all sub-commands by default (callmez)
 - Enh: Added `yii\helper\Console::wrapText()` method to wrap indented text by console window width and used it in `yii help` command (cebe)
-
+- Chg: Updated dependency to `cebe/markdown` to version `1.1.x` (cebe)
 
 2.0.3 March 01, 2015
 --------------------

diff --git a/framework/UPGRADE.md b/framework/UPGRADE.md
@@ -8,6 +8,17 @@ if you want to upgrade from version A to version C and there is
 version B between A and C, you need to following the instructions
 for both A and B.
 
+Upgrade from Yii 2.0.3
+----------------------
+
+* Updated dependency to `cebe/markdown` to version `1.0.x`.
+  If you need stick with 1.0.x, you can specify that in your `composer.json` by
+  adding the following line in the `require` section:
+
+  ```json
+  "cebe/markdown": "~1.0.0",
+  ```
+
 Upgrade from Yii 2.0.2
 ----------------------
 

diff --git a/framework/composer.json b/framework/composer.json
@@ -57,7 +57,7 @@
         "lib-pcre": "*",
         "yiisoft/yii2-composer": "*",
         "ezyang/htmlpurifier": "4.6.*",
-        "cebe/markdown": "~1.0.0",
+        "cebe/markdown": "~1.0.0 | ~1.1.0",
         "bower-asset/jquery": "2.1.*@stable | 1.11.*@stable",
         "bower-asset/jquery.inputmask": "3.1.*",
         "bower-asset/punycode": "1.3.*",