diff options
author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-04-05 23:14:21 +0200 |
---|---|---|
committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-04-05 23:14:21 +0200 |
commit | 3112304ec8516e0fcbe2672806d97900b8ff02ff (patch) | |
tree | c1fd8b5f03d6eafa3e73b78efa8f9b4d9675f49c /tests/cpp/main.cpp | |
parent | 479e9979a69b9fdb995525576d4588cd92239ed5 (diff) | |
parent | 877f40e4ec538260a58277ae9e3a50abcc857542 (diff) |
Merge branch 'master' of https://github.com/CopernicaMarketingSoftware/PHP-CPP
Diffstat (limited to 'tests/cpp/main.cpp')
-rw-r--r-- | tests/cpp/main.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/cpp/main.cpp b/tests/cpp/main.cpp index db2416d..84d95d8 100644 --- a/tests/cpp/main.cpp +++ b/tests/cpp/main.cpp @@ -52,7 +52,12 @@ extern "C" customClass.property("CONSTANT1", "some string", Php::Const); customClass.property("EXP", 2.718281828459, Php::Const); customClass.property("CONSTANT2", -2582341, Php::Const); - customClass.property("CONSTANT1", true, Php::Const); + customClass.property("CONSTANT3", true, Php::Const); + + customClass.property("StatProp1", "some string", Php::Static); + customClass.property("Exp", 2.718281828459, Php::Static); + customClass.property("StatProp2", -2582341, Php::Static); + customClass.property("StatProp3", true, Php::Static); // add the class to the extension extension.add(customClass); @@ -108,8 +113,13 @@ extern "C" extension.add("TestVariables\\value_object1", TestVariables::value_object1); extension.add("TestVariables\\value_object2", TestVariables::value_object2); extension.add("TestVariables\\fnFromUserSpace", TestVariables::fnFromUserSpace); - extension.add("TestVariables\\fnFromUserSpace2", TestVariables::fnFromUserSpace2); + extension.add("TestVariables\\fnFromUserSpace2", TestVariables::fnFromUserSpace2); extension.add("TestVariables\\fnCallback", TestVariables::fnCallback); + extension.add("TestVariables\\test_HashMember_1", TestVariables::test_HashMember_1); + extension.add("TestVariables\\test_HashMember_2", TestVariables::test_HashMember_2); + extension.add("TestVariables\\test_HashMember_3", TestVariables::test_HashMember_3); + extension.add("TestVariables\\test_HashMember_4", TestVariables::test_HashMember_4); + |