[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/php into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
Validation queue job php-2011-11-30T17-03-02.328Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/php-2011-11-30T17-03-02.328Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/php into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
Review: Approve Everything worked fine on windows... -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/php into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
Validation queue job php-2011-11-30T16-17-08.766Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/php-2011-11-30T16-17-08.766Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/php into lp:zorba has been updated. Commit Message changed to: Fix bug #897825 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/php into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
William Candillon has proposed merging lp:~zorba-coders/zorba/php into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935
Fix bug #897825
--
https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83935
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'swig/php/CMakeLists.txt'
--- swig/php/CMakeLists.txt 2011-10-12 20:56:27 +
+++ swig/php/CMakeLists.txt 2011-11-30 12:50:30 +
@@ -78,6 +78,7 @@
### Start PHP proxy generation
# Configure the test file
SET (phpAPIPath ${CMAKE_CURRENT_BINARY_DIR})
+ SET (phpLibPrefix ${ZORBA_SWIG_LIB_PREFIX})
CONFIGURE_FILE (
${CMAKE_CURRENT_SOURCE_DIR}/generate_proxy.php.in
${CMAKE_CURRENT_BINARY_DIR}/generate_proxy.php
=== modified file 'swig/php/generate_proxy.php.in'
--- swig/php/generate_proxy.php.in 2011-06-24 19:58:33 +
+++ swig/php/generate_proxy.php.in 2011-11-30 12:50:30 +
@@ -1,4 +1,5 @@
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
Review: Needs Fixing I would like to have the bug fix merged separately together with a revision to the actual bug and also include it in the ChangeLog. -- https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83829 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/php into lp:zorba
William Candillon has proposed merging lp:~zorba-coders/zorba/php into lp:zorba.
Requested reviews:
Rodolfo Ochoa (rodolfo-ochoa)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83829
Fix bug with php binding prefix on Macosx.
Add a new wrapper API on top of the existing one.
--
https://code.launchpad.net/~zorba-coders/zorba/php/+merge/83829
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/php/examples/CMakeLists.txt'
--- doc/php/examples/CMakeLists.txt 2011-08-19 00:03:31 +
+++ doc/php/examples/CMakeLists.txt 2011-11-29 18:27:25 +
@@ -24,10 +24,15 @@
MESSAGE(STATUS "Configuration file: " ${CMAKE_CURRENT_BINARY_DIR}/php.ini)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/simple.php.in ${CMAKE_CURRENT_BINARY_DIR}/simple.php)
MESSAGE(STATUS "Simple configuration file: " ${CMAKE_CURRENT_BINARY_DIR}/simple.php)
- ADD_TEST("php" ${PHP5_EXECUTABLE} -c ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/simple.php)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/test.php.in ${CMAKE_CURRENT_BINARY_DIR}/test.php)
+ MESSAGE(STATUS "PHP test file configured: " ${CMAKE_CURRENT_BINARY_DIR}/test.php)
+ ADD_TEST("php1" ${PHP5_EXECUTABLE} -c ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/simple.php)
MESSAGE(STATUS "Installing: " ${CMAKE_CURRENT_BINARY_DIR}/simple.php)
-
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/simple.php
+ ADD_TEST("php2" ${PHP5_EXECUTABLE} -c ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/test.php)
+ MESSAGE(STATUS "Installing: " ${CMAKE_CURRENT_BINARY_DIR}/test.php)
+
+
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/simple.php ${CMAKE_CURRENT_BINARY_DIR}/test.php
COMPONENT "php_examples"
DESTINATION
share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/php/examples)
=== added file 'doc/php/examples/test.php.in'
--- doc/php/examples/test.php.in 1970-01-01 00:00:00 +
+++ doc/php/examples/test.php.in 2011-11-29 18:27:25 +
@@ -0,0 +1,69 @@
+http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+require '@phpPath@/ZorbaXQueryProcessor.php';
+
+function omitXMLDecl($xml)
+{
+ $xml = str_replace('', '', $xml);
+ $xml = trim($xml);
+ return $xml;
+}
+
+function assertEquality($test, $reference, $label)
+{
+
+ if($test == $reference) {
+throw new Exception(
+ "Test "
+ . $label
+ . " failed. Result:\n"
+ . $test
+ . "\nDoesn't match reference:\n"
+ . $reference
+);
+ }
+}
+/* Test 1 */
+$xquery = new ZorbaXQueryProcessor();
+$xquery->importQuery('1+1');
+$result = $xquery->execute();
+assertEquality($result, '2', "1+1");
+
+/* Test 2 */
+$query = <<<'XQ'
+declare variable $foo as xs:string external;
+declare variable $bar as xs:integer external;
+declare variable $doc1 as document-node() external;
+declare variable $doc2 as document-node() external;
+
+$foo, $bar, $doc1, $doc2
+XQ;
+
+$xquery->importQuery($query);
+
+$xquery->setVariable("foo", "bar");
+$xquery->setVariable("bar", 3);
+
+$doc = simplexml_load_string('');
+$xquery->setVariable("doc1", $doc);
+
+$doc = $xquery->parseXML("");
+$xquery->setVariable("doc2", $doc);
+
+$result = trim($xquery->execute());
+assertEquality($result, "bar 3", "Scalar Types");
+?>
=== modified file 'swig/php/CMakeLists.txt'
--- swig/php/CMakeLists.txt 2011-10-12 20:56:27 +
+++ swig/php/CMakeLists.txt 2011-11-29 18:27:25 +
@@ -55,6 +55,7 @@
INSTALL (
FILES
+${CMAKE_CURRENT_BINARY_DIR}/ZorbaXQueryProcessor.php
${CMAKE_CURRENT_BINARY_DIR}/zorba_api_wrapper.php
${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api.so
DESTINATION ${PHP5_INSTALL_PATH}
@@ -77,12 +78,18 @@
### Start PHP proxy generation
# Configure the test file
+ SET (phpLibPrefix ${ZORBA_SWIG_LIB_PREFIX})
SET (phpAPIPath ${CMAKE_CURRENT_BINARY_DIR})
CONFIGURE_FILE (
${CMAKE_CURRENT_SOURCE_DIR}/generate_proxy.php.in
${CMAKE_CURRENT_BINARY_DIR}/generate_proxy.php
)
+ CONFIGURE_FILE (
+${CMAKE_CURRENT_SOURCE_DIR}/ZorbaXQueryProcessor.php
+${CMAKE_CURRENT_BINARY_DIR}/ZorbaXQueryProcessor.php
+ )
+
ADD_CUSTOM_COMMAND (
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zorba_api_wrapper.php
# the following addes a dependency to the *.cxx file that is generated by swig
@@ -94,6 +101,7 @@
ADD_CUSTOM_TARGET (
Api_PHP_Wrapper ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/zorba_api_wrapper.php
+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ZorbaXQueryProcessor.php
)
### End PHP proxy generation
=== added file 'swig/php/ZorbaXQueryProcessor.php'
--- swig/php/ZorbaXQuery
