Skip to content

Commit 7228b86

Browse files
committed
Rebase doc templates
- renamed documentation directory: doc -> docs - moved all support files into docs directory - added PR and ISSUE github templates - updated .gitattributes and .gitignore - updated LICENSE.md skeleton - updated composer.json skeleton - updated link and coveralls badge in README.md
1 parent 6fd6efb commit 7228b86

18 files changed

+1978
-121
lines changed

.gitattributes

Lines changed: 10 additions & 8 deletions
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

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
.buildpath
2-
.DS_Store
3-
.idea
4-
.project
5-
.settings/
6-
.*.sw*
7-
.*.un~
8-
nbproject
9-
doc/html/
10-
tmp/
11-
zf-mkdoc-theme/
12-
13-
clover.xml
14-
composer.lock
15-
coveralls-upload.json
16-
phpunit.xml
17-
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/

LICENSE.md

Lines changed: 6 additions & 7 deletions
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-2018, 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# zend-text
22

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

66
`Zend\Text` is a component to work on text strings. It contains the subcomponents:
77

@@ -17,4 +17,4 @@
1717

1818

1919
- File issues at https://github.com/zendframework/zend-text/issues
20-
- Documentation is at https://zendframework.github.io/zend-text/
20+
- Documentation is at https://docs.zendframework.com/zend-text/

composer.json

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
{
22
"name": "zendframework/zend-text",
3-
"description": " ",
3+
"description": "Create FIGlets and text-based tables",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"text"
89
],
9-
"homepage": "https://github.com/zendframework/zend-text",
10-
"extra": {
11-
"branch-alias": {
12-
"dev-master": "2.6-dev",
13-
"dev-develop": "2.7-dev"
14-
}
10+
"support": {
11+
"docs": "https://docs.zendframework.com/zend-text/",
12+
"issues": "https://github.com/zendframework/zend-text/issues",
13+
"source": "https://github.com/zendframework/zend-text",
14+
"rss": "https://github.com/zendframework/zend-text/releases.atom",
15+
"chat": "https://zendframework-slack.herokuapp.com",
16+
"forum": "https://discourse.zendframework.com/c/questions/components"
1517
},
1618
"require": {
1719
"php": "^5.6 || ^7.0",
18-
"zendframework/zend-stdlib": "^2.7 || ^3.0",
19-
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
20+
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
21+
"zendframework/zend-stdlib": "^2.7 || ^3.0"
2022
},
2123
"require-dev": {
2224
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
23-
"zendframework/zend-config": "^2.6",
24-
"zendframework/zend-coding-standard": "~1.0.0"
25+
"zendframework/zend-coding-standard": "~1.0.0",
26+
"zendframework/zend-config": "^2.6"
2527
},
2628
"autoload": {
2729
"psr-4": {
@@ -33,6 +35,15 @@
3335
"ZendTest\\Text\\": "test/"
3436
}
3537
},
38+
"config": {
39+
"sort-packages": true
40+
},
41+
"extra": {
42+
"branch-alias": {
43+
"dev-master": "2.6.x-dev",
44+
"dev-develop": "2.7.x-dev"
45+
}
46+
},
3647
"scripts": {
3748
"check": [
3849
"@cs-check",

0 commit comments

Comments
 (0)