aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-07-12 16:08:13 -0400
committerNils Adermann <naderman@naderman.de>2013-07-12 16:47:08 -0400
commit97f633bcedbdc0dd037559f9b7be3f8921a053df (patch)
tree63fc49f4ad9a115c0568b6caf634f718887854cd /phpBB
parent036a4188f3409387046aacaf22854edae4ace999 (diff)
downloadforums-97f633bcedbdc0dd037559f9b7be3f8921a053df.tar
forums-97f633bcedbdc0dd037559f9b7be3f8921a053df.tar.gz
forums-97f633bcedbdc0dd037559f9b7be3f8921a053df.tar.bz2
forums-97f633bcedbdc0dd037559f9b7be3f8921a053df.tar.xz
forums-97f633bcedbdc0dd037559f9b7be3f8921a053df.zip
[ticket/11671] Add phing as a dependency and upgrade deps
PHPBB3-11671
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/composer.json3
-rw-r--r--phpBB/composer.lock170
2 files changed, 115 insertions, 58 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json
index 14190f5e82..9e73936322 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -2,6 +2,7 @@
"require-dev": {
"fabpot/goutte": "v0.1.0",
"phpunit/dbunit": "1.2.*",
- "phpunit/phpunit": "3.7.*"
+ "phpunit/phpunit": "3.7.*",
+ "phing/phing": "2.4.*"
}
}
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 70b352a320..dd09b6cd56 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -1,9 +1,5 @@
{
- "_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": "656de56578d4eb3e4779bc0ab95524f5",
+ "hash": "ef6d05965cca4e390fff7ce63e9d2d49",
"packages": [
],
@@ -153,6 +149,58 @@
"time": "2012-12-19 23:06:35"
},
{
+ "name": "phing/phing",
+ "version": "2.4.14",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phingofficial/phing",
+ "reference": "2.4.14"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://github.com/phingofficial/phing/archive/2.4.14.zip",
+ "reference": "2.4.14",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.2.0"
+ },
+ "bin": [
+ "bin/phing"
+ ],
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "classes/phing/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ "classes"
+ ],
+ "license": [
+ "LGPL3"
+ ],
+ "authors": [
+ {
+ "name": "Michiel Rook",
+ "email": "mrook@php.net"
+ },
+ {
+ "name": "Phing Community",
+ "homepage": "http://www.phing.info/trac/wiki/Development/Contributors"
+ }
+ ],
+ "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
+ "homepage": "http://www.phing.info/",
+ "keywords": [
+ "build",
+ "task",
+ "tool"
+ ],
+ "time": "2012-11-29 21:23:47"
+ },
+ {
"name": "phpunit/dbunit",
"version": "1.2.3",
"source": {
@@ -212,16 +260,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "1.2.9",
+ "version": "1.2.12",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "1.2.9"
+ "reference": "1.2.12"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.9",
- "reference": "1.2.9",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.12",
+ "reference": "1.2.12",
"shasum": ""
},
"require": {
@@ -230,11 +278,19 @@
"phpunit/php-text-template": ">=1.1.1@stable",
"phpunit/php-token-stream": ">=1.1.3@stable"
},
+ "require-dev": {
+ "phpunit/phpunit": "3.7.*@dev"
+ },
"suggest": {
"ext-dom": "*",
"ext-xdebug": ">=2.0.5"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.2.x-dev"
+ }
+ },
"autoload": {
"classmap": [
"PHP/"
@@ -261,7 +317,7 @@
"testing",
"xunit"
],
- "time": "2013-02-26 18:55:56"
+ "time": "2013-07-06 06:26:16"
},
{
"name": "phpunit/php-file-iterator",
@@ -443,16 +499,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "3.7.19",
+ "version": "3.7.22",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "3.7.19"
+ "reference": "3.7.22"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.19",
- "reference": "3.7.19",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.22",
+ "reference": "3.7.22",
"shasum": ""
},
"require": {
@@ -461,12 +517,12 @@
"ext-reflection": "*",
"ext-spl": "*",
"php": ">=5.3.3",
- "phpunit/php-code-coverage": ">=1.2.1,<1.3.0",
+ "phpunit/php-code-coverage": "~1.2.1",
"phpunit/php-file-iterator": ">=1.3.1",
"phpunit/php-text-template": ">=1.1.1",
- "phpunit/php-timer": ">=1.0.2,<1.1.0",
- "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0",
- "symfony/yaml": ">=2.0.0,<2.3.0"
+ "phpunit/php-timer": "~1.0.2",
+ "phpunit/phpunit-mock-objects": "~1.2.0",
+ "symfony/yaml": "~2.0"
},
"require-dev": {
"pear-pear/pear": "1.9.4"
@@ -513,7 +569,7 @@
"testing",
"xunit"
],
- "time": "2013-03-25 11:45:06"
+ "time": "2013-07-06 06:29:15"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -566,17 +622,17 @@
},
{
"name": "symfony/browser-kit",
- "version": "v2.1.10",
+ "version": "v2.1.11",
"target-dir": "Symfony/Component/BrowserKit",
"source": {
"type": "git",
"url": "https://github.com/symfony/BrowserKit.git",
- "reference": "v2.1.10"
+ "reference": "v2.1.11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.10",
- "reference": "v2.1.10",
+ "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.11",
+ "reference": "v2.1.11",
"shasum": ""
},
"require": {
@@ -616,17 +672,17 @@
},
{
"name": "symfony/css-selector",
- "version": "v2.1.10",
+ "version": "v2.1.11",
"target-dir": "Symfony/Component/CssSelector",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector.git",
- "reference": "v2.1.10"
+ "reference": "v2.1.11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.10",
- "reference": "v2.1.10",
+ "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.11",
+ "reference": "v2.1.11",
"shasum": ""
},
"require": {
@@ -654,21 +710,21 @@
],
"description": "Symfony CssSelector Component",
"homepage": "http://symfony.com",
- "time": "2013-01-09 08:51:07"
+ "time": "2013-05-17 00:31:34"
},
{
"name": "symfony/dom-crawler",
- "version": "v2.1.10",
+ "version": "v2.1.11",
"target-dir": "Symfony/Component/DomCrawler",
"source": {
"type": "git",
"url": "https://github.com/symfony/DomCrawler.git",
- "reference": "v2.1.10"
+ "reference": "v2.1.11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.10",
- "reference": "v2.1.10",
+ "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.11",
+ "reference": "v2.1.11",
"shasum": ""
},
"require": {
@@ -702,21 +758,21 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "http://symfony.com",
- "time": "2013-03-27 17:13:16"
+ "time": "2013-05-16 00:06:15"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.2.1",
+ "version": "v2.3.1",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "v2.2.1"
+ "reference": "v2.3.1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.1",
- "reference": "v2.2.1",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.3.1",
+ "reference": "v2.3.1",
"shasum": ""
},
"require": {
@@ -726,13 +782,13 @@
"symfony/dependency-injection": ">=2.0,<3.0"
},
"suggest": {
- "symfony/dependency-injection": "2.2.*",
- "symfony/http-kernel": "2.2.*"
+ "symfony/dependency-injection": "",
+ "symfony/http-kernel": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.3-dev"
}
},
"autoload": {
@@ -756,21 +812,21 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
- "time": "2013-02-11 11:26:43"
+ "time": "2013-05-13 14:36:40"
},
{
"name": "symfony/finder",
- "version": "v2.1.10",
+ "version": "v2.1.11",
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder.git",
- "reference": "v2.1.10"
+ "reference": "v2.1.11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.1.10",
- "reference": "v2.1.10",
+ "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.1.11",
+ "reference": "v2.1.11",
"shasum": ""
},
"require": {
@@ -798,21 +854,21 @@
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com",
- "time": "2013-03-06 19:26:55"
+ "time": "2013-05-25 15:47:15"
},
{
"name": "symfony/process",
- "version": "v2.1.9",
+ "version": "v2.1.11",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
- "reference": "v2.1.9"
+ "reference": "v2.1.11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.9",
- "reference": "v2.1.9",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.11",
+ "reference": "v2.1.11",
"shasum": ""
},
"require": {
@@ -840,21 +896,21 @@
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
- "time": "2013-03-23 07:44:01"
+ "time": "2013-05-06 10:21:56"
},
{
"name": "symfony/yaml",
- "version": "v2.2.1",
+ "version": "v2.3.1",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "v2.2.1"
+ "reference": "v2.3.1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.1",
- "reference": "v2.2.1",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.3.1",
+ "reference": "v2.3.1",
"shasum": ""
},
"require": {
@@ -863,7 +919,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.3-dev"
}
},
"autoload": {
@@ -887,7 +943,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2013-03-23 07:49:54"
+ "time": "2013-05-10 18:12:13"
}
],
"aliases": [