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. diff --git a/README.md b/README.md index 0a6e5d1..c689e57 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Chullo is a PHP client for [Fedora 4](http://fedorarepository.org/) built using [![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 diff --git a/composer.json b/composer.json index 6ab4ae2..52f180c 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "squizlabs/php_codesniffer": "^2.0@dev", "mockery/mockery": "^0.9" }, - "license": "GPLv3", + "license": "MIT", "authors": [ { "name": "Islandora Foundation", @@ -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 f15221c..4ec73a1 100644 --- a/src/Chullo.php +++ b/src/Chullo.php @@ -10,10 +10,10 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest * @author Diego Pino - * @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,12 +23,6 @@ /** * Default implementation of IFedoraClient - * - * @category Islandora - * @package Islandora - * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL - * @link http://www.islandora.ca */ class Chullo implements IFedoraClient { diff --git a/src/FedoraApi.php b/src/FedoraApi.php index b90e22e..11fbd25 100644 --- a/src/FedoraApi.php +++ b/src/FedoraApi.php @@ -10,11 +10,11 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest * @author Jared Whiklo * @author Diego Pino - * @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,15 +26,6 @@ /** * Default implementation of IFedoraApi using Guzzle. - * - * @category Islandora - * @package Islandora - * @author Daniel Lamb - * @author Nick Ruest - * @author Jared Whiklo - * @author Diego Pino - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL - * @link http://www.islandora.ca */ class FedoraApi implements IFedoraApi { diff --git a/src/IFedoraApi.php b/src/IFedoraApi.php index 65103c5..fb7f958 100644 --- a/src/IFedoraApi.php +++ b/src/IFedoraApi.php @@ -10,9 +10,10 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @author Diego Pino + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ @@ -22,14 +23,7 @@ /** * Interface for Fedora interaction. All functions return a PSR-7 response. - * - * @category Islandora - * @package Islandora - * @author Daniel Lamb - * @author Diego Pino - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL - * @link http://www.islandora.ca - */ + */ interface IFedoraApi { /** diff --git a/src/IFedoraClient.php b/src/IFedoraClient.php index 978e098..0d695c1 100644 --- a/src/IFedoraClient.php +++ b/src/IFedoraClient.php @@ -10,9 +10,10 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @author Diego Pino + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ @@ -20,14 +21,6 @@ /** * Interface for Fedora interaction. - * - * @category Islandora - * @package Islandora - * @author Daniel Lamb - * @author Nick Ruest - * @author Diego Pino - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL - * @link http://www.islandora.ca */ interface IFedoraClient extends IFedoraApi { diff --git a/src/ITriplestoreClient.php b/src/ITriplestoreClient.php index e98e585..e604c36 100644 --- a/src/ITriplestoreClient.php +++ b/src/ITriplestoreClient.php @@ -10,9 +10,10 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @author Diego Pino + * @license https://opensource.org/licenses/MIT MIT * @link http://www.islandora.ca */ @@ -20,13 +21,6 @@ /** * Interface for triplestore interaction. - * - * @category Islandora - * @package Islandora - * @author Daniel Lamb - * @author Diego Pino - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL - * @link http://www.islandora.ca */ interface ITriplestoreClient { diff --git a/src/TriplestoreClient.php b/src/TriplestoreClient.php index 90d7ab4..52e9c61 100644 --- a/src/TriplestoreClient.php +++ b/src/TriplestoreClient.php @@ -10,10 +10,10 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb + * @author Daniel Lamb * @author Nick Ruest * @author Diego Pino - * @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 72e05c9..d0fde43 100644 --- a/src/Uuid/IUuidGenerator.php +++ b/src/Uuid/IUuidGenerator.php @@ -10,8 +10,8 @@ * * @category Islandora * @package Islandora - * @author Daniel Lamb - * @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL + * @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 http://www.gnu.org/licenses/gpl-3.0.en.html GPL - * @link http://www.islandora.ca */ interface IUuidGenerator { diff --git a/src/Uuid/UuidGenerator.php b/src/Uuid/UuidGenerator.php index 146a013..67442ac 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;