Moved to the MIT license

BootstrapCMS · Jan 2, 2015 · a498c46 · a498c46
1 parent 960b73e
commit a498c46
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 269 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2015 Graham Campbell <graham@mineuk.com>
+
+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/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
@@ -1,15 +1,15 @@
 Laravel CloudFlare
 ==================
 
-Laravel CloudFlare was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell), and provides a simple [CloudFlare](https://www.cloudflare.com/) module for [Laravel 4.1/4.2](http://laravel.com). It utilises a few of my packages including [Laravel Core](https://github.com/GrahamCampbell/Laravel-Core) and [Laravel CloudFlare API](https://github.com/GrahamCampbell/Laravel-CloudFlare-API). Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Laravel-CloudFlare/releases), [license](LICENSE.md), [api docs](http://docs.grahamjcampbell.co.uk), and [contribution guidelines](CONTRIBUTING.md).
+Laravel CloudFlare was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell), and provides a simple [CloudFlare](https://www.cloudflare.com/) module for [Laravel 4.1/4.2](http://laravel.com). It utilises a few of my packages including [Laravel Core](https://github.com/GrahamCampbell/Laravel-Core) and [Laravel CloudFlare API](https://github.com/GrahamCampbell/Laravel-CloudFlare-API). Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Laravel-CloudFlare/releases), [license](LICENSE), [api docs](http://docs.grahamjcampbell.co.uk), and [contribution guidelines](CONTRIBUTING.md).
 
 ![Laravel CloudFlare](https://cloud.githubusercontent.com/assets/2829600/4432320/c1804e48-468c-11e4-8786-34d48cf3ad2b.PNG)
 
 <p align="center">
 <a href="https://travis-ci.org/GrahamCampbell/Laravel-CloudFlare"><img src="https://img.shields.io/travis/GrahamCampbell/Laravel-CloudFlare/master.svg?style=flat-square" alt="Build Status"></img></a>
 <a href="https://scrutinizer-ci.com/g/GrahamCampbell/Laravel-CloudFlare/code-structure"><img src="https://img.shields.io/scrutinizer/coverage/g/GrahamCampbell/Laravel-CloudFlare.svg?style=flat-square" alt="Coverage Status"></img></a>
 <a href="https://scrutinizer-ci.com/g/GrahamCampbell/Laravel-CloudFlare"><img src="https://img.shields.io/scrutinizer/g/GrahamCampbell/Laravel-CloudFlare.svg?style=flat-square" alt="Quality Score"></img></a>
-<a href="LICENSE.md"><img src="https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg?style=flat-square" alt="Software License"></img></a>
+<a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square" alt="Software License"></img></a>
 <a href="https://github.com/GrahamCampbell/Laravel-CloudFlare/releases"><img src="https://img.shields.io/github/release/GrahamCampbell/Laravel-CloudFlare.svg?style=flat-square" alt="Latest Version"></img></a>
 </p>
 
@@ -90,18 +90,4 @@ The internals of Laravel CloudFlare are not documented here, but feel free to ch
 
 ## License
 
-Apache License
-
-Copyright 2014 Graham Campbell
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Laravel CloudFlare is licensed under [The MIT License (MIT)](LICENSE).
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "graham-campbell/cloudflare",
     "description": "CloudFlare Provides A Simple CloudFlare Module For Laravel 4.1/4.2",
     "keywords": ["laravel", "framework", "cloudflare api", "cloudflare", "CloudFlare", "Laravel CloudFlare", "Laravel-CloudFlare", "Graham Campbell", "GrahamCampbell"],
-    "license": "Apache-2.0",
+    "license": "MIT",
     "authors": [
         {
             "name": "Graham Campbell",

diff --git a/src/CloudFlareServiceProvider.php b/src/CloudFlareServiceProvider.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Laravel CloudFlare by Graham Campbell.
+ * This file is part of Laravel CloudFlare.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://bit.ly/UWsjkb.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\CloudFlare;
@@ -21,9 +16,7 @@
 /**
  * This is the cloudflare service provider class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Laravel-CloudFlare/blob/master/LICENSE.md> Apache 2.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class CloudFlareServiceProvider extends ServiceProvider
 {

diff --git a/src/Controllers/CloudFlareController.php b/src/Controllers/CloudFlareController.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Laravel CloudFlare by Graham Campbell.
+ * This file is part of Laravel CloudFlare.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://bit.ly/UWsjkb.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace GrahamCampbell\CloudFlare\Controllers;
@@ -24,9 +19,7 @@
 /**
  * This is the cloudflare controller class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Laravel-CloudFlare/blob/master/LICENSE.md> Apache 2.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class CloudFlareController extends Controller
 {

diff --git a/src/assets.php b/src/assets.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Laravel CloudFlare by Graham Campbell.
+ * This file is part of Laravel CloudFlare.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://bit.ly/UWsjkb.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 use Lightgear\Asset\Facades\Asset;

diff --git a/src/config/config.php b/src/config/config.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Laravel CloudFlare by Graham Campbell.
+ * This file is part of Laravel CloudFlare.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://bit.ly/UWsjkb.
+ * (c) Graham Campbell <graham@mineuk.com>
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 return [