Browse Source

require erusev/parsedown 转换markdown

baijunyao 8 years ago
parent
commit
e8e72a39af
3 changed files with 48 additions and 7 deletions
  1. 0 2
      app/Http/Controllers/Admin/IndexController.php
  2. 4 3
      composer.json
  3. 44 2
      composer.lock

+ 0 - 2
app/Http/Controllers/Admin/IndexController.php

@@ -13,8 +13,6 @@ use App\Models\Comment;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use League\HTMLToMarkdown\HtmlConverter;
-use Markdownify\Converter;
-use Markdownify\ConverterExtra;
 
 class IndexController extends Controller
 {

+ 4 - 3
composer.json

@@ -7,14 +7,15 @@
     "require": {
         "php": ">=5.6.4",
         "barryvdh/laravel-ide-helper": "^2.3",
+        "erusev/parsedown": "^1.6",
         "intervention/image": "^2.3",
         "laravel/framework": "5.3.*",
+        "laravel/socialite": "~2.0",
         "league/html-to-markdown": "^4.4",
         "mews/purifier": "^2.0",
         "pixel418/markdownify": "^2.2",
-        "laravel/socialite": "~2.0",
-        "socialiteproviders/weibo": "~2.0",
-        "socialiteproviders/qq": "~2.0"
+        "socialiteproviders/qq": "~2.0",
+        "socialiteproviders/weibo": "~2.0"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",

+ 44 - 2
composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "f846c0e8e4ec7dcce8a45c71fbe6a0c8",
-    "content-hash": "8d543852bb545001ea7e48525b86b119",
+    "hash": "f81bd6260fda61587c56b6b0997259ff",
+    "content-hash": "60d67442588b253eec3f7d8dbf1d492d",
     "packages": [
         {
             "name": "barryvdh/laravel-ide-helper",
@@ -277,6 +277,48 @@
             "time": "2015-11-06 14:35:42"
         },
         {
+            "name": "erusev/parsedown",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/erusev/parsedown.git",
+                "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://files.phpcomposer.com/files/erusev/parsedown/20ff8bbb57205368b4b42d094642a3e52dac85fb.zip",
+                "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Parsedown": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Emanuil Rusev",
+                    "email": "hello@erusev.com",
+                    "homepage": "http://erusev.com"
+                }
+            ],
+            "description": "Parser for Markdown.",
+            "homepage": "http://parsedown.org",
+            "keywords": [
+                "markdown",
+                "parser"
+            ],
+            "time": "2016-11-02 15:56:58"
+        },
+        {
             "name": "ezyang/htmlpurifier",
             "version": "v4.8.0",
             "source": {