diff --git a/composer.json b/composer.json index 0ac864eb01..a047ab4618 100644 --- a/composer.json +++ b/composer.json @@ -99,7 +99,7 @@ }, "scripts": { "pre-install-cmd": [ - "php -r \"if (!(getenv('DYNO'))===false){file_exists('.env') || copy('.env.heroku', '.env');}else{echo 'Not in Heroku environment\n';}\"" + "@php -r \"if (!(getenv('DYNO'))===false){file_exists('.env') || copy('.env.heroku', '.env');}\"" ], "post-root-package-install": [ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" diff --git a/composer.lock b/composer.lock index 88046c0b2d..44cce78bae 100644 --- a/composer.lock +++ b/composer.lock @@ -947,34 +947,34 @@ }, { "name": "league/commonmark", - "version": "0.16.0", + "version": "0.17.0", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "c0e41be0f80c51ad3170c9c713f74a0b8dec59ce" + "reference": "3b4c2224524776a584de663c7a04bc8eb2e1544d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c0e41be0f80c51ad3170c9c713f74a0b8dec59ce", - "reference": "c0e41be0f80c51ad3170c9c713f74a0b8dec59ce", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/3b4c2224524776a584de663c7a04bc8eb2e1544d", + "reference": "3b4c2224524776a584de663c7a04bc8eb2e1544d", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": ">=5.4.8" + "php": ">=5.6.5" }, "replace": { "colinodell/commonmark-php": "*" }, "require-dev": { "cebe/markdown": "~1.0", + "commonmark/commonmark.js": "0.28", "erusev/parsedown": "~1.0", - "jgm/commonmark": "0.28", "michelf/php-markdown": "~1.4", "mikehaertl/php-shellcommand": "~1.2.0", - "phpunit/phpunit": "^4.8.35|~5.7", + "phpunit/phpunit": "~5.7|~6.5", "scrutinizer/ocular": "~1.1", - "symfony/finder": "~2.3|~3.0" + "symfony/finder": "~3.0|~4.0" }, "suggest": { "league/commonmark-extras": "Library of useful extensions including smart punctuation" @@ -985,7 +985,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.17-dev" + "dev-master": "0.18-dev" } }, "autoload": { @@ -1012,7 +1012,7 @@ "markdown", "parser" ], - "time": "2017-10-31T00:49:55+00:00" + "time": "2017-12-30T22:08:48+00:00" }, { "name": "league/csv",