From 4cf2941023b2fc550e84980dacb2d9d8e9fb06d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 25 Nov 2015 21:53:00 +0100 Subject: [PATCH 1/4] Test travis for php7 --- .travis.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7dea8765cb2..0ee41da64fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,8 @@ matrix: - php: 7.0 env: - - DB=mysql +# - DB=mysql PHPCS_VERSION=">=1.5.1,<2.0" + - DB=mysql PHPCS_VERSION=">=2.0" # - DB=postgres before_script: @@ -44,11 +45,15 @@ before_script: - which phpunit - phpunit --version - echo Install phpcs then show installed rules - - pyrus install pear/PHP_CodeSniffer + - composer self-update + - composer require squizlabs/php_codesniffer:${PHPCS_VERSION} + - composer install - phpenv rehash - - which phpcs - - phpcs --version - - phpcs -i + - ln -s `pwd` htdocs/includes/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility + - htdocs/includes/squizlabs/php_codesniffer/scripts/phpcs --version +# - which phpcs +# - phpcs --version +# - phpcs -i - echo Create dir $(pwd)/htdocs/documents - sudo mkdir -p $(pwd)/htdocs/documents/admin/temp; - sudo touch $(pwd)/htdocs/documents/dolibarr.log; @@ -139,7 +144,7 @@ script: - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php - date # - phpcs -p --warning-severity=0 -s --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ htdocs/core/class/dolgraph.class.php 2>&1 - - phpcs -p --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/htdocs/conf/conf.php,/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1 + - htdocs/includes/squizlabs/php_codesniffer/scripts/phpcs -p --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/htdocs/conf/conf.php,/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1 - date after_script: From 4539d84609ee9209accd6bdb14e10e3019ad05ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 27 Nov 2015 00:35:07 +0100 Subject: [PATCH 2/4] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0ee41da64fc..49aaecd5c32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,7 @@ before_script: - htdocs/includes/squizlabs/php_codesniffer/scripts/phpcs --version # - which phpcs # - phpcs --version + - htdocs/includes/squizlabs/php_codesniffer/scripts/phpcs -i # - phpcs -i - echo Create dir $(pwd)/htdocs/documents - sudo mkdir -p $(pwd)/htdocs/documents/admin/temp; From 212fce2ab7771464235b2fb9393329595f6210b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 28 Nov 2015 17:36:03 +0100 Subject: [PATCH 3/4] Create composer.json.phpcs --- composer.json.phpcs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 composer.json.phpcs diff --git a/composer.json.phpcs b/composer.json.phpcs new file mode 100644 index 00000000000..5f5ea2d1fdf --- /dev/null +++ b/composer.json.phpcs @@ -0,0 +1,18 @@ +{ + "name": "dolibarr/dolibarr", + "type": "project", + "description": "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business", + "keywords": ["erp","crm","invoice","sme","proposal","order","stock"], + "homepage": "http://www.dolibarr.org", + "license": "GPL-3.0+", + "support": { + "issues": "https://github.com/Dolibarr/dolibarr/issues", + "forum": "http://www.dolibarr.org/forum", + "wiki": "http://wiki.dolibarr.org", + "irc": "irc://chat.freenode.net/dolibarr", + "source": "https://github.com/Dolibarr/dolibarr" + }, + "config": { + "vendor-dir": "htdocs/includes" + } +} From d178c1bf3786f4329811fc523d92f372d7b90016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 28 Nov 2015 17:38:48 +0100 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 49aaecd5c32..a31aff2eda7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,8 @@ before_script: - which phpunit - phpunit --version - echo Install phpcs then show installed rules + - cp composer.json composer.json.old + - cp composer.json.phpcs composer.json - composer self-update - composer require squizlabs/php_codesniffer:${PHPCS_VERSION} - composer install