lochmueller / sourceopt

Classes/Service/CleanHtmlService.php

Doc Comments +5 added lines, -1 removed lines

@@ -555,12 +555,16 @@
 	/**
 	 * Include configured header comment in HTML content block
 	 *
-	 * @param $html
+	 * @param string $html
 	 */
 	public function includeHeaderComment(&$html) {
 		if (!empty($this->headerComment)) {
 			$html = preg_replace_callback(
 				'/<meta http-equiv(.*)>/Usi',
+
+				/**
+				 * @param string $matches
+				 */
 				function ($matches) {
 					return trim($matches[0] . $this->newline . $this->tab . $this->tab . '<!-- ' . $this->headerComment . '-->');
 				},

Indentation -1 removed lines

@@ -4,7 +4,6 @@
 /**
  * Service: Clean parsed HTML functionality
  * Based on the extension 'sourceopt'
-
  */
 class CleanHtmlService implements \TYPO3\CMS\Core\SingletonInterface {
 

Spacing +12 added lines, -12 removed lines

@@ -201,12 +201,12 @@ 
 		$functionalBoxElements = 'dd|dt|frameset|li|tbody|td|tfoot|th|thead|tr|colgroup';
 		$usableBoxElements = 'applet|button|del|iframe|ins|map|object|script';
 		$imagineBoxElements = 'html|body|head|meta|title|link|script|base|!--';
-		$allBoxLikeElements = '(?>' . $trueBoxElements . '|' . $functionalBoxElements . '|' . $usableBoxElements . '|' . $imagineBoxElements . ')';
+		$allBoxLikeElements = '(?>'.$trueBoxElements.'|'.$functionalBoxElements.'|'.$usableBoxElements.'|'.$imagineBoxElements.')';
 		$esteticBoxLikeElements = '(?>html|head|body|meta name|title|div|table|h1|h2|h3|h4|h5|h6|p|form|pre|center|!--)';
 		$structureBoxLikeElements = '(?>html|head|body|div|!--)';
 
 		// split html into it's elements
-		$html_array_temp = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $html, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+		$html_array_temp = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $html, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
 		// remove empty lines
 		$html_array = array('');
 		$z = 1;
@@ -233,20 +233,20 @@ 
 				$newline = TRUE;
 			} elseif ($this->formatType == 2 && ( // minimalistic line break
 					# this element has a line break before itself
-					preg_match('/<' . $structureBoxLikeElements . '(.*)>/Usi', $html_array[$x]) || preg_match('/<' . $structureBoxLikeElements . '(.*) \/>/Usi', $html_array[$x]) || # one element before is a element that has a line break after
-					preg_match('/<\/' . $structureBoxLikeElements . '(.*)>/Usi', $html_array[$x - 1]) || substr($html_array[$x - 1], 0, 4) == '<!--' || preg_match('/<' . $structureBoxLikeElements . '(.*) \/>/Usi', $html_array[$x - 1]))
+					preg_match('/<'.$structureBoxLikeElements.'(.*)>/Usi', $html_array[$x]) || preg_match('/<'.$structureBoxLikeElements.'(.*) \/>/Usi', $html_array[$x]) || # one element before is a element that has a line break after
+					preg_match('/<\/'.$structureBoxLikeElements.'(.*)>/Usi', $html_array[$x - 1]) || substr($html_array[$x - 1], 0, 4) == '<!--' || preg_match('/<'.$structureBoxLikeElements.'(.*) \/>/Usi', $html_array[$x - 1]))
 			) {
 				$newline = TRUE;
 			} elseif ($this->formatType == 3 && ( // aestetic line break
 					# this element has a line break before itself
-					preg_match('/<' . $esteticBoxLikeElements . '(.*)>/Usi', $html_array[$x]) || preg_match('/<' . $esteticBoxLikeElements . '(.*) \/>/Usi', $html_array[$x]) || # one element before is a element that has a line break after
-					preg_match('/<\/' . $esteticBoxLikeElements . '(.*)>/Usi', $html_array[$x - 1]) || substr($html_array[$x - 1], 0, 4) == '<!--' || preg_match('/<' . $esteticBoxLikeElements . '(.*) \/>/Usi', $html_array[$x - 1]))
+					preg_match('/<'.$esteticBoxLikeElements.'(.*)>/Usi', $html_array[$x]) || preg_match('/<'.$esteticBoxLikeElements.'(.*) \/>/Usi', $html_array[$x]) || # one element before is a element that has a line break after
+					preg_match('/<\/'.$esteticBoxLikeElements.'(.*)>/Usi', $html_array[$x - 1]) || substr($html_array[$x - 1], 0, 4) == '<!--' || preg_match('/<'.$esteticBoxLikeElements.'(.*) \/>/Usi', $html_array[$x - 1]))
 			) {
 				$newline = TRUE;
 			} elseif ($this->formatType >= 4 && ( // logical line break
 					# this element has a line break before itself
-					preg_match('/<' . $allBoxLikeElements . '(.*)>/Usi', $html_array[$x]) || preg_match('/<' . $allBoxLikeElements . '(.*) \/>/Usi', $html_array[$x]) || # one element before is a element that has a line break after
-					preg_match('/<\/' . $allBoxLikeElements . '(.*)>/Usi', $html_array[$x - 1]) || substr($html_array[$x - 1], 0, 4) == '<!--' || preg_match('/<' . $allBoxLikeElements . '(.*) \/>/Usi', $html_array[$x - 1]))
+					preg_match('/<'.$allBoxLikeElements.'(.*)>/Usi', $html_array[$x]) || preg_match('/<'.$allBoxLikeElements.'(.*) \/>/Usi', $html_array[$x]) || # one element before is a element that has a line break after
+					preg_match('/<\/'.$allBoxLikeElements.'(.*)>/Usi', $html_array[$x - 1]) || substr($html_array[$x - 1], 0, 4) == '<!--' || preg_match('/<'.$allBoxLikeElements.'(.*) \/>/Usi', $html_array[$x - 1]))
 			) {
 				$newline = TRUE;
 			}
@@ -299,7 +299,7 @@ 
 
 		// include debug comment at the end
 		if ($tabs != 0 && $this->debugComment === TRUE) {
-			$html .= '<!--' . $tabs . " open elements found-->\r\n";
+			$html .= '<!--'.$tabs." open elements found-->\r\n";
 		}
 	}
 
@@ -426,7 +426,7 @@ 
 			'textarea',
 			'pre'
 		); // eventuell auch: span, script, style
-		$peaces = preg_split('#(<(' . implode('|', $splitArray) . ').*>.*</\2>)#Uis', $html, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$peaces = preg_split('#(<('.implode('|', $splitArray).').*>.*</\2>)#Uis', $html, -1, PREG_SPLIT_DELIM_CAPTURE);
 		$html = "";
 		for ($i = 0; $i < count($peaces); $i++) {
 			if (($i + 1) % 3 == 0) {
@@ -561,8 +561,8 @@ 
 		if (!empty($this->headerComment)) {
 			$html = preg_replace_callback(
 				'/<meta http-equiv(.*)>/Usi',
-				function ($matches) {
-					return trim($matches[0] . $this->newline . $this->tab . $this->tab . '<!-- ' . $this->headerComment . '-->');
+				function($matches) {
+					return trim($matches[0].$this->newline.$this->tab.$this->tab.'<!-- '.$this->headerComment.'-->');
 				},
 				$html,
 				1

ext_emconf.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  * writing. "version" and "dependencies" must not be touched!
  ***************************************************************/
 
-$EM_CONF[$_EXTKEY] = array (
+$EM_CONF[$_EXTKEY] = array(
 	'title' => 'Source Optimization',
 	'description' => 'Optimization of the final page: reformatting the (x)html output, removal of new lines, and quotes. Move development repository to https://github.com/lochmueller/sourceopt',
 	'category' => 'fe',
@@ -20,9 +20,9 @@ 
 	'author_email' => 'ronald.steiner@googlemail.com, boris.nicolai@andavida.com, tim@fruit-lab.de',
 	'author_company' => NULL,
 	'constraints' =>
-	array (
+	array(
 		'depends' =>
-		array (
+		array(
 			'typo3' => '6.2.0-7.99.99',
 		),
 	),

Classes/User/FrontendHook.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	 *
 	 * @return void
 	 */
-	public function clean(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController &$typoScriptFrontend) {
+	public function clean(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController&$typoScriptFrontend) {
 		if ($this->cleanHtmlService instanceof CleanHtmlService) {
 			$configuration = $typoScriptFrontend->config['config']['sourceopt.'];
 			$this->cleanHtmlService->clean($typoScriptFrontend->content, $configuration);