diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-13 10:28:02 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-13 10:28:02 -0500 |
| commit | fd10d97cb1e6c43b88b923bab1015cafe03d379c (patch) | |
| tree | bf9b18e984e17cd631d2f9c01b50068224aba54b | |
| parent | 1584fdd26dd73610d76e1bacf25c442d5d59f0f9 (diff) | |
| parent | b1b37ddde2ddf6bae5d64e634f070c7f7afd251f (diff) | |
| download | forums-fd10d97cb1e6c43b88b923bab1015cafe03d379c.tar forums-fd10d97cb1e6c43b88b923bab1015cafe03d379c.tar.gz forums-fd10d97cb1e6c43b88b923bab1015cafe03d379c.tar.bz2 forums-fd10d97cb1e6c43b88b923bab1015cafe03d379c.tar.xz forums-fd10d97cb1e6c43b88b923bab1015cafe03d379c.zip | |
Merge branch 'develop-olympus' into develop
# By Igor Wiedler (1) and others
* develop-olympus:
[ticket/11671] Update composer.lock
[ticket/11671] Add phing as a dependency and upgrade deps
[ticket/11668] Move lint test to the end for travis
Conflicts:
phpBB/composer.lock
| -rw-r--r-- | phpBB/composer.json | 3 | ||||
| -rw-r--r-- | phpBB/composer.lock | 54 | ||||
| -rw-r--r-- | travis/phpunit-mysql-travis.xml | 4 | ||||
| -rw-r--r-- | travis/phpunit-postgres-travis.xml | 4 |
4 files changed, 63 insertions, 2 deletions
diff --git a/phpBB/composer.json b/phpBB/composer.json index a114d5c0e0..bf693d1950 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -12,6 +12,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 7b18d2fd25..1ba6cb6f83 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -3,7 +3,7 @@ "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": "e4a4f4848a7201d7e044446001afda29", + "hash": "6e6125b88160e28568edcb9fd007abed", "packages": [ { "name": "symfony/config", @@ -542,6 +542,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": { diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml index 2d6af0e2ac..715e66c223 100644 --- a/travis/phpunit-mysql-travis.xml +++ b/travis/phpunit-mysql-travis.xml @@ -15,6 +15,10 @@ <testsuite name="phpBB Test Suite"> <directory suffix="_test.php">../tests/</directory> <exclude>tests/functional</exclude> + <exclude>tests/lint_test.php</exclude> + </testsuite> + <testsuite name="phpBB Lint Test"> + <file>tests/lint_test.php</file> </testsuite> <testsuite name="phpBB Functional Tests"> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index a9062efafb..9f281b4c21 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -15,6 +15,10 @@ <testsuite name="phpBB Test Suite"> <directory suffix="_test.php">../tests/</directory> <exclude>tests/functional</exclude> + <exclude>tests/lint_test.php</exclude> + </testsuite> + <testsuite name="phpBB Lint Test"> + <file>tests/lint_test.php</file> </testsuite> <testsuite name="phpBB Functional Tests"> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> |