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

Commit

Permalink
Merge branch 'hotfix/154'
Browse files Browse the repository at this point in the history
Close #154
  • Loading branch information
weierophinney committed Nov 7, 2017
2 parents e9aff80 + 15a3de2 commit afd3662
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ of input data. For instance, you could use it to filter `$_GET` or `$_POST`
values, CLI arguments, etc.

- File issues at https://github.com/zendframework/zend-inputfilter/issues
- Documentation is at https://zendframework.github.io/zend-inputfilter/
- Documentation is at https://docs.zendframework.com/zend-inputfilter/
4 changes: 2 additions & 2 deletions docs/book/file-input.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ While `FileInput` uses the same interface as `Input`, it differs in a few ways:
1. It expects the raw value to be in a normalized `$_FILES` array format. See
the [PSR-7 Uploaded files](http://www.php-fig.org/psr/psr-7/#uploaded-files)
chapter for details on how to accomplish this.
[Diactoros](https://zendframework.github.io/zend-diactoros/) and
[zend-http](https://zendframework.github.io/zend-http/) can do this for you.
[Diactoros](https://docs.zendframework.com/zend-diactoros/) and
[zend-http](https://docs.zendframework.com/zend-http/) can do this for you.
2. The validators are run **before** the filters (which is the opposite behavior
of `Input`). This is so that any `is_uploaded_file()` validation can be run
prior to any filters that may rename/move/modify the file.
Expand Down
4 changes: 2 additions & 2 deletions docs/book/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,5 +243,5 @@ class SimplePerson

Also see

- [zend-filter](https://zendframework.github.io/zend-filter/)
- [zend-validator](https://github.com/zendframework/zend-validator/)
- [zend-filter](https://docs.zendframework.com/zend-filter/)
- [zend-validator](https://docs.zendframework.com/zend-validator/)
4 changes: 2 additions & 2 deletions docs/book/specs.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ return array(
);
```

For [Expressive](https://zendframework.github.io/zend-expressive/) when using
For [Expressive](https://docs.zendframework.com/zend-expressive/) when using
the configuration manager, and for zend-mvc v3 releases, the functionality is
enabled by default, assuming you are using the
[component installer](https://zendframework.github.io/zend-component-installer/).
[component installer](https://docs.zendframework.com/zend-component-installer/).

## Example

Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ pages:
site_name: zend-inputfilter
site_description: zend-inputfilter
repo_url: 'https://github.com/zendframework/zend-inputfilter'
copyright: 'Copyright (c) 2016 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'
copyright: 'Copyright (c) 2016-2017 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'

0 comments on commit afd3662

Please sign in to comment.