svn: /phpdoc/ja/trunk/reference/fileinfo/ finfo/buffer.xml finfo/construct.xml finfo/file.xml finfo/set-flags.xml functions/finfo-buffer.xml functions/finfo-file.xml functions/finfo-open.xml functions/finfo-set-flags.xml functions/mime-content-type.xml
[email protected] (Yoshinari Takaoka)
| Newsgroups | php.doc.ja |
|---|---|
| Message-ID | <[email protected]> |
mumumu Thu, 19 Nov 2020 00:31:28 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=351445 Log: Generate fileinfo methodsynopses based on stubs Based on a patch contributed by Máté Kocsis <[email protected]>. Changed paths: U phpdoc/ja/trunk/reference/fileinfo/finfo/buffer.xml U phpdoc/ja/trunk/reference/fileinfo/finfo/construct.xml U phpdoc/ja/trunk/reference/fileinfo/finfo/file.xml U phpdoc/ja/trunk/reference/fileinfo/finfo/set-flags.xml U phpdoc/ja/trunk/reference/fileinfo/functions/finfo-buffer.xml U phpdoc/ja/trunk/reference/fileinfo/functions/finfo-file.xml U phpdoc/ja/trunk/reference/fileinfo/functions/finfo-open.xml U phpdoc/ja/trunk/reference/fileinfo/functions/finfo-set-flags.xml U phpdoc/ja/trunk/reference/fileinfo/functions/mime-content-type.xml
svn-diffs-351445.txt
(text/x-diff, 20.7 KB)
Modified: phpdoc/ja/trunk/reference/fileinfo/finfo/buffer.xml
===================================================================
--- phpdoc/ja/trunk/reference/fileinfo/finfo/buffer.xml 2020-11-19 00:12:20 UTC (rev 351444)
+++ phpdoc/ja/trunk/reference/fileinfo/finfo/buffer.xml 2020-11-19 00:31:28 UTC (rev 351445)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347865 Maintainer: satoruyoshida Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: satoruyoshida Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="finfo.buffer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -11,10 +11,10 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis role="oop">
- <modifier>public</modifier> <type>string</type><methodname>finfo::buffer</methodname>
+ <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>finfo::buffer</methodname>
<methodparam><type>string</type><parameter>string</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
- <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
&info.function.alias; <link linkend="function.finfo-buffer">finfo_buffer()</link>
Modified: phpdoc/ja/trunk/reference/fileinfo/finfo/construct.xml
===================================================================
--- phpdoc/ja/trunk/reference/fileinfo/finfo/construct.xml 2020-11-19 00:12:20 UTC (rev 351444)
+++ phpdoc/ja/trunk/reference/fileinfo/finfo/construct.xml 2020-11-19 00:31:28 UTC (rev 351445)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347865 Maintainer: satoruyoshida Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: satoruyoshida Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="finfo.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -10,10 +10,10 @@
<refsect1 role="description">
&reftitle.description;
- <constructorsynopsis>
+ <constructorsynopsis role="oop">
<modifier>public</modifier> <methodname>finfo::__construct</methodname>
- <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>magic_file</parameter><initializer>""</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+ <methodparam choice="opt"><type>string</type><parameter>magic_database</parameter><initializer>""</initializer></methodparam>
</constructorsynopsis>
<para>
&info.function.alias; <function>finfo_open</function>
@@ -20,7 +20,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/fileinfo/finfo/file.xml
===================================================================
--- phpdoc/ja/trunk/reference/fileinfo/finfo/file.xml 2020-11-19 00:12:20 UTC (rev 351444)
+++ phpdoc/ja/trunk/reference/fileinfo/finfo/file.xml 2020-11-19 00:31:28 UTC (rev 351445)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347865 Maintainer: satoruyoshida Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: satoruyoshida Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="finfo.file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -11,10 +11,10 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis role="oop">
- <modifier>public</modifier> <type>string</type><methodname>finfo::file</methodname>
- <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
- <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+ <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>finfo::file</methodname>
+ <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
&info.function.alias; <link linkend="function.finfo-file">finfo_file()</link>
Modified: phpdoc/ja/trunk/reference/fileinfo/finfo/set-flags.xml
===================================================================
--- phpdoc/ja/trunk/reference/fileinfo/finfo/set-flags.xml 2020-11-19 00:12:20 UTC (rev 351444)
+++ phpdoc/ja/trunk/reference/fileinfo/finfo/set-flags.xml 2020-11-19 00:31:28 UTC (rev 351445)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 339319 Maintainer: satoruyoshida Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: satoruyoshida Status: ready -->
+<!-- Credits: mumumu -->
<refentry xml:id="finfo.set-flags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>finfo::set_flags</refname>
@@ -11,7 +12,7 @@
&reftitle.description;
<methodsynopsis role="oop">
<modifier>public</modifier> <type>bool</type><methodname>finfo::set_flags</methodname>
- <methodparam><type>int</type><parameter>options</parameter></methodparam>
+ <methodparam><type>int</type><parameter>flags</parameter></methodparam>
</methodsynopsis>
<para>
&info.function.alias; <link linkend="function.finfo-set-flags">finfo_set_flags()</link>
@@ -18,7 +19,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/fileinfo/functions/finfo-buffer.xml
===================================================================
--- phpdoc/ja/trunk/reference/fileinfo/functions/finfo-buffer.xml 2020-11-19 00:12:20 UTC (rev 351444)
+++ phpdoc/ja/trunk/reference/fileinfo/functions/finfo-buffer.xml 2020-11-19 00:31:28 UTC (rev 351445)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347865 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.finfo-buffer" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -12,18 +12,18 @@
&reftitle.description;
<para>&style.procedural;</para>
<methodsynopsis role="procedural">
- <type>string</type><methodname>finfo_buffer</methodname>
+ <type class="union"><type>string</type><type>false</type></type><methodname>finfo_buffer</methodname>
<methodparam><type>resource</type><parameter>finfo</parameter></methodparam>
<methodparam><type>string</type><parameter>string</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
- <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> <type>string</type><methodname>finfo::buffer</methodname>
+ <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>finfo::buffer</methodname>
<methodparam><type>string</type><parameter>string</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
- <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
@@ -52,7 +52,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>options</parameter></term>
+ <term><parameter>flags</parameter></term>
<listitem>
<para>
ひとつあるいは複数の<link linkend="fileinfo.constants">Fileinfo
@@ -78,6 +78,28 @@
</para>
</refsect1>
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>context</parameter> は、nullable になりました。
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
+
<refsect1 role="examples">
&reftitle.examples;
<para>
@@ -111,7 +133,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/fileinfo/functions/finfo-file.xml
===================================================================
--- phpdoc/ja/trunk/reference/fileinfo/functions/finfo-file.xml 2020-11-19 00:12:20 UTC (rev 351444)
+++ phpdoc/ja/trunk/reference/fileinfo/functions/finfo-file.xml 2020-11-19 00:31:28 UTC (rev 351445)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347865 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.finfo-file" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -12,18 +12,18 @@
&reftitle.description;
<para>&style.procedural;</para>
<methodsynopsis role="procedural">
- <type>string</type><methodname>finfo_file</methodname>
+ <type class="union"><type>string</type><type>false</type></type><methodname>finfo_file</methodname>
<methodparam><type>resource</type><parameter>finfo</parameter></methodparam>
- <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
- <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+ <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> <type>string</type><methodname>finfo::file</methodname>
- <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
- <methodparam choice="opt"><type>resource</type><parameter>context</parameter></methodparam>
+ <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>finfo::file</methodname>
+ <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
@@ -44,7 +44,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>file_name</parameter></term>
+ <term><parameter>filename</parameter></term>
<listitem>
<para>
調べるファイルの名前。
@@ -52,7 +52,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>options</parameter></term>
+ <term><parameter>flags</parameter></term>
<listitem>
<para>
ひとつあるいは複数の<link linkend="fileinfo.constants">Fileinfo
@@ -75,11 +75,33 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- <parameter>file_name</parameter> のテキスト表現、あるいはエラーが発生した場合に
+ <parameter>filename</parameter> のテキスト表現、あるいはエラーが発生した場合に
&false; を返します。
</para>
</refsect1>
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>context</parameter> は、nullable になりました。
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
+
<refsect1 role="examples">
&reftitle.examples;
<para>
@@ -118,7 +140,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/fileinfo/functions/finfo-open.xml
===================================================================
--- phpdoc/ja/trunk/reference/fileinfo/functions/finfo-open.xml 2020-11-19 00:12:20 UTC (rev 351444)
+++ phpdoc/ja/trunk/reference/fileinfo/functions/finfo-open.xml 2020-11-19 00:31:28 UTC (rev 351445)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 351135 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.finfo-open" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -14,14 +14,14 @@
<para>&style.procedural;</para>
<methodsynopsis role="procedural">
<type class="union"><type>resource</type><type>false</type></type><methodname>finfo_open</methodname>
- <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>magic_file</parameter><initializer>""</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+ <methodparam choice="opt"><type>string</type><parameter>magic_database</parameter><initializer>""</initializer></methodparam>
</methodsynopsis>
<para>&style.oop; (コンストラクタ)</para>
- <constructorsynopsis>
+ <constructorsynopsis role="oop">
<modifier>public</modifier> <methodname>finfo::__construct</methodname>
- <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>FILEINFO_NONE</initializer></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>magic_file</parameter><initializer>""</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>FILEINFO_NONE</constant></initializer></methodparam>
+ <methodparam choice="opt"><type>string</type><parameter>magic_database</parameter><initializer>""</initializer></methodparam>
</constructorsynopsis>
<para>
この関数は、magic データベースをオープンしてそのリソースを返します。
@@ -33,7 +33,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>options</parameter></term>
+ <term><parameter>flags</parameter></term>
<listitem>
<para>
ひとつあるいは複数の<link linkend="fileinfo.constants">Fileinfo
@@ -42,7 +42,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>magic_file</parameter></term>
+ <term><parameter>magic_database</parameter></term>
<listitem>
<para>
magic データベースファイルの名前。通常は
@@ -84,7 +84,7 @@
<para>
一般的には、独自の magic データベースを使う必要がある場合を除いて、
組み込みの magic データベースを使うのが一番いい方法です
- (<parameter>magic_file</parameter> を省略し、環境変数 <literal>MAGIC</literal>
+ (<parameter>magic_database</parameter> を省略し、環境変数 <literal>MAGIC</literal>
も設定しないようにします)。
</para>
</note>
@@ -147,7 +147,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/fileinfo/functions/finfo-set-flags.xml
===================================================================
--- phpdoc/ja/trunk/reference/fileinfo/functions/finfo-set-flags.xml 2020-11-19 00:12:20 UTC (rev 351444)
+++ phpdoc/ja/trunk/reference/fileinfo/functions/finfo-set-flags.xml 2020-11-19 00:31:28 UTC (rev 351445)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 330543 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: takagi Status: ready -->
<refentry xml:id="function.finfo-set-flags" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>finfo_set_flags</refname>
@@ -13,12 +13,12 @@
<methodsynopsis role="procedural">
<type>bool</type><methodname>finfo_set_flags</methodname>
<methodparam><type>resource</type><parameter>finfo</parameter></methodparam>
- <methodparam><type>int</type><parameter>options</parameter></methodparam>
+ <methodparam><type>int</type><parameter>flags</parameter></methodparam>
</methodsynopsis>
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> <type>bool</type><methodname>finfo::set_flags</methodname>
- <methodparam><type>int</type><parameter>options</parameter></methodparam>
+ <methodparam><type>int</type><parameter>flags</parameter></methodparam>
</methodsynopsis>
<para>
@@ -41,7 +41,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>options</parameter></term>
+ <term><parameter>flags</parameter></term>
<listitem>
<para>
ひとつあるいは複数の<link linkend="fileinfo.constants">Fileinfo
@@ -60,7 +60,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/fileinfo/functions/mime-content-type.xml
===================================================================
--- phpdoc/ja/trunk/reference/fileinfo/functions/mime-content-type.xml 2020-11-19 00:12:20 UTC (rev 351444)
+++ phpdoc/ja/trunk/reference/fileinfo/functions/mime-content-type.xml 2020-11-19 00:31:28 UTC (rev 351445)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 351135 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351435 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: takagi -->
<refentry xml:id="function.mime-content-type" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -12,7 +12,7 @@
&reftitle.description;
<methodsynopsis>
<type class="union"><type>string</type><type>false</type></type><methodname>mime_content_type</methodname>
- <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+ <methodparam><type class="union"><type>resource</type><type>string</type></type><parameter>filename</parameter></methodparam>
</methodsynopsis>
<para>
<filename>magic.mime</filename> ファイルの情報を用いて、
@@ -85,7 +85,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml