Skip to content
This repository has been archived by the owner on Jul 11, 2019. It is now read-only.

Commit

Permalink
Merge be18b61 into bd2cdf5
Browse files Browse the repository at this point in the history
  • Loading branch information
michalbundyra committed Jan 25, 2019
2 parents bd2cdf5 + be18b61 commit 3c2efc9
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 33 deletions.
36 changes: 16 additions & 20 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
Copyright (c) 2018, WEBIMPRESS Michał Bundyra.
All rights reserved.
Copyright (c) 2006-2019 Doctrine Project

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

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

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.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# doctrine-zend-hydrator

[![Build Status](https://travis-ci.org/webimpress/doctrine-zend-hydrator.svg?branch=master)](https://travis-ci.org/webimpress/doctrine-zend-hydrator)
[![Coverage Status](https://coveralls.io/repos/github/webimpress/doctrine-zend-hydrator/badge.svg?branch=master)](https://coveralls.io/github/webimpress/doctrine-zend-hydrator?branch=master)
[![Build Status](https://travis-ci.org/doctrine/doctrine-zend-hydrator.svg?branch=master)](https://travis-ci.org/doctrine/doctrine-zend-hydrator)
[![Coverage Status](https://coveralls.io/repos/github/doctrine/doctrine-zend-hydrator/badge.svg?branch=master)](https://coveralls.io/github/doctrine/doctrine-zend-hydrator?branch=master)

This library provides Doctrine Hydrators for Zend Framework application.

Expand All @@ -10,7 +10,7 @@ This library provides Doctrine Hydrators for Zend Framework application.
Run the following to install this library:

```bash
$ composer require webimpress/doctrine-zend-hydrator
$ composer require doctrine/doctrine-zend-hydrator
```

## Usage
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "webimpress/doctrine-zend-hydrator",
"name": "doctrine/doctrine-zend-hydrator",
"description": "Doctrine hydrators for Zend Framework applications",
"license": "BSD-2-Clause",
"keywords": [
Expand All @@ -9,9 +9,9 @@
"zendframework"
],
"support": {
"issues": "https://github.com/webimpress/doctrine-zend-hydrator/issues",
"source": "https://github.com/webimpress/doctrine-zend-hydrator",
"rss": "https://github.com/webimpress/doctrine-zend-hydrator/releases.atom"
"issues": "https://github.com/doctrine/doctrine-zend-hydrator/issues",
"source": "https://github.com/doctrine/doctrine-zend-hydrator",
"rss": "https://github.com/doctrine/doctrine-zend-hydrator/releases.atom"
},
"require": {
"php": "^7.1",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3c2efc9

Please sign in to comment.