From 92b4144e2900ef0f39664a5b8f2d70de2de1d82f Mon Sep 17 00:00:00 2001 From: Nick Ruest Date: Sat, 10 Oct 2015 13:37:25 -0400 Subject: [PATCH 1/5] Add LICENSE -- Address #4 --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..07afdda --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Islandora Foundation + +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: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +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. From d2b4640af0c16e44a31f7bd1de2ccebcefdfa216 Mon Sep 17 00:00:00 2001 From: nruest Date: Sun, 24 Apr 2016 21:23:05 -0400 Subject: [PATCH 2/5] Change from GPLv3 to MIT. Just waiting on @daniel-dgi. --- composer.json | 2 +- src/Chullo.php | 4 ++-- src/FedoraApi.php | 4 ++-- src/IFedoraApi.php | 4 ++-- src/IFedoraClient.php | 4 ++-- src/ITriplestoreClient.php | 4 ++-- src/TriplestoreClient.php | 2 +- src/Uuid/IUuidGenerator.php | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 141566c..a6eb13a 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "require-dev": { "phpunit/phpunit": "^4.8" }, - "license": "GPLv3", + "license": "MIT", "authors": [ { "name": "Islandora Foundation", diff --git a/src/Chullo.php b/src/Chullo.php index eb7e981..ecd5cf5 100644 --- a/src/Chullo.php +++ b/src/Chullo.php @@ -12,7 +12,7 @@ * @package Islandora * @author Daniel Lamb * @author Nick Ruest - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ @@ -26,7 +26,7 @@ * @category Islandora * @package Islandora * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ class Chullo implements IFedoraClient diff --git a/src/FedoraApi.php b/src/FedoraApi.php index 818db0d..d525ea4 100644 --- a/src/FedoraApi.php +++ b/src/FedoraApi.php @@ -12,7 +12,7 @@ * @package Islandora * @author Daniel Lamb * @author Nick Ruest - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ @@ -28,7 +28,7 @@ * @category Islandora * @package Islandora * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ class FedoraApi implements IFedoraApi diff --git a/src/IFedoraApi.php b/src/IFedoraApi.php index 1d76b84..9e55081 100644 --- a/src/IFedoraApi.php +++ b/src/IFedoraApi.php @@ -12,7 +12,7 @@ * @package Islandora * @author Daniel Lamb * @author Nick Ruest - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ @@ -26,7 +26,7 @@ * @category Islandora * @package Islandora * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ interface IFedoraApi diff --git a/src/IFedoraClient.php b/src/IFedoraClient.php index ffac273..601ea4a 100644 --- a/src/IFedoraClient.php +++ b/src/IFedoraClient.php @@ -12,7 +12,7 @@ * @package Islandora * @author Daniel Lamb * @author Nick Ruest - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ @@ -24,7 +24,7 @@ * @category Islandora * @package Islandora * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ interface IFedoraClient extends IFedoraApi diff --git a/src/ITriplestoreClient.php b/src/ITriplestoreClient.php index 628d72f..02beb3a 100644 --- a/src/ITriplestoreClient.php +++ b/src/ITriplestoreClient.php @@ -11,7 +11,7 @@ * @category Islandora * @package Islandora * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ @@ -23,7 +23,7 @@ * @category Islandora * @package Islandora * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ interface ITriplestoreClient diff --git a/src/TriplestoreClient.php b/src/TriplestoreClient.php index ea0a375..aa686af 100644 --- a/src/TriplestoreClient.php +++ b/src/TriplestoreClient.php @@ -11,7 +11,7 @@ * @category Islandora * @package Islandora * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ diff --git a/src/Uuid/IUuidGenerator.php b/src/Uuid/IUuidGenerator.php index 70a2229..e78e9fa 100644 --- a/src/Uuid/IUuidGenerator.php +++ b/src/Uuid/IUuidGenerator.php @@ -11,7 +11,7 @@ * @category Islandora * @package Islandora * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ @@ -23,7 +23,7 @@ * @category Islandora * @package Islandora * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ interface IUuidGenerator { From 93a71820d1a60fabd1aac21e129ce0f048900246 Mon Sep 17 00:00:00 2001 From: nruest Date: Sun, 26 Jun 2016 19:43:43 -0400 Subject: [PATCH 3/5] Add License README badge; Address https://github.com/Islandora-CLAW/CLAW/issues/263 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cfc0b1b..d9d4e42 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Chullo is a PHP client for Fedora 4 built using Guzzle and EasyRdf. [![Downloads](https://img.shields.io/packagist/dt/islandora/chullo.svg?style=flat-square)](https://packagist.org/packages/islandora/chullo) [![Build Status](https://travis-ci.org/Islandora-CLAW/chullo.svg?branch=master)](https://travis-ci.org/Islandora-CLAW/chullo) [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md) +[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](./LICENSE) [![codecov](https://codecov.io/gh/Islandora-CLAW/chullo/branch/master/graph/badge.svg)](https://codecov.io/gh/Islandora-CLAW/chullo) ## Requirements From d9e3a99dab6b507fead6f40638ad570bb83be920 Mon Sep 17 00:00:00 2001 From: nruest Date: Tue, 26 Jul 2016 08:58:00 -0400 Subject: [PATCH 4/5] Update Danny's email --- composer.json | 2 +- src/Chullo.php | 2 +- src/FedoraApi.php | 2 +- src/IFedoraApi.php | 2 +- src/IFedoraClient.php | 2 +- src/ITriplestoreClient.php | 2 +- src/TriplestoreClient.php | 2 +- src/Uuid/IUuidGenerator.php | 8 +------- src/Uuid/UuidGenerator.php | 15 +++++++++++++++ 9 files changed, 23 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 98b81e7..52f180c 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ }, { "name": "Daniel Lamb", - "email": "daniel@discoverygarden.ca", + "email": "dlamb@islandora.ca", "role": "Maintainer" }, { diff --git a/src/Chullo.php b/src/Chullo.php index 90c3f0f..4ec73a1 100644 --- a/src/Chullo.php +++ b/src/Chullo.php @@ -10,7 +10,7 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest * @author Diego Pino * @license https://opensource.org/licenses/MIT MIT diff --git a/src/FedoraApi.php b/src/FedoraApi.php index 098c069..11fbd25 100644 --- a/src/FedoraApi.php +++ b/src/FedoraApi.php @@ -10,7 +10,7 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest * @author Jared Whiklo * @author Diego Pino diff --git a/src/IFedoraApi.php b/src/IFedoraApi.php index 930f48f..fb7f958 100644 --- a/src/IFedoraApi.php +++ b/src/IFedoraApi.php @@ -10,7 +10,7 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest * @author Diego Pino * @license https://opensource.org/licenses/MIT MIT diff --git a/src/IFedoraClient.php b/src/IFedoraClient.php index ce7afa5..0d695c1 100644 --- a/src/IFedoraClient.php +++ b/src/IFedoraClient.php @@ -10,7 +10,7 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest * @author Diego Pino * @license https://opensource.org/licenses/MIT MIT diff --git a/src/ITriplestoreClient.php b/src/ITriplestoreClient.php index bd0b715..e604c36 100644 --- a/src/ITriplestoreClient.php +++ b/src/ITriplestoreClient.php @@ -10,7 +10,7 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest * @author Diego Pino * @license https://opensource.org/licenses/MIT MIT diff --git a/src/TriplestoreClient.php b/src/TriplestoreClient.php index 94a19db..52e9c61 100644 --- a/src/TriplestoreClient.php +++ b/src/TriplestoreClient.php @@ -10,7 +10,7 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest * @author Diego Pino * @license https://opensource.org/licenses/MIT MIT diff --git a/src/Uuid/IUuidGenerator.php b/src/Uuid/IUuidGenerator.php index 0787af6..d0fde43 100644 --- a/src/Uuid/IUuidGenerator.php +++ b/src/Uuid/IUuidGenerator.php @@ -10,7 +10,7 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ @@ -19,12 +19,6 @@ /** * Interface for generating UUIDs. - * - * @category Islandora - * @package Islandora - * @author Daniel Lamb - * @license https://opensource.org/licenses/MIT MIT - * @link http://www.islandora.ca */ interface IUuidGenerator { diff --git a/src/Uuid/UuidGenerator.php b/src/Uuid/UuidGenerator.php index 146a013..c9c3ca5 100644 --- a/src/Uuid/UuidGenerator.php +++ b/src/Uuid/UuidGenerator.php @@ -1,5 +1,20 @@ + * @license https://opensource.org/licenses/MIT MIT + * @link http://www.islandora.ca + */ + namespace Islandora\Chullo\Uuid; use Ramsey\Uuid\Uuid; From 04271743aeba2bbbf86a82d907693e9bd3e13aeb Mon Sep 17 00:00:00 2001 From: nruest Date: Tue, 26 Jul 2016 09:07:25 -0400 Subject: [PATCH 5/5] WHITE SPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACE --- src/Uuid/UuidGenerator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Uuid/UuidGenerator.php b/src/Uuid/UuidGenerator.php index c9c3ca5..67442ac 100644 --- a/src/Uuid/UuidGenerator.php +++ b/src/Uuid/UuidGenerator.php @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. * - * PHP Version 5.5.9 + * PHP Version 5.5.9 * - * @category Islandora + * @category Islandora * @package Islandora * @author Daniel Lamb * @license https://opensource.org/licenses/MIT MIT