BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-18 02:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PHP) fixes getting indirect table, also fixes getInt method on 32bit machine.

Browse Source
This commit is contained in:
Shuhei Tanuma
2015-12-17 11:35:31 +09:00
parent b974e95ce4
commit c9198dbbb8
8 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/MyGame/Example/Monster.php
View File

@@ -188,7 +188,7 @@ class Monster extends Table
{
$obj = new Monster();
$o = $this->__offset(28);
return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : 0;
return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
}
/**
@@ -214,7 +214,7 @@ class Monster extends Table
{
$obj = new Stat();
$o = $this->__offset(32);
return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : 0;
return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
}
/**

1
tests/generate_code.bat
View File

@@ -1,2 +1,3 @@
..\flatc.exe -c -j -n -g -b -p --php -s --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
..\flatc.exe -b --schema monster_test.fbs
..\flatc.exe -b .\monster_test.fbs .\monsterdata_indirect.json

1
tests/generate_code.sh
View File

@@ -1,2 +1,3 @@
../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
../flatc --binary --schema monster_test.fbs
../flatc --binary monster_test.fbs monsterdata_indirect.json

6
tests/monsterdata_indirect.json Normal file
View File

@@ -0,0 +1,6 @@
{
"name": "Gob",
"enemy": {
"name": "Awk"
}
}

BIN
tests/monsterdata_indirect.mon Normal file
View File

Binary file not shown.

13
tests/phpTest.php
View File

@@ -74,6 +74,9 @@ function main()
fuzzTest1($assert);
// testUnicode($assert);
testIndirectBuffer($assert);
echo 'FlatBuffers php test: completed successfully' . PHP_EOL;
}
@@ -587,7 +590,15 @@ function testByteBuffer(Assert $assert) {
$assert->Equal(0x0D0C0B0A, $uut->readLittleEndian(0, 4, true));
}
function testIndirectBuffer(Assert $assert)
{
$js = json_decode(file_get_contents('monsterdata_indirect.json'), true);
$data = file_get_contents('monsterdata_indirect.mon');
$bb = Google\FlatBuffers\ByteBuffer::wrap($data);
$mons = \MyGame\Example\Monster::getRootAsMonster($bb);
$assert->Equal($js["name"], $mons->getName());
$assert->Equal($js["enemy"]["name"], $mons->getEnemy()->getName());
}
class Assert {
public function ok($result, $message = "") {
if (!$result){