aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Kooman <fkooman@tuxed.net>2021-01-20 10:25:08 +0100
committerFrançois Kooman <fkooman@tuxed.net>2021-01-20 10:25:08 +0100
commit728834c2b7dd9b3bf0cbbb82a588665d68fb955a (patch)
tree5ff21f23d4ba5ab3a885a84092a281796c28f62b
parent103476227b4f966093417e68e98f402f99e1d845 (diff)
downloadwww.tuxed.net-728834c2b7dd9b3bf0cbbb82a588665d68fb955a.zip
www.tuxed.net-728834c2b7dd9b3bf0cbbb82a588665d68fb955a.tar.gz
www.tuxed.net-728834c2b7dd9b3bf0cbbb82a588665d68fb955a.tar.xz
update league/commonmark
-rw-r--r--bin/generate.php4
-rw-r--r--composer.json3
-rw-r--r--composer.lock411
3 files changed, 47 insertions, 371 deletions
diff --git a/bin/generate.php b/bin/generate.php
index 4c7400f..0c60ab0 100644
--- a/bin/generate.php
+++ b/bin/generate.php
@@ -6,8 +6,8 @@ $baseDir = dirname(__DIR__);
use fkooman\Template\Tpl;
use League\CommonMark\CommonMarkConverter;
use League\CommonMark\Environment;
-use League\CommonMark\Ext\SmartPunct\SmartPunctExtension;
-use League\CommonMark\Ext\Table\TableExtension;
+use League\CommonMark\Extension\SmartPunct\SmartPunctExtension;
+use League\CommonMark\Extension\Table\TableExtension;
$cgitRepoWebUrl = 'https://git.tuxed.net/fkooman/www.tuxed.net/';
$dateTime = new DateTime();
diff --git a/composer.json b/composer.json
index d8fc8ad..bb2ca6e 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,6 @@
],
"require": {
"fkooman/tpl": "dev-master",
- "league/commonmark": "^1",
- "league/commonmark-extras": "^1"
+ "league/commonmark": "^1"
}
}
diff --git a/composer.lock b/composer.lock
index 8a0ec4e..81c8e6e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "a68739cce0396fa57819b874db881b9a",
+ "content-hash": "c949322da362da62710cb8102e047ca7",
"packages": [
{
"name": "fkooman/tpl",
@@ -12,7 +12,7 @@
"source": {
"type": "git",
"url": "https://git.tuxed.net/fkooman/php-tpl",
- "reference": "f1b54e1577fde06bccac767aa4e884ee73258a1a"
+ "reference": "164daca4d080839cb81cb01c0b16a3d6df3dc756"
},
"require": {
"php": ">=5.4"
@@ -20,6 +20,7 @@
"require-dev": {
"phpunit/phpunit": "^4.8.35|^5|^6|^7"
},
+ "default-branch": true,
"type": "library",
"autoload": {
"psr-4": {
@@ -45,52 +46,46 @@
"email": "fkooman@tuxed.net",
"source": "https://git.tuxed.net/fkooman/php-tpl"
},
- "time": "2019-09-02T09:33:49+00:00"
+ "time": "2020-01-29T16:33:02+00:00"
},
{
"name": "league/commonmark",
- "version": "1.0.0",
+ "version": "1.5.7",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
- "reference": "7a40f2b0931602c504c2a9692d9f1e33635fd5ef"
+ "reference": "11df9b36fd4f1d2b727a73bf14931d81373b9a54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/7a40f2b0931602c504c2a9692d9f1e33635fd5ef",
- "reference": "7a40f2b0931602c504c2a9692d9f1e33635fd5ef",
+ "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/11df9b36fd4f1d2b727a73bf14931d81373b9a54",
+ "reference": "11df9b36fd4f1d2b727a73bf14931d81373b9a54",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
- "php": "^7.1"
+ "php": "^7.1 || ^8.0"
},
- "replace": {
- "colinodell/commonmark-php": "*"
+ "conflict": {
+ "scrutinizer/ocular": "1.7.*"
},
"require-dev": {
"cebe/markdown": "~1.0",
- "commonmark/commonmark.js": "0.29.0",
+ "commonmark/commonmark.js": "0.29.2",
"erusev/parsedown": "~1.0",
+ "ext-json": "*",
+ "github/gfm": "0.29.0",
"michelf/php-markdown": "~1.4",
"mikehaertl/php-shellcommand": "^1.4",
- "phpstan/phpstan-shim": "^0.11.5",
- "phpunit/phpunit": "^7.5",
+ "phpstan/phpstan": "^0.12",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.2",
"scrutinizer/ocular": "^1.5",
"symfony/finder": "^4.2"
},
- "suggest": {
- "league/commonmark-extras": "Library of useful extensions including smart punctuation"
- },
"bin": [
"bin/commonmark"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
"autoload": {
"psr-4": {
"League\\CommonMark\\": "src"
@@ -108,370 +103,51 @@
"role": "Lead Developer"
}
],
- "description": "PHP Markdown parser based on the CommonMark spec",
+ "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and Github-Flavored Markdown (GFM)",
"homepage": "https://commonmark.thephpleague.com",
"keywords": [
"commonmark",
- "markdown",
- "parser"
- ],
- "time": "2019-06-29T11:19:01+00:00"
- },
- {
- "name": "league/commonmark-ext-autolink",
- "version": "v1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/commonmark-ext-autolink.git",
- "reference": "9f6da88485412b1c37a982c9fee8f4fbc2fa5ade"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark-ext-autolink/zipball/9f6da88485412b1c37a982c9fee8f4fbc2fa5ade",
- "reference": "9f6da88485412b1c37a982c9fee8f4fbc2fa5ade",
- "shasum": ""
- },
- "require": {
- "league/commonmark": "^1.0",
- "php": "^7.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^7.5"
- },
- "type": "commonmark-extension",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "League\\CommonMark\\Ext\\Autolink\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Colin O'Dell",
- "email": "colinodell@gmail.com",
- "homepage": "https://www.colinodell.com",
- "role": "Lead Developer"
- }
- ],
- "description": "Extension for league/commonmark which autolinks URLs, emails, and @-mentions",
- "homepage": "https://github.com/thephpleague/commonmark-ext-autolink",
- "keywords": [
- "autolink",
- "commonmark",
- "extension",
+ "flavored",
"gfm",
"github",
+ "github-flavored",
"markdown",
- "twitter"
- ],
- "time": "2019-06-29T11:23:54+00:00"
- },
- {
- "name": "league/commonmark-ext-smartpunct",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/commonmark-ext-smartpunct.git",
- "reference": "3746a86c91903fe200999a992de064f87b352019"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark-ext-smartpunct/zipball/3746a86c91903fe200999a992de064f87b352019",
- "reference": "3746a86c91903fe200999a992de064f87b352019",
- "shasum": ""
- },
- "require": {
- "league/commonmark": "^1.0",
- "php": "^7.1"
- },
- "require-dev": {
- "jgm/smartpunct": "0.29",
- "phpunit/phpunit": "^7.5"
- },
- "type": "commonmark-extension",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "League\\CommonMark\\Ext\\SmartPunct\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Colin O'Dell",
- "email": "colinodell@gmail.com",
- "homepage": "https://www.colinodell.com",
- "role": "Lead Developer"
- }
- ],
- "description": "Intelligently converts ASCII quotes, dashes, and ellipses in Markdown to their Unicode equivalents",
- "homepage": "https://github.com/thephpleague/commonmark-ext-smartpunct",
- "keywords": [
- "commonmark",
- "extension",
- "markdown",
- "punctuation",
- "smartpunct"
+ "md",
+ "parser"
],
- "time": "2019-10-03T12:57:34+00:00"
- },
- {
- "name": "league/commonmark-ext-strikethrough",
- "version": "v1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/commonmark-ext-strikethrough.git",
- "reference": "99892ad549e101fe1fbe424ff71224efc32d2d68"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark-ext-strikethrough/zipball/99892ad549e101fe1fbe424ff71224efc32d2d68",
- "reference": "99892ad549e101fe1fbe424ff71224efc32d2d68",
- "shasum": ""
- },
- "require": {
- "ext-mbstring": "*",
- "league/commonmark": "^1.0",
- "php": "^7.1"
- },
- "replace": {
- "uafrica/commonmark-ext": ">=0.1.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^7.5"
- },
- "type": "commonmark-extension",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "League\\CommonMark\\Ext\\Strikethrough\\": "src/"
- }
+ "support": {
+ "docs": "https://commonmark.thephpleague.com/",
+ "issues": "https://github.com/thephpleague/commonmark/issues",
+ "rss": "https://github.com/thephpleague/commonmark/releases.atom",
+ "source": "https://github.com/thephpleague/commonmark"
},
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
+ "funding": [
{
- "name": "Colin O'Dell",
- "email": "colinodell@gmail.com"
+ "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
+ "type": "custom"
},
{
- "name": "Johan Meiring",
- "email": "johan@uafrica.com"
- }
- ],
- "description": "Strikethrough support for the PHP League's CommonMark Markdown parser",
- "homepage": "https://github.com/thephpleague/commonmark-ext-strikethrough",
- "keywords": [
- "commonmark",
- "extension",
- "markdown",
- "strikeout",
- "strikethrough"
- ],
- "time": "2019-06-29T11:34:00+00:00"
- },
- {
- "name": "league/commonmark-ext-table",
- "version": "v2.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/commonmark-ext-table.git",
- "reference": "3228888ea69636e855efcf6636ff8e6316933fe7"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark-ext-table/zipball/3228888ea69636e855efcf6636ff8e6316933fe7",
- "reference": "3228888ea69636e855efcf6636ff8e6316933fe7",
- "shasum": ""
- },
- "require": {
- "league/commonmark": "~0.19.3|^1.0",
- "php": "^7.1"
- },
- "require-dev": {
- "friendsofphp/php-cs-fixer": "^2.14",
- "phpstan/phpstan": "~0.11",
- "phpunit/phpunit": "^7.0|^8.0",
- "symfony/var-dumper": "^4.0",
- "vimeo/psalm": "^3.0"
- },
- "type": "commonmark-extension",
- "extra": {
- "branch-alias": {
- "dev-master": "2.2-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "League\\CommonMark\\Ext\\Table\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Martin Hasoň",
- "email": "martin.hason@gmail.com"
+ "url": "https://www.colinodell.com/sponsor",
+ "type": "custom"
},
{
- "name": "Webuni s.r.o.",
- "homepage": "https://www.webuni.cz"
+ "url": "https://www.paypal.me/colinpodell/10.00",
+ "type": "custom"
},
{
- "name": "Colin O'Dell",
- "email": "colinodell@gmail.com",
- "homepage": "https://www.colinodell.com"
- }
- ],
- "description": "Table extension for league/commonmark",
- "homepage": "https://github.com/thephpleague/commonmark-ext-table",
- "keywords": [
- "commonmark",
- "extension",
- "markdown",
- "table"
- ],
- "time": "2019-09-26T13:28:33+00:00"
- },
- {
- "name": "league/commonmark-ext-task-list",
- "version": "v1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/commonmark-ext-task-list.git",
- "reference": "9fe28f3527ab913b60d44bdc8d66829733cad7c6"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark-ext-task-list/zipball/9fe28f3527ab913b60d44bdc8d66829733cad7c6",
- "reference": "9fe28f3527ab913b60d44bdc8d66829733cad7c6",
- "shasum": ""
- },
- "require": {
- "league/commonmark": "^0.19|^1.0",
- "php": "^7.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^7.5"
- },
- "type": "commonmark-extension",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "League\\CommonMark\\Ext\\TaskList\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
+ "url": "https://github.com/colinodell",
+ "type": "github"
+ },
{
- "name": "Colin O'Dell",
- "email": "colinodell@gmail.com",
- "homepage": "https://www.colinodell.com",
- "role": "Lead Developer"
- }
- ],
- "description": "Extension for league/commonmark which supports GFM-style task lists",
- "homepage": "https://github.com/thephpleague/commonmark-ext-task-list",
- "keywords": [
- "Lists",
- "commonmark",
- "extension",
- "gfm",
- "github",
- "markdown",
- "task"
- ],
- "time": "2019-07-11T00:35:13+00:00"
- },
- {
- "name": "league/commonmark-extras",
- "version": "1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/commonmark-extras.git",
- "reference": "4947edfb292d6f38b309cd63c64d7b08558df315"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark-extras/zipball/4947edfb292d6f38b309cd63c64d7b08558df315",
- "reference": "4947edfb292d6f38b309cd63c64d7b08558df315",
- "shasum": ""
- },
- "require": {
- "league/commonmark": "^1.0",
- "league/commonmark-ext-autolink": "^1.0",
- "league/commonmark-ext-smartpunct": "^1.0",
- "league/commonmark-ext-strikethrough": "^1.0",
- "league/commonmark-ext-table": "^2.0",
- "league/commonmark-ext-task-list": "^1.0",
- "php": "^7.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^7.5"
- },
- "type": "commonmark-extension",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "League\\CommonMark\\Extras\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
+ "url": "https://www.patreon.com/colinodell",
+ "type": "patreon"
+ },
{
- "name": "Colin O'Dell",
- "email": "colinodell@gmail.com",
- "homepage": "https://www.colinodell.com",
- "role": "Lead Developer"
+ "url": "https://tidelift.com/funding/github/packagist/league/commonmark",
+ "type": "tidelift"
}
],
- "description": "Useful extensions for customizing the league/commonmark Markdown parser",
- "homepage": "https://github.com/thephpleague/commonmark-extras",
- "keywords": [
- "Extras",
- "commonmark",
- "extensions",
- "gfm",
- "markdown"
- ],
- "time": "2019-07-13T11:56:05+00:00"
+ "time": "2020-10-31T13:49:32+00:00"
}
],
"packages-dev": [],
@@ -483,5 +159,6 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
- "platform-dev": []
+ "platform-dev": [],
+ "plugin-api-version": "2.0.0"
}