Merge pull request #515 from marc1706/ticket/514

[ticket/514] Add PHP7 to travis build matrix

.travis.yml

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

modules/calendar.php

@@ -716,11 +716,13 @@ class calendar extends module_base
 	 *
 	 * @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);
 	}
 

modules/links.php

@@ -470,7 +470,9 @@ class links extends module_base
 	 */
 	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);
 	}
 }

modules/main_menu.php

@@ -534,7 +534,9 @@ class main_menu extends module_base
 	 */
 	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);
 	}
 }