NotificationsYou must be signed in to change notification settings
Fork69
Star97

Commit232fc09

committed

Add method on InputStream to get all chars to EOF (this will allow us to re-optimize PLAINTEXT). Also we want to check that iconv extension is loaded, not that there is a function of that name.

1 parent8e6d677 commit232fc09Copy full SHA for 232fc09

File tree

1 file changed

-11

lines changed

library/HTML5
- InputStream.php

1 file changed

-11

lines changed

`‎library/HTML5/InputStream.php`

Lines changed: 7 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function __construct($data) {`
`71`	`71`	`// We previously had an mbstring implementation here, but that`
`72`	`72`	`// implementation is heavily non-conforming, so it's been`
`73`	`73`	`// omitted.`
`74`		`-if (function_exists('iconv')) {`
	`74`	`+if (extension_loaded('iconv')) {`
`75`	`75`	`// non-conforming`
`76`	`76`	`$data =iconv('UTF-8','UTF-8//IGNORE',$data);`
`77`	`77`	`}else {`
`@@ -220,18 +220,14 @@ public function char() {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`/**`
`223`		`- *Return some range of characters.`
	`223`	`+ *Get all characters until EOF.`
`224`	`224`	`* @note This performs bounds checking`
`225`		`- * @param $l Length`
`226`	`225`	`*/`
`227`		`-publicfunctionchars($l =1) {`
`228`		`-if((int)$l >0 &&$this->char <$this->EOF) {`
`229`		`-$this->char +=$l;`
`230`		`-if($l ===1) {`
`231`		`-return$this->data[$this->char];`
`232`		`- }else {`
`233`		`-returnsubstr($this->data,$this->char,$l);`
`234`		`- }`
	`226`	`+publicfunctionremainingChars() {`
	`227`	`+if($this->char <$this->EOF) {`
	`228`	`+$data =substr($this->data,$this->char);`
	`229`	`+$this->char =$this->EOF;`
	`230`	`+return$data;`
`235`	`231`	`}else {`
`236`	`232`	`returnfalse;`
`237`	`233`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit232fc09

File tree

1 file changed

1 file changed

`‎library/HTML5/InputStream.php`

0 commit comments