Moved to the MIT license

Author: GrahamCampbell

CHANGELOG.md

@@ -5,6 +5,8 @@ CHANGE LOG
 ## V1.0.2 (Upcoming)
 
 * Removed the cs fixers
+* CS fixes
+* Moved to the MIT license
 
 
 ## V1.0.1 (19/10/2014)

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-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.

LICENSE.md

@@ -1,15 +1,15 @@
 Laravel Navigation
 ==================
 
-Laravel Navigation was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell), and is a navigation bar generator for [Laravel 4.2](http://laravel.com). Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Laravel-Navigation/releases), [license](LICENSE.md), [api docs](http://docs.grahamjcampbell.co.uk), and [contribution guidelines](CONTRIBUTING.md).
+Laravel Navigation was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell), and is a navigation bar generator for [Laravel 4.2](http://laravel.com). Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Laravel-Navigation/releases), [license](LICENSE), [api docs](http://docs.grahamjcampbell.co.uk), and [contribution guidelines](CONTRIBUTING.md).
 
 ![Laravel Navigation](https://cloud.githubusercontent.com/assets/2829600/4432310/c15b15ba-468c-11e4-8ced-33d809c3b209.PNG)
 
 <p align="center">
 <a href="https://travis-ci.org/GrahamCampbell/Laravel-Navigation"><img src="https://img.shields.io/travis/GrahamCampbell/Laravel-Navigation/master.svg?style=flat-square" alt="Build Status"></img></a>
 <a href="https://scrutinizer-ci.com/g/GrahamCampbell/Laravel-Navigation/code-structure"><img src="https://img.shields.io/scrutinizer/coverage/g/GrahamCampbell/Laravel-Navigation.svg?style=flat-square" alt="Coverage Status"></img></a>
 <a href="https://scrutinizer-ci.com/g/GrahamCampbell/Laravel-Navigation"><img src="https://img.shields.io/scrutinizer/g/GrahamCampbell/Laravel-Navigation.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-Navigation/releases"><img src="https://img.shields.io/github/release/GrahamCampbell/Laravel-Navigation.svg?style=flat-square" alt="Latest Version"></img></a>
 </p>
 
@@ -50,7 +50,7 @@ Laravel Navigation requires no configuration. Just follow the simple install ins
 
 This is the class of most interest. It is bound to the ioc container as `'navigation'` and can be accessed using the `Facades\Navigation` facade. There are three public methods of interest.
 
-The `'addToMain'` and `'addToBar'` methods will add the item to the internal main navigation array in the specified way. These methods both accept three arguments. All but the first are optional. The first argument must be an array. It must have either a `'slug'` key or a `'url'` key where the slug is the target url relative to the base url, and the url is a full url you may specify (useful to link to somewhere outside the application). It must also have a `'title'` key which will specify the title, and you may also optionally add an `'icon'` key which will at the relevant icon from font awesome to the mix. The second parameter specifies which navigation bar you want to add to. By default this is `'default'`, but you may have mutliple navigation bars, for example, [Bootstrap CMS](https://github.com/GrahamCampbell/Bootstrap-CMS) has an `'admin'` navigation bar. The final parameter specifies if the item should be prepended to the internal array. By default this is `false`.
+The `'addToMain'` and `'addToBar'` methods will add the item to the internal main navigation array in the specified way. These methods both accept three arguments. All but the first are optional. The first argument must be an array. It must have either a `'slug'` key or a `'url'` key where the slug is the target url relative to the base url, and the url is a full url you may specify (useful to link to somewhere outside the application). It must also have a `'title'` key which will specify the title, and you may also optionally add an `'icon'` key which will at the relevant icon from font awesome to the mix. The second parameter specifies which navigation bar you want to add to. By default this is `'default'`, but you may have mutliple navigation bars, for example, [Bootstrap CMS](https://github.com/BootstrapCMS/CMS) has an `'admin'` navigation bar. The final parameter specifies if the item should be prepended to the internal array. By default this is `false`.
 
 The third method is `'render'`, and accepts three arguments. All arguments are optional. The fist argument selects the main navigation bar you which to return. By default this is set to `'default'`. The third argument selection the bar navigation bar you wish to return. By default this is set to `false`, where by no bar navigation is returned. You may set this to any string to return the relevant navigation bar. The final parameter is an array of variables you wish to pass to the navigation view. The default is `array('title' => 'Navigation', 'side' => 'dropdown', 'inverse' => true)`.
 
@@ -70,23 +70,7 @@ This class contains no public methods of interest. This class should be added to
 
 Feel free to check out the [API Documentation](http://docs.grahamjcampbell.co.uk) for Laravel Navigation.
 
-You may see an example of implementation in [Bootstrap CMS](https://github.com/GrahamCampbell/Bootstrap-CMS).
-
 
 ## License
 
-Apache License
-
-Copyright 2013-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 Navigation is licensed under [The MIT License (MIT)](LICENSE).

README.md

@@ -2,7 +2,7 @@
     "name": "graham-campbell/navigation",
     "description": "Navigation Is A Navigation Bar Generator For Laravel 4.2",
     "keywords": ["laravel", "framework", "navigation generator", "navigation", "navigation bar", "Navigation", "Laravel Navigation", "Laravel-Navigation", "Graham Campbell", "GrahamCampbell"],
-    "license": "Apache-2.0",
+    "license": "MIT",
     "authors": [
         {
             "name": "Graham Campbell",

composer.json

@@ -1,17 +1,12 @@
 <?php
 
 /*
- * This file is part of Laravel Navigation by Graham Campbell.
+ * This file is part of Laravel Navigation.
  *
- * 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\Navigation\Facades;
@@ -21,9 +16,7 @@
 /**
  * This is the navigation facade class.
  *
- * @author    Graham Campbell <graham@mineuk.com>
- * @copyright 2013-2014 Graham Campbell
- * @license   <https://github.com/GrahamCampbell/Laravel-Navigation/blob/master/LICENSE.md> Apache 2.0
+ * @author Graham Campbell <graham@mineuk.com>
  */
 class Navigation extends Facade
 {