From 886d5315d2f58c954449fa2012604bbbd73b93f7 Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Wed, 18 Mar 2009 21:30:26 +0000 Subject: [PATCH] Fixed examples, for both parse and deprecated errors git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@277448 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/com/functions/com-event-sink.xml | 6 +++--- reference/ingres-ii/functions/ingres-error.xml | 4 ++-- reference/ingres-ii/functions/ingres-escape-string.xml | 4 ++-- reference/ingres-ii/functions/ingres-execute.xml | 4 ++-- reference/ingres-ii/functions/ingres-prepare.xml | 4 ++-- reference/intl/collator/compare.xml | 3 ++- reference/intl/dateformatter/is-lenient.xml | 8 +++----- reference/intl/dateformatter/set-lenient.xml | 8 +++----- reference/memcached/memcached/get.xml | 4 ++-- reference/memcached/memcached/getresultcode.xml | 4 ++-- reference/mqseries/functions/mqseries-get.xml | 4 ++-- reference/mqseries/functions/mqseries-open.xml | 4 ++-- reference/ncurses/functions/ncurses-getmouse.xml | 4 ++-- reference/ncurses/functions/ncurses-mousemask.xml | 4 ++-- reference/ovrimos/functions/ovrimos-fetch-into.xml | 6 +++--- reference/sam/functions/SAM-Connection-isConnected.xml | 6 +++--- reference/sam/functions/SAM-Connection-peekall.xml | 5 ++--- reference/sam/functions/SAM-Message-header.xml | 6 +++--- reference/soap/soapclient/setsoapheaders.xml | 8 ++++---- reference/var/functions/serialize.xml | 6 +++--- reference/var/functions/unserialize.xml | 4 ++-- reference/yaz/functions/yaz-scan.xml | 4 ++-- reference/zip/functions/ziparchive-getarchivecomment.xml | 4 ++-- reference/zip/functions/ziparchive-getcommentindex.xml | 4 ++-- reference/zip/functions/ziparchive-getcommentname.xml | 4 ++-- reference/zip/functions/ziparchive-renameindex.xml | 4 ++-- reference/zip/functions/ziparchive-statindex.xml | 4 ++-- reference/zip/functions/ziparchive-statname.xml | 4 ++-- 28 files changed, 65 insertions(+), 69 deletions(-) diff --git a/reference/com/functions/com-event-sink.xml b/reference/com/functions/com-event-sink.xml index cb417de3ad..6bbc54dc93 100644 --- a/reference/com/functions/com-event-sink.xml +++ b/reference/com/functions/com-event-sink.xml @@ -1,5 +1,5 @@ - + com_event_sink @@ -93,10 +93,10 @@ class IEEventSinker { } $ie = new COM("InternetExplorer.Application"); // note that you don't need the & for PHP 5! -$sink =& new IEEventSinker(); +$sink = new IEEventSinker(); com_event_sink($ie, $sink, "DWebBrowserEvents2"); $ie->Visible = true; -$ie->Navigate("http://www.php.net"); +$ie->Navigate("http://www.example.org"); while(!$sink->terminated) { com_message_pump(4000); } diff --git a/reference/ingres-ii/functions/ingres-error.xml b/reference/ingres-ii/functions/ingres-error.xml index 352c1d1ec4..1c5a938f27 100644 --- a/reference/ingres-ii/functions/ingres-error.xml +++ b/reference/ingres-ii/functions/ingres-error.xml @@ -1,5 +1,5 @@ - + ingres_error @@ -72,7 +72,7 @@ $error_text = ingres_error(); if (!is_null($error_text)) { echo "An error occured - " . $error_text; } -> +?> ]]> diff --git a/reference/ingres-ii/functions/ingres-escape-string.xml b/reference/ingres-ii/functions/ingres-escape-string.xml index 03bd3a6f72..1c1f1ecc65 100644 --- a/reference/ingres-ii/functions/ingres-escape-string.xml +++ b/reference/ingres-ii/functions/ingres-escape-string.xml @@ -1,5 +1,5 @@ - + ingres_escape_string @@ -68,7 +68,7 @@ $result = ingres_query($link, $sql); while ($user = ingres_fetch_object($result)) { - echo $user->up_first .
; + echo $user->up_first . '
'; } ingres_commit($link); diff --git a/reference/ingres-ii/functions/ingres-execute.xml b/reference/ingres-ii/functions/ingres-execute.xml index 22c65803cd..350f4e7ec8 100644 --- a/reference/ingres-ii/functions/ingres-execute.xml +++ b/reference/ingres-ii/functions/ingres-execute.xml @@ -1,5 +1,5 @@ - + ingres_execute @@ -99,7 +99,7 @@ while ($row = ingres_fetch_row($result)) { $link = ingres_connect("demodb"); $params[] = "Emma"; -$query = "select * from user_profile where up_first = ?" +$query = "select * from user_profile where up_first = ?"; $result = ingres_query($link, $query, $params); while ($row = ingres_fetch_row($result)) { echo $row[1]; diff --git a/reference/ingres-ii/functions/ingres-prepare.xml b/reference/ingres-ii/functions/ingres-prepare.xml index b01f6844d4..268d506453 100644 --- a/reference/ingres-ii/functions/ingres-prepare.xml +++ b/reference/ingres-ii/functions/ingres-prepare.xml @@ -1,5 +1,5 @@ - + ingres_prepare @@ -108,7 +108,7 @@ while ($row = ingres_fetch_row($result)) { $link = ingres_connect("demodb"); $params[] = "Emma"; -$query = "select * from user_profile where up_first = ?" +$query = "select * from user_profile where up_first = ?"; $result = ingres_query($link, $query, $params); while ($row = ingres_fetch_row($result)) { echo $row[1]; diff --git a/reference/intl/collator/compare.xml b/reference/intl/collator/compare.xml index bd5cf791f2..c1c3347d6b 100755 --- a/reference/intl/collator/compare.xml +++ b/reference/intl/collator/compare.xml @@ -1,5 +1,5 @@ - + Collator::compare @@ -119,6 +119,7 @@ if ($res === false) { echo "s1 is less than s2\n"; } else { echo "s1 is equal to s2\n"; +} ?> ]]> diff --git a/reference/intl/dateformatter/is-lenient.xml b/reference/intl/dateformatter/is-lenient.xml index 972dbb5045..81d5628ad4 100644 --- a/reference/intl/dateformatter/is-lenient.xml +++ b/reference/intl/dateformatter/is-lenient.xml @@ -1,5 +1,5 @@ - + IntlDateFormatter::isLenient @@ -58,8 +58,7 @@ isLenient() ){ echo('TRUE'); @@ -95,8 +94,7 @@ if( intl_get_error_code() !=0 ){ isLenient() ){ echo('TRUE'); diff --git a/reference/intl/dateformatter/set-lenient.xml b/reference/intl/dateformatter/set-lenient.xml index 3ecc0c7d7f..cb8bdfc717 100644 --- a/reference/intl/dateformatter/set-lenient.xml +++ b/reference/intl/dateformatter/set-lenient.xml @@ -1,5 +1,5 @@ - + IntlDateFormatter::setLenient @@ -70,8 +70,7 @@ isLenient() ){ echo('TRUE'); @@ -107,8 +106,7 @@ if( intl_get_error_code() !=0 ){ isLenient() ){ echo('TRUE'); diff --git a/reference/memcached/memcached/get.xml b/reference/memcached/memcached/get.xml index cf9c9f90f8..4e1ae30f22 100644 --- a/reference/memcached/memcached/get.xml +++ b/reference/memcached/memcached/get.xml @@ -1,5 +1,5 @@ - + @@ -106,7 +106,7 @@ if (!($ip = $m->get('ip_block'))) { $m->set('ip_block', $ip); } else { /* log error */ - ... + /* ... */ } } ?> diff --git a/reference/memcached/memcached/getresultcode.xml b/reference/memcached/memcached/getresultcode.xml index 528fda1f56..e7718e3f9b 100644 --- a/reference/memcached/memcached/getresultcode.xml +++ b/reference/memcached/memcached/getresultcode.xml @@ -1,5 +1,5 @@ - + @@ -45,7 +45,7 @@ $m->addServer('localhost', 11211); $m->add('foo', 'bar'); if ($m->getResultCode() == Memcached::RES_NOTSTORED) { - ... + /* ... */ } ?> ]]> diff --git a/reference/mqseries/functions/mqseries-get.xml b/reference/mqseries/functions/mqseries-get.xml index c2e6164fb3..5ab71a8058 100644 --- a/reference/mqseries/functions/mqseries-get.xml +++ b/reference/mqseries/functions/mqseries-get.xml @@ -1,5 +1,5 @@ - + mqseries_get @@ -145,7 +145,7 @@ // $obj now holds the reference to the object (TESTQ) // setup empty message descriptor. - mdg = array(); + $mdg = array(); // setup get message options $gmo = array('Options' => MQSERIES_MQGMO_FAIL_IF_QUIESCING | MQSERIES_MQGMO_WAIT, 'WaitInterval' => 3000); diff --git a/reference/mqseries/functions/mqseries-open.xml b/reference/mqseries/functions/mqseries-open.xml index 8bcc0d2cd0..a02bedc61f 100644 --- a/reference/mqseries/functions/mqseries-open.xml +++ b/reference/mqseries/functions/mqseries-open.xml @@ -1,5 +1,5 @@ - + mqseries_open @@ -98,7 +98,7 @@ 'TESTQ'); + $mqods = array('ObjectName' => 'TESTQ'); mqseries_open( $conn, $mqods, diff --git a/reference/ncurses/functions/ncurses-getmouse.xml b/reference/ncurses/functions/ncurses-getmouse.xml index 524166a832..36c4f4280f 100644 --- a/reference/ncurses/functions/ncurses-getmouse.xml +++ b/reference/ncurses/functions/ncurses-getmouse.xml @@ -1,5 +1,5 @@ - + ncurses_getmouse @@ -80,7 +80,7 @@ - + ncurses_mousemask @@ -95,7 +95,7 @@ - + ovrimos_fetch_into @@ -131,10 +131,10 @@ if ($conn!=0) { $res=ovrimos_exec($conn, "select table_id, table_name from sys.tables"); if ($res != 0) { echo "Statement ok!"; - if (ovrimos_fetch_into($res, &$row)) { + if (ovrimos_fetch_into($res, $row)) { list($table_id, $table_name) = $row; echo "table_id=" . $table_id . ", table_name=" . $table_name . "\n"; - if (ovrimos_fetch_into($res, &$row)) { + if (ovrimos_fetch_into($res, $row)) { list($table_id, $table_name) = $row; echo "table_id=" . $table_id . ", table_name=" . $table_name . "\n"; } else { diff --git a/reference/sam/functions/SAM-Connection-isConnected.xml b/reference/sam/functions/SAM-Connection-isConnected.xml index bb6261ccf3..3a7bb48e14 100644 --- a/reference/sam/functions/SAM-Connection-isConnected.xml +++ b/reference/sam/functions/SAM-Connection-isConnected.xml @@ -1,5 +1,5 @@ - + SAMConnection->isConnected @@ -43,9 +43,9 @@ isConnected()) { - echo 'Connection is active.' + echo 'Connection is active.'; } else { - echo 'No active connection!' + echo 'No active connection!'; } ?> diff --git a/reference/sam/functions/SAM-Connection-peekall.xml b/reference/sam/functions/SAM-Connection-peekall.xml index cc6f27f5f9..b7364176b3 100644 --- a/reference/sam/functions/SAM-Connection-peekall.xml +++ b/reference/sam/functions/SAM-Connection-peekall.xml @@ -1,5 +1,5 @@ - + SAMConnection->peekAll @@ -115,8 +115,7 @@ if ($msgArray) { foreach ( $msgArray as $key => $msg) { echo "Message $key: body = $msg->body\n"; } - } - else + } else { echo "PeekAll failed ($conn->errno) $conn->error"; } diff --git a/reference/sam/functions/SAM-Message-header.xml b/reference/sam/functions/SAM-Message-header.xml index c6d9391faf..00d9575fef 100644 --- a/reference/sam/functions/SAM-Message-header.xml +++ b/reference/sam/functions/SAM-Message-header.xml @@ -1,5 +1,5 @@ - + SAMMessage->header @@ -251,10 +251,10 @@ $msg->header->myDoubleProp = array(3.14159265358979, SAM_DOUBLE); header->'MyIntProp'; +$intProp = $msg->header->MyIntProp; // accessing a messaging system specific property -$encoding = $msg->header->'JMS_IBM_Msgtype'; +$encoding = $msg->header->JMS_IBM_Msgtype; ?> ]]> diff --git a/reference/soap/soapclient/setsoapheaders.xml b/reference/soap/soapclient/setsoapheaders.xml index 2780a138a0..258f4a8812 100644 --- a/reference/soap/soapclient/setsoapheaders.xml +++ b/reference/soap/soapclient/setsoapheaders.xml @@ -1,5 +1,5 @@ - + @@ -59,7 +59,7 @@ $client = new SoapClient(null, array('location' => "http://localhost/soap.php", 'uri' => "http://test-uri/")); $header = new SoapHeader('http://soapinterop.org/echoheader/', 'echoMeStringRequest', - 'hello world')); + 'hello world'); $client->__setSoapHeaders($header); @@ -82,11 +82,11 @@ $headers = array(); $headers[] = new SoapHeader('http://soapinterop.org/echoheader/', 'echoMeStringRequest', - 'hello world')); + 'hello world'); $headers[] = new SoapHeader('http://soapinterop.org/echoheader/', 'echoMeStringRequest', - 'hello world again')); + 'hello world again'); $client->__setSoapHeaders($headers); diff --git a/reference/var/functions/serialize.xml b/reference/var/functions/serialize.xml index 720a0693d5..a84bddc44f 100644 --- a/reference/var/functions/serialize.xml +++ b/reference/var/functions/serialize.xml @@ -1,5 +1,5 @@ - + serialize @@ -85,10 +85,10 @@ $conn = odbc_connect("webdb", "php", "chicken"); $stmt = odbc_prepare($conn, "UPDATE sessions SET data = ? WHERE id = ?"); $sqldata = array (serialize($session_data), $_SERVER['PHP_AUTH_USER']); -if (!odbc_execute($stmt, &$sqldata)) { +if (!odbc_execute($stmt, $sqldata)) { $stmt = odbc_prepare($conn, "INSERT INTO sessions (id, data) VALUES(?, ?)"); - if (!odbc_execute($stmt, &$sqldata)) { + if (!odbc_execute($stmt, $sqldata)) { /* Something went wrong.. */ } } diff --git a/reference/var/functions/unserialize.xml b/reference/var/functions/unserialize.xml index f60623a7d1..9debc5d9f4 100644 --- a/reference/var/functions/unserialize.xml +++ b/reference/var/functions/unserialize.xml @@ -1,5 +1,5 @@ - + unserialize @@ -116,7 +116,7 @@ $conn = odbc_connect("webdb", "php", "chicken"); $stmt = odbc_prepare($conn, "SELECT data FROM sessions WHERE id = ?"); $sqldata = array($_SERVER['PHP_AUTH_USER']); -if (!odbc_execute($stmt, &$sqldata) || !odbc_fetch_into($stmt, &$tmp)) { +if (!odbc_execute($stmt, $sqldata) || !odbc_fetch_into($stmt, $tmp)) { // if the execute or fetch fails, initialize to empty array $session_data = array(); } else { diff --git a/reference/yaz/functions/yaz-scan.xml b/reference/yaz/functions/yaz-scan.xml index 95e3bf89b6..034600216b 100644 --- a/reference/yaz/functions/yaz-scan.xml +++ b/reference/yaz/functions/yaz-scan.xml @@ -1,5 +1,5 @@ - + yaz_scan @@ -100,7 +100,7 @@ function scan_titles($id, $startterm) yaz_wait(); $errno = yaz_errno($id); if ($errno == 0) { - $ar = yaz_scan_result($id, &$options); + $ar = yaz_scan_result($id, $options); echo 'Scan ok; '; foreach ($options as $key => $val) { echo "$key = $val  "; diff --git a/reference/zip/functions/ziparchive-getarchivecomment.xml b/reference/zip/functions/ziparchive-getarchivecomment.xml index 0b13587f5d..97c4d2711f 100644 --- a/reference/zip/functions/ziparchive-getarchivecomment.xml +++ b/reference/zip/functions/ziparchive-getarchivecomment.xml @@ -1,5 +1,5 @@ - + ZipArchive::getArchiveComment @@ -29,7 +29,7 @@ open('test_with_comment.zip') +$res = $zip->open('test_with_comment.zip'); if ($res === TRUE) { var_dump($zip->getArchiveComment()); /* Or using the archive property */ diff --git a/reference/zip/functions/ziparchive-getcommentindex.xml b/reference/zip/functions/ziparchive-getcommentindex.xml index cc94e6d70a..89b5f77ec4 100644 --- a/reference/zip/functions/ziparchive-getcommentindex.xml +++ b/reference/zip/functions/ziparchive-getcommentindex.xml @@ -1,5 +1,5 @@ - + ZipArchive::getCommentIndex @@ -54,7 +54,7 @@ open('test1.zip') +$res = $zip->open('test1.zip'); if ($res === TRUE) { var_dump($zip->getCommentIndex(1)); } else { diff --git a/reference/zip/functions/ziparchive-getcommentname.xml b/reference/zip/functions/ziparchive-getcommentname.xml index 7031b178d2..273d466557 100644 --- a/reference/zip/functions/ziparchive-getcommentname.xml +++ b/reference/zip/functions/ziparchive-getcommentname.xml @@ -1,5 +1,5 @@ - + ZipArchive::getCommentName @@ -54,7 +54,7 @@ open('test1.zip') +$res = $zip->open('test1.zip'); if ($res === TRUE) { var_dump($zip->getCommentName('test/entry1.txt')); } else { diff --git a/reference/zip/functions/ziparchive-renameindex.xml b/reference/zip/functions/ziparchive-renameindex.xml index fbc285589a..8a69cc1621 100644 --- a/reference/zip/functions/ziparchive-renameindex.xml +++ b/reference/zip/functions/ziparchive-renameindex.xml @@ -1,5 +1,5 @@ - + ZipArchive::renameIndex @@ -53,7 +53,7 @@ open('test.zip') +$res = $zip->open('test.zip'); if ($res === TRUE) { $zip->renameIndex(2,'newname.txt'); $zip->close(); diff --git a/reference/zip/functions/ziparchive-statindex.xml b/reference/zip/functions/ziparchive-statindex.xml index 8182301313..eb18def530 100644 --- a/reference/zip/functions/ziparchive-statindex.xml +++ b/reference/zip/functions/ziparchive-statindex.xml @@ -1,5 +1,5 @@ - + ZipArchive::statIndex @@ -56,7 +56,7 @@ open('test.zip') +$res = $zip->open('test.zip'); if ($res === TRUE) { print_r($zip->statIndex(3)); $zip->close(); diff --git a/reference/zip/functions/ziparchive-statname.xml b/reference/zip/functions/ziparchive-statname.xml index 0547cdbb88..3ffb49fec9 100644 --- a/reference/zip/functions/ziparchive-statname.xml +++ b/reference/zip/functions/ziparchive-statname.xml @@ -1,5 +1,5 @@ - + ZipArchive::statName @@ -74,7 +74,7 @@ open('test.zip') +$res = $zip->open('test.zip'); if ($res === TRUE) { print_r($zip->statName('foobar/baz')); $zip->close();