leszek Sun May 12 16:31:51 2002 EDT
Modified files:
/phpdoc-pl/reference/array reference.xml
/phpdoc-pl/reference/array/functions array-change-key-case.xml
array-chunk.xml
array-count-values.xml
array-diff.xml array-fill.xml
array-filter.xml
array-flip.xml
array-intersect.xml
array-key-exists.xml
array-keys.xml array-map.xml
array-merge-recursive.xml
array-merge.xml
array-multisort.xml
array-pad.xml array-pop.xml
array-push.xml array-rand.xml
array-reduce.xml
array-reverse.xml
array-search.xml
array-shift.xml
array-slice.xml
array-splice.xml array-sum.xml
array-unique.xml
array-unshift.xml
array-values.xml
array-walk.xml array.xml
arsort.xml asort.xml
compact.xml count.xml
current.xml each.xml end.xml
extract.xml in-array.xml
key.xml krsort.xml ksort.xml
list.xml natcasesort.xml
natsort.xml next.xml pos.xml
prev.xml range.xml reset.xml
rsort.xml shuffle.xml
sizeof.xml sort.xml uasort.xml
uksort.xml usort.xml
Log:
Updated to newest version
Index: phpdoc-pl/reference/array/reference.xml
diff -u phpdoc-pl/reference/array/reference.xml:1.2
phpdoc-pl/reference/array/reference.xml:1.3
--- phpdoc-pl/reference/array/reference.xml:1.2 Tue Apr 16 20:05:24 2002
+++ phpdoc-pl/reference/array/reference.xml Sun May 12 16:31:46 2002
@@ -1,30 +1,68 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.5 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<reference id="ref.array">
<title>Tablice</title>
<titleabbrev>Tablice</titleabbrev>
+
<partintro>
- <simpara>
- Funkcje te pozwalaj� na operowanie i manipulowanie tablicami na wiele
- r�nych sposob�w. Tablice s� kluczowym elementem przechowywania,
- zarz�dzania i operowania na zbiorach zmiennych.
- </simpara>
- <simpara>
- Obs�ugiwane s� proste i wielowymiarowane tablica, kt�re mog� by� stworzone
- przez u�ytkownika lub przez funkcj�. Istniej� specjalne funkcje obs�ugi
- baz danych odpowiedzialne za wype�nianie tablic danymi z zapyta� do baz
- danych, a tak�e kilka innych funkcji zwracaj�cych tablice.
- </simpara>
- <para>
- Zobacz rozdzia� podr�cznika <link linkend="language.types.array">Tablice
- </link> aby uzyska� dok�adne wyja�nienie jak tablice zosta�y
- zaimplementowane i jak si� ich u�ywa w PHP.
- </para>
- <para>
- Patrz tak�e <function>is_array</function>, <function>explode</function>,
- <function>implode</function>, <function>split</function>
- i <function>join</function>.
- </para>
+ <section id="array.intro">
+ &reftitle.intro;
+ <para>
+ Funkcje te pozwalaj� na operowanie i manipulowanie tablicami na wiele
+ r�nych sposob�w. Tablice s� kluczowym elementem przechowywania,
+ zarz�dzania i operowania na zbiorach zmiennych.
+ </para>
+ <para>
+ Obs�ugiwane s� proste i wielowymiarowane tablica, kt�re mog� by� stworzone
+ przez u�ytkownika lub przez funkcj�. Istniej� specjalne funkcje obs�ugi
+ baz danych odpowiedzialne za wype�nianie tablic danymi z zapyta� do baz
+ danych, a tak�e kilka innych funkcji zwracaj�cych tablice.
+ </para>
+ <para>
+ Zobacz rozdzia� podr�cznika <link linkend="language.types.array">Tablice
+ </link> aby uzyska� dok�adne wyja�nienie jak tablice zosta�y
+ zaimplementowane i jak si� ich u�ywa w PHP.
+ </para>
+ </section>
+
+ <section id="array.requirements">
+ &reftitle.required;
+ &no.requirement;
+ </section>
+
+ <section id="array.installation">
+ &reftitle.install;
+ &no.install;
+ </section>
+
+ <section id="array.configuration">
+ &reftitle.runtime;
+ &no.config;
+ </section>
+
+ <section id="array.resources">
+ &reftitle.resources;
+ &no.resource;
+ </section>
+
+ <section id="array.constants">
+ &reftitle.constants;
+ <para>
+ Sta�e <constant>CASE_UPPER</constant> i <constant>CASE_LOWER</constant>
+ s� u�ywane w funkcji <function>array_change_key_case</function>. S� one
+ u�ywane odpowiednio do zmiany wielko�ci liter na du�e lub ma�e.
+ </para>
+ </section>
+
+ <section id="array.seealso">
+ &reftitle.seealso;
+ <para>
+ Patrz tak�e: <function>is_array</function>, <function>explode</function>,
+ <function>implode</function>, <function>split</function>, i
+ <function>join</function>.
+ </para>
+ </section>
</partintro>
&reference.array.functions;
Index: phpdoc-pl/reference/array/functions/array-change-key-case.xml
diff -u phpdoc-pl/reference/array/functions/array-change-key-case.xml:1.2
phpdoc-pl/reference/array/functions/array-change-key-case.xml:1.3
--- phpdoc-pl/reference/array/functions/array-change-key-case.xml:1.2 Wed Apr 17
03:16:07 2002
+++ phpdoc-pl/reference/array/functions/array-change-key-case.xml Sun May 12
+16:31:46 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-change-key-case' in en/ tree in rev 1.113 -->
<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.113 -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-change-key-case">
<refnamediv>
<refname>array_change_key_case</refname>
@@ -33,7 +31,7 @@
<programlisting role="php">
<![CDATA[
$wejscie = array("PierWszy" => 1, "DruGi" => 4);
-print_r(array_change_key_case($wejscie, CASE_UPPER);
+print_r(array_change_key_case($wejscie, CASE_UPPER));
]]>
</programlisting>
<para>
Index: phpdoc-pl/reference/array/functions/array-chunk.xml
diff -u phpdoc-pl/reference/array/functions/array-chunk.xml:1.2
phpdoc-pl/reference/array/functions/array-chunk.xml:1.3
--- phpdoc-pl/reference/array/functions/array-chunk.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-chunk.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-chunk' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-chunk">
<refnamediv>
<refname>array_chunk</refname>
@@ -39,7 +37,7 @@
]]>
</programlisting>
<para>
- Powy�szy program wy�wietli:
+ Powy�szy przyk�ad wy�wietli:
<screen>
<![CDATA[
Array
Index: phpdoc-pl/reference/array/functions/array-count-values.xml
diff -u phpdoc-pl/reference/array/functions/array-count-values.xml:1.2
phpdoc-pl/reference/array/functions/array-count-values.xml:1.3
--- phpdoc-pl/reference/array/functions/array-count-values.xml:1.2 Wed Apr 17
03:16:07 2002
+++ phpdoc-pl/reference/array/functions/array-count-values.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-count-values' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-count-values">
<refnamediv>
<refname>array_count_values</refname>
@@ -25,9 +23,22 @@
<programlisting role="php">
<![CDATA[
$tablica = array (1, "witaj", 1, "�wiecie", "witaj");
-array_count_values ($tablica); // zwraca tablic� (1=>2, "witaj"=>2, "�wiecie"=>1)
+print_r(array_count_values ($tablica));
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Array
+(
+ [1] => 2
+ [hello] => 2
+ [world] => 1
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
</refsect1>
Index: phpdoc-pl/reference/array/functions/array-diff.xml
diff -u phpdoc-pl/reference/array/functions/array-diff.xml:1.2
phpdoc-pl/reference/array/functions/array-diff.xml:1.3
--- phpdoc-pl/reference/array/functions/array-diff.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-diff.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-diff' in en/ tree in rev 1.14 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.14 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-diff">
<refnamediv>
<refname>array_diff</refname>
@@ -32,7 +30,7 @@
]]>
</programlisting>
</example>
- </para>
+ </para>
<para>
W powy�szym przyk�adzie zmienna <varname>$wynik</varname> zawiera
<literal>array ("niebieski");</literal>. Wielokrotne wyst�pienia w
Index: phpdoc-pl/reference/array/functions/array-fill.xml
diff -u phpdoc-pl/reference/array/functions/array-fill.xml:1.2
phpdoc-pl/reference/array/functions/array-fill.xml:1.3
--- phpdoc-pl/reference/array/functions/array-fill.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-fill.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-fill' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-fill">
<refnamediv>
<refname>array_fill</refname>
@@ -27,20 +25,25 @@
<title>Przyk�ad u�ycia <function>array_fill</function></title>
<programlisting role="php">
<![CDATA[
-$a = array_fill(5, 6, 'banan');
-
-/*
-$a zawiera teraz takie elementy:
-
-$a[5] = "banan";
-$a[6] = "banan";
-$a[7] = "banan";
-$a[8] = "banan";
-$a[9] = "banan";
-$a[10] = "banan";
-*/
+print_r(array_fill(5, 6, 'banan'));
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Array
+(
+ [5] => banana
+ [6] => banana
+ [7] => banana
+ [8] => banana
+ [9] => banana
+ [10] => banana
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
</refsect1>
Index: phpdoc-pl/reference/array/functions/array-filter.xml
diff -u phpdoc-pl/reference/array/functions/array-filter.xml:1.2
phpdoc-pl/reference/array/functions/array-filter.xml:1.3
--- phpdoc-pl/reference/array/functions/array-filter.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-filter.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-filter' in en/ tree in rev 1.62 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.62 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-filter">
<refnamediv>
<refname>array_filter</refname>
@@ -33,26 +31,50 @@
}
function parzysta($var) {
- return ($var % 2 == 0);
+ return ($var % 2 == 0);
}
$tablica1 = array ("a"=>1, "b"=>2, "c"=>3, "d"=>4, "e"=>5);
$tablica2 = array (6, 7, 8, 9, 10, 11, 12);
-$nieparzyste = array_filter($tablica1, "nieparzyste");
-$parzyste = array_filter($tablica2, "parzyste");
+echo "Nieparzyste:\n";
+print_r(array_filter($tablica1, "nieparzyste"));
+echo "Parzyste:\n";
+print_r(array_filter($tablica2, "parzyste"));
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen role="php">
+<![CDATA[
+Nieparzyste:
+Array
+(
+ [a] => 1
+ [c] => 3
+ [e] => 5
+)
+Parzyste:
+Array
+(
+ [0] => 6
+ [2] => 8
+ [4] => 10
+ [6] => 12
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
+ ¬e.func-callback;
<para>
- W tym przyk�adzie tablica <varname>$nieparzyste</varname> zawiera
- <literal>array ("a"=>1, "c"=>3, "e"=>5);</literal>,
- a tablica <varname>$parzyste</varname> zawiera
- <literal>array (6, 8, 10, 12);</literal>,
+ U�ytkownicy nie mog� zmienia� filtrowanej tablicy z wn�trza funkcji
+ zwrotnej. Je�li tablica zostanie zmieniona, zachowanie tej funkcji
+ <function>array_filter</function> pozostaje nieokre�lone.
</para>
<para>
- Patrz tak�e <function>array_map</function>,
+ Patrz tak�e: <function>array_map</function> i
<function>array_reduce</function>.
</para>
</refsect1>
Index: phpdoc-pl/reference/array/functions/array-flip.xml
diff -u phpdoc-pl/reference/array/functions/array-flip.xml:1.2
phpdoc-pl/reference/array/functions/array-flip.xml:1.3
--- phpdoc-pl/reference/array/functions/array-flip.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-flip.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-flip' in en/ tree in rev 1.107 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.107 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-flip">
<refnamediv>
<refname>array_flip</refname>
@@ -52,9 +50,19 @@
<![CDATA[
$trans = array ("a" => 1, "b" => 1, "c" => 2);
$trans = array_flip ($trans);
-// teraz $trans zawiera : array(1 => "b", 2 => "c");
+print_r($trans);
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Array
+ [1] => b
+ [2] => c
+]]>
+ </screen>
+ </para>
</example>
</para>
</refsect1>
Index: phpdoc-pl/reference/array/functions/array-intersect.xml
diff -u phpdoc-pl/reference/array/functions/array-intersect.xml:1.2
phpdoc-pl/reference/array/functions/array-intersect.xml:1.3
--- phpdoc-pl/reference/array/functions/array-intersect.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-intersect.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-intersect' in en/ tree in rev 1.14 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.14 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-intersect">
<refnamediv>
<refname>array_intersect</refname>
@@ -28,15 +26,23 @@
<![CDATA[
$tablica1 = array ("a" => "zielony", "czerwony", "niebieski");
$tablica2 = array ("b" => "zielony", "��ty", "czerwony");
-$wynik = array_intersect ($tablica1, $tablica2);
+print_r(array_intersect ($tablica1, $tablica2));
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Array
+(
+ [a] => green
+ [0] => red
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
- <para>
- W powy�szym przyk�adzie tablica <varname>$wynik</varname> zawiera
- <literal>array ("a" => "zielony", "czerwony");</literal>
- </para>
<note>
<simpara>
Dwa elementy tablicy uwa�ane s� za identyczne wtedy i tylko wtedy je�li
Index: phpdoc-pl/reference/array/functions/array-key-exists.xml
diff -u phpdoc-pl/reference/array/functions/array-key-exists.xml:1.2
phpdoc-pl/reference/array/functions/array-key-exists.xml:1.3
--- phpdoc-pl/reference/array/functions/array-key-exists.xml:1.2 Wed Apr 17
03:16:07 2002
+++ phpdoc-pl/reference/array/functions/array-key-exists.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-key-exists' in en/ tree in rev 1.119 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.119 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-key-exists">
<refnamediv>
<refname>array_key_exists</refname>
Index: phpdoc-pl/reference/array/functions/array-keys.xml
diff -u phpdoc-pl/reference/array/functions/array-keys.xml:1.2
phpdoc-pl/reference/array/functions/array-keys.xml:1.3
--- phpdoc-pl/reference/array/functions/array-keys.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-keys.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-keys' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-keys">
<refnamediv>
<refname>array_keys</refname>
@@ -33,15 +31,38 @@
<programlisting role="php">
<![CDATA[
$tablica = array (0 => 100, "kolor" => "czerwony");
-array_keys ($tablica); // zwraca array (0, "kolor")
+print_r(array_keys ($tablica));
$tablica = array ("niebieski", "czerwony", "zielony", "niebieski", "niebieski");
-array_keys ($tablica, "niebieski"); // zwraca array (0, 3, 4)
+print_r(array_keys ($tablica, "niebieski"));
$tablica = array ("kolor" => array("niebieski", "czerwony", "zielony"), "rozmiar" =>
array("ma�y", "�redni", "du�y"));
-array_keys ($tablica); // zwraca array ("kolor", "rozmiar")
+print_r(array_keys ($tablica));
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Array
+(
+ [0] => 0
+ [1] => kolor
+)
+Array
+(
+ [0] => 0
+ [1] => 3
+ [2] => 4
+)
+Array
+(
+ [0] => kolor
+ [1] => rozmiar
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
<note>
@@ -57,12 +78,12 @@
function array_keys ($arr, $term="") {
$t = array();
while (list($k,$v) = each($arr)) {
- if ($term && $v != $term) {
+ if ($term && $v != $term) {
continue;
- $t[] = $k;
}
- return $t;
- }
+ $t[] = $k;
+ }
+ return $t;
}
]]>
</programlisting>
Index: phpdoc-pl/reference/array/functions/array-map.xml
diff -u phpdoc-pl/reference/array/functions/array-map.xml:1.2
phpdoc-pl/reference/array/functions/array-map.xml:1.3
--- phpdoc-pl/reference/array/functions/array-map.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-map.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-map' in en/ tree in rev 1.62 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.62 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-map">
<refnamediv>
<refname>array_map</refname>
@@ -35,15 +33,27 @@
$a = array(1, 2, 3, 4, 5);
$b = array_map("szescian", $a);
+print_r($b);
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Array
+(
+ [0] => 1
+ [1] => 8
+ [2] => 27
+ [3] => 64
+ [4] => 125
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
<para>
- W powy�szej funkcji tablica <varname>$b</varname> zawiera
- <literal>array (1, 8, 27, 64, 125);</literal>
- </para>
- <para>
<example>
<title>
<function>array_map</function> - u�ywanie wi�kszej ilo�ci tablic
@@ -62,54 +72,58 @@
$b = array("uno", "dos", "tres", "cuatro", "cinco");
$c = array_map("pokaz_po_Hiszpansku", $a, $b);
-
print_r($c);
-// will output:
-// Array
-// (
-// [0] => Po Hiszpa�sku liczba 1 to uno
-// [1] => Po Hiszpa�sku liczba 2 to dos
-// [2] => Po Hiszpa�sku liczba 3 to tres
-// [3] => Po Hiszpa�sku liczba 4 to cuatro
-// [4] => Po Hiszpa�sku liczba 5 to cinco
-// )
-
$d = array_map("mapuj_po_Hiszpansku", $a , $b);
-
print_r($d);
-
-// wy�wietli:
-// Array
-// (
-// [0] => Array
-// (
-// [1] => uno
-// )
-//
-// [1] => Array
-// (
-// [2] => dos
-// )
-//
-// [2] => Array
-// (
-// [3] => tres
-// )
-//
-// [3] => Array
-// (
-// [4] => cuatro
-// )
-//
-// [4] => Array
-// (
-// [5] => cinco
-// )
-//
-// )
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+// Zmienna $c
+Array
+(
+ [0] => The number 1 is called uno in Spanish
+ [1] => The number 2 is called dos in Spanish
+ [2] => The number 3 is called tres in Spanish
+ [3] => The number 4 is called cuatro in Spanish
+ [4] => The number 5 is called cinco in Spanish
+)
+
+// Zmienna $d
+Array
+(
+ [0] => Array
+ (
+ [1] => uno
+ )
+
+ [1] => Array
+ (
+ [2] => dos
+ )
+
+ [2] => Array
+ (
+ [3] => tres
+ )
+
+ [3] => Array
+ (
+ [4] => cuatro
+ )
+
+ [4] => Array
+ (
+ [5] => cinco
+ )
+
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
<para>
@@ -136,53 +150,58 @@
$e = array_map(null, $a, $b, $c, $d);
print_r($e);
-
-// wy�wietli:
-// Array
-// (
-// [0] => Array
-// (
-// [0] => 1
-// [1] => one
-// [2] => uno
-// [3] => jeden
-// )
-//
-// [1] => Array
-// (
-// [0] => 2
-// [1] => two
-// [2] => dos
-// [3] => dwa
-// )
-//
-// [2] => Array
-// (
-// [0] => 3
-// [1] => three
-// [2] => tres
-// [3] => trzy
-// )
-//
-// [3] => Array
-// (
-// [0] => 4
-// [1] => four
-// [2] => cuatro
-// [3] => cztery
-// )
-//
-// [4] => Array
-// (
-// [0] => 5
-// [1] => five
-// [2] => cinco
-// [3] => pi��
-// )
-//
-// )
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Array
+(
+ [0] => Array
+ (
+ [0] => 1
+ [1] => one
+ [2] => uno
+ [3] => jeden
+ )
+
+ [1] => Array
+ (
+ [0] => 2
+ [1] => two
+ [2] => dos
+ [3] => dwa
+ )
+
+ [2] => Array
+ (
+ [0] => 3
+ [1] => three
+ [2] => tres
+ [3] => trzy
+ )
+
+ [3] => Array
+ (
+ [0] => 4
+ [1] => four
+ [2] => cuatro
+ [3] => cztery
+ )
+
+ [4] => Array
+ (
+ [0] => 5
+ [1] => five
+ [2] => cinco
+ [3] => pi��
+ )
+
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
<para>
Index: phpdoc-pl/reference/array/functions/array-merge-recursive.xml
diff -u phpdoc-pl/reference/array/functions/array-merge-recursive.xml:1.2
phpdoc-pl/reference/array/functions/array-merge-recursive.xml:1.3
--- phpdoc-pl/reference/array/functions/array-merge-recursive.xml:1.2 Wed Apr 17
03:16:07 2002
+++ phpdoc-pl/reference/array/functions/array-merge-recursive.xml Sun May 12
+16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-merge-recursive' in en/ tree in rev 1.12 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.12 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-merge-recursive">
<refnamediv>
<refname>array_merge_recursive</refname>
@@ -36,15 +34,32 @@
<![CDATA[
$tbl1 = array ("kolor" => array ("ulubiony" => "czerwony"), 5);
$tbl2 = array (10, "kolor" => array ("ulubiony" => "zielony", "niebieski"));
-$wynik = array_merge_recursive ($tbl1, $tbl2);
+print_r(array_merge_recursive ($tbl1, $tbl2));
]]>
</programlisting>
+ <para>
+ <screen>
+<![CDATA[
+Array
+(
+ [kolor] => Array
+ (
+ [ulubiony] => Array
+ (
+ [0] => czerwony
+ [1] => zielony
+ )
+
+ [0] => niebieski
+ )
+
+ [0] => 5
+ [1] => 10
+)
+]]>
+ </screen>
+ </para>
</example>
- </para>
- <para>
- W powy�szym przyk�adzie tablica <varname>$wynik</varname> zawiera
- <literal>array ("kolor" => array ("ulubiony" => array ("czerwony",
- "zielony"), "niebieski"), 5, 10)</literal>.
</para>
<para>
Patrz tak�e <function>array_merge</function>.
Index: phpdoc-pl/reference/array/functions/array-merge.xml
diff -u phpdoc-pl/reference/array/functions/array-merge.xml:1.2
phpdoc-pl/reference/array/functions/array-merge.xml:1.3
--- phpdoc-pl/reference/array/functions/array-merge.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-merge.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-merge' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-merge">
<refnamediv>
<refname>array_merge</refname>
@@ -23,7 +21,7 @@
</para>
<para>
Je�li tablice wej�ciowe maj� takie same klucze tekstowe, najnowsza
- warto�� nadpisze starsz�. Jednak�e je��i tablice b�d� mia�y takie same
+ warto�� nadpisze starsz�. Jednak�e je�li tablice b�d� mia�y takie same
klucze liczbowe, p�niejsza warto�� nie nadpisze starszej, lecz zostanie
dopisana na koniec tablicy.
</para>
@@ -34,15 +32,27 @@
<![CDATA[
$tablica1 = array ("kolor" => "czerwony", 2, 4);
$tablica2 = array ("a", "b", "kolor" => "zielony", "kszta�t" => "trapezoid", 4);
-$wynik = array_merge ($tablica1, $tablica2);
+print_r(array_merge ($tablica1, $tablica2));
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Array
+(
+ [kolor] => zielony
+ [0] => 2
+ [1] => 4
+ [2] => a
+ [3] => b
+ [kszta�t] => trapezoid
+ [4] => 4
+)
+]]>
+ </screen>
+ </para>
</example>
- </para>
- <para>
- W powy�szym przyk�adze tablica <varname>$wynik</varname> zawiera
- <literal>array("kolor" => "zielony", 2, 4,
- "a", "b", "kszta�t" => "trapezoid", 4)</literal>.
</para>
<para>
Patrz tak�e <function>array_merge_recursive</function>.
Index: phpdoc-pl/reference/array/functions/array-multisort.xml
diff -u phpdoc-pl/reference/array/functions/array-multisort.xml:1.2
phpdoc-pl/reference/array/functions/array-multisort.xml:1.3
--- phpdoc-pl/reference/array/functions/array-multisort.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-multisort.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-multisort' in en/ tree in rev 1.11 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.11 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-multisort">
<refnamediv>
<refname>array_multisort</refname>
@@ -67,7 +65,7 @@
ka�dym argumencie tablicowym.
</para>
<para>
- Zwraca &true; w przypadku sukcesu, &false; w przypadku pora�ki.
+ &return.success;
</para>
<para>
<example>
@@ -93,7 +91,7 @@
<programlisting role="php">
<![CDATA[
$tbl = array (array ("10", 100, 100, "a"), array (1, 3, "2", 1));
-array_multisort ($tbl[0], SORT_ASC, SORT_STRING,
+array_multisort ($tbl[0], SORT_ASC, SORT_STRING,
$tbl[1], SORT_NUMERIC, SORT_DESC);
]]>
</programlisting>
Index: phpdoc-pl/reference/array/functions/array-pad.xml
diff -u phpdoc-pl/reference/array/functions/array-pad.xml:1.2
phpdoc-pl/reference/array/functions/array-pad.xml:1.3
--- phpdoc-pl/reference/array/functions/array-pad.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-pad.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-pad' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-pad">
<refnamediv>
<refname>array_pad</refname>
Index: phpdoc-pl/reference/array/functions/array-pop.xml
diff -u phpdoc-pl/reference/array/functions/array-pop.xml:1.2
phpdoc-pl/reference/array/functions/array-pop.xml:1.3
--- phpdoc-pl/reference/array/functions/array-pop.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-pop.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-pop' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-pop">
<refnamediv>
<refname>array_pop</refname>
@@ -25,7 +23,7 @@
<title>Przyk�ad u�ycia <function>array_pop</function></title>
<programlisting role="php">
<![CDATA[
-$stos = array ("pomara�cza", "jab�ko", "malina");
+$stos = array ("pomara�cza", "banan", "jab�ko", "malina");
$owoc = array_pop ($stos);
]]>
</programlisting>
@@ -33,9 +31,21 @@
</para>
<para>
Po wykonaniu powy�szego kodu <varname>$stos</varname> b�dzie mia� tylko
- dwa elementy: "pomara�cza" i "jab�ko", a zmienna <varname>$owoc</varname>
- b�dzie zawiera�a string "malina".
+ trzy elementy:
+ <screen role="php">
+<![CDATA[
+Array
+(
+ [0] => pomara�cza
+ [1] => banan
+ [2] => jab�ko
+)
+]]>
+ </screen>
+ a <literal>malina</literal> b�dzie przypisana do zmiennej
+ <varname>$owoc</varname>.
</para>
+ &return.falseproblem;
<para>
Patrz tak�e <function>array_push</function>,
<function>array_shift</function> i
Index: phpdoc-pl/reference/array/functions/array-push.xml
diff -u phpdoc-pl/reference/array/functions/array-push.xml:1.2
phpdoc-pl/reference/array/functions/array-push.xml:1.3
--- phpdoc-pl/reference/array/functions/array-push.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-push.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-push' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-push">
<refnamediv>
<refname>array_push</refname>
@@ -38,18 +36,29 @@
<title>Przyk�ad u�ycia <function>array_push</function></title>
<programlisting role="php">
<![CDATA[
-$stos = array (1, 2);
-array_push ($stos, "+", 3);
+$stos = array ("pomara�cza", "banan");
+array_push ($stos, "jab�ko", "malina");
+print_r($stos);
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Array
+(
+ [0] => pomara�cza
+ [1] => banan
+ [2] => jab�ko
+ [3] => malina
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
<para>
- Po wykonaniu powy�szego kodu zmienna <varname>$stos</varname> b�dzie
- zawiera�a 4 elementy: 1, 2, "+" i 3.
- </para>
- <para>
- Patrz tak�e <function>array_pop</function>,
+ Patrz tak�e: <function>array_pop</function>,
<function>array_shift</function> i
<function>array_unshift</function>.
</para>
Index: phpdoc-pl/reference/array/functions/array-rand.xml
diff -u phpdoc-pl/reference/array/functions/array-rand.xml:1.2
phpdoc-pl/reference/array/functions/array-rand.xml:1.3
--- phpdoc-pl/reference/array/functions/array-rand.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-rand.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-rand' in en/ tree in rev 1.13 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.13 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-rand">
<refnamediv>
<refname>array_rand</refname>
Index: phpdoc-pl/reference/array/functions/array-reduce.xml
diff -u phpdoc-pl/reference/array/functions/array-reduce.xml:1.2
phpdoc-pl/reference/array/functions/array-reduce.xml:1.3
--- phpdoc-pl/reference/array/functions/array-reduce.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-reduce.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-reduce' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-reduce">
<refnamediv>
<refname>array_reduce</refname>
@@ -58,7 +56,7 @@
<varname>$d</varname> containing <literal>1</literal>.
</para>
<para>
- Patrz tak�e <function>array_filter</function>,
+ Patrz tak�e <function>array_filter</function> i
<function>array_map</function>.
</para>
</refsect1>
Index: phpdoc-pl/reference/array/functions/array-reverse.xml
diff -u phpdoc-pl/reference/array/functions/array-reverse.xml:1.2
phpdoc-pl/reference/array/functions/array-reverse.xml:1.3
--- phpdoc-pl/reference/array/functions/array-reverse.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-reverse.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-reverse' in en/ tree in rev 1.62 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.62 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-reverse">
<refnamediv>
<refname>array_reverse</refname>
@@ -29,18 +27,43 @@
<programlisting role="php">
<![CDATA[
$wejscie = array ("php", 4.0, array ("zielony", "czerwony"));
-$wynik = array_reverse ($wejscie);
+$wynik = array_reverse ($wejscie);
$wynik_kluczowany = array_reverse ($input, TRUE);
]]>
</programlisting>
+ <para>
+ W tym przyk�adzie i <varname>$wynik</varname> i
+ <varname>$wynik_kluczowny</varname> b�d� zawiera�y te same elementy,
+ ale trzeba zauwa�y� r�nic� w kluczach. Tablice te b�d� wygl�da�y
+ nast�puj�co:
+ <screen>
+<![CDATA[
+Array
+(
+ [0] => Array
+ (
+ [0] => zielony
+ [1] => czerwony
+ )
+
+ [1] => 4
+ [2] => php
+)
+Array
+(
+ [2] => Array
+ (
+ [0] => zielony
+ [1] => czerwony
+ )
+
+ [1] => 4
+ [0] => php
+)
+]]>
+ </screen>
+ </para>
</example>
- </para>
- <para>
- I <varname>$wynik</varname> i <varname>$wynik_kluczowany</varname>
- b�d� zawiera�y <literal>array(array
- ("zielony", "czerwony"), 4.0, "php")</literal>. Ale
- <varname>$wynik_kluczowany[0]</varname> ci�gle b�dzie zawiera�
- <literal>"php"</literal>.
</para>
<note>
<para>
Index: phpdoc-pl/reference/array/functions/array-search.xml
diff -u phpdoc-pl/reference/array/functions/array-search.xml:1.2
phpdoc-pl/reference/array/functions/array-search.xml:1.3
--- phpdoc-pl/reference/array/functions/array-search.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-search.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-search' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-search">
<refnamediv>
<refname>array_search</refname>
@@ -24,14 +22,22 @@
<parameter>ig�a</parameter> i zwraca odpowiedni klucz je�li zosta� on
znaleziony lub &false; w przeciwnym przypadku.
</para>
+ <note>
+ <para>
+ Pocz�wszy od PHP 4.1.2, <function>array_search</function> zwraca
+ <constant>NULL</constant> w przypadku niepowodzenia zamiast &false;
+ </para>
+ </note>
<para>
Je�li trzeci parametr <parameter>�cis�y</parameter> jest ustawiony na
&true; to <function>array_search</function> por�wna tak�e typy
parametru <parameter>ig�a</parameter> z tymi z parametru
<parameter>st�g_siana</parameter>.
</para>
+ &return.falseproblem;
<para>
- Patrz tak�e <function>in_array</function>.
+ Patrz tak�e <function>array_keys</function> i
+ <function>in_array</function>.
</para>
</refsect1>
</refentry>
Index: phpdoc-pl/reference/array/functions/array-shift.xml
diff -u phpdoc-pl/reference/array/functions/array-shift.xml:1.2
phpdoc-pl/reference/array/functions/array-shift.xml:1.3
--- phpdoc-pl/reference/array/functions/array-shift.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-shift.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-shift' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-shift">
<refnamediv>
<refname>array_shift</refname>
@@ -28,16 +26,26 @@
<title>Przyk�ad u�ycia <function>array_shift</function></title>
<programlisting role="php">
<![CDATA[
-$argumenty = array ("-v", "-f");
-$opcja = array_shift ($argument);
+$stos= array ("pomara�cza", "banan", "jab�ko", "malina");
+$owoc = array_shift ($owoc);
]]>
</programlisting>
+ <para>
+ Zmienna <varname>$owoc</varname> b�dzie mia�a 3 elementy:
+ <screen>
+<![CDATA[
++Array
+(
+ [0] => banan
+ [1] => jab�ko
+ [2] => malina
+)
+]]>
+ </screen>
+ a <literal>pomara�cza</literal> b�dzie przypisana do zmiennej
+ <varname>$owoc</varname>
+ </para>
</example>
- </para>
- <para>
- Po wykonaniu powy�szego kodu zmienna <varname>$args</varname> b�dzie
- zawiera�a jeden element "-f" a <varname>$opcja</varname> b�dzie zawiera�a
- string "-v".
</para>
<para>
Patrz tak�e <function>array_unshift</function>,
Index: phpdoc-pl/reference/array/functions/array-slice.xml
diff -u phpdoc-pl/reference/array/functions/array-slice.xml:1.2
phpdoc-pl/reference/array/functions/array-slice.xml:1.3
--- phpdoc-pl/reference/array/functions/array-slice.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-slice.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-slice' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-slice">
<refnamediv>
<refname>array_slice</refname>
@@ -39,6 +37,11 @@
<parameter>tablica</parameter>.
</para>
<para>
+ Zauwa�, �e <function>array_slice</function> zignoruje klucze i obliczy
+ d�ugo�� i przesuni�cie na podstawie aktualnych pozycji element�w w
+ tablicy.
+ </para>
+ <para>
<example>
<title>Przyk�ad u�ycia <function>array_slice</function></title>
<programlisting role="php">
@@ -55,7 +58,7 @@
</para>
<para>
Patrz tak�e <function>array_splice</function>.
- </para>
+ </para>
</refsect1>
</refentry>
Index: phpdoc-pl/reference/array/functions/array-splice.xml
diff -u phpdoc-pl/reference/array/functions/array-splice.xml:1.2
phpdoc-pl/reference/array/functions/array-splice.xml:1.3
--- phpdoc-pl/reference/array/functions/array-splice.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-splice.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-splice' in en/ tree in rev 1.14 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.14 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-splice">
<refnamediv>
<refname>array_splice</refname>
@@ -26,7 +24,8 @@
</parameter> elementy okre�lone przez parametry
<parameter>przesuni�cie</parameter> i
<parameter>d�ugo��</parameter>, i zamienia je przez elementy tablicy
- <parameter>zamiennik</parameter>, je�li zosta�a ona podana.
+ <parameter>zamiennik</parameter>, je�li zosta�a ona podana. Funkcja
+ zwraca tablice zawieraj�c� usuni�te elementy.
</para>
<para>
Je�li <parameter>przesuni�cie</parameter> jest dodatnie, to pocz�tek
@@ -60,7 +59,7 @@
R�wnoznaczno�ci kodu:
<programlisting role="php">
<![CDATA[
-array_push ($wejscie, $x, $y) array_splice ($wejscie, count ($wejscie), 0,
+array_push ($wejscie, $x, $y) array_splice ($wejscie, count ($wejscie), 0,
array ($x, $y))
array_pop ($wejscie) array_splice ($wejscie, -1)
array_shift ($wejscie) array_splice ($wejscie, 0, 1)
Index: phpdoc-pl/reference/array/functions/array-sum.xml
diff -u phpdoc-pl/reference/array/functions/array-sum.xml:1.2
phpdoc-pl/reference/array/functions/array-sum.xml:1.3
--- phpdoc-pl/reference/array/functions/array-sum.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-sum.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-sum' in en/ tree in rev 1.59 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.59 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-sum">
<refnamediv>
<refname>array_sum</refname>
@@ -27,15 +25,29 @@
<![CDATA[
$a = array(2, 4, 6, 8);
echo "sum(a) = ".array_sum($a)."\n";
-// wy�wietla: sum(a) = 20
$b = array("a"=>1.2,"b"=>2.3,"c"=>3.4);
echo "sum(b) = ".array_sum($b)."\n";
-// wy�wietla: sum(b) = 6.9
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+sum(a) = 20
+sum(b) = 6.9
+]]>
+ </screen>
+ </para>
</example>
</para>
+ <note>
+ <para>
+ PHP w wersjach wcze�niejszych ni� 4.0.6 modyfikowa�o obrabian� tablic� i
+ konwertowa�o ci�gi na liczby (wi�kszo�� z nich by�a konwertowana na
+ warto�� zero, zale�nie od zawarto�ci).
+ </para>
+ </note>
</refsect1>
</refentry>
Index: phpdoc-pl/reference/array/functions/array-unique.xml
diff -u phpdoc-pl/reference/array/functions/array-unique.xml:1.2
phpdoc-pl/reference/array/functions/array-unique.xml:1.3
--- phpdoc-pl/reference/array/functions/array-unique.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-unique.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-unique' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-unique">
<refnamediv>
<refname>array_unique</refname>
@@ -21,8 +19,10 @@
</para>
<para>
Zauwa�, �e klucze s� zachowywane. <function>array_unique</function>
- zachowa pierwszy napotkany klucz dla ka�dej warto�ci ignoruj�c wszystkie
- pozosta�e.
+ najpierw sortuje warto�ci skonwertowane na ci�gi a p�niej zachowuje
+ pierwszy napotkany klucz dla ka�dej warto�ci ignoruj�c wszystkie
+ pozosta�e klucze. Nie oznacza to, �e klucz pierwszej zwi�zanej warto�ci z
+ nieposortowanej tablicy b�dzie zachowany.
</para>
<note>
<simpara>
@@ -49,15 +49,21 @@
$wejscie = array ("a" => "zielony", "czerwony", "b" => "zielony", "niebieski",
"czerwony");
$wynik = array_unique ($wejscie);
print_r($wynik);
-// wy�wietli si� :
-//Array
-//(
-// [a] => zielony
-// [0] => czerwony
-// [1] => niebieski
-//)
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Array
+(
+ [a] => zielony
+ [0] => czerwony
+ [1] => niebieski
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
<para>
@@ -68,17 +74,21 @@
$wejscie = array (4,"4","3",4,3,"3");
$wynik = array_unique ($wejscie);
var_dump($wynik);
-
-/* wyj�cie:
+]]>
+ </programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
array(2) {
[0]=>
int(4)
[1]=>
string(1) "3"
}
-*/
]]>
- </programlisting>
+ </screen>
+ </para>
</example>
</para>
</refsect1>
Index: phpdoc-pl/reference/array/functions/array-unshift.xml
diff -u phpdoc-pl/reference/array/functions/array-unshift.xml:1.2
phpdoc-pl/reference/array/functions/array-unshift.xml:1.3
--- phpdoc-pl/reference/array/functions/array-unshift.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-unshift.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-unshift' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-unshift">
<refnamediv>
<refname>array_unshift</refname>
@@ -35,15 +33,25 @@
<title>Przyk�ad u�ycia <function>array_unshift</function></title>
<programlisting role="php">
<![CDATA[
-$kolejka = array ("p1", "p3");
-array_unshift ($kolejka, "p4", "p5", "p6");
+$kolejka = array ("pomara�cza", "banan");
+array_unshift ($kolejka, "jab�ko", "malina");
]]>
</programlisting>
+ <para>
+ Zmienna <varname>$kolejka</varname> b�dzie mia�a nast�puj�ce elementy:
+ <screen>
+<![CDATA[
+Array
+(
+ [0] => jab�ko
+ [1] => malina
+ [2] => pomara�cza
+ [3] => banan
+)
+]]>
+ </screen>
+ </para>
</example>
- </para>
- <para>
- Po wykonaniu powy�szego kodu zmienna <varname>$kolejka</varname> b�dzie
- zawiera�a 5 element�w: "p4", "p5", "p6", "p1", and "p3".
</para>
<para>
Patrz tak�e <function>array_shift</function>,
Index: phpdoc-pl/reference/array/functions/array-values.xml
diff -u phpdoc-pl/reference/array/functions/array-values.xml:1.2
phpdoc-pl/reference/array/functions/array-values.xml:1.3
--- phpdoc-pl/reference/array/functions/array-values.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-values.xml Sun May 12 16:31:48
+2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-values' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-values">
<refnamediv>
<refname>array_values</refname>
@@ -24,9 +22,21 @@
<programlisting role="php">
<![CDATA[
$tablica = array ("rozmiar" => "XL", "kolor" => "z�oty");
-array_values ($tablica); // zwraca array ("XL", "z�oty")
+print_r(array_values ($tablica));
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
++Array
+(
+ [0] => XL
+ [1] => z�oty
+)
+]]>
+ </screen>
+ </para>
</example>
</para>
<note>
Index: phpdoc-pl/reference/array/functions/array-walk.xml
diff -u phpdoc-pl/reference/array/functions/array-walk.xml:1.2
phpdoc-pl/reference/array/functions/array-walk.xml:1.3
--- phpdoc-pl/reference/array/functions/array-walk.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/array-walk.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array-walk' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array-walk">
<refnamediv>
<refname>array_walk</refname>
@@ -32,6 +30,7 @@
zawieraj�c� <function>str2lower</function> i przekaza� t� funkcj� jako
parametr.
</simpara>
+ ¬e.func-callback;
<simpara>
Je�li <parameter>funk</parameter> wymaga wi�cej ni� dw�ch lub trzech
parametr�w, zale�nie od parametru <parameter>dane</parameter>,
@@ -48,6 +47,10 @@
przypadku wszystkie zmiany dokonane przez t� funkcj� b�d� dokonywane
bezpo�rednio na tablicy.
</para>
+ <para>
+ Modyfikacja tablicy z wn�trza <parameter>funk</parameter> mo�e powodowa�
+ nieprzewidziane b��dy.
+ </para>
</note>
<note>
<para>
@@ -58,6 +61,12 @@
W PHP 4 konieczne jest wywo�anie <function>reset</function> poniewa�
<function>array_walk</function> nie resetuje tablicy domy�lnie.
</para>
+ <para>
+ U�ytkownicy nie mog� zmienia� samej tablicy z wn�trza funkcji zwrotnej,
+ to jest dodawa�/usuwa� elementy, usuwa� tablic� na kt�rej jest
+ wywo�ywana funkcja <function>array_walk</function>. Je�li ta tablica
+ zostanie zmieniona, funkcja mo�e si� zachowywa� w spos�b nieokre�lony.
+ </para>
</note>
<para>
<example>
@@ -66,21 +75,39 @@
<![CDATA[
$owoce = array ("d"=>"cytryna", "a"=>"pomara�cza", "b"=>"banan", "c"=>"jab�ko");
-function test_zmiana (&$element1, $klucz, $prefiks) {
+function test_zmiana (&$element1, $klucz, $prefiks) {
$element1 = "$prefiks: $element1";
}
function test_wyswietlanie ($element2, $klucz) {
echo "$klucz. $element2<br>\n";
}
-
+echo "Przed ...:\n";
array_walk ($owoce, 'test_wyswietlanie');
reset ($owoce);
array_walk ($owoce, 'test_zmiana', 'owoc');
+echo "... i po:\n";
reset ($owoce);
array_walk ($owoce, 'test_wyswietlanie');
]]>
</programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Przed ...:
+d. cytryna
+a. pomara�cza
+b. banan
+c. jab�ko
+... i po:
+d. owoc: cytryna
+a. owoc: pomara�cza
+b. owoc: banan
+c. owoc: jab�ko
+]]>
+ </screen>
+ </para>
</example>
</para>
<simpara>
Index: phpdoc-pl/reference/array/functions/array.xml
diff -u phpdoc-pl/reference/array/functions/array.xml:1.2
phpdoc-pl/reference/array/functions/array.xml:1.3
--- phpdoc-pl/reference/array/functions/array.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/array.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'array' in en/ tree in rev 1.110 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.110 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.array">
<refnamediv>
<refname>array</refname>
@@ -67,7 +65,7 @@
wy�wietli:
<screen role="php">
<![CDATA[
-Array
+Array
(
[0] => 1
[1] => 1
@@ -100,7 +98,7 @@
wy�wietli:
<screen role="php">
<![CDATA[
-Array
+Array
(
[1] => 'Stycze�'
[2] => 'Luty'
@@ -112,7 +110,8 @@
</example>
</para>
<para>
- Patrz tak�e: <function>list</function>.
+ Patrz tak�e: <function>array_pad</function>, <function>list</function>
+ i <function>range</function>.
</para>
</refsect1>
</refentry>
Index: phpdoc-pl/reference/array/functions/arsort.xml
diff -u phpdoc-pl/reference/array/functions/arsort.xml:1.2
phpdoc-pl/reference/array/functions/arsort.xml:1.3
--- phpdoc-pl/reference/array/functions/arsort.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/arsort.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'arsort' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.arsort">
<refnamediv>
<refname>arsort</refname>
Index: phpdoc-pl/reference/array/functions/asort.xml
diff -u phpdoc-pl/reference/array/functions/asort.xml:1.2
phpdoc-pl/reference/array/functions/asort.xml:1.3
--- phpdoc-pl/reference/array/functions/asort.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/asort.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'asort' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.asort">
<refnamediv>
<refname>asort</refname>
Index: phpdoc-pl/reference/array/functions/compact.xml
diff -u phpdoc-pl/reference/array/functions/compact.xml:1.2
phpdoc-pl/reference/array/functions/compact.xml:1.3
--- phpdoc-pl/reference/array/functions/compact.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/compact.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'compact' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.compact">
<refnamediv>
<refname>compact</refname>
@@ -49,9 +47,17 @@
]]>
</programlisting>
<para>
- Po tym <varname>$wynik</varname> b�dzie zawiera� <literal>array
- ("wydarzenie" => "SIGGRAPH", "miasto" => "San Francisco",
- "stan" => "CA")</literal>.
+ Zmienna <varname>$wynik</varname> b�dzie zawiera�a:
+ <screen>
+<![CDATA[
++Array
+(
+ [wydarzenie] => SIGGRAPH
+ [miasto] => San Francisco
+ [stan] => CA
+)
+]]>
+ </screen>
</para>
</example>
</para>
Index: phpdoc-pl/reference/array/functions/count.xml
diff -u phpdoc-pl/reference/array/functions/count.xml:1.2
phpdoc-pl/reference/array/functions/count.xml:1.3
--- phpdoc-pl/reference/array/functions/count.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/count.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'count' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.count">
<refnamediv>
<refname>count</refname>
@@ -61,14 +59,14 @@
</para>
<note>
<para>
- Funkcja <function>sizeof</function> jest aliasem dla
- <function>count</function>.
+ Funkcja <function>sizeof</function> jest <link
+ linkend="aliases">aliasem</link> dla <function>count</function>.
</para>
</note>
<para>
- Patrz tak�e <function>sizeof</function>,
+ Patrz tak�e <function>is_array</function>,
<function>isset</function> i
- <function>is_array</function>.
+ <function>strlen</function>.
</para>
</refsect1>
</refentry>
Index: phpdoc-pl/reference/array/functions/current.xml
diff -u phpdoc-pl/reference/array/functions/current.xml:1.2
phpdoc-pl/reference/array/functions/current.xml:1.3
--- phpdoc-pl/reference/array/functions/current.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/current.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'current' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.current">
<refnamediv>
<refname>current</refname>
Index: phpdoc-pl/reference/array/functions/each.xml
diff -u phpdoc-pl/reference/array/functions/each.xml:1.2
phpdoc-pl/reference/array/functions/each.xml:1.3
--- phpdoc-pl/reference/array/functions/each.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/each.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'each' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.5 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.each">
<refnamediv>
<refname>each</refname>
@@ -97,7 +95,8 @@
<para>
Patrz tak�e <function>key</function>, <function>list</function>,
<function>current</function>, <function>reset</function>,
- <function>next</function> i <function>prev</function>.
+ <function>next</function>, <function>prev</function> i
+ <function>foreach</function>.
</para>
</refsect1>
</refentry>
Index: phpdoc-pl/reference/array/functions/end.xml
diff -u phpdoc-pl/reference/array/functions/end.xml:1.2
phpdoc-pl/reference/array/functions/end.xml:1.3
--- phpdoc-pl/reference/array/functions/end.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/end.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'end' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.5 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.end">
<refnamediv>
<refname>end</refname>
@@ -22,8 +20,24 @@
element.
</para>
<para>
+ <example>
+ <title>Prosty przyk�ad u�ycia funkcji <function>end</function></title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+
+ $owoce = array('jab�ko', 'banan', 'malina');
+
+ print end($owoce); // malina
+
+?>
+]]>
+ </programlisting>
+ </example>
+ </para>
+ <para>
Patrz tak�e <function>current</function>,
- <function>each</function>, <function>end</function>,
+ <function>each</function>,
<function>next</function> i <function>reset</function>.
</para>
</refsect1>
Index: phpdoc-pl/reference/array/functions/extract.xml
diff -u phpdoc-pl/reference/array/functions/extract.xml:1.2
phpdoc-pl/reference/array/functions/extract.xml:1.3
--- phpdoc-pl/reference/array/functions/extract.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/extract.xml Sun May 12 16:31:48 2002
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'extract' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.extract">
<refnamediv>
<refname>extract</refname>
<refpurpose>
- Importuj zmienne do tabeli symboli z tablicy
+ Importuj zmienne do bie��cej tabeli symboli z tablicy
</refpurpose>
</refnamediv>
<refsect1>
@@ -32,6 +30,11 @@
Od wersji 4.0.5 ta funkcja zwraca liczb� wyekstraktowanych zmiennych.
</para>
</note>
+ <note>
+ <para>
+ Sta�e EXTR_IF_EXISTS i EXTR_PREFIX_IF_EXISTS zosta�y dodane w PHP 4.2.0.
+ </para>
+ </note>
<para>
<function>extract</function> sprawdza ka�dy klucz aby sprawdzi�, czy
zawiera prawid�ow� nazw� zmiennej a tak�e czy istniej� kolizje z
@@ -83,6 +86,27 @@
</simpara>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>EXTR_IF_EXISTS</term>
+ <listitem>
+ <simpara>
+ Nadpisz tylko zmienn� ju� istniej�c� w bie��cej tablicy symboli. Jest
+ to przydatne do definiowania listy poprawnych zmiennych i ekstraktuj
+ tylko te zmienne kt�re zdefiniowano na przyk�ad w $_REQUEST. Flaga ta
+ zosta�a dodana w PHP 4.2.0.
+ </simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>EXTR_PREFIX_IF_EXISTS</term>
+ <listitem>
+ <simpara>
+ Przedrostek zostanie dodany tylko do zmiennych kt�rych odpowiedniki
+ bez przedrostka ju� istniej� w bie��cej tablicy symboli. Flaga ta
+ zosta�a dodana w PHP 4.2.0.
+ </simpara>
+ </listitem>
+ </varlistentry>
</variablelist>
</para>
<para>
@@ -92,9 +116,9 @@
<para>
Zauwa�, �e parametr <parameter>prefiks</parameter> jest wymagany tylko
je�li <parameter>typ_ekstrakcji</parameter> to EXTR_PREFIX_SAME,
- EXTR_PREFIX_ALL i EXTR_PREFIX_INVALID. Je�li nazwa zmiennej po dodaniu
- prefiksa nie jest prawid�ow� nazw� zmiennej, nie jest portowana do
- tablicy symboli.
+ EXTR_PREFIX_ALL, EXTR_PREFIX_INVALID lub EXTR_PREFIX_IF_EXISTS. Je�li
+ nazwa zmiennej po dodaniu prefiksu nie jest prawid�ow� nazw� zmiennej,
+ nie jest importowana do tablicy symboli.
</para>
<para>
<function>extract</function> zwraca liczb� zmiennych szcz�liwie
@@ -148,7 +172,8 @@
</para>
<para>
Musisz u�y� tablic asocjacyjnych. Tablica indeksowana liczbowo nie da
- �adnych efekt�w.
+ �adnych efekt�w, chyba �e zostanie u�yta flaga EXTR_PREFIX_ALL lub
+ EXTR_PREFIX_INVALID.
</para>
<para>
Patrz tak�e <function>compact</function>.
Index: phpdoc-pl/reference/array/functions/in-array.xml
diff -u phpdoc-pl/reference/array/functions/in-array.xml:1.2
phpdoc-pl/reference/array/functions/in-array.xml:1.3
--- phpdoc-pl/reference/array/functions/in-array.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/in-array.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'in-array' in en/ tree in rev 1.56 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.56 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.in-array">
<refnamediv>
<refname>in_array</refname>
@@ -28,6 +26,18 @@
parametru <parameter>ig�a</parameter> z tymi z parametru
<parameter>st�g_siana</parameter>.
</para>
+ <note>
+ <para>
+ Je�li <parameter>ig�a</parameter> jest ci�giem to por�wnywanie jest
+ dokonywane z uwzgl�dnieniem wielko�ci znak�w.
+ </para>
+ </note>
+ <note>
+ <para>
+ W wersjach PHP starszych ni� 4.2.0 <parameter>ig�a</parameter> nie mog�a
+ by� tablic�.
+ </para>
+ </note>
<para>
<example>
<title>Przyk�ad u�ycia <function>in_array</function></title>
@@ -37,8 +47,21 @@
if (in_array ("Irix", $os)) {
print "Znaleziono Irix";
}
+if (in_array ("mac", $os)) {
+ print "Znaleziono mac";
+}
]]>
</programlisting>
+ <para>
+ Drugi warunek nie zostaje spe�niony poniewa� funkcja
+ <function>in_array</function> uwzgl�dnia wielko�� znak�w, tak wi�c
+ powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
+Znaleziono Irix
+]]>
+ </screen>
+ </para>
</example>
</para>
<para>
@@ -56,9 +79,38 @@
if (in_array(1.13, $a, TRUE))
echo "1.13 znalezione ze �cis�ym sprawdzaniem\n";
?>
-// Wy�wietli to:
-
+]]>
+ </programlisting>
+ <para>
+ Powy�szy przyk�ad wy�wietli:
+ <screen>
+<![CDATA[
1.13 znalezione ze �cis�ym sprawdzaniem
+]]>
+ </screen>
+ </para>
+ </example>
+ </para>
+ <para>
+ <example>
+ <title><function>in_array</function> z tablic� jako ig�a</title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+$a = array(array('p', 'h'), array('p', 'r'), 'o');
+
+if (in_array(array ('p', 'h'), $a))
+ echo "znaleziono 'ph'\n";
+if (in_array(array ('f', 'i'), $a))
+ echo "nie znaleziono 'fi'\n";
+if (in_array('o', $a))
+ echo "znaleziono 'o'\n";
+?>
+
+// Wy�wietlone zostanie
+
+znaleziono 'ph'
+znaleziono 'o'
]]>
</programlisting>
</example>
Index: phpdoc-pl/reference/array/functions/key.xml
diff -u phpdoc-pl/reference/array/functions/key.xml:1.2
phpdoc-pl/reference/array/functions/key.xml:1.3
--- phpdoc-pl/reference/array/functions/key.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/key.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'key' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.key">
<refnamediv>
<refname>key</refname>
Index: phpdoc-pl/reference/array/functions/krsort.xml
diff -u phpdoc-pl/reference/array/functions/krsort.xml:1.2
phpdoc-pl/reference/array/functions/krsort.xml:1.3
--- phpdoc-pl/reference/array/functions/krsort.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/krsort.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'krsort' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.krsort">
<refnamediv>
<refname>krsort</refname>
@@ -37,16 +35,14 @@
Ten przyk�ad wy�wietli:
</para>
<para>
- <informalexample>
- <programlisting>
+ <screen>
<![CDATA[
d = cytryna
c = jab�ko
b = banan
a = pomara�cza
]]>
- </programlisting>
- </informalexample>
+ </screen>
</para>
<para>
Mo�esz zmodyfikowa� zachowanie sortowania przez u�ycie opcjonalnego
Index: phpdoc-pl/reference/array/functions/ksort.xml
diff -u phpdoc-pl/reference/array/functions/ksort.xml:1.2
phpdoc-pl/reference/array/functions/ksort.xml:1.3
--- phpdoc-pl/reference/array/functions/ksort.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/ksort.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'ksort' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.ksort">
<refnamediv>
<refname>ksort</refname>
@@ -36,16 +34,14 @@
Ten przyk�ad wy�wietli:
</para>
<para>
- <informalexample>
- <programlisting>
+ <screen>
<![CDATA[
a = pomara�cza
b = banan
c = jab�ko
d = cytryna
]]>
- </programlisting>
- </informalexample>
+ </screen>
</para>
<para>
Mo�esz zmodyfikowa� zachowanie sortowania przez u�ycie opcjonalnego
@@ -53,7 +49,8 @@
<function>sort</function>.
</para>
<simpara>
- Patrz tak�e <function>asort</function>, <function>arsort</function>,
+ Patrz tak�e <function>asort</function>, <function>arsort</function>,
+ <function>krsort</function>, <function>uksort</function>,
<function>sort</function>, <function>natsort</function> i
<function>rsort</function>.
</simpara>
Index: phpdoc-pl/reference/array/functions/list.xml
diff -u phpdoc-pl/reference/array/functions/list.xml:1.2
phpdoc-pl/reference/array/functions/list.xml:1.3
--- phpdoc-pl/reference/array/functions/list.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/list.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'list' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.list">
<refnamediv>
<refname>list</refname>
@@ -17,9 +15,43 @@
<methodparam
rep="repeat"><type>mixed</type><parameter>...</parameter></methodparam>
</methodsynopsis>
<para>
- Podobna do <function>array</function>, ale to nie jest na prawd� funkcja,
- ale sk�adnia j�zyka. Instrukcja <function>list</function> jest u�ywana do
- przypisywania listy zmiennych w jednej operacji.
+ Podobnie jak <function>array</function>, nie jest na prawd� funkcj�,
+ ale elementem sk�adni j�zyka. Instrukcja <function>list</function>
+ jest u�ywana do przypisywania listy zmiennych w jednej operacji.
+ </para>
+ <note>
+ <para>
+ <function>list</function> dzia�a tylko z tablicami o indeksach
+ liczbowych zak�adaj�c �e indeksy zaczynaj� si� od 0.
+ </para>
+ </note>
+ <para>
+ <example>
+ <title>Przyk�ady u�ycia <function>list</function></title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+
+$info = array('kawa', 'br�zowa', 'kofeina');
+
+// Listowanie wszystkich zmiennych
+list($nap�j, $kolor, $sk�adnik) = $info;
+print "$nap�j jest $kolor a $sk�adnik czyni j� wyj�tkow�.\n";
+
+// Listowanie niekt�rych element�w
+list($nap�j, , $sk�adnik) = $info;
+print "$nap�j zawiera $sk�adnik.\n";
+
+// Albo przeskoczmy od razu do trzeciego
+list( , , $sk�adnik) = $info;
+print "Potrzebna jest mi $sk�adnik!\n";
+
+?>
+]]>
+ </programlisting>
+ </example>
+ </para>
+ <para>
<example>
<title>Przyk�ad u�ycia <function>list</function></title>
<programlisting role="php">
@@ -32,10 +64,10 @@
<?php
-$wynik = mysql_query ($conn, "SELECT id, nazwisko, pensja FROM pracownicy");
+$wynik = mysql_query ("SELECT id, nazwisko, pensja FROM pracownicy", $conn);
while (list ($id, $nazwisko, $pensja) = mysql_fetch_row ($wynik)) {
print (" <tr>\n".
- " <td><a href=\"info.php3?id=$id\">$nazwisko</a></td>\n".
+ " <td><a href=\"info.php?id=$id\">$nazwisko</a></td>\n".
" <td>$pensja</td>\n".
" </tr>\n");
}
@@ -48,7 +80,8 @@
</example>
</para>
<para>
- Patrz tak�e <function>each</function> i <function>array</function>.
+ Patrz tak�e <function>each</function> <function>array</function> i
+ <function>extract</function>.
</para>
</refsect1>
</refentry>
Index: phpdoc-pl/reference/array/functions/natcasesort.xml
diff -u phpdoc-pl/reference/array/functions/natcasesort.xml:1.2
phpdoc-pl/reference/array/functions/natcasesort.xml:1.3
--- phpdoc-pl/reference/array/functions/natcasesort.xml:1.2 Wed Apr 17 03:16:07
2002
+++ phpdoc-pl/reference/array/functions/natcasesort.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'natcasesort' in en/ tree in rev 1.25 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.25 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.natcasesort">
<refnamediv>
<refname>natcasesort</refname>
Index: phpdoc-pl/reference/array/functions/natsort.xml
diff -u phpdoc-pl/reference/array/functions/natsort.xml:1.2
phpdoc-pl/reference/array/functions/natsort.xml:1.3
--- phpdoc-pl/reference/array/functions/natsort.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/natsort.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'natsort' in en/ tree in rev 1.25 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.25 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.natsort">
<refnamediv>
<refname>natsort</refname>
@@ -42,11 +40,10 @@
</example>
</para>
<para>
- Powy�szy kod wy�wietlni nast�puj�ce dane:
+ Powy�szy przyk�ad wy�wietli:
</para>
<para>
- <informalexample>
- <programlisting>
+ <screen>
<![CDATA[
Standardowe sortowanie
Array
@@ -66,8 +63,7 @@
[0] => img12.png
)
]]>
- </programlisting>
- </informalexample>
+ </screen>
Aby uzyska� wi�cej informacji zobacz stron� Martina Poola <ulink
url="&url.strnatcmp;">Natural Order String Comparison</ulink>.
</para>
Index: phpdoc-pl/reference/array/functions/next.xml
diff -u phpdoc-pl/reference/array/functions/next.xml:1.2
phpdoc-pl/reference/array/functions/next.xml:1.3
--- phpdoc-pl/reference/array/functions/next.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/next.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'next' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.next">
<refnamediv>
<refname>next</refname>
Index: phpdoc-pl/reference/array/functions/pos.xml
diff -u phpdoc-pl/reference/array/functions/pos.xml:1.2
phpdoc-pl/reference/array/functions/pos.xml:1.3
--- phpdoc-pl/reference/array/functions/pos.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/pos.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'pos' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.pos">
<refnamediv>
<refname>pos</refname>
@@ -15,7 +13,8 @@
<methodparam><type>array</type><parameter>tablica</parameter></methodparam>
</methodsynopsis>
<simpara>
- Jest to alias dla funkcji <function>current</function>.
+ Jest to <link linkend="aliases">alias</link> dla funkcji
+ <function>current</function>.
</simpara>
<para>
Patrz tak�e <function>end</function>, <function>next</function>,
Index: phpdoc-pl/reference/array/functions/prev.xml
diff -u phpdoc-pl/reference/array/functions/prev.xml:1.2
phpdoc-pl/reference/array/functions/prev.xml:1.3
--- phpdoc-pl/reference/array/functions/prev.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/prev.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'prev' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.prev">
<refnamediv>
<refname>prev</refname>
Index: phpdoc-pl/reference/array/functions/range.xml
diff -u phpdoc-pl/reference/array/functions/range.xml:1.2
phpdoc-pl/reference/array/functions/range.xml:1.3
--- phpdoc-pl/reference/array/functions/range.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/range.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'range' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.range">
<refnamediv>
<refname>range</refname>
@@ -21,9 +19,10 @@
<function>range</function> zwraca tablic� element�w od
<parameter>dolny</parameter> do <parameter>g�rny</parameter>, w��cznie.
Je�li dolny > g�rny, to sekwencja b�dzie od g�rnego do dolnego.
- <example>
- <title>Przyk�ady u�ycia <function>range</function></title>
- <programlisting role="php">
+ </para>
+ <example>
+ <title>Przyk�ady u�ycia <function>range</function></title>
+ <programlisting role="php">
<![CDATA[
foreach(range(0, 9) as $liczba) {
echo $liczba;
@@ -35,15 +34,31 @@
echo $litera;
}
]]>
- </programlisting>
- </example>
- </para>
+ </programlisting>
+ </example>
<note>
<para>
Do wersji 4.1.0, funkcja <function>range</function> generowa�a tylko
rosn�ce tablice liczbowe. Obs�uga dla sekwencji znakowych i tablic
malej�cych zosta�a dodana w 4.1.0.
</para>
+ <example>
+ <title>Symulowanie sekwencji malej�cych i znakowych</title>
+ <programlisting role="php">
+<![CDATA[
+# do odwr�cenia kolejno�ci sekwencji mo�na u�y� array_reverse
+foreach(array_reverse(range(0,9)) as $liczba) {
+ echo $liczba;
+}
+
+# funkcja array_map() mo�e by� u�yta do zamiany liczb ca�kowitych na znaki
+# u�ywaj�c chr()
+foreach(array_map('chr', range(ord('a'),ord('z'))) as $znak){
+ echo $znak;
+}
+]]>
+ </programlisting>
+ </example>
</note>
<para>
Patrz tak�e <function>shuffle</function> aby zobaczy� inny przyk�ad
Index: phpdoc-pl/reference/array/functions/reset.xml
diff -u phpdoc-pl/reference/array/functions/reset.xml:1.2
phpdoc-pl/reference/array/functions/reset.xml:1.3
--- phpdoc-pl/reference/array/functions/reset.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/reset.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'reset' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.reset">
<refnamediv>
<refname>reset</refname>
Index: phpdoc-pl/reference/array/functions/rsort.xml
diff -u phpdoc-pl/reference/array/functions/rsort.xml:1.2
phpdoc-pl/reference/array/functions/rsort.xml:1.3
--- phpdoc-pl/reference/array/functions/rsort.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/rsort.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'rsort' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.rsort">
<refnamediv>
<refname>rsort</refname>
@@ -36,16 +34,14 @@
Ten przyk�ad wy�wietli:
</para>
<para>
- <informalexample>
- <programlisting>
+ <screen>
<![CDATA[
0 = pomara�cza
1 = cytryna
2 = banan
3 = jab�ko
]]>
- </programlisting>
- </informalexample>
+ </screen>
</para>
<para>
Owoce zosta�y posortowane w odwrotnym porz�dku alfabetycznym.
Index: phpdoc-pl/reference/array/functions/shuffle.xml
diff -u phpdoc-pl/reference/array/functions/shuffle.xml:1.2
phpdoc-pl/reference/array/functions/shuffle.xml:1.3
--- phpdoc-pl/reference/array/functions/shuffle.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/shuffle.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'shuffle' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.shuffle">
<refnamediv>
<refname>shuffle</refname>
Index: phpdoc-pl/reference/array/functions/sizeof.xml
diff -u phpdoc-pl/reference/array/functions/sizeof.xml:1.2
phpdoc-pl/reference/array/functions/sizeof.xml:1.3
--- phpdoc-pl/reference/array/functions/sizeof.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/sizeof.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'sizeof' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.sizeof">
<refnamediv>
<refname>sizeof</refname>
Index: phpdoc-pl/reference/array/functions/sort.xml
diff -u phpdoc-pl/reference/array/functions/sort.xml:1.2
phpdoc-pl/reference/array/functions/sort.xml:1.3
--- phpdoc-pl/reference/array/functions/sort.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/sort.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'sort' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.sort">
<refnamediv>
<refname>sort</refname>
@@ -39,16 +37,14 @@
Ten przyk�ad wy�wietli:
</para>
<para>
- <informalexample>
- <programlisting>
+ <screen>
<![CDATA[
owoce[0] = banan
owoce[1] = cytryna
owoce[2] = jab�ko
owoce[3] = pomara�cza
]]>
- </programlisting>
- </informalexample>
+ </screen>
</para>
<para>
Owoce zosta�y posortowane w porz�dku alfabetycznym.
Index: phpdoc-pl/reference/array/functions/uasort.xml
diff -u phpdoc-pl/reference/array/functions/uasort.xml:1.2
phpdoc-pl/reference/array/functions/uasort.xml:1.3
--- phpdoc-pl/reference/array/functions/uasort.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/uasort.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'uasort' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.uasort">
<refnamediv>
<refname>uasort</refname>
@@ -31,6 +29,7 @@
por�wnuj�cych.
</para>
</note>
+ ¬e.func-callback;
<para>
Patrz tak�e <function>usort</function>, <function>uksort</function>,
<function>sort</function>, <function>asort</function>,
Index: phpdoc-pl/reference/array/functions/uksort.xml
diff -u phpdoc-pl/reference/array/functions/uksort.xml:1.2
phpdoc-pl/reference/array/functions/uksort.xml:1.3
--- phpdoc-pl/reference/array/functions/uksort.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/uksort.xml Sun May 12 16:31:48 2002
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'uksort' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.uksort">
<refnamediv>
<refname>uksort</refname>
<refpurpose>
Sortuj tablic� wed�ug kluczy korzystaj�c ze zdefiniowanej przez
- u�ytkownika funcji por�wnuj�cej
+ u�ytkownika funkcji por�wnuj�cej
</refpurpose>
</refnamediv>
<refsect1>
@@ -19,16 +17,15 @@
<methodparam><type>function</type><parameter>funkcja_por</parameter></methodparam>
</methodsynopsis>
<para>
- Funkcja ta posortuje tablic� wed�u kluczy korzystaj�c z podanej przez
+ Funkcja ta posortuje tablic� wed�ug kluczy korzystaj�c z podanej przez
u�ytkownika funkcji por�wnuj�cej. Je�li chcesz posortowa� tablic� wed�ug
skomplikowanych kryteri�w, to powiniene� u�y� tej funkcji.
</para>
- <para>
- <example>
- <title>Przyk�ad u�ycia <function>uksort</function></title>
- <programlisting role="php">
+ <example>
+ <title>Przyk�ad u�ycia <function>uksort</function></title>
+ <programlisting role="php">
<![CDATA[
-function cmp ($a, $b) {
+function cmp ($a, $b) {
if ($a == $b) return 0;
return ($a > $b) ? -1 : 1;
}
@@ -41,24 +38,22 @@
echo "$key: $value\n";
}
]]>
- </programlisting>
- </example>
- </para>
+ </programlisting>
+ </example>
<para>
Ten przyk�ad wy�wietli:
</para>
<para>
- <informalexample>
- <programlisting>
+ <screen>
<![CDATA[
20: dwadzie�cia
10: dziesi��
4: cztery
3: trzy
]]>
- </programlisting>
- </informalexample>
+ </screen>
</para>
+ ¬e.func-callback;
<para>
Patrz tak�e <function>usort</function>, <function>uasort</function>,
<function>sort</function>, <function>asort</function>,
Index: phpdoc-pl/reference/array/functions/usort.xml
diff -u phpdoc-pl/reference/array/functions/usort.xml:1.2
phpdoc-pl/reference/array/functions/usort.xml:1.3
--- phpdoc-pl/reference/array/functions/usort.xml:1.2 Wed Apr 17 03:16:07 2002
+++ phpdoc-pl/reference/array/functions/usort.xml Sun May 12 16:31:48 2002
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="iso-8859-2"?>
-<!-- splitted from ./pl/functions/array.xml, last change in rev 1.1 -->
-<!-- last change to 'usort' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.2 Maintainer: leszek Status: ready -->
-<!-- OLD-Revision: 1.130/EN.1.2 -->
+<!-- EN-Revision: 1.4 Maintainer: leszek Status: ready -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.usort">
<refnamediv>
<refname>usort</refname>
@@ -30,15 +28,11 @@
kolejno�� wyst�powania w posortowanej tablicy pozostaje niezdefiniowany.
</para>
<para>
- Istenieje tak�e mo�liwo�� u�ycia funkcji sk�adowej obiektu jako funkcji
- por�wnuj�cej. Zobacz przyk�ad nr 3 poni�ej.
- </para>
- <para>
<example>
<title>Przyk�ad u�ycia <function>usort</function></title>
<programlisting role="php">
<![CDATA[
-function cmp ($a, $b) {
+function cmp ($a, $b) {
if ($a == $b) return 0;
return ($a > $b) ? -1 : 1;
}
@@ -58,8 +52,7 @@
Powy�szy przyk�ad wy�wietli:
</para>
<para>
- <informalexample>
- <programlisting>
+ <screen>
<![CDATA[
0: 6
1: 5
@@ -67,8 +60,7 @@
3: 2
4: 1
]]>
- </programlisting>
- </informalexample>
+ </screen>
</para>
<note>
<para>
@@ -86,16 +78,16 @@
<![CDATA[
function cmp ($a, $b) {
return strcmp($a["owoc"], $b["owoc"]);
-}
+}
-$owocs[0]["owoc"] = "cytryny";
-$owocs[1]["owoc"] = "jab�ka";
-$owocs[2]["owoc"] = "winogrona";
+$owoce[0]["owoc"] = "cytryny";
+$owoce[1]["owoc"] = "jab�ka";
+$owoce[2]["owoc"] = "winogrona";
-usort($owocs, "cmp");
+usort($owoce, "cmp");
-while (list ($key, $value) = each ($owocs)) {
- echo "\$owocs[$key]: " . $value["owoc"] . "\n";
+while (list ($key, $value) = each ($owoce)) {
+ echo "\$owoce[$key]: " . $value["owoc"] . "\n";
}
]]>
</programlisting>
@@ -109,16 +101,15 @@
Ten przyk�ad wy�wietli:
</para>
<para>
- <informalexample>
- <programlisting>
+ <screen>
<![CDATA[
-$fruits[0]: cytryny
-$fruits[1]: jab�ka
-$fruits[2]: winogrona
+$owoce[0]: cytryny
+$owoce[1]: jab�ka
+$owoce[2]: winogrona
]]>
- </programlisting>
- </informalexample>
+ </screen>
</para>
+ ¬e.func-callback;
<para>
<example>
<title>
@@ -162,15 +153,13 @@
Ten przyk�ad wy�wietli:
</para>
<para>
- <informalexample>
- <programlisting>
+ <screen>
<![CDATA[
b
c
d
]]>
- </programlisting>
- </informalexample>
+ </screen>
</para>
<para>
<warning>
