Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add LICENSE -- Address #4 #13

Merged
merged 9 commits into from
Aug 1, 2016
Merged
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"squizlabs/php_codesniffer": "^2.0@dev",
"mockery/mockery": "^0.9"
},
"license": "GPLv3",
"license": "MIT",
"authors": [
{
"name": "Islandora Foundation",
Expand All @@ -29,7 +29,7 @@
},
{
"name": "Daniel Lamb",
"email": "daniel@discoverygarden.ca",
"email": "dlamb@islandora.ca",
"role": "Maintainer"
},
{
Expand Down
10 changes: 2 additions & 8 deletions src/Chullo.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <daniel@discoverygarden.ca>
* @author Daniel Lamb <dlamb@islandora.ca>
* @author Nick Ruest <[email protected]>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note to self to update Danny's email address before we merge this

* @author Diego Pino <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @license https://opensource.org/licenses/MIT MIT
* @link http://www.islandora.ca
*/

Expand All @@ -23,12 +23,6 @@

/**
* Default implementation of IFedoraClient
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @link http://www.islandora.ca
*/
class Chullo implements IFedoraClient
{
Expand Down
13 changes: 2 additions & 11 deletions src/FedoraApi.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <daniel@discoverygarden.ca>
* @author Daniel Lamb <dlamb@islandora.ca>
* @author Nick Ruest <[email protected]>
* @author Jared Whiklo <[email protected]>
* @author Diego Pino <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @license https://opensource.org/licenses/MIT MIT
* @link http://www.islandora.ca
*/

Expand All @@ -26,15 +26,6 @@

/**
* Default implementation of IFedoraApi using Guzzle.
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <[email protected]>
* @author Nick Ruest <[email protected]>
* @author Jared Whiklo <[email protected]>
* @author Diego Pino <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @link http://www.islandora.ca
*/
class FedoraApi implements IFedoraApi
{
Expand Down
14 changes: 4 additions & 10 deletions src/IFedoraApi.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <daniel@discoverygarden.ca>
* @author Daniel Lamb <dlamb@islandora.ca>
* @author Nick Ruest <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @author Diego Pino <[email protected]>
* @license https://opensource.org/licenses/MIT MIT
* @link http://www.islandora.ca
*/

Expand All @@ -22,14 +23,7 @@

/**
* Interface for Fedora interaction. All functions return a PSR-7 response.
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <[email protected]>
* @author Diego Pino <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @link http://www.islandora.ca
*/
*/
interface IFedoraApi
{
/**
Expand Down
13 changes: 3 additions & 10 deletions src/IFedoraClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,17 @@
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <daniel@discoverygarden.ca>
* @author Daniel Lamb <dlamb@islandora.ca>
* @author Nick Ruest <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @author Diego Pino <[email protected]>
* @license https://opensource.org/licenses/MIT MIT
* @link http://www.islandora.ca
*/

namespace Islandora\Chullo;

/**
* Interface for Fedora interaction.
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <[email protected]>
* @author Nick Ruest <[email protected]>
* @author Diego Pino <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @link http://www.islandora.ca
*/
interface IFedoraClient extends IFedoraApi
{
Expand Down
12 changes: 3 additions & 9 deletions src/ITriplestoreClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,17 @@
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <daniel@discoverygarden.ca>
* @author Daniel Lamb <dlamb@islandora.ca>
* @author Nick Ruest <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @author Diego Pino <[email protected]>
* @license https://opensource.org/licenses/MIT MIT
* @link http://www.islandora.ca
*/

namespace Islandora\Chullo;

/**
* Interface for triplestore interaction.
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <[email protected]>
* @author Diego Pino <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @link http://www.islandora.ca
*/
interface ITriplestoreClient
{
Expand Down
4 changes: 2 additions & 2 deletions src/TriplestoreClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <daniel@discoverygarden.ca>
* @author Daniel Lamb <dlamb@islandora.ca>
* @author Nick Ruest <[email protected]>
* @author Diego Pino <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @license https://opensource.org/licenses/MIT MIT
* @link http://www.islandora.ca
*/

Expand Down
10 changes: 2 additions & 8 deletions src/Uuid/IUuidGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,15 @@
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <daniel@discoverygarden.ca>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @author Daniel Lamb <dlamb@islandora.ca>
* @license https://opensource.org/licenses/MIT MIT
* @link http://www.islandora.ca
*/

namespace Islandora\Chullo\Uuid;

/**
* Interface for generating UUIDs.
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <[email protected]>
* @license http://www.gnu.org/licenses/gpl-3.0.en.html GPL
* @link http://www.islandora.ca
*/
interface IUuidGenerator
{
Expand Down
15 changes: 15 additions & 0 deletions src/Uuid/UuidGenerator.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
<?php

/**
* This file is part of Islandora.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*
* PHP Version 5.5.9
*
* @category Islandora
* @package Islandora
* @author Daniel Lamb <[email protected]>
* @license https://opensource.org/licenses/MIT MIT
* @link http://www.islandora.ca
*/

namespace Islandora\Chullo\Uuid;

use Ramsey\Uuid\Uuid;
Expand Down