Skip to content

Commit 83add54

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents e27dab1 + 100584e commit 83add54

9 files changed

+2128
-4
lines changed

.scrutinizer.yml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
filter:
2+
paths: [src/*]
3+
excluded_paths: [examples/*, tests/*]
4+
tools:
5+
external_code_coverage: true
6+
php_analyzer: true
7+
php_hhvm: true
8+
php_sim: true
9+
php_pdepend: true
10+
sensiolabs_security_checker: true
11+
php_changetracking: true
12+
php_code_sniffer:
13+
enabled: true
14+
config:
15+
tab_width: 0
16+
encoding: utf8
17+
ruleset: ~
18+
standard: "PSR2"
19+
php_cs_fixer:
20+
enabled: true
21+
config:
22+
level: psr2
23+
php_mess_detector:
24+
enabled: true
25+
config:
26+
ruleset: ~
27+
code_size_rules:
28+
cyclomatic_complexity: true
29+
npath_complexity: true
30+
excessive_method_length: true
31+
excessive_class_length: true
32+
excessive_parameter_list: true
33+
excessive_public_count: true
34+
too_many_fields: true
35+
too_many_methods: true
36+
excessive_class_complexity: true
37+
design_rules:
38+
exit_expression: true
39+
eval_expression: true
40+
goto_statement: true
41+
number_of_class_children: true
42+
depth_of_inheritance: true
43+
coupling_between_objects: true
44+
unused_code_rules:
45+
unused_private_field: true
46+
unused_local_variable: true
47+
unused_private_method: true
48+
unused_formal_parameter: true
49+
naming_rules:
50+
short_variable:
51+
minimum: 3
52+
long_variable:
53+
maximum: 20
54+
short_method:
55+
minimum: 3
56+
constructor_conflict: true
57+
constant_naming: true
58+
boolean_method_name: true
59+
controversial_rules:
60+
superglobals: true
61+
camel_case_class_name: true
62+
camel_case_property_name: true
63+
camel_case_method_name: true
64+
camel_case_parameter_name: true
65+
camel_case_variable_name: true
66+
checks:
67+
php:
68+
code_rating: true

.travis.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
language: php
2+
sudo: false
3+
4+
## Cache composer bits
5+
cache:
6+
directories:
7+
- $HOME/.composer/cache
8+
9+
## PHP versions we test against
10+
php:
11+
- 5.5
12+
- 5.6
13+
- 7.0
14+
- 7.1
15+
- nightly
16+
- hhvm
17+
18+
## Build matrix for lowest and highest possible targets
19+
matrix:
20+
include:
21+
- php: 5.5
22+
env: dependencies=lowest
23+
- php: 5.6
24+
env: dependencies=lowest
25+
- php: 7.0
26+
env: dependencies=lowest
27+
- php: 7.1
28+
env: dependencies=lowest
29+
- php: nightly
30+
env: dependencies=lowest
31+
- php: hhvm
32+
env: dependencies=lowest
33+
- php: 5.5
34+
env: dependencies=highest
35+
- php: 5.6
36+
env: dependencies=highest
37+
- php: 7.0
38+
env: dependencies=highest
39+
- php: 7.1
40+
env: dependencies=highest
41+
- php: nightly
42+
env: dependencies=highest
43+
- php: hhvm
44+
env: dependencies=highest
45+
allow_failures:
46+
- php: hhvm
47+
48+
## Install or update dependencies
49+
install:
50+
#- composer validate
51+
- composer config --unset platform.php
52+
- if [ -z "$dependencies" ]; then composer install --prefer-dist; fi;
53+
- if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest --prefer-dist -n; fi;
54+
- if [ "$dependencies" = "highest" ]; then composer update --prefer-dist -n; fi;
55+
- composer show
56+
57+
## Run the actual test
58+
script: make ci
59+
60+
## Gather coverage and set it to coverage servers
61+
after_script: make ci-coverage

Makefile

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
all:
2+
composer qa-all
3+
4+
ci:
5+
composer qa-ci
6+
7+
contrib:
8+
composer qa-contrib
9+
10+
init:
11+
composer ensure-installed
12+
13+
cs:
14+
composer cs
15+
16+
unit:
17+
composer unit
18+
19+
mutation:
20+
composer mutation
21+
22+
ci-coverage: init
23+
composer ci-coverage

appveyor.yml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
build: false
2+
platform:
3+
- x64
4+
clone_folder: c:\projects\php-project-workspace
5+
6+
7+
## Build matrix for lowest and highest possible targets
8+
environment:
9+
matrix:
10+
- dependencies: lowest
11+
php_ver_target: 5.6
12+
- dependencies: lowest
13+
php_ver_target: 7.0
14+
- dependencies: current
15+
php_ver_target: 5.6
16+
- dependencies: highest
17+
php_ver_target: 7.0
18+
- dependencies: highest
19+
php_ver_target: 5.6
20+
- dependencies: highest
21+
php_ver_target: 7.0
22+
23+
## Cache composer bits
24+
cache:
25+
- '%LOCALAPPDATA%\Composer\files -> composer.lock'
26+
27+
## Set up environment varriables
28+
init:
29+
- SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
30+
- SET COMPOSER_NO_INTERACTION=1
31+
- SET PHP=1
32+
- SET ANSICON=121x90 (121x90)
33+
34+
## Install PHP and composer, and run the appropriate composer command
35+
install:
36+
- IF EXIST c:\tools\php (SET PHP=0)
37+
- ps: appveyor-retry cinst -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $Env:php_ver_target | Select-Object -first 1) -replace '[php|]','')
38+
- cd c:\tools\php
39+
- IF %PHP%==1 copy php.ini-production php.ini /Y
40+
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini
41+
- IF %PHP%==1 echo extension_dir=ext >> php.ini
42+
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
43+
- IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
44+
- IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
45+
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
46+
- appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
47+
- cd c:\projects\php-project-workspace
48+
- IF %dependencies%==lowest appveyor-retry composer update --prefer-lowest --no-progress --profile -n
49+
- IF %dependencies%==current appveyor-retry composer install --no-progress --profile
50+
- IF %dependencies%==highest appveyor-retry composer update --no-progress --profile -n
51+
- composer show
52+
53+
## Run the actual test
54+
test_script:
55+
- cd c:\projects\php-project-workspace
56+
- vendor/bin/phpunit -c phpunit.xml.dist

composer.json

+41
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
"php": "^7.0 || ^5.5",
1616
"psr/http-message": "^1.0"
1717
},
18+
"require-dev": {
19+
"humbug/humbug": "1.0.0-alpha2",
20+
"phpunit/phpunit": "^5.5 || ^4.8",
21+
"squizlabs/php_codesniffer": "^2.6"
22+
},
1823
"autoload": {
1924
"psr-4": {
2025
"ApiClients\\Tools\\Psr7\\Oauth1\\": "src/"
@@ -30,5 +35,41 @@
3035
"platform": {
3136
"php": "5.5.9"
3237
}
38+
},
39+
"scripts": {
40+
"ensure-installed": "composer install --ansi -n -q",
41+
"cs": [
42+
"@ensure-installed",
43+
"phpcs --standard=PSR2 src/"
44+
],
45+
"unit": [
46+
"@ensure-installed",
47+
"phpunit --colors=always -c phpunit.xml.dist --coverage-text --coverage-html covHtml"
48+
],
49+
"mutation": [
50+
"@ensure-installed",
51+
"if [ `php -m | grep xdebug | wc -l` -gt 0 ]; then humbug --ansi --incremental; fi"
52+
],
53+
"qa-all": [
54+
"@cs",
55+
"@unit",
56+
"@mutation"
57+
],
58+
"qa-windows": [
59+
"@cs",
60+
"@unit"
61+
],
62+
"qa-ci": [
63+
"@qa-all"
64+
],
65+
"qa-ci-windows": [
66+
"@qa-windows"
67+
],
68+
"qa-contrib": [
69+
"@qa-all"
70+
],
71+
"ci-coverage": [
72+
"if [ -f ./build/logs/clover.xml ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml; fi"
73+
]
3374
}
3475
}

0 commit comments

Comments
 (0)