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

Commit d49b4e8

Browse files
michalbundyramichalbundyra
committed
Rebase docs templates
- renamed documentation directory: doc -> docs - added PR and ISSUE github templates - moved all support files into docs directory - updated LICENSE.md skeleton - updated coveralls badge in README.md - updated link to the docsumentation in README.md - updated .gitattributes and .gitignore
1 parent bb93a75 commit d49b4e8

17 files changed

+188
-163
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-
phpcs.xml 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-
doc/html/
10-
tmp/
11-
vendor/
12-
zf-mkdoc-theme/
13-
14-
clover.xml
15-
coveralls-upload.json
16-
phpunit.xml
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

+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-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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# zend-server
22

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

66
The zend-server family of classes provides functionality for the various server
77
classes, including `Zend\XmlRpc\Server` and `Zend\Json\Server`.
@@ -10,4 +10,4 @@ all server classes should implement this interface in order to provide a standar
1010
server API.
1111

1212
- File issues at https://github.com/zendframework/zend-server/issues
13-
- Documentation is at https://zendframework.github.io/zend-server/
13+
- Documentation is at https://docs.zendframework.com/zend-server/

‎composer.json

+23-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
{
22
"name": "zendframework/zend-server",
3-
"description": " ",
3+
"description": "Create Reflection-based RPC servers",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"server"
89
],
9-
"homepage": "https://github.com/zendframework/zend-server",
10-
"extra": {
11-
"branch-alias": {
12-
"dev-master": "2.7-dev",
13-
"dev-develop": "2.8-dev"
14-
}
10+
"support": {
11+
"docs": "https://docs.zendframework.com/zend-server/",
12+
"issues": "https://github.com/zendframework/zend-server/issues",
13+
"source": "https://github.com/zendframework/zend-server",
14+
"rss": "https://github.com/zendframework/zend-server/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.5 || ^3.0",
19-
"zendframework/zend-code": "^2.5 || ^3.0"
20+
"zendframework/zend-code": "^2.5 || ^3.0",
21+
"zendframework/zend-stdlib": "^2.5 || ^3.0"
2022
},
2123
"require-dev": {
22-
"phpunit/phpUnit": "^5.7.27 || ^6.5.8 || ^7.1.4",
24+
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
2325
"zendframework/zend-coding-standard": "~1.0.0"
2426
},
2527
"autoload": {
@@ -35,6 +37,15 @@
3537
"test/TestAsset/reflectionTestFunction.php"
3638
]
3739
},
40+
"config": {
41+
"sort-packages": true
42+
},
43+
"extra": {
44+
"branch-alias": {
45+
"dev-master": "2.7.x-dev",
46+
"dev-develop": "2.8.x-dev"
47+
}
48+
},
3849
"scripts": {
3950
"check": [
4051
"@cs-check",
@@ -43,7 +54,6 @@
4354
"cs-check": "phpcs",
4455
"cs-fix": "phpcbf",
4556
"test": "phpunit --colors=always",
46-
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
47-
"upload-coverage": "coveralls -v"
57+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
4858
}
4959
}

‎composer.lock

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

‎CONDUCT.md ‎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

0 commit comments

Comments
 (0)