Merge remote-tracking branch 'p/ticket/11238-develop' into develop

* p/ticket/11238-develop:
  [ticket/11238] Set goutte to 0.1.0 in develop.
This commit is contained in:
Andreas Fischer 2012-12-03 13:44:08 +01:00
commit 34018ed1d6

170
phpBB/composer.lock generated
View file

@ -1,5 +1,5 @@
{ {
"hash": "efb4768ba71d7cd2c84baa0610d84067", "hash": "c1a76530df6b9daa16b8033d61b76503",
"packages": [ "packages": [
{ {
"name": "symfony/config", "name": "symfony/config",
@ -381,29 +381,29 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "fabpot/goutte", "name": "fabpot/goutte",
"version": "dev-master", "version": "v0.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fabpot/Goutte", "url": "https://github.com/fabpot/Goutte",
"reference": "f2940f9c7c1f409159f5e9f512e575946c5cff48" "reference": "v0.1.0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/fabpot/Goutte/archive/f2940f9c7c1f409159f5e9f512e575946c5cff48.zip", "url": "https://github.com/fabpot/Goutte/archive/v0.1.0.zip",
"reference": "f2940f9c7c1f409159f5e9f512e575946c5cff48", "reference": "v0.1.0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.0", "php": ">=5.3.0",
"ext-curl": "*",
"symfony/browser-kit": "2.1.*", "symfony/browser-kit": "2.1.*",
"symfony/css-selector": "2.1.*", "symfony/css-selector": "2.1.*",
"symfony/dom-crawler": "2.1.*", "symfony/dom-crawler": "2.1.*",
"symfony/finder": "2.1.*", "symfony/finder": "2.1.*",
"symfony/process": "2.1.*", "symfony/process": "2.1.*",
"ext-curl": "*", "guzzle/guzzle": "3.0.*"
"guzzle/http": "2.8.*"
}, },
"time": "1351086217", "time": "2012-12-02 13:44:35",
"type": "application", "type": "application",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -432,126 +432,90 @@
] ]
}, },
{ {
"name": "guzzle/common", "name": "guzzle/guzzle",
"version": "v2.8.8", "version": "v3.0.5",
"target-dir": "Guzzle/Common",
"source": { "source": {
"type": "git", "type": "git",
"url": "git://github.com/guzzle/common.git", "url": "https://github.com/guzzle/guzzle",
"reference": "v2.8.8" "reference": "v3.0.5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/guzzle/common/zipball/v2.8.8", "url": "https://github.com/guzzle/guzzle/archive/v3.0.5.zip",
"reference": "v2.8.8", "reference": "v3.0.5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.3.2",
"ext-curl": "*",
"symfony/event-dispatcher": "2.1.*" "symfony/event-dispatcher": "2.1.*"
}, },
"time": "2012-10-15 17:42:47", "replace": {
"type": "library", "guzzle/batch": "self.version",
"installation-source": "dist", "guzzle/cache": "self.version",
"autoload": {
"psr-0": {
"Guzzle\\Common": ""
}
},
"license": [
"MIT"
],
"description": "Common libraries used by Guzzle",
"homepage": "http://guzzlephp.org/",
"keywords": [
"log",
"event",
"cache",
"validation",
"Socket",
"common",
"batch",
"inflection"
]
},
{
"name": "guzzle/http",
"version": "v2.8.8",
"target-dir": "Guzzle/Http",
"source": {
"type": "git",
"url": "git://github.com/guzzle/http.git",
"reference": "v2.8.8"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/http/zipball/v2.8.8",
"reference": "v2.8.8",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"guzzle/common": "self.version", "guzzle/common": "self.version",
"guzzle/parser": "self.version" "guzzle/http": "self.version",
"guzzle/inflection": "self.version",
"guzzle/iterator": "self.version",
"guzzle/log": "self.version",
"guzzle/parser": "self.version",
"guzzle/plugin": "self.version",
"guzzle/plugin-async": "self.version",
"guzzle/plugin-backoff": "self.version",
"guzzle/plugin-cache": "self.version",
"guzzle/plugin-cookie": "self.version",
"guzzle/plugin-curlauth": "self.version",
"guzzle/plugin-history": "self.version",
"guzzle/plugin-log": "self.version",
"guzzle/plugin-md5": "self.version",
"guzzle/plugin-mock": "self.version",
"guzzle/plugin-oauth": "self.version",
"guzzle/service": "self.version",
"guzzle/stream": "self.version"
}, },
"time": "2012-10-15 17:42:47", "require-dev": {
"doctrine/common": "*",
"symfony/class-loader": "*",
"monolog/monolog": "1.*",
"zendframework/zend-cache": "2.0.*",
"zendframework/zend-log": "2.0.*",
"zend/zend-log1": "1.12",
"zend/zend-cache1": "1.12",
"phpunit/phpunit": "3.7.*"
},
"time": "2012-11-19 00:15:33",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"Guzzle\\Http": "" "Guzzle\\Tests": "tests/",
"Guzzle": "src/"
} }
}, },
"license": [ "license": [
"MIT" "MIT"
], ],
"description": "HTTP libraries used by Guzzle", "authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Guzzle Community",
"homepage": "https://github.com/guzzle/guzzle/contributors"
}
],
"description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
"homepage": "http://guzzlephp.org/", "homepage": "http://guzzlephp.org/",
"keywords": [ "keywords": [
"framework",
"curl", "curl",
"http", "http",
"rest",
"http client", "http client",
"client", "client",
"Guzzle" "web service"
]
},
{
"name": "guzzle/parser",
"version": "v2.8.8",
"target-dir": "Guzzle/Parser",
"source": {
"type": "git",
"url": "git://github.com/guzzle/parser.git",
"reference": "v2.8.8"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/parser/zipball/v2.8.8",
"reference": "v2.8.8",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"time": "2012-09-20 13:28:06",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-0": {
"Guzzle\\Parser": ""
}
},
"license": [
"MIT"
],
"description": "Interchangeable parsers used by Guzzle",
"homepage": "http://guzzlephp.org/",
"keywords": [
"http",
"url",
"message",
"cookie",
"URI Template"
] ]
}, },
{ {
@ -808,7 +772,7 @@
], ],
"minimum-stability": "beta", "minimum-stability": "beta",
"stability-flags": { "stability-flags": [
"fabpot/goutte": 20
} ]
} }