diff --git a/appendices/migration72/new-features.xml b/appendices/migration72/new-features.xml index 7c1d2b827753..5aa718689a8a 100644 --- a/appendices/migration72/new-features.xml +++ b/appendices/migration72/new-features.xml @@ -156,13 +156,13 @@ $db->quote('über', PDO::PARAM_STR | PDO::PARAM_STR_NATL); Additional emulated prepares debugging information for <link linkend="book.pdo">PDO</link> - + The PDOStatement::debugDumpParams method has been updated to include the SQL being sent to the DB, where the full, raw query - (including the replaced placeholders with their bounded values) will be + (including the replaced placeholders with their bound values) will be shown. This has been added to aid with debugging emulated prepares (and so it will only be available when emulated prepares are turned on). - + diff --git a/appendices/migration83/other-changes.xml b/appendices/migration83/other-changes.xml index b1d288e9d454..bad46fd7f9e2 100644 --- a/appendices/migration83/other-changes.xml +++ b/appendices/migration83/other-changes.xml @@ -266,7 +266,7 @@ mysqli_fetch_object now raises a ValueError instead of an Exception when the constructor_args argument is non empty with - the class not having constructor. + the class not having a constructor. @@ -300,7 +300,7 @@ pg_fetch_object now raises a ValueError instead of an Exception when the constructor_args argument is non empty with - the class not having constructor. + the class not having a constructor. diff --git a/reference/mysqli/book.xml b/reference/mysqli/book.xml index 76717366d4f0..0f93ca63fbed 100644 --- a/reference/mysqli/book.xml +++ b/reference/mysqli/book.xml @@ -29,10 +29,10 @@ xlink:href="&url.mysql.docs;">&url.mysql.docs;. - - Parts of this documentation included from MySQL manual with - permissions of Oracle Corporation. - + + Parts of this documentation were included from the MySQL manual with + permission of Oracle Corporation. + Examples use either the world diff --git a/reference/mysqli/configure.xml b/reference/mysqli/configure.xml index 95d42e1b1287..91a182c7c875 100644 --- a/reference/mysqli/configure.xml +++ b/reference/mysqli/configure.xml @@ -35,14 +35,15 @@ as your choice of client library for each extension. - - The MySQL Native Driver is the recommended client library option, as it + + The MySQL Native Driver is the recommended client library option, + and as of PHP 8.2.0 the only option, as it results in improved performance and gives access to features not available when using the MySQL Client Library. Refer to What is PHP's MySQL Native Driver? for a brief overview of the advantages of MySQL Native Driver. - + The /path/to/mysql_config represents the location of @@ -64,7 +65,14 @@ - 5.4.x and above + 8.2.0 and later + mysqlnd + + libmysqlclient is not supported + mysqlnd is the only option + + + 5.4.0 through 8.1.x mysqlnd @@ -88,15 +96,6 @@ - - Note that it is possible to freely mix MySQL extensions and client - libraries. For example, it is possible to enable the MySQL extension - to use the MySQL Client Library (libmysqlclient), while configuring the - mysqli extension to use the MySQL Native Driver. - However, all permutations of extension and client library are - possible. - -
diff --git a/reference/mysqli/constants.xml b/reference/mysqli/constants.xml index 9392b76db318..692252f96821 100644 --- a/reference/mysqli/constants.xml +++ b/reference/mysqli/constants.xml @@ -448,9 +448,9 @@ (int) - - Field is part of an multi-index. - + + Field is part of a multi-index. + diff --git a/reference/mysqli/ini.xml b/reference/mysqli/ini.xml index bb1c8faf1958..53da0143438e 100644 --- a/reference/mysqli/ini.xml +++ b/reference/mysqli/ini.xml @@ -147,10 +147,10 @@ int - - Maximum of persistent connections that can be made. Set to + + The maximum number of persistent connections that can be made. Set to 0 for unlimited. - + @@ -159,9 +159,9 @@ int - - The maximum number of MySQL connections per process. - + + The maximum number of connections per process. + diff --git a/reference/mysqli/mysqli/change-user.xml b/reference/mysqli/mysqli/change-user.xml index 8aa4dc397f8e..f1b38d297ee0 100644 --- a/reference/mysqli/mysqli/change-user.xml +++ b/reference/mysqli/mysqli/change-user.xml @@ -31,12 +31,12 @@ In comparison to mysqli::connect, this method will not disconnect the current connection if the new connection cannot be opened. - - In order to successfully change users a valid username and - password parameters must be provided and that user must have + + In order to successfully change users, a valid username and + password must be provided, and that user must have sufficient permissions to access the desired database. If for any reason authorization fails, the current user authentication will remain. - + @@ -172,13 +172,13 @@ Default database: &reftitle.notes; - + Using this command will always cause the current database connection to - behave as if was a completely new database connection, regardless of if + behave as if it was a completely new database connection, regardless of if the operation was completed successfully. This reset includes performing a rollback on any active transactions, closing all temporary tables, and unlocking all locked tables. - + diff --git a/reference/mysqli/mysqli/dump-debug-info.xml b/reference/mysqli/mysqli/dump-debug-info.xml index 055691dbb61d..8ed0f44c13af 100644 --- a/reference/mysqli/mysqli/dump-debug-info.xml +++ b/reference/mysqli/mysqli/dump-debug-info.xml @@ -19,11 +19,11 @@ boolmysqli_dump_debug_info mysqlimysql - - This function is designed to be executed by an user with the SUPER + + This function is designed to be executed by a user with the SUPER privilege and is used to dump debugging information into the log for the MySQL Server relating to the connection. - + diff --git a/reference/mysqli/mysqli/errno.xml b/reference/mysqli/mysqli/errno.xml index f2a2169a9e99..703c2f6a766e 100644 --- a/reference/mysqli/mysqli/errno.xml +++ b/reference/mysqli/mysqli/errno.xml @@ -33,10 +33,10 @@ &reftitle.returnvalues; - - An error code value for the last call, if it failed. zero means no error - occurred. - + + An error code value for the last call, if it failed. + 0 means no error occurred. + diff --git a/reference/mysqli/mysqli/init.xml b/reference/mysqli/mysqli/init.xml index 50492a3d584a..bd95347d4b01 100644 --- a/reference/mysqli/mysqli/init.xml +++ b/reference/mysqli/mysqli/init.xml @@ -25,11 +25,11 @@ mysqli_options and mysqli_real_connect. - - Any subsequent calls to any mysqli function (except mysqli_options + + Any subsequent call to any mysqli function (except mysqli_options and mysqli_ssl_set) - will fail until mysqli_real_connect was called. - + will fail until mysqli_real_connect is called. + diff --git a/reference/mysqli/mysqli/multi-query.xml b/reference/mysqli/mysqli/multi-query.xml index 6869ef2ffc75..7567c4cbeb51 100644 --- a/reference/mysqli/mysqli/multi-query.xml +++ b/reference/mysqli/mysqli/multi-query.xml @@ -28,7 +28,7 @@ Queries are sent in a single call to the database and processed sequentially. mysqli_multi_query waits for the first query to complete before returning control to PHP. In the meantime, the MySQL server - will continue processing the remaining queries asynchronously of PHP and make + will continue processing the remaining queries asynchronously from PHP and make the results available for fetching. diff --git a/reference/mysqli/mysqli/options.xml b/reference/mysqli/mysqli/options.xml index 74175e948ce1..750a1e8b6885 100644 --- a/reference/mysqli/mysqli/options.xml +++ b/reference/mysqli/mysqli/options.xml @@ -75,7 +75,7 @@ MYSQLI_INIT_COMMAND - Command to execute after when connecting to MySQL server + Command to execute after establishing a connection to the MySQL server MYSQLI_SET_CHARSET_NAME diff --git a/reference/mysqli/mysqli/ping.xml b/reference/mysqli/mysqli/ping.xml index e76d7ffe0856..ab108cf65e55 100644 --- a/reference/mysqli/mysqli/ping.xml +++ b/reference/mysqli/mysqli/ping.xml @@ -80,8 +80,8 @@ Both mysqli::ping and mysqli_ping are now deprecated. - The reconnect feature has not been available - as of PHP 8.2.0, making this function obsolete. + As of PHP 8.2.0, the reconnect feature is no longer + available, making this function obsolete. diff --git a/reference/mysqli/mysqli/poll.xml b/reference/mysqli/mysqli/poll.xml index 4db7ab027974..bfefb377142e 100644 --- a/reference/mysqli/mysqli/poll.xml +++ b/reference/mysqli/mysqli/poll.xml @@ -63,10 +63,10 @@ reject - - List of connections rejected because no asynchronous query - has been run on for which the function could poll results. - + + List of connections rejected because no pending asynchronous query exists + to poll. + diff --git a/reference/mysqli/mysqli/rollback.xml b/reference/mysqli/mysqli/rollback.xml index a80c39c39c20..a7445da369d3 100644 --- a/reference/mysqli/mysqli/rollback.xml +++ b/reference/mysqli/mysqli/rollback.xml @@ -22,9 +22,9 @@ intflags0 stringnullname&null; - - Rollbacks the current transaction for the database. - + + Rolls back the current transaction for the database. + diff --git a/reference/mysqli/mysqli/select-db.xml b/reference/mysqli/mysqli/select-db.xml index f1ed1189f4f7..ce20000abd6a 100644 --- a/reference/mysqli/mysqli/select-db.xml +++ b/reference/mysqli/mysqli/select-db.xml @@ -25,11 +25,11 @@ the database connection. - + This function should only be used to change the default database for the - connection. You can select the default database with 4th parameter in + connection. You can select the default database with the 4th parameter in mysqli_connect. - + diff --git a/reference/mysqli/mysqli/sqlstate.xml b/reference/mysqli/mysqli/sqlstate.xml index bce36d26d116..a564f0316274 100644 --- a/reference/mysqli/mysqli/sqlstate.xml +++ b/reference/mysqli/mysqli/sqlstate.xml @@ -23,10 +23,10 @@ &url.mysql.docs.error;. - - Note that not all MySQL errors are yet mapped to SQLSTATE's. + + Note that not all MySQL errors are yet mapped to SQLSTATEs. The value HY000 (general error) is used for unmapped errors. - + diff --git a/reference/mysqli/mysqli/stmt-init.xml b/reference/mysqli/mysqli/stmt-init.xml index 71339a74ed2b..fc5bfddc60ad 100644 --- a/reference/mysqli/mysqli/stmt-init.xml +++ b/reference/mysqli/mysqli/stmt-init.xml @@ -24,10 +24,10 @@ mysqli_stmt_prepare. - - Any subsequent calls to any mysqli_stmt function - will fail until mysqli_stmt_prepare was called. - + + Any subsequent call to any mysqli_stmt method + will fail until mysqli_stmt_prepare is called. + @@ -42,9 +42,9 @@ &reftitle.returnvalues; - - Returns an object. - + + Returns a mysqli_stmt object. + diff --git a/reference/mysqli/mysqli/use-result.xml b/reference/mysqli/mysqli/use-result.xml index b5e3145858bb..6bb2f58e1e13 100644 --- a/reference/mysqli/mysqli/use-result.xml +++ b/reference/mysqli/mysqli/use-result.xml @@ -31,9 +31,9 @@ from failing. - + The mysqli_use_result function does not transfer - the entire result set from the database and hence cannot be used functions + the entire result set from the database and hence cannot be used with functions such as mysqli_data_seek to move to a particular row within the set. To use this functionality, the result set must be stored using mysqli_store_result. One should not @@ -41,7 +41,7 @@ the client side is performed, since this will tie up the server and prevent other threads from updating any tables from which the data is being fetched. - + diff --git a/reference/mysqli/mysqli_driver.xml b/reference/mysqli/mysqli_driver.xml index 57e7f8cbe543..5e0803bf975a 100644 --- a/reference/mysqli/mysqli_driver.xml +++ b/reference/mysqli/mysqli_driver.xml @@ -9,11 +9,11 @@
&reftitle.intro; - + The mysqli_driver class is an instance of the monostate - pattern, i.e. there is only one driver which can be accessed though an arbitrary + pattern, i.e. there is only one driver which can be accessed through an arbitrary amount of mysqli_driver instances. - +
diff --git a/reference/mysqli/mysqli_result/fetch-fields.xml b/reference/mysqli/mysqli_result/fetch-fields.xml index fdbb1969f142..281a8b0cd188 100644 --- a/reference/mysqli/mysqli_result/fetch-fields.xml +++ b/reference/mysqli/mysqli_result/fetch-fields.xml @@ -89,7 +89,7 @@ length The width of the field in bytes. For string columns, - the length value varies on the connection character set. For example, + the length value depends on the connection character set. For example, if the character set is latin1, a single-byte character set, the length value for a SELECT 'abc' query is 3. If the character set is utf8mb4, a multibyte character diff --git a/reference/mysqli/mysqli_result/fetch-object.xml b/reference/mysqli/mysqli_result/fetch-object.xml index 1d4cf889a397..ddce8c7ce82d 100644 --- a/reference/mysqli/mysqli_result/fetch-object.xml +++ b/reference/mysqli/mysqli_result/fetch-object.xml @@ -84,10 +84,10 @@ &reftitle.errors; - + A ValueError is thrown when - the constructor_args is non-empty with the class not having constructor. - + the constructor_args is non-empty with the class not having a constructor. + @@ -105,7 +105,7 @@ 8.3.0 Now throws a ValueError exception when - the constructor_args is non-empty with the class not having constructor; + the constructor_args is non-empty with the class not having a constructor; previously an Exception was thrown. diff --git a/reference/mysqli/mysqli_result/num-rows.xml b/reference/mysqli/mysqli_result/num-rows.xml index 8741ea78ddf0..19dd962faf32 100644 --- a/reference/mysqli/mysqli_result/num-rows.xml +++ b/reference/mysqli/mysqli_result/num-rows.xml @@ -95,11 +95,11 @@ Result set has 239 rows. &reftitle.notes; - + In contrast to the mysqli_stmt_num_rows function, - this function doesn't have object-oriented method variant. + this function doesn't have an object-oriented method variant. In the object-oriented style, use the getter property. - + diff --git a/reference/mysqli/mysqli_sql_exception/getsqlstate.xml b/reference/mysqli/mysqli_sql_exception/getsqlstate.xml index c3dc7e77e196..bb8b9d7e4a28 100644 --- a/reference/mysqli/mysqli_sql_exception/getsqlstate.xml +++ b/reference/mysqli/mysqli_sql_exception/getsqlstate.xml @@ -19,10 +19,10 @@ &url.mysql.docs.error;. - - Note that not all MySQL errors are yet mapped to SQLSTATE's. + + Note that not all MySQL errors are yet mapped to SQLSTATEs. The value HY000 (general error) is used for unmapped errors. - + diff --git a/reference/mysqli/mysqli_stmt/affected-rows.xml b/reference/mysqli/mysqli_stmt/affected-rows.xml index ba6e8ce840fa..fde14ab89d93 100644 --- a/reference/mysqli/mysqli_stmt/affected-rows.xml +++ b/reference/mysqli/mysqli_stmt/affected-rows.xml @@ -18,12 +18,12 @@ intstringmysqli_stmt_affected_rows mysqli_stmtstatement - - Returns the number of rows affected by INSERT, - UPDATE, or DELETE query. + + Returns the number of rows affected by the INSERT, + UPDATE, or DELETE query. Works like mysqli_stmt_num_rows for SELECT statements. - + @@ -48,10 +48,10 @@ mysqli_stmt_store_result. - - If the number of affected rows is greater than maximum PHP int value, the + + If the number of affected rows is greater than the maximum PHP int value, the number of affected rows will be returned as a string value. - + diff --git a/reference/mysqli/mysqli_stmt/bind-result.xml b/reference/mysqli/mysqli_stmt/bind-result.xml index 0e808d785eee..e373d14a6d97 100644 --- a/reference/mysqli/mysqli_stmt/bind-result.xml +++ b/reference/mysqli/mysqli_stmt/bind-result.xml @@ -49,11 +49,11 @@ - - This function is useful for simple results. To retrieve iterable result + + This function is useful for simple results. To retrieve an iterable result set, or fetch each row as an array or object, use mysqli_stmt_get_result. - + diff --git a/reference/mysqli/mysqli_stmt/execute.xml b/reference/mysqli/mysqli_stmt/execute.xml index 75539d8041fd..af03273990a2 100644 --- a/reference/mysqli/mysqli_stmt/execute.xml +++ b/reference/mysqli/mysqli_stmt/execute.xml @@ -21,7 +21,7 @@ arraynullparams&null; - Executes previously prepared statement. The statement must be successfully + Executes a previously prepared statement. The statement must be successfully prepared prior to execution, using either the mysqli_prepare or mysqli_stmt_prepare function, or by passing the second diff --git a/reference/mysqli/mysqli_stmt/reset.xml b/reference/mysqli/mysqli_stmt/reset.xml index 480bb2f67ee7..59c67bfa1bdb 100644 --- a/reference/mysqli/mysqli_stmt/reset.xml +++ b/reference/mysqli/mysqli_stmt/reset.xml @@ -19,9 +19,9 @@ boolmysqli_stmt_reset mysqli_stmtstatement - - Resets a prepared statement on client and server to state after prepare. - + + Resets a prepared statement on client and server to the state after prepare. + It resets the statement on the server, data sent using mysqli_stmt_send_long_data, unbuffered result sets and current errors. It does not clear bindings or stored result sets. diff --git a/reference/mysqli/mysqli_stmt/send-long-data.xml b/reference/mysqli/mysqli_stmt/send-long-data.xml index a2a5d98bedf3..b4c2ef283557 100644 --- a/reference/mysqli/mysqli_stmt/send-long-data.xml +++ b/reference/mysqli/mysqli_stmt/send-long-data.xml @@ -22,12 +22,12 @@ intparam_num stringdata - - Allows to send parameter data to the server in pieces (or chunks), e.g. if the + + Allows sending parameter data to the server in pieces (or chunks), e.g. if the size of a blob exceeds the size of max_allowed_packet. This function can be called multiple times to send the parts of a character or binary data value for a column, which must be one of the TEXT or BLOB datatypes. - + diff --git a/reference/mysqli/mysqli_stmt/sqlstate.xml b/reference/mysqli/mysqli_stmt/sqlstate.xml index dcd931a087d5..e9b697cb149b 100644 --- a/reference/mysqli/mysqli_stmt/sqlstate.xml +++ b/reference/mysqli/mysqli_stmt/sqlstate.xml @@ -133,10 +133,10 @@ Error: 42S02. &reftitle.notes; - - Note that not all MySQL errors are yet mapped to SQLSTATE's. + + Note that not all MySQL errors are yet mapped to SQLSTATEs. The value HY000 (general error) is used for unmapped errors. - + diff --git a/reference/mysqli/overview.xml b/reference/mysqli/overview.xml index 4844f362978e..93218725bb4e 100644 --- a/reference/mysqli/overview.xml +++ b/reference/mysqli/overview.xml @@ -80,12 +80,12 @@ the MySQL server. - + Sometimes people use the terms connector and driver interchangeably, - this can be confusing. In the MySQL-related documentation the term + which can be confusing. In the MySQL-related documentation the term driver is reserved for software that provides the database-specific part of a connector package. - + What is an Extension? @@ -307,15 +307,15 @@ libmysqlclient for PHP applications. - - Both, the mysqli extension and the PDO MySQL driver can + + Both the mysqli extension and the PDO MySQL driver can each be individually configured to use either libmysqlclient or mysqlnd. As mysqlnd is designed specifically to be utilised in the PHP system it has numerous memory and speed enhancements over libmysqlclient. You are strongly encouraged to take advantage of these improvements. - + The MySQL Native Driver is implemented using the PHP extension diff --git a/reference/mysqli/quickstart.xml b/reference/mysqli/quickstart.xml index b38a2adcfa2e..643e4df62157 100644 --- a/reference/mysqli/quickstart.xml +++ b/reference/mysqli/quickstart.xml @@ -231,11 +231,11 @@ mysqli.default_socket=/tmp/mysql.sock name. If not given or empty, then the socket (pipe name) defaults to \\.\pipe\MySQL. - - If neither a Unix domain socket based not a Windows named pipe based connection + + If neither a Unix domain socket-based nor a Windows named pipe-based connection is to be established and the port parameter value is unset, the library will default to port 3306. - + The mysqlnd library and the MySQL Client Library (libmysqlclient) implement the same logic for determining defaults. @@ -287,15 +287,15 @@ mysqli.default_socket=/tmp/mysql.sock per PHP process can be restricted with mysqli.max_persistent. Please note that the web server may spawn many PHP processes. - - A common complain about persistent connections is that their state is + + A common complaint about persistent connections is that their state is not reset before reuse. For example, open and unfinished transactions are not automatically rolled back. But also, authorization changes which happened in the time between putting the connection into the pool and reusing it are not reflected. This may be seen as an unwanted side-effect. On the contrary, the name persistent may be understood as a promise that the state is persisted. - + The mysqli extension supports both interpretations of a persistent connection: state persisted, and state reset before reuse. The default is reset. @@ -949,9 +949,9 @@ array(2) { Client-side prepared statement emulation - - The API does not include emulation for client-side prepared statement emulation. - + + The API does not include support for client-side prepared statement emulation. + See also @@ -1063,12 +1063,12 @@ Hi! - + Application and framework developers may be able to provide a more convenient - API using a mix of session variables and databased catalog inspection. + API using a mix of session variables and database catalog inspection. However, please note the possible performance impact of a custom solution based on catalog inspection. - + Handling result sets diff --git a/reference/mysqli/summary.xml b/reference/mysqli/summary.xml index 5dd09c080fc8..16a7e4bdbfb9 100644 --- a/reference/mysqli/summary.xml +++ b/reference/mysqli/summary.xml @@ -203,7 +203,7 @@ mysqli::get_warnings mysqli_get_warnings N/A - NOT DOCUMENTED + Get result of SHOW WARNINGS mysqli::init @@ -393,7 +393,7 @@ $mysqli_stmt::field_count mysqli_stmt_field_count N/A - Returns the number of field in the given statement - not documented + Returns the number of fields in the statement $mysqli_stmt::insert_id @@ -405,19 +405,19 @@ $mysqli_stmt::num_rows mysqli_stmt_num_rows N/A - Return the number of rows in statements result set + Returns the number of rows in statement's result set $mysqli_stmt::param_count mysqli_stmt_param_count N/A - Returns the number of parameter for the given statement + Returns the number of parameters for the statement $mysqli_stmt::sqlstate mysqli_stmt_sqlstate N/A - Returns SQLSTATE error from previous statement operation + Returns SQLSTATE error from previous operation Methods @@ -426,7 +426,7 @@ mysqli_stmt::attr_get mysqli_stmt_attr_get N/A - Used to get the current value of a statement attribute + Used to get the current value of a statement's attribute mysqli_stmt::attr_set diff --git a/reference/mysqlinfo/set.xml b/reference/mysqlinfo/set.xml index 4d3a828e89ad..cbeb998edd61 100644 --- a/reference/mysqlinfo/set.xml +++ b/reference/mysqlinfo/set.xml @@ -127,7 +127,7 @@ Sometimes people use the terms connector and driver interchangeably, - this can be confusing. In the MySQL-related documentation the term + which can be confusing. In the MySQL-related documentation the term driver is reserved for software that provides the database-specific part of a connector package. diff --git a/reference/pdo/configure.xml b/reference/pdo/configure.xml index 6ed2a1b7a5cf..e6510fc046c0 100644 --- a/reference/pdo/configure.xml +++ b/reference/pdo/configure.xml @@ -9,14 +9,14 @@ Installing PDO on Unix systems - + PDO and the PDO_SQLITE driver - is enabled by default. You may need + are enabled by default. You may need to enable the PDO driver for your database of choice; consult the documentation for database-specific PDO drivers to find out more about that. - + When building PDO as a shared extension (not diff --git a/reference/pdo/connections.xml b/reference/pdo/connections.xml index 8b9291a65d58..6602616cc3b4 100644 --- a/reference/pdo/connections.xml +++ b/reference/pdo/connections.xml @@ -114,13 +114,13 @@ $dbh = new PDO('mysql:host=localhost;dbname=test', $user, $pass, array( - + The value of the PDO::ATTR_PERSISTENT option is converted to &boolean; (enable/disable persistent connections), unless it is a non-numeric - &string;, in which case it allows to use multiple persistent connection pools. + &string;, in which case it allows the use of multiple persistent connection pools. This is useful if different connections use incompatible settings, for instance, different values of PDO::MYSQL_ATTR_USE_BUFFERED_QUERY. - + If you wish to use persistent connections, you must set diff --git a/reference/pdo/constants.xml b/reference/pdo/constants.xml index 14d9a5d76247..cb881bd27218 100644 --- a/reference/pdo/constants.xml +++ b/reference/pdo/constants.xml @@ -425,7 +425,10 @@ - Sets the class name of which statements are returned as. + Sets the class name and constructor arguments for the extension of the + PDOStatement object. The first + element of the array is the class name, and the second element is an + array of constructor arguments. @@ -518,8 +521,9 @@ - Sets the default string parameter type, this can be one of PDO::PARAM_STR_NATL - and PDO::PARAM_STR_CHAR. + Sets the default string parameter type, which can be either + PDO::PARAM_STR_NATL + or PDO::PARAM_STR_CHAR. Available as of PHP 7.2.0. diff --git a/reference/pdo/ini.xml b/reference/pdo/ini.xml index a1595c81d8f0..84433dab5e24 100644 --- a/reference/pdo/ini.xml +++ b/reference/pdo/ini.xml @@ -39,7 +39,7 @@ - Defines DSN alias. See PDO::__construct for + Defines a DSN alias. See PDO::__construct for thorough explanation. diff --git a/reference/pdo/pdo/connect.xml b/reference/pdo/pdo/connect.xml index a6fb10aba576..52ecaf1adfb8 100644 --- a/reference/pdo/pdo/connect.xml +++ b/reference/pdo/pdo/connect.xml @@ -17,7 +17,7 @@ Creates an instance of a PDO subclass for the database being connected to, if it exists, - otherwise return a generic PDO instance. + otherwise returns a generic PDO instance. diff --git a/reference/pdo/pdo/errorcode.xml b/reference/pdo/pdo/errorcode.xml index 11f25cb13ae5..209f4a5a3047 100644 --- a/reference/pdo/pdo/errorcode.xml +++ b/reference/pdo/pdo/errorcode.xml @@ -23,17 +23,17 @@ &reftitle.returnvalues; - - Returns an SQLSTATE, a five characters alphanumeric identifier defined in + + Returns an SQLSTATE, a five-character alphanumeric identifier defined in the ANSI SQL-92 standard. Briefly, an SQLSTATE consists of a - two characters class value followed by a three characters subclass value. A + two-character class value followed by a three-character subclass value. A class value of 01 indicates a warning and is accompanied by a return code of SQL_SUCCESS_WITH_INFO. Class values other than '01', except for the class 'IM', indicate an error. The class 'IM' is specific to warnings and errors that derive from the implementation of PDO (or perhaps ODBC, if you're using the ODBC driver) itself. The subclass value '000' in any class indicates that there is no subclass for that SQLSTATE. - + PDO::errorCode only retrieves error codes for operations performed directly on the database handle. If you create a PDOStatement diff --git a/reference/pdo/pdo/errorinfo.xml b/reference/pdo/pdo/errorinfo.xml index eafed1f13170..54ebd11d8010 100644 --- a/reference/pdo/pdo/errorinfo.xml +++ b/reference/pdo/pdo/errorinfo.xml @@ -38,7 +38,7 @@ 0 - SQLSTATE error code (a five characters alphanumeric identifier defined + SQLSTATE error code (a five-character alphanumeric identifier defined in the ANSI SQL standard). diff --git a/reference/pdo/pdo/getavailabledrivers.xml b/reference/pdo/pdo/getavailabledrivers.xml index 2827a2ffeca1..fdaf1871b2f9 100644 --- a/reference/pdo/pdo/getavailabledrivers.xml +++ b/reference/pdo/pdo/getavailabledrivers.xml @@ -20,7 +20,7 @@ This function returns all currently available PDO drivers which can be used - in DSN parameter of + in the DSN parameter of PDO::__construct. diff --git a/reference/pdo/pdo/prepare.xml b/reference/pdo/pdo/prepare.xml index 006de0ced5d2..36d7b308a2c7 100644 --- a/reference/pdo/pdo/prepare.xml +++ b/reference/pdo/pdo/prepare.xml @@ -32,12 +32,12 @@ statement, unless emulation mode is on. - + Parameter markers can represent a complete data literal only. - Neither part of literal, nor keyword, nor identifier, nor whatever arbitrary query - part can be bound using parameters. For example, you cannot bind multiple values + Neither part of a literal, nor keyword, nor identifier, nor whatever arbitrary query + part can be bound using parameters. For example, you cannot bind multiple values to a single parameter in the IN() clause of an SQL statement. - + Calling PDO::prepare and @@ -113,10 +113,10 @@ PDOException (depending on error handling). - - Emulated prepared statements does not communicate with the database server + + Emulated prepared statements do not communicate with the database server so PDO::prepare does not check the statement. - + diff --git a/reference/pdo/pdo/quote.xml b/reference/pdo/pdo/quote.xml index 03b06c587143..80f70a0d7d79 100644 --- a/reference/pdo/pdo/quote.xml +++ b/reference/pdo/pdo/quote.xml @@ -60,7 +60,7 @@ type - Provides a hint to the type of data for drivers that have alternate quoting + Provides a hint as to the type of data for drivers that have alternate quoting styles. For example PDO_PARAM_LOB will tell the driver to escape binary data. diff --git a/reference/pdo/pdorow.xml b/reference/pdo/pdorow.xml index 8352c248b8c0..f0df279d31e1 100644 --- a/reference/pdo/pdorow.xml +++ b/reference/pdo/pdorow.xml @@ -16,13 +16,13 @@ Objects of this class cannot be instantiated and are not serializable. - + The PDORow object allows access to the returned data as if both PDO::FETCH_OBJ - and PDO::FETCH_BOTH mode was used. + and PDO::FETCH_BOTH mode were used. This means that the returned data can be accessed as object properties, and as an array both indexed by the column name and a column offset number. - + Accessing an undefined property returns &null; diff --git a/reference/pdo/pdostatement/debugdumpparams.xml b/reference/pdo/pdostatement/debugdumpparams.xml index 08ad6b8fa609..ddec44731185 100644 --- a/reference/pdo/pdostatement/debugdumpparams.xml +++ b/reference/pdo/pdostatement/debugdumpparams.xml @@ -63,7 +63,7 @@ PDOStatement::debugDumpParams now returns the SQL sent to the database, including the full, raw query (including the replaced placeholders with - their bounded values). Note, that this will only be available if emulated prepared + their bound values). Note, that this will only be available if emulated prepared statements are turned on. diff --git a/reference/pdo/pdostatement/errorinfo.xml b/reference/pdo/pdostatement/errorinfo.xml index 7285ffe76b76..fe5c50283d54 100644 --- a/reference/pdo/pdostatement/errorinfo.xml +++ b/reference/pdo/pdostatement/errorinfo.xml @@ -37,7 +37,7 @@ 0 - SQLSTATE error code (a five characters alphanumeric identifier defined + SQLSTATE error code (a five-character alphanumeric identifier defined in the ANSI SQL standard). diff --git a/reference/pdo/pdostatement/execute.xml b/reference/pdo/pdostatement/execute.xml index 1813c8ee2696..bb3dd3b470b2 100644 --- a/reference/pdo/pdostatement/execute.xml +++ b/reference/pdo/pdostatement/execute.xml @@ -171,10 +171,10 @@ $sth->execute($params); &reftitle.notes; - - Some drivers require to close - cursor before executing next statement. - + + Some drivers require the cursor to + be closed before executing the next statement. + diff --git a/reference/pdo/pdostatement/fetch.xml b/reference/pdo/pdostatement/fetch.xml index 04bf4d907770..73bf889ce273 100644 --- a/reference/pdo/pdostatement/fetch.xml +++ b/reference/pdo/pdostatement/fetch.xml @@ -71,12 +71,12 @@ of the requested class, mapping the columns of the result set to named properties in the class - + PDO::FETCH_LAZY: combines PDO::FETCH_BOTH and PDO::FETCH_OBJ, - and is returning a PDORow object - which is creating the object property names as they are accessed. - + and returns a PDORow object + which creates the object property names as they are accessed. + PDO::FETCH_NAMED: returns an array with the same form as PDO::FETCH_ASSOC, except that if there are diff --git a/reference/pdo/pdostatement/fetchall.xml b/reference/pdo/pdostatement/fetchall.xml index 9b088f08474d..613113459fc3 100644 --- a/reference/pdo/pdostatement/fetchall.xml +++ b/reference/pdo/pdostatement/fetchall.xml @@ -74,7 +74,7 @@ - The following are dynamic parameters that are depending on the fetch mode. + The following are dynamic parameters that depend on the fetch mode. They can't be used with named parameters. diff --git a/reference/pdo/pdostatement/getattribute.xml b/reference/pdo/pdostatement/getattribute.xml index ea458ce1c6b6..fccc3b509af5 100644 --- a/reference/pdo/pdostatement/getattribute.xml +++ b/reference/pdo/pdostatement/getattribute.xml @@ -17,10 +17,10 @@ Gets an attribute of the statement. Currently, no generic attributes exist but only driver specific: - PDO::ATTR_CURSOR_NAME + PDO::ATTR_CURSOR_NAME (Firebird and ODBC specific): - Get the name of cursor for UPDATE ... WHERE CURRENT OF. - + Get the name of the cursor for UPDATE ... WHERE CURRENT OF. + Note that driver specific attributes must not be used with other drivers. diff --git a/reference/pdo/pdostatement/rowcount.xml b/reference/pdo/pdostatement/rowcount.xml index f876f7c7acc7..9fa81475b2dd 100644 --- a/reference/pdo/pdostatement/rowcount.xml +++ b/reference/pdo/pdostatement/rowcount.xml @@ -28,11 +28,11 @@ on for portable applications. - - This method returns "0" (zero) with PostgreSQL driver when setting the + + This method returns "0" (zero) with the PostgreSQL driver when setting the PDO::ATTR_CURSOR statement attribute to PDO::CURSOR_SCROLL. - + diff --git a/reference/pdo/pdostatement/setattribute.xml b/reference/pdo/pdostatement/setattribute.xml index ef91fff828e0..bcd0989f898f 100644 --- a/reference/pdo/pdostatement/setattribute.xml +++ b/reference/pdo/pdostatement/setattribute.xml @@ -18,10 +18,10 @@ Sets an attribute on the statement. Currently, no generic attributes are set but only driver specific: - PDO::ATTR_CURSOR_NAME + PDO::ATTR_CURSOR_NAME (Firebird and ODBC specific): - Set the name of cursor for UPDATE ... WHERE CURRENT OF. - + Set the name of the cursor for UPDATE ... WHERE CURRENT OF. + Note that driver specific attributes must not be used with other drivers. diff --git a/reference/pgsql/functions/pg-fetch-object.xml b/reference/pgsql/functions/pg-fetch-object.xml index 7e82297e9dd4..f5b96aa9267e 100644 --- a/reference/pgsql/functions/pg-fetch-object.xml +++ b/reference/pgsql/functions/pg-fetch-object.xml @@ -87,10 +87,10 @@ &reftitle.errors; - + A ValueError is thrown when - the constructor_args is non-empty with the class not having constructor. - + the constructor_args is non-empty with the class not having a constructor. + @@ -108,7 +108,7 @@ 8.3.0 Now throws a ValueError exception when - the constructor_args is non-empty with the class not having constructor; + the constructor_args is non-empty with the class not having a constructor; previously an Exception was thrown. diff --git a/reference/tidy/tidy/parsefile.xml b/reference/tidy/tidy/parsefile.xml index 0ff971073526..842e30e08a7a 100644 --- a/reference/tidy/tidy/parsefile.xml +++ b/reference/tidy/tidy/parsefile.xml @@ -90,7 +90,7 @@ tidy::parseFile returns &true; on success. tidy_parse_file returns a new tidy instance on success. - Both, the method and the function return &false; on failure. + Both the method and the function return &false; on failure. diff --git a/reference/tidy/tidy/parsestring.xml b/reference/tidy/tidy/parsestring.xml index 8d70b7e995c4..03d05222b742 100644 --- a/reference/tidy/tidy/parsestring.xml +++ b/reference/tidy/tidy/parsestring.xml @@ -77,7 +77,7 @@ tidy::parseString returns &true; on success. tidy_parse_string returns a new tidy instance on success. - Both, the method and the function return &false; on failure. + Both the method and the function return &false; on failure.