From 8c9b7083d8f193f8613af7e02638665d8310ea82 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 12 Apr 2014 07:47:26 +0200 Subject: [PATCH 1/2] Depend on phing/phing build script. --- composer.json | 1 + composer.lock | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0b2b419f..005873f3 100644 --- a/composer.json +++ b/composer.json @@ -49,6 +49,7 @@ "php": ">=5.0.0" }, "require-dev": { + "phing/phing": "2.7.*", "phpunit/phpunit": "4.0.*", "squizlabs/php_codesniffer": "1.*" }, diff --git a/composer.lock b/composer.lock index f5677fe6..64a120fa 100644 --- a/composer.lock +++ b/composer.lock @@ -3,11 +3,63 @@ "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": "e508db8f195e0056e162042b6d51e242", + "hash": "5aa15d99ad03d53bff56d47fdbd53211", "packages": [ ], "packages-dev": [ + { + "name": "phing/phing", + "version": "2.7.0", + "source": { + "type": "git", + "url": "https://github.com/phingofficial/phing.git", + "reference": "bd2689790c620ac745b3ad29765c641a0dd5d007" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phingofficial/phing/zipball/bd2689790c620ac745b3ad29765c641a0dd5d007", + "reference": "bd2689790c620ac745b3ad29765c641a0dd5d007", + "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": "2014-02-13 13:17:59" + }, { "name": "phpunit/php-code-coverage", "version": "2.0.5", From 4a064a050610f13938337a8aa7b5a78ac52e534b Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 12 Apr 2014 07:47:53 +0200 Subject: [PATCH 2/2] Run Code Sniffer via phing. --- .travis.yml | 3 +-- build/build.xml | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 build/build.xml diff --git a/.travis.yml b/.travis.yml index 822dae91..c6f56a9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,7 @@ before_script: - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then travis/setup-composer.sh; fi" script: - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' ]; then vendor/bin/phpcs -s --extensions=php --standard=build/code-sniffer-ruleset.xml phpseclib/; fi" - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' ]; then vendor/bin/phpcs -s --extensions=php --standard=build/code-sniffer-ruleset-tests.xml tests/; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' ]; then vendor/bin/phing -f build/build.xml sniff; fi" - travis/run-phpunit.sh after_success: diff --git a/build/build.xml b/build/build.xml new file mode 100644 index 00000000..b29f20e5 --- /dev/null +++ b/build/build.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + +