cvs: phpdoc-fr /reference/json/functions json-encode.xml /reference/memcached callbacks.xml /reference/memcached/memcached get.xml getresultcode.xml
/reference/mqseries/functions mqseries-get.xml mqseries-open.xml /reference/ncurses/functions ncurses-getmouse.xml ncurses-mousemask.xml
/reference/newt examples.xml /reference/objaggregation examples.xml /reference/ovrimos/functions ovrimos-fetch-into.xml
| From: | Yannick Torres | Date: | Fri, 20 Mar 2009 06:45:22 +0000 |
| Subject: | cvs: phpdoc-fr /reference/json/functions json-encode.xml /reference/memcached callbacks.xml /reference/memcached/memcached get.xml getresultcode.xml /reference/mqseries/functions mqseries-get.xml mqseries-open.xml /reference/ncurses/functions ncurses-getmouse.xml ncurses-mousemask.xml /reference/newt examples.xml /reference/objaggregation examples.xml /reference/ovrimos/functions ovrimos-fetch-into.xml |
||
| Groups: | php.doc.fr | ||
| Request: | Send a blank email to doc-fr+get-6801@lists.php.net to get a copy of this message | ||
yannick Fri Mar 20 06:45:22 2009 UTC
Modified files:
/phpdoc-fr/reference/ovrimos/functions ovrimos-fetch-into.xml
/phpdoc-fr/reference/objaggregation examples.xml
/phpdoc-fr/reference/newt examples.xml
/phpdoc-fr/reference/ncurses/functions ncurses-getmouse.xml
ncurses-mousemask.xml
/phpdoc-fr/reference/mqseries/functions mqseries-get.xml
mqseries-open.xml
/phpdoc-fr/reference/memcached/memcached getresultcode.xml get.xml
/phpdoc-fr/reference/memcached callbacks.xml
/phpdoc-fr/reference/json/functions json-encode.xml
Log:
sync with EN
http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml?r1=1.15&r2=1.16&diff_format=u Index: phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml diff -u phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml:1.15 phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml:1.16 --- phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml:1.15 Thu May 8 21:00:15 2008 +++ phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.15 $ --> -<!-- EN-Revision: 1.10 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.16 $ --> +<!-- EN-Revision: 1.11 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="function.ovrimos-fetch-into" xmlns="http://docbook.org/ns/docbook"> @@ -135,7 +135,7 @@ $res=ovrimos_exec($conn, "select table_id, table_name from sys.tables"); if ($res != 0) { echo "Requête 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)) { http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/objaggregation/examples.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc-fr/reference/objaggregation/examples.xml diff -u phpdoc-fr/reference/objaggregation/examples.xml:1.2 phpdoc-fr/reference/objaggregation/examples.xml:1.3 --- phpdoc-fr/reference/objaggregation/examples.xml:1.2 Sat Jun 21 20:51:39 2008 +++ phpdoc-fr/reference/objaggregation/examples.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> -<!-- EN-Revision: 1.3 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.3 $ --> +<!-- EN-Revision: 1.4 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <appendix xml:id="objaggregation.examples"> @@ -91,7 +91,7 @@ // initialisation } - function setMyDateTime(&$dt) + function setMyDateTime($dt) { $this->_dt =& $dt; } @@ -110,13 +110,13 @@ $dtp = new MyDateTimePlus("l, F j, Y (h:i:s a, T)"); // Génération du rapport avec une simple date -$rep->setMyDateTime(&$dt); +$rep->setMyDateTime($dt); echo $rep->generateReport(); // plus loin dans le code ... // Génération du rapport avec une date designée -$rep->setMyDateTime(&$dtp); +$rep->setMyDateTime($dtp); $output = $rep->generateReport(); // sauvegarde pour affichage dans la base // ... etc ... http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/newt/examples.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc-fr/reference/newt/examples.xml diff -u phpdoc-fr/reference/newt/examples.xml:1.2 phpdoc-fr/reference/newt/examples.xml:1.3 --- phpdoc-fr/reference/newt/examples.xml:1.2 Sat Jun 21 20:51:39 2008 +++ phpdoc-fr/reference/newt/examples.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> -<!-- EN-Revision: 1.2 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.3 $ --> +<!-- EN-Revision: 1.3 Maintainer: yannick Status: ready --> <!-- Reviewed: no --> <chapter xml:id="newt.examples" xmlns="http://docbook.org/ns/docbook"> @@ -23,7 +23,7 @@ newt_push_help_line (null); newt_draw_root_text (-30, 0, "(c) 1999-2002 RedHat, Inc"); -newt_get_screen_size (&$rows, &$cols); +newt_get_screen_size ($rows, $cols); newt_open_window ($rows/2-17, $cols/2-10, 34, 17, "Choose a Tool"); http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml?r1=1.12&r2=1.13&diff_format=u Index: phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml diff -u phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml:1.12 phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml:1.13 --- phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml:1.12 Fri May 30 11:27:26 2008 +++ phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.12 $ --> -<!-- EN-Revision: 1.9 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.13 $ --> +<!-- EN-Revision: 1.10 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="function.ncurses-getmouse" xmlns="http://docbook.org/ns/docbook"> @@ -84,7 +84,7 @@ <?php switch (ncurses_getch()){ case NCURSES_KEY_MOUSE: - if (!ncurses_getmouse(&$mevent)){ + if (!ncurses_getmouse($mevent)){ if ($mevent["mmask"] & NCURSES_MOUSE_BUTTON1_PRESSED){ $mouse_x = $mevent["x"]; // Sauve la position de la souris $mouse_y = $mevent["y"]; http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml?r1=1.16&r2=1.17&diff_format=u Index: phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml diff -u phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml:1.16 phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml:1.17 --- phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml:1.16 Thu Feb 12 23:17:30 2009 +++ phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.16 $ --> -<!-- EN-Revision: 1.11 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.17 $ --> +<!-- EN-Revision: 1.12 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="function.ncurses-mousemask" xmlns="http://docbook.org/ns/docbook"> @@ -99,7 +99,7 @@ <![CDATA[ <?php $newmask = NCURSES_BUTTON1_CLICKED + NCURSES_BUTTON1_RELEASED; -$mask = ncurses_mousemask($newmask, &$oldmask); +$mask = ncurses_mousemask($newmask, $oldmask); if ($mask & $newmask){ printf("Toutes les options de souris spécifiées sont supportées\n"); } http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/mqseries/functions/mqseries-get.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-fr/reference/mqseries/functions/mqseries-get.xml diff -u phpdoc-fr/reference/mqseries/functions/mqseries-get.xml:1.1 phpdoc-fr/reference/mqseries/functions/mqseries-get.xml:1.2 --- phpdoc-fr/reference/mqseries/functions/mqseries-get.xml:1.1 Thu Jan 8 21:50:44 2009 +++ phpdoc-fr/reference/mqseries/functions/mqseries-get.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.5 Maintainer: dams Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.6 Maintainer: dams Status: ready --> <!-- Reviewed: no --> <refentry xml:id="function.mqseries-get" xmlns="http://docbook.org/ns/docbook"> @@ -141,7 +141,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); http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/mqseries/functions/mqseries-open.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-fr/reference/mqseries/functions/mqseries-open.xml diff -u phpdoc-fr/reference/mqseries/functions/mqseries-open.xml:1.1 phpdoc-fr/reference/mqseries/functions/mqseries-open.xml:1.2 --- phpdoc-fr/reference/mqseries/functions/mqseries-open.xml:1.1 Thu Jan 8 21:50:44 2009 +++ phpdoc-fr/reference/mqseries/functions/mqseries-open.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.3 Maintainer: dams Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.4 Maintainer: dams Status: ready --> <!-- Reviewed: no --> <refentry xml:id="function.mqseries-open" xmlns="http://docbook.org/ns/docbook"> @@ -96,7 +96,7 @@ <programlisting role="php"> <![CDATA[ <?php - mqods = array('ObjectName' => 'TESTQ'); + $mqods = array('ObjectName' => 'TESTQ'); mqseries_open( $conn, $mqods, http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/memcached/memcached/getresultcode.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-fr/reference/memcached/memcached/getresultcode.xml diff -u phpdoc-fr/reference/memcached/memcached/getresultcode.xml:1.1 phpdoc-fr/reference/memcached/memcached/getresultcode.xml:1.2 --- phpdoc-fr/reference/memcached/memcached/getresultcode.xml:1.1 Thu Feb 12 08:54:25 2009 +++ phpdoc-fr/reference/memcached/memcached/getresultcode.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.2 Maintainer: dams Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.3 Maintainer: dams Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="memcached.getresultcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -47,7 +47,7 @@ $m->add('foo', 'bar'); if ($m->getResultCode() == Memcached::RES_NOTSTORED) { - ... + /* ... */ } ?> ]]> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/memcached/memcached/get.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-fr/reference/memcached/memcached/get.xml diff -u phpdoc-fr/reference/memcached/memcached/get.xml:1.1 phpdoc-fr/reference/memcached/memcached/get.xml:1.2 --- phpdoc-fr/reference/memcached/memcached/get.xml:1.1 Thu Feb 12 08:54:25 2009 +++ phpdoc-fr/reference/memcached/memcached/get.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.3 Maintainer: dams Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.4 Maintainer: dams Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="memcached.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -108,7 +108,7 @@ $m->set('ip_block', $ip); } else { /* log error */ - ... + /* ... */ } } ?> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/memcached/callbacks.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc-fr/reference/memcached/callbacks.xml diff -u phpdoc-fr/reference/memcached/callbacks.xml:1.2 phpdoc-fr/reference/memcached/callbacks.xml:1.3 --- phpdoc-fr/reference/memcached/callbacks.xml:1.2 Fri Mar 13 08:49:27 2009 +++ phpdoc-fr/reference/memcached/callbacks.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> -<!-- EN-Revision: 1.4 Maintainer: dams Status: ready --> +<!-- $Revision: 1.3 $ --> +<!-- EN-Revision: 1.5 Maintainer: dams Status: ready --> <!-- Reviewed: no --> <chapter xml:id="memcached.callbacks" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -91,7 +91,7 @@ { $user_id = substr($key, 5); /* Lit un profil dans une base de données */ - ... + /* ... */ $value = $profile_info; return true; } http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/json/functions/json-encode.xml?r1=1.8&r2=1.9&diff_format=u Index: phpdoc-fr/reference/json/functions/json-encode.xml diff -u phpdoc-fr/reference/json/functions/json-encode.xml:1.8 phpdoc-fr/reference/json/functions/json-encode.xml:1.9 --- phpdoc-fr/reference/json/functions/json-encode.xml:1.8 Thu Jan 22 16:30:58 2009 +++ phpdoc-fr/reference/json/functions/json-encode.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> -<!-- EN-Revision: 1.8 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.9 $ --> +<!-- EN-Revision: 1.9 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="function.json-encode" xmlns="http://docbook.org/ns/docbook"> @@ -42,10 +42,11 @@ <listitem> <para> Masque composé des constantes - <constant>PHP_JSON_HEX_QUOT</constant>, - <constant>PHP_JSON_HEX_TAG</constant>, - <constant>PHP_JSON_HEX_AMP</constant>, - <constant>PHP_JSON_HEX_APOS</constant>. Par défaut, vaut 0. + <constant>JSON_HEX_QUOT</constant>, + <constant>JSON_HEX_TAG</constant>, + <constant>JSON_HEX_AMP</constant>, + <constant>JSON_HEX_APOS</constant>, + <constant>JSON_FORCE_OBJECT</constant>. Par défaut, vaut 0. </para> </listitem> </varlistentry> @@ -78,6 +79,12 @@ Ajout du support des types basiques d'encodage JSON </entry> </row> + <row> + <entry>5.3.0</entry> + <entry> + Le paramètre <parameter>options</parameter> a été ajouté. + </entry> + </row> </tbody> </tgroup> </informaltable> @@ -105,6 +112,50 @@ ]]> </screen> </example> + <example> + <title>Exemple avec <function>json_encode</function> montrant toutes les options</title> + <programlisting role="php"> +<![CDATA[ +<?php +$a = array('<foo>',"'bar'",'"baz"','&blong&'); + +echo "Normal : ", json_encode($a), "\n"; +echo "Tags : ", json_encode($a,JSON_HEX_TAG), "\n"; +echo "Apos : ", json_encode($a,JSON_HEX_APOS), "\n"; +echo "Quot : ", json_encode($a,JSON_HEX_QUOT), "\n"; +echo "Amp : ", json_encode($a,JSON_HEX_AMP), "\n"; +echo "Toutes : ", json_encode($a,JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP), "\n\n"; + +$b = array(); + +echo "Tableau vide sous forme de tableau : ", json_encode($b), "\n"; +echo "Tableau vide sous forme d'objet : ", json_encode($b, JSON_FORCE_OBJECT), "\n\n"; + +$c = array(array(1,2,3)); + +echo "Tableau non-associatif sous forme de tableau : ", json_encode($c), "\n"; +echo "Tableau non-associatif sous forme d'objet : ", json_encode($c, JSON_FORCE_OBJECT), "\n\n"; +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +Normal : ["<foo>","'bar'","\"baz\"","&blong&"] +Tags : ["\u003Cfoo\u003E","'bar'","\"baz\"","&blong&"] +Apos : ["<foo>","\u0027bar\u0027","\"baz\"","&blong&"] +Quot : ["<foo>","'bar'","\u0022baz\u0022","&blong&"] +Amp : ["<foo>","'bar'","\"baz\"","\u0026blong\u0026"] +Toutes : ["\u003Cfoo\u003E","\u0027bar\u0027","\u0022baz\u0022","\u0026blong\u0026"] + +Tableau vide sous forme de tableau : [] +Tableau vide sous forme d'objet : {} + +Tableau non-associatif sous forme de tableau : [[1,2,3]] +Tableau non-associatif sous forme d'objet : {"0":{"0":1,"1":2,"2":3}} +]]> + </screen> + </example> </para> </refsect1>
http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml?r1=1.15&r2=1.16&diff_format=u Index: phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml diff -u phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml:1.15 phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml:1.16 --- phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml:1.15 Thu May 8 21:00:15 2008 +++ phpdoc-fr/reference/ovrimos/functions/ovrimos-fetch-into.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.15 $ --> -<!-- EN-Revision: 1.10 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.16 $ --> +<!-- EN-Revision: 1.11 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="function.ovrimos-fetch-into" xmlns="http://docbook.org/ns/docbook"> @@ -135,7 +135,7 @@ $res=ovrimos_exec($conn, "select table_id, table_name from sys.tables"); if ($res != 0) { echo "Requête 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)) { http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/objaggregation/examples.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc-fr/reference/objaggregation/examples.xml diff -u phpdoc-fr/reference/objaggregation/examples.xml:1.2 phpdoc-fr/reference/objaggregation/examples.xml:1.3 --- phpdoc-fr/reference/objaggregation/examples.xml:1.2 Sat Jun 21 20:51:39 2008 +++ phpdoc-fr/reference/objaggregation/examples.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> -<!-- EN-Revision: 1.3 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.3 $ --> +<!-- EN-Revision: 1.4 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <appendix xml:id="objaggregation.examples"> @@ -91,7 +91,7 @@ // initialisation } - function setMyDateTime(&$dt) + function setMyDateTime($dt) { $this->_dt =& $dt; } @@ -110,13 +110,13 @@ $dtp = new MyDateTimePlus("l, F j, Y (h:i:s a, T)"); // Génération du rapport avec une simple date -$rep->setMyDateTime(&$dt); +$rep->setMyDateTime($dt); echo $rep->generateReport(); // plus loin dans le code ... // Génération du rapport avec une date designée -$rep->setMyDateTime(&$dtp); +$rep->setMyDateTime($dtp); $output = $rep->generateReport(); // sauvegarde pour affichage dans la base // ... etc ... http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/newt/examples.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc-fr/reference/newt/examples.xml diff -u phpdoc-fr/reference/newt/examples.xml:1.2 phpdoc-fr/reference/newt/examples.xml:1.3 --- phpdoc-fr/reference/newt/examples.xml:1.2 Sat Jun 21 20:51:39 2008 +++ phpdoc-fr/reference/newt/examples.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> -<!-- EN-Revision: 1.2 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.3 $ --> +<!-- EN-Revision: 1.3 Maintainer: yannick Status: ready --> <!-- Reviewed: no --> <chapter xml:id="newt.examples" xmlns="http://docbook.org/ns/docbook"> @@ -23,7 +23,7 @@ newt_push_help_line (null); newt_draw_root_text (-30, 0, "(c) 1999-2002 RedHat, Inc"); -newt_get_screen_size (&$rows, &$cols); +newt_get_screen_size ($rows, $cols); newt_open_window ($rows/2-17, $cols/2-10, 34, 17, "Choose a Tool"); http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml?r1=1.12&r2=1.13&diff_format=u Index: phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml diff -u phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml:1.12 phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml:1.13 --- phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml:1.12 Fri May 30 11:27:26 2008 +++ phpdoc-fr/reference/ncurses/functions/ncurses-getmouse.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.12 $ --> -<!-- EN-Revision: 1.9 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.13 $ --> +<!-- EN-Revision: 1.10 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="function.ncurses-getmouse" xmlns="http://docbook.org/ns/docbook"> @@ -84,7 +84,7 @@ <?php switch (ncurses_getch()){ case NCURSES_KEY_MOUSE: - if (!ncurses_getmouse(&$mevent)){ + if (!ncurses_getmouse($mevent)){ if ($mevent["mmask"] & NCURSES_MOUSE_BUTTON1_PRESSED){ $mouse_x = $mevent["x"]; // Sauve la position de la souris $mouse_y = $mevent["y"]; http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml?r1=1.16&r2=1.17&diff_format=u Index: phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml diff -u phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml:1.16 phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml:1.17 --- phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml:1.16 Thu Feb 12 23:17:30 2009 +++ phpdoc-fr/reference/ncurses/functions/ncurses-mousemask.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.16 $ --> -<!-- EN-Revision: 1.11 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.17 $ --> +<!-- EN-Revision: 1.12 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="function.ncurses-mousemask" xmlns="http://docbook.org/ns/docbook"> @@ -99,7 +99,7 @@ <![CDATA[ <?php $newmask = NCURSES_BUTTON1_CLICKED + NCURSES_BUTTON1_RELEASED; -$mask = ncurses_mousemask($newmask, &$oldmask); +$mask = ncurses_mousemask($newmask, $oldmask); if ($mask & $newmask){ printf("Toutes les options de souris spécifiées sont supportées\n"); } http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/mqseries/functions/mqseries-get.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-fr/reference/mqseries/functions/mqseries-get.xml diff -u phpdoc-fr/reference/mqseries/functions/mqseries-get.xml:1.1 phpdoc-fr/reference/mqseries/functions/mqseries-get.xml:1.2 --- phpdoc-fr/reference/mqseries/functions/mqseries-get.xml:1.1 Thu Jan 8 21:50:44 2009 +++ phpdoc-fr/reference/mqseries/functions/mqseries-get.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.5 Maintainer: dams Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.6 Maintainer: dams Status: ready --> <!-- Reviewed: no --> <refentry xml:id="function.mqseries-get" xmlns="http://docbook.org/ns/docbook"> @@ -141,7 +141,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); http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/mqseries/functions/mqseries-open.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-fr/reference/mqseries/functions/mqseries-open.xml diff -u phpdoc-fr/reference/mqseries/functions/mqseries-open.xml:1.1 phpdoc-fr/reference/mqseries/functions/mqseries-open.xml:1.2 --- phpdoc-fr/reference/mqseries/functions/mqseries-open.xml:1.1 Thu Jan 8 21:50:44 2009 +++ phpdoc-fr/reference/mqseries/functions/mqseries-open.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.3 Maintainer: dams Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.4 Maintainer: dams Status: ready --> <!-- Reviewed: no --> <refentry xml:id="function.mqseries-open" xmlns="http://docbook.org/ns/docbook"> @@ -96,7 +96,7 @@ <programlisting role="php"> <![CDATA[ <?php - mqods = array('ObjectName' => 'TESTQ'); + $mqods = array('ObjectName' => 'TESTQ'); mqseries_open( $conn, $mqods, http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/memcached/memcached/getresultcode.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-fr/reference/memcached/memcached/getresultcode.xml diff -u phpdoc-fr/reference/memcached/memcached/getresultcode.xml:1.1 phpdoc-fr/reference/memcached/memcached/getresultcode.xml:1.2 --- phpdoc-fr/reference/memcached/memcached/getresultcode.xml:1.1 Thu Feb 12 08:54:25 2009 +++ phpdoc-fr/reference/memcached/memcached/getresultcode.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.2 Maintainer: dams Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.3 Maintainer: dams Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="memcached.getresultcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -47,7 +47,7 @@ $m->add('foo', 'bar'); if ($m->getResultCode() == Memcached::RES_NOTSTORED) { - ... + /* ... */ } ?> ]]> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/memcached/memcached/get.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-fr/reference/memcached/memcached/get.xml diff -u phpdoc-fr/reference/memcached/memcached/get.xml:1.1 phpdoc-fr/reference/memcached/memcached/get.xml:1.2 --- phpdoc-fr/reference/memcached/memcached/get.xml:1.1 Thu Feb 12 08:54:25 2009 +++ phpdoc-fr/reference/memcached/memcached/get.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.3 Maintainer: dams Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.4 Maintainer: dams Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="memcached.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -108,7 +108,7 @@ $m->set('ip_block', $ip); } else { /* log error */ - ... + /* ... */ } } ?> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/memcached/callbacks.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc-fr/reference/memcached/callbacks.xml diff -u phpdoc-fr/reference/memcached/callbacks.xml:1.2 phpdoc-fr/reference/memcached/callbacks.xml:1.3 --- phpdoc-fr/reference/memcached/callbacks.xml:1.2 Fri Mar 13 08:49:27 2009 +++ phpdoc-fr/reference/memcached/callbacks.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> -<!-- EN-Revision: 1.4 Maintainer: dams Status: ready --> +<!-- $Revision: 1.3 $ --> +<!-- EN-Revision: 1.5 Maintainer: dams Status: ready --> <!-- Reviewed: no --> <chapter xml:id="memcached.callbacks" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -91,7 +91,7 @@ { $user_id = substr($key, 5); /* Lit un profil dans une base de données */ - ... + /* ... */ $value = $profile_info; return true; } http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/json/functions/json-encode.xml?r1=1.8&r2=1.9&diff_format=u Index: phpdoc-fr/reference/json/functions/json-encode.xml diff -u phpdoc-fr/reference/json/functions/json-encode.xml:1.8 phpdoc-fr/reference/json/functions/json-encode.xml:1.9 --- phpdoc-fr/reference/json/functions/json-encode.xml:1.8 Thu Jan 22 16:30:58 2009 +++ phpdoc-fr/reference/json/functions/json-encode.xml Fri Mar 20 06:45:22 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> -<!-- EN-Revision: 1.8 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.9 $ --> +<!-- EN-Revision: 1.9 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xml:id="function.json-encode" xmlns="http://docbook.org/ns/docbook"> @@ -42,10 +42,11 @@ <listitem> <para> Masque composé des constantes - <constant>PHP_JSON_HEX_QUOT</constant>, - <constant>PHP_JSON_HEX_TAG</constant>, - <constant>PHP_JSON_HEX_AMP</constant>, - <constant>PHP_JSON_HEX_APOS</constant>. Par défaut, vaut 0. + <constant>JSON_HEX_QUOT</constant>, + <constant>JSON_HEX_TAG</constant>, + <constant>JSON_HEX_AMP</constant>, + <constant>JSON_HEX_APOS</constant>, + <constant>JSON_FORCE_OBJECT</constant>. Par défaut, vaut 0. </para> </listitem> </varlistentry> @@ -78,6 +79,12 @@ Ajout du support des types basiques d'encodage JSON </entry> </row> + <row> + <entry>5.3.0</entry> + <entry> + Le paramètre <parameter>options</parameter> a été ajouté. + </entry> + </row> </tbody> </tgroup> </informaltable> @@ -105,6 +112,50 @@ ]]> </screen> </example> + <example> + <title>Exemple avec <function>json_encode</function> montrant toutes les options</title> + <programlisting role="php"> +<![CDATA[ +<?php +$a = array('<foo>',"'bar'",'"baz"','&blong&'); + +echo "Normal : ", json_encode($a), "\n"; +echo "Tags : ", json_encode($a,JSON_HEX_TAG), "\n"; +echo "Apos : ", json_encode($a,JSON_HEX_APOS), "\n"; +echo "Quot : ", json_encode($a,JSON_HEX_QUOT), "\n"; +echo "Amp : ", json_encode($a,JSON_HEX_AMP), "\n"; +echo "Toutes : ", json_encode($a,JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP), "\n\n"; + +$b = array(); + +echo "Tableau vide sous forme de tableau : ", json_encode($b), "\n"; +echo "Tableau vide sous forme d'objet : ", json_encode($b, JSON_FORCE_OBJECT), "\n\n"; + +$c = array(array(1,2,3)); + +echo "Tableau non-associatif sous forme de tableau : ", json_encode($c), "\n"; +echo "Tableau non-associatif sous forme d'objet : ", json_encode($c, JSON_FORCE_OBJECT), "\n\n"; +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +Normal : ["<foo>","'bar'","\"baz\"","&blong&"] +Tags : ["\u003Cfoo\u003E","'bar'","\"baz\"","&blong&"] +Apos : ["<foo>","\u0027bar\u0027","\"baz\"","&blong&"] +Quot : ["<foo>","'bar'","\u0022baz\u0022","&blong&"] +Amp : ["<foo>","'bar'","\"baz\"","\u0026blong\u0026"] +Toutes : ["\u003Cfoo\u003E","\u0027bar\u0027","\u0022baz\u0022","\u0026blong\u0026"] + +Tableau vide sous forme de tableau : [] +Tableau vide sous forme d'objet : {} + +Tableau non-associatif sous forme de tableau : [[1,2,3]] +Tableau non-associatif sous forme d'objet : {"0":{"0":1,"1":2,"2":3}} +]]> + </screen> + </example> </para> </refsect1>