[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-doc-cvs
Subject:    [DOC-CVS] =?utf-8?q?svn:_/phpdoc/en/trunk/reference/json/_constants.xml?=
From:       Christoph_Michael_Becker <cmb () php ! net>
Date:       2018-09-29 12:11:06
Message-ID: svn-cmb-1538223066-345719-1852135921 () svn ! php ! net
[Download RAW message or body]

cmb                                      Sat, 29 Sep 2018 12:11:06 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=345719

Log:
Document JSON_THROW_ON_ERROR only once

We introduce a new "section" for options of json_encode() and json_decode().

Changed paths:
    U   phpdoc/en/trunk/reference/json/constants.xml

Modified: phpdoc/en/trunk/reference/json/constants.xml
===================================================================
--- phpdoc/en/trunk/reference/json/constants.xml	2018-09-29 12:04:39 UTC (rev 345718)
+++ phpdoc/en/trunk/reference/json/constants.xml	2018-09-29 12:11:06 UTC (rev 345719)
@@ -188,22 +188,6 @@
     </simpara>
    </listitem>
   </varlistentry>
-  <varlistentry xml:id="constant.json-throw-on-error">
-   <term>
-    <constant>JSON_THROW_ON_ERROR</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Throws <classname>JsonException</classname> if an error occurs instead
-     of setting the global error state that is retrieved with
-     <function>json_last_error</function>.
-     <constant>JSON_PARTIAL_OUTPUT_ON_ERROR</constant> takes precedence over
-     <constant>JSON_THROW_ON_ERROR</constant>. Available since PHP 7.3.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-
  </variablelist>

  <para>
@@ -361,6 +345,13 @@
     </simpara>
    </listitem>
   </varlistentry>
+ </variablelist>
+
+ <para>
+  The following constants can be combined to form options for
+  <function>json_decode</function> and <function>json_encode</function>.
+ </para>
+ <variablelist>
   <varlistentry xml:id="constant.json-throw-on-error">
    <term>
     <constant>JSON_THROW_ON_ERROR</constant>



-- 
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]