Schlaefer / Saito

app/Plugin/BbcodeParser/Test/Case/Lib/BbcodeParserTest.php

Spacing +18 added lines, -18 removed lines

@@ -284,10 +284,10 @@ 
 		public function testAtLinkKnownUsers() {
 			$input = '@Alice @Bob @Bobby Junior @Bobby Tables @Dr. No';
 			$expected =
-				"<a href='/at/Alice'>@Alice</a>" .
-				" @Bob " .
-				"<a href='/at/Bobby+Junior'>@Bobby Junior</a>" .
-				" @Bobby Tables " .
+				"<a href='/at/Alice'>@Alice</a>".
+				" @Bob ".
+				"<a href='/at/Bobby+Junior'>@Bobby Junior</a>".
+				" @Bobby Tables ".
 				"<a href='/at/Dr.+No'>@Dr. No</a>";
 
 			$result = $this->_Parser->parse($input);
@@ -580,8 +580,8 @@ 
 
 		public function testIframe() {
 			//* test allowed domain
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtube.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtube.com/embed/HdoW3t_WorU '.
 				'frameborder=0][/iframe]';
 			$expected = [
 				['iframe' => [
@@ -596,8 +596,8 @@ 
 			$this->assertTags($result, $expected);
 
 			//* test forbidden domains
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
 				'frameborder=0][/iframe]';
 			$expected = '/src/i';
 			$result = $this->_Parser->parse($input, ['video_domains_allowed' => 'youtube | vimeo']);
@@ -605,8 +605,8 @@ 
 		}
 
 		public function testIframeAllDomainsAllowed() {
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
 				'][/iframe]';
 			$expected = 'src="http://www.youtubescam.com/embed/HdoW3t_WorU';
 			$result = $this->_Parser->parse($input, ['video_domains_allowed' => '*']);
@@ -614,8 +614,8 @@ 
 		}
 
 		public function testIframeNoDomainAllowed() {
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
 				'][/iframe]';
 			$expected = '/src/i';
 			$result = $this->_Parser->parse($input, ['video_domains_allowed' => '']);
@@ -634,7 +634,7 @@ 
 
 			// test for URIs without protocol
 			$input = '[img]/somewhere/macnemo.png[/img]';
-			$expected = '<img src="' . $this->_Helper->webroot . 'somewhere/macnemo.png" alt=""/>';
+			$expected = '<img src="'.$this->_Helper->webroot.'somewhere/macnemo.png" alt=""/>';
 			$result = $this->_Parser->parse($input);
 			$this->assertEquals($expected, $result);
 
@@ -817,7 +817,7 @@ 
 		public function testCodeNoCitationMark() {
 			// [code]<citation mark>[/code] should not be cited
 			$input = h(
-				"[code]\n" . $this->_Helper->settings['quote_symbol'] . "\n[/code]"
+				"[code]\n".$this->_Helper->settings['quote_symbol']."\n[/code]"
 			);
 			$expected = '`span class=.*?richtext-citation`';
 			$result = $this->_Parser->parse($input);
@@ -832,11 +832,11 @@ 
 
 		public function testQuote() {
 			$_qs = h($this->_Helper->settings['quote_symbol']);
-			$input = $_qs . ' fo [b]test[/b] ba';
+			$input = $_qs.' fo [b]test[/b] ba';
 			$result = $this->_Parser->parse($input);
 			$expected = [
 				'span' => ['class' => 'richtext-citation'],
-				$_qs . ' fo ',
+				$_qs.' fo ',
 				'strong' => [],
 				'test',
 				'/strong',
@@ -864,7 +864,7 @@ 
 			//* test autoconversion for audio files
 			$html5AudioExtensions = array('m4a', 'ogg', 'mp3', 'wav', 'opus');
 			foreach ($html5AudioExtensions as $extension) {
-				$url = 'http://example.com/audio.' . $extension;
+				$url = 'http://example.com/audio.'.$extension;
 				$input = "[video]{$url}[/video]";
 				$result = $this->_Parser->parse($input);
 				$expected = array(
@@ -927,7 +927,7 @@ 
 			$input = "[audio]{$url}[/audio]";
 			$result = $this->_Parser->parse($input);
 			$expected = array(
-					'audio' => array( 'src' => $url, 'controls' => 'controls' ),
+					'audio' => array('src' => $url, 'controls' => 'controls'),
 			);
 			$this->assertTags($result, $expected);
 

app/Plugin/BbcodeParser/Lib/Parser.php

Spacing +3 added lines, -3 removed lines

@@ -217,7 +217,7 @@ 
 			$options = array_merge($this->_cSettings, $options);
 
 			// serializing complex objects kills PHP
-			$serializable = array_filter($options, function ($value) {
+			$serializable = array_filter($options, function($value) {
 				return !is_object($value);
 			});
 			$parserId = md5(serialize($serializable));
@@ -258,8 +258,8 @@ 
 						$this->_Parser->addCodeDefinition($builder->build());
 						break;
 					case 'class':
-						require_once (\CakePlugin::path('BbcodeParser') . DS . 'Lib' . DS . 'jBBCode' . DS . 'Definitions' . DS . 'JbbCodeDefinitions.php');
-						$class = '\Plugin\BbcodeParser\Lib\jBBCode\Definitions\\' . ucfirst($title);
+						require_once (\CakePlugin::path('BbcodeParser').DS.'Lib'.DS.'jBBCode'.DS.'Definitions'.DS.'JbbCodeDefinitions.php');
+						$class = '\Plugin\BbcodeParser\Lib\jBBCode\Definitions\\'.ucfirst($title);
 						$this->_Parser->addCodeDefinition(new $class($this->_Helper, $options));
 						break;
 					default:

app/Plugin/BbcodeParser/Lib/Helper/UrlParserTrait.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 				// use Cakes Validation class to detect valid URL
 				\App::uses('Validation', 'Utility');
 				if (\Validation::url($url)) {
-					$url = 'http://' . $url;
+					$url = 'http://'.$url;
 				}
 			}
 
@@ -36,7 +36,7 @@ 
 				if (!empty($url) && preg_match('/\<img\s*?src=/', $text) !== 1) {
 					$host = DomainParser::domainAndTld($url);
 					if ($host !== false && $host !== env('SERVER_NAME')) {
-						$out .= ' <span class=\'richtext-linkInfo\'>[' . $host . ']</span>';
+						$out .= ' <span class=\'richtext-linkInfo\'>['.$host.']</span>';
 					}
 				}
 			}
@@ -64,10 +64,10 @@ 
 			}
 
 			$_placeholder = ' … ';
-			$leftMargin = (int)floor($_textWordMaxLength / 2);
-			$rightMargin = (int)(-1 * ($_textWordMaxLength - $leftMargin - mb_strlen($_placeholder)));
+			$leftMargin = (int) floor($_textWordMaxLength / 2);
+			$rightMargin = (int) (-1 * ($_textWordMaxLength - $leftMargin - mb_strlen($_placeholder)));
 
-			$string = mb_substr($string, 0, $leftMargin) . $_placeholder .
+			$string = mb_substr($string, 0, $leftMargin).$_placeholder.
 				mb_substr($string, $rightMargin);
 			return $string;
 		}
@@ -79,7 +79,7 @@ 
 		 * @return string
 		 */
 		protected function _decorateTarget($string) {
-			$decorator = function ($matches) {
+			$decorator = function($matches) {
 				$out = '';
 				$url = $matches[1];
 
@@ -90,11 +90,11 @@ 
 				$parsedUrl = @parse_url($url);
 
 				if (isset($parsedUrl['host'])) {
-					if ($parsedUrl['host'] !== env('SERVER_NAME') && $parsedUrl['host'] !== "www." . env('SERVER_NAME')) {
+					if ($parsedUrl['host'] !== env('SERVER_NAME') && $parsedUrl['host'] !== "www.".env('SERVER_NAME')) {
 						$out = " rel='external' target='_blank'";
 					}
 				}
-				return $matches[0] . $out;
+				return $matches[0].$out;
 			};
 
 			return preg_replace_callback('#href=["\'](.*?)["\']#is',

app/Plugin/BbcodeParser/Lib/jBBCode/Visitors/JbbCodeAutolinkVisitor.php

Spacing +10 added lines, -10 removed lines

@@ -60,10 +60,10 @@ 
 				}
 			}
 			krsort($names);
-			$baseUrl = $this->_sOptions['webroot'] . $this->_sOptions['atBaseUrl'];
+			$baseUrl = $this->_sOptions['webroot'].$this->_sOptions['atBaseUrl'];
 			foreach ($names as $name => $v) {
 				$title = urlencode($name);
-				$link = $this->_url($baseUrl . $title, "@$name",
+				$link = $this->_url($baseUrl.$title, "@$name",
 					false);
 				$string = str_replace("@$name", $link, $string);
 			}
@@ -72,11 +72,11 @@ 
 		}
 
 		protected function _autolink($string) {
-			$replace = function ($matches) {
+			$replace = function($matches) {
 				// exclude punctuation at end of sentence from URLs
 				$ignoredEndChars = implode('|', [',', '\?', ',', '\.', '\)', '!']);
 				preg_match(
-					'/(?P<element>.*?)(?P<suffix>' . $ignoredEndChars . ')?$/',
+					'/(?P<element>.*?)(?P<suffix>'.$ignoredEndChars.')?$/',
 					$matches['element'],
 					$m
 				);
@@ -84,7 +84,7 @@ 
 				$matches = $m + $matches;
 
 				if (strpos($matches['element'], '://') === false) {
-					$matches['element'] = 'http://' . $matches['element'];
+					$matches['element'] = 'http://'.$matches['element'];
 				}
 				$matches += [
 					'prefix' => '',
@@ -93,7 +93,7 @@ 
 
 				$url = $this->_url($matches['element'], $matches['element'], false,
 					true);
-				return $matches['prefix'] . $url . $matches['suffix'];
+				return $matches['prefix'].$url.$matches['suffix'];
 			};
 
 			//# autolink http://urls
@@ -113,7 +113,7 @@ 
 			//# autolink email
 			$string = preg_replace_callback(
 				"#(?<=^|[\n ])(?P<content>([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+))#i",
-				function ($matches) {
+				function($matches) {
 					return $this->_email($matches['content']);
 				}, $string
 			);
@@ -122,12 +122,12 @@ 
 		}
 
 		protected function _hashLink($string) {
-			$baseUrl = $this->_sOptions['webroot'] . $this->_sOptions['hashBaseUrl'];
+			$baseUrl = $this->_sOptions['webroot'].$this->_sOptions['hashBaseUrl'];
 			$string = preg_replace_callback(
 				'/(?<=\s|^|])(?<tag>#)(?<element>\d+)(?!\w)/',
-				function ($m) use ($baseUrl) {
+				function($m) use ($baseUrl) {
 					$hash = $m['element'];
-					return $this->_url($baseUrl . $hash, '#' . $hash);
+					return $this->_url($baseUrl.$hash, '#'.$hash);
 				},
 				$string
 			);

app/Plugin/BbcodeParser/Lib/jBBCode/Definitions/JbbHtml5MediaCodeDefinition.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 		protected function _audio($content) {
 			$out = "<audio src='$content' controls='controls'>";
 			$out .= Message::format(__(
-				'Your browser does not support HTML5 audio. Please updgrade to a modern ' .
+				'Your browser does not support HTML5 audio. Please updgrade to a modern '.
 				'browser. In order to watch this stream you need an HTML5 capable browser.',
 				true));
 			$out .= "</audio>";
@@ -28,7 +28,7 @@ 
 
 		protected function _video($content) {
 			// fix audio files mistakenly wrapped into an [video] tag
-			if (preg_match('/(' . implode('|', self::$_html5AudioExtensions) . ')$/i',
+			if (preg_match('/('.implode('|', self::$_html5AudioExtensions).')$/i',
 					$content) === 1
 			) {
 				return $this->_audio($content);
@@ -36,7 +36,7 @@ 
 
 			$out = "<video src='$content' controls='controls' x-webkit-airplay='allow'>";
 			$out .= Message::format(__(
-				'Your browser does not support HTML5 video. Please updgrade to a modern ' .
+				'Your browser does not support HTML5 video. Please updgrade to a modern '.
 				'browser. In order to watch this stream you need an HTML5 capable browser.',
 				true));
 			$out .= '</video>';

app/Plugin/BbcodeParser/Lib/jBBCode/Definitions/JbbCodeCodeDefinition.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 			// load config from app/Config/geshi.php
 			$this->Geshi->features = false;
 
-			$string = '<div class="geshi-wrapper"><pre lang="' . $type . '">' . $content . '</pre></div>';
+			$string = '<div class="geshi-wrapper"><pre lang="'.$type.'">'.$content.'</pre></div>';
 
 			$string = $this->Geshi->highlight($string);
 			return $string;

app/Plugin/BbcodeParser/Lib/jBBCode/Definitions/JbbCodeDefinitions.php

Spacing +13 added lines, -13 removed lines

@@ -123,7 +123,7 @@ 
 
 			// @todo should be done in Setting model
 			$ad = explode('|', $this->_sOptions['video_domains_allowed']);
-			$trim = function ($v) {
+			$trim = function($v) {
 				return trim($v);
 			};
 			$this->_allowedVideoDomains = array_fill_keys(array_map($trim, $ad), 1);
@@ -193,9 +193,9 @@ 
 				}
 			}
 
-			$out = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="' . $width . '" height="' . $height . '">
-									<param name="movie" value="' . $url . '"></param>
-									<embed src="' . $url . '" width="' . $width . '" height="' . $height . '" type="application/x-shockwave-flash" wmode="opaque" style="width:' . $width . 'px; height:' . $height . 'px;" id="VideoPlayback" flashvars=""> </embed> </object>';
+			$out = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="'.$width.'" height="'.$height.'">
+									<param name="movie" value="' . $url.'"></param>
+									<embed src="' . $url.'" width="'.$width.'" height="'.$height.'" type="application/x-shockwave-flash" wmode="opaque" style="width:'.$width.'px; height:'.$height.'px;" id="VideoPlayback" flashvars=""> </embed> </object>';
 			return $out;
 		}
 
@@ -258,12 +258,12 @@ 
 		protected function _parse($content, $attributes) {
 			$listPieces = explode('[*]', $content);
 			unset($listPieces[0]);
-			$listPieceProcessor = function ($li) {
-				return '<li>' . $li . '</li>' . "\n";
+			$listPieceProcessor = function($li) {
+				return '<li>'.$li.'</li>'."\n";
 			};
 			$listPieces = array_map($listPieceProcessor, $listPieces);
 
-			return '<ul>' . implode('', $listPieces) . '</ul>';
+			return '<ul>'.implode('', $listPieces).'</ul>';
 		}
 
 	}
@@ -280,14 +280,14 @@ 
 			}
 
 			$title = $this->_mbStrpad(
-				' ' . __('Spoiler') . ' ',
+				' '.__('Spoiler').' ',
 				$length,
 				'▇',
 				STR_PAD_BOTH
 			);
 
 			$json = json_encode(['string' => $content]);
-			$id = 'spoiler_' . rand(0, 9999999999999);
+			$id = 'spoiler_'.rand(0, 9999999999999);
 
 			$out = <<<EOF
 <div class="richtext-spoiler" style="display: inline;">
@@ -320,19 +320,19 @@ 
 			$result = null;
 			$repeat = ceil($strLen - $padStrLen + $padLen);
 			if ($dir == STR_PAD_RIGHT) {
-				$result = $str . str_repeat($padStr, $repeat);
+				$result = $str.str_repeat($padStr, $repeat);
 				$result = mb_substr($result, 0, $padLen);
 			} else {
 				if ($dir == STR_PAD_LEFT) {
-					$result = str_repeat($padStr, $repeat) . $str;
+					$result = str_repeat($padStr, $repeat).$str;
 					$result = mb_substr($result, -$padLen);
 				} else {
 					if ($dir == STR_PAD_BOTH) {
 						$length = ($padLen - $strLen) / 2;
 						$repeat = ceil($length / $padStrLen);
 						$result = mb_substr(str_repeat($padStr, $repeat), 0,
-								floor($length)) .
-							$str .
+								floor($length)).
+							$str.
 							mb_substr(str_repeat($padStr, $repeat), 0, ceil($length));
 					}
 				}

app/Plugin/BbcodeParser/Lib/Editor.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 					'className' => 'btn-markItUp-Link',
 					'key' => 'L',
 					'openWith' =>
-						'[url=[![' . __('geshi_link_popup') . ']!]]',
+						'[url=[!['.__('geshi_link_popup').']!]]',
 					'closeWith' => '[/url]',
 					'placeHolder' => __('geshi_link_placeholder'),
 				),

app/Plugin/BbcodeParser/Lib/Processors/BbcodeQuotePostprocessor.php

Spacing +3 added lines, -3 removed lines

@@ -8,10 +8,10 @@
 			$quoteSymbolSanitized = h($this->_sOptions['quote_symbol']);
 			$string = preg_replace(
 			// Begin of the text or a new line in the text, maybe one space afterwards
-				'/(^|\n\r\s?)' .
-				$quoteSymbolSanitized .
+				'/(^|\n\r\s?)'.
+				$quoteSymbolSanitized.
 				'\s(.*)(?!\<br)/m',
-				"\\1<span class=\"richtext-citation\">" . $quoteSymbolSanitized . " \\2</span>",
+				"\\1<span class=\"richtext-citation\">".$quoteSymbolSanitized." \\2</span>",
 				$string
 			);
 			return $string;