Moved to the MIT license

GrahamCampbell · GrahamCampbell · commit 0843f9443080 · 2015-01-11T16:34:44.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ CHANGE LOG
 ## V1.0.1 (Upcoming)
 
 * Removed the cs fixers
+* CS fixes
+* Moved to the MIT license
 
 
 ## V1.0 (19/10/2014)
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 Parse
 =============
 
-Laravel Parse was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell), and is a [Parse SDK](https://github.com/ParsePlatform/parse-php-sdk) bridge for [Laravel 4.1/4.2](http://laravel.com). Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Laravel-Parse/releases), [license](LICENSE.md), [api docs](http://docs.grahamjcampbell.co.uk), and [contribution guidelines](CONTRIBUTING.md).
+Laravel Parse was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell), and is a [Parse SDK](https://github.com/ParsePlatform/parse-php-sdk) bridge for [Laravel 4.1/4.2](http://laravel.com). Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Laravel-Parse/releases), [license](LICENSE), [api docs](http://docs.grahamjcampbell.co.uk), and [contribution guidelines](CONTRIBUTING.md).
 
 ![Laravel Parse](https://cloud.githubusercontent.com/assets/2829600/4432306/c14b319a-468c-11e4-81e8-29754fa09a86.PNG)
 
 <p align="center">
 <a href="https://travis-ci.org/GrahamCampbell/Laravel-Parse"><img src="https://img.shields.io/travis/GrahamCampbell/Laravel-Parse/master.svg?style=flat-square" alt="Build Status"></img></a>
 <a href="https://scrutinizer-ci.com/g/GrahamCampbell/Laravel-Parse/code-structure"><img src="https://img.shields.io/scrutinizer/coverage/g/GrahamCampbell/Laravel-Parse.svg?style=flat-square" alt="Coverage Status"></img></a>
 <a href="https://scrutinizer-ci.com/g/GrahamCampbell/Laravel-Parse"><img src="https://img.shields.io/scrutinizer/g/GrahamCampbell/Laravel-Parse.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-Parse/releases"><img src="https://img.shields.io/github/release/GrahamCampbell/Laravel-Parse.svg?style=flat-square" alt="Latest Version"></img></a>
 </p>
 
@@ -67,18 +67,4 @@ This package is only responsible for the automatic initialisation of the parse c
 
 ## 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 Parse is licensed under [The MIT License (MIT)](LICENSE).
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "graham-campbell/parse",
     "description": "Parse Is A Parse SDK Bridge For Laravel 4.1/4.2",
     "keywords": ["laravel", "framework", "parse", "parse-sdk", "parse sdk", "ParseSDK", "parse bridge", "parse sdk bridge", "bridge", "Parse", "Laravel Parse", "Laravel-Parse", "Graham Campbell", "GrahamCampbell"],
-    "license": "Apache-2.0",
+    "license": "MIT",
     "authors": [
         {
             "name": "Graham Campbell",
diff --git a/src/ParseServiceProvider.php b/src/ParseServiceProvider.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Laravel Parse by Graham Campbell.
+ * This file is part of Laravel Parse.
  *
- * 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\Parse;
@@ -22,9 +17,7 @@
 /**
  * This is the parse service provider class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Laravel-Parse/blob/master/LICENSE.md> Apache 2.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class ParseServiceProvider extends ServiceProvider
 {
diff --git a/src/config/config.php b/src/config/config.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Laravel Parse by Graham Campbell.
+ * This file is part of Laravel Parse.
  *
- * 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 [
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Laravel Parse by Graham Campbell.
+ * This file is part of Laravel Parse.
  *
- * 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\Tests\Parse;
@@ -21,9 +16,7 @@
 /**
  * This is the abstract test case class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Laravel-Parse/blob/master/LICENSE.md> Apache 2.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 abstract class AbstractTestCase extends TestCase
 {
diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Laravel Parse by Graham Campbell.
+ * This file is part of Laravel Parse.
  *
- * 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\Tests\Parse;
@@ -21,9 +16,7 @@
 /**
  * This is the service provider test class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Laravel-Parse/blob/master/LICENSE.md> Apache 2.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class ServiceProviderTest extends AbstractTestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "graham-campbell/parse",`
`3`	`3`	`"description": "Parse Is A Parse SDK Bridge For Laravel 4.1/4.2",`
`4`	`4`	`"keywords": ["laravel", "framework", "parse", "parse-sdk", "parse sdk", "ParseSDK", "parse bridge", "parse sdk bridge", "bridge", "Parse", "Laravel Parse", "Laravel-Parse", "Graham Campbell", "GrahamCampbell"],`
`5`		`- "license": "Apache-2.0",`
	`5`	`+ "license": "MIT",`
`6`	`6`	`"authors": [`
`7`	`7`	`{`
`8`	`8`	`"name": "Graham Campbell",`