Skip to content

Commit 379a9e5

Browse files
GrahamCampbellGrahamCampbell
committed
Merge remote-tracking branch 'origin/2.1'
Conflicts: CHANGELOG.md README.md src/filters.php
2 parents 06ddac4 + 8316f23 commit 379a9e5

28 files changed

+143
-470
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ CHANGE LOG
77
* Upgraded to laravel 5
88

99

10-
## V2.1.4 (Upcoming)
10+
## V2.1.4 (04/01/2014)
1111

1212
* Removed the cs fixers
13+
* CS fixes
14+
* Moved to the MIT license
1315

1416

1517
## V2.1.3 (05/10/2014)

‎LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2013-2015 Graham Campbell <[email protected]>
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎LICENSE.md

Lines changed: 0 additions & 176 deletions
This file was deleted.

‎README.md

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Laravel HTMLMin
22
===============
33

4-
Laravel HTMLMin was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell), and is a simple HTML minifier for [Laravel 5](http://laravel.com). It utilises Mr Clay's [Minify](https://github.com/mrclay/minify) package to minify entire responses, but can also minify blade at compile time. Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Laravel-HTMLMin/releases), [license](LICENSE.md), [api docs](http://docs.grahamjcampbell.co.uk), and [contribution guidelines](CONTRIBUTING.md).
4+
Laravel HTMLMin was created by, and is maintained by [Graham Campbell](https://github.com/GrahamCampbell), and is a simple HTML minifier for [Laravel 5](http://laravel.com). It utilises Mr Clay's [Minify](https://github.com/mrclay/minify) package to minify entire responses, but can also minify blade at compile time. Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/GrahamCampbell/Laravel-HTMLMin/releases), [license](LICENSE), [api docs](http://docs.grahamjcampbell.co.uk), and [contribution guidelines](CONTRIBUTING.md).
55

66
![Laravel HTMLMin](https://cloud.githubusercontent.com/assets/2829600/4432287/a99460da-468c-11e4-9bda-18345c06b2a5.PNG)
77

88
<p align="center">
99
<a href="https://travis-ci.org/GrahamCampbell/Laravel-HTMLMin"><img src="https://img.shields.io/travis/GrahamCampbell/Laravel-HTMLMin/master.svg?style=flat-square" alt="Build Status"></img></a>
1010
<a href="https://scrutinizer-ci.com/g/GrahamCampbell/Laravel-HTMLMin/code-structure"><img src="https://img.shields.io/scrutinizer/coverage/g/GrahamCampbell/Laravel-HTMLMin.svg?style=flat-square" alt="Coverage Status"></img></a>
1111
<a href="https://scrutinizer-ci.com/g/GrahamCampbell/Laravel-HTMLMin"><img src="https://img.shields.io/scrutinizer/g/GrahamCampbell/Laravel-HTMLMin.svg?style=flat-square" alt="Quality Score"></img></a>
12-
<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>
12+
<a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square" alt="Software License"></img></a>
1313
<a href="https://github.com/GrahamCampbell/Laravel-HTMLMin/releases"><img src="https://img.shields.io/github/release/GrahamCampbell/Laravel-HTMLMin.svg?style=flat-square" alt="Latest Version"></img></a>
1414
</p>
1515

@@ -100,23 +100,7 @@ There are other classes in this package that are not documented here (such as th
100100

101101
Feel free to check out the [API Documentation](http://docs.grahamjcampbell.co.uk) for Laravel HTMLMin.
102102

103-
You may see an example of implementation in [Bootstrap CMS](https://github.com/GrahamCampbell/Bootstrap-CMS).
104-
105103

106104
## License
107105

108-
Apache License
109-
110-
Copyright 2013-2014 Graham Campbell
111-
112-
Licensed under the Apache License, Version 2.0 (the "License");
113-
you may not use this file except in compliance with the License.
114-
You may obtain a copy of the License at
115-
116-
http://www.apache.org/licenses/LICENSE-2.0
117-
118-
Unless required by applicable law or agreed to in writing, software
119-
distributed under the License is distributed on an "AS IS" BASIS,
120-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
121-
See the License for the specific language governing permissions and
122-
limitations under the License.
106+
Laravel HTMLMin is licensed under [The MIT License (MIT)](LICENSE).

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "graham-campbell/htmlmin",
33
"description": "HTMLMin Is A Simple HTML Minifier For Laravel 5",
44
"keywords": ["laravel", "framework", "html minifier", "html", "minifier", "HTMLMin", "Laravel HTMLMin", "Laravel-HTMLMin", "Graham Campbell", "GrahamCampbell"],
5-
"license": "Apache-2.0",
5+
"license": "MIT",
66
"authors": [
77
{
88
"name": "Graham Campbell",

‎src/Compilers/MinifyCompiler.php

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
<?php
22

33
/*
4-
* This file is part of Laravel HTMLMin by Graham Campbell.
4+
* This file is part of Laravel HTMLMin.
55
*
6-
* Licensed under the Apache License, Version 2.0 (the "License");
7-
* you may not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at http://bit.ly/UWsjkb.
6+
* (c) Graham Campbell <[email protected]>
97
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
1510
*/
1611

1712
namespace GrahamCampbell\HTMLMin\Compilers;
@@ -23,9 +18,7 @@
2318
/**
2419
* This is the minify compiler class.
2520
*
26-
* @author Graham Campbell <[email protected]>
27-
* @copyright 2013-2014 Graham Campbell
28-
* @license <https://github.com/GrahamCampbell/Laravel-HTMLMin/blob/master/LICENSE.md> Apache 2.0
21+
* @author Graham Campbell <[email protected]>
2922
*/
3023
class MinifyCompiler extends BladeCompiler
3124
{

‎src/Facades/HTMLMin.php

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
<?php
22

33
/*
4-
* This file is part of Laravel HTMLMin by Graham Campbell.
4+
* This file is part of Laravel HTMLMin.
55
*
6-
* Licensed under the Apache License, Version 2.0 (the "License");
7-
* you may not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at http://bit.ly/UWsjkb.
6+
* (c) Graham Campbell <[email protected]>
97
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
1510
*/
1611

1712
namespace GrahamCampbell\HTMLMin\Facades;
@@ -21,9 +16,7 @@
2116
/**
2217
* This is the htmlmin facade class.
2318
*
24-
* @author Graham Campbell <[email protected]>
25-
* @copyright 2013-2014 Graham Campbell
26-
* @license <https://github.com/GrahamCampbell/Laravel-HTMLMin/blob/master/LICENSE.md> Apache 2.0
19+
* @author Graham Campbell <[email protected]>
2720
*/
2821
class HTMLMin extends Facade
2922
{

‎src/HTMLMin.php

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
<?php
22

33
/*
4-
* This file is part of Laravel HTMLMin by Graham Campbell.
4+
* This file is part of Laravel HTMLMin.
55
*
6-
* Licensed under the Apache License, Version 2.0 (the "License");
7-
* you may not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at http://bit.ly/UWsjkb.
6+
* (c) Graham Campbell <[email protected]>
97
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
1510
*/
1611

1712
namespace GrahamCampbell\HTMLMin;
@@ -25,9 +20,7 @@
2520
/**
2621
* This is the htmlmin class.
2722
*
28-
* @author Graham Campbell <[email protected]>
29-
* @copyright 2013-2014 Graham Campbell
30-
* @license <https://github.com/GrahamCampbell/Laravel-HTMLMin/blob/master/LICENSE.md> Apache 2.0
23+
* @author Graham Campbell <[email protected]>
3124
*/
3225
class HTMLMin
3326
{

0 commit comments

Comments
 (0)