cvs: phpdoc-it /reference/array/functions array-intersect-assoc.xml array-merge.xml array-walk.xml sort.xml usort.xml
| From: | Marco Cucinato | Date: | Sat, 04 Sep 2004 12:05:20 +0000 |
| Subject: | cvs: phpdoc-it /reference/array/functions array-intersect-assoc.xml array-merge.xml array-walk.xml sort.xml usort.xml | ||
| Groups: | php.doc.it | ||
| Request: | Send a blank email to doc-it+get-654@lists.php.net to get a copy of this message | ||
cucinato Sat Sep 4 08:05:20 2004 EDT
Modified files:
/phpdoc-it/reference/array/functions array-intersect-assoc.xml
array-merge.xml array-walk.xml
sort.xml usort.xml
Log:
Sync to EN tree
http://cvs.php.net/diff.php/phpdoc-it/reference/array/functions/array-intersect-assoc.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc-it/reference/array/functions/array-intersect-assoc.xml diff -u phpdoc-it/reference/array/functions/array-intersect-assoc.xml:1.5 phpdoc-it/reference/array/functions/array-intersect-assoc.xml:1.6 --- phpdoc-it/reference/array/functions/array-intersect-assoc.xml:1.5 Fri Mar 5 18:44:23 2004 +++ phpdoc-it/reference/array/functions/array-intersect-assoc.xml Sat Sep 4 08:05:19 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- EN-Revision: 1.6 Maintainer: cucinato Status: ready --> +<!-- EN-Revision: 1.7 Maintainer: cucinato Status: ready --> <refentry id="function.array-intersect-assoc"> <refnamediv> <refname>array_intersect_assoc</refname> @@ -61,7 +61,10 @@ <!-- TODO: example of it... --> </simpara> <simpara> - Vedere anche <function>array_intersect</function> + Vedere anche <function>array_intersect</function>, + <function>array_uintersect_assoc</function>, + <function>array_intersect_uassoc</function>, + <function>array_uintersect_uassoc</function>, <function>array_diff</function> e <function>array_diff_assoc</function>. </simpara> http://cvs.php.net/diff.php/phpdoc-it/reference/array/functions/array-merge.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc-it/reference/array/functions/array-merge.xml diff -u phpdoc-it/reference/array/functions/array-merge.xml:1.10 phpdoc-it/reference/array/functions/array-merge.xml:1.11 --- phpdoc-it/reference/array/functions/array-merge.xml:1.10 Tue Jan 6 09:15:15 2004 +++ phpdoc-it/reference/array/functions/array-merge.xml Sat Sep 4 08:05:19 2004 @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- splitted from ./it/functions/array.xml, last change in rev 1.6 --> <!-- last change to 'array-merge' in en/ tree in rev 1.2 --> -<!-- EN-Revision: 1.12 Maintainer: cucinato Status: ready --> +<!-- EN-Revision: 1.13 Maintainer: cucinato Status: ready --> <!-- OLD-Revision: 1.173/EN.1.2 --> <refentry id="function.array-merge"> <refnamediv> <refname>array_merge</refname> - <refpurpose>Fonde due o più array</refpurpose> + <refpurpose>Fonde uno o più array</refpurpose> </refnamediv> <refsect1> <title>Descrizione</title> <methodsynopsis> <type>array</type><methodname>array_merge</methodname> <methodparam><type>array</type><parameter>array1</parameter></methodparam> - <methodparam><type>array</type><parameter>array2</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>array2</parameter></methodparam> <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam> </methodsynopsis> <para> - <function>array_merge</function> fonde gli elementi di due o + <function>array_merge</function> fonde gli elementi di uno o più array in modo che i valori di un array siano accodati a quelli dell'array precedente. Restituisce l'array risultante. </para> @@ -29,6 +29,11 @@ accodato. </para> <para> + Se viene fornito un solo array, e questo è indicizzato numericamente, le + chiavi vengono reindicizzate in una sequenza continua. Nel caso di array associativi, delle + chiavi duplicate rimane solo l'ultima. Vedere l'esempio tre per ulteriori dettagli. + </para> + <para> <example> <title>Esempio di <function>array_merge</function></title> <programlisting role="php"> @@ -104,6 +109,43 @@ Array ( [1] => data +) +]]> + </screen> + </example> + <example> + <title>esempio di <function>array_merge</function></title> + <programlisting role="php"> +<![CDATA[ +<?php +$array_uno = array(0 => "mario", 1 => "roberto", 2 => "andrea", 3 => "dante"); +$array_due = array("mario => "roberto", "andrea" => "dante", "mario" => "giacomo"); + +unset($array_uno[2]); + +$risultato_uno = array_merge($array_uno); +$risultato_due = array_merge($array_due); + +print_r($risultato_uno); +print_r($risultato_due); +?> +]]> + </programlisting> + <para> + Il risultato sarà: + </para> + <screen role="php"> +<![CDATA[ +Array +( + [0] => mario + [1] => roberto + [2] => dante +) +Array +( + [mario] => giacomo + [andrea] => dante ) ]]> </screen> http://cvs.php.net/diff.php/phpdoc-it/reference/array/functions/array-walk.xml?r1=1.11&r2=1.12&ty=u Index: phpdoc-it/reference/array/functions/array-walk.xml diff -u phpdoc-it/reference/array/functions/array-walk.xml:1.11 phpdoc-it/reference/array/functions/array-walk.xml:1.12 --- phpdoc-it/reference/array/functions/array-walk.xml:1.11 Fri Feb 13 16:59:51 2004 +++ phpdoc-it/reference/array/functions/array-walk.xml Sat Sep 4 08:05:19 2004 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- splitted from ./it/functions/array.xml, last change in rev 1.1 --> <!-- last change to 'array-walk' in en/ tree in rev 1.2 --> -<!-- EN-Revision: 1.15 Maintainer: cucinato Status: ready --> +<!-- EN-Revision: 1.21 Maintainer: cucinato Status: ready --> <!-- OLD-Revision: 1.173/EN.1.2 --> <refentry id="function.array-walk"> <refnamediv> @@ -12,12 +12,12 @@ </refnamediv> <refsect1> <title>Descrizione</title> - <methodsynopsis> - <type>bool</type><methodname>array_walk</methodname> - <methodparam><type>array</type><parameter>array</parameter></methodparam> - <methodparam><type>callback</type><parameter>funzione</parameter></methodparam> - <methodparam choice="opt"><type>mixed</type><parameter>datiutente</parameter></methodparam> - </methodsynopsis> + <methodsynopsis> + <type>bool</type><methodname>array_walk</methodname> + <methodparam><type>array</type><parameter>&array</parameter></methodparam> + <methodparam><type>callback</type><parameter>funzione</parameter></methodparam> + <methodparam choice="opt"><type>mixed</type><parameter>datiutente</parameter></methodparam> + </methodsynopsis> <simpara> &return.success; </simpara> @@ -119,9 +119,13 @@ </example> </para> <simpara> - Vedere anche <function>create_function</function>, <function>list</function>, - <link linkend="control-structures.foreach">foreach</link>, - <function>each</function> e <function>call_user_func_array</function>. + Vedere anche <function>array_walk_recursive</function>, + <function>create_function</function>, + <function>list</function>, + <link linkend="control-structures.foreach">foreach</link>, + <function>each</function>, + <function>call_user_func_array</function> e + <function>array_map</function> </simpara> </refsect1> </refentry> http://cvs.php.net/diff.php/phpdoc-it/reference/array/functions/sort.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc-it/reference/array/functions/sort.xml diff -u phpdoc-it/reference/array/functions/sort.xml:1.6 phpdoc-it/reference/array/functions/sort.xml:1.7 --- phpdoc-it/reference/array/functions/sort.xml:1.6 Sat Jan 3 10:35:19 2004 +++ phpdoc-it/reference/array/functions/sort.xml Sat Sep 4 08:05:19 2004 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- splitted from ./it/functions/array.xml, last change in rev 1.1 --> <!-- last change to 'sort' in en/ tree in rev 1.2 --> -<!-- EN-Revision: 1.10 Maintainer: cucinato Status: ready --> +<!-- EN-Revision: 1.14 Maintainer: cucinato Status: ready --> <!-- OLD-Revision: 1.173/EN.1.2 --> <refentry id="function.sort"> <refnamediv> @@ -12,7 +12,7 @@ <title>Descrizione</title> <methodsynopsis> <type>bool</type><methodname>sort</methodname> - <methodparam><type>array</type><parameter>array</parameter></methodparam> + <methodparam><type>array</type><parameter>&array</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter></methodparam> </methodsynopsis> <para> @@ -70,13 +70,13 @@ flag d'ordinamento: <itemizedlist> <listitem> - <simpara>SORT_REGULAR - compara gli elementi in modo normale</simpara> + <simpara><constant>SORT_REGULAR</constant> - compara gli elementi in modo normale</simpara> </listitem> <listitem> - <simpara>SORT_NUMERIC - compara gli elementi numericamente</simpara> + <simpara><constant>SORT_NUMERIC</constant> - compara gli elementi numericamente</simpara> </listitem> <listitem> - <simpara>SORT_STRING - compara gli elementi convertiti in stringa</simpara> + <simpara><constant>SORT_STRING</constant> - compara gli elementi convertiti in stringa</simpara> </listitem> </itemizedlist> </para> http://cvs.php.net/diff.php/phpdoc-it/reference/array/functions/usort.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc-it/reference/array/functions/usort.xml diff -u phpdoc-it/reference/array/functions/usort.xml:1.10 phpdoc-it/reference/array/functions/usort.xml:1.11 --- phpdoc-it/reference/array/functions/usort.xml:1.10 Mon Feb 9 18:45:41 2004 +++ phpdoc-it/reference/array/functions/usort.xml Sat Sep 4 08:05:19 2004 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- splitted from ./it/functions/array.xml, last change in rev 1.1 --> <!-- last change to 'usort' in en/ tree in rev 1.2 --> -<!-- EN-Revision: 1.17 Maintainer: cucinato Status: ready --> +<!-- EN-Revision: 1.19 Maintainer: cucinato Status: ready --> <!-- OLD-Revision: 1.173/EN.1.2 --> <refentry id="function.usort"> <refnamediv> @@ -14,7 +14,7 @@ <title>Descrizione</title> <methodsynopsis> <type>bool</type><methodname>usort</methodname> - <methodparam><type>array</type><parameter>array</parameter></methodparam> + <methodparam><type>array</type><parameter>&array</parameter></methodparam> <methodparam><type>callback</type><parameter>cmp_function</parameter></methodparam> </methodsynopsis> <para> @@ -112,8 +112,8 @@ ]]> </programlisting> <para> - Quando si ordina un array multidimensionale, $a e $b contengono - riferimenti al primo indice dell'array. + Quando si ordina un array multidimensionale, <varname>$a</varname> e + <varname>$b</varname> contengono riferimenti al primo indice dell'array. </para> <para> Questo esempio mostrerà:
http://cvs.php.net/diff.php/phpdoc-it/reference/array/functions/array-intersect-assoc.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc-it/reference/array/functions/array-intersect-assoc.xml diff -u phpdoc-it/reference/array/functions/array-intersect-assoc.xml:1.5 phpdoc-it/reference/array/functions/array-intersect-assoc.xml:1.6 --- phpdoc-it/reference/array/functions/array-intersect-assoc.xml:1.5 Fri Mar 5 18:44:23 2004 +++ phpdoc-it/reference/array/functions/array-intersect-assoc.xml Sat Sep 4 08:05:19 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- EN-Revision: 1.6 Maintainer: cucinato Status: ready --> +<!-- EN-Revision: 1.7 Maintainer: cucinato Status: ready --> <refentry id="function.array-intersect-assoc"> <refnamediv> <refname>array_intersect_assoc</refname> @@ -61,7 +61,10 @@ <!-- TODO: example of it... --> </simpara> <simpara> - Vedere anche <function>array_intersect</function> + Vedere anche <function>array_intersect</function>, + <function>array_uintersect_assoc</function>, + <function>array_intersect_uassoc</function>, + <function>array_uintersect_uassoc</function>, <function>array_diff</function> e <function>array_diff_assoc</function>. </simpara> http://cvs.php.net/diff.php/phpdoc-it/reference/array/functions/array-merge.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc-it/reference/array/functions/array-merge.xml diff -u phpdoc-it/reference/array/functions/array-merge.xml:1.10 phpdoc-it/reference/array/functions/array-merge.xml:1.11 --- phpdoc-it/reference/array/functions/array-merge.xml:1.10 Tue Jan 6 09:15:15 2004 +++ phpdoc-it/reference/array/functions/array-merge.xml Sat Sep 4 08:05:19 2004 @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- splitted from ./it/functions/array.xml, last change in rev 1.6 --> <!-- last change to 'array-merge' in en/ tree in rev 1.2 --> -<!-- EN-Revision: 1.12 Maintainer: cucinato Status: ready --> +<!-- EN-Revision: 1.13 Maintainer: cucinato Status: ready --> <!-- OLD-Revision: 1.173/EN.1.2 --> <refentry id="function.array-merge"> <refnamediv> <refname>array_merge</refname> - <refpurpose>Fonde due o più array</refpurpose> + <refpurpose>Fonde uno o più array</refpurpose> </refnamediv> <refsect1> <title>Descrizione</title> <methodsynopsis> <type>array</type><methodname>array_merge</methodname> <methodparam><type>array</type><parameter>array1</parameter></methodparam> - <methodparam><type>array</type><parameter>array2</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>array2</parameter></methodparam> <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam> </methodsynopsis> <para> - <function>array_merge</function> fonde gli elementi di due o + <function>array_merge</function> fonde gli elementi di uno o più array in modo che i valori di un array siano accodati a quelli dell'array precedente. Restituisce l'array risultante. </para> @@ -29,6 +29,11 @@ accodato. </para> <para> + Se viene fornito un solo array, e questo è indicizzato numericamente, le + chiavi vengono reindicizzate in una sequenza continua. Nel caso di array associativi, delle + chiavi duplicate rimane solo l'ultima. Vedere l'esempio tre per ulteriori dettagli. + </para> + <para> <example> <title>Esempio di <function>array_merge</function></title> <programlisting role="php"> @@ -104,6 +109,43 @@ Array ( [1] => data +) +]]> + </screen> + </example> + <example> + <title>esempio di <function>array_merge</function></title> + <programlisting role="php"> +<![CDATA[ +<?php +$array_uno = array(0 => "mario", 1 => "roberto", 2 => "andrea", 3 => "dante"); +$array_due = array("mario => "roberto", "andrea" => "dante", "mario" => "giacomo"); + +unset($array_uno[2]); + +$risultato_uno = array_merge($array_uno); +$risultato_due = array_merge($array_due); + +print_r($risultato_uno); +print_r($risultato_due); +?> +]]> + </programlisting> + <para> + Il risultato sarà: + </para> + <screen role="php"> +<![CDATA[ +Array +( + [0] => mario + [1] => roberto + [2] => dante +) +Array +( + [mario] => giacomo + [andrea] => dante ) ]]> </screen> http://cvs.php.net/diff.php/phpdoc-it/reference/array/functions/array-walk.xml?r1=1.11&r2=1.12&ty=u Index: phpdoc-it/reference/array/functions/array-walk.xml diff -u phpdoc-it/reference/array/functions/array-walk.xml:1.11 phpdoc-it/reference/array/functions/array-walk.xml:1.12 --- phpdoc-it/reference/array/functions/array-walk.xml:1.11 Fri Feb 13 16:59:51 2004 +++ phpdoc-it/reference/array/functions/array-walk.xml Sat Sep 4 08:05:19 2004 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- splitted from ./it/functions/array.xml, last change in rev 1.1 --> <!-- last change to 'array-walk' in en/ tree in rev 1.2 --> -<!-- EN-Revision: 1.15 Maintainer: cucinato Status: ready --> +<!-- EN-Revision: 1.21 Maintainer: cucinato Status: ready --> <!-- OLD-Revision: 1.173/EN.1.2 --> <refentry id="function.array-walk"> <refnamediv> @@ -12,12 +12,12 @@ </refnamediv> <refsect1> <title>Descrizione</title> - <methodsynopsis> - <type>bool</type><methodname>array_walk</methodname> - <methodparam><type>array</type><parameter>array</parameter></methodparam> - <methodparam><type>callback</type><parameter>funzione</parameter></methodparam> - <methodparam choice="opt"><type>mixed</type><parameter>datiutente</parameter></methodparam> - </methodsynopsis> + <methodsynopsis> + <type>bool</type><methodname>array_walk</methodname> + <methodparam><type>array</type><parameter>&array</parameter></methodparam> + <methodparam><type>callback</type><parameter>funzione</parameter></methodparam> + <methodparam choice="opt"><type>mixed</type><parameter>datiutente</parameter></methodparam> + </methodsynopsis> <simpara> &return.success; </simpara> @@ -119,9 +119,13 @@ </example> </para> <simpara> - Vedere anche <function>create_function</function>, <function>list</function>, - <link linkend="control-structures.foreach">foreach</link>, - <function>each</function> e <function>call_user_func_array</function>. + Vedere anche <function>array_walk_recursive</function>, + <function>create_function</function>, + <function>list</function>, + <link linkend="control-structures.foreach">foreach</link>, + <function>each</function>, + <function>call_user_func_array</function> e + <function>array_map</function> </simpara> </refsect1> </refentry> http://cvs.php.net/diff.php/phpdoc-it/reference/array/functions/sort.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc-it/reference/array/functions/sort.xml diff -u phpdoc-it/reference/array/functions/sort.xml:1.6 phpdoc-it/reference/array/functions/sort.xml:1.7 --- phpdoc-it/reference/array/functions/sort.xml:1.6 Sat Jan 3 10:35:19 2004 +++ phpdoc-it/reference/array/functions/sort.xml Sat Sep 4 08:05:19 2004 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- splitted from ./it/functions/array.xml, last change in rev 1.1 --> <!-- last change to 'sort' in en/ tree in rev 1.2 --> -<!-- EN-Revision: 1.10 Maintainer: cucinato Status: ready --> +<!-- EN-Revision: 1.14 Maintainer: cucinato Status: ready --> <!-- OLD-Revision: 1.173/EN.1.2 --> <refentry id="function.sort"> <refnamediv> @@ -12,7 +12,7 @@ <title>Descrizione</title> <methodsynopsis> <type>bool</type><methodname>sort</methodname> - <methodparam><type>array</type><parameter>array</parameter></methodparam> + <methodparam><type>array</type><parameter>&array</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter></methodparam> </methodsynopsis> <para> @@ -70,13 +70,13 @@ flag d'ordinamento: <itemizedlist> <listitem> - <simpara>SORT_REGULAR - compara gli elementi in modo normale</simpara> + <simpara><constant>SORT_REGULAR</constant> - compara gli elementi in modo normale</simpara> </listitem> <listitem> - <simpara>SORT_NUMERIC - compara gli elementi numericamente</simpara> + <simpara><constant>SORT_NUMERIC</constant> - compara gli elementi numericamente</simpara> </listitem> <listitem> - <simpara>SORT_STRING - compara gli elementi convertiti in stringa</simpara> + <simpara><constant>SORT_STRING</constant> - compara gli elementi convertiti in stringa</simpara> </listitem> </itemizedlist> </para> http://cvs.php.net/diff.php/phpdoc-it/reference/array/functions/usort.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc-it/reference/array/functions/usort.xml diff -u phpdoc-it/reference/array/functions/usort.xml:1.10 phpdoc-it/reference/array/functions/usort.xml:1.11 --- phpdoc-it/reference/array/functions/usort.xml:1.10 Mon Feb 9 18:45:41 2004 +++ phpdoc-it/reference/array/functions/usort.xml Sat Sep 4 08:05:19 2004 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- splitted from ./it/functions/array.xml, last change in rev 1.1 --> <!-- last change to 'usort' in en/ tree in rev 1.2 --> -<!-- EN-Revision: 1.17 Maintainer: cucinato Status: ready --> +<!-- EN-Revision: 1.19 Maintainer: cucinato Status: ready --> <!-- OLD-Revision: 1.173/EN.1.2 --> <refentry id="function.usort"> <refnamediv> @@ -14,7 +14,7 @@ <title>Descrizione</title> <methodsynopsis> <type>bool</type><methodname>usort</methodname> - <methodparam><type>array</type><parameter>array</parameter></methodparam> + <methodparam><type>array</type><parameter>&array</parameter></methodparam> <methodparam><type>callback</type><parameter>cmp_function</parameter></methodparam> </methodsynopsis> <para> @@ -112,8 +112,8 @@ ]]> </programlisting> <para> - Quando si ordina un array multidimensionale, $a e $b contengono - riferimenti al primo indice dell'array. + Quando si ordina un array multidimensionale, <varname>$a</varname> e + <varname>$b</varname> contengono riferimenti al primo indice dell'array. </para> <para> Questo esempio mostrerà: