Merge remote-tracking branch 'origin/2.1'

GrahamCampbell · GrahamCampbell · commit 284e0e7914a5 · 2014-12-23T19:06:25.000Z
Conflicts:
	CHANGELOG.md
	src/filters.php
	tests/Functional/FilterEnabledTest.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@ CHANGE LOG
 * Upgraded to laravel 5
 
 
-## V2.1.4 Alpha (Upcoming)
+## V2.1.4 (Upcoming)
 
 * Removed the cs fixers
 
diff --git a/src/Compilers/MinifyCompiler.php b/src/Compilers/MinifyCompiler.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -53,11 +53,11 @@ public function __construct(BladeMinifier $blade, Filesystem $files, $cachePath)
     }
 
     /**
-    * Minifies the output before saving it.
-    *
-    * @param  string  $value
-    * @return string
-    */
+     * Minifies the output before saving it.
+     *
+     * @param  string $value
+     * @return string
+     */
     public function compileMinify($value)
     {
         return $this->blade->render($value);
diff --git a/src/Facades/HTMLMin.php b/src/Facades/HTMLMin.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/HTMLMin.php b/src/HTMLMin.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/HTMLMinServiceProvider.php b/src/HTMLMinServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/Minifiers/BladeMinifier.php b/src/Minifiers/BladeMinifier.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/Minifiers/CssMinifier.php b/src/Minifiers/CssMinifier.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/Minifiers/HtmlMinifier.php b/src/Minifiers/HtmlMinifier.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/Minifiers/JsMinifier.php b/src/Minifiers/JsMinifier.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/Minifiers/MinifierInterface.php b/src/Minifiers/MinifierInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/config/config.php b/src/config/config.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Compilers/MinifyCompilerTest.php b/tests/Compilers/MinifyCompilerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Facades/HTMLMinTest.php b/tests/Facades/HTMLMinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Functional/AbstractFunctionalTestCase.php b/tests/Functional/AbstractFunctionalTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Functional/BladeEnabledTest.php b/tests/Functional/BladeEnabledTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Functional/FilterEnabledTest.php b/tests/Functional/FilterEnabledTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,7 @@ public function testNewSetup()
 
         $this->app['router']->get('htmlmin-test-route', ['after' => 'htmlmin', function () {
             return $this->app['view']->make('stubs::test');
-        }, ]);
+        }]);
 
         $actual = $this->call('GET', 'htmlmin-test-route')->getContent();
 
diff --git a/tests/Functional/LiveEnabledTest.php b/tests/Functional/LiveEnabledTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/HTMLMinTest.php b/tests/HTMLMinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Minifiers/BladeMinifierTest.php b/tests/Minifiers/BladeMinifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Minifiers/CssMinifierTest.php b/tests/Minifiers/CssMinifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Minifiers/HtmlMinifierTest.php b/tests/Minifiers/HtmlMinifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Minifiers/JsMinifierTest.php b/tests/Minifiers/JsMinifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel HTMLMin by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-/**`
	`3`	`+/*`
`4`	`4`	`* This file is part of Laravel HTMLMin by Graham Campbell.`
`5`	`5`	`*`
`6`	`6`	`* Licensed under the Apache License, Version 2.0 (the "License");`