From 173d0290ea4cc63e524978fc81e0f105eecd361d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 17 Jan 2016 07:49:49 +0100 Subject: [PATCH] New composer stuff. --- composer.json | 6 ++++-- composer.lock | 50 ++++++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/composer.json b/composer.json index 44c5ab0766..7dbfee8eb0 100755 --- a/composer.json +++ b/composer.json @@ -55,13 +55,15 @@ ], "post-install-cmd": [ "php artisan clear-compiled", - "php artisan optimize" + "php artisan optimize", + "php artisan firefly:upgrade-instructions" ], "pre-update-cmd": [ "php artisan clear-compiled" ], "post-update-cmd": [ - "php artisan optimize" + "php artisan optimize", + "php artisan firefly:upgrade-instructions" ] }, "config": { diff --git a/composer.lock b/composer.lock index ac61669c9c..91b23f2f19 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "847987de4271f2467a4a5fc50bc04cc9", + "hash": "df00127da416acad2a36b6128b82fdd9", "content-hash": "28b178f07a713b4db441e7e1f380916e", "packages": [ { @@ -759,16 +759,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.8", + "version": "v5.2.10", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "867914788c2ec942967c3608ed54626228a5f916" + "reference": "93dc5b0089eef468157fd7200e575c3861ec59a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/867914788c2ec942967c3608ed54626228a5f916", - "reference": "867914788c2ec942967c3608ed54626228a5f916", + "url": "https://api.github.com/repos/laravel/framework/zipball/93dc5b0089eef468157fd7200e575c3861ec59a5", + "reference": "93dc5b0089eef468157fd7200e575c3861ec59a5", "shasum": "" }, "require": { @@ -883,20 +883,20 @@ "framework", "laravel" ], - "time": "2016-01-12 22:45:00" + "time": "2016-01-13 20:29:10" }, { "name": "laravelcollective/html", - "version": "v5.2", + "version": "v5.2.2", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "5a8f1380a0d5ef21cdef37e775d86566307f8358" + "reference": "c88b2d59a56ed2290fc5082a1a6099e357c9fdbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/5a8f1380a0d5ef21cdef37e775d86566307f8358", - "reference": "5a8f1380a0d5ef21cdef37e775d86566307f8358", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/c88b2d59a56ed2290fc5082a1a6099e357c9fdbc", + "reference": "c88b2d59a56ed2290fc5082a1a6099e357c9fdbc", "shasum": "" }, "require": { @@ -937,20 +937,20 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "http://laravelcollective.com", - "time": "2015-12-23 07:46:46" + "time": "2016-01-16 16:54:49" }, { "name": "league/commonmark", - "version": "0.12.0", + "version": "0.13.0", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "3eb64850ee688623db494398a5284a7a4cdf7b47" + "reference": "a4e93bc4fd1a8ff8f534040c4a07371ea5f4b484" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/3eb64850ee688623db494398a5284a7a4cdf7b47", - "reference": "3eb64850ee688623db494398a5284a7a4cdf7b47", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/a4e93bc4fd1a8ff8f534040c4a07371ea5f4b484", + "reference": "a4e93bc4fd1a8ff8f534040c4a07371ea5f4b484", "shasum": "" }, "require": { @@ -962,21 +962,23 @@ }, "require-dev": { "erusev/parsedown": "~1.0", - "jgm/commonmark": "0.22", - "jgm/smartpunct": "0.22", + "jgm/commonmark": "0.24", "michelf/php-markdown": "~1.4", "mikehaertl/php-shellcommand": "~1.1.0", "phpunit/phpunit": "~4.3|~5.0", "scrutinizer/ocular": "^1.1", "symfony/finder": "~2.3" }, + "suggest": { + "league/commonmark-extras": "Library of useful extensions including smart punctuation" + }, "bin": [ "bin/commonmark" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "0.13-dev" + "dev-master": "0.14-dev" } }, "autoload": { @@ -1003,7 +1005,7 @@ "markdown", "parser" ], - "time": "2015-11-04 14:24:41" + "time": "2016-01-14 04:29:54" }, { "name": "league/csv", @@ -3897,16 +3899,16 @@ }, { "name": "symfony/class-loader", - "version": "v2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "ec74b0a279cf3a9bd36172b3e3061591d380ce6c" + "reference": "98e9089a428ed0e39423b67352c57ef5910a3269" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/ec74b0a279cf3a9bd36172b3e3061591d380ce6c", - "reference": "ec74b0a279cf3a9bd36172b3e3061591d380ce6c", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/98e9089a428ed0e39423b67352c57ef5910a3269", + "reference": "98e9089a428ed0e39423b67352c57ef5910a3269", "shasum": "" }, "require": { @@ -3945,7 +3947,7 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2015-12-05 17:37:59" + "time": "2016-01-03 15:33:41" }, { "name": "symfony/css-selector",