danog/MadelineProto
1
0
Fork 0
mirror of https://github.com/danog/MadelineProto.git synced 2024-11-30 10:38:59 +01:00
Code Issues Projects Releases Wiki Activity

Avoid php incompatibilities

Browse Source
This commit is contained in:
Github Actions 2021-12-12 15:17:55 +01:00
parent 8f2800f011
commit 62eedfb3f0
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
schemas

@ -1 +1 @@
Subproject commit 68c8a4ca854c1a7ec72dfaf4803b37f0030709a1
Subproject commit d0b2b612cbece1fd3dc971634326f7470dc0099b

2
src/danog/MadelineProto/Serialization.php
View File

@ -45,7 +45,7 @@ abstract class Serialization
/**
* Serialization version.
*/
const VERSION = 1;
const VERSION = 2;
/**
* Unserialize session.

18
src/danog/MadelineProto/SessionPaths.php
View File

@ -103,10 +103,12 @@ class SessionPaths
$file = yield open("$path.temp.php", 'bw+');
$l = yield $file->write(Serialization::PHP_HEADER);
$l += yield $file->write(\chr(Serialization::VERSION));
$l += yield $file->write(\chr(PHP_MAJOR_VERSION));
$l += yield $file->write(\chr(PHP_MINOR_VERSION));
$l += yield $file->write($object);
yield $file->close();
if ($l !== ($need = \strlen(Serialization::PHP_HEADER)+1+\strlen($object))) {
if ($l !== ($need = \strlen(Serialization::PHP_HEADER)+3+\strlen($object))) {
throw new Exception("Did not write all the data (need $need, wrote $l)");
}
yield renameAsync("$path.temp.php", $path);
@ -132,7 +134,7 @@ class SessionPaths
if (!yield exists($path)) {
return null;
}
$headerLen = \strlen(Serialization::PHP_HEADER) + 1;
$headerLen = \strlen(Serialization::PHP_HEADER);
Logger::log("Waiting for shared lock of $path.lock...", Logger::ULTRA_VERBOSE);
$unlock = yield from Tools::flockGenerator("$path.lock", LOCK_SH, 0.1);
@ -144,7 +146,17 @@ class SessionPaths
$size = yield stat($path);
$size = $size['size'] ?? $headerLen;
yield $file->seek($headerLen); // Skip version for now
yield $file->seek($headerLen++);
$v = \ord(yield $file->read(1));
if ($v === Serialization::VERSION) {
$php = yield $file->read(2);
$major = \ord($php[0]);
$minor = \ord($php[1]);
if (\version_compare("$major.$minor", PHP_VERSION) > 0) {
throw new Exception("Cannot deserialize session created on newer PHP $major.$minor, currently using PHP ".PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION.', please upgrade to the latest version of PHP!');
}
$headerLen += 2;
}
$unserialized = \unserialize((yield $file->read($size - $headerLen)) ?? '');
yield $file->close();
} finally {