makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 13:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/11526] Update all dependencies / regenerate composer.lock.
  [ticket/11526] Increase composer minimum stability in olympus to stable.
  [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
This commit is contained in:
Nils Adermann 2013-05-09 18:12:54 +02:00
commit dbb4a87b79
2 changed files with 146 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
composer.phar
View file

Binary file not shown.

337
phpBB/composer.lock generated
View file

@ -1,37 +1,35 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
"hash": "c1a76530df6b9daa16b8033d61b76503",
"packages": [
{
"name": "symfony/config",
"version": "v2.1.3",
"version": "v2.1.10",
"target-dir": "Symfony/Component/Config",
"source": {
"type": "git",
"url": "https://github.com/symfony/Config",
"reference": "v2.1.3"
"url": "https://github.com/symfony/Config.git",
"reference": "v2.1.10"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Config/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/Config/zipball/v2.1.10",
"reference": "v2.1.10",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-10-20 00:10:30",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\Config": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -46,47 +44,42 @@
}
],
"description": "Symfony Config Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-04-22 04:28:40"
},
{
"name": "symfony/dependency-injection",
"version": "v2.1.3",
"version": "v2.1.10",
"target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
"url": "https://github.com/symfony/DependencyInjection",
"reference": "v2.1.3"
"url": "https://github.com/symfony/DependencyInjection.git",
"reference": "v2.1.10"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/DependencyInjection/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.1.10",
"reference": "v2.1.10",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/yaml": "2.1.*",
"symfony/config": "2.1.*"
"symfony/config": "2.1.*",
"symfony/yaml": "2.1.*"
},
"suggest": {
"symfony/yaml": "2.1.*",
"symfony/config": "2.1.*"
"symfony/config": "2.1.*",
"symfony/yaml": "2.1.*"
},
"time": "2012-10-22 07:37:12",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\DependencyInjection": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -101,21 +94,22 @@
}
],
"description": "Symfony DependencyInjection Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-05-03 05:08:13"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.1.3",
"version": "v2.1.10",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher",
"reference": "v2.1.3"
"url": "https://github.com/symfony/EventDispatcher.git",
"reference": "v2.1.10"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/EventDispatcher/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.1.10",
"reference": "v2.1.10",
"shasum": ""
},
"require": {
@ -128,19 +122,13 @@
"symfony/dependency-injection": "2.1.*",
"symfony/http-kernel": "2.1.*"
},
"time": "2012-10-04 08:17:57",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\EventDispatcher": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -155,40 +143,35 @@
}
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-02-11 11:26:14"
},
{
"name": "symfony/http-foundation",
"version": "v2.1.3",
"version": "v2.1.10",
"target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation",
"reference": "v2.1.3"
"url": "https://github.com/symfony/HttpFoundation.git",
"reference": "v2.1.10"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/HttpFoundation/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.1.10",
"reference": "v2.1.10",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-10-20 00:10:30",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\HttpFoundation": "",
"SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -203,21 +186,22 @@
}
],
"description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-04-30 17:01:33"
},
{
"name": "symfony/http-kernel",
"version": "v2.1.3",
"version": "v2.1.10",
"target-dir": "Symfony/Component/HttpKernel",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel",
"reference": "v2.1.3"
"url": "https://github.com/symfony/HttpKernel.git",
"reference": "v2.1.10"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/HttpKernel/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.1.10",
"reference": "v2.1.10",
"shasum": ""
},
"require": {
@ -243,19 +227,13 @@
"symfony/dependency-injection": "2.1.*",
"symfony/finder": "2.1.*"
},
"time": "2012-10-30 01:14:14",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\HttpKernel": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -270,50 +248,45 @@
}
],
"description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-05-06 11:01:51"
},
{
"name": "symfony/routing",
"version": "v2.1.3",
"version": "v2.1.9",
"target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing",
"reference": "v2.1.3"
"url": "https://github.com/symfony/Routing.git",
"reference": "v2.1.9"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Routing/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/Routing/zipball/v2.1.9",
"reference": "v2.1.9",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"doctrine/common": ">=2.2,<3.0",
"symfony/config": "2.1.*",
"symfony/yaml": "2.1.*",
"symfony/http-kernel": "2.1.*",
"doctrine/common": ">=2.2,<2.4-dev"
"symfony/yaml": "2.1.*"
},
"suggest": {
"doctrine/common": "~2.2",
"symfony/config": "2.1.*",
"symfony/yaml": "2.1.*",
"doctrine/common": ">=2.2,<2.4-dev"
"symfony/yaml": "2.1.*"
},
"time": "2012-10-26 02:26:42",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\Routing": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -328,39 +301,34 @@
}
],
"description": "Symfony Routing Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-03-23 07:47:35"
},
{
"name": "symfony/yaml",
"version": "v2.1.3",
"version": "v2.1.9",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml",
"reference": "v2.1.3"
"url": "https://github.com/symfony/Yaml.git",
"reference": "v2.1.9"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Yaml/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.1.9",
"reference": "v2.1.9",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-10-29 04:15:41",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\Yaml": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -375,7 +343,8 @@
}
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-03-23 01:54:33"
}
],
"packages-dev": [
@ -394,28 +363,27 @@
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"ext-curl": "*",
"guzzle/guzzle": "3.0.*",
"php": ">=5.3.0",
"symfony/browser-kit": "2.1.*",
"symfony/css-selector": "2.1.*",
"symfony/dom-crawler": "2.1.*",
"symfony/finder": "2.1.*",
"symfony/process": "2.1.*",
"guzzle/guzzle": "3.0.*"
"symfony/process": "2.1.*"
},
"time": "2012-12-02 13:44:35",
"type": "application",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Goutte": "."
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -429,26 +397,27 @@
"homepage": "https://github.com/fabpot/Goutte",
"keywords": [
"scraper"
]
],
"time": "2012-12-02 13:44:35"
},
{
"name": "guzzle/guzzle",
"version": "v3.0.5",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle",
"reference": "v3.0.5"
"reference": "v3.0.7"
},
"dist": {
"type": "zip",
"url": "https://github.com/guzzle/guzzle/archive/v3.0.5.zip",
"reference": "v3.0.5",
"url": "https://github.com/guzzle/guzzle/archive/v3.0.7.zip",
"reference": "v3.0.7",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"ext-curl": "*",
"symfony/event-dispatcher": "2.1.*"
"php": ">=5.3.2",
"symfony/event-dispatcher": ">=2.1"
},
"replace": {
"guzzle/batch": "self.version",
@ -475,23 +444,27 @@
},
"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",
"phpunit/phpunit": "3.7.*",
"symfony/class-loader": "*",
"zend/zend-cache1": "1.12",
"phpunit/phpunit": "3.7.*"
"zend/zend-log1": "1.12",
"zendframework/zend-cache": "2.0.*",
"zendframework/zend-log": "2.0.*"
},
"time": "2012-11-19 00:15:33",
"type": "library",
"installation-source": "dist",
"extra": {
"branch-alias": {
"dev-master": "3.0-dev"
}
},
"autoload": {
"psr-0": {
"Guzzle\\Tests": "tests/",
"Guzzle": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -509,28 +482,29 @@
"description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
"homepage": "http://guzzlephp.org/",
"keywords": [
"framework",
"curl",
"http",
"rest",
"http client",
"client",
"curl",
"framework",
"http",
"http client",
"rest",
"web service"
]
],
"time": "2012-12-19 23:06:35"
},
{
"name": "symfony/browser-kit",
"version": "v2.1.3",
"version": "v2.1.10",
"target-dir": "Symfony/Component/BrowserKit",
"source": {
"type": "git",
"url": "https://github.com/symfony/BrowserKit",
"reference": "v2.1.3"
"url": "https://github.com/symfony/BrowserKit.git",
"reference": "v2.1.10"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/BrowserKit/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.10",
"reference": "v2.1.10",
"shasum": ""
},
"require": {
@ -538,25 +512,19 @@
"symfony/dom-crawler": "2.1.*"
},
"require-dev": {
"symfony/process": "2.1.*",
"symfony/css-selector": "2.1.*"
"symfony/css-selector": "2.1.*",
"symfony/process": "2.1.*"
},
"suggest": {
"symfony/process": "2.1.*"
},
"time": "2012-10-25 06:11:50",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\BrowserKit": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -571,39 +539,34 @@
}
],
"description": "Symfony BrowserKit Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-04-29 20:22:06"
},
{
"name": "symfony/css-selector",
"version": "v2.1.3",
"version": "v2.1.10",
"target-dir": "Symfony/Component/CssSelector",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector",
"reference": "v2.1.3"
"url": "https://github.com/symfony/CssSelector.git",
"reference": "v2.1.10"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/CssSelector/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.10",
"reference": "v2.1.10",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-10-04 08:17:57",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\CssSelector": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -618,21 +581,22 @@
}
],
"description": "Symfony CssSelector Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-01-09 08:51:07"
},
{
"name": "symfony/dom-crawler",
"version": "v2.1.3",
"version": "v2.1.10",
"target-dir": "Symfony/Component/DomCrawler",
"source": {
"type": "git",
"url": "https://github.com/symfony/DomCrawler",
"reference": "v2.1.3"
"url": "https://github.com/symfony/DomCrawler.git",
"reference": "v2.1.10"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/DomCrawler/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.10",
"reference": "v2.1.10",
"shasum": ""
},
"require": {
@ -644,19 +608,13 @@
"suggest": {
"symfony/css-selector": "2.1.*"
},
"time": "2012-10-18 14:16:01",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\DomCrawler": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -671,39 +629,34 @@
}
],
"description": "Symfony DomCrawler Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-03-27 17:13:16"
},
{
"name": "symfony/finder",
"version": "v2.1.3",
"version": "v2.1.10",
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder",
"reference": "v2.1.3"
"url": "https://github.com/symfony/Finder.git",
"reference": "v2.1.10"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Finder/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/Finder/zipball/v2.1.10",
"reference": "v2.1.10",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-10-20 00:10:30",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\Finder": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -718,39 +671,34 @@
}
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-03-06 19:26:55"
},
{
"name": "symfony/process",
"version": "v2.1.3",
"version": "v2.1.9",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process",
"reference": "v2.1.3"
"url": "https://github.com/symfony/Process.git",
"reference": "v2.1.9"
},
"dist": {
"type": "zip",
"url": "https://github.com/symfony/Process/zipball/v2.1.3",
"reference": "v2.1.3",
"url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.9",
"reference": "v2.1.9",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2012-10-20 00:10:30",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\Process": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -765,7 +713,8 @@
}
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com"
"homepage": "http://symfony.com",
"time": "2013-03-23 07:44:01"
}
],
"aliases": [
@ -774,5 +723,11 @@
"minimum-stability": "beta",
"stability-flags": [
],
"platform": [
],
"platform-dev": [
]
}