composer update

This commit is contained in:
Oliver Davies 2015-08-18 11:59:37 +01:00
parent dacc43ce1a
commit ecd833c9e6
2 changed files with 24 additions and 25 deletions

View file

@ -1,6 +1,6 @@
{
"require": {
"sculpin/sculpin": "2.*@dev",
"sculpin/sculpin": "2.0.*@dev",
"dflydev/embedded-composer-console": "@dev",
"dflydev/embedded-composer-core": "@dev",
"composer/composer": "@dev"

47
composer.lock generated
View file

@ -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": "8e9d0b9dd7e4004ec4e3be52be92fa95",
"hash": "706355836752a9b1fbe6e7698ab7600b",
"packages": [
{
"name": "composer/composer",
@ -12,12 +12,12 @@
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
"reference": "c83650f299cfff1049cd61ea72ee5345bd4f92d3"
"reference": "9859859f1082d94e546aa75746867df127aa0d9e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/c83650f299cfff1049cd61ea72ee5345bd4f92d3",
"reference": "c83650f299cfff1049cd61ea72ee5345bd4f92d3",
"url": "https://api.github.com/repos/composer/composer/zipball/9859859f1082d94e546aa75746867df127aa0d9e",
"reference": "9859859f1082d94e546aa75746867df127aa0d9e",
"shasum": ""
},
"require": {
@ -76,7 +76,7 @@
"dependency",
"package"
],
"time": "2015-08-04 13:59:03"
"time": "2015-08-17 14:57:00"
},
{
"name": "composer/spdx-licenses",
@ -359,16 +359,16 @@
},
{
"name": "dflydev/dot-access-data",
"version": "v1.0.0",
"version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/dflydev/dflydev-dot-access-data.git",
"reference": "d493ca16fe1a7e82e56810124ec0b556e6ed9113"
"reference": "7a0960d088119818ce7687d200c363b01d183cbe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/d493ca16fe1a7e82e56810124ec0b556e6ed9113",
"reference": "d493ca16fe1a7e82e56810124ec0b556e6ed9113",
"url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/7a0960d088119818ce7687d200c363b01d183cbe",
"reference": "7a0960d088119818ce7687d200c363b01d183cbe",
"shasum": ""
},
"require": {
@ -409,7 +409,7 @@
"dot",
"notation"
],
"time": "2012-07-17 20:32:32"
"time": "2015-08-13 03:51:18"
},
{
"name": "dflydev/embedded-composer-console",
@ -1210,16 +1210,16 @@
},
{
"name": "sculpin/sculpin",
"version": "dev-master",
"version": "2.0.x-dev",
"source": {
"type": "git",
"url": "https://github.com/sculpin/sculpin.git",
"reference": "ed273849fa19246684dbecad2704485e0dfac27b"
"reference": "a0770a36a6fabc969e78c72229b7e5c48b655447"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sculpin/sculpin/zipball/ed273849fa19246684dbecad2704485e0dfac27b",
"reference": "ed273849fa19246684dbecad2704485e0dfac27b",
"url": "https://api.github.com/repos/sculpin/sculpin/zipball/a0770a36a6fabc969e78c72229b7e5c48b655447",
"reference": "a0770a36a6fabc969e78c72229b7e5c48b655447",
"shasum": ""
},
"require": {
@ -1235,7 +1235,7 @@
"guzzle/guzzle": "~3.0",
"michelf/php-markdown": "~1.5.0",
"netcarver/textile": "3.5.*",
"php": ">=5.4",
"php": ">=5.3.2",
"react/http": "0.2.*",
"sculpin/sculpin-theme-composer-plugin": "1.0.*@dev",
"symfony/class-loader": "~2.3",
@ -1264,7 +1264,6 @@
"sculpin/twig-bundle": "self.version"
},
"require-dev": {
"phpunit/phpunit": "3.7.*",
"symfony/css-selector": "~2.6",
"symfony/dom-crawler": "~2.6"
},
@ -1275,7 +1274,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
"dev-master": "2.0.x-dev"
}
},
"autoload": {
@ -1306,7 +1305,7 @@
"site",
"static"
],
"time": "2015-08-04 18:03:27"
"time": "2015-07-15 07:51:38"
},
{
"name": "sculpin/sculpin-theme-composer-plugin",
@ -2196,16 +2195,16 @@
},
{
"name": "twig/twig",
"version": "v1.19.0",
"version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "edbeaf43b0a606cdaadc32a11d2673614a377b90"
"reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/edbeaf43b0a606cdaadc32a11d2673614a377b90",
"reference": "edbeaf43b0a606cdaadc32a11d2673614a377b90",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844",
"reference": "1ea4e5f81c6d005fe84d0b38e1c4f1955eb86844",
"shasum": ""
},
"require": {
@ -2214,7 +2213,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.19-dev"
"dev-master": "1.20-dev"
}
},
"autoload": {
@ -2249,7 +2248,7 @@
"keywords": [
"templating"
],
"time": "2015-07-31 13:45:26"
"time": "2015-08-12 15:56:39"
},
{
"name": "webignition/internet-media-type",