Contributions are ready for review

From:	phpdoc at lists dot php dot net	Date:	Mon, 10 Jun 2019 12:00:05 +0000
Subject:	Contributions are ready for review
Groups:	php.doc
Request:	Send a blank email to phpdoc+get-969387280@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 : ----------------------- Modified: en/reference/memcached/ini.xml By: Julien Boulen on 2018-08-23 06:08:26 =================================================================== --- en/reference/memcached/ini.xml +++ en/reference/memcached/ini.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> - + + <section xml:id="memcached.configuration" xmlns="http://docbook.org/ns/docbook"> &reftitle.runtime; @@ -23,76 +24,179 @@ <entry>PHP_INI_ALL</entry> <entry></entry> </row> + <row> - <entry><link linkend="ini.memcached.sess-consistent-hash">memcached.sess_consistent_hash</link></entry> - <entry>0</entry> + <entry><link linkend="ini.memcached.sess-lock-wait-min">memcached.sess_lock_wait_min</link></entry> + <entry>150</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + <row> - <entry><link linkend="ini.memcached.sess-binary">memcached.sess_binary</link></entry> - <entry>0</entry> + <entry><link linkend="ini.memcached.sess-lock-wait-max">memcached.sess_lock_wait_max</link></entry> + <entry>150</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + + <row> + <entry><link linkend="ini.memcached.sess-lock-retries">memcached.sess_lock_retries</link></entry> + <entry>200</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + <row> - <entry><link linkend="ini.memcached.sess-lock-wait">memcached.sess_lock_wait</link></entry> - <entry>150000</entry> + <entry><link linkend="ini.memcached.sess-lock-expire">memcached.sess_lock_expire</link></entry> + <entry>0</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + <row> <entry><link linkend="ini.memcached.sess-prefix">memcached.sess_prefix</link></entry> <entry>memc.sess.key.</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + + <row> + <entry><link linkend="ini.memcached.sess-persistent">memcached.sess_persistent</link></entry> + <entry>Off</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + + <row> + <entry><link linkend="ini.memcached.sess-consistent-hash">memcached.sess_consistent_hash</link></entry> + <entry>On</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + + <row> + <entry><link linkend="ini.memcached.sess-consistent-hash-type">memcached.sess_consistent_hash_type</link></entry> + <entry>ketama</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + + <row> + <entry><link linkend="ini.memcached.sess-remove-failed-servers">memcached.sess_remove_failed_servers</link></entry> + <entry>Off</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + + <row> + <entry><link linkend="ini.memcached.sess-server-failure-limit">memcached.sess_server_failure_limit</link></entry> + <entry>0</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + <row> <entry><link linkend="ini.memcached.sess-number-of-replicas">memcached.sess_number_of_replicas</link></entry> <entry>0</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + + <row> + <entry><link linkend="ini.memcached.sess-binary-protocol">memcached.sess_binary_protocol</link></entry> + <entry>On</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + <row> <entry><link linkend="ini.memcached.sess-randomize-replica-read">memcached.sess_randomize_replica_read</link></entry> - <entry>0</entry> + <entry>Off</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + + <row> + <entry><link linkend="ini.memcached.sess-connect-timeout">memcached.sess_connect_timeout</link></entry> + <entry>1000</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + + <row> + <entry><link linkend="ini.memcached.sess-sasl-username">memcached.sess_sasl_username</link></entry> + <entry>null</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + + <row> + <entry><link linkend="ini.memcached.sess-sasl-password">memcached.sess_sasl_password</link></entry> + <entry>null</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + <row> <entry><link linkend="ini.memcached.sess-remove-failed">memcached.sess_remove_failed</link></entry> <entry>0</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + <row> <entry><link linkend="ini.memcached.compression-type">memcached.compression_type</link></entry> <entry>fastlz</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + <row> <entry><link linkend="ini.memcached.compression-factor">memcached.compression_factor</link></entry> <entry>1.3</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + <row> <entry><link linkend="ini.memcached.compression-threshold">memcached.compression_threshold</link></entry> <entry>2000</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + <row> <entry><link linkend="ini.memcached.serializer">memcached.serializer</link></entry> - <entry>php</entry> + <entry>igbinary</entry> <entry>PHP_INI_ALL</entry> <entry></entry> </row> + <row> - <entry><link linkend="ini.memcached.use-sasl">memcached.use_sasl</link></entry> + <entry><link linkend="ini.memcached.store-retry-count">memcached.store_retry_count</link></entry> + <entry>2</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + + <row> + <entry><link linkend="ini.memcached.default-consistent-hash">memcached.default_consistent_hash</link></entry> + <entry>Off</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + + <row> + <entry><link linkend="ini.memcached.default-binary-protocol">memcached.default_binary_protocol</link></entry> + <entry>Off</entry> + <entry>PHP_INI_ALL</entry> + <entry></entry> + </row> + + <row> + <entry><link linkend="ini.memcached.default-connect-timeout">memcached.default_connect_timeout</link></entry> <entry>0</entry> - <entry>PHP_INI_SYSTEM</entry> + <entry>PHP_INI_ALL</entry> <entry></entry> </row> </tbody> @@ -104,217 +208,360 @@ <para> <variablelist> - <varlistentry xml:id="ini.memcached.sess-locking"> - <term> - <parameter>memcached.sess_locking</parameter> - <type>integer</type> - </term> - <listitem> - <para> - Use session locking. Valid values: On, Off, the default is On. - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.sess-consistent-hash"> - <term> - <parameter>memcached.sess_consistent_hash</parameter> - <type>integer</type> - </term> - <listitem> - <para> - Memcached session consistent hash mode. If set to On, consistent - hashing is used for session handling. When consistent hashing is used, - one can add or remove cache node(s) without messing up too much with - existing keys. The default is Off. - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.sess-binary"> - <term> - <parameter>memcached.sess_binary</parameter> - <type>integer</type> - </term> - <listitem> - <para> - Use memcached session binary mode. Libmemcached replicas only work if - binary mode is enabled. The default is Off. - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.sess-lock-wait"> - <term> - <parameter>memcached.sess_lock_wait</parameter> - <type>integer</type> - </term> - <listitem> - <para> - Session spin lock retry wait time in microseconds. Be carefull when - setting this value. Valid values are integers, where 0 is interpreted - as the default value. Negative values result in a reduces locking to a - try lock. The default is 150000. - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.sess-prefix"> - <term> - <parameter>memcached.sess_prefix</parameter> - <type>string</type> - </term> - <listitem> - <para> - Memcached session key prefix. Valid values are strings less than 219 - bytes long. The default value is "memc.sess.key." - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.sess-number-of-replicas"> - <term> - <parameter>memcached.sess_number_of_replicas</parameter> - <type>integer</type> - </term> - <listitem> - <para> - The memcached session number of replicas. - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.sess-randomize-replica-read"> - <term> - <parameter>memcached.sess_randomize_replica_read</parameter> - <type>integer</type> - </term> - <listitem> - <para> - Memcached session replica read randomize. - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.sess-remove-failed"> - <term> - <parameter>memcached.sess_remove_failed</parameter> - <type>integer</type> - </term> - <listitem> - <para> - Allow failed memcached server to automatically be removed. - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.compression-type"> - <term> - <parameter>memcached.compression_type</parameter> - <type>string</type> - </term> - <listitem> - <para> - Set the compression type, valid values are: fastlz, zlib. The default - is fastlz. - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.compression-factor"> - <term> - <parameter>memcached.compression_factor</parameter> - <type>float</type> - </term> - <listitem> - <para> - Compression factor. Store compressed value only if the compression - factor (saving) exceeds the set limit. Store compressed if: - <literal>plain_len > comp_len * factor</literal>. The default value - is 1.3 (23% space saving). - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.compression-threshold"> - <term> - <parameter>memcached.compression_threshold</parameter> - <type>integer</type> - </term> - <listitem> - <para> - The compression threshold. Do not compress serialized values below this - threshold. The default is 2000 bytes. - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.serializer"> - <term> - <parameter>memcached.serializer</parameter> - <type>string</type> - </term> - <listitem> - <para> - Set the default serializer for new memcached objects. Valid values - are: php, igbinary, json, json_array. - </para> - <variablelist> - <varlistentry> - <term>json</term> - <listitem> - <para> - Standard php JSON encoding. This serializer is fast and compact but - only works on UTF-8 encoded data and does not fully implement - serializing. See the JSON extension. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>json_array</term> - <listitem> - <para> - As json, but decodes into arrays. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>php</term> - <listitem> - <para> - The standard PHP serializer. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>igbinary</term> - <listitem> - <para> - A binary serializer - </para> - </listitem> - </varlistentry> - </variablelist> - <para> - The default is igbinary if available and php otherwise. - </para> - </listitem> - </varlistentry> - - <varlistentry xml:id="ini.memcached.use-sasl"> - <term> - <parameter>memcached.use_sasl</parameter> - <type>integer</type> - </term> - <listitem> - <para> - Use SASL authentication for connections. Valid values: On, Off. The - default is Off. - </para> - </listitem> - </varlistentry> - + <term> + <parameter>memcached.sess_locking</parameter> + <type>integer</type> + </term> + <listitem> + <para> + Use session locking. Valid values: On, Off, the default is On. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-lock-wait-min"> + <term> + <parameter>memcached.sess_lock_wait_min</parameter> + <type>integer</type> + </term> + <listitem> + <para> + The minimum time, in milliseconds, to wait between session lock attempts. This value is double on each lock retry until memcached.sess_lock_wait_max is reached, after which any further retries will take sess_lock_wait_max seconds. The default is 150. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-lock-wait-max"> + <term> + <parameter>memcached.sess_lock_wait_max</parameter> + <type>integer</type> + </term> + <listitem> + <para> + The maximum time, in milliseconds, to wait between session lock attempts. The default is 150. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-lock-retries"> + <term> + <parameter>memcached.sess_lock_retries</parameter> + <type>integer</type> + </term> + <listitem> + <para> + The number of times to retry locking the session lock, not including the first attempt. Default is 200. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-lock-expire"> + <term> + <parameter>memcached.sess_lock_retries</parameter> + <type>integer</type> + </term> + <listitem> + <para> + The time, in seconds, before a lock should release itself. Setting to 0 results in the default behaviour, which is to use PHP's max_execution_time. Default is 0. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-prefix"> + <term> + <parameter>memcached.sess_prefix</parameter> + <type>string</type> + </term> + <listitem> + <para> + Memcached session key prefix. Valid values are strings less than 219 + bytes long. The default value is "memc.sess.key." + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-persistent"> + <term> + <parameter>memcached.sess_persistent</parameter> + <type>integer</type> + </term> + <listitem> + <para> + Whether or not to re-use the memcached connections corresponding to the value(s) of session.save_path after the execution of the script ends. Don't use this if certain settings (e.g. SASL settings, sess_binary_protocol) would be overridden between requests. Default is Off. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-consistent-hash"> + <term> + <parameter>memcached.sess_consistent_hash</parameter> + <type>integer</type> + </term> + <listitem> + <para> + If set to On, consistent hashing (libketama) is used for session handling. When consistent hashing is used, one can add or remove cache node(s) without messing up too much with existing keys. Default is On. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-consistent-hash-type"> + <term> + <parameter>memcached.sess_consistent_hash_type</parameter> + <type>string</type> + </term> + <listitem> + <para> + Memcached session consistent hash type if set to 'ketama', consistent hashing (libketama) is used for session handling (default for php-memcached 3.x) if set to 'ketama_weighted', weighted consistent hashing (libketama) is used for session handling (default for php-memcached 2.x). Default is "ketama". + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-remove-failed-servers"> + <term> + <parameter>memcached.sess_remove_failed_servers</parameter> + <type>integer</type> + </term> + <listitem> + <para> + Allow failed memcached server to automatically be removed. Default is Off. (In previous versions, this setting was called memcached.sess_remove_failed). + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-server-failure-limit"> + <term> + <parameter>memcached.sess_server_failure_limit</parameter> + <type>integer</type> + </term> + <listitem> + <para> + Set this value to enable the server be removed after configured number of continuous times connection failure. Default is 0. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-number-of-replicas"> + <term> + <parameter>memcached.sess_number_of_replicas</parameter> + <type>integer</type> + </term> + <listitem> + <para> + Write data to a number of additional memcached servers. This is "poor man's HA" as libmemcached calls it. If this value is positive and sess_remove_failed is enabled when a memcached server fails the session will continue to be available from a replica. However, if the failed memcache server becomes available again it will read the session from there which could have old data or no data at all. Default is 0. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-binary-protocol"> + <term> + <parameter>memcached.sess_binary_protocol</parameter> + <type>integer</type> + </term> + <listitem> + <para> + Use the memcached binary protocol for memcached sessions (Instead of the text protocol) libmemcached replicas work only if binary mode is enabled. However, certain proxies (such as twemproxy) will work only if the binary protocol is disabled. In older versions of php-memcached, this setting was Off and was called memcached.sess_binary. Default is On with libmemcached 1.0.18 or newer. Default is Off with older version. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-randomize-replica-read"> + <term> + <parameter>memcached.sess_randomize_replica_read</parameter> + <type>integer</type> + </term> + <listitem> + <para> + Memcached session replica read randomize. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-connect-timeout"> + <term> + <parameter>memcached.sess_connect_timeout</parameter> + <type>integer</type> + </term> + <listitem> + <para> + memcached connect timeout value + In non-blocking mode this changes the value of the timeout during socket connection in milliseconds. Specifying -1 means an infinite timeout. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-sasl-username"> + <term> + <parameter>memcached.sess_sasl_username</parameter> + <type>string</type> + </term> + <listitem> + <para> + Session SASL username + Both username and password need to be set for SASL to be enabled In addition to this memcached.use_sasl needs to be on + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.sess-sasl-password"> + <term> + <parameter>memcached.sess_sasl_password</parameter> + <type>string</type> + </term> + <listitem> + <para> + Session SASL password + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.compression-type"> + <term> + <parameter>memcached.compression_type</parameter> + <type>string</type> + </term> + <listitem> + <para> + Set the compression type, valid values are: fastlz, zlib. The default + is fastlz. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.compression-factor"> + <term> + <parameter>memcached.compression_factor</parameter> + <type>float</type> + </term> + <listitem> + <para> + Compression factor. Store compressed value only if the compression + factor (saving) exceeds the set limit. Store compressed if: + <literal>plain_len > comp_len * factor</literal>. The default value + is 1.3 (23% space saving). + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.compression-threshold"> + <term> + <parameter>memcached.compression_threshold</parameter> + <type>integer</type> + </term> + <listitem> + <para> + The compression threshold. Do not compress serialized values below this + threshold. The default is 2000 bytes. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.serializer"> + <term> + <parameter>memcached.serializer</parameter> + <type>string</type> + </term> + <listitem> + <para> + Set the default serializer for new memcached objects. Valid values + are: php, igbinary, json, json_array. + </para> + <variablelist> + <varlistentry> + <term>json</term> + <listitem> + <para> + Standard php JSON encoding. This serializer is fast and compact but + only works on UTF-8 encoded data and does not fully implement + serializing. See the JSON extension. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term>json_array</term> + <listitem> + <para> + As json, but decodes into arrays. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term>php</term> + <listitem> + <para> + The standard PHP serializer. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term>igbinary</term> + <listitem> + <para> + A binary serializer + </para> + </listitem> + </varlistentry> + </variablelist> + <para> + The default is igbinary if available and php otherwise. + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.store-retry-count"> + <term> + <parameter>memcached.store_retry_count</parameter> + <type>integer</type> + </term> + <listitem> + <para> + The amount of retries for failed store commands. + This mechanism allows transparent fail-over to secondary servers when set/increment/decrement/setMulti operations fail on the desired server in a multi-server environment. the default is 2 + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.default-consistent-hash"> + <term> + <parameter>memcached.default_consistent_hash</parameter> + <type>integer</type> + </term> + <listitem> + <para> + Sets the default for consistent hashing for new connections. (To configure consistent hashing for session connections, use memcached.sess_consistent_hash instead) + + If set to On, consistent hashing (libketama) is used for session handling. When consistent hashing is used, one can add or remove cache node(s) without messing up too much with existing keys default is Off + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.default-binary-protocol"> + <term> + <parameter>memcached.default_binary_protocol</parameter> + <type>integer</type> + </term> + <listitem> + <para> + Sets the default memcached protocol for new connections. (To configure the memcached protocol for connections used by sessions, use memcached.sess_binary_protocol instead) + + If set to On, the memcached binary protocol is used by default. If set to Off, the memcached text protocol is used. Default is Off + </para> + </listitem> + </varlistentry> + + <varlistentry xml:id="ini.memcached.default-connect-timeout"> + <term> + <parameter>memcached.default_connect_timeout</parameter> + <type>integer</type> + </term> + <listitem> + <para> + Sets the default memcached connection timeout for new connections. (To configure the memcached connection timeout for sessions, use memcached.sess_connect_timeout instead) + + In non-blocking mode this changes the value of the timeout. during socket connection in milliseconds. Specifying -1 means an infinite timeout. Specifying 0 means using the memcached library's default connection timeout. Default is 0. + </para> + </listitem> + </varlistentry> </variablelist> </para> </section> @@ -338,4 +585,4 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 ---> +--> No newline at end of file => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=85064 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=85064 ------------------------------------------------------------------ Modified: en/reference/spl/functions/iterator-to-array.xml By: Joel Wurtz on 2019-01-09 08:31:37 =================================================================== --- en/reference/spl/functions/iterator-to-array.xml +++ en/reference/spl/functions/iterator-to-array.xml @@ -138,6 +138,44 @@ ]]> </screen> </example> + <example> + <title><function>iterator_to_array</function> with Generator example</title> + <programlisting role="php"> +<![CDATA[ +<?php + +function yield1() { + yield 'foo'; +} + +function yield2() { + yield 'bar'; + + yield from yield1(); +} + +var_dump(iterator_to_array(yield2(), false)); +var_dump(iterator_to_array(yield2(), true)); + +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +array(2) { + [0]=> + string(3) "bar" + [1]=> + string(3) "foo" +} +array(1) { + [0]=> + string(3) "foo" +} +]]> + </screen> + </example> </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=89165 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=89165 ------------------------------------------------------------------ Modified: en/reference/openssl/functions/openssl-encrypt.xml By: anonymous on 2019-01-13 05:08:52 =================================================================== --- en/reference/openssl/functions/openssl-encrypt.xml +++ en/reference/openssl/functions/openssl-encrypt.xml @@ -187,22 +187,23 @@ $ivlen = openssl_cipher_iv_length($cipher="AES-128-CBC"); $iv = openssl_random_pseudo_bytes($ivlen); $ciphertext_raw = openssl_encrypt($plaintext, $cipher, $key, $options=OPENSSL_RAW_DATA, $iv); -$hmac = hash_hmac('sha256', $ciphertext_raw, $key, $as_binary=true); -$ciphertext = base64_encode( $iv.$hmac.$ciphertext_raw ); - -//decrypt later.... +$hmac = hash_hmac('sha256', $iv.$ciphertext_raw, $key, $as_binary=true); +$ciphertext = base64_encode( $iv.$ciphertext_raw.$hmac ); +//decrypt later... +$sha2len = 32; $c = base64_decode($ciphertext); -$ivlen = openssl_cipher_iv_length($cipher="AES-128-CBC"); -$iv = substr($c, 0, $ivlen); -$hmac = substr($c, $ivlen, $sha2len=32); -$ciphertext_raw = substr($c, $ivlen+$sha2len); -$original_plaintext = openssl_decrypt($ciphertext_raw, $cipher, $key, $options=OPENSSL_RAW_DATA, $iv); -$calcmac = hash_hmac('sha256', $ciphertext_raw, $key, $as_binary=true); +$hmac = substr($c, -1*$sha2len); +$hmac_input = substr($c, 0, -1*$sha2len); +$calcmac = hash_hmac('sha256', $hmac_input, $key, $as_binary=true); if (hash_equals($hmac, $calcmac))//PHP 5.6+ timing attack safe comparison { + $ivlen = openssl_cipher_iv_length($cipher="AES-128-CBC"); + $iv = substr($c, 0, $ivlen); + $ciphertext_raw = substr($c, $ivlen, -1*$sha2len); + $original_plaintext = openssl_decrypt($ciphertext_raw, $cipher, $key, $options=OPENSSL_RAW_DATA, $iv); echo $original_plaintext."n"; } -?> + ]]> </programlisting> </example> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=89229 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=89229 ------------------------------------------------------------------ Modified: en/reference/reflection/reflectionclass/getmodifiers.xml By: Florian Berberich on 2019-02-17 03:35:34 =================================================================== --- en/reference/reflection/reflectionclass/getmodifiers.xml +++ en/reference/reflection/reflectionclass/getmodifiers.xml @@ -31,12 +31,113 @@ modifier constants</link>. </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.2.0</entry> + <entry> + The returned bitfield now only consists on the value of the + <link linkend="reflectionclass.constants.modifiers">modifier constants.</link> + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </refsect1> + + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title><methodname>ReflectionClass::getModifiers</methodname> example</title> + <programlisting role="php"> +<![CDATA[ +<?php + +trait Trait1 { + +} + +trait Trait2 { + abstract function abstract1(); +} + +interface Interface1 { + +} + +interface Interface2 { + function abstract2(); +} + +abstract class Abstract1 { + +} + +abstract class Abstract2 { + abstract function abstract3(); +} + +class Class1 { + +} + +final class Class2 { + +} + +$refTrait1 = new ReflectionClass('Trait1'); +$refTrait2 = new ReflectionClass('Trait2'); // implicit abstract +$refInterface1 = new ReflectionClass('Interface1'); +$refInterface2 = new ReflectionClass('Interface2'); // implicit abstract +$refAbstract1 = new ReflectionClass('Abstract1'); // explicit abstract +$refAbstract2 = new ReflectionClass('Abstract2'); // implicit and explicit abstract +$refClass1 = new ReflectionClass('Class1'); +$refClass2 = new ReflectionClass('Class2'); // final + +var_dump($refTrait1->getModifiers()); +var_dump($refTrait2->getModifiers()); +var_dump($refInterface1->getModifiers()); +var_dump($refInterface2->getModifiers()); +var_dump($refAbstract1->getModifiers()); +var_dump($refAbstract2->getModifiers()); +var_dump($refClass1->getModifiers()); +var_dump($refClass2->getModifiers()); +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +int(0) +int(16) +int(0) +int(16) +int(32) +int(48) +int(0) +int(4) +]]> + </screen> + </example> + </para> + </refsect1> <refsect1 role="seealso"> &reftitle.seealso; <para> <simplelist> - <member><methodname>ReflectionClass::getProperties</methodname></member> <member><methodname>Reflection::getModifierNames</methodname></member> </simplelist> </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=89789 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=89789 ------------------------------------------------------------------ Modified: en/reference/reflection/reflectionclass.xml By: Florian Berberich on 2019-02-17 03:37:49 =================================================================== --- en/reference/reflection/reflectionclass.xml +++ en/reference/reflection/reflectionclass.xml @@ -2,13 +2,13 @@  <phpdoc:classref xml:id="class.reflectionclass" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> - + <title>The ReflectionClass class</title> <titleabbrev>ReflectionClass</titleabbrev> - + <partintro> - - + +  <section xml:id="reflectionclass.intro"> &reftitle.intro; <para> @@ -16,16 +16,16 @@ information about a class. </para> </section> - - +  + <section xml:id="reflectionclass.synopsis"> &reftitle.classsynopsis; - - + +  <classsynopsis> <ooclass><classname>ReflectionClass</classname></ooclass> - - + +  <classsynopsisinfo> <ooclass> <classname>ReflectionClass</classname> @@ -35,7 +35,7 @@ <interfacename>Reflector</interfacename> </oointerface> </classsynopsisinfo> - +  <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo> <fieldsynopsis> <modifier>const</modifier> @@ -53,25 +53,25 @@ <modifier>const</modifier> <type>integer</type> <varname linkend="reflectionclass.constants.is-final">ReflectionClass::IS_FINAL</varname> - <initializer>64</initializer> + <initializer>4</initializer> </fieldsynopsis> - + <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo> <fieldsynopsis> <modifier>public</modifier> <varname linkend="reflectionclass.props.name">name</varname> </fieldsynopsis> - + <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.reflectionclass')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" /> </classsynopsis> - - +  + </section> - - + +  <section xml:id="reflectionclass.props"> &reftitle.properties; <variablelist> @@ -86,36 +86,39 @@ </varlistentry> </variablelist> </section> - - +  - + +  <section xml:id="reflectionclass.constants"> &reftitle.constants; <section xml:id="reflectionclass.constants.modifiers"> <title>ReflectionClass Modifiers</title> <variablelist> - + <varlistentry xml:id="reflectionclass.constants.is-implicit-abstract"> <term><constant>ReflectionClass::IS_IMPLICIT_ABSTRACT</constant></term> <listitem> <para> - Indicates class that is <link linkend="language.oop5.abstract"> - abstract</link> because it has some abstract methods. + Indicates class is <link linkend="language.oop5.abstract"> + abstract</link> because it has some abstract methods. This may + also be true for interfaces and traits that containt abstract + methods. </para> </listitem> </varlistentry> - + <varlistentry xml:id="reflectionclass.constants.is-explicit-abstract"> <term><constant>ReflectionClass::IS_EXPLICIT_ABSTRACT</constant></term> <listitem> <para> - Indicates class that is <link linkend="language.oop5.abstract"> - abstract</link> because of its definition. + Indicates class is <link linkend="language.oop5.abstract"> + abstract</link> because of its definition. This is only true for + abstract classes. </para> </listitem> </varlistentry> - + <varlistentry xml:id="reflectionclass.constants.is-final"> <term><constant>ReflectionClass::IS_FINAL</constant></term> <listitem> @@ -125,17 +128,72 @@ </para> </listitem> </varlistentry> - + </variablelist> </section> </section> - - - +  + + <section role="changelog" xml:id="reflectionclass.changelog"> + &reftitle.changelog; + <para> + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>7.2.0</entry> + <entry> + Added method: <methodname>isIterable</methodname>. + <methodname>isIterateable</methodname> is now an alias of + the new method. + </entry> + </row> + <row> + <entry>7.1.0</entry> + <entry> + Added methods: <methodname>getReflectionConstant</methodname> + and <methodname>getReflectionConstants</methodname>. + </entry> + </row> + <row> + <entry>7.0.0</entry> + <entry> + The value of <constant>ReflectionClass::IS_FINAL</constant> + changed from 64 to 4. + </entry> + </row> + <row> + <entry>7.0.0</entry> + <entry> + Added method: <methodname>isAnonymous</methodname> + </entry> + </row> + <row> + <entry>5.4.0</entry> + <entry> + Added methods: <methodname>isCloneable</methodname>, + <methodname>newInstanceWithoutConstructor</methodname>, + <methodname>getTraits</methodname>, <methodname> + getTraitNames</methodname>, <methodname>getTraitAliases + </methodname> and <methodname>isTrait</methodname>. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </section> + </partintro> - + &reference.reflection.entities.reflectionclass; - + </phpdoc:classref>  + <refentry xml:id="reflectionclass.isiterable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -14,7 +14,8 @@ <void /> </methodsynopsis> <para> - Check whether this class is iterable (i.e. can be used inside &foreach;). + Checks whether the class implements the interface <interfacename>Traversable</interfacename> + and is actually iterable. Therefore abstract classes are not iterable. </para> </refsect1> @@ -34,12 +35,12 @@ &reftitle.examples; <para> <example> - <title>Basic <methodname>ReflectionClass::isIterable</methodname> Usage</title> + <title><methodname>ReflectionClass::isIterable</methodname> example</title> <programlisting role="php"> <![CDATA[ <?php -class IteratorClass implements Iterator { +abstract class IteratorClass implements Iterator { public function __construct() { } public function key() { } public function current() { } @@ -50,16 +51,16 @@ class DerivedClass extends IteratorClass { } class NonIterator { } -function dump_iterable($class) { +function dump_iterateable($class) { $reflection = new ReflectionClass($class); - var_dump($reflection->isIterable()); + var_dump($reflection->isIterateable()); } $classes = array("ArrayObject", "IteratorClass", "DerivedClass", "NonIterator"); foreach ($classes as $class) { - echo "Is $class iterable? "; - dump_iterable($class); + echo "Is $class iterateable? "; + dump_iterateable($class); } ?> ]]> @@ -67,25 +68,15 @@ &example.outputs; <screen> <![CDATA[ -Is ArrayObject iterable? bool(true) -Is IteratorClass iterable? bool(true) -Is DerivedClass iterable? bool(true) -Is NonIterator iterable? bool(false) +Is ArrayObject iterateable? bool(true) +Is IteratorClass iterateable? bool(false) +Is DerivedClass iterateable? bool(true) +Is NonIterator iterateable? bool(false) ]]> </screen> </example> </para> </refsect1> - - <refsect1 role="seealso"> - &reftitle.seealso; - <para> - <simplelist> - <member><methodname>ReflectionClass::__construct</methodname></member> - </simplelist> - </para> - </refsect1> - </refentry>  + <chapter xml:id="pgsql.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.examples; @@ -40,6 +40,80 @@ ?> ]]> </programlisting> + </example> + </para> + </section> + + <section xml:id="pgsql.examples-queries"> + <title>Basic usage</title> + <para> + These examples contain user defined functions similar to legacy MySQL + functions. + + <example> + <title>PostgreSQL user defined functions example</title> + <programlisting role="php"> +<![CDATA[ +<?php +// This function should be needed, since PostgreSQL connection binds database. +function pg_list_dbs($db) +{ + assert(is_resource($db)); + $query = ' +SELECT + d.datname as "Name", + u.usename as "Owner", + pg_encoding_to_char(d.encoding) as "Encoding" +FROM + pg_database d LEFT JOIN pg_user u ON d.datdba = u.usesysid +ORDER BY 1; +'; + return pg_query($db, $query); +} + +// List tables. +function pg_list_tables($db) +{ + assert(is_resource($db)); + $query = " +SELECT + c.relname as "Name", + CASE c.relkind WHEN 'r' THEN 'table' WHEN 'v' THEN 'view' WHEN 'i' THEN 'index' WHEN 'S' THEN 'sequence' WHEN 's' THEN 'special' END as "Type", + u.usename as "Owner" +FROM + pg_class c LEFT JOIN pg_user u ON c.relowner = u.usesysid +WHERE + c.relkind IN ('r','v','S','') + AND c.relname !~ '^pg_' +ORDER BY 1; +"; + return pg_query($db, $query); +} + +// See also pg_meta_data(). It returns field definition as array. +function pg_list_fields($db, $table) +{ + assert(is_resource($db)); + $query = " +SELECT + a.attname, + format_type(a.atttypid, a.atttypmod), + a.attnotnull, + a.atthasdef, + a.attnum +FROM + pg_class c, + pg_attribute a +WHERE + c.relname = '".$table."' + AND a.attnum > 0 AND a.attrelid = c.oid +ORDER BY a.attnum; +"; + return pg_query($db, $query); +} +?> +]]> + </programlisting> </example> </para> </section> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=91807 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=91807 ------------------------------------------------------------------ Modified: en/reference/array/functions/uasort.xml By: Patrick McDougle on 2019-05-30 11:36:02 =================================================================== --- en/reference/array/functions/uasort.xml +++ en/reference/array/functions/uasort.xml @@ -65,20 +65,21 @@ <programlisting role="php"> <![CDATA[ <?php -// Comparison function -function cmp($a, $b) { - if ($a == $b) { - return 0; - } - return ($a < $b) ? -1 : 1; -} -// Array to be sorted -$array = array('a' => 4, 'b' => 8, 'c' => -1, 'd' => -9, 'e' => 2, 'f' => 5, 'g' => 3, 'h' => -4); +$array = [0 => ['id' => 5, 'name' => 'bravo'], 1 => ['id' => 7, 'name' => 'alpha']]; + +usort($array, function($a, $b) { + return strcasecmp($a['name'], $b['name']); +}); + print_r($array); -// Sort and print the resulting array -uasort($array, 'cmp'); +$array = [0 => ['id' => 5, 'name' => 'bravo'], 1 => ['id' => 7, 'name' => 'alpha']]; + +uasort($array, function($a, $b) { + return strcasecmp($a['name'], $b['name']); +}); + print_r($array); ?> ]]> @@ -88,25 +89,33 @@ <![CDATA[ Array ( - [a] => 4 - [b] => 8 - [c] => -1 - [d] => -9 - [e] => 2 - [f] => 5 - [g] => 3 - [h] => -4 + [0] => Array + ( + [id] => 7 + [name] => alpha + ) + + [1] => Array + ( + [id] => 5 + [name] => bravo + ) + ) Array ( - [d] => -9 - [h] => -4 - [c] => -1 - [e] => 2 - [g] => 3 - [a] => 4 - [f] => 5 - [b] => 8 + [1] => Array + ( + [id] => 7 + [name] => alpha + ) + + [0] => Array + ( + [id] => 5 + [name] => bravo + ) + ) ]]> </screen> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92055 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92055 ------------------------------------------------------------------ Modified: en/reference/apache/ini.xml By: girgias on 2019-06-08 13:36:18 =================================================================== --- en/reference/apache/ini.xml +++ en/reference/apache/ini.xml @@ -29,25 +29,25 @@ <entry><link linkend="ini.engine">engine</link></entry> <entry>"1"</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.0.5.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.child-terminate">child_terminate</link></entry> <entry>"0"</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.0.5.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.last-modified">last_modified</link></entry> <entry>"0"</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.0.5.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.xbithack">xbithack</link></entry> <entry>"0"</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.0.5.</entry> + <entry></entry> </row> </tbody> </tgroup> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92410 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92410 ------------------------------------------------------------------ Modified: en/reference/apache/book.xml By: girgias on 2019-06-08 13:36:58 =================================================================== --- en/reference/apache/book.xml +++ en/reference/apache/book.xml @@ -11,22 +11,6 @@ <para> These functions are only available when running PHP as an Apache module. </para> - <note> - <simpara> - As of PHP 4.3.2, <envar>PATH_TRANSLATED</envar> is no longer set - implicitly under the Apache 2 <acronym>SAPI</acronym> in contrast - to the situation in Apache 1, where it's set to the same value as - the <envar>SCRIPT_FILENAME</envar> server variable when it's not - populated by Apache. This change was made to comply with the - <acronym>CGI</acronym> specification that - <envar>PATH_TRANSLATED</envar> should only exist if - <envar>PATH_INFO</envar> is defined. - </simpara> - <simpara> - Apache 2 users may use <literal>AcceptPathInfo = On</literal> inside - <filename>httpd.conf</filename> to define <envar>PATH_INFO</envar>. - </simpara> - </note> </preface>  => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92411 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92411 ------------------------------------------------------------------ Modified: en/reference/apache/functions/apache-get-modules.xml By: girgias on 2019-06-08 13:37:21 =================================================================== --- en/reference/apache/functions/apache-get-modules.xml +++ en/reference/apache/functions/apache-get-modules.xml @@ -24,32 +24,6 @@ </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>5.0.0</entry> - <entry> - Became available when using Apache 1, or the PHP Apache 2 - <emphasis>filter</emphasis> API. Before this time, it was only - available when using the Apache 2 <emphasis>handler</emphasis> API. - </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=92412 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92412 ------------------------------------------------------------------ Modified: en/reference/bc/setup.xml By: girgias on 2019-06-08 15:38:22 =================================================================== --- en/reference/bc/setup.xml +++ en/reference/bc/setup.xml @@ -7,10 +7,7 @@  <section xml:id="bc.requirements"> &reftitle.required; - <para> - Since PHP 4.0.4, libbcmath is bundled with PHP. You don't need any - external libraries for this extension. - </para> + &no.requirement; </section>  => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92413 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92413 ------------------------------------------------------------------ Modified: en/reference/com/ini.xml By: girgias on 2019-06-08 15:51:42 =================================================================== --- en/reference/com/ini.xml +++ en/reference/com/ini.xml @@ -20,37 +20,37 @@ <entry><link linkend="ini.com.allow-dcom">com.allow_dcom</link></entry> <entry>"0"</entry> <entry>PHP_INI_SYSTEM</entry> - <entry>Available since PHP 4.0.5.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.com.autoregister-typelib">com.autoregister_typelib</link></entry> <entry>"0"</entry> <entry>PHP_INI_ALL</entry> - <entry>PHP_INI_SYSTEM in PHP 4. Available since PHP 4.1.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.com.autoregister-verbose">com.autoregister_verbose</link></entry> <entry>"0"</entry> <entry>PHP_INI_ALL</entry> - <entry>PHP_INI_SYSTEM in PHP 4. Available since PHP 4.1.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.com.autoregister-casesensitive">com.autoregister_casesensitive</link></entry> <entry>"1"</entry> <entry>PHP_INI_ALL</entry> - <entry>PHP_INI_SYSTEM in PHP 4. Available since PHP 4.1.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.com.code-page">com.code_page</link></entry> <entry>""</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 5.0.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.com.typelib-file">com.typelib_file</link></entry> <entry>""</entry> <entry>PHP_INI_SYSTEM</entry> - <entry>Available since PHP 4.0.5.</entry> + <entry></entry> </row> </tbody> </tgroup> @@ -138,11 +138,6 @@ script becomes less portable; you should use the COM constructor parameter whenever possible. </para> - <note> - <simpara> - This configuration directive was introduced with PHP 5. - </simpara> - </note> </listitem> </varlistentry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92414 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92414 ------------------------------------------------------------------ Modified: en/reference/com/book.xml By: girgias on 2019-06-08 15:52:30 =================================================================== --- en/reference/com/book.xml +++ en/reference/com/book.xml @@ -41,16 +41,10 @@ more with COM. </para> <para> - Starting with PHP 5, this extension (and this documentation) was - rewritten from scratch and much of the old confusing and bogus cruft has - been removed. Additionally, we support the instantiation and creation of + Additionally, we support the instantiation and creation of .Net assemblies using the COM interoperability layer provided by Microsoft. </para> - <para> - Please read <link xlink:href="&url.zend.comdotnet;">this article</link> - for an overview of the changes in this extension in PHP 5. - </para> </preface>  => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92415 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92415 ------------------------------------------------------------------ Modified: en/reference/com/error-handling.xml By: girgias on 2019-06-08 15:53:58 =================================================================== --- en/reference/com/error-handling.xml +++ en/reference/com/error-handling.xml @@ -4,10 +4,7 @@ <chapter xml:id="com.error-handling" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Errors and error handling</title> -  - <para> - <emphasis>Exceptions (PHP 5)</emphasis> - </para> +  <para> This extension will throw instances of the class <literal>com_exception</literal> whenever there is a potentially fatal error reported by COM. All @@ -18,3 +15,24 @@ </para> </chapter> + + => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92416 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92416 ------------------------------------------------------------------ Modified: en/reference/com/variant.xml By: girgias on 2019-06-08 16:06:45 =================================================================== --- en/reference/com/variant.xml +++ en/reference/com/variant.xml @@ -43,13 +43,6 @@ linkend="com.constants"/>. </simpara> <simpara> - In PHP versions prior to PHP 5, you could force PHP to pass a variant - object by reference by OR'ing <constant>VT_BYREF</constant> - with the <parameter>type</parameter>. In PHP 5, this hack is not - supported; instead, PHP 5 can detect parameters passed by reference - automatically; they do not even need to be passed as VARIANT objects. - </simpara> - <simpara> Consult the <acronym>MSDN</acronym> library for additional information on the VARIANT type. </simpara> @@ -67,28 +60,8 @@ </variablelist> </para> <para> - PHP versions prior to PHP 5 define a number of (undocumented) virtual properties - for instances of the VARIANT class; these properties have all been removed in - PHP 5 in favour of its more natural syntax; these differences are best - highlighted by example: - </para> - <para> - <example xml:id="com.variant.example.php4"> - <title>Variant example, PHP 4.x style</title> - <programlisting role="php"> -<![CDATA[ -<?php -$v = new VARIANT(42); -print "The type is " . $v->type . "<br/>"; -print "The value is " . $v->value . "<br/>"; -?> -]]> - </programlisting> - </example> - </para> - <para> <example xml:id="com.variant.example.php5"> - <title>Variant example, PHP 5 style</title> + <title>Variant example</title> <programlisting role="php"> <![CDATA[ <?php @@ -100,17 +73,9 @@ </programlisting> </example> </para> - <para> - The reason for the change is that, internally, the COM extension sees - VARIANT, COM and DOTNET classes as the same thing, and the design - philosophy for these classes is that all property and member accesses are - passed through to COM with no interference. The new syntax is more - natural and less effort, and most of the removed virtual properties didn't - make any sense in a PHP context in any case. - </para> <note> <para> - PHP 5 takes a much simpler approach to handling VARIANTs; when returning + When returning a value or fetching a variant property, the variant is converted to a PHP value only when there is a direct mapping between the types that would not result in a loss of information. In all other cases, the result is => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92420 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92420 ------------------------------------------------------------------ Modified: en/reference/com/examples.xml By: girgias on 2019-06-08 16:07:00 =================================================================== --- en/reference/com/examples.xml +++ en/reference/com/examples.xml @@ -4,78 +4,44 @@ <chapter xml:id="com.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.examples; - <section xml:id="com.examples.foreach"> - <title>For Each</title> - <para> - Starting with PHP 5, you may use PHP's own - &foreach; statement to iterate - over the contents of a standard COM/OLE IEnumVariant. In layman's terms, - this means that you can use foreach in places where you would have used - <literal>For Each</literal> in VB/ASP code. - </para> - <para> - <example> - <title>For Each in ASP</title> - <programlisting role="asp"> -<![CDATA[ -<% -Set domainObject = GetObject("WinNT://Domain") -For Each obj in domainObject - Response.Write obj.Name & "<br />" -Next -%> -]]> - </programlisting> - </example> - </para> - <para> - <example> - <title>foreach in PHP</title> - <programlisting role="php"> -<![CDATA[ -<?php -$domainObject = new COM("WinNT://Domain"); -foreach ($domainObject as $obj) { - echo $obj->Name . "<br />"; -} -?> -]]> - </programlisting> - </example> - </para> - </section> - <section xml:id="com.examples.arrays"> <title>Arrays and Array-style COM properties</title> <para> Many COM objects expose their properties as arrays, or using array-style - access. In PHP 4, you may use PHP array syntax to read/write such a - property, but only a single dimension is allowed. If you want to read a - multi-dimensional property, you could instead make the property access - into a function call, with each parameter representing each dimension of - the array access, but there is no way to write to such a property. + access. </para> <para> - PHP 5 introduces the following new features to make your life easier: - <itemizedlist> - <listitem> - <para> - Access multi-dimensional arrays, or COM properties that require - multiple parameters using PHP array syntax. You can also write or set - properties using this technique. - </para> - </listitem> - <listitem> - <para> - Iterate SafeArrays ("true" arrays) using the &foreach; control structure. - This works because SafeArrays include information about their size. If an - array-style property implements IEnumVariant then you can also use - foreach for that property too; take a look at <xref - linkend="com.examples.foreach"/> for more information on this topic. - </para> - </listitem> - </itemizedlist> + Access multi-dimensional arrays, or COM properties that require + multiple parameters using PHP array syntax. You can also write or set + properties using this technique. + </para> + <para> + Iterate SafeArrays ("true" arrays) using the &foreach; control structure. + This works because SafeArrays include information about their size. If an + array-style property implements IEnumVariant then you can also use + foreach for that property too. </para> </section> -</chapter> No newline at end of file +</chapter> + + => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92417 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92417 ------------------------------------------------------------------ Modified: en/reference/exif/ini.xml By: girgias on 2019-06-08 16:17:46 =================================================================== --- en/reference/exif/ini.xml +++ en/reference/exif/ini.xml @@ -27,37 +27,37 @@ <entry><link linkend="ini.exif.encode-unicode">exif.encode_unicode</link></entry> <entry>"ISO-8859-15"</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.3.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.exif.decode-unicode-motorola">exif.decode_unicode_motorola</link></entry> <entry>"UCS-2BE"</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.3.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.exif.decode-unicode-intel">exif.decode_unicode_intel</link></entry> <entry>"UCS-2LE"</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.3.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.exif.encode-jis">exif.encode_jis</link></entry> <entry>""</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.3.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.exif.decode-jis-motorola">exif.decode_jis_motorola</link></entry> <entry>"JIS"</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.3.0.</entry> + <entry></entry> </row> <row> <entry><link linkend="ini.exif.decode-jis-intel">exif.decode_jis_intel</link></entry> <entry>"JIS"</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.3.0.</entry> + <entry></entry> </row> </tbody> </tgroup> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92436 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92436 ------------------------------------------------------------------ Modified: en/reference/exif/functions/exif-read-data.xml By: girgias on 2019-06-08 16:18:13 =================================================================== --- en/reference/exif/functions/exif-read-data.xml +++ en/reference/exif/functions/exif-read-data.xml @@ -256,40 +256,6 @@ </itemizedlist> </entry> </row> - <row> - <entry>4.3.0</entry> - <entry> - Can read all embedded <acronym>IFD</acronym> data including arrays - (returned as such). Also the size of an embedded thumbnail is - returned in a <literal>THUMBNAIL</literal> subarray, and can - return thumbnails in <acronym>TIFF</acronym> format. Also, there is - no longer a maximum length for returned values (not until the memory - limit has been reached). - </entry> - </row> - <row> - <entry>4.3.0</entry> - <entry> - If PHP has <link linkend="ref.mbstring">mbstring</link> support, - the user comment can automatically change encoding. Also, if the - user comment uses <literal>Unicode</literal> or <literal>JIS</literal> encoding this encoding will - automatically be changed according to the exif ini settings in - &php.ini; - </entry> - </row> - <row> - <entry>4.3.0</entry> - <entry> - If the image contains any <literal>IFD0</literal> data then - <literal>COMPUTED</literal> contains the entry - <literal>ByteOrderMotorola</literal> which is 0 for - <literal>little-endian</literal> (intel) and 1 for - <literal>big-endian</literal> (motorola) byte order. Also, - <literal>COMPUTED</literal> and <literal>UserComment</literal> no - longer only contain the first copyright entry if the datatype was - wrong. - </entry> - </row> </tbody> </tgroup> </informaltable> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92438 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92438 ------------------------------------------------------------------ Modified: en/reference/image/setup.xml By: girgias on 2019-06-08 16:24:48 =================================================================== --- en/reference/image/setup.xml +++ en/reference/image/setup.xml @@ -19,7 +19,7 @@ <acronym>GIF</acronym> support is available as of gd-2.0.28. <note> <simpara> - As of PHP 5.0 libgd-2.0.4 or higher is required. + libgd-2.0.4 or higher is required. As of PHP 5.5 libgd-2.1.0 or higher is required. Alternatively, use the bundled <acronym>GD</acronym> library that ships with PHP. </simpara> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92441 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92441 ------------------------------------------------------------------ Modified: en/reference/image/functions/getimagesize.xml By: girgias on 2019-06-08 16:25:43 =================================================================== --- en/reference/image/functions/getimagesize.xml +++ en/reference/image/functions/getimagesize.xml @@ -210,48 +210,6 @@ <constant>E_NOTICE</constant> from <constant>E_WARNING</constant>. </entry> </row> - <row> - <entry>4.3.2</entry> - <entry> - Support for <acronym>JPC</acronym>, <acronym>JP2</acronym>, - <acronym>JPX</acronym>, <acronym>JB2</acronym>, - <acronym>XBM</acronym>, and <acronym>WBMP</acronym> became available. - </entry> - </row> - <row> - <entry>4.3.2</entry> - <entry> - JPEG 2000 support was added for the <parameter>imageinfo</parameter> - parameter. - </entry> - </row> - <row> - <entry>4.3.0</entry> - <entry> - <literal>bits</literal> and <literal>channels</literal> are present - for other image types, too. - </entry> - </row> - <row> - <entry>4.3.0</entry> - <entry> - Support for <acronym>SWC</acronym> and <acronym>IFF</acronym> was - added. - </entry> - </row> - <row> - <entry>4.2.0</entry> - <entry> - Support for <acronym>TIFF</acronym> was added. - </entry> - </row> - <row> - <entry>4.0.6</entry> - <entry> - Support for <acronym>BMP</acronym> and <acronym>PSD</acronym> was - added. - </entry> - </row> </tbody> </tgroup> </informaltable> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92442 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92442 ------------------------------------------------------------------ Modified: en/reference/pcntl/functions/pcntl-signal.xml By: girgias on 2019-06-09 08:27:49 =================================================================== --- en/reference/pcntl/functions/pcntl-signal.xml +++ en/reference/pcntl/functions/pcntl-signal.xml @@ -113,20 +113,6 @@ </thead> <tbody> <row> - <entry>4.3.0</entry> - <entry> - As of PHP 4.3.0 PCNTL uses ticks as the signal handle callback - mechanism, which is much faster than the previous mechanism. This - change follows the same semantics as using - "<link linkend="control-structures.declare.ticks">user ticks</link>". - You must use the <link - linkend="control-structures.declare">declare()</link> statement to - specify the locations in your program where callbacks are allowed to - occur for the signal handler to function properly (as used in the - example below). - </entry> - </row> - <row> <entry>7.1.0</entry> <entry> As of PHP 7.1.0 the handler callback is given a second argument @@ -149,7 +135,7 @@ <programlisting role="php"> <![CDATA[ <?php -// tick use required as of PHP 4.3.0 +// tick use required declare(ticks = 1); // signal handler function @@ -180,7 +166,7 @@ pcntl_signal(SIGHUP, "sig_handler"); pcntl_signal(SIGUSR1, "sig_handler"); -// or use an object, available as of PHP 4.3.0 +// or use an object // pcntl_signal(SIGUSR1, array($obj, "do_something")); echo"Generating signal SIGUSR1 to self...n"; => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92449 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92449 ------------------------------------------------------------------ Modified: en/reference/pcntl/book.xml By: girgias on 2019-06-09 08:48:40 =================================================================== --- en/reference/pcntl/book.xml +++ en/reference/pcntl/book.xml @@ -34,13 +34,6 @@ always incur this overhead, whether or not your script actually used pcntl. </para> - <para> - There is one adjustment that all pcntl scripts prior to PHP 4.3.0 must - make for them to work which is to either to use - <function>declare</function> on a section where you wish to allow - callbacks or to just enable it across the entire script using - the new global syntax of <function>declare</function>. - </para> &note.no-windows.extension; </preface> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92450 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92450 ------------------------------------------------------------------ Modified: en/reference/pcre/book.xml By: girgias on 2019-06-10 07:18:45 =================================================================== --- en/reference/pcre/book.xml +++ en/reference/pcre/book.xml @@ -14,9 +14,8 @@ forward slash (/), for example. Delimiters can be any non-alphanumeric, non-whitespace ASCII character except the backslash () and the null byte. If the delimiter character has to be used in the - expression itself, it needs to be escaped by backslash. Since PHP - 4.0.4, you can also use Perl-style (), {}, [], and <> - matching delimiters. + expression itself, it needs to be escaped by backslash. + Perl-style (), {}, [], and <> matching delimiters may also be used. See <link linkend="reference.pcre.pattern.syntax">Pattern Syntax</link> for detailed explanation. </para> @@ -42,6 +41,7 @@ xlink:href="&url.pcre.man;">&url.pcre.man;</link> for more info. </para> </warning> +  <para> The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92467 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92467 ------------------------------------------------------------------ Modified: en/reference/pcre/constants.xml By: girgias on 2019-06-10 07:26:38 =================================================================== --- en/reference/pcre/constants.xml +++ en/reference/pcre/constants.xml @@ -8,9 +8,9 @@ <tgroup cols="2"> <thead> <row> - <entry>constant</entry> - <entry>description</entry> - <entry>since</entry> + <entry>&Constants;</entry> + <entry>&Description;</entry> + <entry>As of</entry> </row> </thead> <tbody> @@ -39,7 +39,7 @@ See the description of <constant>PREG_SPLIT_OFFSET_CAPTURE</constant>. </entry> - <entry>4.3.0</entry> + <entry></entry> </row> <row xml:id="constant.preg-split-no-empty"> <entry><constant>PREG_SPLIT_NO_EMPTY</constant></entry> @@ -55,7 +55,7 @@ This flag tells <function>preg_split</function> to capture parenthesized expression in the delimiter pattern as well. </entry> - <entry>4.0.5</entry> + <entry></entry> </row> <row xml:id="constant.preg-split-offset-capture"> <entry><constant>PREG_SPLIT_OFFSET_CAPTURE</constant></entry> @@ -66,7 +66,7 @@ matched string at offset 0 and its string offset within subject at offset 1. This flag is only used for <function>preg_split</function>. </entry> - <entry>4.3.0</entry> + <entry></entry> </row> <row xml:id="constant.preg-unmatched-as-null"> <entry><constant>PREG_UNMATCHED_AS_NULL</constant></entry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92468 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92468 ------------------------------------------------------------------ Modified: en/reference/nsapi/ini.xml By: girgias on 2019-06-10 07:33:05 =================================================================== --- en/reference/nsapi/ini.xml +++ en/reference/nsapi/ini.xml @@ -25,7 +25,7 @@ <entry><link linkend="ini.nsapi.read-timeout">nsapi.read_timeout</link></entry> <entry>"60"</entry> <entry>PHP_INI_ALL</entry> - <entry>Available since PHP 4.3.3.</entry> + <entry></entry> </row> </tbody> </tgroup> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92469 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92469 ------------------------------------------------------------------ Modified: en/reference/nsapi/functions/nsapi-request-headers.xml By: girgias on 2019-06-10 07:33:08 =================================================================== --- en/reference/nsapi/functions/nsapi-request-headers.xml +++ en/reference/nsapi/functions/nsapi-request-headers.xml @@ -18,8 +18,6 @@ </para> <note> <para> - Prior to PHP 4.3.3, <function>getallheaders</function> was only - available for the Apache servers. After PHP 4.3.3, <function>getallheaders</function> is an alias for <function>nsapi_request_headers</function> if you use the NSAPI module. </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=92470 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=92470 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.