JeroenED/libpairtwo
1
0
Fork 0
mirror of https://github.com/JeroenED/libpairtwo.git synced 2024-11-22 06:26:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'task/binarydataIsNull' into develop

Browse Source
This commit is contained in:
Jeroen De Meerleer 2019-09-25 14:42:34 +02:00
commit 185f0b86fb
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
# CHANGELOG # CHANGELOG
## vx.y.z (Release: aa-bbb-cccc) ## vx.y.z (Release: aa-bbb-cccc)
* ENHANCEMENT: `Class::getBinaryData` methods return null if field is non-existent
* BUGFIX: `Player:GetId` returns elo instead of id * BUGFIX: `Player:GetId` returns elo instead of id
## v1.1.2 (Release: 21-jun-2019) ## v1.1.2 (Release: 21-jun-2019)

7
src/Player.php
View File

@ -464,11 +464,14 @@ class Player
* Returns binary data that was read out the pairtwo file but was not needed immediately * Returns binary data that was read out the pairtwo file but was not needed immediately
* *
* @param string $Key * @param string $Key
* @return bool|DateTime|int|string * @return bool|DateTime|int|string|null
*/ */
public function getBinaryData(string $Key) public function getBinaryData(string $Key)
{ {
return $this->BinaryData[$Key]; if (isset($this->BinaryData[$Key])) {
return $this->BinaryData[$Key];
}
return null;
} }
/** /**

9
src/Readers/Pairtwo6.php
View File

@ -103,11 +103,14 @@ class Pairtwo6 implements ReaderInterface
* Returns binary data that was read out the pairtwo file but was not needed immediately * Returns binary data that was read out the pairtwo file but was not needed immediately
* *
* @param string $Key * @param string $Key
* @return bool|DateTime|int|string * @return bool|DateTime|int|string|null
*/ */
public function getBinaryData(string $Key) public function getBinaryData(string $Key)
{ {
return $this->BinaryData[$Key]; if (isset($this->BinaryData[$Key])) {
return $this->BinaryData[$Key];
}
return null;
} }
@ -138,7 +141,7 @@ class Pairtwo6 implements ReaderInterface
fclose($swshandle); fclose($swshandle);
$offset = 0; $offset = 0;
$length = 4; $length = 4;
$this->setRelease($this->readData('String', substr($swscontents, $offset, $length))); $this->setRelease($this->readData('String', substr($swscontents, $offset, $length)));