Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add required packages for the phar generators as svn externals and up…

…date the README part of the make scripts

git-svn-id: http://svn.php.net/repository/pear/pear-core/pear/pear-core/trunk@286692 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
commit a03ee9490cdd40b32e27beedf37fe0303c410d42 1 parent 12f153b
dufuz authored
View
5 PEAR/ChannelFile.php
@@ -501,6 +501,7 @@ function _makeRestXml($info, $indent)
if (!isset($info['baseurl'][0])) {
$info['baseurl'] = array($info['baseurl']);
}
+
foreach ($info['baseurl'] as $url) {
$ret .= "$indent <baseurl type=\"" . $url['attribs']['type'] . "\"";
$ret .= ">" . $url['_content'] . "</baseurl>\n";
@@ -687,15 +688,17 @@ function _validateFunctions($protocol, $functions, $parent = '')
if (!isset($functions[0])) {
$functions = array($functions);
}
+
foreach ($functions as $function) {
if (!isset($function['_content']) || empty($function['_content'])) {
$this->_validateError(PEAR_CHANNELFILE_ERROR_NO_FUNCTIONNAME,
array('parent' => $parent, 'protocol' => $protocol));
}
+
if ($protocol == 'rest') {
if (!isset($function['attribs']['type']) ||
empty($function['attribs']['type'])) {
- $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_BASEURLTYPE,
+ $this->_validateError(PEAR_CHANNELFILE_ERROR_NOBASEURLTYPE,
array('parent' => $parent, 'protocol' => $protocol));
}
} else {
View
12 make-gopear-phar.php
@@ -8,19 +8,9 @@
* named go-pear-tarballs, and run these commands in the directory
*
* <pre>
- * $ pear download -Z PEAR
- * $ pear download -Z Archive_Tar
- * $ pear download -Z Console_Getopt
- * $ pear download -Z Structures_Graph
- * $ pear download -Z XML_Util
+ * $ pear download -Z PEAR Archive_Tar Console_Getopt Structures_Graph XML_Util
* </pre>
*
- * Next, check out pear/Structure_Graph and copy it into pear-core/
- *
- * Next, check out pear/Console_Getopt and copy it into pear-core/
- *
- * Next, check out pear/XML_Util and copy it into pear-core/
- *
* finally, run this script using PHP 5.1's cli php
*
View
13 make-installpear-nozlib-phar.php
@@ -8,20 +8,9 @@
* named go-pear-tarballs, and run these commands in the directory
*
* <pre>
- * $ pear download -Z PEAR
- * $ pear download -Z Archive_Tar
- * $ pear download -Z Console_Getopt
- * $ pear download -Z Structures_Graph
- * $ pear download -Z XML_Util
+ * $ pear download -Z PEAR Archive_Tar Console_Getopt Structures_Graph XML_Util
* </pre>
*
- * Next, check out pear/Structure_Graph and copy it into pear-core/
- *
- * Next, check out pear/Console_Getopt and copy it into pear-core/
- *
- * Next, check out pear/XML_Util and copy it into pear-core/
- *
- *
* finally, run this script using PHP 5.1's cli php
*
Please sign in to comment.
Something went wrong with that request. Please try again.