makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop-ascraeus

Browse source 
* develop-olympus:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
This commit is contained in:
Tristan Darricau 2014-11-11 15:29:58 +01:00
commit cd6085ebdc
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
phpBB/composer.lock generated
View file

@ -703,21 +703,21 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "fabpot/goutte", "name": "fabpot/goutte",
"version": "v1.0.3", "version": "v1.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fabpot/Goutte.git", "url": "https://github.com/FriendsOfPHP/Goutte.git",
"reference": "75c9f23c4122caf4ea3e87a42a00b471366e707f" "reference": "794b196e76bdd37b5155cdecbad311f0a3b07625"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fabpot/Goutte/zipball/75c9f23c4122caf4ea3e87a42a00b471366e707f", "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/794b196e76bdd37b5155cdecbad311f0a3b07625",
"reference": "75c9f23c4122caf4ea3e87a42a00b471366e707f", "reference": "794b196e76bdd37b5155cdecbad311f0a3b07625",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-curl": "*", "ext-curl": "*",
"guzzle/http": ">=3.0.5,<3.8-dev", "guzzle/http": "~3.1",
"php": ">=5.3.0", "php": ">=5.3.0",
"symfony/browser-kit": "~2.1", "symfony/browser-kit": "~2.1",
"symfony/css-selector": "~2.1", "symfony/css-selector": "~2.1",
@ -726,8 +726,8 @@
"symfony/process": "~2.1" "symfony/process": "~2.1"
}, },
"require-dev": { "require-dev": {
"guzzle/plugin-history": ">=3.0.5,<3.8-dev", "guzzle/plugin-history": "~3.1",
"guzzle/plugin-mock": ">=3.0.5,<3.8-dev" "guzzle/plugin-mock": "~3.1"
}, },
"type": "application", "type": "application",
"extra": { "extra": {
@ -747,9 +747,7 @@
"authors": [ "authors": [
{ {
"name": "Fabien Potencier", "name": "Fabien Potencier",
"email": "fabien@symfony.com", "email": "fabien@symfony.com"
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
} }
], ],
"description": "A simple PHP Web Scraper", "description": "A simple PHP Web Scraper",
@ -757,7 +755,7 @@
"keywords": [ "keywords": [
"scraper" "scraper"
], ],
"time": "2013-08-16 06:03:22" "time": "2014-10-09 15:52:51"
}, },
{ {
"name": "guzzle/common", "name": "guzzle/common",
@ -1592,16 +1590,16 @@
}, },
{ {
"name": "sami/sami", "name": "sami/sami",
"version": "v1.3", "version": "v1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fabpot/Sami.git", "url": "https://github.com/FriendsOfPHP/Sami.git",
"reference": "76f2ed80b3420f7e2f6dcd5b7218b5a5781f4110" "reference": "70f29c781f7bef30181c814b9471b2ceac694454"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fabpot/Sami/zipball/76f2ed80b3420f7e2f6dcd5b7218b5a5781f4110", "url": "https://api.github.com/repos/FriendsOfPHP/Sami/zipball/70f29c781f7bef30181c814b9471b2ceac694454",
"reference": "76f2ed80b3420f7e2f6dcd5b7218b5a5781f4110", "reference": "70f29c781f7bef30181c814b9471b2ceac694454",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1622,7 +1620,7 @@
"type": "application", "type": "application",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.3-dev" "dev-master": "1.4-dev"
} }
}, },
"autoload": { "autoload": {
@ -1637,9 +1635,7 @@
"authors": [ "authors": [
{ {
"name": "Fabien Potencier", "name": "Fabien Potencier",
"email": "fabien@symfony.com", "email": "fabien@symfony.com"
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
} }
], ],
"description": "Sami, an API documentation generator", "description": "Sami, an API documentation generator",
@ -1647,7 +1643,7 @@
"keywords": [ "keywords": [
"phpdoc" "phpdoc"
], ],
"time": "2013-11-30 17:16:25" "time": "2014-06-25 11:24:03"
}, },
{ {
"name": "sebastian/comparator", "name": "sebastian/comparator",