Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
  • 9 commits
  • 10 files changed
  • 0 commit comments
  • 1 contributor
View
655 package.xml
@@ -39,11 +39,11 @@ http://pear.php.net/manual/en/pyrus.php</description>
<email>helgi@php.net</email>
<active>yes</active>
</lead>
- <date>2011-03-27</date>
- <time>16:31:42</time>
+ <date>2011-08-18</date>
+ <time>13:26:11</time>
<version>
- <release>2.0.0a3</release>
- <api>2.0.0a1</api>
+ <release>2.0.0a4</release>
+ <api>2.0.0a4</api>
</version>
<stability>
<release>alpha</release>
@@ -52,23 +52,29 @@ http://pear.php.net/manual/en/pyrus.php</description>
<license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
<notes>Features:
- - Add object for interacting with installed packages [saltybeagle]
- - Auto-channel discovery for channels off web root [saltybeagle]
- - Improve missing package error message when no channel name is provided [saltybeagle]
- - Support auto-discovery for dependencies on unknown channels [saltybeagle]
- - Use setSchema for xsd validation, min libxml version 2.6.20 [boekkooi]
+ - Add support for installing from a remote package.xml [saltybeagle]
+ - Display version and stability in list-packages [saltybeagle]
+ - Improve error when phar includes are disabled by suhosin [mfonda]
+ - Replace config-show with allowing people to call the get command without any arguments to achieve the same result.
+ &quot;php pyrus.phar get&quot; and php &quot;pyrus.phar config-show&quot; are the same
+ - Dropped the channel-add command in favor of channel-discover as they were doing the same thing.
Bug Fixes/Refactoring:
- - Correct exit status codes [saltybeagle]
- - Check if config options are set before re-setting during install [boekkooi]
- - Load custom roles installed outside the phar [boekkooi]
- - Added customsystemvars to the Replace task [boekkooi]
- - RecursiveIteratorIterator returns path twice when in phar [boekkooi]
- - Refactor AtomicFileTransaction [boekkooi]
+ - Improve error message for plugin installation failures [saltybeagle]
+ - Correct exit codes when pyrus fails from CLI [saltybeagle]
+ - Packaged license files should use 'filesource' not 'path' [saltybeagle]
+ - Removed the PEAR2 namespace and made Pyrus the top level namespace.
+ This means all includes and classes need to drop the PEAR2 portion [helgi]
+ - Use the channel name instead of package name when giving the security error of when a package claims
+ to be from channel X but really is Y (pyrus/Pyrus#50) [xc]
+ - DOMDocument::schemaValidate doesn't support phar:// stream [tyrael]
-Initial pyrus public API
-</notes>
+API notes for 2.0.0a4:
+
+ - Add Pyrus\Channel\RemotePackage::getLatestVersion() [saltybeagle]
+ - removed the second ($isxml) and third ($isremote) from the Pyrus\ChannelFile
+ __construct as it can ascertain that information automagically</notes>
<contents>
<dir name="/">
<dir name="data" baseinstalldir="/">
@@ -225,335 +231,333 @@ Initial pyrus public API
<tasks:replace from="@php_dir@" to="php_dir" type="pear-config"/>
</file>
</dir>
- <dir name="src" baseinstalldir="/">
- <dir name="PEAR2">
- <dir name="Pyrus">
- <dir name="AtomicFileTransaction">
- <dir name="Transaction">
- <file role="php" name="Base.php"/>
- <file role="php" name="TwoStage.php"/>
- </dir>
- <file role="php" name="Exception.php"/>
- <file role="php" name="Manager.php"/>
- <file role="php" name="MultiException.php"/>
- <file role="php" name="RuntimeException.php"/>
- <file role="php" name="Transaction.php"/>
+ <dir name="src" baseinstalldir="PEAR2">
+ <dir name="Pyrus">
+ <dir name="AtomicFileTransaction">
+ <dir name="Transaction">
+ <file role="php" name="Base.php"/>
+ <file role="php" name="TwoStage.php"/>
</dir>
- <dir name="Channel">
- <dir name="RemotePackage">
- <file role="php" name="Categories.php"/>
- </dir>
- <file role="php" name="Exception.php"/>
- <file role="php" name="MirrorInterface.php"/>
- <file role="php" name="RemoteCategories.php"/>
- <file role="php" name="RemoteCategory.php"/>
- <file role="php" name="RemoteMaintainers.php"/>
- <file role="php" name="RemotePackage.php"/>
- <file role="php" name="RemotePackages.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="Manager.php"/>
+ <file role="php" name="MultiException.php"/>
+ <file role="php" name="RuntimeException.php"/>
+ <file role="php" name="Transaction.php"/>
+ </dir>
+ <dir name="Channel">
+ <dir name="RemotePackage">
+ <file role="php" name="Categories.php"/>
</dir>
- <dir name="ChannelFile">
- <dir name="Parser">
- <file role="php" name="v1.php"/>
- </dir>
- <dir name="v1">
- <dir name="Servers">
- <dir name="Protocols">
- <file role="php" name="REST.php"/>
- </dir>
- <file role="php" name="Protocols.php"/>
- </dir>
- <file role="php" name="Mirror.php"/>
- <file role="php" name="Servers.php"/>
- </dir>
- <file role="php" name="Exception.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="MirrorInterface.php"/>
+ <file role="php" name="RemoteCategories.php"/>
+ <file role="php" name="RemoteCategory.php"/>
+ <file role="php" name="RemoteMaintainers.php"/>
+ <file role="php" name="RemotePackage.php"/>
+ <file role="php" name="RemotePackages.php"/>
+ </dir>
+ <dir name="ChannelFile">
+ <dir name="Parser">
<file role="php" name="v1.php"/>
</dir>
- <dir name="ChannelRegistry">
- <dir name="Mirror">
- <file role="php" name="Sqlite3.php"/>
- <file role="php" name="Xml.php"/>
+ <dir name="v1">
+ <dir name="Servers">
+ <dir name="Protocols">
+ <file role="php" name="REST.php"/>
+ </dir>
+ <file role="php" name="Protocols.php"/>
</dir>
- <file role="php" name="Base.php"/>
- <file role="php" name="Channel.php"/>
- <file role="php" name="Exception.php"/>
- <file role="php" name="ParseException.php"/>
- <file role="php" name="Pear1.php"/>
+ <file role="php" name="Mirror.php"/>
+ <file role="php" name="Servers.php"/>
+ </dir>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="v1.php"/>
+ </dir>
+ <dir name="ChannelRegistry">
+ <dir name="Mirror">
<file role="php" name="Sqlite3.php"/>
<file role="php" name="Xml.php"/>
</dir>
- <dir name="Config">
+ <file role="php" name="Base.php"/>
+ <file role="php" name="Channel.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="ParseException.php"/>
+ <file role="php" name="Pear1.php"/>
+ <file role="php" name="Sqlite3.php"/>
+ <file role="php" name="Xml.php"/>
+ </dir>
+ <dir name="Config">
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="Snapshot.php"/>
+ </dir>
+ <dir name="Dependency">
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="Validator.php"/>
+ </dir>
+ <dir name="DER">
+ <file role="php" name="BitString.php"/>
+ <file role="php" name="BMPString.php"/>
+ <file role="php" name="Boolean.php"/>
+ <file role="php" name="Choice.php"/>
+ <file role="php" name="Constructed.php"/>
+ <file role="php" name="Enumerated.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="External.php"/>
+ <file role="php" name="GeneralizedTime.php"/>
+ <file role="php" name="IA5String.php"/>
+ <file role="php" name="Integer.php"/>
+ <file role="php" name="Null.php"/>
+ <file role="php" name="NumericString.php"/>
+ <file role="php" name="ObjectIdentifier.php"/>
+ <file role="php" name="OCSPRequest.php"/>
+ <file role="php" name="OctetString.php"/>
+ <file role="php" name="Parser.php"/>
+ <file role="php" name="PrintableString.php"/>
+ <file role="php" name="Schema.php"/>
+ <file role="php" name="SchemaChoice.php"/>
+ <file role="php" name="Sequence.php"/>
+ <file role="php" name="Set.php"/>
+ <file role="php" name="String.php"/>
+ <file role="php" name="UniversalString.php"/>
+ <file role="php" name="UTCTime.php"/>
+ <file role="php" name="UTF8String.php"/>
+ <file role="php" name="VisibleString.php"/>
+ </dir>
+ <dir name="DirectedGraph">
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="Vertex.php"/>
+ </dir>
+ <dir name="Installer">
+ <dir name="Role">
+ <file role="php" name="Cfg.php"/>
+ <file role="php" name="Cfg.xml"/>
+ <file role="php" name="Common.php"/>
+ <file role="php" name="Customcommand.php"/>
+ <file role="php" name="Customcommand.xml"/>
+ <file role="php" name="Customrole.php"/>
+ <file role="php" name="Customrole.xml"/>
+ <file role="php" name="Customtask.php"/>
+ <file role="php" name="Customtask.xml"/>
+ <file role="php" name="Data.php"/>
+ <file role="php" name="Data.xml"/>
+ <file role="php" name="Doc.php"/>
+ <file role="php" name="Doc.xml"/>
<file role="php" name="Exception.php"/>
- <file role="php" name="Snapshot.php"/>
+ <file role="php" name="Ext.php"/>
+ <file role="php" name="Ext.xml"/>
+ <file role="php" name="Php.php"/>
+ <file role="php" name="Php.xml"/>
+ <file role="php" name="Script.php"/>
+ <file role="php" name="Script.xml"/>
+ <file role="php" name="Src.php"/>
+ <file role="php" name="Src.xml"/>
+ <file role="php" name="Test.php"/>
+ <file role="php" name="Test.xml"/>
+ <file role="php" name="Www.php"/>
+ <file role="php" name="Www.xml"/>
</dir>
- <dir name="Dependency">
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="Role.php"/>
+ </dir>
+ <dir name="Package">
+ <dir name="Creator">
<file role="php" name="Exception.php"/>
- <file role="php" name="Validator.php"/>
+ <file role="php" name="TaskIterator.php"/>
</dir>
- <dir name="DER">
- <file role="php" name="BitString.php"/>
- <file role="php" name="BMPString.php"/>
- <file role="php" name="Boolean.php"/>
- <file role="php" name="Choice.php"/>
- <file role="php" name="Constructed.php"/>
- <file role="php" name="Enumerated.php"/>
- <file role="php" name="Exception.php"/>
- <file role="php" name="External.php"/>
- <file role="php" name="GeneralizedTime.php"/>
- <file role="php" name="IA5String.php"/>
- <file role="php" name="Integer.php"/>
- <file role="php" name="Null.php"/>
- <file role="php" name="NumericString.php"/>
- <file role="php" name="ObjectIdentifier.php"/>
- <file role="php" name="OCSPRequest.php"/>
- <file role="php" name="OctetString.php"/>
- <file role="php" name="Parser.php"/>
- <file role="php" name="PrintableString.php"/>
- <file role="php" name="Schema.php"/>
- <file role="php" name="SchemaChoice.php"/>
- <file role="php" name="Sequence.php"/>
+ <dir name="Dependency">
+ <dir name="Set">
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="PackageTree.php"/>
+ </dir>
<file role="php" name="Set.php"/>
- <file role="php" name="String.php"/>
- <file role="php" name="UniversalString.php"/>
- <file role="php" name="UTCTime.php"/>
- <file role="php" name="UTF8String.php"/>
- <file role="php" name="VisibleString.php"/>
</dir>
- <dir name="DirectedGraph">
+ <dir name="Phar">
<file role="php" name="Exception.php"/>
- <file role="php" name="Vertex.php"/>
- </dir>
- <dir name="Installer">
- <dir name="Role">
- <file role="php" name="Cfg.php"/>
- <file role="php" name="Cfg.xml"/>
- <file role="php" name="Common.php"/>
- <file role="php" name="Customcommand.php"/>
- <file role="php" name="Customcommand.xml"/>
- <file role="php" name="Customrole.php"/>
- <file role="php" name="Customrole.xml"/>
- <file role="php" name="Customtask.php"/>
- <file role="php" name="Customtask.xml"/>
- <file role="php" name="Data.php"/>
- <file role="php" name="Data.xml"/>
- <file role="php" name="Doc.php"/>
- <file role="php" name="Doc.xml"/>
+ </dir>
+ <file role="php" name="Base.php"/>
+ <file role="php" name="Cloner.php"/>
+ <file role="php" name="Creator.php"/>
+ <file role="php" name="CreatorInterface.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="Installed.php"/>
+ <file role="php" name="InstalledException.php"/>
+ <file role="php" name="Phar.php"/>
+ <file role="php" name="Remote.php"/>
+ <file role="php" name="Xml.php"/>
+ </dir>
+ <dir name="PackageFile">
+ <dir name="Parser">
+ <file role="php" name="v2.php"/>
+ </dir>
+ <dir name="v2">
+ <dir name="Compatible">
<file role="php" name="Exception.php"/>
- <file role="php" name="Ext.php"/>
- <file role="php" name="Ext.xml"/>
- <file role="php" name="Php.php"/>
- <file role="php" name="Php.xml"/>
- <file role="php" name="Script.php"/>
- <file role="php" name="Script.xml"/>
- <file role="php" name="Src.php"/>
- <file role="php" name="Src.xml"/>
- <file role="php" name="Test.php"/>
- <file role="php" name="Test.xml"/>
- <file role="php" name="Www.php"/>
- <file role="php" name="Www.xml"/>
</dir>
- <file role="php" name="Exception.php"/>
- <file role="php" name="Role.php"/>
- </dir>
- <dir name="Package">
- <dir name="Creator">
+ <dir name="Configureoption">
<file role="php" name="Exception.php"/>
- <file role="php" name="TaskIterator.php"/>
</dir>
- <dir name="Dependency">
- <dir name="Set">
- <file role="php" name="Exception.php"/>
- <file role="php" name="PackageTree.php"/>
- </dir>
- <file role="php" name="Set.php"/>
+ <dir name="Dependencies">
+ <file role="php" name="Dep.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="Group.php"/>
+ <file role="php" name="Package.php"/>
</dir>
- <dir name="Phar">
+ <dir name="Developer">
<file role="php" name="Exception.php"/>
</dir>
- <file role="php" name="Base.php"/>
- <file role="php" name="Cloner.php"/>
- <file role="php" name="Creator.php"/>
- <file role="php" name="CreatorInterface.php"/>
- <file role="php" name="Exception.php"/>
- <file role="php" name="Installed.php"/>
- <file role="php" name="InstalledException.php"/>
- <file role="php" name="Phar.php"/>
- <file role="php" name="Remote.php"/>
- <file role="php" name="Xml.php"/>
- </dir>
- <dir name="PackageFile">
- <dir name="Parser">
- <file role="php" name="v2.php"/>
- </dir>
- <dir name="v2">
- <dir name="Compatible">
- <file role="php" name="Exception.php"/>
- </dir>
- <dir name="Configureoption">
- <file role="php" name="Exception.php"/>
- </dir>
- <dir name="Dependencies">
- <file role="php" name="Dep.php"/>
- <file role="php" name="Exception.php"/>
- <file role="php" name="Group.php"/>
- <file role="php" name="Package.php"/>
- </dir>
- <dir name="Developer">
- <file role="php" name="Exception.php"/>
- </dir>
- <dir name="Files">
- <file role="php" name="Exception.php"/>
- <file role="php" name="File.php"/>
- </dir>
- <dir name="License">
- <file role="php" name="Exception.php"/>
- </dir>
- <dir name="Release">
- <file role="php" name="BinaryPackage.php"/>
- <file role="php" name="ConfigureOption.php"/>
- <file role="php" name="Exception.php"/>
- <file role="php" name="InstallCondition.php"/>
- </dir>
- <dir name="UsesRoleTask">
- <file role="php" name="Exception.php"/>
- </dir>
- <file role="php" name="BundledPackage.php"/>
- <file role="php" name="Compatible.php"/>
- <file role="php" name="Configureoption.php"/>
- <file role="php" name="Dependencies.php"/>
- <file role="php" name="Developer.php"/>
- <file role="php" name="Files.php"/>
- <file role="php" name="License.php"/>
- <file role="php" name="Release.php"/>
- <file role="php" name="SimpleProperty.php"/>
- <file role="php" name="UsesRoleTask.php"/>
- <file role="php" name="Validator.php"/>
- </dir>
- <dir name="v2Iterator">
+ <dir name="Files">
+ <file role="php" name="Exception.php"/>
<file role="php" name="File.php"/>
- <file role="php" name="FileAttribsFilter.php"/>
- <file role="php" name="FileContents.php"/>
- <file role="php" name="FileContentsMulti.php"/>
- <file role="php" name="FileInstallationFilter.php"/>
- <file role="php" name="FileTag.php"/>
- <file role="php" name="MinimalPackageFilter.php"/>
- <file role="php" name="PackagingFilterBase.php"/>
- <file role="php" name="PackagingIterator.php"/>
- <file role="php" name="ScriptFileFilterIterator.php"/>
</dir>
- <file role="php" name="Exception.php"/>
- <file role="php" name="v2.php"/>
- <file role="php" name="ValidatorInterface.php"/>
- </dir>
- <dir name="PECLBuild">
- <file role="php" name="Exception.php"/>
- </dir>
- <dir name="PluginRegistry">
- <file role="php" name="Exception.php"/>
- </dir>
- <dir name="Registry">
- <dir name="Package">
- <file role="php" name="Base.php"/>
- </dir>
- <dir name="Pear1">
- <file role="php" name="DependencyDB.php"/>
- <file role="php" name="Package.php"/>
+ <dir name="License">
+ <file role="php" name="Exception.php"/>
</dir>
- <dir name="Sqlite3">
- <file role="php" name="Creator.php"/>
- <file role="php" name="Package.php"/>
+ <dir name="Release">
+ <file role="php" name="BinaryPackage.php"/>
+ <file role="php" name="ConfigureOption.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="InstallCondition.php"/>
</dir>
- <dir name="Xml">
- <file role="php" name="Package.php"/>
+ <dir name="UsesRoleTask">
+ <file role="php" name="Exception.php"/>
</dir>
- <file role="php" name="Base.php"/>
- <file role="php" name="Exception.php"/>
- <file role="php" name="Pear1.php"/>
- <file role="php" name="Sqlite3.php"/>
- <file role="php" name="Xml.php"/>
+ <file role="php" name="BundledPackage.php"/>
+ <file role="php" name="Compatible.php"/>
+ <file role="php" name="Configureoption.php"/>
+ <file role="php" name="Dependencies.php"/>
+ <file role="php" name="Developer.php"/>
+ <file role="php" name="Files.php"/>
+ <file role="php" name="License.php"/>
+ <file role="php" name="Release.php"/>
+ <file role="php" name="SimpleProperty.php"/>
+ <file role="php" name="UsesRoleTask.php"/>
+ <file role="php" name="Validator.php"/>
</dir>
- <dir name="REST">
- <file role="php" name="Exception.php"/>
+ <dir name="v2Iterator">
+ <file role="php" name="File.php"/>
+ <file role="php" name="FileAttribsFilter.php"/>
+ <file role="php" name="FileContents.php"/>
+ <file role="php" name="FileContentsMulti.php"/>
+ <file role="php" name="FileInstallationFilter.php"/>
+ <file role="php" name="FileTag.php"/>
+ <file role="php" name="MinimalPackageFilter.php"/>
+ <file role="php" name="PackagingFilterBase.php"/>
+ <file role="php" name="PackagingIterator.php"/>
+ <file role="php" name="ScriptFileFilterIterator.php"/>
</dir>
- <dir name="ScriptFrontend">
- <file role="php" name="Command.php"/>
- <file role="php" name="Commands.php"/>
- <file role="php" name="Exception.php"/>
- <file role="php" name="Renderer.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="v2.php"/>
+ <file role="php" name="ValidatorInterface.php"/>
+ </dir>
+ <dir name="PECLBuild">
+ <file role="php" name="Exception.php"/>
+ </dir>
+ <dir name="PluginRegistry">
+ <file role="php" name="Exception.php"/>
+ </dir>
+ <dir name="Registry">
+ <dir name="Package">
+ <file role="php" name="Base.php"/>
</dir>
- <dir name="Task">
- <dir name="Exception">
- <file role="php" name="InvalidTask.php"/>
- <file role="php" name="MissingAttribute.php"/>
- <file role="php" name="NoAttributes.php"/>
- <file role="php" name="WrongAttributeValue.php"/>
- </dir>
- <dir name="Postinstallscript">
- <dir name="Paramgroup">
- <file role="php" name="Param.php"/>
- </dir>
- <file role="php" name="Paramgroup.php"/>
- </dir>
- <file role="php" name="Common.php"/>
- <file role="php" name="Exception.php"/>
- <file role="php" name="MultipleProxy.php"/>
- <file role="php" name="Postinstallscript.php"/>
- <file role="php" name="Replace.php"/>
- <file role="php" name="Unixeol.php"/>
- <file role="php" name="Windowseol.php"/>
+ <dir name="Pear1">
+ <file role="php" name="DependencyDB.php"/>
+ <file role="php" name="Package.php"/>
</dir>
- <dir name="Uninstaller">
- <file role="php" name="Exception.php"/>
- </dir>
- <dir name="Validate">
- <file role="php" name="Exception.php"/>
+ <dir name="Sqlite3">
+ <file role="php" name="Creator.php"/>
+ <file role="php" name="Package.php"/>
</dir>
- <dir name="Validator">
- <file role="php" name="PECL.php"/>
+ <dir name="Xml">
+ <file role="php" name="Package.php"/>
</dir>
- <dir name="XMLParser">
- <file role="php" name="Exception.php"/>
+ <file role="php" name="Base.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="Pear1.php"/>
+ <file role="php" name="Sqlite3.php"/>
+ <file role="php" name="Xml.php"/>
+ </dir>
+ <dir name="REST">
+ <file role="php" name="Exception.php"/>
+ </dir>
+ <dir name="ScriptFrontend">
+ <file role="php" name="Command.php"/>
+ <file role="php" name="Commands.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="Renderer.php"/>
+ </dir>
+ <dir name="Task">
+ <dir name="Exception">
+ <file role="php" name="InvalidTask.php"/>
+ <file role="php" name="MissingAttribute.php"/>
+ <file role="php" name="NoAttributes.php"/>
+ <file role="php" name="WrongAttributeValue.php"/>
</dir>
- <dir name="XMLWriter">
- <file role="php" name="Exception.php"/>
+ <dir name="Postinstallscript">
+ <dir name="Paramgroup">
+ <file role="php" name="Param.php"/>
+ </dir>
+ <file role="php" name="Paramgroup.php"/>
</dir>
- <file role="php" name="AtomicFileTransaction.php"/>
- <file role="php" name="Channel.php"/>
- <file role="php" name="ChannelFile.php"/>
- <file role="php" name="ChannelFileInterface.php"/>
- <file role="php" name="ChannelInterface.php"/>
- <file role="php" name="ChannelRegistry.php"/>
- <file role="php" name="ChannelRegistryInterface.php"/>
- <file role="php" name="Config.php"/>
- <file role="php" name="DER.php"/>
- <file role="php" name="DirectedGraph.php"/>
- <file role="php" name="DownloadProgressListener.php"/>
+ <file role="php" name="Common.php"/>
<file role="php" name="Exception.php"/>
- <file role="php" name="Filesystem.php"/>
- <file role="php" name="FileTransactionInterface.php"/>
- <file role="php" name="FileTransactions.php"/>
- <file role="php" name="HTTPException.php"/>
- <file role="php" name="Installer.php"/>
- <file role="php" name="IOException.php"/>
- <file role="php" name="Logger.php"/>
- <file role="php" name="LogInterface.php"/>
- <file role="php" name="Main.php"/>
- <file role="php" name="OSGuess.php"/>
- <file role="php" name="Package.php"/>
- <file role="php" name="PackageFile.php"/>
- <file role="php" name="PackageFileInterface.php"/>
- <file role="php" name="PackageInterface.php"/>
- <file role="php" name="PECLBuild.php"/>
- <file role="php" name="PluginRegistry.php"/>
- <file role="php" name="Registry.php"/>
- <file role="php" name="RegistryInterface.php"/>
- <file role="php" name="REST.php"/>
- <file role="php" name="ScriptFrontend.php"/>
- <file role="php" name="ScriptRunner.php"/>
- <file role="php" name="Uninstaller.php"/>
- <file role="php" name="Validate.php"/>
- <file role="php" name="XMLParser.php"/>
- <file role="php" name="XMLWriter.php"/>
+ <file role="php" name="MultipleProxy.php"/>
+ <file role="php" name="Postinstallscript.php"/>
+ <file role="php" name="Replace.php"/>
+ <file role="php" name="Unixeol.php"/>
+ <file role="php" name="Windowseol.php"/>
</dir>
+ <dir name="Uninstaller">
+ <file role="php" name="Exception.php"/>
+ </dir>
+ <dir name="Validate">
+ <file role="php" name="Exception.php"/>
+ </dir>
+ <dir name="Validator">
+ <file role="php" name="PECL.php"/>
+ </dir>
+ <dir name="XMLParser">
+ <file role="php" name="Exception.php"/>
+ </dir>
+ <dir name="XMLWriter">
+ <file role="php" name="Exception.php"/>
+ </dir>
+ <file role="php" name="AtomicFileTransaction.php"/>
+ <file role="php" name="Channel.php"/>
+ <file role="php" name="ChannelFile.php"/>
+ <file role="php" name="ChannelFileInterface.php"/>
+ <file role="php" name="ChannelInterface.php"/>
+ <file role="php" name="ChannelRegistry.php"/>
+ <file role="php" name="ChannelRegistryInterface.php"/>
+ <file role="php" name="Config.php"/>
+ <file role="php" name="DER.php"/>
+ <file role="php" name="DirectedGraph.php"/>
+ <file role="php" name="DownloadProgressListener.php"/>
+ <file role="php" name="Exception.php"/>
+ <file role="php" name="Filesystem.php"/>
+ <file role="php" name="FileTransactionInterface.php"/>
+ <file role="php" name="FileTransactions.php"/>
+ <file role="php" name="HTTPException.php"/>
+ <file role="php" name="Installer.php"/>
+ <file role="php" name="IOException.php"/>
+ <file role="php" name="Logger.php"/>
+ <file role="php" name="LogInterface.php"/>
+ <file role="php" name="Main.php"/>
+ <file role="php" name="OSGuess.php"/>
+ <file role="php" name="Package.php"/>
+ <file role="php" name="PackageFile.php"/>
+ <file role="php" name="PackageFileInterface.php"/>
+ <file role="php" name="PackageInterface.php"/>
+ <file role="php" name="PECLBuild.php"/>
+ <file role="php" name="PluginRegistry.php"/>
+ <file role="php" name="Registry.php"/>
+ <file role="php" name="RegistryInterface.php"/>
+ <file role="php" name="REST.php"/>
+ <file role="php" name="ScriptFrontend.php"/>
+ <file role="php" name="ScriptRunner.php"/>
+ <file role="php" name="Uninstaller.php"/>
+ <file role="php" name="Validate.php"/>
+ <file role="php" name="XMLParser.php"/>
+ <file role="php" name="XMLWriter.php"/>
</dir>
</dir>
<dir name="tests" baseinstalldir="/">
@@ -610,12 +614,6 @@ Initial pyrus public API
<file role="test" name="setup.empty.php.inc"/>
<file role="test" name="setup.php.inc"/>
</dir>
- <dir name="begin">
- <file role="test" name="begin.fail.php"/>
- </dir>
- <dir name="createOrOpenPath">
- <file role="test" name="createoropenpath.fail.fp.stream.empty.php"/>
- </dir>
<dir name="ManagerClass">
<dir name="begin">
<file role="test" name="begin.fail.intransaction.phpt"/>
@@ -879,6 +877,7 @@ Initial pyrus public API
</dir>
<file role="test" name="setup.php.inc"/>
</dir>
+ <file role="test" name="bug_35.phpt"/>
<file role="test" name="sample_channel.xml"/>
<file role="test" name="sample_channel_complex.xml"/>
<file role="test" name="sample_channel_complex2.xml"/>
@@ -922,6 +921,9 @@ Initial pyrus public API
<file role="test" name="gooduserfile.saveconfig.phpt"/>
<file role="test" name="setup.php.inc"/>
</dir>
+ <dir name="registry">
+ <file role="test" name="getIterator.phpt"/>
+ </dir>
<dir name="setCascadingRegistries">
<file role="test" name="basic.phpt"/>
<file role="test" name="basic2.phpt"/>
@@ -1167,6 +1169,10 @@ Initial pyrus public API
<dir name="FileInstallationFilter">
<file role="test" name="installconditions.phpt"/>
</dir>
+ <dir name="Filesystem">
+ <file role="test" name="path.phpt"/>
+ <file role="test" name="setup.inc.php"/>
+ </dir>
<dir name="Installer">
<dir name="prepare">
<file role="test" name="install.prepare.circulardep.phpt"/>
@@ -1207,7 +1213,7 @@ Initial pyrus public API
</dir>
<dir name="Mocks">
<dir name="badmd5sum">
- <dir name="src" baseinstalldir="/">
+ <dir name="src" baseinstalldir="PEAR2">
<file role="test" name="foo.php"/>
</dir>
<file role="test" name="package.xml"/>
@@ -2752,7 +2758,7 @@ Initial pyrus public API
<dir name="scripts" baseinstalldir="/">
<file role="test" name="pearscs"/>
</dir>
- <dir name="src" baseinstalldir="/">
+ <dir name="src" baseinstalldir="PEAR2">
<dir name="SimpleChannelServer">
<dir name="Categories">
<file role="test" name="Exception.php"/>
@@ -3467,7 +3473,7 @@ Initial pyrus public API
<dir name="ScriptFrontend">
<dir name="Commands">
<dir name="build">
- <file role="test" name="docblock-0.2.0.tar"/>
+ <file role="test" name="oauth-1.2.2.tar"/>
</dir>
<dir name="listPackages.pear1">
<dir name="php">
@@ -3508,7 +3514,7 @@ Initial pyrus public API
<dir name="data" baseinstalldir="/">
<file role="test" name="phartemplate.php"/>
</dir>
- <dir name="src" baseinstalldir="/">
+ <dir name="src" baseinstalldir="PEAR2">
<dir name="Pyrus">
<dir name="Developer">
<dir name="CoverageAnalyzer">
@@ -3559,7 +3565,6 @@ Initial pyrus public API
<file role="test" name="RELEASE-0.1.0"/>
</dir>
<file role="test" name="build.phpt"/>
- <file role="test" name="channelAdd.phpt"/>
<file role="test" name="channelDel.phpt"/>
<file role="test" name="channelDiscover.fail.phpt"/>
<file role="test" name="channelDiscover.fail2.phpt"/>
@@ -3660,9 +3665,15 @@ Initial pyrus public API
</dir>
<dir name="Validate">
<file role="test" name="setup.php.inc"/>
+ <file role="test" name="validatedate.failure.invaliddate.phpt"/>
<file role="test" name="validatepackagename.extends.failure.phpt"/>
<file role="test" name="validatepackagename.extends.phpt"/>
<file role="test" name="validatepackagename.failure.phpt"/>
+ <file role="test" name="validatestability.failure.api.invalidstate.phpt"/>
+ <file role="test" name="validatestability.failure.api.invalidstate.snapshot.phpt"/>
+ <file role="test" name="validatestability.failure.release.invalidstate.phpt"/>
+ <file role="test" name="validatetime.failure1.phpt"/>
+ <file role="test" name="validatetime.failure2.phpt"/>
<file role="test" name="validateversion.alpha.0.3.4.phpt"/>
<file role="test" name="validateversion.alpha.extends.2.0.0a1.phpt"/>
<file role="test" name="validateversion.failure.00.0.0.phpt"/>
@@ -3744,7 +3755,7 @@ Initial pyrus public API
<package>
<name>PEAR2_Autoload</name>
<channel>pear2.php.net</channel>
- <min>0.2.0</min>
+ <min>0.2.4</min>
</package>
<package>
<name>PEAR2_Exception</name>
@@ -3764,7 +3775,7 @@ Initial pyrus public API
<package>
<name>PEAR2_Console_CommandLine</name>
<channel>pear2.php.net</channel>
- <min>0.1.0</min>
+ <min>0.2.0</min>
</package>
</required>
</dependencies>
View
74 package_compatible.xml
@@ -39,11 +39,11 @@ http://pear.php.net/manual/en/pyrus.php</description>
<email>helgi@php.net</email>
<active>yes</active>
</lead>
- <date>2011-03-27</date>
- <time>16:31:43</time>
+ <date>2011-08-18</date>
+ <time>13:26:13</time>
<version>
- <release>2.0.0a3</release>
- <api>2.0.0a1</api>
+ <release>2.0.0a4</release>
+ <api>2.0.0a4</api>
</version>
<stability>
<release>alpha</release>
@@ -52,23 +52,29 @@ http://pear.php.net/manual/en/pyrus.php</description>
<license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
<notes>Features:
- - Add object for interacting with installed packages [saltybeagle]
- - Auto-channel discovery for channels off web root [saltybeagle]
- - Improve missing package error message when no channel name is provided [saltybeagle]
- - Support auto-discovery for dependencies on unknown channels [saltybeagle]
- - Use setSchema for xsd validation, min libxml version 2.6.20 [boekkooi]
+ - Add support for installing from a remote package.xml [saltybeagle]
+ - Display version and stability in list-packages [saltybeagle]
+ - Improve error when phar includes are disabled by suhosin [mfonda]
+ - Replace config-show with allowing people to call the get command without any arguments to achieve the same result.
+ &quot;php pyrus.phar get&quot; and php &quot;pyrus.phar config-show&quot; are the same
+ - Dropped the channel-add command in favor of channel-discover as they were doing the same thing.
Bug Fixes/Refactoring:
- - Correct exit status codes [saltybeagle]
- - Check if config options are set before re-setting during install [boekkooi]
- - Load custom roles installed outside the phar [boekkooi]
- - Added customsystemvars to the Replace task [boekkooi]
- - RecursiveIteratorIterator returns path twice when in phar [boekkooi]
- - Refactor AtomicFileTransaction [boekkooi]
+ - Improve error message for plugin installation failures [saltybeagle]
+ - Correct exit codes when pyrus fails from CLI [saltybeagle]
+ - Packaged license files should use 'filesource' not 'path' [saltybeagle]
+ - Removed the PEAR2 namespace and made Pyrus the top level namespace.
+ This means all includes and classes need to drop the PEAR2 portion [helgi]
+ - Use the channel name instead of package name when giving the security error of when a package claims
+ to be from channel X but really is Y (pyrus/Pyrus#50) [xc]
+ - DOMDocument::schemaValidate doesn't support phar:// stream [tyrael]
-Initial pyrus public API
-</notes>
+API notes for 2.0.0a4:
+
+ - Add Pyrus\Channel\RemotePackage::getLatestVersion() [saltybeagle]
+ - removed the second ($isxml) and third ($isremote) from the Pyrus\ChannelFile
+ __construct as it can ascertain that information automagically</notes>
<contents>
<dir name="/">
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/XMLWriter/XMLWriter/siblingtags.phpt"/>
@@ -123,9 +129,15 @@ Initial pyrus public API
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validateversion.failure.00.0.0.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validateversion.alpha.extends.2.0.0a1.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validateversion.alpha.0.3.4.phpt"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatetime.failure2.phpt"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatetime.failure1.phpt"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatestability.failure.release.invalidstate.phpt"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatestability.failure.api.invalidstate.snapshot.phpt"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatestability.failure.api.invalidstate.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatepackagename.failure.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatepackagename.extends.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatepackagename.extends.failure.phpt"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatedate.failure.invaliddate.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/setup.php.inc"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Uninstaller/Uninstaller/uninstall.rollback.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Uninstaller/Uninstaller/uninstall.basic.phpt"/>
@@ -206,7 +218,6 @@ Initial pyrus public API
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelDiscover.fail2.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelDiscover.fail.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelDel.phpt"/>
- <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelAdd.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/build.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/v2.php"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/PEAR2SVN.php"/>
@@ -259,7 +270,7 @@ Initial pyrus public API
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/pecl.txt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/pear.txt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/foo.txt"/>
- <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/build/ScriptFrontend/Commands/build/docblock-0.2.0.tar"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/build/ScriptFrontend/Commands/build/oauth-1.2.2.tar"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFileFilterIterator/ScriptFileFilterIterator/setup.php.inc"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ScriptFileFilterIterator/ScriptFileFilterIterator/basic.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/RemotePackages/RemotePackages/singlerelease.phpt"/>
@@ -1797,6 +1808,8 @@ Initial pyrus public API
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Installer/Installer/install.depgroup.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Installer/Installer/install.badmd5sum.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ignorexdebug.php"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Filesystem/Filesystem/setup.inc.php"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Filesystem/Filesystem/path.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/FileInstallationFilter/FileInstallationFilter/installconditions.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/DownloadProgressListener/DownloadProgressListener/setup.php.inc"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/DownloadProgressListener/DownloadProgressListener/progress.phpt"/>
@@ -1994,6 +2007,7 @@ Initial pyrus public API
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Config/setCascadingRegistries/Config/setCascadingRegistries/setup.php.inc"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Config/setCascadingRegistries/Config/setCascadingRegistries/basic2.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Config/setCascadingRegistries/Config/setCascadingRegistries/basic.phpt"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Config/registry/Config/registry/getIterator.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Config/loadConfigFile/Config/loadConfigFile/setup.php.inc"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Config/loadConfigFile/Config/loadConfigFile/gooduserfile.saveconfig.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/Config/loadConfigFile/Config/loadConfigFile/gooduserfile.phpt"/>
@@ -2064,6 +2078,7 @@ Initial pyrus public API
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/sample_channel_complex2.xml"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/sample_channel_complex.xml"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/sample_channel.xml"/>
+ <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/bug_35.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/AllRegistries/__construct/ChannelRegistry/AllRegistries/__construct/errors.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/AllRegistries/update/ChannelRegistry/AllRegistries/update/update.readonly.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/AllRegistries/update/ChannelRegistry/AllRegistries/update/update.phpt"/>
@@ -2172,8 +2187,6 @@ Initial pyrus public API
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/ManagerClass/begin/AtomicFileTransaction/ManagerClass/begin/begin.fail.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/ManagerClass/begin/AtomicFileTransaction/ManagerClass/begin/begin.fail.intransaction.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/ManagerClass/AtomicFileTransaction/ManagerClass/setup.php.inc"/>
- <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/createOrOpenPath/AtomicFileTransaction/createOrOpenPath/createoropenpath.fail.fp.stream.empty.php"/>
- <file role="test" name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/begin/AtomicFileTransaction/begin/begin.fail.php"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/AtomicFileTransactionClass/rollback/AtomicFileTransaction/AtomicFileTransactionClass/rollback/rollback2.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/AtomicFileTransactionClass/rollback/AtomicFileTransaction/AtomicFileTransactionClass/rollback/rollback.phpt"/>
<file role="test" name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/AtomicFileTransactionClass/rollback/AtomicFileTransaction/AtomicFileTransactionClass/rollback/rollback.fail.notintransaction.phpt"/>
@@ -2588,7 +2601,7 @@ Initial pyrus public API
<package>
<name>PEAR2_Autoload</name>
<channel>pear2.php.net</channel>
- <min>0.2.0</min>
+ <min>0.2.4</min>
</package>
<package>
<name>PEAR2_Exception</name>
@@ -2608,7 +2621,7 @@ Initial pyrus public API
<package>
<name>PEAR2_Console_CommandLine</name>
<channel>pear2.php.net</channel>
- <min>0.1.0</min>
+ <min>0.2.0</min>
</package>
</required>
</dependencies>
@@ -3015,8 +3028,6 @@ Initial pyrus public API
<install name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/AtomicFileTransactionClass/rollback/AtomicFileTransaction/AtomicFileTransactionClass/rollback/rollback.fail.notintransaction.phpt" as="PEAR2_Pyrus/AtomicFileTransaction/AtomicFileTransactionClass/rollback/AtomicFileTransaction/AtomicFileTransactionClass/rollback/rollback.fail.notintransaction.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/AtomicFileTransactionClass/rollback/AtomicFileTransaction/AtomicFileTransactionClass/rollback/rollback.phpt" as="PEAR2_Pyrus/AtomicFileTransaction/AtomicFileTransactionClass/rollback/AtomicFileTransaction/AtomicFileTransactionClass/rollback/rollback.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/AtomicFileTransactionClass/rollback/AtomicFileTransaction/AtomicFileTransactionClass/rollback/rollback2.phpt" as="PEAR2_Pyrus/AtomicFileTransaction/AtomicFileTransactionClass/rollback/AtomicFileTransaction/AtomicFileTransactionClass/rollback/rollback2.phpt"/>
- <install name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/begin/AtomicFileTransaction/begin/begin.fail.php" as="PEAR2_Pyrus/AtomicFileTransaction/begin/AtomicFileTransaction/begin/begin.fail.php"/>
- <install name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/createOrOpenPath/AtomicFileTransaction/createOrOpenPath/createoropenpath.fail.fp.stream.empty.php" as="PEAR2_Pyrus/AtomicFileTransaction/createOrOpenPath/AtomicFileTransaction/createOrOpenPath/createoropenpath.fail.fp.stream.empty.php"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/ManagerClass/AtomicFileTransaction/ManagerClass/setup.php.inc" as="PEAR2_Pyrus/AtomicFileTransaction/ManagerClass/AtomicFileTransaction/ManagerClass/setup.php.inc"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/ManagerClass/begin/AtomicFileTransaction/ManagerClass/begin/begin.fail.intransaction.phpt" as="PEAR2_Pyrus/AtomicFileTransaction/ManagerClass/begin/AtomicFileTransaction/ManagerClass/begin/begin.fail.intransaction.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/AtomicFileTransaction/ManagerClass/begin/AtomicFileTransaction/ManagerClass/begin/begin.fail.phpt" as="PEAR2_Pyrus/AtomicFileTransaction/ManagerClass/begin/AtomicFileTransaction/ManagerClass/begin/begin.fail.phpt"/>
@@ -3125,6 +3136,7 @@ Initial pyrus public API
<install name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/AllRegistries/update/ChannelRegistry/AllRegistries/update/update.phpt" as="PEAR2_Pyrus/ChannelRegistry/AllRegistries/update/ChannelRegistry/AllRegistries/update/update.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/AllRegistries/update/ChannelRegistry/AllRegistries/update/update.readonly.phpt" as="PEAR2_Pyrus/ChannelRegistry/AllRegistries/update/ChannelRegistry/AllRegistries/update/update.readonly.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/AllRegistries/__construct/ChannelRegistry/AllRegistries/__construct/errors.phpt" as="PEAR2_Pyrus/ChannelRegistry/AllRegistries/__construct/ChannelRegistry/AllRegistries/__construct/errors.phpt"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/bug_35.phpt" as="PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/bug_35.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/sample_channel.xml" as="PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/sample_channel.xml"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/sample_channel_complex.xml" as="PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/sample_channel_complex.xml"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/sample_channel_complex2.xml" as="PEAR2_Pyrus/ChannelRegistry/ChannelRegistry/sample_channel_complex2.xml"/>
@@ -3195,6 +3207,7 @@ Initial pyrus public API
<install name="test/pear2.php.net/PEAR2_Pyrus/Config/loadConfigFile/Config/loadConfigFile/gooduserfile.phpt" as="PEAR2_Pyrus/Config/loadConfigFile/Config/loadConfigFile/gooduserfile.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Config/loadConfigFile/Config/loadConfigFile/gooduserfile.saveconfig.phpt" as="PEAR2_Pyrus/Config/loadConfigFile/Config/loadConfigFile/gooduserfile.saveconfig.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Config/loadConfigFile/Config/loadConfigFile/setup.php.inc" as="PEAR2_Pyrus/Config/loadConfigFile/Config/loadConfigFile/setup.php.inc"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/Config/registry/Config/registry/getIterator.phpt" as="PEAR2_Pyrus/Config/registry/Config/registry/getIterator.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Config/setCascadingRegistries/Config/setCascadingRegistries/basic.phpt" as="PEAR2_Pyrus/Config/setCascadingRegistries/Config/setCascadingRegistries/basic.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Config/setCascadingRegistries/Config/setCascadingRegistries/basic2.phpt" as="PEAR2_Pyrus/Config/setCascadingRegistries/Config/setCascadingRegistries/basic2.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Config/setCascadingRegistries/Config/setCascadingRegistries/setup.php.inc" as="PEAR2_Pyrus/Config/setCascadingRegistries/Config/setCascadingRegistries/setup.php.inc"/>
@@ -3392,6 +3405,8 @@ Initial pyrus public API
<install name="test/pear2.php.net/PEAR2_Pyrus/DownloadProgressListener/DownloadProgressListener/progress.phpt" as="PEAR2_Pyrus/DownloadProgressListener/DownloadProgressListener/progress.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/DownloadProgressListener/DownloadProgressListener/setup.php.inc" as="PEAR2_Pyrus/DownloadProgressListener/DownloadProgressListener/setup.php.inc"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/FileInstallationFilter/FileInstallationFilter/installconditions.phpt" as="PEAR2_Pyrus/FileInstallationFilter/FileInstallationFilter/installconditions.phpt"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/Filesystem/Filesystem/path.phpt" as="PEAR2_Pyrus/Filesystem/Filesystem/path.phpt"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/Filesystem/Filesystem/setup.inc.php" as="PEAR2_Pyrus/Filesystem/Filesystem/setup.inc.php"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ignorexdebug.php" as="PEAR2_Pyrus/ignorexdebug.php"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Installer/Installer/install.badmd5sum.phpt" as="PEAR2_Pyrus/Installer/Installer/install.badmd5sum.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Installer/Installer/install.depgroup.phpt" as="PEAR2_Pyrus/Installer/Installer/install.depgroup.phpt"/>
@@ -4929,7 +4944,7 @@ Initial pyrus public API
<install name="test/pear2.php.net/PEAR2_Pyrus/RemotePackages/RemotePackages/singlerelease.phpt" as="PEAR2_Pyrus/RemotePackages/RemotePackages/singlerelease.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFileFilterIterator/ScriptFileFilterIterator/basic.phpt" as="PEAR2_Pyrus/ScriptFileFilterIterator/ScriptFileFilterIterator/basic.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFileFilterIterator/ScriptFileFilterIterator/setup.php.inc" as="PEAR2_Pyrus/ScriptFileFilterIterator/ScriptFileFilterIterator/setup.php.inc"/>
- <install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/build/ScriptFrontend/Commands/build/docblock-0.2.0.tar" as="PEAR2_Pyrus/ScriptFrontend/Commands/build/ScriptFrontend/Commands/build/docblock-0.2.0.tar"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/build/ScriptFrontend/Commands/build/oauth-1.2.2.tar" as="PEAR2_Pyrus/ScriptFrontend/Commands/build/ScriptFrontend/Commands/build/oauth-1.2.2.tar"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/foo.txt" as="PEAR2_Pyrus/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/foo.txt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/pear.txt" as="PEAR2_Pyrus/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/pear.txt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/pecl.txt" as="PEAR2_Pyrus/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/ScriptFrontend/Commands/listPackages.pear1/php/.channels/.alias/pecl.txt"/>
@@ -4982,7 +4997,6 @@ Initial pyrus public API
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/PEAR2SVN.php" as="PEAR2_Pyrus/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/PEAR2SVN.php"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/v2.php" as="PEAR2_Pyrus/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/ScriptFrontend/Commands/Pyrus_Developer/src/Pyrus/Developer/PackageFile/v2.php"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/build.phpt" as="PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/build.phpt"/>
- <install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelAdd.phpt" as="PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelAdd.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelDel.phpt" as="PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelDel.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelDiscover.fail.phpt" as="PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelDiscover.fail.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelDiscover.fail2.phpt" as="PEAR2_Pyrus/ScriptFrontend/Commands/ScriptFrontend/Commands/channelDiscover.fail2.phpt"/>
@@ -5063,9 +5077,15 @@ Initial pyrus public API
<install name="test/pear2.php.net/PEAR2_Pyrus/Uninstaller/Uninstaller/uninstall.basic.phpt" as="PEAR2_Pyrus/Uninstaller/Uninstaller/uninstall.basic.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Uninstaller/Uninstaller/uninstall.rollback.phpt" as="PEAR2_Pyrus/Uninstaller/Uninstaller/uninstall.rollback.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/setup.php.inc" as="PEAR2_Pyrus/Validate/Validate/setup.php.inc"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatedate.failure.invaliddate.phpt" as="PEAR2_Pyrus/Validate/Validate/validatedate.failure.invaliddate.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatepackagename.extends.failure.phpt" as="PEAR2_Pyrus/Validate/Validate/validatepackagename.extends.failure.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatepackagename.extends.phpt" as="PEAR2_Pyrus/Validate/Validate/validatepackagename.extends.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatepackagename.failure.phpt" as="PEAR2_Pyrus/Validate/Validate/validatepackagename.failure.phpt"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatestability.failure.api.invalidstate.phpt" as="PEAR2_Pyrus/Validate/Validate/validatestability.failure.api.invalidstate.phpt"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatestability.failure.api.invalidstate.snapshot.phpt" as="PEAR2_Pyrus/Validate/Validate/validatestability.failure.api.invalidstate.snapshot.phpt"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatestability.failure.release.invalidstate.phpt" as="PEAR2_Pyrus/Validate/Validate/validatestability.failure.release.invalidstate.phpt"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatetime.failure1.phpt" as="PEAR2_Pyrus/Validate/Validate/validatetime.failure1.phpt"/>
+ <install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validatetime.failure2.phpt" as="PEAR2_Pyrus/Validate/Validate/validatetime.failure2.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validateversion.alpha.0.3.4.phpt" as="PEAR2_Pyrus/Validate/Validate/validateversion.alpha.0.3.4.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validateversion.alpha.extends.2.0.0a1.phpt" as="PEAR2_Pyrus/Validate/Validate/validateversion.alpha.extends.2.0.0a1.phpt"/>
<install name="test/pear2.php.net/PEAR2_Pyrus/Validate/Validate/validateversion.failure.00.0.0.phpt" as="PEAR2_Pyrus/Validate/Validate/validateversion.failure.00.0.0.phpt"/>
View
11 src/Pyrus/Channel/RemotePackage.php
@@ -411,17 +411,6 @@ function download()
}
$ret = new \Pyrus\Package\Remote($url . $ext);
- if ($certdownloaded) {
- if ($ext == '.tar' || $ext == '.tgz') {
- if (phpversion() == '5.3.0') {
- Logger::log(0, 'WARNING: ' . $url . $ext . ' may not be installable ' .
- 'with PHP version 5.3.0, the PHP extension phar ' .
- 'has a bug verifying openssl signatures for ' .
- 'tar and tgz files. Either upgrade to PHP 5.3.1 ' .
- 'or install the .zip version');
- }
- }
- }
return $ret;
} catch (\Pyrus\HTTPException $e) {
if ($certdownloaded && file_exists($pubkey)) {
View
2  src/Pyrus/Main.php
@@ -60,7 +60,7 @@ static function getDataPath()
return $val;
}
- $val = dirname(dirname(dirname(__DIR__))) . '/data/pear2.php.net/Pyrus';
+ $val = dirname(dirname(__DIR__)) . '/data/pear2.php.net/Pyrus';
if (!file_exists($val)) {
// running out of git
$val = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'data';
View
44 src/Pyrus/PECLBuild.php
@@ -210,7 +210,7 @@ protected function harvestInstDir($dest_prefix, $dirname, $instroot)
* @param \Pyrus\PackageInterface $pkg package object
*
* @param mixed $callback callback function used to report output,
- * see PEAR_Builder::_runCommand for details
+ * see PEAR_Builder::runCommand for details
*
* @return array an array of associative arrays with built files,
* format:
@@ -222,7 +222,7 @@ protected function harvestInstDir($dest_prefix, $dirname, $instroot)
*
* @access public
*
- * @see PEAR_Builder::_runCommand
+ * @see PEAR_Builder::runCommand
*/
function build(Registry\Package\Base $pkg, $callback = null)
{
@@ -253,9 +253,9 @@ function build(Registry\Package\Base $pkg, $callback = null)
// Find config. outside of normal path - e.g. config.m4
foreach ($pkg->installcontents as $file) {
- if (stristr(basename($file->name), 'config.m4')) {
- $dir .= DIRECTORY_SEPARATOR . dirname($file->name);
- break;
+ if (stristr(basename($file->name), 'config.m4')) {
+ $dir .= DIRECTORY_SEPARATOR . dirname($file->name);
+ break;
}
}
@@ -276,14 +276,14 @@ function build(Registry\Package\Base $pkg, $callback = null)
}
$this->log(0, "cleaning build directory $dir");
- $this->_runCommand($config->php_prefix
+ $this->runCommand($config->php_prefix
. "phpize" .
$config->php_suffix . ' --clean',
null,
array('PATH' => $path));
$this->log(0, "building in $dir");
- if (!$this->_runCommand($config->php_prefix
+ if (!$this->runCommand($config->php_prefix
. "phpize" .
$config->php_suffix,
null, /*array($this, 'phpizeCallback'),*/
@@ -293,7 +293,7 @@ function build(Registry\Package\Base $pkg, $callback = null)
}
// {{{ start of interactive part
- $configure_command = "$dir/configure"
+ $configure = "$dir/configure"
. " --with-php-config="
. $config->php_prefix
. "php-config"
@@ -303,9 +303,9 @@ function build(Registry\Package\Base $pkg, $callback = null)
list($r) = $this->ui->ask($o->prompt, array(), $o->default);
if (substr($o->name, 0, 5) == 'with-' &&
($r == 'yes' || $r == 'autodetect')) {
- $configure_command .= ' --' . $o->name;
+ $configure .= ' --' . $o->name;
} else {
- $configure_command .= ' --' . $o->name . '=' . trim($r);
+ $configure .= ' --' . $o->name . '=' . trim($r);
}
}
}
@@ -317,19 +317,17 @@ function build(Registry\Package\Base $pkg, $callback = null)
throw new PECLBuild\Exception('could not create temporary install dir: ' . $inst_dir);
}
- if (getenv('MAKE')) {
- $make_command = getenv('MAKE');
- } else {
- $make_command = 'make';
- }
+
+ $make = getenv('MAKE') ? getenv('MAKE') : 'make';
$to_run = array(
- $configure_command,
- $make_command,
- "$make_command INSTALL_ROOT=\"$inst_dir\" install",
+ $configure,
+ $make,
+ "$make INSTALL_ROOT=\"$inst_dir\" install",
);
if (!file_exists($dir) || !is_dir($dir) || !chdir($dir)) {
throw new PECLBuild\Exception('could not chdir to ' . $dir);
}
+
$env = $_ENV;
if (count($env) == 0) {
//variables_order may not include E
@@ -342,9 +340,10 @@ function build(Registry\Package\Base $pkg, $callback = null)
} else {
$env['PHP_PEAR_VERSION'] = '@PEAR-VER@';
}
+
foreach ($to_run as $cmd) {
try {
- if (!$this->_runCommand($cmd, $callback, $env)) {
+ if (!$this->runCommand($cmd, $callback, $env)) {
throw new PECLBuild\Exception("`$cmd' failed");
}
} catch (\Exception $e) {
@@ -415,13 +414,10 @@ function phpizeCallback($what, $data)
*
* @return bool whether the command was successful (exit code 0
* means success, any other means failure)
- *
- * @access private
*/
- function _runCommand($command, $callback = null, $env = null)
+ private function runCommand($command, $callback = null, $env = null)
{
$this->log(1, "running: $command 2>&1");
-
$exitcode = $this->system_with_timeout($command . ' 2>&1', $this->buildDirectory, $callback, $env);
return ($exitcode == 0);
}
@@ -465,7 +461,7 @@ function system_with_timeout($commandline, $cwd, $callback = null, $env = null,
break;
} else if ($n === 0) {
/* timed out */
- proc_terminate($proc);
+ proc_terminate($proc, 9);
throw new PECLBuild\Exception('Error: Process timed out');
} else if ($n > 0) {
$called = false;
View
10 tests/Config/configSnapshot/test.phpt
@@ -1,7 +1,5 @@
--TEST--
\Pyrus\Config::configSnapshot()
---SKIPIF--
-<?php die('Skipped: for coverage'); ?>
--FILE--
<?php
require __DIR__ . '/setup.php.inc';
@@ -33,7 +31,8 @@ $test->assertEquals('<?xml version="1.0"?>
$a->src_dir . '</src_dir><php_bin>' .
$a->php_bin . '</php_bin><php_ini>' .
$a->php_ini . '</php_ini><php_prefix></php_prefix><php_suffix></php_suffix></pearconfig>
-', file_get_contents($cdir . '/configsnapshot-' . date('Y-m-d H-i-s') . '.xml'), 'contents 1');
+', file_get_contents($cdir . 'configsnapshot-' . date('Y-m-d H-i-s') . '.xml'), 'contents 1');
+
$test->assertEquals('<?xml version="1.0"?>
<pearconfig version="1.0"><php_dir>' .
$a->php_dir . '</php_dir><ext_dir>' .
@@ -47,7 +46,8 @@ $test->assertEquals('<?xml version="1.0"?>
$a->src_dir . '</src_dir><php_bin>' .
$a->php_bin . '</php_bin><php_ini>' .
$a->php_ini . '</php_ini><php_prefix></php_prefix><php_suffix></php_suffix></pearconfig>
-', file_get_contents($cdir . '/configsnapshot-' . date('Y-m-d H-i-s') . '.1.xml'), 'contents 2');
+', file_get_contents($cdir . 'configsnapshot-' . date('Y-m-d H-i-s') . '.1.xml'), 'contents 2');
+
$test->assertEquals('<?xml version="1.0"?>
<pearconfig version="1.0"><php_dir>' .
$a->php_dir . '</php_dir><ext_dir>' .
@@ -61,7 +61,7 @@ $test->assertEquals('<?xml version="1.0"?>
$a->src_dir . '</src_dir><php_bin>' .
$a->php_bin . '</php_bin><php_ini>' .
$a->php_ini . '</php_ini><php_prefix></php_prefix><php_suffix></php_suffix></pearconfig>
-', file_get_contents($cdir . '/configsnapshot-' . date('Y-m-d H-i-s') . '.1.1.xml'), 'contents 3');
+', file_get_contents($cdir . 'configsnapshot-' . date('Y-m-d H-i-s') . '.1.1.xml'), 'contents 3');
?>
===DONE===
--CLEAN--
View
53 tests/DownloadProgressListener/progress.phpt
@@ -40,32 +40,33 @@ $download->update(1, 'downloadprogress', 92000);
$download->update(1, 'downloadprogress', 100000);
$download->update(1, 'disconnect', 1);
$test->assertEquals(array (
- "Connected...\n" .
-"Redirected to foobar\n" .
-"Mime-type: blah/blah\n",
- "[=> ] 1% ( 0/97 kb)\r",
- "[========> ] 8% ( 7/97 kb)\r",
- "[====================> ] 20% (19/97 kb)\r",
- "[================================> ] 32% (31/97 kb)\r",
- "[============================================> ] 44% (42/97 kb)\r",
- "[========================================================> ] 56% (54/97 kb)\r",
- "[====================================================================> ] 68% (66/97 kb)\r",
- "[================================================================================> ] 80% (78/97 kb)\r",
- "[============================================================================================> ] 92% (89/97 kb)\r",
- "[====================================================================================================>] 100% (97/97 kb)\r",
- "Connected...\n" .
-"Redirected to foobar\n" .
-"Mime-type: blah/blah\n",
- "Unknown filesize.. 0 kb done..\r",
- "Unknown filesize.. 7 kb done..\r",
- "Unknown filesize.. 19 kb done..\r",
- "Unknown filesize.. 31 kb done..\r",
- "Unknown filesize.. 42 kb done..\r",
- "Unknown filesize.. 54 kb done..\r",
- "Unknown filesize.. 66 kb done..\r",
- "Unknown filesize.. 78 kb done..\r",
- "Unknown filesize.. 89 kb done..\r",
- "Unknown filesize.. 97 kb done..\r",
+ '',
+ 'Redirected to foobar
+Mime-type: blah/blah',
+ '[=> ] 1% ( 0/97 kb)',
+ '[========> ] 8% ( 7/97 kb)',
+ '[====================> ] 20% (19/97 kb)',
+ '[================================> ] 32% (31/97 kb)',
+ '[============================================> ] 44% (42/97 kb)',
+ '[========================================================> ] 56% (54/97 kb)',
+ '[====================================================================> ] 68% (66/97 kb)',
+ '[================================================================================> ] 80% (78/97 kb)',
+ '[============================================================================================> ] 92% (89/97 kb)',
+ '[====================================================================================================>] 100% (97/97 kb)',
+ '',
+ 'Redirected to foobar
+Mime-type: blah/blah',
+ 'Unknown filesize.. 0 kb done..',
+ 'Unknown filesize.. 7 kb done..',
+ 'Unknown filesize.. 19 kb done..',
+ 'Unknown filesize.. 31 kb done..',
+ 'Unknown filesize.. 42 kb done..',
+ 'Unknown filesize.. 54 kb done..',
+ 'Unknown filesize.. 66 kb done..',
+ 'Unknown filesize.. 78 kb done..',
+ 'Unknown filesize.. 89 kb done..',
+ 'Unknown filesize.. 97 kb done..',
+ '',
), \Pyrus\Logger::$log[0], 'download log');
?>
===DONE===
View
2  tests/ScriptFrontend/Commands/findpear1.phpt
@@ -13,7 +13,7 @@ ob_end_clean();
$help1 = 'Using PEAR installation found at ' . TESTDIR . "\n";
$help2 =
'
-Pyrus, the installer for PEAR2
+Pyrus, the PHP manager
Usage:
php findpear1.php [/path/to/pyrus] [options]
View
2  tests/ScriptFrontend/Commands/findpear2.phpt
@@ -65,7 +65,7 @@ TESTDIR . DIRECTORY_SEPARATOR . "testit\n" .
;
$help2 =
'
-Pyrus, the installer for PEAR2
+Pyrus, the PHP manager
Usage:
php findpear2.php [/path/to/pyrus] [options]
View
4 tests/ScriptFrontend/Commands/help.phpt
@@ -14,7 +14,7 @@ restore_include_path();
$help1 = 'Using PEAR installation found at ' . TESTDIR . "\n";
$help2 =
'
-Pyrus, the installer for PEAR2
+Pyrus, the PHP manager
Usage:
php help.php [/path/to/pyrus] [options]
@@ -100,7 +100,7 @@ Error: Command "fooburp" is not valid.
Type "php help.php --help" to get help.
Type "php help.php <command> --help" to get help on specific command.
-Pyrus, the installer for PEAR2
+Pyrus, the PHP manager
Usage:
php help.php [/path/to/pyrus] [options]

No commit comments for this range

Something went wrong with that request. Please try again.