Skip to content

Commit

Permalink
Update Parsedown library
Browse files Browse the repository at this point in the history
  • Loading branch information
@fguillot
fguillot committed Apr 20, 2018
1 parent 32a95ce commit bb406d5
Show file tree
Hide file tree
Showing 123 changed files with 372 additions and 1,225 deletions.
7 changes: 3 additions & 4 deletions app/Core/Markdown.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ protected function inlineUserLink(array $Excerpt)
$user = $this->container['userCacheDecorator']->getByUsername($username);

if (! empty($user)) {
$url = $this->container['helper']->url->href('UserViewController', 'profile', array('user_id' => $user['id']));
$url = $this->container['helper']->url->to('UserViewController', 'profile', array('user_id' => $user['id']));

return array(
'extent' => strlen($username) + 1,
Expand Down Expand Up @@ -124,14 +124,13 @@ private function buildTaskLink($task_id)
$token = $this->container['memoryCache']->proxy($this->container['taskFinderModel'], 'getProjectToken', $task_id);

if (! empty($token)) {
return $this->container['helper']->url->href(
return $this->container['helper']->url->to(
'TaskViewController',
'readonly',
array(
'token' => $token,
'task_id' => $task_id,
),
false,
'',
true
);
Expand All @@ -140,7 +139,7 @@ private function buildTaskLink($task_id)
return '';
}

return $this->container['helper']->url->href(
return $this->container['helper']->url->to(
'TaskViewController',
'show',
array('task_id' => $task_id)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"ext-session" : "*",
"christian-riesen/otp" : "1.4.3",
"eluceo/ical": "0.10.1",
"erusev/parsedown" : "1.6.0",
"erusev/parsedown" : "1.7.1",
"fguillot/json-rpc" : "1.2.1",
"fguillot/picodb" : "v1.0.18",
"paragonie/random_compat": "2.0.11",
Expand Down
42 changes: 25 additions & 17 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/composer/autoload_classmap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,6 @@
'PHPQRCode\\QRstr' => $vendorDir . '/aferrandini/phpqrcode/lib/PHPQRCode/QRstr.php',
'PHPQRCode\\QRtools' => $vendorDir . '/aferrandini/phpqrcode/lib/PHPQRCode/QRtools.php',
'Parsedown' => $vendorDir . '/erusev/parsedown/Parsedown.php',
'ParsedownTest' => $vendorDir . '/erusev/parsedown/test/ParsedownTest.php',
'PicoDb\\Builder\\BaseBuilder' => $vendorDir . '/fguillot/picodb/lib/PicoDb/Builder/BaseBuilder.php',
'PicoDb\\Builder\\ConditionBuilder' => $vendorDir . '/fguillot/picodb/lib/PicoDb/Builder/ConditionBuilder.php',
'PicoDb\\Builder\\InsertBuilder' => $vendorDir . '/fguillot/picodb/lib/PicoDb/Builder/InsertBuilder.php',
Expand Down
1 change: 0 additions & 1 deletion vendor/composer/autoload_static.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,6 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
'PHPQRCode\\QRstr' => __DIR__ . '/..' . '/aferrandini/phpqrcode/lib/PHPQRCode/QRstr.php',
'PHPQRCode\\QRtools' => __DIR__ . '/..' . '/aferrandini/phpqrcode/lib/PHPQRCode/QRtools.php',
'Parsedown' => __DIR__ . '/..' . '/erusev/parsedown/Parsedown.php',
'ParsedownTest' => __DIR__ . '/..' . '/erusev/parsedown/test/ParsedownTest.php',
'PicoDb\\Builder\\BaseBuilder' => __DIR__ . '/..' . '/fguillot/picodb/lib/PicoDb/Builder/BaseBuilder.php',
'PicoDb\\Builder\\ConditionBuilder' => __DIR__ . '/..' . '/fguillot/picodb/lib/PicoDb/Builder/ConditionBuilder.php',
'PicoDb\\Builder\\InsertBuilder' => __DIR__ . '/..' . '/fguillot/picodb/lib/PicoDb/Builder/InsertBuilder.php',
Expand Down
104 changes: 56 additions & 48 deletions vendor/composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
"barcode",
"php",
"qrcode"
]
],
"abandoned": "endroid/qr-code"
},
{
"name": "christian-riesen/base32",
Expand Down Expand Up @@ -209,47 +210,6 @@
"php calendar"
]
},
{
"name": "erusev/parsedown",
"version": "1.6.0",
"version_normalized": "1.6.0.0",
"source": {
"type": "git",
"url": "https://github.com/erusev/parsedown.git",
"reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/erusev/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
"reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
"shasum": ""
},
"time": "2015-10-04T16:44:32+00:00",
"type": "library",
"installation-source": "dist",
"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"
]
},
{
"name": "fguillot/json-rpc",
"version": "v1.2.1",
Expand Down Expand Up @@ -901,25 +861,73 @@
"description": "Minimalist database query builder",
"homepage": "https://github.com/fguillot/picoDb"
},
{
"name": "erusev/parsedown",
"version": "1.7.1",
"version_normalized": "1.7.1.0",
"source": {
"type": "git",
"url": "https://github.com/erusev/parsedown.git",
"reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
"reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": ">=5.3.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35"
},
"time": "2018-03-08T01:11:30+00:00",
"type": "library",
"installation-source": "dist",
"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"
]
},
{
"name": "symfony/finder",
"version": "v3.4.7",
"version_normalized": "3.4.7.0",
"version": "v3.4.8",
"version_normalized": "3.4.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "7a2e1299cc0c4162996f18e347b6356729a55317"
"reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/7a2e1299cc0c4162996f18e347b6356729a55317",
"reference": "7a2e1299cc0c4162996f18e347b6356729a55317",
"url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433",
"reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8"
},
"time": "2018-03-28T18:23:39+00:00",
"time": "2018-04-04T05:07:11+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down
16 changes: 0 additions & 16 deletions vendor/erusev/parsedown/.travis.yml
View file

This file was deleted.

4 changes: 2 additions & 2 deletions vendor/erusev/parsedown/LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013 Emanuil Rusev, erusev.com
Copyright (c) 2013-2018 Emanuil Rusev, erusev.com

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand All @@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Loading

0 comments on commit bb406d5

Please sign in to comment.