Unify PHP PEAR and PECL

PURL-TYPES.rst

@@ -471,16 +471,18 @@ including container images built by Docker and others:
       pkg:oci/static@sha256%3A244fd47e07d10?repository_url=gcr.io/distroless/static&tag=latest
       pkg:oci/hello-wasm@sha256%3A244fd47e07d10?tag=v1
 
-pecl
+pear
 ----
-``pecl`` for PECL PHP packages:
+``pear`` for PEAR and PECL PHP packages:
 
-- The default repository is ``https://pecl.php.net/``.
-- The ``namespace`` is empty.
+- The default repository for PEAR is ``https://pear.php.net``. The default repository for PECL is ``https://pecl.php.net/``.
+- The ``namespace`` is the channel of the package. The domain portion of the channel MUST be lowercased.
 - The ``name`` is not case sensitive
+- The ``version`` is the version of the package
 - Examples:
 
-      pkg:pecl/[email protected]
+      pkg:pear/pear.php.net/[email protected]
+      pkg:pear/pecl.php.net/[email protected]
 
 pub
 ----
@@ -599,7 +601,6 @@ Other candidate types to define:
 - ``openwrt`` for OpenWRT packages:
 - ``osgi`` for OSGi bundle packages:
 - ``p2`` for Eclipse p2 packages:
-- ``pear`` for Pear PHP packages:
 - ``perl6`` for Perl 6 module packages:
 - ``platformio`` for PlatformIO packages:
 - ``ebuild`` for Gentoo Linux portage packages:

test-suite-data.json

@@ -552,27 +552,39 @@
     "is_invalid": false
   },
   {
-    "description": "valid pecl purl",
-    "purl": "pkg:pecl/[email protected]",
-    "canonical_purl": "pkg:pecl/[email protected]",
-    "type": "pecl",
-    "namespace": null,
+    "description": "valid php pecl purl",
+    "purl": "pkg:pear/pecl.php.net/[email protected]",
+    "canonical_purl": "pkg:pear/pecl.php.net/[email protected]",
+    "type": "pear",
+    "namespace": "pecl.php.net",
     "name": "APCu",
     "version": "5.1.23",
     "qualifiers": null,
     "subpath": null,
     "is_invalid": false
   },
   {
-    "description": "valid pecl purl without version",
-    "purl": "pkg:pecl/APCu",
-    "canonical_purl": "pkg:pecl/APCu",
-    "type": "pecl",
-    "namespace": null,
+    "description": "valid php pecl purl without version",
+    "purl": "pkg:pear/pecl.php.net/APCu",
+    "canonical_purl": "pkg:pear/pecl.php.net/APCu",
+    "type": "pear",
+    "namespace": "pecl.php.net",
     "name": "APCu",
     "version": null,
     "qualifiers": null,
     "subpath": null,
     "is_invalid": false
+  },
+  {
+    "description": "valid php pear purl",
+    "purl": "pkg:pear/pear.php.net/[email protected]",
+    "canonical_purl": "pkg:pear/pear.php.net/[email protected]",
+    "type": "pear",
+    "namespace": "pear.php.net",
+    "name": "Text_Password",
+    "version": "1.2.1",
+    "qualifiers": null,
+    "subpath": null,
+    "is_invalid": false
   }
 ]