mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-04-21 02:01:52 +02:00
Code Issues Projects Releases Wiki Activity

add hhvm and php 5.6 test

Browse Source
This commit is contained in:
祁宁 2014-10-11 13:08:04 +08:00
parent ccd87381b0
commit 25f5e34e66
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,10 +1,12 @@
language: php
php:
- 5.6
- 5.5
- 5.4
- 5.3
- 5.2
- hhvm
script: cd ./tools/ && set -e && make test

5
var/CommonMark/InlineParser.php
View File

@ -721,7 +721,8 @@ class CommonMark_InlineParser
$res = $this->parseImage($inlines);
break;
case '<':
$res = $this->parseAutolink($inlines) ? : $this->parseHtmlTag($inlines);
$res = $this->parseAutolink($inlines);
$res = $res ? $res : $this->parseHtmlTag($inlines);
break;
case '&':
$res = $this->parseEntity($inlines);
@ -730,7 +731,7 @@ class CommonMark_InlineParser
// Nothing
}
return $res ? : $this->parseString($inlines);
return $res ? $res : $this->parseString($inlines);
}
/**