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

Commit 16b6978

Browse files
committed
Merge pull request #153 from webimpress/hotfix/docs
Hotfix - documentation updates
2 parents 02bbc6b + 0b85e8c commit 16b6978

18 files changed

+269
-282
lines changed

.editorconfig

-24
This file was deleted.

.gitattributes

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
/docs export-ignore
12
/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
3+
/.coveralls.yml export-ignore
4+
/.gitattributes export-ignore
5+
/.gitignore export-ignore
6+
/.travis.yml export-ignore
7+
/composer.lock export-ignore
8+
/mkdocs.yml export-ignore
9+
/phpcs.xml export-ignore
10+
/phpunit.xml.dist export-ignore

.gitignore

+2-11
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-
doc/html/
10-
tmp/
1+
docs/html/
112
vendor/
123
zf-mkdoc-theme/
13-
144
clover.xml
155
coveralls-upload.json
166
phpunit.xml
7+
zf-mkdoc-theme.tgz

LICENSE.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
1+
Copyright (c) 2015-2017, Zend Technologies USA, Inc.
22

33
All rights reserved.
44

55
Redistribution and use in source and binary forms, with or without modification,
66
are permitted provided that the following conditions are met:
77

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

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.
11+
- Redistributions in binary form must reproduce the above copyright notice, this
12+
list of conditions and the following disclaimer in the documentation and/or
13+
other materials provided with the distribution.
1414

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

composer.json

+32-23
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,50 @@
11
{
22
"name": "zendframework/zend-inputfilter",
3-
"description": " ",
3+
"description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"inputfilter"
89
],
9-
"homepage": "https://github.com/zendframework/zend-inputfilter",
10-
"autoload": {
11-
"psr-4": {
12-
"Zend\\InputFilter\\": "src/"
10+
"config": {
11+
"sort-packages": true
12+
},
13+
"extra": {
14+
"branch-alias": {
15+
"dev-master": "2.7-dev",
16+
"dev-develop": "2.8-dev"
17+
},
18+
"zf": {
19+
"component": "Zend\\InputFilter",
20+
"config-provider": "Zend\\InputFilter\\ConfigProvider"
1321
}
1422
},
23+
"support": {
24+
"docs": "https://docs.zendframework.com/zend-inputfilter/",
25+
"issues": "https://github.com/zendframework/zend-inputfilter/issues",
26+
"source": "https://github.com/zendframework/zend-inputfilter",
27+
"rss": "https://github.com/zendframework/zend-inputfilter/releases.atom",
28+
"slack": "https://zendframework-slack.herokuapp.com",
29+
"forum": "https://discourse.zendframework.com/c/questions/expressive"
30+
},
1531
"require": {
16-
"php": "^7.0 || ^5.6",
32+
"php": "^5.6 || ^7.0",
1733
"zendframework/zend-filter": "^2.6",
18-
"zendframework/zend-validator": "^2.6",
19-
"zendframework/zend-stdlib": "^2.7 || ^3.0"
34+
"zendframework/zend-stdlib": "^2.7 || ^3.0",
35+
"zendframework/zend-validator": "^2.6"
2036
},
2137
"require-dev": {
22-
"phpunit/phpunit": "^6.0.8 || ^5.7.15",
38+
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
2339
"zendframework/zend-coding-standard": "~1.0.0",
2440
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
2541
},
2642
"suggest": {
2743
"zendframework/zend-servicemanager": "To support plugin manager support"
2844
},
29-
"minimum-stability": "dev",
30-
"prefer-stable": true,
31-
"extra": {
32-
"branch-alias": {
33-
"dev-master": "2.7-dev",
34-
"dev-develop": "2.8-dev"
35-
},
36-
"zf": {
37-
"component": "Zend\\InputFilter",
38-
"config-provider": "Zend\\InputFilter\\ConfigProvider"
45+
"autoload": {
46+
"psr-4": {
47+
"Zend\\InputFilter\\": "src/"
3948
}
4049
},
4150
"autoload-dev": {
@@ -48,10 +57,10 @@
4857
"@cs-check",
4958
"@test"
5059
],
51-
"upload-coverage": "coveralls -v",
5260
"cs-check": "phpcs",
5361
"cs-fix": "phpcbf",
54-
"test": "phpunit",
55-
"test-coverage": "phpunit --coverage-clover clover.xml"
62+
"test": "phpunit --colors=always",
63+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
64+
"upload-coverage": "coveralls -v"
5665
}
5766
}

0 commit comments

Comments
 (0)