Commit fe350ef

committed

:octocat: eol handling

1 parent e846663 commit fe350efCopy full SHA for fe350ef

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public function parse(string $bbcode):string{`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`// replace the newline placeholders`
`200`		`- $bbcode = str_replace($this->options->placeholder_eol, PHP_EOL, $bbcode);`
	`200`	`+ $bbcode = str_replace($this->options->placeholder_eol, $this->outputInterface->getEOL(), $bbcode);`
`201`	`201`
`202`	`202`	`// run the sanitizer/html purifier/whatever as a final step`
`203`	`203`	`if($this->options->sanitizeOutput){`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`* @property int $pcre_recursion_limit`
`28`	`28`	`* @property int $pcre_jit`
`29`	`29`	`* @property string $placeholder_eol`
	`30`	`+ * @property string $replacement_eol`
`30`	`31`	`* @property string $placeholder_bbtag`
`31`	`32`	`* @property array $allowedTags`
`32`	`33`	`* @property bool $allowAvailableTags`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,13 @@ trait BBCodeOptionsTrait{`
`101`	`101`	`*/`
`102`	`102`	`protected $placeholder_eol = '{EOL}';`
`103`	`103`
	`104`	`+ /**`
	`105`	`+ * optional EOL replacement`
	`106`	`+ *`
	`107`	`+ * @var string`
	`108`	`+ */`
	`109`	`+ protected $replacement_eol = null;`
	`110`	`+`
`104`	`111`	`/**`
`105`	`112`	`* The key name of the tag attribute`
`106`	`113`	`*`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,11 @@ abstract class BBCodeOutputAbstract implements BBCodeOutputInterface{`
`65`	`65`	`*/`
`66`	`66`	`protected $moduleInterfaces = [];`
`67`	`67`
	`68`	`+ /**`
	`69`	`+ * @var string`
	`70`	`+ */`
	`71`	`+ protected $eol = PHP_EOL;`
	`72`	`+`
`68`	`73`	`/**`
`69`	`74`	`* BBCodeOutputInterface constructor.`
`70`	`75`	`*`
`@@ -73,6 +78,8 @@ abstract class BBCodeOutputAbstract implements BBCodeOutputInterface{`
`73`	`78`	`* @param \Psr\Log\LoggerInterface $logger`
`74`	`79`	`*/`
`75`	`80`	`public function __construct(ContainerInterface $options, CacheInterface $cache, LoggerInterface $logger){`
	`81`	`+ $options->replacement_eol = $options->replacement_eol ?? $this->eol;`
	`82`	`+`
`76`	`83`	`$this->options = $options;`
`77`	`84`	`$this->cache = $cache;`
`78`	`85`	`$this->logger = $logger;`
`@@ -113,6 +120,13 @@ public function getNoparse():array{`
`113`	`120`	`return $this->noparse;`
`114`	`121`	`}`
`115`	`122`
	`123`	`+ /**`
	`124`	`+ * @return string`
	`125`	`+ */`
	`126`	`+ public function getEOL():string{`
	`127`	`+ return $this->options->replacement_eol;`
	`128`	`+ }`
	`129`	`+`
`116`	`130`	`/**`
`117`	`131`	`* @inheritdoc`
`118`	`132`	`*/`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,11 @@ public function getSingleTags():array;`
`48`	`48`	`*/`
`49`	`49`	`public function getNoparse():array;`
`50`	`50`
	`51`	`+ /**`
	`52`	`+ * @return string`
	`53`	`+ */`
	`54`	`+ public function getEOL():string;`
	`55`	`+`
`51`	`56`	`/**`
`52`	`57`	`* transforms the current bbcode`
`53`	`58`	`*`

Comments

(0)