From 356ec276bc3bdffddefb9c9d14583438d4a60242 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 23 Feb 2016 12:04:00 +0100 Subject: [PATCH] Updated composer stuff. --- composer.json | 3 +- composer.lock | 144 ++++++++++++++++++++++---------------------------- 2 files changed, 64 insertions(+), 83 deletions(-) diff --git a/composer.json b/composer.json index 45949b7898..5e40fb7ba0 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,8 @@ "league/commonmark": "~0.7", "rcrowe/twigbridge": "~0.9", "league/csv": "^7.1", - "laravelcollective/html": "^5.2" + "laravelcollective/html": "^5.2", + "rmccue/requests": "^1.6" }, "require-dev": { "fzaninotto/faker": "~1.4", diff --git a/composer.lock b/composer.lock index 9bc328678c..588c5d33aa 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "2497234cd55deda05ff00e585e5fbcb1", - "content-hash": "56659c85d2676e3e4da0f4498f96b2b2", + "hash": "3f02bd1e0ee5144fa644b46fe7cd8d47", + "content-hash": "e2efaf3624f47b046b4330cc76289d69", "packages": [ { "name": "classpreloader/classpreloader", @@ -759,16 +759,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.14", + "version": "v5.2.20", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ce63ba53d4891bdbb5e1aaeced1b5dd34edbc86f" + "reference": "d4ff9a1e3e9b2f99f8f3e957876e343d804d944f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ce63ba53d4891bdbb5e1aaeced1b5dd34edbc86f", - "reference": "ce63ba53d4891bdbb5e1aaeced1b5dd34edbc86f", + "url": "https://api.github.com/repos/laravel/framework/zipball/d4ff9a1e3e9b2f99f8f3e957876e343d804d944f", + "reference": "d4ff9a1e3e9b2f99f8f3e957876e343d804d944f", "shasum": "" }, "require": { @@ -883,7 +883,7 @@ "framework", "laravel" ], - "time": "2016-02-03 14:19:04" + "time": "2016-02-19 17:58:28" }, { "name": "laravelcollective/html", @@ -1066,16 +1066,16 @@ }, { "name": "league/flysystem", - "version": "1.0.16", + "version": "1.0.17", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "183e1a610664baf6dcd6fceda415baf43cbdc031" + "reference": "02f5b6c9a8b9278c8381e3361e7bd9d641c740ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/183e1a610664baf6dcd6fceda415baf43cbdc031", - "reference": "183e1a610664baf6dcd6fceda415baf43cbdc031", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/02f5b6c9a8b9278c8381e3361e7bd9d641c740ca", + "reference": "02f5b6c9a8b9278c8381e3361e7bd9d641c740ca", "shasum": "" }, "require": { @@ -1088,8 +1088,7 @@ "ext-fileinfo": "*", "mockery/mockery": "~0.9", "phpspec/phpspec": "^2.2", - "phpspec/prophecy-phpunit": "~1.0", - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "~4.8 || ~5.0" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -1146,7 +1145,7 @@ "sftp", "storage" ], - "time": "2015-12-19 20:16:43" + "time": "2016-02-19 15:35:38" }, { "name": "monolog/monolog", @@ -1589,6 +1588,55 @@ ], "time": "2015-12-21 22:03:34" }, + { + "name": "rmccue/requests", + "version": "v1.6.1", + "source": { + "type": "git", + "url": "https://github.com/rmccue/Requests.git", + "reference": "6aac485666c2955077d77b796bbdd25f0013a4ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rmccue/Requests/zipball/6aac485666c2955077d77b796bbdd25f0013a4ea", + "reference": "6aac485666c2955077d77b796bbdd25f0013a4ea", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "require-dev": { + "satooshi/php-coveralls": "dev-master" + }, + "type": "library", + "autoload": { + "psr-0": { + "Requests": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Ryan McCue", + "homepage": "http://ryanmccue.info" + } + ], + "description": "A HTTP library written in PHP, for human beings.", + "homepage": "http://github.com/rmccue/Requests", + "keywords": [ + "curl", + "fsockopen", + "http", + "idna", + "ipv6", + "iri", + "sockets" + ], + "time": "2014-05-18 04:59:02" + }, { "name": "swiftmailer/swiftmailer", "version": "v5.4.1", @@ -2585,80 +2633,12 @@ "validation" ], "time": "2016-01-27 00:10:53" - }, - { - "name": "zizaco/entrust", - "version": "dev-laravel-5", - "source": { - "type": "git", - "url": "https://github.com/Zizaco/entrust.git", - "reference": "be28aa634c44551ae5187894c903094a8ce8baee" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Zizaco/entrust/zipball/be28aa634c44551ae5187894c903094a8ce8baee", - "reference": "be28aa634c44551ae5187894c903094a8ce8baee", - "shasum": "" - }, - "require": { - "illuminate/console": "~5.0", - "illuminate/support": "~5.0", - "php": ">=5.4.0" - }, - "require-dev": { - "illuminate/database": "~5.0", - "mockery/mockery": "dev-master", - "phpunit/phpunit": "~4.1", - "sami/sami": "dev-master" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/commands" - ], - "psr-4": { - "Zizaco\\Entrust\\": "src/Entrust/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andrew Elkins", - "homepage": "http://andrewelkins.com" - }, - { - "name": "Zizaco Zizuini", - "email": "zizaco@gmail.com" - }, - { - "name": "Ben Batschelet", - "homepage": "http://github.com/bbatsche" - }, - { - "name": "Michele Angioni", - "email": "michele.angioni@gmail.com" - } - ], - "description": "This package provides a flexible way to add Role-based Permissions to Laravel", - "keywords": [ - "acl", - "auth", - "illuminate", - "laravel", - "permission", - "roles" - ], - "time": "2015-11-12 17:38:37" } ], "packages-dev": null, "aliases": [], "minimum-stability": "stable", "stability-flags": { - "zizaco/entrust": 20, "mockery/mockery": 20, "barryvdh/laravel-debugbar": 0, "hamcrest/hamcrest-php": 20