Contributions are ready for review
| From: | phpdoc at lists dot php dot net | Date: | Mon, 08 Jun 2015 12:00:04 +0000 |
| Subject: | Contributions are ready for review | ||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969385733@lists.php.net to get a copy of this message | ||
Hello PHP EN Documentation team,
There are contributions within the online editor queue for this language.
Please review, then commit or delete these patches.
Patches for review :
-----------------------
New file: en/language/types/scalar_typed_parameters.xml
By: pasindu on 2015-05-15 23:33:13
===================================================================
--- en/language/types/scalar_typed_parameters.xml
+++ en/language/types/scalar_typed_parameters.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 299488 $ -->
+
+<sect1 xml:id="language.types.scalar-typed-parameters" xmlns="http://docbook.org/ns/docbook">
+ <title>Scalar Typed Parameteres</title>
+ <warning>
+ Scalar Typed parameters documenation is currently been documented.
+ </warning>
+ <note>
+ <para>
+ Typed Parameters is also knowns as Type Hinting.
+ </para>
+ </note>
+ <para>
+ PHP 7 introduces scalar typed parameters. Functions are now able to force parameters
+ to be <type>string</type>, <type>int</type>,
<type>float</type> or <type>bool</type>.
+ By default all PHP Files are in weakly typed mode.
+ To enable strict type checking declare(strict_types=1) directive must be the first,
+ statement in the file. strict_types takes has two options, 1 for strict type
+ checking and 0 for weak type checking. This only effect the file this is stated in and not
+ files either included in this file or other files that includes this file.
+ Whether or not the function being called was declared in a file that uses strict or weak
+ type checking is irrelevant. The type checking mode depends on the file where the function is
called.
+ </para>
+ <example>
+ <title>Scalar Typed Parameters examples</title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+declare(strict_types=1); // Fatal error if this is not the first statement
+
+foo(); // strictly type-checked function call
+
+function foobar() {
+ foo(); // strictly type-checked function call
+}
+
+class baz {
+ function foobar() {
+ foo(); // strictly type-checked function call
+ }
+}
+
+
+]]>
+ </programlisting>
+ </example>
+</sect1>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62645
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62645
------------------------------------------------------------------
Modified: en/faq/installation.xml
By: mattficken on 2014-09-04 14:39:45
===================================================================
--- en/faq/installation.xml
+++ en/faq/installation.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 334758 $ -->
+<!-- $Revision: 311461 $ -->
<chapter xml:id="faq.installation" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Installation</title>
<titleabbrev>Installation</titleabbrev>
@@ -394,9 +394,9 @@
<function>phpinfo</function>. Near the top, there will be a
listing called <literal>Configuration File (php.ini)</literal>.
This will tell you where PHP is looking for &php.ini; and
- whether or not it's being read. If just a directory <envar>PATH</envar>
exists,
+ whether or not it's being read. If just a directory PATH exists,
then it's not being read, and you should put your &php.ini;
- in that directory. If &php.ini; is included within the <envar>PATH</envar>,
+ in that directory. If &php.ini; is included within the PATH,
it is being read.
</para>
<para>
@@ -413,18 +413,16 @@
<qandaentry xml:id="faq.installation.addtopath">
<question>
<para>
- How do I add my PHP directory to the <envar>PATH</envar>
+ How do I add my PHP directory to the <varname>PATH</varname>
on Windows?
</para>
</question>
<answer>
<para>
- On Windows NT+ and Windows Server 2000+:
+ On Windows 7, XP, Vista, 2008, 2012 and up
<itemizedlist>
<listitem><para>
- Go to Control Panel and open the System icon (Start -> Settings
- -> Control Panel -> System, or just Start -> Control Panel
- -> System for Windows XP/2003+)
+ Go to Control Panel and open the System icon (Start -> Control Panel)
</para></listitem>
<listitem><para>
Go to the Advanced tab
@@ -450,107 +448,18 @@
</para></listitem>
</itemizedlist>
</para>
- <para>
- On Windows 98/Me you need to edit the <filename>autoexec.bat</filename>
- file:
- <itemizedlist>
- <listitem><para>
- Open the Notepad (Start -> Run and enter notepad)
- </para></listitem>
- <listitem><para>
- Open the <filename>C:autoexec.bat</filename> file
- </para></listitem>
- <listitem><para>
- Locate the line with PATH=C:WINDOWS;C:WINDOWSCOMMAND;..... and add:
- <literal>;C:php</literal> to the end of the line
- </para></listitem>
- <listitem><para>
- Save the file and restart your computer
- </para></listitem>
- </itemizedlist>
- </para>
- <note>
- <simpara>
- Be sure to reboot after following the steps above to ensure that the
- <envar>PATH</envar> changes are applied.
- </simpara>
- </note>
- <para>
- The PHP manual used to promote the copying of files into the Windows
- system directory, this is because this directory
+
+ <para>
+ The PHP manual used to promote the copying of files into the Windows
+ system directory, this is because this directory
(<filename>C:Windows</filename>, <filename>C:WINNT</filename>, etc.)
- is by default in the system's <envar>PATH</envar>. Copying files into the
Windows
+ is by default in the systems PATH. Copying files into the Windows
system directory has long since been deprecated and may cause problems.
</para>
</answer>
</qandaentry>
- <qandaentry xml:id="faq.installation.phprc">
- <question>
- <para>
- How do I make the &php.ini; file available to PHP on windows?
- </para>
- </question>
- <answer>
- <para>
- There are several ways of doing this. If you are using Apache, read
- their installation specific instructions (<link
- linkend="install.windows.apache1">Apache 1</link>, <link
- linkend="install.windows.apache2">Apache 2</link>), otherwise you must
- set the <varname>PHPRC</varname> environment variable:
- </para>
- <para>
- On Windows NT, 2000, XP and 2003:
- <itemizedlist>
- <listitem><para>
- Go to Control Panel and open the System icon (Start -> Settings
- -> Control Panel -> System, or just Start -> Control Panel
- -> System for Windows XP/2003)
- </para></listitem>
- <listitem><para>
- Go to the Advanced tab
- </para></listitem>
- <listitem><para>
- Click on the 'Environment Variables' button
- </para></listitem>
- <listitem><para>
- Look into the 'System variables' pane
- </para></listitem>
- <listitem><para>
- Click on 'New' and enter 'PHPRC' as the variable name and the
- directory where &php.ini; is located as the variable value (e.g.
- <literal>C:php</literal>)
- </para></listitem>
- <listitem><para>
- Press OK and restart your computer
- </para></listitem>
- </itemizedlist>
- </para>
- <para>
- On Windows 98/Me you need to edit the <filename>autoexec.bat</filename>
- file:
- <itemizedlist>
- <listitem><para>
- Open the Notepad (Start -> Run and enter notepad)
- </para></listitem>
- <listitem><para>
- Open the <filename>C:autoexec.bat</filename> file
- </para></listitem>
- <listitem><para>
- Add a new line to the end of the file: <literal>set
- PHPRC=C:php</literal> (replace <literal>C:php</literal> with the
- directory where &php.ini; is located). Please note that the path
- cannot contain spaces. For instance, if you have installed PHP in
- <filename>C:Program FilesPHP</filename>, you would enter
- <filename>C:PROGRA~1PHP</filename> instead.
- </para></listitem>
- <listitem><para>
- Save the file and restart your computer
- </para></listitem>
- </itemizedlist>
- </para>
- </answer>
- </qandaentry>
+
<qandaentry xml:id="faq.installation.apache.multiviews">
<question>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=57941
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=57941
------------------------------------------------------------------
Modified: en/reference/pthreads/threaded/merge.xml
By: Krzysiek Łukasiak on 2014-11-25 03:44:27
===================================================================
--- en/reference/pthreads/threaded/merge.xml
+++ en/reference/pthreads/threaded/merge.xml
@@ -1,134 +1,135 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 334955 $ -->
-
-<refentry xml:id="threaded.merge" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
- <refname>Threaded::merge</refname>
- <refpurpose>Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
- &reftitle.description;
- <methodsynopsis>
- <modifier>public</modifier>
<type>boolean</type><methodname>Threaded::merge</methodname>
-
<methodparam><type>mixed</type><parameter>from</parameter></methodparam>
- <methodparam
choice="opt"><type>mixed</type><parameter>overwrite</parameter></methodparam>
- </methodsynopsis>
- <para>
- Merges data into the current object
- </para>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
- <varlistentry>
- <term><parameter>from</parameter></term>
- <listitem>
- <para>
- The data to merge
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>overwrite</parameter></term>
- <listitem>
- <para>
- Overwrite existing keys, by default true
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
- &reftitle.returnvalues;
- <para>
- A boolean indication of success
- </para>
- </refsect1>
-
- <refsect1 role="examples">
- &reftitle.examples;
- <para>
- <example>
- <title>Merging into the property table of a threaded object</title>
- <programlisting role="php">
-<![CDATA[
-<?php
-$array = [];
-
-while (count($array) < 10)
- $array[] = count($array);
-
-$stdClass = new stdClass();
-$stdClass->foo = "foo";
-$stdClass->bar = "bar";
-$stdClass->baz = "baz";
-
-$safe = new Threaded();
-$safe->merge($array);
-$safe->merge($stdClass);
-
-var_dump($safe);
-?>
-]]>
- </programlisting>
- &example.outputs;
- <screen>
-<![CDATA[
-object(Threaded)#2 (13) {
- ["0"]=>
- int(0)
- ["1"]=>
- int(1)
- ["2"]=>
- int(2)
- ["3"]=>
- int(3)
- ["4"]=>
- int(4)
- ["5"]=>
- int(5)
- ["6"]=>
- int(6)
- ["7"]=>
- int(7)
- ["8"]=>
- int(8)
- ["9"]=>
- int(9)
- ["foo"]=>
- string(3) "foo"
- ["bar"]=>
- string(3) "bar"
- ["baz"]=>
- string(3) "baz"
-}
-]]>
- </screen>
- </example>
- </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 334955 $ -->
+
+<refentry xml:id="threaded.merge" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+ <refname>Threaded::merge</refname>
+ <refpurpose>Manipulation</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+ &reftitle.description;
+ <methodsynopsis>
+ <modifier>public</modifier>
<type>boolean</type><methodname>Threaded::merge</methodname>
+
<methodparam><type>mixed</type><parameter>from</parameter></methodparam>
+ <methodparam
choice="opt"><type>bool</type><parameter>overwrite</parameter></methodparam>
+ </methodsynopsis>
+ <para>
+ Merges data into the current object
+ </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <variablelist>
+ <varlistentry>
+ <term><parameter>from</parameter></term>
+ <listitem>
+ <para>
+ The data to merge
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>overwrite</parameter></term>
+ <listitem>
+ <para>
+ Overwrite existing keys, by default true
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
+ <para>
+ A boolean indication of success
+ </para>
+ </refsect1>
+
+ <refsect1 role="examples">
+ &reftitle.examples;
+ <para>
+ <example>
+ <title>Merging into the property table of a threaded object</title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+$array = [];
+
+while (count($array) < 10)
+ $array[] = count($array);
+
+$stdClass = new stdClass();
+$stdClass->foo = "foo";
+$stdClass->bar = "bar";
+$stdClass->baz = "baz";
+
+$safe = new Threaded();
+$safe->merge($array);
+$safe->foo = "bar";
+$safe->merge($stdClass, false);
+
+var_dump($safe);
+?>
+]]>
+ </programlisting>
+ &example.outputs;
+ <screen>
+<![CDATA[
+object(Threaded)#2 (13) {
+ ["0"]=>
+ int(0)
+ ["1"]=>
+ int(1)
+ ["2"]=>
+ int(2)
+ ["3"]=>
+ int(3)
+ ["4"]=>
+ int(4)
+ ["5"]=>
+ int(5)
+ ["6"]=>
+ int(6)
+ ["7"]=>
+ int(7)
+ ["8"]=>
+ int(8)
+ ["9"]=>
+ int(9)
+ ["foo"]=>
+ string(3) "bar"
+ ["bar"]=>
+ string(3) "bar"
+ ["baz"]=>
+ string(3) "baz"
+}
+]]>
+ </screen>
+ </example>
+ </para>
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59207
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59207
------------------------------------------------------------------
Modified: en/reference/mbstring/supported-encodings.xml
By: hayk on 2014-12-24 09:42:39
===================================================================
--- en/reference/mbstring/supported-encodings.xml
+++ en/reference/mbstring/supported-encodings.xml
@@ -88,6 +88,7 @@
<listitem><simpara>Windows-1252 (CP1252)</simpara></listitem>
<listitem><simpara>CP866 (IBM866)</simpara></listitem>
<listitem><simpara>KOI8-R*</simpara></listitem>
+ <listitem><simpara>ArmSCII-8 (ArmSCII8)</simpara></listitem>
</itemizedlist>
<para>
* denotes encodings usable also in regular expressions.
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59553
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59553
------------------------------------------------------------------
Modified: en/install/windows/manual.xml
By: Ladislav Kubes on 2015-01-22 01:18:31
===================================================================
--- en/install/windows/manual.xml
+++ en/install/windows/manual.xml
@@ -11,35 +11,8 @@
<para>
Download the PHP zip binary distribution from
<link xlink:href="&url.php.win.downloads;">PHP for Windows: Binaries and
Sources</link>.
- There are several different versions of the zip package - choose the version that is suitable
for
- the web server being used:
- <itemizedlist spacing="compact">
- <listitem>
- <para>
- If PHP is used with IIS then choose PHP 5.3 <emphasis>VC9 Non Thread
Safe</emphasis> or
- PHP 5.2 <emphasis>VC6 Non Thread Safe</emphasis>;
- </para>
- </listitem>
- <listitem>
- <para>
- If PHP is used with IIS7 or greater and PHP 5.3+, then the VC9 binaries of PHP should be
used.
- </para>
- </listitem>
- <listitem>
- <para>
- If PHP is used with Apache 1 or Apache 2 then choose PHP 5.3
<emphasis>VC6</emphasis> or
- PHP 5.2 <emphasis>VC6</emphasis>.
- </para>
- </listitem>
- </itemizedlist>
- <note>
- <para>
- VC9 Versions are compiled with the Visual Studio 2008 compiler and have improvements
- in performance and stability. The VC9 versions require you to have the
- <link xlink:href="&url.microsoft.vc9.x86;">Microsoft 2008 C++ Runtime
(x86)</link> or
- the <link xlink:href="&url.microsoft.vc9.x64;">Microsoft 2008 C++
Runtime (x64)</link> installed.
- </para>
- </note>
+ There are several different versions of the zip package - to choose a right version for you,
follow
+ detailed guide on the <link xlink:href="&url.php.win.downloads;">download
page</link>.
</para>
</sect2>
<sect2 xml:id="install.windows.manual.package">
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60149
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60149
------------------------------------------------------------------
Modified: en/internals2/opcodes/add-interface.xml
By: Gennady Kovshenin on 2015-03-15 18:27:32
===================================================================
--- en/internals2/opcodes/add-interface.xml
+++ en/internals2/opcodes/add-interface.xml
@@ -8,11 +8,64 @@
<![CDATA[
<?php
/*
- *
+ * adds an implemented interface to a class declaration
* opcode number: 144
- * No sample PHP yet */
+ */
+interface iA {
+}
+
+class A implements iA {
+}
?>
]]>
</programlisting>
</section>
+ <section xml:id="internals2.opcodes.add-interface.listing">
+ <title>PHP opcodes</title>
+ <simpara>Function name: (null)</simpara>
+ <simpara>Compiled variables: none</simpara>
+ <informaltable>
+ <tgroup cols="7">
+ <thead>
+ <row>
+ <entry>line</entry><entry>#</entry><entry>op</entry>
+
<entry>fetch</entry><entry>ext</entry><entry>return</entry>
+ <entry>operands</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>6</entry><entry>0</entry>
+ <entry>NOP</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry></entry><entry>1</entry>
+ <entry>DECLARE_CLASS</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry>'a'</entry>
+ </row>
+ <row>
+ <entry></entry><entry>2</entry>
+ <entry>ADD_INTERFACE</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry>'iA'</entry>
+ </row>
+ <row>
+ <entry></entry><entry>3</entry>
+ <entry>VERIFY_ABSTRACT_CLASS</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry></entry><entry>3</entry>
+ <entry>RETURN</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry>1</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
</section>
No newline at end of file
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60576
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60576
------------------------------------------------------------------
Modified: en/internals2/opcodes/add-char.xml
By: Gennady Kovshenin on 2015-03-15 18:29:44
===================================================================
--- en/internals2/opcodes/add-char.xml
+++ en/internals2/opcodes/add-char.xml
@@ -8,10 +8,10 @@
<![CDATA[
<?php
/*
- * add character value2 to string value1 and store in result
+ * add regular characters in encapsed string
* opcode number: 54
*/
-echo "hello world";
+echo "$a ";
?>
]]>
</programlisting>
@@ -19,7 +19,7 @@
<section xml:id="internals2.opcodes.add-char.listing">
<title>PHP opcodes</title>
<simpara>Function name: (null)</simpara>
- <simpara>Compiled variables: none </simpara>
+ <simpara>Compiled variables: !0=$a</simpara>
<informaltable>
<tgroup cols="7">
<thead>
@@ -32,12 +32,24 @@
<tbody>
<row>
<entry>6</entry><entry>0</entry>
+ <entry>ADD_VAR</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry>!0</entry>
+ </row>
+ <row>
+ <entry></entry><entry>1</entry>
+ <entry>ADD_CHAR</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry>32</entry>
+ </row>
+ <row>
+ <entry></entry><entry>2</entry>
<entry>ECHO</entry><entry></entry>
<entry></entry><entry></entry>
- <entry>'hello%5C+world'</entry>
+ <entry> </entry>
</row>
<row>
- <entry>7</entry><entry>1</entry>
+ <entry></entry><entry>3</entry>
<entry>RETURN</entry><entry></entry>
<entry></entry><entry></entry>
<entry>1</entry>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60575
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60575
------------------------------------------------------------------
Modified: en/internals2/opcodes/cast.xml
By: Gennady Kovshenin on 2015-03-15 18:46:59
===================================================================
--- en/internals2/opcodes/cast.xml
+++ en/internals2/opcodes/cast.xml
@@ -8,7 +8,7 @@
<![CDATA[
<?php
/*
- * casts value1 as type value2 (?? Not certain about arguments ??)
+ * casts value1 as type value2 (type in extended_value)
* opcode number: 21
*/
echo (int)1;
@@ -39,7 +39,7 @@
<row>
<entry></entry><entry>1</entry>
<entry>ECHO</entry><entry></entry>
- <entry></entry><entry></entry>
+ <entry></entry><entry>1</entry>
<entry>~0</entry>
</row>
<row>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60577
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60577
------------------------------------------------------------------
Modified: en/internals2/opcodes/declare-const.xml
By: salathe on 2015-04-15 01:07:47
===================================================================
--- en/internals2/opcodes/declare-const.xml
+++ en/internals2/opcodes/declare-const.xml
@@ -6,13 +6,75 @@
<title>PHP code</title>
<programlisting role="php">
<![CDATA[
-<?php
+<?php
/*
*
* opcode number: 143
- * No sample PHP yet */
+ * Declare a constant
+ */
+const a = "A";
+
+echo a;
?>
]]>
</programlisting>
</section>
+ <section xml:id="internals2.opcodes.declare-const.listing">
+ <title>PHP opcodes</title>
+ <simpara>Function name: (null)</simpara>
+ <simpara>Compiled variables: (null) </simpara>
+ <informaltable>
+ <tgroup cols="7">
+ <thead>
+ <row>
+ <entry>line</entry>
+ <entry>#</entry>
+ <entry>op</entry>
+ <entry>fetch</entry>
+ <entry>ext</entry>
+ <entry>return</entry>
+ <entry>operands</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>7</entry>
+ <entry>0</entry>
+ <entry>DECLARE_CONST</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>'a', 'A'</entry>
+ </row>
+ <row>
+ <entry>9</entry>
+ <entry>1</entry>
+ <entry>FETCH_CONSTANT</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>~0</entry>
+ <entry>'a'</entry>
+ </row>
+ <row>
+ <entry></entry>
+ <entry>2</entry>
+ <entry>ECHO</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>~0</entry>
+ </row>
+ <row>
+ <entry></entry>
+ <entry>3</entry>
+ <entry>RETURN</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>1</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
</section>
No newline at end of file
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62134
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62134
------------------------------------------------------------------
Modified: en/internals2/opcodes.xml
By: salathe on 2015-04-15 03:41:19
===================================================================
--- en/internals2/opcodes.xml
+++ en/internals2/opcodes.xml
@@ -65,7 +65,7 @@
<row><entry>38</entry><entry><xref
linkend="internals2.opcodes.assign"/></entry><entry>yes</entry></row>
<row><entry>39</entry><entry><xref
linkend="internals2.opcodes.assign-ref"/></entry><entry>yes</entry></row>
<row><entry>40</entry><entry><xref
linkend="internals2.opcodes.echo"/></entry><entry>yes</entry></row>
- <row><entry>41</entry><entry><xref
linkend="internals2.opcodes.print"/></entry><entry>yes</entry></row>
+ <row><entry>41</entry><entry><xref
linkend="internals2.opcodes.print"/>(removed in
PHP7)</entry><entry>yes</entry></row>
<row><entry>42</entry><entry><xref
linkend="internals2.opcodes.jmp"/></entry><entry>yes</entry></row>
<row><entry>43</entry><entry><xref
linkend="internals2.opcodes.jmpz"/></entry><entry>yes</entry></row>
<row><entry>44</entry><entry><xref
linkend="internals2.opcodes.jmpnz"/></entry><entry>yes</entry></row>
@@ -77,7 +77,7 @@
<row><entry>50</entry><entry><xref
linkend="internals2.opcodes.brk"/></entry><entry>yes</entry></row>
<row><entry>51</entry><entry><xref
linkend="internals2.opcodes.cont"/></entry><entry>yes</entry></row>
<row><entry>52</entry><entry><xref
linkend="internals2.opcodes.bool"/></entry><entry>yes</entry></row>
- <row><entry>53</entry><entry><xref
linkend="internals2.opcodes.init-string"/></entry><entry>yes</entry></row>
+ <row><entry>53</entry><entry><xref
linkend="internals2.opcodes.init-string"/>(removed)</entry><entry>yes</entry></row>
<row><entry>54</entry><entry><xref
linkend="internals2.opcodes.add-char"/></entry><entry>yes</entry></row>
<row><entry>55</entry><entry><xref
linkend="internals2.opcodes.add-string"/></entry><entry>yes</entry></row>
<row><entry>56</entry><entry><xref
linkend="internals2.opcodes.add-var"/></entry><entry>yes</entry></row>
@@ -90,7 +90,7 @@
<row><entry>63</entry><entry><xref
linkend="internals2.opcodes.recv"/></entry><entry>yes</entry></row>
<row><entry>64</entry><entry><xref
linkend="internals2.opcodes.recv-init"/></entry><entry>yes</entry></row>
<row><entry>65</entry><entry><xref
linkend="internals2.opcodes.send-val"/></entry><entry>yes</entry></row>
- <row><entry>66</entry><entry><xref
linkend="internals2.opcodes.send-var"/></entry><entry>yes</entry></row>
+
<row><entry>66</entry><entry>SEND_VAR_EX</entry><entry>no</entry></row>
<row><entry>67</entry><entry><xref
linkend="internals2.opcodes.send-ref"/></entry><entry>yes</entry></row>
<row><entry>68</entry><entry><xref
linkend="internals2.opcodes.new"/></entry><entry>yes</entry></row>
<row><entry>69</entry><entry><xref
linkend="internals2.opcodes.init-ns-fcall-by-name"/></entry><entry>no</entry></row>
@@ -101,8 +101,10 @@
<row><entry>74</entry><entry><xref
linkend="internals2.opcodes.unset-var"/></entry><entry>yes</entry></row>
<row><entry>75</entry><entry><xref
linkend="internals2.opcodes.unset-dim"/></entry><entry>yes</entry></row>
<row><entry>76</entry><entry><xref
linkend="internals2.opcodes.unset-obj"/></entry><entry>yes</entry></row>
- <row><entry>77</entry><entry><xref
linkend="internals2.opcodes.fe-reset"/></entry><entry>yes</entry></row>
- <row><entry>78</entry><entry><xref
linkend="internals2.opcodes.fe-fetch"/></entry><entry>yes</entry></row>
+ <row><entry>77 (outdated)</entry><entry><xref
linkend="internals2.opcodes.fe-reset"/></entry><entry>yes</entry></row>
+
<row><entry>77</entry><entry>FE_RESET_R</entry><entry>no</entry></row>
+ <row><entry>78 (outdate)</entry><entry><xref
linkend="internals2.opcodes.fe-fetch"/></entry><entry>yes</entry></row>
+
<row><entry>78</entry><entry>FE_FETCH_R</entry><entry>no</entry></row>
<row><entry>79</entry><entry><xref
linkend="internals2.opcodes.exit"/></entry><entry>yes</entry></row>
<row><entry>80</entry><entry><xref
linkend="internals2.opcodes.fetch-r"/></entry><entry>yes</entry></row>
<row><entry>81</entry><entry><xref
linkend="internals2.opcodes.fetch-dim-r"/></entry><entry>yes</entry></row>
@@ -122,7 +124,7 @@
<row><entry>95</entry><entry><xref
linkend="internals2.opcodes.fetch-unset"/></entry><entry>no</entry></row>
<row><entry>96</entry><entry><xref
linkend="internals2.opcodes.fetch-dim-unset"/></entry><entry>no</entry></row>
<row><entry>97</entry><entry><xref
linkend="internals2.opcodes.fetch-obj-unset"/></entry><entry>no</entry></row>
- <row><entry>98</entry><entry><xref
linkend="internals2.opcodes.fetch-dim-tmp-var"/></entry><entry>yes</entry></row>
+ <row><entry>98 (outdated)</entry><entry><xref
linkend="internals2.opcodes.fetch-dim-tmp-var"/></entry><entry>yes</entry></row>
<row><entry>99</entry><entry><xref
linkend="internals2.opcodes.fetch-constant"/></entry><entry>yes</entry></row>
<row><entry>100</entry><entry><xref
linkend="internals2.opcodes.goto"/></entry><entry>no</entry></row>
<row><entry>101</entry><entry><xref
linkend="internals2.opcodes.ext-stmt"/></entry><entry>yes</entry></row>
@@ -140,22 +142,22 @@
<row><entry>113</entry><entry><xref
linkend="internals2.opcodes.init-static-method-call"/></entry><entry>yes</entry></row>
<row><entry>114</entry><entry><xref
linkend="internals2.opcodes.isset-isempty-var"/></entry><entry>yes</entry></row>
<row><entry>115</entry><entry><xref
linkend="internals2.opcodes.isset-isempty-dim-obj"/></entry><entry>yes</entry></row>
- <row><entry>116</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>117</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>118</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>119</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>120</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>121</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>122</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>123</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>124</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>125</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>126</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>127</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>128</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>129</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>130</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>131</entry><entry>not
documented</entry><entry>no</entry></row>
+
<row><entry>116</entry><entry>SEND_VAL_EX</entry><entry>no</entry></row>
+ <row><entry>117</entry><entry><xref
linkend="internals2.opcodes.send-var"/></entry><entry>yes</entry></row>
+
<row><entry>118</entry><entry>INIT_USER_CALL</entry><entry>no</entry></row>
+
<row><entry>119</entry><entry>SEND_ARRAY</entry><entry>no</entry></row>
+
<row><entry>120</entry><entry>SEND_USER</entry><entry>no</entry></row>
+
<row><entry>121</entry><entry>STRLEN</entry><entry>no</entry></row>
+
<row><entry>122</entry><entry>DEFINED</entry><entry>no</entry></row>
+
<row><entry>123</entry><entry>TYPE_CHECK</entry><entry>no</entry></row>
+
<row><entry>124</entry><entry>VERIFY_RETURN_TYPE</entry><entry>no</entry></row>
+
<row><entry>125</entry><entry>FE_RESET_RW</entry><entry>no</entry></row>
+
<row><entry>126</entry><entry>FE_FETCH_RW</entry><entry>no</entry></row>
+
<row><entry>127</entry><entry>FE_FREE</entry><entry>no</entry></row>
+
<row><entry>128</entry><entry>INIT_DYNAMIC_CALL</entry><entry>no</entry></row>
+
<row><entry>129</entry><entry>DO_ICALL</entry><entry>no</entry></row>
+
<row><entry>130</entry><entry>DO_UCALL</entry><entry>no</entry></row>
+
<row><entry>131</entry><entry>DO_FCALL_BY_NAME</entry><entry>no</entry></row>
<row><entry>132</entry><entry><xref
linkend="internals2.opcodes.pre-inc-obj"/></entry><entry>yes</entry></row>
<row><entry>133</entry><entry><xref
linkend="internals2.opcodes.pre-dec-obj"/></entry><entry>yes</entry></row>
<row><entry>134</entry><entry><xref
linkend="internals2.opcodes.post-inc-obj"/></entry><entry>yes</entry></row>
@@ -175,8 +177,26 @@
<row><entry>148</entry><entry><xref
linkend="internals2.opcodes.isset-isempty-prop-obj"/></entry><entry>yes</entry></row>
<row><entry>149</entry><entry><xref
linkend="internals2.opcodes.handle-exception"/></entry><entry>yes</entry></row>
<row><entry>150</entry><entry><xref
linkend="internals2.opcodes.user-opcode"/></entry><entry>no</entry></row>
+
<row><entry>151</entry><entry>ASSERT_CHECK</entry><entry>no</entry></row>
<row><entry>152</entry><entry><xref
linkend="internals2.opcodes.zend-jmp-set"/></entry><entry>no</entry></row>
<row><entry>153</entry><entry><xref
linkend="internals2.opcodes.zend-declare-lambda-function"/></entry><entry>no</entry></row>
+
<row><entry>154</entry><entry>ADD_TRAIT</entry><entry>no</entry></row>
+
<row><entry>155</entry><entry>BIND_TRAITS</entry><entry>no</entry></row>
+
<row><entry>156</entry><entry>SEPARATE</entry><entry>no</entry></row>
+
<row><entry>157</entry><entry>FETCH_CLASS_NAME</entry><entry>no</entry></row>
+
<row><entry>158</entry><entry>CALL_TRAMPOLINE</entry><entry>no</entry></row>
+
<row><entry>159</entry><entry>DISCARD_EXCEPTION</entry><entry>no</entry></row>
+
<row><entry>160</entry><entry>YIELD</entry><entry>no</entry></row>
+
<row><entry>161</entry><entry>GENERATOR_RETURN</entry><entry>no</entry></row>
+
<row><entry>162</entry><entry>FAST_CALL</entry><entry>no</entry></row>
+
<row><entry>163</entry><entry>FAST_RET</entry><entry>no</entry></row>
+
<row><entry>164</entry><entry>RECV_VARIADIC</entry><entry>no</entry></row>
+
<row><entry>165</entry><entry>SEND_UNPACK</entry><entry>no</entry></row>
+
<row><entry>166</entry><entry>POW</entry><entry>no</entry></row>
+
<row><entry>167</entry><entry>ASSIGN_POW</entry><entry>no</entry></row>
+
<row><entry>168</entry><entry>BIND_GLOBAL</entry><entry>no</entry></row>
+
<row><entry>169</entry><entry>COALESCE</entry><entry>no</entry></row>
+
<row><entry>170</entry><entry>SPACESHIP</entry><entry>no</entry></row>
</tbody>
</tgroup>
</table>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62136
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62136
------------------------------------------------------------------
Modified: en/language/types/string.xml
By: salathe on 2015-04-15 10:43:18
===================================================================
--- en/language/types/string.xml
+++ en/language/types/string.xml
@@ -594,7 +594,8 @@
<type>string</type>, and then wrap it in <literal>{</literal> and
<literal>}</literal>. Since <literal>{</literal> can not be escaped,
this
syntax will only be recognised when the <literal>$</literal> immediately
- follows the <literal>{</literal>. Use <literal>{$</literal> to get a
+ follows the <literal>{</literal> or <literal>{</literal> immediately
follows the<literal>$</literal>.
+ Use <literal>{$</literal> to get a
literal <literal>{$</literal>. Some examples to make it clear:
</simpara>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62158
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62158
------------------------------------------------------------------
Modified: en/reference/kadm5/setup.xml
By: salathe on 2015-04-15 11:18:34
===================================================================
--- en/reference/kadm5/setup.xml
+++ en/reference/kadm5/setup.xml
@@ -28,6 +28,11 @@
the client libraries installed by KADM5, avoiding any conflicts.
</para>
</note>
+ <note>
+ <para>
+ Kadm5 last release was 0.2.3 alpha which was on 2003-06-03.
+ </para>
+ </note>
<para>
&pecl.windows.download;
</para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62163
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62163
------------------------------------------------------------------
Modified: en/reference/filter/constants.xml
By: salathe on 2015-04-16 06:23:28
===================================================================
--- en/reference/filter/constants.xml
+++ en/reference/filter/constants.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 336878 $ -->
+<!-- $Revision: 335127 $ -->
<!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
<appendix xml:id="filter.constants" xmlns="http://docbook.org/ns/docbook">
&reftitle.constants;
@@ -223,8 +223,7 @@
</term>
<listitem>
<simpara>
- ID of "validate_mac_address" filter.
- (Available as of PHP 5.5.0)
+ ID of "validate_mac" filter.
</simpara>
</listitem>
</varlistentry>
@@ -235,7 +234,7 @@
</term>
<listitem>
<simpara>
- ID of default ("unsafe_raw") filter. This is equivalent to
+ ID of default ("string") filter. This is equivalent to
<constant>FILTER_UNSAFE_RAW</constant>.
</simpara>
</listitem>
@@ -262,6 +261,17 @@
</simpara>
</listitem>
</varlistentry>
+ <varlistentry xml:id="constant.filter-sanitize-full-special-chars">
+ <term>
+ <constant>FILTER_SANITIZE_FULL_SPECIAL_CHARS</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ ID of "full special chars" filter.
+ </simpara>
+ </listitem>
+ </varlistentry>
<varlistentry xml:id="constant.filter-sanitize-stripped">
<term>
<constant>FILTER_SANITIZE_STRIPPED</constant>
@@ -560,6 +570,39 @@
</simpara>
</listitem>
</varlistentry>
+ <varlistentry xml:id="constant.filter-flag-strip-backtick">
+ <term>
+ <constant>FILTER_FLAG_STRIP_BACKTICK</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Removes backticks (`)
+ </simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="constant.filter-flag-scheme-required">
+ <term>
+ <constant>FILTER_FLAG_SCHEME_REQUIRED</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Requires url scheme.
+ </simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="constant.filter-flag-host-required">
+ <term>
+ <constant>FILTER_FLAG_HOST_REQUIRED</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Requires url host.
+ </simpara>
+ </listitem>
+ </varlistentry>
</variablelist>
</appendix>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62178
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62178
------------------------------------------------------------------
Modified: en/reference/array/functions/list.xml
By: pasindu on 2015-04-19 07:09:53
===================================================================
--- en/reference/array/functions/list.xml
+++ en/reference/array/functions/list.xml
@@ -39,6 +39,29 @@
Returns the assigned array.
</para>
</refsect1>
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>7.0.0</entry>
+ <entry>
+ Will not work with string.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </refsect1>
<refsect1 role="examples">
&reftitle.examples;
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62276
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62276
------------------------------------------------------------------
Modified: en/reference/xmlreader/xmlreader/expand.xml
By: cmb on 2015-05-14 06:04:16
===================================================================
--- en/reference/xmlreader/xmlreader/expand.xml
+++ en/reference/xmlreader/xmlreader/expand.xml
@@ -54,7 +54,7 @@
<row>
<entry>5.3.0</entry>
<entry>
- The parameter 'basenode' was added.
+ The parameter <parameter>basenode</parameter> was added.
</entry>
</row>
</tbody>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62614
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62614
------------------------------------------------------------------
Modified: en/reference/classobj/functions/get-class-vars.xml
By: cmb on 2015-05-15 08:06:08
===================================================================
--- en/reference/classobj/functions/get-class-vars.xml
+++ en/reference/classobj/functions/get-class-vars.xml
@@ -55,7 +55,7 @@
<row>
<entry>5.0.3</entry>
<entry>
- Depending on the scope, <function>get_class_vars</function> will
+ <function>get_class_vars</function> will
only return the properties that can be accessed from the current
scope.
</entry>
@@ -94,7 +94,7 @@
var $var1; // this has no default value...
var $var2 = "xyz";
var $var3 = 100;
- private $var4; // PHP 5
+ private $var4;
// constructor
function myclass() {
@@ -120,11 +120,6 @@
&example.outputs;
<screen>
<![CDATA[
-// Before PHP 4.2.0
-var2 : xyz
-var3 : 100
-
-// As of PHP 4.2.0
var1 :
var2 : xyz
var3 : 100
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62631
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62631
------------------------------------------------------------------
Modified: en/reference/calendar/functions/frenchtojd.xml
By: cmb on 2015-05-15 10:09:20
===================================================================
--- en/reference/calendar/functions/frenchtojd.xml
+++ en/reference/calendar/functions/frenchtojd.xml
@@ -2,7 +2,7 @@
<!-- $Revision: 334762 $ -->
<refentry xml:id="function.frenchtojd" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
- <refname>FrenchToJD</refname>
+ <refname>frenchtojd</refname>
<refpurpose>Converts a date from the French Republican Calendar to a Julian Day
Count</refpurpose>
</refnamediv>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62632
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62632
------------------------------------------------------------------
Modified: en/reference/calendar/functions/gregoriantojd.xml
By: cmb on 2015-05-15 10:09:39
===================================================================
--- en/reference/calendar/functions/gregoriantojd.xml
+++ en/reference/calendar/functions/gregoriantojd.xml
@@ -2,7 +2,7 @@
<!-- $Revision: 297028 $ -->
<refentry xml:id="function.gregoriantojd" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
- <refname>GregorianToJD</refname>
+ <refname>gregoriantojd</refname>
<refpurpose>Converts a Gregorian date to Julian Day Count</refpurpose>
</refnamediv>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62633
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62633
------------------------------------------------------------------
Modified: en/reference/calendar/functions/jddayofweek.xml
By: cmb on 2015-05-15 10:09:57
===================================================================
--- en/reference/calendar/functions/jddayofweek.xml
+++ en/reference/calendar/functions/jddayofweek.xml
@@ -2,7 +2,7 @@
<!-- $Revision: 297028 $ -->
<refentry xml:id="function.jddayofweek" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
- <refname>JDDayOfWeek</refname>
+ <refname>jddayofweek</refname>
<refpurpose>Returns the day of the week</refpurpose>
</refnamediv>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62634
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62634
------------------------------------------------------------------
Modified: en/reference/calendar/functions/jdmonthname.xml
By: cmb on 2015-05-15 10:10:11
===================================================================
--- en/reference/calendar/functions/jdmonthname.xml
+++ en/reference/calendar/functions/jdmonthname.xml
@@ -2,7 +2,7 @@
<!-- $Revision: 297028 $ -->
<refentry xml:id="function.jdmonthname" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
- <refname>JDMonthName</refname>
+ <refname>jdmonthname</refname>
<refpurpose>Returns a month name</refpurpose>
</refnamediv>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62635
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62635
------------------------------------------------------------------
Modified: en/reference/calendar/functions/jdtofrench.xml
By: cmb on 2015-05-15 10:10:26
===================================================================
--- en/reference/calendar/functions/jdtofrench.xml
+++ en/reference/calendar/functions/jdtofrench.xml
@@ -2,7 +2,7 @@
<!-- $Revision: 297028 $ -->
<refentry xml:id="function.jdtofrench" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
- <refname>JDToFrench</refname>
+ <refname>jdtofrench</refname>
<refpurpose>Converts a Julian Day Count to the French Republican
Calendar</refpurpose>
</refnamediv>
<refsect1 role="description">
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62636
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62636
------------------------------------------------------------------
Modified: en/reference/calendar/functions/jdtogregorian.xml
By: cmb on 2015-05-15 10:10:46
===================================================================
--- en/reference/calendar/functions/jdtogregorian.xml
+++ en/reference/calendar/functions/jdtogregorian.xml
@@ -2,7 +2,7 @@
<!-- $Revision: 297028 $ -->
<refentry xml:id="function.jdtogregorian" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
- <refname>JDToGregorian</refname>
+ <refname>jdtogregorian</refname>
<refpurpose>Converts Julian Day Count to Gregorian date</refpurpose>
</refnamediv>
<refsect1 role="description">
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62637
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62637
------------------------------------------------------------------
Modified: en/reference/calendar/functions/jdtojulian.xml
By: cmb on 2015-05-15 10:11:10
===================================================================
--- en/reference/calendar/functions/jdtojulian.xml
+++ en/reference/calendar/functions/jdtojulian.xml
@@ -2,7 +2,7 @@
<!-- $Revision: 297028 $ -->
<refentry xml:id="function.jdtojulian" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
- <refname>JDToJulian</refname>
+ <refname>jdtojulian</refname>
<refpurpose>Converts a Julian Day Count to a Julian Calendar Date</refpurpose>
</refnamediv>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62638
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62638
------------------------------------------------------------------
Modified: en/reference/calendar/functions/jewishtojd.xml
By: cmb on 2015-05-15 10:11:27
===================================================================
--- en/reference/calendar/functions/jewishtojd.xml
+++ en/reference/calendar/functions/jewishtojd.xml
@@ -2,7 +2,7 @@
<!-- $Revision: 297028 $ -->
<refentry xml:id="function.jewishtojd" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
- <refname>JewishToJD</refname>
+ <refname>jewishtojd</refname>
<refpurpose>Converts a date in the Jewish Calendar to Julian Day Count</refpurpose>
</refnamediv>
<refsect1 role="description">
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62639
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62639
------------------------------------------------------------------
Modified: en/reference/calendar/functions/juliantojd.xml
By: cmb on 2015-05-15 10:11:46
===================================================================
--- en/reference/calendar/functions/juliantojd.xml
+++ en/reference/calendar/functions/juliantojd.xml
@@ -2,7 +2,7 @@
<!-- $Revision: 297028 $ -->
<refentry xml:id="function.juliantojd" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
- <refname>JulianToJD</refname>
+ <refname>juliantojd</refname>
<refpurpose>Converts a Julian Calendar date to Julian Day Count</refpurpose>
</refnamediv>
<refsect1 role="description">
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62640
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62640
------------------------------------------------------------------
Modified: en/appendices/ini.core.xml
By: cmb on 2015-05-19 15:18:26
===================================================================
--- en/appendices/ini.core.xml
+++ en/appendices/ini.core.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 336815 $ -->
+<!-- $Revision: 336606 $ -->
<section xml:id="ini.core" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Description of core &php.ini; directives</title>
@@ -719,6 +719,12 @@
<entry>PHP_INI_SYSTEM in PHP <= 4.2.3. Available since PHP
4.0.3.</entry>
</row>
<row>
+ <entry><link
linkend="ini.gpc-order">gpc_order</link></entry>
+ <entry>"GPC"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry>Removed in PHP 5.0.0.</entry>
+ </row>
+ <row>
<entry><link
linkend="ini.auto-prepend-file">auto_prepend_file</link></entry>
<entry>NULL</entry>
<entry>PHP_INI_PERDIR</entry>
@@ -1057,7 +1063,30 @@
</para>
</listitem>
</varlistentry>
-
+
+ <varlistentry xml:id="ini.gpc-order">
+ <term>
+ <parameter>gpc_order</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+ Set the order of GET/POST/COOKIE variable parsing. The
+ default setting of this directive is "GPC". Setting this to
+ "GP", for example, will cause PHP to completely ignore cookies
+ and to overwrite any GET method variables with POST-method
+ variables of the same name.
+ </para>
+ <note>
+ <para>
+ This option was removed in PHP 5.0.0.
+ Use <link linkend="ini.variables-order">variables_order</link>
+ instead.
+ </para>
+ </note>
+ </listitem>
+ </varlistentry>
+
<varlistentry xml:id="ini.auto-prepend-file">
<term>
<parameter>auto_prepend_file</parameter>
@@ -1919,7 +1948,7 @@
<listitem>
<para>
If turned on, database connection functions that specify default values
- will use those values in-place of any user-supplied arguments. For details
+ will use those values in place of any user-supplied arguments. For details
on the default values, see the documentation for the relevant connection
functions.
</para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62678
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62678
------------------------------------------------------------------
Modified: en/appendices/resources.xml
By: cmb on 2015-05-20 14:52:14
===================================================================
--- en/appendices/resources.xml
+++ en/appendices/resources.xml
@@ -1716,7 +1716,7 @@
<entry>
<function>OCI-Lob::free</function>
</entry>
- <entry>Oracle long objects</entry>
+ <entry>Oracle large objects</entry>
</row>
<row>
<entry>oci8 statement</entry>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62687
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62687
------------------------------------------------------------------
Modified: en/reference/curl/functions/curl-share-setopt.xml
By: Daniel Platt on 2015-06-02 10:29:06
===================================================================
--- en/reference/curl/functions/curl-share-setopt.xml
+++ en/reference/curl/functions/curl-share-setopt.xml
@@ -95,7 +95,7 @@
<entry valign="top">
Shares SSL session IDs, reducing the time spent on the SSL
handshake when reconnecting to the same server. Note that SSL
- session IDs are reused withing the same handle by default.
+ session IDs are reused within the same handle by default.
</entry>
</row>
</tbody>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62980
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62980
------------------------------------------------------------------
Modified: en/reference/filesystem/versions.xml
By: pasindu on 2015-06-03 00:55:43
===================================================================
--- en/reference/filesystem/versions.xml
+++ en/reference/filesystem/versions.xml
@@ -5,87 +5,87 @@
-->
<versions>
- <function name='basename' from='PHP 4, PHP 5'/>
- <function name='chgrp' from='PHP 4, PHP 5'/>
- <function name='chmod' from='PHP 4, PHP 5'/>
- <function name='chown' from='PHP 4, PHP 5'/>
- <function name='clearstatcache' from='PHP 4, PHP 5'/>
- <function name='copy' from='PHP 4, PHP 5'/>
+ <function name='basename' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='chgrp' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='chmod' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='chown' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='clearstatcache' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='copy' from='PHP 4, PHP 5, PHP 7'/>
<function name='delete' from='None'/>
- <function name='dirname' from='PHP 4, PHP 5'/>
- <function name='disk_free_space' from='PHP 4 >= 4.1.0, PHP 5'/>
- <function name='disk_total_space' from='PHP 4 >= 4.1.0, PHP 5'/>
- <function name='diskfreespace' from='PHP 4, PHP 5'/>
- <function name='fclose' from='PHP 4, PHP 5'/>
- <function name='feof' from='PHP 4, PHP 5'/>
- <function name='fflush' from='PHP 4 >= 4.0.1, PHP 5'/>
- <function name='fgetc' from='PHP 4, PHP 5'/>
- <function name='fgetcsv' from='PHP 4, PHP 5'/>
- <function name='fgets' from='PHP 4, PHP 5'/>
- <function name='fgetss' from='PHP 4, PHP 5'/>
- <function name='file' from='PHP 4, PHP 5'/>
- <function name='file_exists' from='PHP 4, PHP 5'/>
- <function name='file_get_contents' from='PHP 4 >= 4.3.0, PHP 5'/>
- <function name='file_put_contents' from='PHP 5'/>
- <function name='fileatime' from='PHP 4, PHP 5'/>
- <function name='filectime' from='PHP 4, PHP 5'/>
- <function name='filegroup' from='PHP 4, PHP 5'/>
- <function name='fileinode' from='PHP 4, PHP 5'/>
- <function name='filemtime' from='PHP 4, PHP 5'/>
- <function name='fileowner' from='PHP 4, PHP 5'/>
- <function name='fileperms' from='PHP 4, PHP 5'/>
- <function name='filesize' from='PHP 4, PHP 5'/>
- <function name='filetype' from='PHP 4, PHP 5'/>
- <function name='flock' from='PHP 4, PHP 5'/>
- <function name='fnmatch' from='PHP 4 >= 4.3.0, PHP 5'/>
- <function name='fopen' from='PHP 4, PHP 5'/>
- <function name='fpassthru' from='PHP 4, PHP 5'/>
- <function name='fputcsv' from='PHP 5 >= 5.1.0'/>
- <function name='fputs' from='PHP 4, PHP 5'/>
- <function name='fread' from='PHP 4, PHP 5'/>
- <function name='fscanf' from='PHP 4 >= 4.0.1, PHP 5'/>
- <function name='fseek' from='PHP 4, PHP 5'/>
- <function name='fstat' from='PHP 4, PHP 5'/>
- <function name='ftell' from='PHP 4, PHP 5'/>
- <function name='ftruncate' from='PHP 4, PHP 5'/>
- <function name='fwrite' from='PHP 4, PHP 5'/>
- <function name='glob' from='PHP 4 >= 4.3.0, PHP 5'/>
- <function name='is_dir' from='PHP 4, PHP 5'/>
- <function name='is_executable' from='PHP 4, PHP 5'/>
- <function name='is_file' from='PHP 4, PHP 5'/>
- <function name='is_link' from='PHP 4, PHP 5'/>
- <function name='is_readable' from='PHP 4, PHP 5'/>
- <function name='is_uploaded_file' from='PHP 4 >= 4.0.3, PHP 5'/>
- <function name='is_writable' from='PHP 4, PHP 5'/>
- <function name='is_writeable' from='PHP 4, PHP 5'/>
- <function name='lchgrp' from='PHP 5 >= 5.1.2'/>
- <function name='lchown' from='PHP 5 >= 5.1.2'/>
- <function name='link' from='PHP 4, PHP 5'/>
- <function name='linkinfo' from='PHP 4, PHP 5'/>
- <function name='lstat' from='PHP 4, PHP 5'/>
- <function name='mkdir' from='PHP 4, PHP 5'/>
- <function name='move_uploaded_file' from='PHP 4 >= 4.0.3, PHP
5'/>
- <function name='parse_ini_file' from='PHP 4, PHP 5'/>
- <function name='parse_ini_string' from='PHP 5 >= 5.3.0'/>
- <function name='pathinfo' from='PHP 4 >= 4.0.3, PHP 5'/>
- <function name='pclose' from='PHP 4, PHP 5'/>
- <function name='popen' from='PHP 4, PHP 5'/>
- <function name='readfile' from='PHP 4, PHP 5'/>
- <function name='readlink' from='PHP 4, PHP 5'/>
- <function name='realpath' from='PHP 4, PHP 5'/>
- <function name='realpath_cache_size' from='PHP 5 >= 5.3.2'/>
- <function name='realpath_cache_get' from='PHP 5 >= 5.3.2'/>
- <function name='rename' from='PHP 4, PHP 5'/>
- <function name='rewind' from='PHP 4, PHP 5'/>
- <function name='rmdir' from='PHP 4, PHP 5'/>
- <function name='set_file_buffer' from='PHP 4, PHP 5'/>
- <function name='stat' from='PHP 4, PHP 5'/>
- <function name='symlink' from='PHP 4, PHP 5'/>
- <function name='tempnam' from='PHP 4, PHP 5'/>
- <function name='tmpfile' from='PHP 4, PHP 5'/>
- <function name='touch' from='PHP 4, PHP 5'/>
- <function name='umask' from='PHP 4, PHP 5'/>
- <function name='unlink' from='PHP 4, PHP 5'/>
+ <function name='dirname' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='disk_free_space' from='PHP 4 >= 4.1.0, PHP 5, PHP
7'/>
+ <function name='disk_total_space' from='PHP 4 >= 4.1.0, PHP 5, PHP
7'/>
+ <function name='diskfreespace' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fclose' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='feof' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fflush' from='PHP 4 >= 4.0.1, PHP 5, PHP 7'/>
+ <function name='fgetc' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fgetcsv' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fgets' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fgetss' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='file' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='file_exists' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='file_get_contents' from='PHP 4 >= 4.3.0, PHP 5, PHP
7'/>
+ <function name='file_put_contents' from='PHP 5, PHP 7'/>
+ <function name='fileatime' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='filectime' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='filegroup' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fileinode' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='filemtime' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fileowner' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fileperms' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='filesize' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='filetype' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='flock' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fnmatch' from='PHP 4 >= 4.3.0, PHP 5, PHP 7'/>
+ <function name='fopen' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fpassthru' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fputcsv' from='PHP 5 >= 5.1.0, PHP 7'/>
+ <function name='fputs' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fread' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fscanf' from='PHP 4 >= 4.0.1, PHP 5, PHP 7'/>
+ <function name='fseek' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fstat' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='ftell' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='ftruncate' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='fwrite' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='glob' from='PHP 4 >= 4.3.0, PHP 5, PHP 7'/>
+ <function name='is_dir' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='is_executable' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='is_file' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='is_link' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='is_readable' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='is_uploaded_file' from='PHP 4 >= 4.0.3, PHP 5, PHP
7'/>
+ <function name='is_writable' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='is_writeable' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='lchgrp' from='PHP 5 >= 5.1.2, PHP 7'/>
+ <function name='lchown' from='PHP 5 >= 5.1.2, PHP 7'/>
+ <function name='link' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='linkinfo' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='lstat' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='mkdir' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='move_uploaded_file' from='PHP 4 >= 4.0.3, PHP 5, PHP
7'/>
+ <function name='parse_ini_file' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='parse_ini_string' from='PHP 5 >= 5.3.0, PHP 7'/>
+ <function name='pathinfo' from='PHP 4 >= 4.0.3, PHP , PHP 75'/>
+ <function name='pclose' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='popen' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='readfile' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='readlink' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='realpath' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='realpath_cache_size' from='PHP 5 >= 5.3.2, PHP
7'/>
+ <function name='realpath_cache_get' from='PHP 5 >= 5.3.2, PHP
7'/>
+ <function name='rename' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='rewind' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='rmdir' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='set_file_buffer' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='stat' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='symlink' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='tempnam' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='tmpfile' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='touch' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='umask' from='PHP 4, PHP 5, PHP 7'/>
+ <function name='unlink' from='PHP 4, PHP 5, PHP 7'/>
</versions>
<!-- Keep this comment at the end of the file
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63047
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63047
------------------------------------------------------------------
--
https://edit.php.net/
This email is send automatically by the Php Docbook Online Editor.