Prepared a 0.2.0 release (including refresh of doxygen.ini and other …

…packaging related fixes).

composer.json

@@ -20,7 +20,8 @@
         "php": ">=5.3.9"
     },
     "suggest": {
-        "ext-apc": ">=3.0.13",
+        "ext-apc": ">=3.1.1",
+        "ext-apc": ">=5.0.0",
         "ext-wincache": ">=1.1.0"
     },
     "autoload": {

docs/apigen.neon

@@ -1,14 +1,17 @@
-source: ../src
+title: PEAR2_Cache_SHM documentation
 
-destination: PEAR2_Cache_SHM__ApiGen_Documentation
+source:
+  - ../src
 
-extensions: php
+destination: Reference/ApiGen/Doc
 
-charset: UTF-8
+extensions:
+  - php
 
-title: PEAR2_Cache_SHM documentation
+charset:
+  - UTF-8
+
+accessLevels:
+  - public
 
-autocomplete:
-    - classes
-    - methods
-    - classconstants
+tree: true

docs/phpdoc.dist.xml

@@ -3,7 +3,7 @@
     <title>PEAR2_Cache_SHM documentation</title>
     <parser>
         <default-package-name>PEAR2_Cache_SHM</default-package-name>
-        <target>PEAR2_Cache_SHM__PhpDocumentor_Cache</target>
+        <target>Reference/PhpDocumentor/Cache</target>
         <extensions>
             <extension>php</extension>
         </extensions>
@@ -13,6 +13,6 @@
         <file>../src/PEAR2/Cache/SHM.php</file>
     </files>
     <transformer>
-        <target>PEAR2_Cache_SHM__PhpDocumentor_Documentation</target>
+        <target>Reference/PhpDocumentor/Doc</target>
     </transformer>
 </phpdoc>

extrasetup.php

@@ -29,11 +29,11 @@
     foreach ($channelPackages as $package) {
         foreach ($registry->toPackage($package, $channel)->installcontents
             as $file => $info) {
-            if (strpos($file, 'php/') === 0) {
+            if (strpos($file, 'php/') === 0 || strpos($file, 'src/') === 0) {
                 $filename = substr($file, 4);
                 $extrafiles['src/' . $filename]
                     = realpath($phpDir . DIRECTORY_SEPARATOR . $filename);
             }
         }
     }
-}
+}

package.xml

@@ -2,31 +2,31 @@
 <package version="2.1" xmlns="http://pear.php.net/dtd/package-2.1" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0     http://pear.php.net/dtd/tasks-1.0.xsd     http://pear.php.net/dtd/package-2.1     http://pear.php.net/dtd/package-2.1.xsd">
  <name>PEAR2_Cache_SHM</name>
  <channel>pear2.php.net</channel>
- <summary>Wrapper for shared memory and locking functionality across different extensions.</summary>
+ <summary>Wrapper for shared memory and locking functionality across different extensions.
+</summary>
  <description>Allows you to share data across requests as long as the PHP process is running. One of APC or WinCache is required to accomplish this, with other extensions being potentially pluggable as adapters.</description>
  <lead>
   <name>Vasil Rangelov</name>
   <user>boen_robot</user>
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2014-11-02</date>
- <time>06:53:24</time>
+ <date>2016-11-07</date>
+ <time>02:54:44</time>
  <version>
-  <release>0.1.3</release>
+  <release>0.2.0</release>
   <api>0.1.0</api>
  </version>
  <stability>
   <release>alpha</release>
   <api>alpha</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL License 2.1</license>
- <notes>* Wincache and APC now check their requirements in greater detail:
-    - APC checks if it's enabled by the apc.enabled INI setting.
-    - Wincache checks if the user cache is enabled by wincache.ucenabled INI setting.
-    - Both check if the SAPI is CLI, and if so, whether that's allowed by the respective ini setting.
-* The PHAR stub also checks and reports the above.
-* SHM::getIterator() now returns ArrayObject instead of a normal array, in order to be compatible with how IteratorAggregate actually works.
+ <notes>* __Added APCu adapter__
+* Version requirements bumped to ones that reflect fully available functionality. More specifically:
+    - APC 3.1.1 is now the required minimum (previously, 3.0.13), because it's the minimum for APCIterator.
+    - APCu 5.0.0 is required, because of APCUIterator, though 4.0.0 would be sufficient for the rest.
+    - PHP 5.3.9 is the minimum required PHP version, because it is the firt one in which a critical bug affecting this package is fixed. See [#43200](https://bugs.php.net/bug.php?id=43200) for details.
 * Doc and CS fixes.</notes>
  <contents>
   <dir name="/">
@@ -49,23 +49,40 @@
        <dir name="Adapter">
         <file role="php" name="APC.php">
          <tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
+         <tasks:replace type="package-info" to="summary" from="~~summary~~"/>
+         <tasks:replace type="package-info" to="description" from="~~description~~"/>
+        </file>
+        <file role="php" name="APCu.php">
+         <tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
+         <tasks:replace type="package-info" to="summary" from="~~summary~~"/>
+         <tasks:replace type="package-info" to="description" from="~~description~~"/>
         </file>
         <file role="php" name="Placebo.php">
          <tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
+         <tasks:replace type="package-info" to="summary" from="~~summary~~"/>
+         <tasks:replace type="package-info" to="description" from="~~description~~"/>
         </file>
         <file role="php" name="Wincache.php">
          <tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
+         <tasks:replace type="package-info" to="summary" from="~~summary~~"/>
+         <tasks:replace type="package-info" to="description" from="~~description~~"/>
         </file>
        </dir>
        <file role="php" name="Exception.php">
         <tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
+        <tasks:replace type="package-info" to="summary" from="~~summary~~"/>
+        <tasks:replace type="package-info" to="description" from="~~description~~"/>
        </file>
        <file role="php" name="InvalidArgumentException.php">
         <tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
+        <tasks:replace type="package-info" to="summary" from="~~summary~~"/>
+        <tasks:replace type="package-info" to="description" from="~~description~~"/>
        </file>
       </dir>
       <file role="php" name="SHM.php">
        <tasks:replace type="package-info" to="version" from="GIT: $Id$"/>
+       <tasks:replace type="package-info" to="summary" from="~~summary~~"/>
+       <tasks:replace type="package-info" to="description" from="~~description~~"/>
       </file>
      </dir>
     </dir>
@@ -88,6 +105,7 @@
       <file role="test" name="SHM-factory.php"/>
      </dir>
      <file role="test" name="APC.phpt"/>
+     <file role="test" name="APCu.phpt"/>
      <file role="test" name="Placebo.phpt"/>
      <file role="test" name="SHM-factory_CGI.phpt"/>
      <file role="test" name="SHM-factory_CLI.phpt"/>
@@ -115,11 +133,15 @@
    <package>
     <name>PEAR2_Autoload</name>
     <channel>pear2.php.net</channel>
-    <min>0.2.4</min>
+    <min>0.3.0</min>
    </package>
    <extension>
     <name>apc</name>
-    <min>3.0.13</min>
+    <min>3.1.1</min>
+   </extension>
+   <extension>
+    <name>apcu</name>
+    <min>5.0.0</min>
    </extension>
    <extension>
     <name>wincache</name>
@@ -134,12 +156,14 @@
    <install name="docs/phpdoc.dist.xml" as="phpdoc.dist.xml"/>
    <install name="src/PEAR2/Cache/SHM.php" as="PEAR2/Cache/SHM.php"/>
    <install name="src/PEAR2/Cache/SHM/Adapter/APC.php" as="PEAR2/Cache/SHM/Adapter/APC.php"/>
+   <install name="src/PEAR2/Cache/SHM/Adapter/APCu.php" as="PEAR2/Cache/SHM/Adapter/APCu.php"/>
    <install name="src/PEAR2/Cache/SHM/Adapter/Placebo.php" as="PEAR2/Cache/SHM/Adapter/Placebo.php"/>
    <install name="src/PEAR2/Cache/SHM/Adapter/Wincache.php" as="PEAR2/Cache/SHM/Adapter/Wincache.php"/>
    <install name="src/PEAR2/Cache/SHM/Exception.php" as="PEAR2/Cache/SHM/Exception.php"/>
    <install name="src/PEAR2/Cache/SHM/InvalidArgumentException.php" as="PEAR2/Cache/SHM/InvalidArgumentException.php"/>
    <install name="tests/bootstrap.php" as="bootstrap.php"/>
    <install name="tests/PHPT/APC.phpt" as="PHPT/APC.phpt"/>
+   <install name="tests/PHPT/APCu.phpt" as="PHPT/APCu.phpt"/>
    <install name="tests/PHPT/Common/testAddingTtlValue_part1.phpt" as="PHPT/Common/testAddingTtlValue_part1.phpt"/>
    <install name="tests/PHPT/Common/testAddingTtlValue_part2.phpt" as="PHPT/Common/testAddingTtlValue_part2.phpt"/>
    <install name="tests/PHPT/Common/testAddingTtlValue_part3.phpt" as="PHPT/Common/testAddingTtlValue_part3.phpt"/>

packagexmlsetup.php

@@ -46,6 +46,14 @@
         'GIT: $Id$' => array(
             'type' => 'package-info',
             'to' => 'version'
+        ),
+        '~~summary~~' => array(
+            'type' => 'package-info',
+            'to' => 'summary'
+        ),
+        '~~description~~' => array(
+            'type' => 'package-info',
+            'to' => 'description'
         )
     ),
     'eol' => array(