Skip to content

Commit 0e6e229

Browse files
theodorejbpetk
authored andcommitted
Fix typos in UPGRADING and improve wording in a few places
Closes GH-4478
1 parent e1c80d8 commit 0e6e229

File tree

1 file changed

+33
-34
lines changed

1 file changed

+33
-34
lines changed

UPGRADING

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ PHP 7.4 UPGRADE NOTES
7272
- Openssl:
7373
. The openssl_random_pseudo_bytes() function will now throw an exception in
7474
error situations, similar to random_bytes(). In particular, an Error is
75-
thrown if the number of requested bytes is smaller *or equal* than zero,
76-
and an Exception is thrown is sufficient randomness cannot be gathered.
75+
thrown if the number of requested bytes is less than *or equal to* zero,
76+
and an Exception is thrown if sufficient randomness cannot be gathered.
7777
The $crypto_strong output argument is guaranteed to always be true if the
7878
function does not throw, so explicitly checking it is not necessary.
7979
RFC: http://php.net/manual/de/function.openssl-random-pseudo-bytes.php
@@ -161,7 +161,7 @@ PHP 7.4 UPGRADE NOTES
161161
public string $name;
162162
}
163163

164-
This will enforce that $user->id can only be assigned integer and
164+
This will enforce that $user->id can only be assigned integers and
165165
$user->name can only be assigned strings. For more information see the
166166
RFC: https://wiki.php.net/rfc/typed_properties_v2
167167

@@ -246,7 +246,7 @@ PHP 7.4 UPGRADE NOTES
246246

247247
imagefilter($im, IMG_FILTER_SCATTER, int $sub, int $plus, array $colors = []);
248248

249-
The $colors array can be populated with a set of indexed colors where to
249+
The $colors array can be populated with a set of indexed colors to
250250
apply the scatter pixel shifting on.
251251

252252
Note, the result of this filter is always random.
@@ -256,7 +256,7 @@ PHP 7.4 UPGRADE NOTES
256256
used by storage systems, such as iSCSI, SCTP, Btrfs and ext4.
257257

258258
- Mbstring:
259-
. Added mb_str_split() function, which provide the same functionality as
259+
. Added mb_str_split() function, which provides the same functionality as
260260
str_split(), but operating on code points rather than bytes.
261261
RFC: https://wiki.php.net/rfc/mb_str_split
262262

@@ -282,8 +282,8 @@ PHP 7.4 UPGRADE NOTES
282282
. PDOStatement::getColumnMeta() is now available
283283

284284
- PDO_SQLite:
285-
. PDOStatement::getAttribute(PDO::SQLITE_ATTR_READONLY_STATEMENT) allows to
286-
check whether this statement is read-only, i.e. whether it doesn't modify
285+
. PDOStatement::getAttribute(PDO::SQLITE_ATTR_READONLY_STATEMENT) allows
286+
checking whether the statement is read-only, i.e. if it doesn't modify
287287
the database.
288288
. PDO::setAttribute(PDO::SQLITE_ATTR_EXTENDED_RESULT_CODES, true) enables the
289289
use of SQLite3 extended result codes in errorInfo().
@@ -362,7 +362,7 @@ PHP 7.4 UPGRADE NOTES
362362
so is equivalent to calling a non-static method statically, which has been
363363
deprecated since PHP 7.0.
364364
. Unbinding $this of a non-static closure is deprecated.
365-
. Using "parent" inside a class without parent is deprecated, and will throw
365+
. Using "parent" inside a class without a parent is deprecated, and will throw
366366
a compile-time error in the future. Currently an error will only be
367367
generated if/when the parent is accessed at run-time.
368368
. The allow_url_include ini directive is deprecated. Enabling it will generate
@@ -373,7 +373,7 @@ PHP 7.4 UPGRADE NOTES
373373
deprecated.
374374

375375
- Filter:
376-
. FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZER_ADD_SLASHES
376+
. FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES
377377
instead.
378378

379379
- Mbstring:
@@ -418,7 +418,7 @@ PHP 7.4 UPGRADE NOTES
418418
. The money_format() function is deprecated. It can be replaced by the
419419
intl NumberFormatter functionality.
420420
. The ezmlm_hash() function is deprecated.
421-
. The restore_include_path() function is deprecated. It can be replace by
421+
. The restore_include_path() function is deprecated. It can be replaced by
422422
ini_restore('include_path').
423423
. Passing parameters to implode() in reverse order is deprecated, use
424424
implode($glue, $parts) instead of implode($parts, $glue).
@@ -455,7 +455,7 @@ PHP 7.4 UPGRADE NOTES
455455
ArrayObject.
456456

457457
- GD:
458-
. Added imagecreatefromtga() function, which allows to read images in TGA
458+
. Added imagecreatefromtga() function, which allows reading images in TGA
459459
format. TGA support is now also indicated by gd_info() and imagetypes().
460460
Note that TGA images are not recognized by imagecreatefromstring() and
461461
getimagesize().
@@ -467,22 +467,22 @@ PHP 7.4 UPGRADE NOTES
467467
See <https://github.com/php/php-src/pull/3624>.
468468

469469
- Pcntl:
470-
. Added bool pcntl_unshare(int flags) function which allows to dissociate
470+
. Added bool pcntl_unshare(int flags) function which allows dissociating
471471
parts of the process execution context which are currently being shared with
472472
other processes. Explicitly, it allows you to unshare the mount, IPC, UTS,
473473
network, PID, user and cgroup namespaces.
474474

475475
- SQLite3:
476-
. Added SQLite3Stmt::getSQL() to retrieve the SQL of the statement. If TRUE is
477-
passed as parameter, query parameters will be replaced in the return value
478-
by their currently bound value, if libsqlite ≥ 3.14 is used.
476+
. Added SQLite3Stmt::getSQL() to retrieve the SQL of the statement. If true is
477+
passed as $expanded argument, query parameters will be replaced in the
478+
return value by their currently bound value, if libsqlite ≥ 3.14 is used.
479479
. Added SQLite3::backup() to create database backups via the SQLite3 online
480480
backup API.
481481

482482
- Standard
483483
. bool sapi_windows_set_ctrl_handler(callable handler, [, bool add = true]) -
484484
set or remove a handler function upon receiving a CTRL event. The handler
485-
function is expected have a signature "function handler(int $event)".
485+
function is expected to have this signature: "function handler(int $event)".
486486
. bool sapi_windows_generate_ctrl_event(int type, int pid) - send a CTRL event
487487
to another process.
488488
. array password_algos() - return a complete list of all registered password
@@ -536,8 +536,8 @@ PHP 7.4 UPGRADE NOTES
536536
can now reliably be built as shared when using ./configure once more.
537537

538538
- Hash:
539-
. The hash extension cannot be disabled anymore and is always an integral
540-
part of any PHP build, similar to the date extension.
539+
. The hash extension cannot be disabled anymore and is always an integral part
540+
of any PHP build, similar to the date extension.
541541

542542
- Intl:
543543
. The Intl extension now requires at least ICU 50.1.
@@ -557,7 +557,7 @@ PHP 7.4 UPGRADE NOTES
557557

558558
- PDO:
559559
. It is now possibile to escape question marks in SQL queries to avoid them
560-
being interpreted as parameter placeholders. Writing "??" allows to send
560+
being interpreted as parameter placeholders. Writing "??" allows sending
561561
a single question mark to the database and e.g. use the PostgreSQL JSON key
562562
exists "?" operator. For more details see the RFC:
563563
https://wiki.php.net/rfc/pdo_escape_placeholders
@@ -573,9 +573,9 @@ PHP 7.4 UPGRADE NOTES
573573
. SimpleXMLElement now implements Countable.
574574

575575
- SQLite3:
576-
. The bundled libsqlite has been removed. To build the SQLite3 extension
577-
a system libsqlite3 ≥ 3.7.4 is now required. To build the PDO_SQLite
578-
extension a system libsqlite3 ≥ 3.5.0 is now required.
576+
. The bundled libsqlite has been removed. To build the SQLite3 extension a
577+
system libsqlite3 ≥ 3.7.4 is now required. To build the PDO_SQLite extension
578+
a system libsqlite3 ≥ 3.5.0 is now required.
579579
. (Un)serialization of SQLite3, SQLite3Stmt and SQLite3Result is now
580580
explicitly forbidden. Formerly, serialization of instances of these classes
581581
was possible, but unserialization yielded unusable objects.
@@ -652,9 +652,9 @@ PHP 7.4 UPGRADE NOTES
652652
- An inode number is delivered and is based on the NTFS file index.
653653
- The device number is now based on the volume serial number.
654654

655-
Note, that both values derived from the system and provided as is on 64-bit
656-
systems. On 32-bit system, these values might overflow the 32-bit integer in
657-
PHP, so they're a fake.
655+
Note that both values are derived from the system and provided as is on 64-bit
656+
systems. On 32-bit systems, these values might overflow the 32-bit integer in
657+
PHP, so they're fake.
658658

659659
- CTRL+C and CTRL+BREAK on console can be caught by setting a handler function
660660
with sapi_windows_set_ctrl_handler().
@@ -670,12 +670,11 @@ PHP 7.4 UPGRADE NOTES
670670
13. Migration to pkg-config
671671
========================================
672672

673-
A number of extensions have been migrated to exclusively use pkg-config for
674-
the detection of library dependencies. Generally, this means that instead of
675-
using --with-foo-dir=DIR or similar only --with-foo is used. Custom library
676-
paths can be specified either by adding additional directories to
677-
PKG_CONFIG_PATH or by explicitly specifying compilation options through
678-
FOO_CFLAGS and FOO_LIBS.
673+
A number of extensions have been migrated to exclusively use pkg-config for the
674+
detection of library dependencies. Generally, this means that instead of using
675+
--with-foo-dir=DIR or similar only --with-foo is used. Custom library paths can
676+
be specified either by adding additional directories to PKG_CONFIG_PATH or by
677+
explicitly specifying compilation options through FOO_CFLAGS and FOO_LIBS.
679678

680679
The following extensions and SAPIs are affected:
681680

@@ -713,8 +712,8 @@ The following extensions and SAPIs are affected:
713712
- Libxml:
714713
. --with-libxml-dir has been removed.
715714
. --enable-libxml becomes --with-libxml.
716-
. --with-libexpat-dir has been renamed to --with-expat and no longer
717-
accepts a directory.
715+
. --with-libexpat-dir has been renamed to --with-expat and no longer accepts a
716+
directory.
718717

719718
- LiteSpeed:
720719
. --with-litespeed becomes --enable-litespeed.
@@ -725,7 +724,7 @@ The following extensions and SAPIs are affected:
725724

726725
- ODBC:
727726
. --with-iodbc no longer accepts a directory.
728-
. --with-unixODBC without directory now use pkg-config (preferred).
727+
. --with-unixODBC without a directory now uses pkg-config (preferred).
729728
Directory is still accepted for old versions without libodbc.pc.
730729

731730
- OpenSSL:

0 commit comments

Comments
 (0)