From fadd1ea054c81e4a6bd67159b29b46fd1a4f4a1b Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Thu, 22 Sep 2016 10:59:07 -0400 Subject: [PATCH] Update composer and npm dependencies --- composer.lock | 93 ++++++++++++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 55 insertions(+), 40 deletions(-) diff --git a/composer.lock b/composer.lock index 40c6809..d6976bc 100644 --- a/composer.lock +++ b/composer.lock @@ -421,12 +421,12 @@ "source": { "type": "git", "url": "https://github.com/gwnobots/laravel-head.git", - "reference": "5b1c47c48bec0fc43083879f9a65501dcb9d7fca" + "reference": "f222ad345c3863a51fdaec41882e43db8977b23a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gwnobots/laravel-head/zipball/5b1c47c48bec0fc43083879f9a65501dcb9d7fca", - "reference": "5b1c47c48bec0fc43083879f9a65501dcb9d7fca", + "url": "https://api.github.com/repos/gwnobots/laravel-head/zipball/f222ad345c3863a51fdaec41882e43db8977b23a", + "reference": "f222ad345c3863a51fdaec41882e43db8977b23a", "shasum": "" }, "require": { @@ -461,7 +461,7 @@ "stylesheets", "twitter" ], - "time": "2016-02-14 07:45:56" + "time": "2016-09-20 14:03:04" }, { "name": "intervention/image", @@ -672,16 +672,16 @@ }, { "name": "laravel/framework", - "version": "v5.3.6", + "version": "v5.3.10", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "c63a7fb7066fea2bce91ace5c830c01d503abe6c" + "reference": "6febb0ee61999cde3bc7b2963c8903032bb22691" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/c63a7fb7066fea2bce91ace5c830c01d503abe6c", - "reference": "c63a7fb7066fea2bce91ace5c830c01d503abe6c", + "url": "https://api.github.com/repos/laravel/framework/zipball/6febb0ee61999cde3bc7b2963c8903032bb22691", + "reference": "6febb0ee61999cde3bc7b2963c8903032bb22691", "shasum": "" }, "require": { @@ -729,6 +729,7 @@ "illuminate/http": "self.version", "illuminate/log": "self.version", "illuminate/mail": "self.version", + "illuminate/notifications": "self.version", "illuminate/pagination": "self.version", "illuminate/pipeline": "self.version", "illuminate/queue": "self.version", @@ -795,7 +796,7 @@ "framework", "laravel" ], - "time": "2016-09-01 14:06:47" + "time": "2016-09-20 13:46:16" }, { "name": "laravelcollective/html", @@ -936,16 +937,16 @@ }, { "name": "maatwebsite/excel", - "version": "2.1.4", + "version": "2.1.6", "source": { "type": "git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "b5c91156f6bd29f68f4f2c51186faae4310a5a68" + "reference": "700eba02f76f2971c81726a4f6a04121c1977e64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/b5c91156f6bd29f68f4f2c51186faae4310a5a68", - "reference": "b5c91156f6bd29f68f4f2c51186faae4310a5a68", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/700eba02f76f2971c81726a4f6a04121c1977e64", + "reference": "700eba02f76f2971c81726a4f6a04121c1977e64", "shasum": "" }, "require": { @@ -999,7 +1000,7 @@ "import", "laravel" ], - "time": "2016-08-28 20:25:51" + "time": "2016-09-15 21:03:21" }, { "name": "mailchimp/mailchimp", @@ -1218,16 +1219,16 @@ }, { "name": "nikic/php-parser", - "version": "v2.1.0", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "47b254ea51f1d6d5dc04b9b299e88346bf2369e3" + "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/47b254ea51f1d6d5dc04b9b299e88346bf2369e3", - "reference": "47b254ea51f1d6d5dc04b9b299e88346bf2369e3", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4dd659edadffdc2143e4753df655d866dbfeedf0", + "reference": "4dd659edadffdc2143e4753df655d866dbfeedf0", "shasum": "" }, "require": { @@ -1265,7 +1266,7 @@ "parser", "php" ], - "time": "2016-04-19 13:41:41" + "time": "2016-09-16 12:04:44" }, { "name": "paragonie/random_compat", @@ -1483,22 +1484,30 @@ }, { "name": "psr/log", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" + "reference": "5277094ed527a1c4477177d102fe4c53551953e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", + "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0", + "reference": "5277094ed527a1c4477177d102fe4c53551953e0", "shasum": "" }, + "require": { + "php": ">=5.3.0" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { - "psr-0": { - "Psr\\Log\\": "" + "psr-4": { + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1512,12 +1521,13 @@ } ], "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ "log", "psr", "psr-3" ], - "time": "2012-12-21 11:40:51" + "time": "2016-09-19 16:02:08" }, { "name": "psy/psysh", @@ -3151,16 +3161,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.5.2", + "version": "1.5.4", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc" + "reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/da8529775f14f4fdae33f916eb0cf65f6afbddbc", - "reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/ea74994a3dc7f8d2f65a06009348f2d63c81e61f", + "reference": "ea74994a3dc7f8d2f65a06009348f2d63c81e61f", "shasum": "" }, "require": { @@ -3189,7 +3199,7 @@ "object", "object graph" ], - "time": "2016-09-06 16:07:05" + "time": "2016-09-16 13:37:59" }, { "name": "phpdocumentor/reflection-common", @@ -3645,24 +3655,24 @@ }, { "name": "phpunit/phpunit", - "version": "5.5.4", + "version": "5.5.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5" + "reference": "a57126dc681b08289fef6ac96a48e30656f84350" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6e88e56c912133de6e99b87728cca7ed70c5f5", - "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a57126dc681b08289fef6ac96a48e30656f84350", + "reference": "a57126dc681b08289fef6ac96a48e30656f84350", "shasum": "" }, "require": { "ext-dom": "*", "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", "myclabs/deep-copy": "~1.3", "php": "^5.6 || ^7.0", "phpspec/prophecy": "^1.3.1", @@ -3684,7 +3694,12 @@ "conflict": { "phpdocumentor/reflection-docblock": "3.0.2" }, + "require-dev": { + "ext-pdo": "*" + }, "suggest": { + "ext-tidy": "*", + "ext-xdebug": "*", "phpunit/php-invoker": "~1.1" }, "bin": [ @@ -3719,7 +3734,7 @@ "testing", "xunit" ], - "time": "2016-08-26 07:11:44" + "time": "2016-09-21 14:40:13" }, { "name": "phpunit/phpunit-mock-objects", diff --git a/package.json b/package.json index 71f5887..5af8dc0 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "gulp-concat": "^2.6.0", "gulp-modernizr": "^1.0.0-alpha", "gulp-plumber": "^1.1.0", - "gulp-postcss": "^6.1.1", + "gulp-postcss": "^6.2.0", "gulp-sass": "^2.3.2", "gulp-sass-glob": "^1.0.6", "gulp-strip-debug": "^1.1.0",