Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Commit 0a29cad

Browse files
committed
Update CI config and composer.json
- Bump dependencies - Add support section to composer.json - Remove docs build step from CI config - Remove notificatins from CI config - Drop hhvm from CI build matrix - Add php 7.2 to CI build matrix
1 parent 6f47fd6 commit 0a29cad

File tree

5 files changed

+113
-453
lines changed

5 files changed

+113
-453
lines changed

.docheader

Lines changed: 0 additions & 5 deletions
This file was deleted.

.travis.yml

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,18 @@ language: php
44

55
branches:
66
except:
7-
- /^release-\d+\.\d+\.\d+.*$/
7+
- /^release-.*$/
88
- /^ghgfk-.*$/
9-
109
cache:
1110
directories:
1211
- $HOME/.composer/cache
13-
- $HOME/.local
14-
- vendor
15-
- zf-mkdoc-theme
1612

1713
env:
1814
global:
1915
- COMPOSER_ARGS="--no-interaction"
2016
- COVERAGE_DEPS="satooshi/php-coveralls"
2117
- LEGACY_DEPS="phpunit/phpunit"
2218
- TESTS_ZEND_HTTP_CLIENT_ONLINE=true
23-
- SITE_URL=https://zendframework.github.io/zend-http
24-
- GH_USER_NAME="Matthew Weier O'Phinney"
25-
- GH_USER_EMAIL=matthew@weierophinney.net
26-
- GH_REF=github.com/zendframework/zend-http.git
27-
- secure: "dla3bBhLgsNCSTFaQJF41P56GoNTDOlZA4OGdu14xsTdtcbncPtZ33oojsxXH5XtdB7bYTpMTx7IC+2FEIrWvfbtaFSdOBoriZz+DuvZKCaD/M56H3q3gAumuXvLBH/R+14uFLNRViztP/6uUUVvwRGSnYub2byaX5xTWRelzQjU15p6l8DA7N7RB9hWeZq+41RhpH3DBZOFHpsy+ezy/GWu005CVdSkBG4p5wHW9hs7LBFqn+kN0Qa1zjX3G+p/Gn28+ro1FF5T8TK/hbI/0hDnVJUjSOUXi5VcsOFcnJ50XZBa42PYI6/P6zSI7uuqQzlsefGXslsnYcsmagmACACrnH0nHJB29jlIGzRLOSGpFzOLDjDjlSCOHwZjeLF6tGeEtBQMp+VNnM3GQb5YEaXEmvvt+m+LEvm8mD2w4A47yydYP6AoLBlGpEEORfqUAhSLOJLoXuGAb90wEe4mIRIJegqQQihWppIMWIVXS2kdGSwzA/WnAuyAKywUiXgCcxsW6Aa8DZl1vTgeBA2MkwsBB3IhAweRVaJHnv4ijVWTN0BrAd0naPB+8XzcXgbtpsoRl+Z5RFAFCJQ+nJucdFMkKyr1DotfspyhnbRw4gOZufjCzTQaox8/DbPS0dmb1Zbzb1t80uqPQmMwdtek4Ovm7IVX2iRW3pluS9PWg5Q="
2819

2920
matrix:
3021
include:
@@ -34,9 +25,8 @@ matrix:
3425
- php: 5.6
3526
env:
3627
- DEPS=locked
28+
- CS_CHECK=true
3729
- TEST_COVERAGE=true
38-
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
39-
- PATH="$HOME/.local/bin:$PATH"
4030
- php: 5.6
4131
env:
4232
- DEPS=latest
@@ -46,7 +36,6 @@ matrix:
4636
- php: 7
4737
env:
4838
- DEPS=locked
49-
- CS_CHECK=true
5039
- php: 7
5140
env:
5241
- DEPS=latest
@@ -59,20 +48,20 @@ matrix:
5948
- php: 7.1
6049
env:
6150
- DEPS=latest
62-
- php: hhvm
51+
- php: 7.2
6352
env:
6453
- DEPS=lowest
65-
- php: hhvm
54+
- php: 7.2
6655
env:
6756
- DEPS=locked
68-
- php: hhvm
57+
- php: 7.2
6958
env:
7059
- DEPS=latest
7160
allow_failures:
72-
- php: hhvm
61+
- php: 7.2
7362

7463
before_install:
75-
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
64+
- if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
7665
- travis_retry composer self-update
7766

7867
install:
@@ -81,20 +70,14 @@ install:
8170
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
8271
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
8372
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
84-
- composer show
73+
- stty cols 120 && composer show
8574

8675
script:
8776
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
8877
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
89-
- if [[ $CS_CHECK == 'true' ]]; then composer license-check ; fi
90-
- if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
9178

9279
after_script:
9380
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
9481

95-
after_success:
96-
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
97-
9882
notifications:
99-
irc: "irc.freenode.org#zftalk.dev"
10083
email: false

composer.json

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,35 @@
11
{
22
"name": "zendframework/zend-http",
33
"description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
4+
"homepage": "https://github.com/zendframework/zend-http",
45
"license": "BSD-3-Clause",
56
"keywords": [
6-
"zf2",
7-
"http"
7+
"zf",
8+
"zend",
9+
"zendframework",
10+
"http",
11+
"HTTP client"
812
],
9-
"homepage": "https://github.com/zendframework/zend-http",
10-
"extra": {
11-
"branch-alias": {
12-
"dev-master": "2.7-dev",
13-
"dev-develop": "2.8-dev"
14-
}
13+
"support": {
14+
"docs": "https://docs.zendframework.com/zend-http",
15+
"issues": "https://github.com/zendframework/zend-http/issues",
16+
"source": "https://github.com/zendframework/zend-http",
17+
"rss": "https://github.com/zendframework/zend-http/releases.atom",
18+
"slack": "https://zendframework-slack.herokuapp.com",
19+
"forum": "https://discourse.zendframework.com/c/questions/components"
20+
},
21+
"config": {
22+
"sort-packages": true
1523
},
1624
"require": {
1725
"php": "^5.6 || ^7.0",
1826
"zendframework/zend-loader": "^2.5.1",
1927
"zendframework/zend-stdlib": "^3.1 || ^2.7.7",
2028
"zendframework/zend-uri": "^2.5.2",
21-
"zendframework/zend-validator": "^2.8.2"
29+
"zendframework/zend-validator": "^2.10.1"
2230
},
2331
"require-dev": {
24-
"malukenho/docheader": "^0.1.5",
25-
"phpunit/phpunit": "^6.0.8 || ^5.7.15",
32+
"phpunit/phpunit": "^6.4.1 || ^5.7.15",
2633
"zendframework/zend-coding-standard": "~1.0.0",
2734
"zendframework/zend-config": "^3.1 || ^2.6"
2835
},
@@ -36,17 +43,21 @@
3643
"ZendTest\\Http\\": "test/"
3744
}
3845
},
46+
"extra": {
47+
"branch-alias": {
48+
"dev-master": "2.7-dev",
49+
"dev-develop": "2.8-dev"
50+
}
51+
},
3952
"scripts": {
4053
"check": [
41-
"@license-check",
4254
"@cs-check",
4355
"@test"
4456
],
4557
"cs-check": "phpcs",
4658
"cs-fix": "phpcbf",
4759
"test": "phpunit --colors=always",
4860
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
49-
"license-check": "vendor/bin/docheader check src/",
5061
"upload-coverage": "coveralls -v"
5162
}
5263
}

0 commit comments

Comments
 (0)