com doc/fr: Apply commit a3a310ccc23af2710c307fb4c6535b123ae2223c: reference/pdo/pdo/construct.xml reference/pdo/pdostatement/bindcolumn.xml reference/pdo/pdostatement/fetch.xml reference/pdo/pdostatement/setfetchmode.xml

Commit:    9597c99cf90705cb51a059beba6ab8be4e4bd8a3
Author:    George Peter Banyard <[email protected]>         Wed, 17 Mar 2021 15:11:51 +0000
Parents:   50c68bd559a4e7d378e62ca36ef2b76d4867d675
Branches:  master

Link:       http://git.php.net/?p=doc/fr.git;a=commitdiff;h=9597c99cf90705cb51a059beba6ab8be4e4bd8a3

Log:
Apply commit a3a310ccc23af2710c307fb4c6535b123ae2223c

Remove try-catch from PDO examples

Changed paths:
  M  reference/pdo/pdo/construct.xml
  M  reference/pdo/pdostatement/bindcolumn.xml
  M  reference/pdo/pdostatement/fetch.xml
  M  reference/pdo/pdostatement/setfetchmode.xml


Diff:
diff --git a/reference/pdo/pdo/construct.xml b/reference/pdo/pdo/construct.xml
index 564064d4c6..116a4f7b2a 100644
--- a/reference/pdo/pdo/construct.xml
+++ b/reference/pdo/pdo/construct.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 7f569e1f175adf1fbd0e462eba8d6bc82214c939 Maintainer: yannick Status: ready -->
-<!-- Reviewed: yes -->
+<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: yannick Status: ready -->
+<!-- Reviewed: no -->
 
 <refentry xml:id="pdo.construct" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -121,7 +121,8 @@
   <para>
    <function>PDO::__construct</function> émet une exception 
    <classname>PDOException</classname> si la tentative
-   de connexion à la base de données échoue.
+   de connexion à la base de données échoue, peut importe le
+   <constant>PDO::ATTR_ERRMODE</constant> actuellement définit.
   </para>
  </refsect1>
 
@@ -137,11 +138,7 @@ $dsn = 'mysql:dbname=testdb;host=127.0.0.1';
 $user = 'dbuser';
 $password = 'dbpass';
 
-try {
-    $dbh = new PDO($dsn, $user, $password);
-} catch (PDOException $e) {
-    echo 'Connexion échouée : ' . $e->getMessage();
-}
+$dbh = new PDO($dsn, $user, $password);
 
 ?>
 ]]>
@@ -171,11 +168,7 @@ $dsn = 'uri:file:///usr/local/dbconnect';
 $user = '';
 $password = '';
 
-try {
-    $dbh = new PDO($dsn, $user, $password);
-} catch (PDOException $e) {
-    echo 'Connexion échouée : ' . $e->getMessage();
-}
+$dbh = new PDO($dsn, $user, $password);
 
 ?>
 ]]>
@@ -199,11 +192,7 @@ $dsn = 'mydb';
 $user = '';
 $password = '';
 
-try {
-    $dbh = new PDO($dsn, $user, $password);
-} catch (PDOException $e) {
-    echo 'Connexion échouée : ' . $e->getMessage();
-}
+$dbh = new PDO($dsn, $user, $password);
 
 ?>
 ]]>
diff --git a/reference/pdo/pdostatement/bindcolumn.xml b/reference/pdo/pdostatement/bindcolumn.xml
index f93f11fd3c..3ebef5cb60 100644
--- a/reference/pdo/pdostatement/bindcolumn.xml
+++ b/reference/pdo/pdostatement/bindcolumn.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 14af302c9c0e561fa6f9cdd956268758ba9a89c5 Maintainer: yannick Status: ready -->
-<!-- Reviewed: yes -->
+<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: yannick Status: ready -->
+<!-- Reviewed: no -->
 
 <refentry xml:id="pdostatement.bindcolumn" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -122,42 +122,32 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-function readData($dbh) {
-  $sql = 'SELECT nom, couleur, calories FROM fruit';
-  try {
-    $stmt = $dbh->prepare($sql);
-    $stmt->execute();
+$stmt = $dbh->prepare('SELECT name, colour, calories FROM fruit');
+$stmt->execute();
 
-    /* Lie par les numéros de colonnes */
-    $stmt->bindColumn(1, $nom);
-    $stmt->bindColumn(2, $couleur);
+/* Lie par les numéros de colonnes */
+$stmt->bindColumn(1, $name);
+$stmt->bindColumn(2, $colour);
 
-    /* Lie par les noms de colonnes */
-    $stmt->bindColumn('calories', $cals);
-
-    while ($row = $stmt->fetch(PDO::FETCH_BOUND)) {
-      $data = $nom . "\t" . $couleur . "\t" . $cals . "\n";
-      print $data;
-    }
-  }
-  catch (PDOException $e) {
-    print $e->getMessage();
-  }
+/* Lie par les noms de colonnes */
+$stmt->bindColumn('calories', $cals);
+while ($stmt->fetch(PDO::FETCH_BOUND)) {
+    print $name . "\t" . $colour . "\t" . $cals . "\n";
 }
 readData($dbh);
 ?>
 ]]>
     </programlisting>
-    &example.outputs;
+    &example.outputs.similar;
     <screen>
-  <![CDATA[
+<![CDATA[
 pomme   rouge     150
 banane  jaune  175
 kiwi    vert   75
 orange  orange  150
 mangue   rouge     200
 fraise      rouge     25
-  ]]>
+]]>
     </screen>
    </example>
   </para>
diff --git a/reference/pdo/pdostatement/fetch.xml b/reference/pdo/pdostatement/fetch.xml
index ae7e4d2f9e..f449dba2d4 100644
--- a/reference/pdo/pdostatement/fetch.xml
+++ b/reference/pdo/pdostatement/fetch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e440c79af15cf829549736b2a292b5f8f6887142 Maintainer: yannick Status: ready -->
-<!-- Reviewed: yes -->
+<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: yannick Status: ready -->
+<!-- Reviewed: no -->
 
 <refentry xml:id="pdostatement.fetch" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -221,35 +221,23 @@ PDO::FETCH_OBJ: Retourne la ligne suivante en tant qu'objet anonyme ayant les no
 <![CDATA[
 <?php
 function readDataForwards($dbh) {
-  $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY BET';
-  try {
+    $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY BET';
     $stmt = $dbh->prepare($sql, array(PDO::ATTR_CURSOR, PDO::CURSOR_SCROLL));
     $stmt->execute();
     while ($row = $stmt->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_NEXT)) {
-      $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n";
-      print $data;
+        $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n";
+        print $data;
     }
-    $stmt = null;
-  }
-  catch (PDOException $e) {
-    print $e->getMessage();
-  }
 }
 function readDataBackwards($dbh) {
-  $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY bet';
-  try {
+    $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY bet';
     $stmt = $dbh->prepare($sql, array(PDO::ATTR_CURSOR, PDO::CURSOR_SCROLL));
     $stmt->execute();
     $row = $stmt->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_LAST);
     do {
-      $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n";
-      print $data;
+        $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n";
+        print $data;
     } while ($row = $stmt->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_PRIOR));
-    $stmt = null;
-  }
-  catch (PDOException $e) {
-    print $e->getMessage();
-  }
 }
 
 print "Lecture en avant :\n";
diff --git a/reference/pdo/pdostatement/setfetchmode.xml b/reference/pdo/pdostatement/setfetchmode.xml
index 28d7f1bfd4..5c42422243 100755
--- a/reference/pdo/pdostatement/setfetchmode.xml
+++ b/reference/pdo/pdostatement/setfetchmode.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9267d8b70e8fa541c5d464e56f94fef7b1b1a849 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="pdostatement.setfetchmode" xmlns="http://docbook.org/ns/docbook">
@@ -106,21 +106,15 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-$sql = 'SELECT name, colour, calories FROM fruit';
-try {
-  $stmt = $dbh->query($sql);
-  $result = $stmt->setFetchMode(PDO::FETCH_NUM);
-  while ($row = $stmt->fetch()) {
+$stmt = $dbh->query('SELECT name, colour, calories FROM fruit');
+$stmt->setFetchMode(PDO::FETCH_NUM);
+foreach ($stmt as $row) {
     print $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n";
-  }
-}
-catch (PDOException $e) {
-  print $e->getMessage();
 }
 ?>
 ]]>
     </programlisting>
-    &example.outputs;
+    &example.outputs.similar;
     <screen>
 <![CDATA[
 apple   red     150
@@ -129,7 +123,6 @@ orange  orange  300
 kiwi    brown   75
 lemon   yellow  25
 pear    green   150
-watermelon      pink    90
 ]]>
     </screen>
    </example>