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

Commit 7b870a7

Browse files
committed
Merge branch 'release/2.12.1'
2 parents c5c14ec + 70dc330 commit 7b870a7

Some content is hidden

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

68 files changed

+220
-191
lines changed

.gitattributes

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
/test export-ignore
2-
/vendor export-ignore
3-
.coveralls.yml export-ignore
4-
.gitattributes export-ignore
5-
.gitignore export-ignore
6-
.travis.yml export-ignore
7-
.php_cs export-ignore
8-
phpunit.xml.dist export-ignore
1+
/.coveralls.yml export-ignore
2+
/.gitattributes export-ignore
3+
/.gitignore export-ignore
4+
/.travis.yml export-ignore
5+
/composer.lock export-ignore
6+
/docs/ export-ignore
7+
/mkdocs.yml export-ignore
8+
/phpcs.xml export-ignore
9+
/phpunit.xml.dist export-ignore
10+
/test/ export-ignore

.gitignore

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
.buildpath
2-
.DS_Store
3-
.idea
4-
.project
5-
.settings/
6-
.*.sw*
7-
.*.un~
8-
nbproject
9-
tmp/
10-
doc/html/
11-
zf-mkdoc-theme/
12-
13-
clover.xml
14-
coveralls-upload.json
15-
phpunit.xml
16-
vendor
1+
/clover.xml
2+
/coveralls-upload.json
3+
/docs/html/
4+
/phpunit.xml
5+
/vendor/
6+
/zf-mkdoc-theme.tgz
7+
/zf-mkdoc-theme/

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
## 2.12.1 - TBD
5+
## 2.12.1 - 2019-10-12
66

77
### Added
88

LICENSE.md

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
2-
1+
Copyright (c) 2005-2019, Zend Technologies USA, Inc.
32
All rights reserved.
43

54
Redistribution and use in source and binary forms, with or without modification,
65
are permitted provided that the following conditions are met:
76

8-
- Redistributions of source code must retain the above copyright notice,
9-
this list of conditions and the following disclaimer.
7+
- Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
109

11-
- Redistributions in binary form must reproduce the above copyright notice,
12-
this list of conditions and the following disclaimer in the documentation
13-
and/or other materials provided with the distribution.
10+
- Redistributions in binary form must reproduce the above copyright notice, this
11+
list of conditions and the following disclaimer in the documentation and/or
12+
other materials provided with the distribution.
1413

1514
- Neither the name of Zend Technologies USA, Inc. nor the names of its
1615
contributors may be used to endorse or promote products derived from this

README.md

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
11
# zend-validator
22

33
[![Build Status](https://secure.travis-ci.org/zendframework/zend-validator.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-validator)
4-
[![Coverage Status](https://coveralls.io/repos/zendframework/zend-validator/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-validator?branch=master)
4+
[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-validator/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-validator?branch=master)
55

66
zend-validator provides a set of commonly needed validators. It also provides a
77
simple validator chaining mechanism by which multiple validators may be applied
88
to a single datum in a user-defined order.
99

10-
- File issues at https://github.com/zendframework/zend-validator/issues
11-
- Documentation is at https://docs.zendframework.com/zend-validator/
10+
## Installation
11+
12+
Run the following to install this library:
13+
14+
```bash
15+
$ composer require zendframework/zend-validator
16+
```
17+
18+
## Documentation
19+
20+
Browse the documentation online at https://docs.zendframework.com/zend-validator/
21+
22+
## Support
23+
24+
* [Issues](https://github.com/zendframework/zend-validator/issues/)
25+
* [Chat](https://zendframework-slack.herokuapp.com/)
26+
* [Forum](https://discourse.zendframework.com/)

composer.json

+23-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
{
22
"name": "zendframework/zend-validator",
3-
"description": "provides a set of commonly needed validators",
3+
"description": "Validation classes for a wide range of domains, and the ability to chain validators to create complex validation criteria",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zendframework",
7+
"zf",
78
"validator"
89
],
9-
"homepage": "https://github.com/zendframework/zend-validator",
10-
"autoload": {
11-
"psr-4": {
12-
"Zend\\Validator\\": "src/"
13-
}
10+
"support": {
11+
"docs": "https://docs.zendframework.com/zend-validator/",
12+
"issues": "https://github.com/zendframework/zend-validator/issues",
13+
"source": "https://github.com/zendframework/zend-validator",
14+
"rss": "https://github.com/zendframework/zend-validator/releases.atom",
15+
"chat": "https://zendframework-slack.herokuapp.com",
16+
"forum": "https://discourse.zendframework.com/c/questions/components"
1417
},
1518
"require": {
1619
"php": "^5.6 || ^7.0",
@@ -43,8 +46,19 @@
4346
"zendframework/zend-session": "Zend\\Session component, ^2.8; required by the Csrf validator",
4447
"zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
4548
},
46-
"minimum-stability": "dev",
47-
"prefer-stable": true,
49+
"autoload": {
50+
"psr-4": {
51+
"Zend\\Validator\\": "src/"
52+
}
53+
},
54+
"autoload-dev": {
55+
"psr-4": {
56+
"ZendTest\\Validator\\": "test/"
57+
}
58+
},
59+
"config": {
60+
"sort-packages": true
61+
},
4862
"extra": {
4963
"branch-alias": {
5064
"dev-master": "2.12.x-dev",
@@ -55,11 +69,6 @@
5569
"config-provider": "Zend\\Validator\\ConfigProvider"
5670
}
5771
},
58-
"autoload-dev": {
59-
"psr-4": {
60-
"ZendTest\\Validator\\": "test/"
61-
}
62-
},
6372
"scripts": {
6473
"check": [
6574
"@cs-check",

composer.lock

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/book/index.html

-12
This file was deleted.

CONDUCT.md renamed to docs/CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributor Code of Conduct
22

3-
The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
3+
This project adheres to [The Code Manifesto](http://codemanifesto.com)
44
as its guidelines for contributor interactions.
55

66
## The Code Manifesto

CONTRIBUTING.md renamed to docs/CONTRIBUTING.md

+23-68
Original file line numberDiff line numberDiff line change
@@ -2,73 +2,43 @@
22

33
## RESOURCES
44

5-
If you wish to contribute to Zend Framework, please be sure to
5+
If you wish to contribute to this project, please be sure to
66
read/subscribe to the following resources:
77

8-
- [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
9-
- [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
10-
- ZF Contributor's mailing list:
11-
Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
12-
Subscribe: [email protected]
13-
- ZF Contributor's IRC channel:
14-
#zftalk.dev on Freenode.net
8+
- [Coding Standards](https://github.com/zendframework/zend-coding-standard)
9+
- [Forums](https://discourse.zendframework.com/c/contributors)
10+
- [Chat](https://zendframework-slack.herokuapp.com)
11+
- [Code of Conduct](CODE_OF_CONDUCT.md)
1512

16-
If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-validator/issues/new).
17-
18-
## Reporting Potential Security Issues
19-
20-
If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
21-
issue tracker: send it to us at [[email protected]](mailto:[email protected]) instead.
22-
We will work with you to verify the vulnerability and patch it as soon as possible.
23-
24-
When reporting issues, please provide the following information:
25-
26-
- Component(s) affected
27-
- A description indicating how to reproduce the issue
28-
- A summary of the security vulnerability and impact
29-
30-
We request that you contact us via the email address above and give the project
31-
contributors a chance to resolve the vulnerability and issue a new release prior
32-
to any public exposure; this helps protect users and provides them with a chance
33-
to upgrade and/or update in order to protect their applications.
34-
35-
For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
13+
If you are working on new features or refactoring
14+
[create a proposal](https://github.com/zendframework/zend-validator/issues/new).
3615

3716
## RUNNING TESTS
3817

39-
> ### Note: testing versions prior to 2.4
40-
>
41-
> This component originates with Zend Framework 2. During the lifetime of ZF2,
42-
> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
43-
> changes were necessary. However, due to the migration, tests may not run on
44-
> versions < 2.4. As such, you may need to change the PHPUnit dependency if
45-
> attempting a fix on such a version.
46-
4718
To run tests:
4819

4920
- Clone the repository:
5021

5122
```console
52-
$ git clone git@github.com:zendframework/zend-validator.git
53-
$ cd
23+
$ git clone git://github.com/zendframework/zend-validator.git
24+
$ cd zend-validator
5425
```
5526

5627
- Install dependencies via composer:
5728

5829
```console
59-
$ curl -sS https://getcomposer.org/installer | php --
60-
$ ./composer.phar install
30+
$ composer install
6131
```
6232

63-
If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
33+
If you don't have `composer` installed, please download it from https://getcomposer.org/download/
6434

65-
- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
35+
- Run the tests using the "test" command shipped in the `composer.json`:
6636

6737
```console
68-
$ ./vendor/bin/phpunit
38+
$ composer test
6939
```
7040

71-
You can turn on conditional tests with the phpunit.xml file.
41+
You can turn on conditional tests with the `phpunit.xml` file.
7242
To do so:
7343

7444
- Copy `phpunit.xml.dist` file to `phpunit.xml`
@@ -77,24 +47,22 @@ To do so:
7747

7848
## Running Coding Standards Checks
7949

80-
This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
81-
standards checks, and provides configuration for our selected checks.
82-
`phpcs` is installed by default via Composer.
50+
First, ensure you've installed dependencies via composer, per the previous
51+
section on running tests.
8352

84-
To run checks only:
53+
To run CS checks only:
8554

8655
```console
8756
$ composer cs-check
8857
```
8958

90-
`phpcs` also includes a tool for fixing most CS violations, `phpcbf`:
91-
59+
To attempt to automatically fix common CS issues:
9260

9361
```console
9462
$ composer cs-fix
9563
```
9664

97-
If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure
65+
If the above fixes any CS issues, please re-run the tests to ensure
9866
they pass, and make sure you add and commit the changes after verification.
9967

10068
## Recommended Workflow for Contributions
@@ -103,12 +71,12 @@ Your first step is to establish a public repository from which we can
10371
pull your work into the master repository. We recommend using
10472
[GitHub](https://github.com), as that is where the component is already hosted.
10573

106-
1. Setup a [GitHub account](http://github.com/), if you haven't yet
107-
2. Fork the repository (http://github.com/zendframework/zend-validator)
74+
1. Setup a [GitHub account](https://github.com/), if you haven't yet
75+
2. Fork the repository (https://github.com/zendframework/zend-validator)
10876
3. Clone the canonical repository locally and enter it.
10977

11078
```console
111-
$ git clone git://github.com:zendframework/zend-validator.git
79+
$ git clone git://github.com/zendframework/zend-validator.git
11280
$ cd zend-validator
11381
```
11482

@@ -188,15 +156,7 @@ To send a pull request, you have two options.
188156
If using GitHub, you can do the pull request from there. Navigate to
189157
your repository, select the branch you just created, and then select the
190158
"Pull Request" button in the upper right. Select the user/organization
191-
"zendframework" as the recipient.
192-
193-
If using your own repository - or even if using GitHub - you can use `git
194-
format-patch` to create a patchset for us to apply; in fact, this is
195-
**recommended** for security-related patches. If you use `format-patch`, please
196-
send the patches as attachments to:
197-
198-
- [email protected] for patches without security implications
199-
- [email protected] for security patches
159+
"zendframework" (or whatever the upstream organization is) as the recipient.
200160

201161
#### What branch to issue the pull request against?
202162

@@ -227,8 +187,3 @@ repository, we suggest doing some cleanup of these branches.
227187
```console
228188
$ git push {username} :<branchname>
229189
```
230-
231-
232-
## Conduct
233-
234-
Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project.

docs/ISSUE_TEMPLATE.md

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
- [ ] I was not able to find an [open](https://github.com/zendframework/zend-validator/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-validator/issues?q=is%3Aclosed) issue matching what I'm seeing.
2+
- [ ] This is not a question. (Questions should be asked on [chat](https://zendframework.slack.com/) ([Signup here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).)
3+
4+
Provide a narrative description of what you are trying to accomplish.
5+
6+
### Code to reproduce the issue
7+
8+
<!-- Please provide the minimum code necessary to recreate the issue -->
9+
10+
```php
11+
```
12+
13+
### Expected results
14+
15+
<!-- What do you think should have happened? -->
16+
17+
### Actual results
18+
19+
<!-- What did you actually observe? -->

0 commit comments

Comments
 (0)