From 090c093e4d0d2689f3ecb214b9a69a8174b87e41 Mon Sep 17 00:00:00 2001 From: Piotr Szymaszek Date: Wed, 17 Feb 2016 21:50:34 +0100 Subject: [PATCH] Changed the license to GPL v3 --- README.md | 15 ++++++++++++--- composer.json | 16 ++++++++++++++-- readme.txt | Bin 12528 -> 0 bytes 3 files changed, 26 insertions(+), 5 deletions(-) delete mode 100644 readme.txt diff --git a/README.md b/README.md index 7a62568..86a6ca6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Table of contents: ================== * [About](#about) +* [License](#license) * [Contributing](#contributing) * [Installation](#installation-via-composer) * [Usage](#usage) @@ -31,18 +32,26 @@ What was done: - Replaced all `exit()` / `die()` commands with `throw` statements to allow a degree of error control. -- Set the code to PSR-2 standard and added annotations (as best as I could figure them out) to methods. -Also, typehinting was added to methods where possible, so some backwards compatibility breaks may occur. +- Refactored the code to meet PSR-2 standard and added annotations (as best as I could figure them out). +to methods Also, typehinting was added to methods where possible, so some backwards compatibility breaks +may occur. - Added a factory service for loading the classes. - Moved all constants to a single file `src/Resources/data/constants.php`. This file is *required* for the library to function and is now loaded via Composer. +License: +======== + +It was previously stated that this package is on [MIT](https://opensource.org/licenses/MIT) license, which did not meet the requirements +set by the original author. It is now under the [GNU GPL v3](http://www.gnu.org/licenses/gpl-3.0.html) +license, so if you wish to use it in a commercial project, you need to pay an [appropriate fee](http://www.pchart.net/license). + Contributing: ============= -If you wish to contribute to the stable version, there is a branch called `legacy` to which you +If you wish to contribute to the `1.*` version, there is a branch called `legacy` to which you may submit pull requests. Otherwise feel free to use the `master` branch. Installation (via Composer): diff --git a/composer.json b/composer.json index 9064417..6a763fb 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,22 @@ { "name": "szymach/c-pchart", - "license": "MIT", + "license": "GPL-3.0", "type": "project", "description": "Port of \"pChart\" library into PHP 5", - "keywords": ["pchart", "pChart","statistics","charts", "c-pChart", "c-pchart"], + "keywords": ["pchart", "pChart","statistics","charts","CpChart","c-pChart"], "homepage": "https://github.com/szymach/c-pchart", + "authors": [ + { + "name": "Jean-Damien Pogolotti", + "homepage": "http://www.pchart.net", + "role": "Creator of the original pChart library" + }, + { + "name": "Piotr Szymaszek", + "homepage": "https://github.com/szymach", + "role": "Developer of the CpChart wrapper package" + } + ], "autoload": { "psr-4": { "CpChart\\": "src/" }, "files": ["src/Resources/data/constants.php"] diff --git a/readme.txt b/readme.txt deleted file mode 100644 index 65917123ab0e5ef1c144efb1e26eed46d00b374e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12528 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