Skip to content

Commit 56e5529

Browse files
authored
Improve config (#3)
1 parent a8f0cec commit 56e5529

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

.scrutinizer.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ build:
1616
stop_on_failure: true
1717
override:
1818
- php-scrutinizer-run --enable-security-analysis
19-
-
20-
command: make codestyle
21-
analysis:
22-
file: 'build/reports/cs-data'
23-
format: 'php-cs-checkstyle'
19+
- make codestyle
2420
-
2521
command: make coverage
2622
idle_timeout: 1200
@@ -39,8 +35,7 @@ build:
3935
COMPOSER_OPTIONS: '--optimize-autoloader'
4036
COVERAGE_OUTPUT_STYLE: 'clover'
4137
COVERAGE_CLOVER_FILE_PATH: 'build/coverage/clover.xml'
42-
PHPCS_REPORT_STYLE: 'checkstyle'
43-
PHPCS_REPORT_FILE: 'build/reports/cs-data'
38+
PHPCS_DISABLE_WARNING: "true"
4439
php:
4540
version: "7.1"
4641
timezone: UTC

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ COVERAGE_CLOVER_FILE_PATH ?= ${COVERAGE_DIRECTORY}/clover.xml
1313
#COMPOSER_OPTIONS=
1414
### Phpcs
1515
PHPCS_REPORT_STYLE ?= full
16+
PHPCS_DISABLE_WARNING ?= "false"
1617
#PHPCS_REPORT_FILE=
1718
#PHPCS_REPORT_FILE_OPTION=
1819

@@ -51,6 +52,12 @@ ifneq ("${PHPCS_REPORT_FILE}","")
5152
PHPCS_REPORT_FILE_OPTION ?= --report-file=${PHPCS_REPORT_FILE}
5253
endif
5354

55+
ifneq ("${PHPCS_DISABLE_WARNING}","true")
56+
PHPCS_DISABLE_WARNING_OPTION=
57+
else
58+
PHPCS_DISABLE_WARNING_OPTION=-n
59+
endif
60+
5461

5562
## Project build (install and configure)
5663
build: install configure
@@ -76,7 +83,7 @@ test-functional:
7683
./vendor/bin/behat ${BEHAT_COLOR_OPTION} ${BEHAT_OUTPUT_STYLE_OPTION} --no-snippets
7784

7885
codestyle: create-reports-directory
79-
./vendor/bin/phpcs --standard=phpcs.xml.dist ${PHPCS_COLOR_OPTION} ${PHPCS_REPORT_FILE_OPTION} --report=${PHPCS_REPORT_STYLE}
86+
./vendor/bin/phpcs ${PHPCS_DISABLE_WARNING_OPTION} --standard=phpcs.xml.dist ${PHPCS_COLOR_OPTION} ${PHPCS_REPORT_FILE_OPTION} --report=${PHPCS_REPORT_STYLE}
8087

8188
coverage: create-coverage-directory
8289
./vendor/bin/phpunit ${PHPUNIT_COLOR_OPTION} ${PHPUNIT_OUTPUT_STYLE_OPTION} ${PHPUNIT_COVERAGE_OPTION}

composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "yoanm/jsonrpc-params-symfony-validator-sdk",
3-
"description": "Symfony Server SDK to convert an HTTP json-rpc request into HTTP json-rpc response",
4-
"license": "GPL-3.0-only",
3+
"description": "Simple JSON-RPC params validator that use Symfony validator component",
4+
"license": "MIT",
55
"type": "library",
66
"support": {
77
"issues": "https://github.com/yoanm/php-jsonrpc-params-symfony-validator-sdk/issues"
@@ -25,8 +25,8 @@
2525
}
2626
},
2727
"require": {
28-
"php": ">5.5",
29-
"yoanm/jsonrpc-server-sdk": "~2.0",
28+
"php": ">=7.0",
29+
"yoanm/jsonrpc-server-sdk": "dev-release/3.0.0",
3030
"symfony/validator": "^3.0 || ^4.0"
3131
},
3232
"suggest": {
@@ -43,6 +43,7 @@
4343
"symfony/http-kernel": "^3.4",
4444
"symfony/routing": "^3.4",
4545
"yoanm/php-unit-extended": "~1.0",
46-
"yoanm/jsonrpc-server-doc-sdk": "dev-master"
47-
}
46+
"yoanm/jsonrpc-server-doc-sdk": "dev-release/1.0.0"
47+
},
48+
"minimum-stability": "dev"
4849
}

src/Model/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)