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

Commit 8089c16

Browse files
committed
Merge branch 'feature/zendframework'
Prepared to push to zendframework org.
2 parents b3361cc + 9254741 commit 8089c16

28 files changed

+278
-133
lines changed

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,31 @@
22

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

5+
Versions 0.3.0 and prior were released as "weierophinney/problem-details".
6+
7+
## 0.4.0 - 2017-08-01
8+
9+
### Added
10+
11+
- Nothing.
12+
13+
### Changed
14+
15+
- The package is now named "zendframework/zend-problem-details".
16+
- The top-level namespace is now named `Zend\ProblemDetails`.
17+
18+
### Deprecated
19+
20+
- Nothing.
21+
22+
### Removed
23+
24+
- Nothing.
25+
26+
### Fixed
27+
28+
- Nothing.
29+
530
## 0.3.0 - 2017-07-31
631

732
### Added

CONTRIBUTING.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
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/zendframework/wiki/Coding-Standards)
9-
- [Contributor's Guide](CONTRIBUTING.md)
8+
- [Coding Standards](https://github.com/zendframework/zend-coding-standard)
9+
- [Forums](https://discourse.zendframework.com/c/contributors)
10+
- [Slack](https://zendframework-slack.herokuapp.com)
1011

11-
If you are working on new features or refactoring [create a
12-
proposal](https://github.com/weierophinney/problem-details/issues/new).
12+
If you are working on new features or refactoring
13+
[create a proposal](https://github.com/zendframework/zend-problem-details/issues/new).
1314

1415
## RUNNING TESTS
1516

@@ -18,8 +19,8 @@ To run tests:
1819
- Clone the repository:
1920

2021
```console
21-
$ git clone git://github.com/weierophinney/problem-details.git
22-
$ cd problem-details
22+
$ git clone git://github.com/zendframework/zend-problem-details.git
23+
$ cd zend-problem-details
2324
```
2425

2526
- Install dependencies via composer:
@@ -70,19 +71,19 @@ pull your work into the master repository. We recommend using
7071
[GitHub](https://github.com), as that is where the component is already hosted.
7172

7273
1. Setup a [GitHub account](https://github.com/), if you haven't yet
73-
2. Fork the repository (https://github.com/weierophinney/problem-details)
74+
2. Fork the repository (https://github.com/zendframework/zend-problem-details)
7475
3. Clone the canonical repository locally and enter it.
7576

7677
```console
77-
$ git clone git://github.com/weierophinney/problem-details.git
78-
$ cd problem-details
78+
$ git clone git://github.com/zendframework/zend-problem-details.git
79+
$ cd zend-problem-details
7980
```
8081

8182
4. Add a remote to your fork; substitute your GitHub username in the command
8283
below.
8384

8485
```console
85-
$ git remote add {username} [email protected]:{username}/problem-details.git
86+
$ git remote add {username} [email protected]:{username}/zend-problem-details.git
8687
$ git fetch {username}
8788
```
8889

@@ -145,7 +146,7 @@ Delta compression using up to 2 threads.
145146
Compression objects: 100% (18/18), done.
146147
Writing objects: 100% (20/20), 8.19KiB, done.
147148
Total 20 (delta 12), reused 0 (delta 0)
148-
To ssh://[email protected]/{username}/problem-details.git
149+
To ssh://[email protected]/{username}/zend-problem-details.git
149150
b5583aa..4f51698 HEAD -> master
150151
```
151152

LICENSE.md

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
1-
Copyright (c) 2017, Matthew Weier O'Phinney
1+
Copyright (c) 2017, Zend Technologies USA, Inc.
22
All rights reserved.
33

4-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4+
Redistribution and use in source and binary forms, with or without modification,
5+
are permitted provided that the following conditions are met:
56

6-
- Redistributions of source code must retain the above copyright notice, 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.
79

8-
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation 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.
913

10-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
14+
- Neither the name of Zend Technologies USA, Inc. nor the names of its
15+
contributors may be used to endorse or promote products derived from this
16+
software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
22+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
25+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Problem Details for PSR-7 Applications
22

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

66
This library provides provides a factory for generating Problem Details
77
responses, error handling middleware for automatically generating Problem
@@ -13,7 +13,7 @@ Details responses from errors and exceptions, and custom exception types for
1313
Run the following to install this library:
1414

1515
```bash
16-
$ composer require weierophinney/problem-details
16+
$ composer require zendframework/zend-problem-details
1717
```
1818

1919
## Documentation
@@ -24,4 +24,4 @@ Documentation is [in the doc tree](doc/book/), and can be compiled using [mkdocs
2424
$ mkdocs build
2525
```
2626

27-
You may also [browse the documentation online](https://weierophinney.github.io/problem-details/index.html).
27+
You may also [browse the documentation online](https://docs.zendframework.com/problem-details/).

composer.json

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
{
2-
"name": "weierophinney/problem-details",
2+
"name": "zendframework/zend-problem-details",
33
"description": "Problem Details for PSR-7 HTTP APIs",
44
"type": "library",
55
"license": "BSD-3-Clause",
6+
"keywords": [
7+
"api",
8+
"rest",
9+
"problem-details",
10+
"zendframework",
11+
"zf"
12+
],
13+
"support": {
14+
"docs": "https://docs.zendframework.com/zend-problem-details/",
15+
"issues": "https://github.com/zendframework/zend-problem-details/issues",
16+
"source": "https://github.com/zendframework/zend-problem-details",
17+
"slack": "https://zendframework-slack.herokuapp.com",
18+
"forum": "https://discourse.zendframework.com/c/questions/expressive"
19+
},
620
"config": {
721
"sort-packages": true
822
},
@@ -23,17 +37,17 @@
2337
},
2438
"autoload": {
2539
"psr-4": {
26-
"ProblemDetails\\": "src/"
40+
"Zend\\ProblemDetails\\": "src/"
2741
}
2842
},
2943
"autoload-dev": {
3044
"psr-4": {
31-
"ProblemDetailsTest\\": "test/"
45+
"ZendTest\\ProblemDetails\\": "test/"
3246
}
3347
},
3448
"extra": {
3549
"zf": {
36-
"config-provider": "ProblemDetails\\ConfigProvider"
50+
"config-provider": "Zend\\ProblemDetails\\ConfigProvider"
3751
}
3852
},
3953
"scripts": {

0 commit comments

Comments
 (0)