From ad87578efb37f5fbe9ab792fbf181bd84b8b3725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Goetz?= <onigoetz@onigoetz.ch>
Date: Thu, 22 Sep 2016 22:51:39 +0200
Subject: [PATCH] Support commonmark 0.15.0

---
 .travis.yml   | 21 +++++++++++++--------
 composer.json |  4 ++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1f5931..75fc5f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,17 +6,22 @@ cache:
   directories:
     - $HOME/.composer/cache
 
-matrix:
-  include:
-    - php: 5.5
-      env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: 5.6
-    - php: 7.0
-      env: PHPUNIT_COVERAGE="--coverage-clover coverage.clover"
-    - php: hhvm
+php:
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+env:
+  - COMMONMARK_VERSION=0.13.*
+  - COMMONMARK_VERSION=0.14.*
+  - COMMONMARK_VERSION=0.15.*
 
 before_script:
+  - if [[ $TRAVIS_PHP_VERSION = '7.0' ]]; then PHPUNIT_COVERAGE="--coverage-clover=coverage.clover"; else PHPUNIT_COVERAGE=""; fi
+  - if [[ $TRAVIS_PHP_VERSION = '5.5' ]]; then COMPOSER_FLAGS="--prefer-lowest"; else COMPOSER_FLAGS=""; fi
   - composer self-update
+  - if [ "$COMMONMARK_VERSION" != "" ]; then composer require "league/commonmark:${COMMONMARK_VERSION}" --no-update; fi;
   - composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
 
 script:
diff --git a/composer.json b/composer.json
index f3b32d4..f3ce8f2 100644
--- a/composer.json
+++ b/composer.json
@@ -14,10 +14,10 @@
     ],
     "require": {
         "php": ">=5.4",
-        "league/commonmark": "^0.13|^0.14"
+        "league/commonmark": "^0.13|^0.14|^0.15"
     },
     "require-dev": {
-        "webuni/commonmark-table-extension": "~0.4",
+        "webuni/commonmark-table-extension": "dev-master",
         "phpunit/phpunit": "^4.3|^5.0",
         "friendsofphp/php-cs-fixer": "^1.9",
         "sllh/php-cs-fixer-styleci-bridge": "^2.0",