Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #515 from marc1706/ticket/514

Browse Source 
[ticket/514] Add PHP7 to travis build matrix
This commit is contained in:
Marc Alexander
2015-03-20 18:47:37 +01:00
parent 24f18700bb 39482d5441
commit 61782b6e77
4 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -22,8 +22,11 @@ matrix:
env: DB=mysqli env: DB=mysqli
- php: hhvm - php: hhvm
env: DB=mysqli env: DB=mysqli
- php: 7.0
env: DB=mysqli
allow_failures: allow_failures:
- php: hhvm - php: hhvm
- php: 7.0
fast_finish: true fast_finish: true
env: env:

18
modules/calendar.php
View File

@@ -712,15 +712,17 @@ class calendar extends module_base
} }
/** /**
* Unserialize links array * Unserialize links array
* *
* @param string $serial_str Serialized string * @param string $serial_str Serialized string
* *
* @return array Unserialized array * @return array Unserialized string
*/ */
protected function utf_unserialize($serial_str) private function utf_unserialize($serial_str)
{ {
$out = preg_replace('!s:(\d+):"(.*?)";!se', "'s:'.strlen('$2').':\"$2\";'", $serial_str ); $out = preg_replace_callback('!s:(\d+):"(.*?)";!s', function ($result) {
return 's:' . strlen($result[2]) . ":\"{$result[2]}\";";
}, $serial_str);
return unserialize($out); return unserialize($out);
} }

16
modules/links.php
View File

@@ -462,15 +462,17 @@ class links extends module_base
} }
/** /**
* Unserialize links array * Unserialize links array
* *
* @param string $serial_str Serialized string * @param string $serial_str Serialized string
* *
* @return array Unserialized string * @return array Unserialized string
*/ */
private function utf_unserialize($serial_str) private function utf_unserialize($serial_str)
{ {
$out = preg_replace('!s:(\d+):"(.*?)";!se', "'s:'.strlen('$2').':\"$2\";'", $serial_str); $out = preg_replace_callback('!s:(\d+):"(.*?)";!s', function ($result) {
return 's:' . strlen($result[2]) . ":\"{$result[2]}\";";
}, $serial_str);
return unserialize($out); return unserialize($out);
} }
} }

16
modules/main_menu.php
View File

@@ -526,15 +526,17 @@ class main_menu extends module_base
} }
/** /**
* Unserialize links array * Unserialize links array
* *
* @param string $serial_str Serialized string * @param string $serial_str Serialized string
* *
* @return array Unserialized string * @return array Unserialized string
*/ */
private function utf_unserialize($serial_str) private function utf_unserialize($serial_str)
{ {
$out = preg_replace('!s:(\d+):"(.*?)";!se', "'s:'.strlen('$2').':\"$2\";'", $serial_str); $out = preg_replace_callback('!s:(\d+):"(.*?)";!s', function ($result) {
return 's:' . strlen($result[2]) . ":\"{$result[2]}\";";
}, $serial_str);
return unserialize($out); return unserialize($out);
} }
} }