From beb304c9470fa2d0b4cb0597b8ab9bd62bc01d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 20 Dec 2019 21:25:09 -0300 Subject: [PATCH 1/2] Fix coding standard error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/InsertEdit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 347ebc026f..10a91ae3a9 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -228,8 +228,8 @@ class InsertEdit /** * Add some url parameters * - * @param array $url_params containing $db and $table as url parameters - * @param array $where_clause_array where clauses array + * @param array $url_params containing $db and $table as url parameters + * @param array $where_clause_array where clauses array * * @return array Add some url parameters to $url_params array and return it */ From e69b22e9f71fb2467324c785ac8f66a8853bf5b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 20 Dec 2019 22:10:42 -0300 Subject: [PATCH 2/2] Add phpcs to the Travis build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds composer test command. Signed-off-by: Maurício Meneghini Fauth --- .travis.yml | 7 +++++++ composer.json | 6 ++++++ phpcs.xml.dist | 20 +++++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b37a20a175..d5da9faa34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,6 +119,13 @@ matrix: env: CI_MODE=test install: - composer install --no-interaction --ignore-platform-reqs + - php: "7.1" + before_script: skip + after_script: skip + after_success: skip + script: + - test/ci-lint + - vendor/bin/phpcs --standard=phpcs.xml.dist allow_failures: - php: "nightly" diff --git a/composer.json b/composer.json index 5653a0d826..2423a2565a 100644 --- a/composer.json +++ b/composer.json @@ -93,5 +93,11 @@ "branch-alias": { "dev-master": "4.9.x-dev" } + }, + "scripts": { + "test": [ + "phpcs", + "phpunit --color=always" + ] } } diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 7925efebc7..72448ac474 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -1,6 +1,24 @@ - + + + + + + + + + + + + + + + + + + +