Upgrade for H6 branch

horde · Mar 20, 2021 · 29276dc · 29276dc
1 parent a90beaa
commit 29276dc
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 67 deletions.
diff --git a/.horde.yml b/.horde.yml
@@ -21,33 +21,26 @@ authors:
     active: false
     role: developer
 version:
-  release: 2.1.4
-  api: 2.1.0
+  release: 3.0.0alpha1
+  api: 3.0.0alpha1
 state:
-  release: stable
-  api: stable
+  release: alpha
+  api: alpha
 license:
   identifier: LGPL-2.1
   uri: http://www.horde.org/licenses/lgpl21
 dependencies:
   required:
-    php: ^5.3 || ^7
-    pear:
-      pear.horde.org/Horde_Autoloader: ^2
+    php: ^7
+    composer:
+      horde/autoloader: ^3
     ext:
       json: '*'
   optional:
-    pear:
-      pear.horde.org/horde_lz4:
-        version: '*'
-        providesextension: horde_lz4
-      pecl.php.net/lzf:
-        version: ^1.5.2
-        providesextension: lzf
-      pecl.php.net/msgpack:
-        version: '*'
-        providesextension: msgpack
     ext:
+      horde_lz4: '*'
+      lzf: '*'
+      msgpack: '*'
       apc: '*'
       eaccelerator: '*'
       xcache: '*'
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "horde/autoloader-cache",
+    "name": "horde/autoloader_cache",
     "description": "Caching library for Horde_Autoloader",
     "type": "library",
     "homepage": "https://www.horde.org/libraries/Horde_Autoloader_Cache",
@@ -16,34 +16,32 @@
             "role": "developer"
         }
     ],
-    "version": "2.1.4",
-    "time": "2017-11-11",
+    "time": "2021-03-20",
     "repositories": [
         {
-            "type": "pear",
-            "url": "https://pear.horde.org"
+            "type": "composer",
+            "url": "https://horde-satis.maintaina.com/"
         }
     ],
     "require": {
-        "php": "^5.3 || ^7",
-        "pear-pear.horde.org/Horde_Autoloader": "^2",
+        "php": "^7",
+        "horde/autoloader": "^3",
         "ext-json": "*"
     },
     "suggest": {
-        "pear-pear.horde.org/horde_lz4": "*",
-        "pear-pecl.php.net/lzf": "^1.5.2",
-        "pear-pecl.php.net/msgpack": "*",
+        "ext-horde_lz4": "*",
+        "ext-lzf": "*",
+        "ext-msgpack": "*",
         "ext-apc": "*",
         "ext-eaccelerator": "*",
         "ext-xcache": "*"
     },
-    "replace": {
-        "pear-pear.horde.org/Horde_Autoloader_Cache": "2.*",
-        "pear-horde/Horde_Autoloader_Cache": "2.*"
-    },
     "autoload": {
         "psr-0": {
             "Horde_Autoloader_Cache": "lib/"
         }
-    }
-}
+    },
+    "bin": [
+        "bin/horde-autoloader-cache-prune"
+    ]
+}
diff --git a/doc/Horde/Autoloader/Cache/CHANGES b/doc/Horde/Autoloader/Cache/CHANGES
@@ -1,3 +1,9 @@
+----------
+v3.0.0-alpha1
+----------
+
+[rla] Add H6 composer metadata.
+
 ----------
 v2.1.4-git
 ----------

diff --git a/doc/Horde/Autoloader/Cache/changelog.yml b/doc/Horde/Autoloader/Cache/changelog.yml
@@ -1,4 +1,15 @@
 ---
+3.0.0alpha1:
+  api: 3.0.0
+  state:
+    release: alpha
+    api: alpha
+  date: 2021-03-17
+  license:
+    identifier: LGPL-2.1
+    uri: http://www.horde.org/licenses/lgpl21
+  notes: |
+    [rla] Add H6 composer metadata.
 2.1.4:
   api: 2.1.0
   state:

diff --git a/package.xml b/package.xml
@@ -3,7 +3,7 @@
  <name>Horde_Autoloader_Cache</name>
  <channel>pear.horde.org</channel>
  <summary>Caching library for Horde_Autoloader</summary>
- <description>Extension of the Horde_Autoloader that implements caching of class-file-maps. The caching method is determined automatically from the list of supported cache backends: APC, XCache, eAccelerator, local file system.
+ <description>An extension of the Horde autoloader that implements caching of class-file-maps. The caching method is determined automatically from the list of supported cache backends: APC, XCache, eAccelerator, local file system.
 </description>
  <lead>
   <name>Jan Schneider</name>
@@ -17,14 +17,14 @@
   <email>[email protected]</email>
   <active>no</active>
  </developer>
- <date>2017-11-11</date>
+ <date>2021-03-20</date>
  <version>
-  <release>2.1.4</release>
-  <api>2.1.0</api>
+  <release>3.0.0alpha1</release>
+  <api>3.0.0alpha1</api>
  </version>
  <stability>
-  <release>stable</release>
-  <api>stable</api>
+  <release>alpha</release>
+  <api>alpha</api>
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
@@ -62,43 +62,27 @@
  <dependencies>
   <required>
    <php>
-    <min>5.3.0</min>
+    <min>7.0.0</min>
     <max>8.0.0alpha1</max>
     <exclude>8.0.0alpha1</exclude>
    </php>
    <pearinstaller>
     <min>1.7.0</min>
    </pearinstaller>
-   <package>
-    <name>Horde_Autoloader</name>
-    <channel>pear.horde.org</channel>
-    <min>2.0.0</min>
-    <max>3.0.0alpha1</max>
-    <exclude>3.0.0alpha1</exclude>
-   </package>
    <extension>
     <name>json</name>
    </extension>
   </required>
   <optional>
-   <package>
+   <extension>
     <name>horde_lz4</name>
-    <channel>pear.horde.org</channel>
-    <providesextension>horde_lz4</providesextension>
-   </package>
-   <package>
+   </extension>
+   <extension>
     <name>lzf</name>
-    <channel>pecl.php.net</channel>
-    <min>1.5.2</min>
-    <max>2.0.0alpha1</max>
-    <exclude>2.0.0alpha1</exclude>
-    <providesextension>lzf</providesextension>
-   </package>
-   <package>
+   </extension>
+   <extension>
     <name>msgpack</name>
-    <channel>pecl.php.net</channel>
-    <providesextension>msgpack</providesextension>
-   </package>
+   </extension>
    <extension>
     <name>apc</name>
    </extension>
@@ -378,12 +362,12 @@
   </release>
   <release>
    <version>
-    <release>2.1.4</release>
-    <api>2.1.0</api></version>
+    <release>3.0.0alpha1</release>
+    <api>3.0.0alpha1</api></version>
    <stability>
-    <release>stable</release>
-    <api>stable</api></stability>
-   <date>2017-11-11</date>
+    <release>alpha</release>
+    <api>alpha</api></stability>
+   <date>2021-03-20</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
 *