THRIFT-4475: PSR-2 support for lib/php/test
Client: php
This closes #1482
diff --git a/lib/php/test/JsonSerialize/JsonSerializeTest.php b/lib/php/test/JsonSerialize/JsonSerializeTest.php
index dfb34c3..8c64595 100644
--- a/lib/php/test/JsonSerialize/JsonSerializeTest.php
+++ b/lib/php/test/JsonSerialize/JsonSerializeTest.php
@@ -20,95 +20,98 @@
namespace Test\Thrift\JsonSerialize;
+use PHPUnit\Framework\TestCase;
use stdClass;
use Thrift\ClassLoader\ThriftClassLoader;
-require_once __DIR__.'/../../../../vendor/autoload.php';
+require_once __DIR__ . '/../../../../vendor/autoload.php';
-$loader = new ThriftClassLoader();
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../packages/phpjs');
-$loader->register();
-
-class JsonSerializeTest extends \PHPUnit_Framework_TestCase
+/**
+ * @runTestsInSeparateProcesses
+ */
+class JsonSerializeTest extends TestCase
{
- protected function setUp() {
- if (version_compare(phpversion(), '5.4', '<')) {
- $this->markTestSkipped('Requires PHP 5.4 or newer!');
+ protected function setUp()
+ {
+ if (version_compare(phpversion(), '5.4', '<')) {
+ $this->markTestSkipped('Requires PHP 5.4 or newer!');
+ }
+ $loader = new ThriftClassLoader();
+ $loader->registerDefinition('ThriftTest', __DIR__ . '/../packages/phpjs');
+ $loader->register();
}
- }
- public function testEmptyStruct()
- {
- $empty = new \ThriftTest\EmptyStruct(array('non_existing_key' => 'bar'));
- $this->assertEquals(new stdClass(), json_decode(json_encode($empty)));
- }
+ public function testEmptyStruct()
+ {
+ $empty = new \ThriftTest\EmptyStruct(array('non_existing_key' => 'bar'));
+ $this->assertEquals(new stdClass(), json_decode(json_encode($empty)));
+ }
- public function testStringsAndInts()
- {
- $input = array(
- 'string_thing' => 'foo',
- 'i64_thing' => 1234567890,
- );
- $xtruct = new \ThriftTest\Xtruct($input);
+ public function testStringsAndInts()
+ {
+ $input = array(
+ 'string_thing' => 'foo',
+ 'i64_thing' => 1234567890,
+ );
+ $xtruct = new \ThriftTest\Xtruct($input);
- // Xtruct's 'i32_thing' and 'byte_thing' fields should not be present here!
- $expected = new stdClass();
- $expected->string_thing = $input['string_thing'];
- $expected->i64_thing = $input['i64_thing'];
- $this->assertEquals($expected, json_decode(json_encode($xtruct)));
- }
+ // Xtruct's 'i32_thing' and 'byte_thing' fields should not be present here!
+ $expected = new stdClass();
+ $expected->string_thing = $input['string_thing'];
+ $expected->i64_thing = $input['i64_thing'];
+ $this->assertEquals($expected, json_decode(json_encode($xtruct)));
+ }
- public function testNestedStructs()
- {
- $xtruct2 = new \ThriftTest\Xtruct2(array(
- 'byte_thing' => 42,
- 'struct_thing' => new \ThriftTest\Xtruct(array(
- 'i32_thing' => 123456,
- )),
- ));
+ public function testNestedStructs()
+ {
+ $xtruct2 = new \ThriftTest\Xtruct2(array(
+ 'byte_thing' => 42,
+ 'struct_thing' => new \ThriftTest\Xtruct(array(
+ 'i32_thing' => 123456,
+ )),
+ ));
- $expected = new stdClass();
- $expected->byte_thing = $xtruct2->byte_thing;
- $expected->struct_thing = new stdClass();
- $expected->struct_thing->i32_thing = $xtruct2->struct_thing->i32_thing;
- $this->assertEquals($expected, json_decode(json_encode($xtruct2)));
- }
+ $expected = new stdClass();
+ $expected->byte_thing = $xtruct2->byte_thing;
+ $expected->struct_thing = new stdClass();
+ $expected->struct_thing->i32_thing = $xtruct2->struct_thing->i32_thing;
+ $this->assertEquals($expected, json_decode(json_encode($xtruct2)));
+ }
- public function testInsanity()
- {
- $xinput = array('string_thing' => 'foo');
- $xtruct = new \ThriftTest\Xtruct($xinput);
- $insanity = new \ThriftTest\Insanity(array(
- 'xtructs' => array($xtruct, $xtruct, $xtruct)
- ));
- $expected = new stdClass();
- $expected->xtructs = array((object) $xinput, (object) $xinput, (object) $xinput);
- $this->assertEquals($expected, json_decode(json_encode($insanity)));
- }
+ public function testInsanity()
+ {
+ $xinput = array('string_thing' => 'foo');
+ $xtruct = new \ThriftTest\Xtruct($xinput);
+ $insanity = new \ThriftTest\Insanity(array(
+ 'xtructs' => array($xtruct, $xtruct, $xtruct)
+ ));
+ $expected = new stdClass();
+ $expected->xtructs = array((object)$xinput, (object)$xinput, (object)$xinput);
+ $this->assertEquals($expected, json_decode(json_encode($insanity)));
+ }
- public function testNestedLists()
- {
- $bonk = new \ThriftTest\Bonk(array('message' => 'foo'));
- $nested = new \ThriftTest\NestedListsBonk(array('bonk' => array(array(array($bonk)))));
- $expected = new stdClass();
- $expected->bonk = array(array(array((object) array('message' => 'foo'))));
- $this->assertEquals($expected, json_decode(json_encode($nested)));
- }
+ public function testNestedLists()
+ {
+ $bonk = new \ThriftTest\Bonk(array('message' => 'foo'));
+ $nested = new \ThriftTest\NestedListsBonk(array('bonk' => array(array(array($bonk)))));
+ $expected = new stdClass();
+ $expected->bonk = array(array(array((object)array('message' => 'foo'))));
+ $this->assertEquals($expected, json_decode(json_encode($nested)));
+ }
- public function testMaps()
- {
- $intmap = new \ThriftTest\ThriftTest_testMap_args(['thing' => [0 => 'zero']]);
- $emptymap = new \ThriftTest\ThriftTest_testMap_args([]);
- $this->assertEquals('{"thing":{"0":"zero"}}', json_encode($intmap));
- $this->assertEquals('{}', json_encode($emptymap));
- }
+ public function testMaps()
+ {
+ $intmap = new \ThriftTest\ThriftTest_testMap_args(['thing' => [0 => 'zero']]);
+ $emptymap = new \ThriftTest\ThriftTest_testMap_args([]);
+ $this->assertEquals('{"thing":{"0":"zero"}}', json_encode($intmap));
+ $this->assertEquals('{}', json_encode($emptymap));
+ }
- public function testScalarTypes()
- {
- $b = new \ThriftTest\Bools(['im_true' => '1', 'im_false' => '0']);
- $this->assertEquals('{"im_true":true,"im_false":false}', json_encode($b));
- $s = new \ThriftTest\StructA(['s' => 42]);
- $this->assertEquals('{"s":"42"}', json_encode($s));
- }
-
+ public function testScalarTypes()
+ {
+ $b = new \ThriftTest\Bools(['im_true' => '1', 'im_false' => '0']);
+ $this->assertEquals('{"im_true":true,"im_false":false}', json_encode($b));
+ $s = new \ThriftTest\StructA(['s' => 42]);
+ $this->assertEquals('{"s":"42"}', json_encode($s));
+ }
}