Skip to content

Commit 49088a6

Browse files
committed
Updated till latest stable packages
1 parent 1d6fc5a commit 49088a6

File tree

127 files changed

+1779
-1511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+1779
-1511
lines changed

Diff for: .php_cs

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php declare(strict_types=1);
2+
3+
use ApiClients\Tools\TestUtilities\PhpCsFixerConfig;
4+
use PhpCsFixer\Config;
5+
6+
return (function (): Config
7+
{
8+
$paths = [
9+
__DIR__ . DIRECTORY_SEPARATOR . 'src',
10+
__DIR__ . DIRECTORY_SEPARATOR . 'tests',
11+
__DIR__ . DIRECTORY_SEPARATOR . 'examples',
12+
];
13+
14+
return PhpCsFixerConfig::create()
15+
->setFinder(
16+
PhpCsFixer\Finder::create()
17+
->in($paths)
18+
->append($paths)
19+
)
20+
->setUsingCache(false)
21+
;
22+
})();

Diff for: .travis.yml

+40-20
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,66 @@
11
language: php
2-
sudo: false
32

43
## Cache composer bits
54
cache:
65
directories:
7-
- $HOME/.composer/cache
8-
9-
## PHP versions we test against
10-
php:
11-
- 7.0
12-
- 7.1
13-
- nightly
6+
- $HOME/.composer/cache/files
147

158
## Build matrix for lowest and highest possible targets
169
matrix:
1710
include:
1811
- php: 7.0
19-
env: dependencies=lowest
12+
env:
13+
- qaExtended=true
14+
- php: 7.1
15+
- php: 7.2
16+
env:
17+
- dropPlatform=false
18+
- php: nightly
19+
env:
20+
- dropPlatform=false
21+
- php: 7.0
22+
env:
23+
- dependencies=lowest
2024
- php: 7.1
21-
env: dependencies=lowest
22-
- php: hhvm
23-
env: dependencies=lowest
25+
env:
26+
- dependencies=lowest
27+
- php: 7.2
28+
env:
29+
- dependencies=lowest
30+
- dropPlatform=false
2431
- php: nightly
25-
env: dependencies=lowest
32+
env:
33+
- dependencies=lowest
34+
- dropPlatform=false
2635
- php: 7.0
27-
env: dependencies=highest
36+
env:
37+
- dependencies=highest
2838
- php: 7.1
29-
env: dependencies=highest
30-
- php: hhvm
31-
env: dependencies=highest
39+
env:
40+
- dependencies=highest
41+
- php: 7.2
42+
env:
43+
- dependencies=highest
44+
- dropPlatform=false
3245
- php: nightly
33-
env: dependencies=highest
46+
env:
47+
- dependencies=highest
48+
- dropPlatform=false
3449

3550
## Install or update dependencies
3651
install:
52+
- composer validate
53+
- if [ -z "$dropPlatform" ]; then composer config --unset platform.php; fi;
54+
- if [ -z "$qaExtended" ]; then phpenv config-rm xdebug.ini || :; fi;
3755
- if [ -z "$dependencies" ]; then composer install --prefer-dist; fi;
3856
- if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest --prefer-dist -n; fi;
3957
- if [ "$dependencies" = "highest" ]; then composer update --prefer-dist -n; fi;
4058
- composer show
4159

4260
## Run the actual test
43-
script: make travis
61+
script:
62+
- if [ -z "$qaExtended" ]; then make ci; fi;
63+
- if [ "$qaExtended" = "true" ]; then make ci-extended; fi;
4464

4565
## Gather coverage and set it to coverage servers
46-
after_script: make travis-coverage
66+
after_script: if [ "$qaExtended" = "true" ]; then make ci-coverage; fi;

Diff for: Makefile

+26-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,35 @@
1-
all: cs unit
2-
travis: cs travis-unit
3-
contrib: cs unit
1+
all:
2+
composer run-script qa-all --timeout=0
3+
4+
all-coverage:
5+
composer run-script qa-all-coverage --timeout=0
6+
7+
ci:
8+
composer run-script qa-ci --timeout=0
9+
10+
ci-extended:
11+
composer run-script qa-ci-extended --timeout=0
12+
13+
contrib:
14+
composer run-script qa-contrib --timeout=0
415

516
init:
6-
if [ ! -d vendor ]; then composer install; fi;
17+
composer ensure-installed
18+
19+
cs:
20+
composer cs
721

8-
cs: init
9-
./vendor/bin/phpcs --standard=PSR2 src/
22+
cs-fix:
23+
composer cs-fix
1024

11-
unit: init
12-
./vendor/bin/phpunit --coverage-text --coverage-html covHtml
25+
unit:
26+
composer run-script unit --timeout=0
1327

14-
travis-unit: init
15-
./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml
28+
unit-coverage:
29+
composer run-script unit-coverage --timeout=0
1630

17-
travis-coverage: init
18-
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
31+
ci-coverage: init
32+
composer ci-coverage
1933

2034
generate-resources: init
2135
./vendor/bin/api-client-resource-generator ./resources.yml

Diff for: appveyor.yml

+20-14
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
build: false
22
platform:
3-
- x86
43
- x64
5-
clone_folder: c:\projects\php-travis-client
6-
4+
clone_folder: c:\projects\php-project-workspace
75

86
## Build matrix for lowest and highest possible targets
97
environment:
108
matrix:
119
- dependencies: lowest
10+
php_ver_target: 7.0
11+
- dependencies: lowest
12+
php_ver_target: 7.1
1213
- dependencies: current
14+
php_ver_target: 7.0
15+
- dependencies: current
16+
php_ver_target: 7.1
17+
- dependencies: highest
18+
php_ver_target: 7.0
1319
- dependencies: highest
20+
php_ver_target: 7.1
1421

15-
## Cache composer bits
22+
## Cache composer, chocolatey and php bits
1623
cache:
17-
- c:\tools\php -> appveyor.yml
1824
- '%LOCALAPPDATA%\Composer\files -> composer.lock'
1925

2026
## Set up environment varriables
@@ -27,8 +33,7 @@ init:
2733
## Install PHP and composer, and run the appropriate composer command
2834
install:
2935
- IF EXIST c:\tools\php (SET PHP=0)
30-
- IF %PHP%==1 cinst -y OpenSSL.Light
31-
- IF %PHP%==1 cinst -y php
36+
- ps: appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
3237
- cd c:\tools\php
3338
- IF %PHP%==1 copy php.ini-production php.ini /Y
3439
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini
@@ -37,14 +42,15 @@ install:
3742
- IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
3843
- IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
3944
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
40-
- appveyor DownloadFile https://getcomposer.org/composer.phar
41-
- cd c:\projects\php-travis-client
42-
- IF %dependencies%==lowest composer update --prefer-lowest --no-progress -n
43-
- IF %dependencies%==current composer install --no-progress
44-
- IF %dependencies%==highest composer update --no-progress -n
45-
- composer show -i
45+
- appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
46+
- cd c:\projects\php-project-workspace
47+
- composer config --unset platform.php
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
4652

4753
## Run the actual test
4854
test_script:
49-
- cd c:\projects\php-travis-client
55+
- cd c:\projects\php-project-workspace
5056
- vendor/bin/phpunit -c phpunit.xml.dist

Diff for: composer.json

+62-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"name": "api-clients/rabbitmq-management",
3+
"description": "RabbitMQ Management API client",
34
"license": "MIT",
4-
"minimum-stability": "dev",
5-
"prefer-stable": true,
65
"authors": [
76
{
87
"name": "Cees-Jan Kiewiet",
@@ -12,15 +11,15 @@
1211
"require": {
1312
"php": "^7.0",
1413
"api-clients/client-services": "^1.1",
15-
"api-clients/foundation": "dev-master",
14+
"api-clients/foundation": "^1.0",
1615
"api-clients/middleware-json": "^3.0||^2.0",
1716
"api-clients/middleware-user-agent": "^2.0",
1817
"api-clients/resource": "^3.0"
1918
},
2019
"require-dev": {
21-
"api-clients/resource-generator": "dev-master",
22-
"api-clients/resource-test-utilities": "dev-master",
23-
"api-clients/test-utilities": "^3.0.1"
20+
"api-clients/resource-generator": "^1.0",
21+
"api-clients/resource-test-utilities": "^1.0",
22+
"api-clients/test-utilities": "^4.2"
2423
},
2524
"autoload": {
2625
"psr-4": {
@@ -33,6 +32,62 @@
3332
}
3433
},
3534
"config": {
36-
"sort-packages": true
35+
"sort-packages": true,
36+
"platform": {
37+
"php": "7.0.22"
38+
}
39+
},
40+
"scripts": {
41+
"ensure-installed": "composer install --ansi -n -q",
42+
"cs": [
43+
"@ensure-installed",
44+
"php-cs-fixer fix --config=.php_cs --ansi --dry-run --diff --verbose --allow-risky=yes --show-progress=estimating"
45+
],
46+
"cs-fix": [
47+
"@ensure-installed",
48+
"php-cs-fixer fix --config=.php_cs --ansi --verbose --allow-risky=yes --show-progress=estimating"
49+
],
50+
"unit": [
51+
"@ensure-installed",
52+
"phpunit --colors=always -c phpunit.xml.dist"
53+
],
54+
"unit-coverage": [
55+
"@ensure-installed",
56+
"phpunit --colors=always -c phpunit.xml.dist --coverage-text --coverage-html covHtml --coverage-clover ./build/logs/clover.xml"
57+
],
58+
"lint-php": [
59+
"@ensure-installed",
60+
"parallel-lint --exclude vendor ."
61+
],
62+
"qa-all": [
63+
"@lint-php",
64+
"@cs",
65+
"@unit"
66+
],
67+
"qa-all-coverage": [
68+
"@lint-php",
69+
"@cs",
70+
"@unit-coverage"
71+
],
72+
"qa-windows": [
73+
"@lint-php",
74+
"@cs",
75+
"@unit"
76+
],
77+
"qa-ci": [
78+
"@unit"
79+
],
80+
"qa-ci-extended": [
81+
"@qa-all-coverage"
82+
],
83+
"qa-ci-windows": [
84+
"@qa-windows"
85+
],
86+
"qa-contrib": [
87+
"@qa-all"
88+
],
89+
"ci-coverage": [
90+
"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"
91+
]
3792
}
3893
}

0 commit comments

Comments
 (0)