From d55c225e37bc4ae4534ecacce8b33f84088679c7 Mon Sep 17 00:00:00 2001 From: webimpress Date: Sat, 26 Jan 2019 14:26:02 +0000 Subject: [PATCH 1/2] Updated package name - move to doctrine org # Conflicts: # composer.lock --- LICENSE.md | 36 ++++++++++++++++-------------------- README.md | 6 +++--- composer.json | 8 ++++---- composer.lock | 2 +- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 36f9b5d..f8ba89d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -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. diff --git a/README.md b/README.md index 9c23621..422fc5e 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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 diff --git a/composer.json b/composer.json index c9cfbb8..0e050eb 100644 --- a/composer.json +++ b/composer.json @@ -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": [ @@ -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", diff --git a/composer.lock b/composer.lock index ae35cce..a8a0974 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "190b41269a589d258fd45b4f64b491bb", + "content-hash": "e3f6e3e4ab5e0f4e8284dd38146fd09c", "packages": [ { "name": "doctrine/annotations", From 2dc4d54f96aa7e1aaf90a33019ffc8d2405706a0 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 10 Jul 2019 22:01:02 +0100 Subject: [PATCH 2/2] Updated to MIT license as it is used by Doctrine org --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0e050eb..4f99dd2 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "doctrine/doctrine-zend-hydrator", "description": "Doctrine hydrators for Zend Framework applications", - "license": "BSD-2-Clause", + "license": "MIT", "keywords": [ "doctrine", "hydrator",