aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2018-03-31 12:50:03 +0200
committerArthurHoaro <arthur@hoa.ro>2018-03-31 13:00:13 +0200
commitc5ee13181ef9b0cd09886051aaf0754859090e76 (patch)
tree6963dbebc3df8f80a0dcbe24bdddb480a2baabd3
parentb66769fec544d16bbe0641d3958a738c1b042ef9 (diff)
downloadShaarli-c5ee13181ef9b0cd09886051aaf0754859090e76.tar.gz
Shaarli-c5ee13181ef9b0cd09886051aaf0754859090e76.tar.zst
Shaarli-c5ee13181ef9b0cd09886051aaf0754859090e76.zip
Update parsedown to its latest version instead of fixed 1.6
-rw-r--r--composer.json2
-rw-r--r--composer.lock125
-rw-r--r--tests/plugins/resources/markdown.html4
3 files changed, 71 insertions, 60 deletions
diff --git a/composer.json b/composer.json
index bbef28af..15e082f8 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
17 "require": { 17 "require": {
18 "php": ">=5.6", 18 "php": ">=5.6",
19 "shaarli/netscape-bookmark-parser": "^2.0", 19 "shaarli/netscape-bookmark-parser": "^2.0",
20 "erusev/parsedown": "1.6", 20 "erusev/parsedown": "^1.6",
21 "slim/slim": "^3.0", 21 "slim/slim": "^3.0",
22 "pubsubhubbub/publisher": "dev-master", 22 "pubsubhubbub/publisher": "dev-master",
23 "gettext/gettext": "^4.4" 23 "gettext/gettext": "^4.4"
diff --git a/composer.lock b/composer.lock
index 0a3fbd83..ee762c0e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "content-hash": "bc39afd7f6d37c76509f96bea69f6131", 7 "content-hash": "308a35eab91602fbb449f2c669c445ed",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "container-interop/container-interop", 10 "name": "container-interop/container-interop",
@@ -39,18 +39,25 @@
39 }, 39 },
40 { 40 {
41 "name": "erusev/parsedown", 41 "name": "erusev/parsedown",
42 "version": "1.6.0", 42 "version": "1.7.1",
43 "source": { 43 "source": {
44 "type": "git", 44 "type": "git",
45 "url": "https://github.com/erusev/parsedown.git", 45 "url": "https://github.com/erusev/parsedown.git",
46 "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7" 46 "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1"
47 }, 47 },
48 "dist": { 48 "dist": {
49 "type": "zip", 49 "type": "zip",
50 "url": "https://api.github.com/repos/erusev/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7", 50 "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
51 "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7", 51 "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
52 "shasum": "" 52 "shasum": ""
53 }, 53 },
54 "require": {
55 "ext-mbstring": "*",
56 "php": ">=5.3.0"
57 },
58 "require-dev": {
59 "phpunit/phpunit": "^4.8.35"
60 },
54 "type": "library", 61 "type": "library",
55 "autoload": { 62 "autoload": {
56 "psr-0": { 63 "psr-0": {
@@ -74,20 +81,20 @@
74 "markdown", 81 "markdown",
75 "parser" 82 "parser"
76 ], 83 ],
77 "time": "2015-10-04T16:44:32+00:00" 84 "time": "2018-03-08T01:11:30+00:00"
78 }, 85 },
79 { 86 {
80 "name": "gettext/gettext", 87 "name": "gettext/gettext",
81 "version": "v4.4.3", 88 "version": "v4.4.4",
82 "source": { 89 "source": {
83 "type": "git", 90 "type": "git",
84 "url": "https://github.com/oscarotero/Gettext.git", 91 "url": "https://github.com/oscarotero/Gettext.git",
85 "reference": "4f57f004635cc6311a20815ebfdc0757cb337113" 92 "reference": "ab5e863de2f60806d02e6e6081e21efd45249168"
86 }, 93 },
87 "dist": { 94 "dist": {
88 "type": "zip", 95 "type": "zip",
89 "url": "https://api.github.com/repos/oscarotero/Gettext/zipball/4f57f004635cc6311a20815ebfdc0757cb337113", 96 "url": "https://api.github.com/repos/oscarotero/Gettext/zipball/ab5e863de2f60806d02e6e6081e21efd45249168",
90 "reference": "4f57f004635cc6311a20815ebfdc0757cb337113", 97 "reference": "ab5e863de2f60806d02e6e6081e21efd45249168",
91 "shasum": "" 98 "shasum": ""
92 }, 99 },
93 "require": { 100 "require": {
@@ -136,7 +143,7 @@
136 "po", 143 "po",
137 "translation" 144 "translation"
138 ], 145 ],
139 "time": "2017-08-09T16:59:46+00:00" 146 "time": "2018-02-21T18:49:59+00:00"
140 }, 147 },
141 { 148 {
142 "name": "gettext/languages", 149 "name": "gettext/languages",
@@ -251,21 +258,24 @@
251 }, 258 },
252 { 259 {
253 "name": "nikic/fast-route", 260 "name": "nikic/fast-route",
254 "version": "v1.2.0", 261 "version": "v1.3.0",
255 "source": { 262 "source": {
256 "type": "git", 263 "type": "git",
257 "url": "https://github.com/nikic/FastRoute.git", 264 "url": "https://github.com/nikic/FastRoute.git",
258 "reference": "b5f95749071c82a8e0f58586987627054400cdf6" 265 "reference": "181d480e08d9476e61381e04a71b34dc0432e812"
259 }, 266 },
260 "dist": { 267 "dist": {
261 "type": "zip", 268 "type": "zip",
262 "url": "https://api.github.com/repos/nikic/FastRoute/zipball/b5f95749071c82a8e0f58586987627054400cdf6", 269 "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812",
263 "reference": "b5f95749071c82a8e0f58586987627054400cdf6", 270 "reference": "181d480e08d9476e61381e04a71b34dc0432e812",
264 "shasum": "" 271 "shasum": ""
265 }, 272 },
266 "require": { 273 "require": {
267 "php": ">=5.4.0" 274 "php": ">=5.4.0"
268 }, 275 },
276 "require-dev": {
277 "phpunit/phpunit": "^4.8.35|~5.7"
278 },
269 "type": "library", 279 "type": "library",
270 "autoload": { 280 "autoload": {
271 "psr-4": { 281 "psr-4": {
@@ -290,7 +300,7 @@
290 "router", 300 "router",
291 "routing" 301 "routing"
292 ], 302 ],
293 "time": "2017-01-19T11:35:12+00:00" 303 "time": "2018-02-13T20:26:39+00:00"
294 }, 304 },
295 { 305 {
296 "name": "pimple/pimple", 306 "name": "pimple/pimple",
@@ -1012,16 +1022,16 @@
1012 }, 1022 },
1013 { 1023 {
1014 "name": "phpspec/prophecy", 1024 "name": "phpspec/prophecy",
1015 "version": "1.7.3", 1025 "version": "1.7.5",
1016 "source": { 1026 "source": {
1017 "type": "git", 1027 "type": "git",
1018 "url": "https://github.com/phpspec/prophecy.git", 1028 "url": "https://github.com/phpspec/prophecy.git",
1019 "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" 1029 "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
1020 }, 1030 },
1021 "dist": { 1031 "dist": {
1022 "type": "zip", 1032 "type": "zip",
1023 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", 1033 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
1024 "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", 1034 "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
1025 "shasum": "" 1035 "shasum": ""
1026 }, 1036 },
1027 "require": { 1037 "require": {
@@ -1033,7 +1043,7 @@
1033 }, 1043 },
1034 "require-dev": { 1044 "require-dev": {
1035 "phpspec/phpspec": "^2.5|^3.2", 1045 "phpspec/phpspec": "^2.5|^3.2",
1036 "phpunit/phpunit": "^4.8.35 || ^5.7" 1046 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
1037 }, 1047 },
1038 "type": "library", 1048 "type": "library",
1039 "extra": { 1049 "extra": {
@@ -1071,7 +1081,7 @@
1071 "spy", 1081 "spy",
1072 "stub" 1082 "stub"
1073 ], 1083 ],
1074 "time": "2017-11-24T13:59:53+00:00" 1084 "time": "2018-02-19T10:16:54+00:00"
1075 }, 1085 },
1076 { 1086 {
1077 "name": "phpunit/php-code-coverage", 1087 "name": "phpunit/php-code-coverage",
@@ -2197,16 +2207,16 @@
2197 }, 2207 },
2198 { 2208 {
2199 "name": "symfony/config", 2209 "name": "symfony/config",
2200 "version": "v3.4.4", 2210 "version": "v3.4.6",
2201 "source": { 2211 "source": {
2202 "type": "git", 2212 "type": "git",
2203 "url": "https://github.com/symfony/config.git", 2213 "url": "https://github.com/symfony/config.git",
2204 "reference": "72689b934d6c6ecf73eca874e98933bf055313c9" 2214 "reference": "05e10567b529476a006b00746c5f538f1636810e"
2205 }, 2215 },
2206 "dist": { 2216 "dist": {
2207 "type": "zip", 2217 "type": "zip",
2208 "url": "https://api.github.com/repos/symfony/config/zipball/72689b934d6c6ecf73eca874e98933bf055313c9", 2218 "url": "https://api.github.com/repos/symfony/config/zipball/05e10567b529476a006b00746c5f538f1636810e",
2209 "reference": "72689b934d6c6ecf73eca874e98933bf055313c9", 2219 "reference": "05e10567b529476a006b00746c5f538f1636810e",
2210 "shasum": "" 2220 "shasum": ""
2211 }, 2221 },
2212 "require": { 2222 "require": {
@@ -2219,6 +2229,7 @@
2219 }, 2229 },
2220 "require-dev": { 2230 "require-dev": {
2221 "symfony/dependency-injection": "~3.3|~4.0", 2231 "symfony/dependency-injection": "~3.3|~4.0",
2232 "symfony/event-dispatcher": "~3.3|~4.0",
2222 "symfony/finder": "~3.3|~4.0", 2233 "symfony/finder": "~3.3|~4.0",
2223 "symfony/yaml": "~3.0|~4.0" 2234 "symfony/yaml": "~3.0|~4.0"
2224 }, 2235 },
@@ -2255,20 +2266,20 @@
2255 ], 2266 ],
2256 "description": "Symfony Config Component", 2267 "description": "Symfony Config Component",
2257 "homepage": "https://symfony.com", 2268 "homepage": "https://symfony.com",
2258 "time": "2018-01-21T19:05:02+00:00" 2269 "time": "2018-02-14T10:03:57+00:00"
2259 }, 2270 },
2260 { 2271 {
2261 "name": "symfony/console", 2272 "name": "symfony/console",
2262 "version": "v3.4.4", 2273 "version": "v3.4.6",
2263 "source": { 2274 "source": {
2264 "type": "git", 2275 "type": "git",
2265 "url": "https://github.com/symfony/console.git", 2276 "url": "https://github.com/symfony/console.git",
2266 "reference": "26b6f419edda16c19775211987651cb27baea7f1" 2277 "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7"
2267 }, 2278 },
2268 "dist": { 2279 "dist": {
2269 "type": "zip", 2280 "type": "zip",
2270 "url": "https://api.github.com/repos/symfony/console/zipball/26b6f419edda16c19775211987651cb27baea7f1", 2281 "url": "https://api.github.com/repos/symfony/console/zipball/067339e9b8ec30d5f19f5950208893ff026b94f7",
2271 "reference": "26b6f419edda16c19775211987651cb27baea7f1", 2282 "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7",
2272 "shasum": "" 2283 "shasum": ""
2273 }, 2284 },
2274 "require": { 2285 "require": {
@@ -2324,20 +2335,20 @@
2324 ], 2335 ],
2325 "description": "Symfony Console Component", 2336 "description": "Symfony Console Component",
2326 "homepage": "https://symfony.com", 2337 "homepage": "https://symfony.com",
2327 "time": "2018-01-29T09:03:43+00:00" 2338 "time": "2018-02-26T15:46:28+00:00"
2328 }, 2339 },
2329 { 2340 {
2330 "name": "symfony/debug", 2341 "name": "symfony/debug",
2331 "version": "v3.4.4", 2342 "version": "v3.4.6",
2332 "source": { 2343 "source": {
2333 "type": "git", 2344 "type": "git",
2334 "url": "https://github.com/symfony/debug.git", 2345 "url": "https://github.com/symfony/debug.git",
2335 "reference": "53f6af2805daf52a43b393b93d2f24925d35c937" 2346 "reference": "9b1071f86e79e1999b3d3675d2e0e7684268b9bc"
2336 }, 2347 },
2337 "dist": { 2348 "dist": {
2338 "type": "zip", 2349 "type": "zip",
2339 "url": "https://api.github.com/repos/symfony/debug/zipball/53f6af2805daf52a43b393b93d2f24925d35c937", 2350 "url": "https://api.github.com/repos/symfony/debug/zipball/9b1071f86e79e1999b3d3675d2e0e7684268b9bc",
2340 "reference": "53f6af2805daf52a43b393b93d2f24925d35c937", 2351 "reference": "9b1071f86e79e1999b3d3675d2e0e7684268b9bc",
2341 "shasum": "" 2352 "shasum": ""
2342 }, 2353 },
2343 "require": { 2354 "require": {
@@ -2380,20 +2391,20 @@
2380 ], 2391 ],
2381 "description": "Symfony Debug Component", 2392 "description": "Symfony Debug Component",
2382 "homepage": "https://symfony.com", 2393 "homepage": "https://symfony.com",
2383 "time": "2018-01-18T22:16:57+00:00" 2394 "time": "2018-02-28T21:49:22+00:00"
2384 }, 2395 },
2385 { 2396 {
2386 "name": "symfony/dependency-injection", 2397 "name": "symfony/dependency-injection",
2387 "version": "v3.4.4", 2398 "version": "v3.4.6",
2388 "source": { 2399 "source": {
2389 "type": "git", 2400 "type": "git",
2390 "url": "https://github.com/symfony/dependency-injection.git", 2401 "url": "https://github.com/symfony/dependency-injection.git",
2391 "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d" 2402 "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07"
2392 }, 2403 },
2393 "dist": { 2404 "dist": {
2394 "type": "zip", 2405 "type": "zip",
2395 "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/4b2717ee2499390e371e1fc7abaf886c1c83e83d", 2406 "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/12e901abc1cb0d637a0e5abe9923471361d96b07",
2396 "reference": "4b2717ee2499390e371e1fc7abaf886c1c83e83d", 2407 "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07",
2397 "shasum": "" 2408 "shasum": ""
2398 }, 2409 },
2399 "require": { 2410 "require": {
@@ -2451,20 +2462,20 @@
2451 ], 2462 ],
2452 "description": "Symfony DependencyInjection Component", 2463 "description": "Symfony DependencyInjection Component",
2453 "homepage": "https://symfony.com", 2464 "homepage": "https://symfony.com",
2454 "time": "2018-01-29T09:16:57+00:00" 2465 "time": "2018-03-04T03:54:53+00:00"
2455 }, 2466 },
2456 { 2467 {
2457 "name": "symfony/filesystem", 2468 "name": "symfony/filesystem",
2458 "version": "v3.4.4", 2469 "version": "v3.4.6",
2459 "source": { 2470 "source": {
2460 "type": "git", 2471 "type": "git",
2461 "url": "https://github.com/symfony/filesystem.git", 2472 "url": "https://github.com/symfony/filesystem.git",
2462 "reference": "e078773ad6354af38169faf31c21df0f18ace03d" 2473 "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541"
2463 }, 2474 },
2464 "dist": { 2475 "dist": {
2465 "type": "zip", 2476 "type": "zip",
2466 "url": "https://api.github.com/repos/symfony/filesystem/zipball/e078773ad6354af38169faf31c21df0f18ace03d", 2477 "url": "https://api.github.com/repos/symfony/filesystem/zipball/253a4490b528597aa14d2bf5aeded6f5e5e4a541",
2467 "reference": "e078773ad6354af38169faf31c21df0f18ace03d", 2478 "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541",
2468 "shasum": "" 2479 "shasum": ""
2469 }, 2480 },
2470 "require": { 2481 "require": {
@@ -2500,20 +2511,20 @@
2500 ], 2511 ],
2501 "description": "Symfony Filesystem Component", 2512 "description": "Symfony Filesystem Component",
2502 "homepage": "https://symfony.com", 2513 "homepage": "https://symfony.com",
2503 "time": "2018-01-03T07:37:34+00:00" 2514 "time": "2018-02-22T10:48:49+00:00"
2504 }, 2515 },
2505 { 2516 {
2506 "name": "symfony/finder", 2517 "name": "symfony/finder",
2507 "version": "v3.4.4", 2518 "version": "v3.4.6",
2508 "source": { 2519 "source": {
2509 "type": "git", 2520 "type": "git",
2510 "url": "https://github.com/symfony/finder.git", 2521 "url": "https://github.com/symfony/finder.git",
2511 "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f" 2522 "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625"
2512 }, 2523 },
2513 "dist": { 2524 "dist": {
2514 "type": "zip", 2525 "type": "zip",
2515 "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f", 2526 "url": "https://api.github.com/repos/symfony/finder/zipball/a479817ce0a9e4adfd7d39c6407c95d97c254625",
2516 "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f", 2527 "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625",
2517 "shasum": "" 2528 "shasum": ""
2518 }, 2529 },
2519 "require": { 2530 "require": {
@@ -2549,7 +2560,7 @@
2549 ], 2560 ],
2550 "description": "Symfony Finder Component", 2561 "description": "Symfony Finder Component",
2551 "homepage": "https://symfony.com", 2562 "homepage": "https://symfony.com",
2552 "time": "2018-01-03T07:37:34+00:00" 2563 "time": "2018-03-05T18:28:11+00:00"
2553 }, 2564 },
2554 { 2565 {
2555 "name": "symfony/polyfill-mbstring", 2566 "name": "symfony/polyfill-mbstring",
@@ -2612,16 +2623,16 @@
2612 }, 2623 },
2613 { 2624 {
2614 "name": "symfony/yaml", 2625 "name": "symfony/yaml",
2615 "version": "v3.4.4", 2626 "version": "v3.4.6",
2616 "source": { 2627 "source": {
2617 "type": "git", 2628 "type": "git",
2618 "url": "https://github.com/symfony/yaml.git", 2629 "url": "https://github.com/symfony/yaml.git",
2619 "reference": "eab73b6c21d27ae4cd037c417618dfd4befb0bfe" 2630 "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb"
2620 }, 2631 },
2621 "dist": { 2632 "dist": {
2622 "type": "zip", 2633 "type": "zip",
2623 "url": "https://api.github.com/repos/symfony/yaml/zipball/eab73b6c21d27ae4cd037c417618dfd4befb0bfe", 2634 "url": "https://api.github.com/repos/symfony/yaml/zipball/6af42631dcf89e9c616242c900d6c52bd53bd1bb",
2624 "reference": "eab73b6c21d27ae4cd037c417618dfd4befb0bfe", 2635 "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb",
2625 "shasum": "" 2636 "shasum": ""
2626 }, 2637 },
2627 "require": { 2638 "require": {
@@ -2666,7 +2677,7 @@
2666 ], 2677 ],
2667 "description": "Symfony Yaml Component", 2678 "description": "Symfony Yaml Component",
2668 "homepage": "https://symfony.com", 2679 "homepage": "https://symfony.com",
2669 "time": "2018-01-21T19:05:02+00:00" 2680 "time": "2018-02-16T09:50:28+00:00"
2670 }, 2681 },
2671 { 2682 {
2672 "name": "theseer/fdomdocument", 2683 "name": "theseer/fdomdocument",
diff --git a/tests/plugins/resources/markdown.html b/tests/plugins/resources/markdown.html
index 844a6f31..f1df4e7e 100644
--- a/tests/plugins/resources/markdown.html
+++ b/tests/plugins/resources/markdown.html
@@ -8,7 +8,7 @@
8</ul> 8</ul>
9<ol> 9<ol>
10<li><a href="http://link.tld">zero</a> 10<li><a href="http://link.tld">zero</a>
11<ol> 11<ol start="2">
12<li><a href="http://link.tld">two</a></li> 12<li><a href="http://link.tld">two</a></li>
13<li><a href="http://link.tld">three</a></li> 13<li><a href="http://link.tld">three</a></li>
14<li><a href="http://link.tld">four</a></li> 14<li><a href="http://link.tld">four</a></li>
@@ -29,5 +29,5 @@ next #foo</code></pre>
29<a href="https://test.tld/path/?query=value#hash">link</a><br /> 29<a href="https://test.tld/path/?query=value#hash">link</a><br />
30<a href="ftp://test.tld/path/?query=value#hash">link</a><br /> 30<a href="ftp://test.tld/path/?query=value#hash">link</a><br />
31<a href="magnet:test.tld/path/?query=value#hash">link</a><br /> 31<a href="magnet:test.tld/path/?query=value#hash">link</a><br />
32<a href="http://alert('xss')">link</a><br /> 32<a href="http://alert(&#039;xss&#039;)">link</a><br />
33<a href="http://test.tld/path/?query=value#hash">link</a></p></div> \ No newline at end of file 33<a href="http://test.tld/path/?query=value#hash">link</a></p></div> \ No newline at end of file