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

Commit b716415

Browse files
XerkusXerkus
committed
2.9.0 readiness
2 parents df1682a + 462bc0f commit b716415

Some content is hidden

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

77 files changed

+2851
-448
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ doc/html/
1111
zf-mkdoc-theme/
1212

1313
clover.xml
14-
composer.lock
1514
coveralls-upload.json
1615
phpunit.xml
1716
vendor

‎.travis.yml

Lines changed: 61 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,64 +15,101 @@ cache:
1515

1616
env:
1717
global:
18+
- COMPOSER_ARGS="--no-interaction"
19+
- COVERAGE_DEPS="satooshi/php-coveralls"
20+
- LEGACY_DEPS="phpunit/phpunit"
1821
- TESTS_ZEND_VALIDATOR_ONLINE_ENABLED=true
19-
- SITE_URL: https://zendframework.github.io/zend-validator
20-
- GH_USER_NAME: "Matthew Weier O'Phinney"
21-
- GH_USER_EMAIL: [email protected]
22-
- GH_REF: github.com/zendframework/zend-validator.git
23-
- secure: "SoUsUxBFCuC0rVQyDJ/+IB38glC5WeWvg0XxtNj79di7wsQ92Jofp6Uu3NJBB8H1+at1pHetphRm4N+GPQmZGMFTG7LyF5u8duV8t4nDpAz5WfoP1y0IyacP6IrWzANeszOTZ04dlHu3dBdHusNpNxxUHl97bSx4XQUAm2GUTqNkuXNgQJFAAxx91jb5txG4W8KeMnfRm9jeDHP17BCnBMaSkYEXeLpHkYa9wA4lBJ7ZD6LuSC+MhrJCtREBTsWKLJY6xeBjRorUug+uCrNyArPtcOAaOLMSDJ1XIi3L5/Q7HdoldV7aC3V5HjNlpdIEFl33IGiCOyictFCpT1KaKx7TL8zDTMCiqe0cCyfTnq28lzULz2hXg0Kov7BFcRr2Ht/1f96RgrakWQiYTmk+C3YYYA16Fb+MndkMI3WH7WI0suC+5nhPdGl53MCWsd5x2+dDk/ifB/VvxHdGhhgxzAxsYJ41gV/LlzjbCQJNDCnTaL/GHCTUGJEPgwLrn2W52uZx6VggE9wl5z4XkiPqBy6zAAdwF55RRJgCxFttGOMVGdegFLHTf6+13S4sEImNmyVTeuJBZEHxaYRJ21wweOocjC2StKC9V54uPysDcEYwhu8WOsYU34fQdpMx3OHfPmXvhNGqoZ1rVsd5HM0QZZMT+7SI0r3UNKxrPC8LEAU="
22+
- SITE_URL=https://zendframework.github.io/zend-validator
23+
- GH_USER_NAME="Matthew Weier O'Phinney"
24+
- GH_USER_EMAIL=[email protected]
25+
- GH_REF=github.com/zendframework/zend-validator.git
26+
- secure="SoUsUxBFCuC0rVQyDJ/+IB38glC5WeWvg0XxtNj79di7wsQ92Jofp6Uu3NJBB8H1+at1pHetphRm4N+GPQmZGMFTG7LyF5u8duV8t4nDpAz5WfoP1y0IyacP6IrWzANeszOTZ04dlHu3dBdHusNpNxxUHl97bSx4XQUAm2GUTqNkuXNgQJFAAxx91jb5txG4W8KeMnfRm9jeDHP17BCnBMaSkYEXeLpHkYa9wA4lBJ7ZD6LuSC+MhrJCtREBTsWKLJY6xeBjRorUug+uCrNyArPtcOAaOLMSDJ1XIi3L5/Q7HdoldV7aC3V5HjNlpdIEFl33IGiCOyictFCpT1KaKx7TL8zDTMCiqe0cCyfTnq28lzULz2hXg0Kov7BFcRr2Ht/1f96RgrakWQiYTmk+C3YYYA16Fb+MndkMI3WH7WI0suC+5nhPdGl53MCWsd5x2+dDk/ifB/VvxHdGhhgxzAxsYJ41gV/LlzjbCQJNDCnTaL/GHCTUGJEPgwLrn2W52uZx6VggE9wl5z4XkiPqBy6zAAdwF55RRJgCxFttGOMVGdegFLHTf6+13S4sEImNmyVTeuJBZEHxaYRJ21wweOocjC2StKC9V54uPysDcEYwhu8WOsYU34fQdpMx3OHfPmXvhNGqoZ1rVsd5HM0QZZMT+7SI0r3UNKxrPC8LEAU="
2427

2528
matrix:
26-
fast_finish: true
2729
include:
28-
- php: 5.5
29-
env:
30-
- CS_CHECK=true
31-
- EXECUTE_HOSTNAME_CHECK=true
32-
- php: 5.5
30+
- php: 5.6
3331
env:
34-
- SERVICE_MANAGER_VERSION="^2.7.5"
32+
- DEPS=lowest
3533
- php: 5.6
3634
env:
35+
- DEPS=locked
36+
- EXECUTE_HOSTNAME_CHECK=true
3737
- TEST_COVERAGE=true
3838
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
3939
- PATH="$HOME/.local/bin:$PATH"
4040
- php: 5.6
4141
env:
42+
- DEPS=locked
4243
- SERVICE_MANAGER_VERSION="^2.7.5"
44+
- php: 5.6
45+
env:
46+
- DEPS=latest
47+
- php: 7
48+
env:
49+
- DEPS=lowest
4350
- php: 7
51+
env:
52+
- DEPS=locked
53+
- CS_CHECK=true
4454
- php: 7
4555
env:
56+
- DEPS=locked
4657
- SERVICE_MANAGER_VERSION="^2.7.5"
47-
- php: hhvm
58+
- php: 7
59+
env:
60+
- DEPS=latest
61+
- php: 7.1
62+
env:
63+
- DEPS=lowest
64+
- php: 7.1
65+
env:
66+
- DEPS=locked
67+
- php: 7.1
68+
env:
69+
- DEPS=latest
70+
- php: hhvm
71+
env:
72+
- DEPS=lowest
73+
- php: hhvm
74+
env:
75+
- DEPS=locked
76+
- php: hhvm
77+
env:
78+
- DEPS=latest
4879
- php: hhvm
4980
env:
81+
- DEPS=locked
5082
- SERVICE_MANAGER_VERSION="^2.7.5"
5183
allow_failures:
5284
- php: hhvm
5385

54-
notifications:
55-
irc: "irc.freenode.org#zftalk.dev"
56-
email: false
57-
5886
before_install:
5987
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
60-
- composer self-update
61-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
62-
- if [[ $SERVICE_MANAGER_VERSION != '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:$SERVICE_MANAGER_VERSION" ; fi
63-
- if [[ $SERVICE_MANAGER_VERSION == '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:^3.0.3" ; fi
88+
- travis_retry composer self-update
6489

6590
install:
66-
- travis_retry composer install --no-interaction --ignore-platform-reqs
91+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
92+
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
93+
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
94+
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
95+
- if [[ $SERVICE_MANAGER_VERSION != '' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS "zendframework/zend-servicemanager:$SERVICE_MANAGER_VERSION" ; fi
96+
- if [[ $SERVICE_MANAGER_VERSION == '' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS "zendframework/zend-servicemanager:^3.0.3" ; fi
97+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
98+
- stty cols 120
99+
- COLUMNS=120 composer show
67100

68101
script:
69102
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
70103
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
71104
- if [[ $EXECUTE_HOSTNAME_CHECK == "true" && $TRAVIS_PULL_REQUEST == "false" ]]; then php bin/update_hostname_validator.php --check-only; fi
72105
- 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
73106

107+
after_script:
108+
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
109+
74110
after_success:
75111
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
76112

77-
after_script:
78-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
113+
notifications:
114+
irc: "irc.freenode.org#zftalk.dev"
115+
email: false

‎CHANGELOG.md

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,34 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5-
## 2.9.0 - TBD
5+
## 2.9.0 - 2017-03-17
66

77
### Added
88

9-
- Nothing.
9+
- [#78](https://github.com/zendframework/zend-validator/pull/78) added
10+
`%length%` as an optional message variable in StringLength validator
1011

1112
### Deprecated
1213

1314
- Nothing.
1415

1516
### Removed
1617

17-
- Nothing.
18-
19-
### Fixed
20-
21-
- Nothing.
22-
23-
24-
## 2.8.3 - TBD
25-
26-
### Added
27-
28-
- Nothing.
29-
30-
### Deprecated
31-
32-
- Nothing.
33-
34-
### Removed
35-
36-
- Nothing.
18+
- [#151](https://github.com/zendframework/zend-validator/pull/151) dropped
19+
php 5.5 support
3720

3821
### Fixed
3922

4023
- [#147](https://github.com/zendframework/zend-validator/issues/147)
41-
[#148](https://github.com/zendframework/zend-validator/pull/110) adds further
24+
[#148](https://github.com/zendframework/zend-validator/pull/148) adds further
4225
`"suggest"` clauses in `composer.json`, since some dependencies are not always
4326
required, and may lead to runtime failures.
4427
- [#66](https://github.com/zendframework/zend-validator/pull/66) fixed
4528
EmailAddress validator applying IDNA conversion to local part
4629
- [#88](https://github.com/zendframework/zend-validator/pull/88) fixed NotEmpty
4730
validator incorrectly applying types bitmaps
4831
- [#150](https://github.com/zendframework/zend-validator/pull/150) fixed Hostname
49-
validator not allowiing some characters in .dk IDN
50-
32+
validator not allowing some characters in .dk IDN
5133

5234
## 2.8.2 - 2017-01-29
5335

‎composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
}
1414
},
1515
"require": {
16-
"php": "^5.5 || ^7.0",
17-
"zendframework/zend-stdlib": "^2.7 || ^3.0",
16+
"php": "^5.6 || ^7.0",
17+
"zendframework/zend-stdlib": "^2.7.6 || ^3.1",
1818
"container-interop/container-interop": "^1.1"
1919
},
2020
"require-dev": {
@@ -28,7 +28,7 @@
2828
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
2929
"zendframework/zend-session": "^2.6.2",
3030
"zendframework/zend-uri": "^2.5",
31-
"phpunit/PHPUnit": "^4.0",
31+
"phpunit/PHPUnit": "^6.0.8 || ^5.7.15",
3232
"zendframework/zend-coding-standard": "~1.0.0"
3333
},
3434
"suggest": {
@@ -45,8 +45,8 @@
4545
"prefer-stable": true,
4646
"extra": {
4747
"branch-alias": {
48-
"dev-master": "2.8-dev",
49-
"dev-develop": "2.9-dev"
48+
"dev-master": "2.9-dev",
49+
"dev-develop": "2.10-dev"
5050
},
5151
"zf": {
5252
"component": "Zend\\Validator",

0 commit comments

Comments
 (0)