Merge branch 'develop'

Author: Stolz

README.md

@@ -42,14 +42,11 @@ If you want the middleware to be run only on specific routes, add the class in t
 		'tidy' => 'Stolz\HtmlTidy\Middleware',
 	];
 
-Now in your `routes.php` file you can use
+Now you can use it in your `routes.php` file
 
-	get('some/url', [
-		'middleware' => 'tidy',
-		function() {
-			return view('hello');
-		}
-	]);
+	get('some/url', ['middleware' => 'tidy', function() {
+		return view('home');
+	}]);
 
 Conversely if you want the middleware to be run on every HTTP request to your application, add the class in the `$middleware` property of your `app/Http/Kernel.php` file.
 
@@ -58,6 +55,21 @@ Conversely if you want the middleware to be run on every HTTP request to your ap
 		'Stolz\HtmlTidy\Middleware',
 	];
 
+## Laravel 4
+
+If you are still using Laravel 4 instead of loading `Stolz\HtmlTidy\ServiceProvider` use `Stolz\HtmlTidy\LegacyServiceProvider` and then in your `routes.php` file use something like this
+
+	// Register filter
+	Route::filter('tidy', function($route, $request, $response) {
+		return app('stolz.tidy')->handle($request, $response);
+	});
+
+	// Use as an 'after' filter
+	Route::get('/', ['after' => 'tidy', function() {
+		return View::make('home');
+	}]);
+
+
 ## License
 
 MIT License

composer.json

@@ -10,7 +10,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.0",
+		"php": ">=5.4",
 		"ext-tidy": "*",
 		"illuminate/support": "5.*",
 		"illuminate/http": "5.*"

phpcodesniffer

@@ -29,6 +29,6 @@ fi
 # Run PHP_CodeSniffer
 
 cd "$DIR"
-./vendor/bin/phpcs --report-width=100 --tab-width=4 --standard=phpcodesniffer.xml,PHPCompatibility src/ -as --runtime-set testVersion 5.3
+./vendor/bin/phpcs --report-width=100 --tab-width=4 --standard=phpcodesniffer.xml,PHPCompatibility src/ -as --runtime-set testVersion 5.4
 
 exit 0

src/LegacyServiceProvider.php

@@ -12,10 +12,11 @@ class LegacyServiceProvider extends IlluminateServiceProvider
 	public function boot()
 	{
 		// Register the package namespace
-		$this->package('stolz/laravel-html-tidy', 'html-tidy');
+		//$this->package('stolz/tidy', 'tidy'); // Only valid if config file is at src/config/config.php
+		$this->app->config->package('stolz/tidy', __DIR__, 'tidy');
 
 		// Read settings from config file
-		$config = $this->app->config->get('html-tidy::config', array());
+		$config = $this->app->config->get('tidy::config', []);
 
 		// Apply config settings
 		$this->app['stolz.tidy']->config($config);
@@ -30,7 +31,7 @@ public function register()
 	{
 		// Bind 'stolz.tidy' shared component to the IoC container
 		$this->app->singleton('stolz.tidy', function ($app) {
-			return new Middleware();
+			return new Tidy();
 		});
 	}
 }

src/Tidy.php

@@ -54,7 +54,7 @@ class Tidy
 	 * Please read http://tidy.sourceforge.net/docs/quickref.html
 	 * @var array
 	 */
-	protected $tidy_options = array(
+	protected $tidy_options = [
 		'output-xhtml' => true,
 		'char-encoding' => 'utf8',
 		//'hide-comments' => true,
@@ -67,13 +67,13 @@ class Tidy
 		'doctype' => 'omit', //The filter will add the configured doctype later
 		'new-blocklevel-tags' => 'article,aside,canvas,dialog,embed,figcaption,figure,footer,header,hgroup,nav,output,progress,section,video',
 		'new-inline-tags' => 'audio,bdi,command,datagrid,datalist,details,keygen,mark,meter,rp,rt,ruby,source,summary,time,track,wbr',
-	);
+	];
 
 	/**
 	 * Errors that match these regexs won't be displayed
 	 * @var array
 	 */
-	protected $ignored_errors = array(
+	protected $ignored_errors = [
 		// workaround to hide errors related to HTML5
 		"/line.*proprietary attribute \"data-.*\n?/",
 		"/line.*proprietary attribute \"placeholder.*\n?/",
@@ -86,15 +86,15 @@ class Tidy
 		"/line.*<script> inserting \"type\" attribute\n?/",
 		"/line.*<input> proprietary attribute \"autocomplete\"\n?/",
 		"/line.*<input> proprietary attribute \"autofocus\"\n?/",
-	);
+	];
 
 	/**
 	 * Class constructor.
 	 *
 	 * @param  array $options
 	 * @return void
 	 */
-	public function __construct(array $options = array())
+	public function __construct(array $options = [])
 	{
 		if($options)
 			$this->config($options);

src/config.php

@@ -10,12 +10,12 @@
 | For more info please visit https://github.com/Stolz/laravel-html-tidy
 |
 */
-return array(
+return [
 
 	// Enable if PHP has tidy extension support
 	'enabled' => extension_loaded('tidy'),
 
-	/*// Filter AJAX requests
+	// Process AJAX requests
 	'ajax' => false,
 
 	// Encoding of your original documents. This refers to the encoding that you original documents have,
@@ -35,7 +35,7 @@
 	'container_close_tag' => '</div>',
 
 	// Options passed to HTML Tidy parseString() function. Docs: http://tidy.sourceforge.net/docs/quickref.html
-	'tidy_options' => array(
+	'tidy_options' => [
 		'output-xhtml' => true,
 		'char-encoding' => 'utf8',
 		'wrap' => 0,
@@ -45,12 +45,12 @@
 
 		// HTML5 workarounds
 		'doctype' => 'omit', //The filter will add the configured doctype later
-		'new-blocklevel-tags' =>  'article,aside,canvas,dialog,embed,figcaption,figure,footer,header,hgroup,nav,output,progress,section,video',
+		'new-blocklevel-tags' => 'article,aside,canvas,dialog,embed,figcaption,figure,footer,header,hgroup,nav,output,progress,section,video',
 		'new-inline-tags' => 'audio,bdi,command,datagrid,datalist,details,keygen,mark,meter,rp,rt,ruby,source,summary,time,track,wbr',
-	),
+	],
 
 	// Errors that match these regexs wont be displayed
-	'ignored_errors' => array(
+	'ignored_errors' => [
 		// workaround to hide errors related to HTML5
 		"/line.*proprietary attribute \"data-.*\n?/",
 		"/line.*proprietary attribute \"placeholder.*\n?/",
@@ -63,6 +63,6 @@
 		"/line.*<script> inserting \"type\" attribute\n?/",
 		"/line.*<input> proprietary attribute \"autocomplete\"\n?/",
 		"/line.*<input> proprietary attribute \"autofocus\"\n?/",
-	),
-	*/
-);
+	],
+
+];