From e266c585154132ce120e42892fd93e918c83a5bd Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Tue, 7 Aug 2018 23:40:10 +0000 Subject: [PATCH] Fixes here and there; renamed or removed methods git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@345442 c90b9560-bf6c-de11-be94-00142212c4b1 --- ...twarningcount.xml => getwarningscount.xml} | 6 +- .../collectionfind/{skip.xml => offet.xml} | 16 ++-- .../collectionmodify/arraydelete.xml | 93 ------------------- .../mysql_xdevapi/collectionmodify/merge.xml | 83 ----------------- ...twarningcount.xml => getwarningscount.xml} | 8 +- .../result/getaffecteditemscount.xml | 74 --------------- ...twarningcount.xml => getwarningscount.xml} | 8 +- ...twarningcount.xml => getwarningscount.xml} | 8 +- ...twarningcount.xml => getwarningscount.xml} | 0 9 files changed, 23 insertions(+), 273 deletions(-) rename reference/mysql_xdevapi/mysql_xdevapi/baseresult/{getwarningcount.xml => getwarningscount.xml} (82%) rename reference/mysql_xdevapi/mysql_xdevapi/collectionfind/{skip.xml => offet.xml} (73%) delete mode 100644 reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/arraydelete.xml delete mode 100644 reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/merge.xml rename reference/mysql_xdevapi/mysql_xdevapi/docresult/{getwarningcount.xml => getwarningscount.xml} (74%) delete mode 100644 reference/mysql_xdevapi/mysql_xdevapi/result/getaffecteditemscount.xml rename reference/mysql_xdevapi/mysql_xdevapi/result/{getwarningcount.xml => getwarningscount.xml} (76%) rename reference/mysql_xdevapi/mysql_xdevapi/rowresult/{getwarningcount.xml => getwarningscount.xml} (75%) rename reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/{getwarningcount.xml => getwarningscount.xml} (100%) diff --git a/reference/mysql_xdevapi/mysql_xdevapi/baseresult/getwarningcount.xml b/reference/mysql_xdevapi/mysql_xdevapi/baseresult/getwarningscount.xml similarity index 82% rename from reference/mysql_xdevapi/mysql_xdevapi/baseresult/getwarningcount.xml rename to reference/mysql_xdevapi/mysql_xdevapi/baseresult/getwarningscount.xml index faca8b1d40..eae98deed9 100644 --- a/reference/mysql_xdevapi/mysql_xdevapi/baseresult/getwarningcount.xml +++ b/reference/mysql_xdevapi/mysql_xdevapi/baseresult/getwarningscount.xml @@ -1,16 +1,16 @@ - + - BaseResult::getWarningCount + BaseResult::getWarningsCount Fetch warning count from last operation &reftitle.description; - abstract public integermysql_xdevapi\BaseResult::getWarningCount + abstract public integermysql_xdevapi\BaseResult::getWarningsCount diff --git a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/skip.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/offet.xml similarity index 73% rename from reference/mysql_xdevapi/mysql_xdevapi/collectionfind/skip.xml rename to reference/mysql_xdevapi/mysql_xdevapi/collectionfind/offet.xml index df0289e5a2..3a84402526 100644 --- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/skip.xml +++ b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/offet.xml @@ -1,21 +1,21 @@ - + - CollectionFind::skip + CollectionFind::offset Skip given number of elements to be returned &reftitle.description; - public mysql_xdevapi\CollectionFindmysql_xdevapi\CollectionFind::skip + public mysql_xdevapi\CollectionFindmysql_xdevapi\CollectionFind::offset integerposition For the result set of a find operation, skip the first N elements that would be returned by the find operation. - If the amout of element skipped is bigger than the size of the result set then the find operation will return an empty set. + If the amount of element skipped is bigger than the size of the result set then the find operation will return an empty set. @@ -44,7 +44,7 @@ &reftitle.examples; - <function>mysql_xdevapi\CollectionFind::skip</function> example + <function>mysql_xdevapi\CollectionFind::offset</function> example find('job like \'Programmatore\'')->skip(3)->execute(); +$res = $coll->find('job like \'Programmatore\'')->offset(3)->execute(); ?> ]]> - - + + diff --git a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/arraydelete.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/arraydelete.xml deleted file mode 100644 index a55bcd2f13..0000000000 --- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/arraydelete.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - CollectionModify::arrayDelete - Delete element - - - - &reftitle.description; - - public mysql_xdevapi\CollectionModifymysql_xdevapi\CollectionModify::arrayDelete - stringcollection_field - - - Delete a document field element. If the deleted element is the only - element then the field is removed. - - - - - - &reftitle.parameters; - - - collection_field - - - The format of this parameter is FIELD_NAME[ INDEX ] where FIELD_NAME is the name of the document - field to remove the element from, and INDEX is the INDEX of the element within the field. - - - The INDEX field is zero based, so the leftmost item from the array has an index of 0. - - - - - - - - &reftitle.returnvalues; - - A CollectionModify object that can be used to execute the command, or to add further operations - - - - - &reftitle.examples; - - <function>mysql_xdevapi\CollectionModify::arrayDelete</function> example - -modify("name in ('Riccardo', 'Carlo')")->arrayDelete('job[0]')->execute(); - -// Remove the second element from the documents which `age` field is greater than 30 -$coll->modify('age > 30')->arrayDelete('job[1]')->execute(); - -?> -]]> - - - - - - - - diff --git a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/merge.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/merge.xml deleted file mode 100644 index b50b6de0b0..0000000000 --- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/merge.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - CollectionModify::merge - Merge attributes to document - - - - &reftitle.description; - - public mysql_xdevapi\CollectionModifymysql_xdevapi\CollectionModify::merge - stringdocument - - - Adds attributes taken from a document into the documents in a collection. - - - &warn.undocumented.func; - - - - - &reftitle.parameters; - - - document - - - The document with attributes to merge. - - - - - - - - &reftitle.returnvalues; - - A CollectionModify object. - - - - - &reftitle.examples; - - <function>mysql_xdevapi\CollectionModify::merge</function> example - -modify("Married like 'NO'")->merge("{'Divorced' : 'NO', 'Vegan' : 'YES'}")->execute(); - -?> -]]> - - - - - - - - diff --git a/reference/mysql_xdevapi/mysql_xdevapi/docresult/getwarningcount.xml b/reference/mysql_xdevapi/mysql_xdevapi/docresult/getwarningscount.xml similarity index 74% rename from reference/mysql_xdevapi/mysql_xdevapi/docresult/getwarningcount.xml rename to reference/mysql_xdevapi/mysql_xdevapi/docresult/getwarningscount.xml index f6800d7ceb..b45f62d98a 100644 --- a/reference/mysql_xdevapi/mysql_xdevapi/docresult/getwarningcount.xml +++ b/reference/mysql_xdevapi/mysql_xdevapi/docresult/getwarningscount.xml @@ -1,16 +1,16 @@ - + - DocResult::getWarningCount + DocResult::getWarningsCount Get warning count from last operation &reftitle.description; - public integermysql_xdevapi\DocResult::getWarningCount + public integermysql_xdevapi\DocResult::getWarningsCount @@ -36,7 +36,7 @@ &reftitle.examples; - <function>mysql_xdevapi\DocResult::getWarningCount</function> example + <function>mysql_xdevapi\DocResult::getWarningsCount</function> example - - - - - Result::getAffectedItemsCount - Get affected row count - - - - &reftitle.description; - - public intmysql_xdevapi\Result::getAffectedItemsCount - - - - - - - &warn.undocumented.func; - - - - - &reftitle.parameters; - &no.function.parameters; - - - - &reftitle.returnvalues; - - - - - - - &reftitle.examples; - - <function>mysql_xdevapi\Result::getAffectedItemsCount</function> example - - -]]> - - - - - - - - diff --git a/reference/mysql_xdevapi/mysql_xdevapi/result/getwarningcount.xml b/reference/mysql_xdevapi/mysql_xdevapi/result/getwarningscount.xml similarity index 76% rename from reference/mysql_xdevapi/mysql_xdevapi/result/getwarningcount.xml rename to reference/mysql_xdevapi/mysql_xdevapi/result/getwarningscount.xml index 370152f405..677489c6c9 100644 --- a/reference/mysql_xdevapi/mysql_xdevapi/result/getwarningcount.xml +++ b/reference/mysql_xdevapi/mysql_xdevapi/result/getwarningscount.xml @@ -1,16 +1,16 @@ - + - Result::getWarningCount + Result::getWarningsCount Get warning count from last operation &reftitle.description; - public integermysql_xdevapi\Result::getWarningCount + public integermysql_xdevapi\Result::getWarningsCount @@ -36,7 +36,7 @@ &reftitle.examples; - <function>mysql_xdevapi\Result::getWarningCount</function> example + <function>mysql_xdevapi\Result::getWarningsCount</function> example - + - RowResult::getWarningCount + RowResult::getWarningsCount Get warning count from last operation &reftitle.description; - public integermysql_xdevapi\RowResult::getWarningCount + public integermysql_xdevapi\RowResult::getWarningsCount @@ -36,7 +36,7 @@ &reftitle.examples; - <function>mysql_xdevapi\RowResult::getWarningCount</function> example + <function>mysql_xdevapi\RowResult::getWarningsCount</function> example