Skip to content

Commit fd570af

Browse files
leonardolaraleonardolara
committed
sync with en rev
1 parent 1f73796 commit fd570af

File tree

6 files changed

+66
-10
lines changed

6 files changed

+66
-10
lines changed

‎reference/curl/functions/curl-escape.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: leonardolara Status: ready --><!-- CREDITS: andersonmamede,resolvendobug,leonardolara -->
2+
<!-- EN-Revision: 98ee565bfbea26d2a9c8f8a8707f0403603f719e Maintainer: leonardolara Status: ready --><!-- CREDITS: andersonmamede,resolvendobug,leonardolara -->
33
<refentry xml:id="function.curl-escape" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
44
<refnamediv>
55
<refname>curl_escape</refname>
@@ -66,6 +66,7 @@
6666
<programlisting role="php">
6767
<![CDATA[
6868
<?php
69+
6970
// Cria um identificador curl
7071
$ch = curl_init();
7172
@@ -77,10 +78,11 @@ $location = curl_escape($ch, 'Hofbräuhaus / München');
7778
$url = "http://example.com/add_location.php?location={$location}";
7879
// Resultado: http://example.com/add_location.php?location=Hofbr%C3%A4uhaus%20%2F%20M%C3%BCnchen
7980
80-
// Envia a requisição HTTP e fecha o identificador
81+
// Define as opções e envia a requisição HTTP
8182
curl_setopt($ch, CURLOPT_URL, $url);
8283
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
8384
curl_exec($ch);
85+
8486
?>
8587
]]>
8688
</programlisting>

‎reference/intl/collator/get-sort-key.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: bfc89e697fd685a7d15177f0b014eba70c5f9931 Maintainer: leonardolara Status: ready -->
2+
<!-- EN-Revision: 743f97dd06d53872e4f498141f57950afda34659 Maintainer: leonardolara Status: ready -->
33
<refentry xml:id="collator.getsortkey" xmlns="http://docbook.org/ns/docbook">
44
<refnamediv>
55
<refname>Collator::getSortKey</refname>
@@ -70,6 +70,7 @@
7070
<programlisting role="php">
7171
<![CDATA[
7272
<?php
73+
7374
$s1 = 'Hello';
7475
7576
$coll = collator_create('en_US');
@@ -92,6 +93,7 @@ echo bin2hex($res);
9293
<programlisting role="php">
9394
<![CDATA[
9495
<?php
96+
9597
$data = [
9698
[ 'name' => '🇳🇱 Derick Rethans', 'linked_account' => 'https://phpc.social/users/derickr' ],
9799
[ 'name' => 'Elephpant', 'linked_account' => 'https://phpc.social/phpc' ],
@@ -105,7 +107,7 @@ $col = new Collator('en');
105107
$col->setAttribute(Collator::CASE_FIRST, Collator::UPPER_FIRST);
106108
107109
/* Usa uma função definida pelo usuário com ordenação, removendo os emojis */
108-
*/
110+
109111
usort(
110112
$data,
111113
function($a, $b) use ($col) {

‎reference/pcntl/functions/pcntl-waitid.xml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: 8e31067f1aa8fa219cc1de11abb26ab81e5a2be0 Maintainer: leonardolara Status: ready -->
2+
<!-- EN-Revision: 4fbe0691312fbf85d67674f2e80c1abb5c36187f Maintainer: leonardolara Status: ready -->
33
<refentry xml:id="function.pcntl-waitid" xmlns="http://docbook.org/ns/docbook">
44
<refnamediv>
55
<refname>pcntl_waitid</refname>
@@ -320,6 +320,28 @@
320320
</table>
321321
</refsect1>
322322

323+
<refsect1 role="changelog">
324+
&reftitle.changelog;
325+
<informaltable>
326+
<tgroup cols="2">
327+
<thead>
328+
<row>
329+
<entry>&Version;</entry>
330+
<entry>&Description;</entry>
331+
</row>
332+
</thead>
333+
<tbody>
334+
<row>
335+
<entry>8.5.0</entry>
336+
<entry>
337+
<parameter>resource_usage</parameter> foi adicionado.
338+
</entry>
339+
</row>
340+
</tbody>
341+
</tgroup>
342+
</informaltable>
343+
</refsect1>
344+
323345
<refsect1 role="seealso">
324346
&reftitle.seealso;
325347
<para>

‎reference/phar/Phar.xml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: 18900b16944d69c38808c42d30f7150e83faec0d Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
2+
<!-- EN-Revision: 2b232242b1c4a99e689f79bd47735008c5009840 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
33
<reference xml:id="class.phar" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
44
<title>A classe Phar</title>
55
<titleabbrev>Phar</titleabbrev>
@@ -172,10 +172,31 @@
172172
Adicionado suporte para a extensão de timestamp Unix para arquivos baseados em Zip.
173173
</entry>
174174
</row>
175+
<row>
176+
<entry>8.0.0</entry>
177+
<entry>
178+
Metadados não são mais desserializados ao abrir o arquivo,
179+
esta atividade é adiada até que <methodname>Phar::getMetadata</methodname>
180+
seja chamado.
181+
</entry>
182+
</row>
175183
</tbody>
176184
</tgroup>
177185
</informaltable>
178186
</section>
187+
188+
<section role="notes">
189+
&reftitle.notes;
190+
<caution>
191+
<simpara>
192+
Anteriormente ao PHP 8.0.0, os metadados eram desserializados na abertura do
193+
arquivo. Isso poderia levar a vulnerabilidades de segurança.
194+
Iniciando com o PHP 8.0.0, os metadados são desserializados somente ao chamar
195+
<methodname>Phar::getMetadata</methodname>, que tem opções para restringir
196+
a desserialização por motivos de segurança.
197+
</simpara>
198+
</caution>
199+
</section>
179200
</partintro>
180201

181202
&reference.phar.entities.Phar;

‎reference/phar/Phar/getMetadata.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: f03806fcd8fe03a0501bd40b6e3939ff6589a1d2 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
2+
<!-- EN-Revision: 2b232242b1c4a99e689f79bd47735008c5009840 Maintainer: leonardolara Status: ready --><!-- CREDITS: leonardolara -->
33
<refentry xml:id="phar.getmetadata" xmlns="http://docbook.org/ns/docbook">
44
<refnamediv>
55
<refname>Phar::getMetadata</refname>
@@ -16,6 +16,15 @@
1616
Recupera metadados de arquivo. Metadados podem ser qualquer variável PHP que possa ser serializada.
1717
</para>
1818

19+
<caution>
20+
<simpara>
21+
Accessar os metadados iniciará a desserialização, que pode ativar
22+
a execução de código PHP arbitrário. Não use isso em arquivos
23+
phar não confiáveis ou configure o parâmetro <parameter>unserializeOptions</parameter>
24+
de maneira segura.
25+
</simpara>
26+
</caution>
27+
1928
</refsect1>
2029
<refsect1 role="parameters">
2130
&reftitle.parameters;

‎reference/stream/functions/stream-context-set-option.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: d5859815063bb6d3a0953c773920ce7425cf912e Maintainer: leonardolara Status: ready -->
2+
<!-- EN-Revision: e2d1e1f44c935cedfa0f98912d0b7c3b0166a087 Maintainer: leonardolara Status: ready -->
33
<refentry xml:id="function.stream-context-set-option" xmlns="http://docbook.org/ns/docbook">
44
<refnamediv>
55
<refname>stream_context_set_option</refname>
@@ -12,7 +12,7 @@
1212
<type>bool</type><methodname>stream_context_set_option</methodname>
1313
<methodparam><type>resource</type><parameter>stream_or_context</parameter></methodparam>
1414
<methodparam><type>string</type><parameter>wrapper</parameter></methodparam>
15-
<methodparam><type>string</type><parameter>option</parameter></methodparam>
15+
<methodparam><type>string</type><parameter>option_name</parameter></methodparam>
1616
<methodparam><type>mixed</type><parameter>value</parameter></methodparam>
1717
</methodsynopsis>
1818
<para>
@@ -53,7 +53,7 @@
5353
</listitem>
5454
</varlistentry>
5555
<varlistentry>
56-
<term><parameter>option</parameter></term>
56+
<term><parameter>option_name</parameter></term>
5757
<listitem>
5858
<para>
5959
O nome da opção.

0 commit comments

Comments
 (0)