svn: /phpdoc/ja/trunk/reference/phar/ Phar/extractTo.xml Phar.xml PharData/addEmptyDir.xml PharData/addFromString.xml PharData/compressFiles.xml PharData.xml PharException.xml book.xml constants.xml installation.xml using.xml

Modified: phpdoc/ja/trunk/reference/phar/Phar/extractTo.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/Phar/extractTo.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/Phar/extractTo.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 339493 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 344088 Maintainer: takagi Status: ready -->
+<!-- Credits: mumumu -->
 <refentry xml:id="phar.extractto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Phar::extractTo</refname>
@@ -13,7 +14,7 @@
    <modifier>public</modifier> <type>bool</type><methodname>Phar::extractTo</methodname>
    <methodparam><type>string</type><parameter>pathto</parameter></methodparam>
    <methodparam choice="opt"><type>string|array</type><parameter>files</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter><initializer>false</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>

   <para>
@@ -46,6 +47,7 @@
      <listitem>
       <para>
        展開したいファイル名/ディレクトリ名、あるいはその配列。
+       この引数をスキップするには &null; を指定します。
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/ja/trunk/reference/phar/Phar.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/Phar.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/Phar.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 330307 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 345662 Maintainer: takagi Status: ready -->
+<!-- Credits: mumumu -->

 <phpdoc:classref xml:id="class.phar" xmlns="http://docbook.org/ns/docbook"
  xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -47,6 +48,11 @@
     </classsynopsisinfo>
 <!-- }}} -->

+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.filesystemiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.phar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />


Modified: phpdoc/ja/trunk/reference/phar/PharData/addEmptyDir.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/PharData/addEmptyDir.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/PharData/addEmptyDir.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 343898 Maintainer: takagi Status: ready -->
+<!-- Credits: mumumu -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="phardata.addemptydir">
  <refnamediv>
   <refname>PharData::addEmptyDir</refname>
@@ -9,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>bool</type><methodname>PharData::addEmptyDir</methodname>
+   <type>void</type><methodname>PharData::addEmptyDir</methodname>
    <methodparam><type>string</type><parameter>dirname</parameter></methodparam>
   </methodsynopsis>


Modified: phpdoc/ja/trunk/reference/phar/PharData/addFromString.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/PharData/addFromString.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/PharData/addFromString.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 343898 Maintainer: takagi Status: ready -->
+<!-- Credits: mumumu -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="phardata.addfromstring">
  <refnamediv>
   <refname>PharData::addFromString</refname>
@@ -9,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>bool</type><methodname>PharData::addFromString</methodname>
+   <type>void</type><methodname>PharData::addFromString</methodname>
    <methodparam><type>string</type><parameter>localname</parameter></methodparam>
    <methodparam><type>string</type><parameter>contents</parameter></methodparam>
   </methodsynopsis>

Modified: phpdoc/ja/trunk/reference/phar/PharData/compressFiles.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/PharData/compressFiles.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/PharData/compressFiles.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 343898 Maintainer: takagi Status: ready -->
+<!-- Credits: mumumu -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="phardata.compressfiles">
  <refnamediv>
   <refname>PharData::compressFiles</refname>
@@ -10,7 +11,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>bool</type><methodname>PharData::compressFiles</methodname>
+   <type>void</type><methodname>PharData::compressFiles</methodname>
    <methodparam><type>int</type><parameter>compression</parameter></methodparam>
   </methodsynopsis>

@@ -53,7 +54,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.success;
+   &return.void;
   </para>
  </refsect1>


Modified: phpdoc/ja/trunk/reference/phar/PharData.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/PharData.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/PharData.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 330307 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 345662 Maintainer: takagi Status: ready -->
+<!-- Credits: mumumu -->

 <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.phardata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>PharData クラス</title>
@@ -38,16 +39,22 @@

      <ooclass>
       <modifier>extends</modifier>
-      <classname>Phar</classname>
+      <classname>RecursiveDirectoryIterator</classname>
      </ooclass>

     </classsynopsisinfo>
 <!-- }}} -->

+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.filesystemiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.phardata')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />

     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+    <!-- PharData doesn't extend Phar but it aliases all its methods so we list them here. -->
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.phar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />

    </classsynopsis>

Modified: phpdoc/ja/trunk/reference/phar/PharException.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/PharException.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/PharException.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 343888 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 347547 Maintainer: takagi Status: ready -->
+<!-- Credits: mumumu -->

 <phpdoc:exceptionref xml:id="class.pharexception" xmlns="http://docbook.org/ns/docbook"
  xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -54,21 +55,7 @@
   </section>

  </partintro>
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="pharexception.intro.unused">
- <refnamediv>
-  <refname>PharException</refname>
-  <refpurpose>PharException クラスは、try/catch ブロックで使用するための
-    phar 固有の例外クラスです</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;

-  <para>
-  </para>
- </refsect1>
-
-</refentry>
-
 </phpdoc:exceptionref>

 <!-- Keep this comment at the end of the file

Modified: phpdoc/ja/trunk/reference/phar/book.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/book.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/book.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 336907 Maintainer: takagi Status: ready -->
-<!-- CREDITS: shimooka -->
+<!-- EN-Revision: 344870 Maintainer: takagi Status: ready -->
+<!-- CREDITS: shimooka,mumumu -->

 <book xml:id="book.phar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="core" ?>
+ <?phpdoc extension-membership="bundled" ?>
  <title>Phar</title>

  <!-- {{{ preface -->

Modified: phpdoc/ja/trunk/reference/phar/constants.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/constants.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/constants.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 323628 Maintainer: takagi Status: ready -->
-<!-- CREDITS: shimooka -->
+<!-- EN-Revision: 345111 Maintainer: takagi Status: ready -->
+<!-- CREDITS: shimooka,mumumu -->

 <appendix xml:id="phar.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.constants;
@@ -63,14 +63,6 @@
      </row>
     </thead>
     <tbody>
-     <row xml:id="phar.constants.same">
-      <entry>
-       <constant>Phar::SAME</constant>
-       (<type>integer</type>)
-      </entry>
-      <entry>0</entry>
-      <entry>同じファイル形式を維持する</entry>
-     </row>
      <row xml:id="phar.constants.phar">
       <entry>
        <constant>Phar::PHAR</constant>
@@ -168,7 +160,7 @@
        <constant>Phar::PHP</constant>
        (<type>integer</type>)
       </entry>
-      <entry>1</entry>
+      <entry>0</entry>
       <entry>
       <function>Phar::webPhar</function> の mimeoverrides
       パラメータに対して、その拡張子を PHP ファイルとしてパースするよう指示する
@@ -179,7 +171,7 @@
        <constant>Phar::PHPS</constant>
        (<type>integer</type>)
       </entry>
-      <entry>2</entry>
+      <entry>1</entry>
       <entry>
       <function>Phar::webPhar</function> の mimeoverrides
       パラメータに対して、その拡張子を PHP ファイルとしてパースして

Modified: phpdoc/ja/trunk/reference/phar/installation.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/installation.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/installation.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: takagi Status: ready -->
-<!-- CREDITS: shimooka -->
+<!-- EN-Revision: 344870 Maintainer: takagi Status: ready -->
+<!-- CREDITS: shimooka,mumumu -->
 <section xml:id="phar.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.install;
  <para>
-  PHP 5.3.0 以降 Phar 拡張モジュールは組み込みとなりました。
+  Phar 拡張モジュールは PHP 5.3.0 以降は PHP にバンドルされており、
+  デフォルトで有効になっています。
+  Phar のサポートを無効にするには、
+  <option role="configure">--disable-phar</option> を使ってください。
+ </para>
+ <para>
   それより前のバージョンの PHP では PECL 拡張モジュールとしてインストールできます。
   <link xlink:href="&url.pecl.package;phar">PECL の Phar のページ</link>
   には詳しい情報や過去の歴史があります。

Modified: phpdoc/ja/trunk/reference/phar/using.xml
===================================================================
--- phpdoc/ja/trunk/reference/phar/using.xml	2020-01-20 13:36:53 UTC (rev 348975)
+++ phpdoc/ja/trunk/reference/phar/using.xml	2020-01-20 13:55:41 UTC (rev 348976)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 322193 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 347277 Maintainer: takagi Status: ready -->
+<!-- Credits: mumumu -->
 <chapter xml:id="phar.using" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Phar アーカイブの使用法</title>

@@ -96,7 +97,7 @@
         // stopBuffering() がコールされるまで (一時的なストレージが必要となっても) なにも書き込まれません
         $p->startBuffering();
         // すべてのファイルを /path/to/project に追加し、プレフィックス "project" で phar に保存します
-        $p->buildFromIterator(new RecursiveIteratorIterator(new DirectoryIterator('/path/to/project')), '/path/to/');
+        $p->buildFromIterator(new RecursiveIteratorIterator(new RecursiveDirectoryIterator('/path/to/project')), '/path/to/');

         // 配列形式の API で新しいファイルを追加します
         $p['file1.txt'] = 'Information';