summaryrefslogtreecommitdiff
path: root/pear
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-02-10 10:37:44 +0100
committerFerenc Kovacs <tyrael@php.net>2015-02-10 10:37:44 +0100
commitae24d24e30d157bfb5d8c7a9d57d8fe80d763758 (patch)
tree16613c31881b87c4563683042910b5e45d789787 /pear
parentf4880774b6a47bb3b71f67fd791a117131438d0a (diff)
downloadphp-git-ae24d24e30d157bfb5d8c7a9d57d8fe80d763758.tar.gz
add php7 compatible pear installer built from their stable branch
Diffstat (limited to 'pear')
-rw-r--r--pear/install-pear-nozlib.phar705
1 files changed, 309 insertions, 396 deletions
diff --git a/pear/install-pear-nozlib.phar b/pear/install-pear-nozlib.phar
index 0cab736063..f018d863ed 100644
--- a/pear/install-pear-nozlib.phar
+++ b/pear/install-pear-nozlib.phar
@@ -1234,11 +1234,9 @@ if (extension_loaded('phar')) {if (isset($_SERVER) && isset($_SERVER['REQUEST_UR
require_once 'phar://install-pear-nozlib.phar/index.php';
-__HALT_COMPILER();
-
-
-0¤/m
-
+__HALT_COMPILER();
+0¤/m
+
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
@@ -8126,7 +8124,7 @@ $options['upgrade'] = true;
$install_root = getenv('INSTALL_ROOT');
if (!empty($install_root)) {
$options['packagingroot'] = $install_root;
- $reg = &new PEAR_Registry($options['packagingroot']);
+ $reg = new PEAR_Registry($options['packagingroot']);
} else {
$reg = $config->getRegistry('default');
}
@@ -8557,7 +8555,7 @@ class OS_Guess
* indent-tabs-mode: nil
* c-basic-offset: 4
* End:
- */package.xml
+ */package.xml
<package packagerversion="1.9.5" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" 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.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>PEAR</name>
<channel>pear.php.net</channel>
@@ -8646,8 +8644,8 @@ class OS_Guess
<email>mj@php.net</email>
<active>no</active>
</helper>
- <date>2015-01-25</date>
- <time>16:44:12</time>
+ <date>2015-02-10</date>
+ <time>09:27:31</time>
<version>
<release>1.9.5</release>
<api>1.9.5</api>
@@ -8690,7 +8688,7 @@ Bug fixes in 1.9.5.dev1:
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="73602fd7f051eaf8d37452d0e3063bdb" name="PEAR/Command/Build.xml" role="php" />
- <file md5sum="ceace47b0e48e081fb47e3bb11e38fda" name="PEAR/Command/Build.php" role="php">
+ <file md5sum="c7919396329a85e869523a9427fa5fa7" name="PEAR/Command/Build.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="6d5aab4d4308c3005b5f584c7783a031" name="PEAR/Command/Channels.xml" role="php" />
@@ -8701,11 +8699,11 @@ Bug fixes in 1.9.5.dev1:
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="91f189cb9423b5e87ee0abc5ea1a2be3" name="PEAR/Command/Config.xml" role="php" />
- <file md5sum="0b102e84d3d993eebc3c7fe49f2c36fc" name="PEAR/Command/Config.php" role="php">
+ <file md5sum="7f5308dddc223db88c08247853b5405c" name="PEAR/Command/Config.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="2db0386b865d3f9a29f9126728722ece" name="PEAR/Command/Install.xml" role="php" />
- <file md5sum="be6904cb44644f7c77724a3ef2a6fcaa" name="PEAR/Command/Install.php" role="php">
+ <file md5sum="86dbc400d1ce627129fb9e3006b456bd" name="PEAR/Command/Install.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="5cb62a04c0a268f4edd64a49a3895c92" name="PEAR/Command/Mirror.xml" role="php" />
@@ -8713,27 +8711,27 @@ Bug fixes in 1.9.5.dev1:
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="9367dcd7e4dbdde423f9c4c7d3f3a919" name="PEAR/Command/Package.xml" role="php" />
- <file md5sum="278505341c63f0133608e1baf0a8e0d7" name="PEAR/Command/Package.php" role="php">
+ <file md5sum="1a48bf3b518b7294dcce9c63282c281d" name="PEAR/Command/Package.php" role="php">
<tasks:replace from="@DATA-DIR@" to="data_dir" type="pear-config" />
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="28dc842ea725d8787b9f9c3dbca5aa22" name="PEAR/Command/Pickle.xml" role="php" />
- <file md5sum="0b1502a7b6c82b18eac3eb2cab196bbb" name="PEAR/Command/Pickle.php" role="php">
+ <file md5sum="a9efe0702637c6473147811064171553" name="PEAR/Command/Pickle.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="49b046cfc14747f0365e02e9c3f0e6dc" name="PEAR/Command/Registry.xml" role="php" />
- <file md5sum="fd3c0e33bc978e6509bbea0d8711f20a" name="PEAR/Command/Registry.php" role="php">
+ <file md5sum="17d2a14999e1b27f41bd18e186b17c1d" name="PEAR/Command/Registry.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="29c02e823879b4e3e291f6b36fb339f1" name="PEAR/Command/Remote.xml" role="php" />
- <file md5sum="8587edcb9bc8a6c02f66f15f9e50f4b6" name="PEAR/Command/Remote.php" role="php">
+ <file md5sum="5554fadcaff58b8e5ae47212f886ffd5" name="PEAR/Command/Remote.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="a50c32015005e0761cc3b04679b29ed0" name="PEAR/Command/Test.xml" role="php" />
- <file md5sum="4bee6a6f6c30a81688fe0fb162a0b8e1" name="PEAR/Command/Test.php" role="php">
+ <file md5sum="c16c4e903074889c452a688e70155906" name="PEAR/Command/Test.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="a0e187d571fa147a7d47fb573c800fc6" name="PEAR/Downloader/Package.php" role="php">
+ <file md5sum="83140fa3349b06d973f6fd1e16029a3c" name="PEAR/Downloader/Package.php" role="php">
<tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
</file>
<file md5sum="7ea1b98ead05f4ab87f5c29a98dd2668" name="PEAR/Frontend/CLI.php" role="php">
@@ -8781,10 +8779,10 @@ Bug fixes in 1.9.5.dev1:
<file md5sum="94b8312236702f8eca3be8707dc1251f" name="PEAR/Installer/Role.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="7cce6312a90498b15b31b2e9a5ec070e" name="PEAR/PackageFile/Generator/v1.php" role="php">
+ <file md5sum="f175c4ee49cb7e045afe24ba6d5eba92" name="PEAR/PackageFile/Generator/v1.php" role="php">
<tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
</file>
- <file md5sum="b39ad66803993dd220bb816669305072" name="PEAR/PackageFile/Generator/v2.php" role="php">
+ <file md5sum="dd51a6e63a553c81dc845d7a573a7d11" name="PEAR/PackageFile/Generator/v2.php" role="php">
<tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
</file>
<file md5sum="77bbb9ca7272c5c383cc89ec36325a5c" name="PEAR/PackageFile/Parser/v1.php" role="php">
@@ -8793,22 +8791,22 @@ Bug fixes in 1.9.5.dev1:
<file md5sum="23c8f0128d415b9ac4fe4611c1abbc98" name="PEAR/PackageFile/Parser/v2.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="48722d63a9cf28f3ebe79224eaa562bc" name="PEAR/PackageFile/v2/rw.php" role="php">
+ <file md5sum="638362dfb65a8a9fc4c6f0741dfed23c" name="PEAR/PackageFile/v2/rw.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="5399a41a0ba63bb658b946e3b5aadc0d" name="PEAR/PackageFile/v2/Validator.php" role="php">
+ <file md5sum="7cf09f7848ca951bd329ed997f80023b" name="PEAR/PackageFile/v2/Validator.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="04edeb75c51568b85d4e4b07e6730887" name="PEAR/PackageFile/v1.php" role="php">
+ <file md5sum="f299787f3253226e3dcd9617890e6b08" name="PEAR/PackageFile/v1.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="18a657204703eadd21d1cb1484998965" name="PEAR/PackageFile/v2.php" role="php">
+ <file md5sum="c885860fba3f63e64208c83e800591eb" name="PEAR/PackageFile/v2.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="c707a5a762c52220196319b06d9ea287" name="PEAR/REST/10.php" role="php">
+ <file md5sum="dd3d0499ec716012df5d0ee23b1ca15c" name="PEAR/REST/10.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="6ec577b69fd505a1da66f21c04a2f93a" name="PEAR/REST/11.php" role="php">
+ <file md5sum="7ea6e541c857cc7f4adefd8a22c966e9" name="PEAR/REST/11.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="8a888a2c87a19f29a2119c0d85f70dfe" name="PEAR/REST/13.php" role="php">
@@ -8844,31 +8842,31 @@ Bug fixes in 1.9.5.dev1:
<file md5sum="423fc3e5caf0a4f93632218404fffedb" name="PEAR/Validator/PECL.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="8f05c73498e74c5cef2613b92766ac49" name="PEAR/Autoloader.php" role="php">
+ <file md5sum="bf7f19661227aa8ad89e014ee2862038" name="PEAR/Autoloader.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="a6e3c5edf25f9c9561dc1fa9232ef0d6" name="PEAR/Builder.php" role="php">
+ <file md5sum="97e77a9cf47dacd9704bb2dbe43ffe33" name="PEAR/Builder.php" role="php">
<tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
</file>
- <file md5sum="5138dd27c6ba11bd26903d4bd7d2f34f" name="PEAR/ChannelFile.php" role="php">
+ <file md5sum="abbafd91dc1ed660c2ca2705ca30acd0" name="PEAR/ChannelFile.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="3db5ed459a921a942ecb5186b3f30ce0" name="PEAR/Command.php" role="php">
+ <file md5sum="60636aa79628bd58099e130405818b4a" name="PEAR/Command.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="4b2c08cbbaf3a0ec28d80348c80f7997" name="PEAR/Common.php" role="php">
+ <file md5sum="f2b71f456915b24bdc1c78fd254f2b68" name="PEAR/Common.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="a0b1e1e316f275e414325f8d7e0e47a9" name="PEAR/Config.php" role="php">
+ <file md5sum="faebce48d29c6ad0f4c2c776d6c98e15" name="PEAR/Config.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="e57870e9ac30c735275d9a600b81233e" name="PEAR/DependencyDB.php" role="php">
+ <file md5sum="644660b5315b448fffeab1202bb5a9eb" name="PEAR/DependencyDB.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="170c80666eb4836c64349aeb96a64407" name="PEAR/Dependency2.php" role="php">
+ <file md5sum="cf3bfe2f4ccafc3d43f7255cc8e9d548" name="PEAR/Dependency2.php" role="php">
<tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
</file>
- <file md5sum="4efbf6fab81915541302398371dcf424" name="PEAR/Downloader.php" role="php">
+ <file md5sum="71b88ecc50194a86eebe10e39f06d0da" name="PEAR/Downloader.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="5e7a672375619abfeb9d847f247189b7" name="PEAR/ErrorStack.php" role="php">
@@ -8877,26 +8875,26 @@ Bug fixes in 1.9.5.dev1:
<file md5sum="d3518fed48c3f04e66fdc4e5694d03c1" name="PEAR/Exception.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="e0e4cbcec4a972fbad779d0f9d323120" name="PEAR/FixPHP5PEARWarnings.php" role="php" />
- <file md5sum="54db0452c9cd5da3c3e33d42d0c7b85d" name="PEAR/Frontend.php" role="php">
+ <file md5sum="bc2c2db4ebcf8ae402eb11a312ad4df2" name="PEAR/FixPHP5PEARWarnings.php" role="php" />
+ <file md5sum="1a1f503b27488f70f2acf3dee1ef5f74" name="PEAR/Frontend.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="4385026134eb94616a96a1c32e05770a" name="PEAR/Installer.php" role="php">
+ <file md5sum="2c5a03a832216edd5089e22798497d1c" name="PEAR/Installer.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="9bb788f49f17576f7d31e4929d2538c5" name="PEAR/PackageFile.php" role="php">
<tasks:replace from="@PEAR-VER@" to="version" type="package-info" />
</file>
- <file md5sum="d6d6614d1716c5d7003c5b4c077ef80f" name="PEAR/Packager.php" role="php">
+ <file md5sum="0b0301ec44dc23728bb9487a084d6dcc" name="PEAR/Packager.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="13259eb8179ae682e851e8233e524f5f" name="PEAR/Registry.php" role="php">
+ <file md5sum="9ee69625641852e4074dd46873443305" name="PEAR/Registry.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="9798b333d64c37f7fea737565a175c71" name="PEAR/REST.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="496744abe2a25f7ce348ad24bb410758" name="PEAR/RunTest.php" role="php">
+ <file md5sum="2671d677a3777079a136f8df384fd466" name="PEAR/RunTest.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file md5sum="c94597a58ce447e3c9b3005820c2aa3f" name="PEAR/Validate.php" role="php">
@@ -8944,7 +8942,7 @@ Bug fixes in 1.9.5.dev1:
<tasks:replace from="@include_path@" to="php_dir" type="pear-config" />
<tasks:unixeol />
</file>
- <file baseinstalldir="/" md5sum="e895f4721a7662697b6165ad6b2d4976" name="scripts/pearcmd.php" role="php">
+ <file baseinstalldir="/" md5sum="179d763fe0203ba4033b1e14416fe940" name="scripts/pearcmd.php" role="php">
<tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
<tasks:replace from="@php_dir@" to="php_dir" type="pear-config" />
<tasks:replace from="@pear_version@" to="version" type="package-info" />
@@ -8963,7 +8961,7 @@ Bug fixes in 1.9.5.dev1:
<file md5sum="a188d10ae25015b4eba97cecdb9155db" name="PEAR.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
- <file md5sum="4ebce9e0919c7d9702373a0090ab301f" name="README" role="doc" />
+ <file md5sum="3f9216552239643c77f06412fae12bd0" name="README" role="doc" />
<file md5sum="b3750a146f22e8c9fcad0d5373076884" name="System.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
@@ -8973,14 +8971,7 @@ Bug fixes in 1.9.5.dev1:
<dependencies>
<required>
<php>
- <min>4.4.0</min>
- <exclude>5.0</exclude>
- <exclude>5.1.0</exclude>
- <exclude>5.1.1</exclude>
- <exclude>5.1.2</exclude>
- <exclude>5.1.3</exclude>
- <exclude>5.1.4</exclude>
- <exclude>5.1.5</exclude>
+ <min>5.4.0</min>
</php>
<pearinstaller>
<min>1.4.3</min>
@@ -9555,7 +9546,7 @@ Bug fixes in 1.9.5.dev1:
</release>
</changelog>
</package>
-
+
/**
* The OS_Guess class
*
@@ -9892,7 +9883,7 @@ class OS_Guess
* indent-tabs-mode: nil
* c-basic-offset: 4
* End:
- */
+ */
/**
* PEAR_ChannelFile_Parser for parsing channel.xml
*
@@ -9959,7 +9950,7 @@ class PEAR_ChannelFile_Parser extends PEAR_XMLParser
$ret->setPackagefile($file, $archive);
return $ret;
}
-}
+}
<login>
<summary>Connects and authenticates to remote server [Deprecated in favor of channel-login]</summary>
<function>doLogin</function>
@@ -9988,7 +9979,7 @@ Logs out from the remote server. This command does not actually
connect to the remote server, it only deletes the stored username and
password from your user configuration.</doc>
</logout>
-</commands>
+</commands>
/**
* PEAR_Command_Auth (login, logout commands)
*
@@ -10068,7 +10059,7 @@ password from your user configuration.',
{
parent::PEAR_Command_Channels($ui, $config);
}
-}
+}
<build>
<summary>Build an Extension From C Source</summary>
<function>doBuild</function>
@@ -10077,7 +10068,7 @@ password from your user configuration.',
<doc>[package.xml]
Builds one or more extensions contained in a package.</doc>
</build>
-</commands>
+</commands>
/**
* PEAR_Command_Auth (build command)
*
@@ -10144,7 +10135,7 @@ Builds one or more extensions contained in a package.'
$params[0] = 'package.xml';
}
- $builder = &new PEAR_Builder($this->ui);
+ $builder = new PEAR_Builder($this->ui);
$this->debug = $this->config->get('verbose');
$err = $builder->build($params[0], array(&$this, 'buildCallback'));
if (PEAR::isError($err)) {
@@ -10161,7 +10152,7 @@ Builds one or more extensions contained in a package.'
$this->ui->outputData(rtrim($data), 'build');
}
}
-}
+}
<list-channels>
<summary>List Available Channels</summary>
<function>doList</function>
@@ -10283,7 +10274,7 @@ the default channel is used. This command does not actually connect to the
remote server, it only deletes the stored username and password from your user
configuration.</doc>
</channel-logout>
-</commands>
+</commands>
// /* vim: set expandtab tabstop=4 shiftwidth=4: */
/**
* PEAR_Command_Channels (list-channels, update-channels, channel-delete, channel-add,
@@ -11165,7 +11156,7 @@ configuration.',
$this->config->store();
return true;
}
-}
+}
/**
* PEAR_Command_Common base class
*
@@ -11437,7 +11428,7 @@ class PEAR_Command_Common extends PEAR
return $this->$func($command, $options, $params);
}
-}
+}
<config-show>
<summary>Show All Settings</summary>
<function>doConfigShow</function>
@@ -11528,7 +11519,7 @@ PEAR installation (using the --remoteconfig option of install, upgrade,
and uninstall).
</doc>
</config-create>
-</commands>
+</commands>
/**
* PEAR_Command_Config (config-show, config-get, config-set, config-help, config-create commands)
*
@@ -11868,7 +11859,7 @@ and uninstall).
}
$params[1] = realpath($params[1]);
- $config = &new PEAR_Config($params[1], '#no#system#config#', false, false);
+ $config = new PEAR_Config($params[1], '#no#system#config#', false, false);
if ($root{strlen($root) - 1} == '/') {
$root = substr($root, 0, strlen($root) - 1);
}
@@ -11941,7 +11932,7 @@ and uninstall).
return false;
}
-}
+}
<install>
<summary>Install Package</summary>
<function>doInstall</function>
@@ -12216,7 +12207,7 @@ package if needed.
Run post-installation scripts in package &lt;package&gt;, if any exist.
</doc>
</run-scripts>
-</commands>
+</commands>
/**
* PEAR_Command_Install (install, upgrade, upgrade-all, uninstall, bundle, run-scripts commands)
*
@@ -12546,7 +12537,7 @@ Run post-installation scripts in package <package>, if any exist.
if (!class_exists('PEAR_Downloader')) {
require_once 'PEAR/Downloader.php';
}
- $a = &new PEAR_Downloader($ui, $options, $config);
+ $a = new PEAR_Downloader($ui, $options, $config);
return $a;
}
@@ -12558,7 +12549,7 @@ Run post-installation scripts in package <package>, if any exist.
if (!class_exists('PEAR_Installer')) {
require_once 'PEAR/Installer.php';
}
- $a = &new PEAR_Installer($ui);
+ $a = new PEAR_Installer($ui);
return $a;
}
@@ -13361,7 +13352,7 @@ Run post-installation scripts in package <package>, if any exist.
$dest .= DIRECTORY_SEPARATOR . $pkgname;
$orig = $pkgname . '-' . $pkgversion;
- $tar = &new Archive_Tar($pkgfile->getArchiveFile());
+ $tar = new Archive_Tar($pkgfile->getArchiveFile());
if (!$tar->extractModify($dest, $orig)) {
return $this->raiseError('unable to unpack ' . $pkgfile->getArchiveFile());
}
@@ -13491,7 +13482,7 @@ Run post-installation scripts in package <package>, if any exist.
return $ret;
}
}
-
+PEAR-1.9.5/PEAR/Command/Mirror.xml
<download-all>
<summary>Downloads each available package from the default channel</summary>
<function>doDownloadAll</function>
@@ -13508,7 +13499,7 @@ Requests a list of available packages from the default channel ({config default_
and downloads them to current working directory. Note: only
packages within preferred_state ({config preferred_state}) will be downloaded</doc>
</download-all>
-</commands>
+</commands>
/**
* PEAR_Command_Mirror (download-all command)
*
@@ -13646,7 +13637,7 @@ packages within preferred_state ({config preferred_state}) will be downloaded'
return true;
}
-}
+}
<package>
<summary>Build Package</summary>
<function>doPackage</function>
@@ -13882,7 +13873,7 @@ This is not the most intelligent conversion, and should only be
used for automated conversion or learning the format.
</doc>
</convert>
-</commands>
+</commands>
/**
* PEAR_Command_Package (package, package-validate, cvsdiff, cvstag, package-dependencies,
* sign, makerpm, convert commands)
@@ -14194,7 +14185,7 @@ used for automated conversion or learning the format.
if (!class_exists('PEAR_Packager')) {
require_once 'PEAR/Packager.php';
}
- $a = &new PEAR_Packager;
+ $a = new PEAR_Packager;
return $a;
}
@@ -14206,7 +14197,7 @@ used for automated conversion or learning the format.
if (!class_exists('PEAR_PackageFile')) {
require_once 'PEAR/PackageFile.php';
}
- $a = &new PEAR_PackageFile($config, $debug);
+ $a = new PEAR_PackageFile($config, $debug);
$common = new PEAR_Common;
$common->ui = $this->ui;
$a->setLogger($common);
@@ -14256,7 +14247,7 @@ used for automated conversion or learning the format.
$info = $obj->fromPackageFile($params[0], PEAR_VALIDATE_NORMAL);
} else {
$archive = $info->getArchiveFile();
- $tar = &new Archive_Tar($archive);
+ $tar = new Archive_Tar($archive);
$tar->extract(dirname($info->getPackageFile()));
$info->setPackageFile(dirname($info->getPackageFile()) . DIRECTORY_SEPARATOR .
$info->getPackage() . '-' . $info->getVersion() . DIRECTORY_SEPARATOR .
@@ -14915,7 +14906,7 @@ used for automated conversion or learning the format.
if (!class_exists('PEAR_Installer')) {
require_once 'PEAR/Installer.php';
}
- $a = &new PEAR_Installer($ui);
+ $a = new PEAR_Installer($ui);
return $a;
}
@@ -14932,7 +14923,7 @@ used for automated conversion or learning the format.
}
if (class_exists('PEAR_Command_Packaging')) {
- $a = &new PEAR_Command_Packaging($ui, $config);
+ $a = new PEAR_Command_Packaging($ui, $config);
} else {
$a = null;
}
@@ -15006,7 +14997,7 @@ used for automated conversion or learning the format.
return true;
}
}
-
+
<pickle>
<summary>Build PECL Package</summary>
<function>doPackage</function>
@@ -15041,7 +15032,7 @@ uses any of these features, you are best off using PEAR_PackageFileManager to
generate both package.xml.
</doc>
</pickle>
-</commands>
+</commands>
/**
* PEAR_Command_Pickle (pickle command)
*
@@ -15135,7 +15126,7 @@ generate both package.xml.
require_once 'PEAR/Packager.php';
}
- $a = &new PEAR_Packager;
+ $a = new PEAR_Packager;
return $a;
}
@@ -15157,7 +15148,7 @@ generate both package.xml.
require_once 'PEAR/PackageFile.php';
}
- $a = &new PEAR_PackageFile($config, $debug);
+ $a = new PEAR_PackageFile($config, $debug);
$common = new PEAR_Common;
$common->ui = $this->ui;
$a->setLogger($common);
@@ -15461,7 +15452,7 @@ generate both package.xml.
$gen = &$pf->getDefaultGenerator();
$gen->toPackageFile('.');
}
-}
+}
<list>
<summary>List Installed Packages In The Default Channel</summary>
<function>doList</function>
@@ -15518,7 +15509,7 @@ Displays information about a package. The package argument may be a
local package file, an URL to a package file, or the name of an
installed package.</doc>
</info>
-</commands>
+</commands>
/**
* PEAR_Command_Registry (list, list-files, shell-test, info commands)
*
@@ -15781,7 +15772,7 @@ installed package.'
require_once 'PEAR/PackageFile.php';
}
- $pkg = &new PEAR_PackageFile($this->config, $this->_debug);
+ $pkg = new PEAR_PackageFile($this->config, $this->_debug);
PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
$info = &$pkg->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
PEAR::staticPopErrorHandling();
@@ -15955,7 +15946,7 @@ installed package.'
require_once 'PEAR/PackageFile.php';
}
- $pkg = &new PEAR_PackageFile($this->config, $this->_debug);
+ $pkg = new PEAR_PackageFile($this->config, $this->_debug);
PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
$obj = &$pkg->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
PEAR::staticPopErrorHandling();
@@ -16662,7 +16653,7 @@ installed package.'
$data['raw'] = $obj->getArray(); // no validation needed
$this->ui->outputData($data, 'package-info');
}
-}
+}
<remote-info>
<summary>Information About Remote Packages</summary>
<function>doRemoteInfo</function>
@@ -16770,7 +16761,7 @@ Clear the XML-RPC/REST cache. See also the cache_ttl configuration
parameter.
</doc>
</clear-cache>
-</commands>
+</commands>
/**
* PEAR_Command_Remote (remote-info, list-upgrades, remote-list, search, list-all, download,
* clear-cache commands)
@@ -17351,7 +17342,7 @@ parameter.
if (!class_exists('PEAR_Downloader')) {
require_once 'PEAR/Downloader.php';
}
- $a = &new PEAR_Downloader($this->ui, $options, $this->config);
+ $a = new PEAR_Downloader($this->ui, $options, $this->config);
return $a;
}
@@ -17579,7 +17570,7 @@ parameter.
$this->ui->outputData(rtrim($output), $command);
return $num;
}
-}
+}
<run-tests>
<summary>Run Regression Tests</summary>
<function>doRunTests</function>
@@ -17632,7 +17623,7 @@ If none is found, all .phpt tests will be tried instead.</doc>
<doc>[testfile|dir ...]
Run regression tests with PHP&#039;s regression testing script (run-tests.php).</doc>
</run-tests>
-</commands>
+</commands>
/**
* PEAR_Command_Test (run-tests)
*
@@ -17966,9 +17957,12 @@ Run regression tests with PHP\'s regression testing script (run-tests.php).',
}
}
- return count($failed) == 0;
+ if (count($failed) == 0) {
+ return true;
+ }
+ return $this->raiseError('Some tests failed');
}
-}
+}
/**
* PEAR_Downloader_Package
*
@@ -19354,7 +19348,7 @@ class PEAR_Downloader_Package
$obj->setExplicitState($s);
}
- $obj = &new PEAR_Downloader_Package($params[$i]->getDownloader());
+ $obj = new PEAR_Downloader_Package($params[$i]->getDownloader());
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
if (PEAR::isError($dir = $dl->getDownloadDir())) {
PEAR::popErrorHandling();
@@ -19370,10 +19364,9 @@ class PEAR_Downloader_Package
continue;
}
- $j = &$obj;
- if (!PEAR_Downloader_Package::willDownload($j,
- array_merge($params, $newparams)) && !$param->isInstalled($j)) {
- $newparams[] = &$j;
+ if (!PEAR_Downloader_Package::willDownload($obj,
+ array_merge($params, $newparams)) && !$param->isInstalled($obj)) {
+ $newparams[] = $obj;
}
}
}
@@ -19407,7 +19400,7 @@ class PEAR_Downloader_Package
// convert the dependencies into PEAR_Downloader_Package objects for the next time around
$params[$i]->_downloadDeps = array();
foreach ($newdeps as $dep) {
- $obj = &new PEAR_Downloader_Package($params[$i]->getDownloader());
+ $obj = new PEAR_Downloader_Package($params[$i]->getDownloader());
if ($s = $params[$i]->explicitState()) {
$obj->setExplicitState($s);
}
@@ -19429,8 +19422,7 @@ class PEAR_Downloader_Package
}
}
- $j = &$obj;
- $newparams[] = &$j;
+ $newparams[] = $obj;
}
}
@@ -19471,7 +19463,7 @@ class PEAR_Downloader_Package
*/
function &getPackagefileObject(&$c, $d)
{
- $a = &new PEAR_PackageFile($c, $d);
+ $a = new PEAR_PackageFile($c, $d);
return $a;
}
@@ -19546,7 +19538,7 @@ class PEAR_Downloader_Package
if ($this->_rawpackagefile) {
require_once 'Archive/Tar.php';
- $tar = &new Archive_Tar($file);
+ $tar = new Archive_Tar($file);
$packagexml = $tar->extractInString('package2.xml');
if (!$packagexml) {
$packagexml = $tar->extractInString('package.xml');
@@ -19955,7 +19947,7 @@ class PEAR_Downloader_Package
return $info;
}
-}
+}
/**
* PEAR_Frontend_CLI
*
@@ -20705,7 +20697,7 @@ class PEAR_Frontend_CLI extends PEAR_Frontend
{
print $text;
}
-}
+}
/**
* Base class for all installation roles.
*
@@ -20878,7 +20870,7 @@ class PEAR_Installer_Role_Common
return $roleInfo['phpextension'];
}
}
-?>
+?>
<releasetypes>php</releasetypes>
<releasetypes>extsrc</releasetypes>
<releasetypes>extbin</releasetypes>
@@ -20892,7 +20884,7 @@ class PEAR_Installer_Role_Common
<executable />
<phpextension />
<config_vars />
-</role>
+</role>
/**
* PEAR_Installer_Role_Cfg
*
@@ -20997,7 +20989,7 @@ class PEAR_Installer_Role_Cfg extends PEAR_Installer_Role_Common
return $test;
}
-}
+}
<releasetypes>php</releasetypes>
<releasetypes>extsrc</releasetypes>
<releasetypes>extbin</releasetypes>
@@ -21011,7 +21003,7 @@ class PEAR_Installer_Role_Cfg extends PEAR_Installer_Role_Common
<executable />
<phpextension />
<config_vars />
-</role>
+</role>
/**
* PEAR_Installer_Role_Data
*
@@ -21038,7 +21030,7 @@ class PEAR_Installer_Role_Cfg extends PEAR_Installer_Role_Common
* @since Class available since Release 1.4.0a1
*/
class PEAR_Installer_Role_Data extends PEAR_Installer_Role_Common {}
-?>
+?>
<releasetypes>php</releasetypes>
<releasetypes>extsrc</releasetypes>
<releasetypes>extbin</releasetypes>
@@ -21052,7 +21044,7 @@ class PEAR_Installer_Role_Data extends PEAR_Installer_Role_Common {}
<executable />
<phpextension />
<config_vars />
-</role>
+</role>
/**
* PEAR_Installer_Role_Doc
*
@@ -21079,7 +21071,7 @@ class PEAR_Installer_Role_Data extends PEAR_Installer_Role_Common {}
* @since Class available since Release 1.4.0a1
*/
class PEAR_Installer_Role_Doc extends PEAR_Installer_Role_Common {}
-?>
+?>
<releasetypes>extbin</releasetypes>
<releasetypes>zendextbin</releasetypes>
<installable>1</installable>
@@ -21090,7 +21082,7 @@ class PEAR_Installer_Role_Doc extends PEAR_Installer_Role_Common {}
<executable />
<phpextension>1</phpextension>
<config_vars />
-</role>
+</role>
/**
* PEAR_Installer_Role_Ext
*
@@ -21117,7 +21109,7 @@ class PEAR_Installer_Role_Doc extends PEAR_Installer_Role_Common {}
* @since Class available since Release 1.4.0a1
*/
class PEAR_Installer_Role_Ext extends PEAR_Installer_Role_Common {}
-?>
+?>
<releasetypes>php</releasetypes>
<releasetypes>extsrc</releasetypes>
<releasetypes>extbin</releasetypes>
@@ -21131,7 +21123,7 @@ class PEAR_Installer_Role_Ext extends PEAR_Installer_Role_Common {}
<executable />
<phpextension />
<config_vars />
-</role>
+</role>
/**
* PEAR_Installer_Role_Php
*
@@ -21158,7 +21150,7 @@ class PEAR_Installer_Role_Ext extends PEAR_Installer_Role_Common {}
* @since Class available since Release 1.4.0a1
*/
class PEAR_Installer_Role_Php extends PEAR_Installer_Role_Common {}
-?>
+?>
<releasetypes>php</releasetypes>
<releasetypes>extsrc</releasetypes>
<releasetypes>extbin</releasetypes>
@@ -21172,7 +21164,7 @@ class PEAR_Installer_Role_Php extends PEAR_Installer_Role_Common {}
<executable>1</executable>
<phpextension />
<config_vars />
-</role>
+</role>
/**
* PEAR_Installer_Role_Script
*
@@ -21199,7 +21191,7 @@ class PEAR_Installer_Role_Php extends PEAR_Installer_Role_Common {}
* @since Class available since Release 1.4.0a1
*/
class PEAR_Installer_Role_Script extends PEAR_Installer_Role_Common {}
-?>
+?>
<releasetypes>extsrc</releasetypes>
<releasetypes>zendextsrc</releasetypes>
<installable>1</installable>
@@ -21210,7 +21202,7 @@ class PEAR_Installer_Role_Script extends PEAR_Installer_Role_Common {}
<executable />
<phpextension />
<config_vars />
-</role>
+</role>
/**
* PEAR_Installer_Role_Src
*
@@ -21243,7 +21235,7 @@ class PEAR_Installer_Role_Src extends PEAR_Installer_Role_Common
$installer->source_files++;
}
}
-?>
+?>
<releasetypes>php</releasetypes>
<releasetypes>extsrc</releasetypes>
<releasetypes>extbin</releasetypes>
@@ -21257,7 +21249,7 @@ class PEAR_Installer_Role_Src extends PEAR_Installer_Role_Common
<executable />
<phpextension />
<config_vars />
-</role>
+</role>
/**
* PEAR_Installer_Role_Test
*
@@ -21284,7 +21276,7 @@ class PEAR_Installer_Role_Src extends PEAR_Installer_Role_Common
* @since Class available since Release 1.4.0a1
*/
class PEAR_Installer_Role_Test extends PEAR_Installer_Role_Common {}
-?>
+?>
<releasetypes>php</releasetypes>
<releasetypes>extsrc</releasetypes>
<releasetypes>extbin</releasetypes>
@@ -21298,7 +21290,7 @@ class PEAR_Installer_Role_Test extends PEAR_Installer_Role_Common {}
<executable />
<phpextension />
<config_vars />
-</role>
+</role>
/**
* PEAR_Installer_Role_Www
*
@@ -21325,7 +21317,7 @@ class PEAR_Installer_Role_Test extends PEAR_Installer_Role_Common {}
* @since Class available since Release 1.7.0
*/
class PEAR_Installer_Role_Www extends PEAR_Installer_Role_Common {}
-?>
+?>
/**
* PEAR_Installer_Role
*
@@ -21600,7 +21592,7 @@ class PEAR_Installer_Role
PEAR_Installer_Role::getValidRoles('****', true);
return true;
}
-}
+}
/**
* package.xml generation class, package.xml version 1.0
*
@@ -21711,7 +21703,7 @@ class PEAR_PackageFile_Generator_v1
// }}}
$packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, 'package.xml', true);
if ($packagexml) {
- $tar =& new Archive_Tar($dest_package, $compress);
+ $tar = new Archive_Tar($dest_package, $compress);
$tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
// ----- Creates with the package.xml file
$ok = $tar->createModify(array($packagexml), '', $where);
@@ -22883,7 +22875,7 @@ class PEAR_PackageFile_Generator_v1
return $ret;
}
}
-?>
+?>
/**
* package.xml generation class, package.xml version 2.0
*
@@ -23117,7 +23109,7 @@ http://pear.php.net/dtd/package-2.0.xsd',
array($this->_packagefile->getTasksNs() . ':', '-'),
array('', '_'), $tag);
$task = "PEAR_Task_$tag";
- $task = &new $task($this->_packagefile->_config,
+ $task = new $task($this->_packagefile->_config,
$this->_packagefile->_logger,
PEAR_TASK_PACKAGE);
$task->init($raw, $atts, null);
@@ -23154,7 +23146,7 @@ http://pear.php.net/dtd/package-2.0.xsd',
$name = $pf1 !== null ? 'package2.xml' : 'package.xml';
$packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, $name);
if ($packagexml) {
- $tar =& new Archive_Tar($dest_package, $compress);
+ $tar = new Archive_Tar($dest_package, $compress);
$tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
// ----- Creates with the package.xml file
$ok = $tar->createModify(array($packagexml), '', $where);
@@ -23776,7 +23768,7 @@ http://pear.php.net/dtd/package-2.0.xsd',
return $tag;
}
}
-
+
/**
* package.xml parsing class, package.xml version 1.0
*
@@ -24234,7 +24226,7 @@ class PEAR_PackageFile_Parser_v1
// }}}
}
-?>
+?>
/**
* package.xml parsing class, package.xml version 2.0
*
@@ -24346,7 +24338,7 @@ class PEAR_PackageFile_Parser_v2 extends PEAR_XMLParser
$ret->setPackagefile($file, $archive);
return $ret;
}
-}
+}
/**
* PEAR_PackageFile_v2, package.xml version 2.0, read/write version
*
@@ -24590,7 +24582,7 @@ class PEAR_PackageFile_v2_rw extends PEAR_PackageFile_v2
}
}
foreach ($info as $i => $maintainer) {
- if ($maintainer['user'] == $handle) {
+ if (is_array($maintainer) && $maintainer['user'] == $handle) {
$found = $i;
break 2;
}
@@ -25949,7 +25941,7 @@ class PEAR_PackageFile_v2_rw extends PEAR_PackageFile_v2
{
unset($this->_packageInfo['changelog']);
}
-}
+}
/**
* PEAR_PackageFile_v2, package.xml version 2.0, read/write version
*
@@ -26063,6 +26055,7 @@ class PEAR_PackageFile_v2_Validator
isset($test['dependencies']['required']) &&
isset($test['dependencies']['required']['pearinstaller']) &&
isset($test['dependencies']['required']['pearinstaller']['min']) &&
+ '1.9.5' != '@package' . '_version@' &&
version_compare('1.9.5',
$test['dependencies']['required']['pearinstaller']['min'], '<')
) {
@@ -27688,7 +27681,7 @@ class PEAR_PackageFile_v2_Validator
if (!is_array($info)) {
$info = array($info);
}
- $pkg = &new PEAR_PackageFile($this->_pf->_config);
+ $pkg = new PEAR_PackageFile($this->_pf->_config);
foreach ($info as $package) {
if (!file_exists($dir_prefix . DIRECTORY_SEPARATOR . $package)) {
$this->_fileNotFound($dir_prefix . DIRECTORY_SEPARATOR . $package);
@@ -28103,7 +28096,7 @@ class PEAR_PackageFile_v2_Validator
return $providesret;
}
}
-
+
/**
* PEAR_PackageFile_v1, package.xml version 1.0
*
@@ -28453,7 +28446,7 @@ class PEAR_PackageFile_v1
*/
function PEAR_PackageFile_v1()
{
- $this->_stack = &new PEAR_ErrorStack('PEAR_PackageFile_v1');
+ $this->_stack = new PEAR_ErrorStack('PEAR_PackageFile_v1');
$this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
$this->_isValid = 0;
}
@@ -29413,7 +29406,7 @@ class PEAR_PackageFile_v1
if (!class_exists('PEAR_PackageFile_Generator_v1')) {
require_once 'PEAR/PackageFile/Generator/v1.php';
}
- $a = &new PEAR_PackageFile_Generator_v1($this);
+ $a = new PEAR_PackageFile_Generator_v1($this);
return $a;
}
@@ -29436,7 +29429,7 @@ class PEAR_PackageFile_v1
if (!class_exists('Archive_Tar')) {
require_once 'Archive/Tar.php';
}
- $tar = &new Archive_Tar($this->_archiveFile);
+ $tar = new Archive_Tar($this->_archiveFile);
$tar->pushErrorHandling(PEAR_ERROR_RETURN);
if ($file != 'package.xml' && $file != 'package2.xml') {
$file = $this->getPackage() . '-' . $this->getVersion() . '/' . $file;
@@ -29715,7 +29708,7 @@ class PEAR_PackageFile_v1
// }}}
}
?>
-
+
/**
* PEAR_PackageFile_v2, package.xml version 2.0
*
@@ -29862,7 +29855,7 @@ class PEAR_PackageFile_v2
*/
function &getPEARDownloader(&$i, $o, &$c)
{
- $z = &new PEAR_Downloader($i, $o, $c);
+ $z = new PEAR_Downloader($i, $o, $c);
return $z;
}
@@ -29880,7 +29873,7 @@ class PEAR_PackageFile_v2
if (!class_exists('PEAR_Dependency2')) {
require_once 'PEAR/Dependency2.php';
}
- $z = &new PEAR_Dependency2($c, $o, $p, $s);
+ $z = new PEAR_Dependency2($c, $o, $p, $s);
return $z;
}
@@ -30281,7 +30274,7 @@ class PEAR_PackageFile_v2
$atts = $filelist[$name];
foreach ($tasks as $tag => $raw) {
$task = $this->getTask($tag);
- $task = &new $task($this->_config, $common, PEAR_TASK_INSTALL);
+ $task = new $task($this->_config, $common, PEAR_TASK_INSTALL);
if ($task->isScript()) {
$ret[] = $filelist[$name]['installed_as'];
}
@@ -30327,7 +30320,7 @@ class PEAR_PackageFile_v2
$atts = $filelist[$name];
foreach ($tasks as $tag => $raw) {
$taskname = $this->getTask($tag);
- $task = &new $taskname($this->_config, $common, PEAR_TASK_INSTALL);
+ $task = new $taskname($this->_config, $common, PEAR_TASK_INSTALL);
if (!$task->isScript()) {
continue; // scripts are only handled after installation
}
@@ -31571,7 +31564,7 @@ class PEAR_PackageFile_v2
return implode('', file($file));
}
} else { // tgz
- $tar = &new Archive_Tar($this->_archiveFile);
+ $tar = new Archive_Tar($this->_archiveFile);
$tar->pushErrorHandling(PEAR_ERROR_RETURN);
if ($file != 'package.xml' && $file != 'package2.xml') {
$file = $this->getPackage() . '-' . $this->getVersion() . '/' . $file;
@@ -31610,7 +31603,7 @@ class PEAR_PackageFile_v2
if (!class_exists('PEAR_PackageFile_Generator_v2')) {
require_once 'PEAR/PackageFile/Generator/v2.php';
}
- $a = &new PEAR_PackageFile_Generator_v2($this);
+ $a = new PEAR_PackageFile_Generator_v2($this);
return $a;
}
@@ -31764,7 +31757,7 @@ class PEAR_PackageFile_v2
}
}
?>
-
+
/**
* PEAR_REST_10
*
@@ -31805,7 +31798,7 @@ class PEAR_REST_10
var $_rest;
function PEAR_REST_10($config, $options = array())
{
- $this->_rest = &new PEAR_REST($config, $options);
+ $this->_rest = new PEAR_REST($config, $options);
}
/**
@@ -32634,7 +32627,7 @@ class PEAR_REST_10
return 1;
}
}
-}
+}
/**
* PEAR_REST_11 - implement faster list-all/remote-list command
*
@@ -32676,7 +32669,7 @@ class PEAR_REST_11
function PEAR_REST_11($config, $options = array())
{
- $this->_rest = &new PEAR_REST($config, $options);
+ $this->_rest = new PEAR_REST($config, $options);
}
function listAll($base, $dostable, $basic = true, $searchpackage = false, $searchsummary = false, $channel = false)
@@ -32974,7 +32967,7 @@ class PEAR_REST_11
return array_slice($states, $i + 1);
}
}
-?>
+?>PEAR-1.9.5/PEAR/REST/13.php
/**
* PEAR_REST_13
*
@@ -33272,7 +33265,7 @@ class PEAR_REST_13 extends PEAR_REST_10
return $this->_returnDownloadURL($base, $package, $release, $info, $found, $skippedphp, $channel);
}
-}
+}
/**
* <tasks:postinstallscript> - read/write version
*
@@ -33440,7 +33433,7 @@ class PEAR_Task_Postinstallscript_rw extends PEAR_Task_Postinstallscript
);
}
}
-?>
+?>
/**
* <tasks:replace> - read/write version
*
@@ -33500,7 +33493,7 @@ class PEAR_Task_Replace_rw extends PEAR_Task_Replace
return $this->_params;
}
}
-?>
+?>
/**
* <tasks:unixeol> - read/write version
*
@@ -33555,7 +33548,7 @@ class PEAR_Task_Unixeol_rw extends PEAR_Task_Unixeol
return '';
}
}
-?>
+?>
/**
* <tasks:windowseol> - read/write version
*
@@ -33610,7 +33603,7 @@ class PEAR_Task_Windowseol_rw extends PEAR_Task_Windowseol
return '';
}
}
-?>
+?>
/**
* PEAR_Task_Common, base class for installer tasks
*
@@ -33811,7 +33804,7 @@ class PEAR_Task_Common
return PEAR::raiseError($msg, $code);
}
}
-?>
+?>
/**
* <tasks:postinstallscript>
*
@@ -34133,7 +34126,7 @@ class PEAR_Task_Postinstallscript extends PEAR_Task_Common
{
}
}
-?>
+?>
/**
* <tasks:replace>
*
@@ -34308,7 +34301,7 @@ class PEAR_Task_Replace extends PEAR_Task_Common
return $contents;
}
}
-?>
+?>
/**
* <tasks:unixeol>
*
@@ -34384,7 +34377,7 @@ class PEAR_Task_Unixeol extends PEAR_Task_Common
return preg_replace("/\r\n|\n\r|\r|\n/", "\n", $contents);
}
}
-?>
+?>
/**
* <tasks:windowseol>
*
@@ -34460,7 +34453,7 @@ class PEAR_Task_Windowseol extends PEAR_Task_Common
return preg_replace("/\r\n|\n\r|\r|\n/", "\r\n", $contents);
}
}
-?>
+?>
/**
* Channel Validator for the pecl.php.net channel
*
@@ -34522,7 +34515,7 @@ class PEAR_Validator_PECL extends PEAR_Validate
return $ret;
}
}
-?>
+?>
/**
* Class auto-loader
*
@@ -34668,7 +34661,7 @@ class PEAR_Autoloader extends PEAR
$include_file = preg_replace('/[^a-z0-9]/i', '_', $classname);
include_once $include_file;
}
- $obj =& new $classname;
+ $obj = new $classname;
$methods = get_class_methods($classname);
foreach ($methods as $method) {
// don't import priviate methods and constructors
@@ -34740,7 +34733,7 @@ class PEAR_Autoloader extends PEAR
overload("PEAR_Autoloader");
?>
-
+
/**
* PEAR_Builder for building PHP extensions (PECL packages)
*
@@ -34821,7 +34814,7 @@ class PEAR_Builder extends PEAR_Common
$pkg = $descfile;
$descfile = $pkg->getPackageFile();
} else {
- $pf = &new PEAR_PackageFile($this->config, $this->debug);
+ $pf = new PEAR_PackageFile($this->config, $this->debug);
$pkg = &$pf->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
if (PEAR::isError($pkg)) {
return $pkg;
@@ -35021,7 +35014,7 @@ class PEAR_Builder extends PEAR_Common
$this->addTempFile($dir);
}
} else {
- $pf = &new PEAR_PackageFile($this->config);
+ $pf = new PEAR_PackageFile($this->config);
$pkg = &$pf->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
if (PEAR::isError($pkg)) {
return $pkg;
@@ -35229,7 +35222,7 @@ class PEAR_Builder extends PEAR_Common
return PEAR_Common::log($level, $msg);
}
}
-
+
/**
* PEAR_ChannelFile, the channel handling class
*
@@ -35427,7 +35420,7 @@ class PEAR_ChannelFile
function PEAR_ChannelFile()
{
- $this->_stack = &new PEAR_ErrorStack('PEAR_ChannelFile');
+ $this->_stack = new PEAR_ErrorStack('PEAR_ChannelFile');
$this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
$this->_isValid = false;
}
@@ -36732,7 +36725,7 @@ class PEAR_ChannelFile
if (isset($this->_channelInfo['validatepackage'])) {
if ($package == $this->_channelInfo['validatepackage']) {
// channel validation packages are always validated by PEAR_Validate
- $val = &new PEAR_Validate;
+ $val = new PEAR_Validate;
return $val;
}
@@ -36744,7 +36737,7 @@ class PEAR_ChannelFile
$this->_channelInfo['validatepackage']['_content']) . '.php';
$vclass = str_replace('.', '_',
$this->_channelInfo['validatepackage']['_content']);
- $val = &new $vclass;
+ $val = new $vclass;
} else {
$a = false;
return $a;
@@ -36752,10 +36745,10 @@ class PEAR_ChannelFile
} else {
$vclass = str_replace('.', '_',
$this->_channelInfo['validatepackage']['_content']);
- $val = &new $vclass;
+ $val = new $vclass;
}
} else {
- $val = &new PEAR_Validate;
+ $val = new PEAR_Validate;
}
return $val;
@@ -36787,7 +36780,7 @@ class PEAR_ChannelFile
return time();
}
-}
+}
/**
* PEAR_Command, command pattern class
*
@@ -36923,7 +36916,7 @@ class PEAR_Command
return $a;
}
$ui =& PEAR_Command::getFrontendObject();
- $obj = &new $class($ui, $config);
+ $obj = new $class($ui, $config);
return $obj;
}
@@ -36940,7 +36933,7 @@ class PEAR_Command
}
$ui =& PEAR_Command::getFrontendObject();
$config = &PEAR_Config::singleton();
- $obj = &new $class($ui, $config);
+ $obj = new $class($ui, $config);
return $obj;
}
@@ -37200,7 +37193,7 @@ class PEAR_Command
return false;
}
// }}}
-}
+}
/**
* PEAR_Common, the base class for the PEAR Installer
*
@@ -37691,7 +37684,7 @@ class PEAR_Common extends PEAR
*/
function infoFromTgzFile($file)
{
- $packagefile = &new PEAR_PackageFile($this->config);
+ $packagefile = new PEAR_PackageFile($this->config);
$pf = &$packagefile->fromTgzFile($file, PEAR_VALIDATE_NORMAL);
return $this->_postProcessChecks($pf);
}
@@ -37710,7 +37703,7 @@ class PEAR_Common extends PEAR
*/
function infoFromDescriptionFile($descfile)
{
- $packagefile = &new PEAR_PackageFile($this->config);
+ $packagefile = new PEAR_PackageFile($this->config);
$pf = &$packagefile->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
return $this->_postProcessChecks($pf);
}
@@ -37729,7 +37722,7 @@ class PEAR_Common extends PEAR
*/
function infoFromString($data)
{
- $packagefile = &new PEAR_PackageFile($this->config);
+ $packagefile = new PEAR_PackageFile($this->config);
$pf = &$packagefile->fromXmlString($data, PEAR_VALIDATE_NORMAL, false);
return $this->_postProcessChecks($pf);
}
@@ -37773,7 +37766,7 @@ class PEAR_Common extends PEAR
function infoFromAny($info)
{
if (is_string($info) && file_exists($info)) {
- $packagefile = &new PEAR_PackageFile($this->config);
+ $packagefile = new PEAR_PackageFile($this->config);
$pf = &$packagefile->fromAnyFile($info, PEAR_VALIDATE_NORMAL);
if (PEAR::isError($pf)) {
$errs = $pf->getUserinfo();
@@ -37806,7 +37799,7 @@ class PEAR_Common extends PEAR
function xmlFromInfo($pkginfo)
{
$config = &PEAR_Config::singleton();
- $packagefile = &new PEAR_PackageFile($config);
+ $packagefile = new PEAR_PackageFile($config);
$pf = &$packagefile->fromArray($pkginfo);
$gen = &$pf->getDefaultGenerator();
return $gen->toXml(PEAR_VALIDATE_PACKAGING);
@@ -37828,7 +37821,7 @@ class PEAR_Common extends PEAR
function validatePackageInfo($info, &$errors, &$warnings, $dir_prefix = '')
{
$config = &PEAR_Config::singleton();
- $packagefile = &new PEAR_PackageFile($config);
+ $packagefile = new PEAR_PackageFile($config);
PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
if (strpos($info, '<?xml') !== false) {
$pf = &$packagefile->fromXmlString($info, PEAR_VALIDATE_NORMAL, '');
@@ -38036,7 +38029,7 @@ class PEAR_Common extends PEAR
}
require_once 'PEAR/Config.php';
-require_once 'PEAR/PackageFile.php';
+require_once 'PEAR/PackageFile.php';
/**
* PEAR_Config, customized configuration handling for the PEAR Installer
*
@@ -38685,7 +38678,7 @@ class PEAR_Config extends PEAR
$this->configuration['default'][$key] = $info['default'];
}
- $this->_registry['default'] = &new PEAR_Registry($this->configuration['default']['php_dir']);
+ $this->_registry['default'] = new PEAR_Registry($this->configuration['default']['php_dir']);
$this->_registry['default']->setConfig($this, false);
$this->_regInitialized['default'] = false;
//$GLOBALS['_PEAR_Config_instance'] = &$this;
@@ -38732,7 +38725,7 @@ class PEAR_Config extends PEAR
return $GLOBALS['_PEAR_Config_instance'];
}
- $t_conf = &new PEAR_Config($user_file, $system_file, false, $strict);
+ $t_conf = new PEAR_Config($user_file, $system_file, false, $strict);
if ($t_conf->_errorsFound > 0) {
return $t_conf->lastError;
}
@@ -38792,7 +38785,7 @@ class PEAR_Config extends PEAR
$this->configuration[$layer] = $data;
$this->_setupChannels();
if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
- $this->_registry[$layer] = &new PEAR_Registry($phpdir);
+ $this->_registry[$layer] = new PEAR_Registry($phpdir);
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
} else {
@@ -38821,7 +38814,7 @@ class PEAR_Config extends PEAR
return PEAR::raiseError('PEAR_RemoteInstaller must be installed to use remote config');
}
- $this->_ftp = &new PEAR_FTP;
+ $this->_ftp = new PEAR_FTP;
$this->_ftp->pushErrorHandling(PEAR_ERROR_RETURN);
$e = $this->_ftp->init($path);
if (PEAR::isError($e)) {
@@ -38949,7 +38942,7 @@ class PEAR_Config extends PEAR
$this->_setupChannels();
if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
- $this->_registry[$layer] = &new PEAR_Registry($phpdir);
+ $this->_registry[$layer] = new PEAR_Registry($phpdir);
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
} else {
@@ -39060,20 +39053,12 @@ class PEAR_Config extends PEAR
}
$size = filesize($file);
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
fclose($fp);
$contents = file_get_contents($file);
if (empty($contents)) {
return $this->raiseError('Configuration file "' . $file . '" is empty');
}
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
-
$version = false;
if (preg_match('/^#PEAR_Config\s+(\S+)\s+/si', $contents, $matches)) {
$version = $matches[1];
@@ -39616,7 +39601,7 @@ class PEAR_Config extends PEAR
if ($key == 'php_dir' && !$this->_noRegistry) {
if (!isset($this->_registry[$layer]) ||
$value != $this->_registry[$layer]->install_dir) {
- $this->_registry[$layer] = &new PEAR_Registry($value);
+ $this->_registry[$layer] = new PEAR_Registry($value);
$this->_regInitialized[$layer] = false;
$this->_registry[$layer]->setConfig($this, false);
}
@@ -39646,7 +39631,7 @@ class PEAR_Config extends PEAR
if (!is_object($this->_registry[$layer])) {
if ($phpdir = $this->get('php_dir', $layer, 'pear.php.net')) {
- $this->_registry[$layer] = &new PEAR_Registry($phpdir);
+ $this->_registry[$layer] = new PEAR_Registry($phpdir);
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
} else {
@@ -40077,7 +40062,7 @@ class PEAR_Config extends PEAR
require_once 'PEAR/REST/' . $version . '.php';
}
- $remote = &new $class($this, $options);
+ $remote = new $class($this, $options);
return $remote;
}
@@ -40130,14 +40115,14 @@ class PEAR_Config extends PEAR
continue;
}
$this->_registry[$layer] =
- &new PEAR_Registry($this->get('php_dir', $layer, 'pear.php.net'));
+ new PEAR_Registry($this->get('php_dir', $layer, 'pear.php.net'));
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
}
}
}
}
-
+
/**
* PEAR_DependencyDB, advanced installed packages dependency database
*
@@ -40689,16 +40674,9 @@ class PEAR_DependencyDB
return $err;
}
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
clearstatcache();
fclose($fp);
$data = unserialize(file_get_contents($this->_depdb));
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
$this->_cache = $data;
return $data;
}
@@ -40720,14 +40698,7 @@ class PEAR_DependencyDB
return PEAR::raiseError("Could not open dependencies file `".$this->_depdb."' for writing");
}
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
fwrite($fp, serialize($deps));
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
fclose($fp);
$this->_unlock();
$this->_cache = $deps;
@@ -40913,7 +40884,7 @@ class PEAR_DependencyDB
);
}
}
-}
+}
/**
* PEAR_Dependency2, advanced dependency validation
*
@@ -41809,9 +41780,9 @@ class PEAR_Dependency2
if (!class_exists('PEAR_Downloader_Package')) {
require_once 'PEAR/Downloader/Package.php';
}
- $dp = &new PEAR_Downloader_Package($dl);
+ $dp = new PEAR_Downloader_Package($dl);
$dp->setPackageFile($downloaded[$i]);
- $params[$i] = &$dp;
+ $params[$i] = $dp;
}
// check cache
@@ -42090,7 +42061,7 @@ class PEAR_Dependency2
require_once 'PEAR/Downloader/Package.php';
}
- $dp = &new PEAR_Downloader_Package($dl);
+ $dp = new PEAR_Downloader_Package($dl);
if (is_object($pkg)) {
$dp->setPackageFile($pkg);
} else {
@@ -42114,7 +42085,7 @@ class PEAR_Dependency2
}
foreach ($ds as $d) {
- $checker = &new PEAR_Dependency2($this->_config, $this->_options,
+ $checker = new PEAR_Dependency2($this->_config, $this->_options,
array('channel' => $channel, 'package' => $package), $this->_state);
$dep = $d['dep'];
$required = $d['type'] == 'required';
@@ -42271,7 +42242,7 @@ class PEAR_Dependency2
$this->_currentPackage, true)));
}
}
-
+
/**
* PEAR_Downloader, the PEAR Installer's download utility class
*
@@ -42508,12 +42479,12 @@ class PEAR_Downloader extends PEAR_Common
* @param PEAR_Downloader
* @return PEAR_Downloader_Package
*/
- function &newDownloaderPackage(&$t)
+ function newDownloaderPackage(&$t)
{
if (!class_exists('PEAR_Downloader_Package')) {
require_once 'PEAR/Downloader/Package.php';
}
- $a = &new PEAR_Downloader_Package($t);
+ $a = new PEAR_Downloader_Package($t);
return $a;
}
@@ -42529,7 +42500,7 @@ class PEAR_Downloader extends PEAR_Common
if (!class_exists('PEAR_Dependency2')) {
require_once 'PEAR/Dependency2.php';
}
- $z = &new PEAR_Dependency2($c, $i, $p, $s);
+ $z = new PEAR_Dependency2($c, $i, $p, $s);
return $z;
}
@@ -44036,7 +44007,7 @@ class PEAR_Downloader extends PEAR_Common
}
return $dest_file;
}
-}
+}
/**
* Error Stack Implementation
*
@@ -45021,7 +44992,7 @@ class PEAR_ErrorStack {
$stack = &PEAR_ErrorStack::singleton('PEAR_ErrorStack');
$stack->pushCallback(array('PEAR_ErrorStack', '_handleError'));
?>
-
+
/* vim: set expandtab tabstop=4 shiftwidth=4 foldmethod=marker: */
/**
* PEAR_Exception
@@ -45409,13 +45380,13 @@ class PEAR_Exception extends Exception
}
return $causeMsg . $this->getTraceAsString();
}
-}
+}
if ($skipmsg) {
- $a = &new $ec($code, $mode, $options, $userinfo);
+ $a = new $ec($code, $mode, $options, $userinfo);
} else {
- $a = &new $ec($message, $code, $mode, $options, $userinfo);
+ $a = new $ec($message, $code, $mode, $options, $userinfo);
}
-?>
+?>
/**
* PEAR_Frontend, the singleton-based frontend for user input/output
*
@@ -45505,7 +45476,7 @@ class PEAR_Frontend extends PEAR
}
if (class_exists($uiclass)) {
- $obj = &new $uiclass;
+ $obj = new $uiclass;
// quick test to see if this class implements a few of the most
// important frontend methods
if (is_a($obj, 'PEAR_Frontend')) {
@@ -45642,7 +45613,7 @@ class PEAR_Frontend extends PEAR
function userDialog($command, $prompts, $types = array(), $defaults = array())
{
}
-}
+}
/**
* PEAR_Installer
*
@@ -46233,7 +46204,7 @@ class PEAR_Installer extends PEAR_Downloader
foreach ($atts as $tag => $raw) {
$tag = str_replace(array($pkg->getTasksNs() . ':', '-'), array('', '_'), $tag);
$task = "PEAR_Task_$tag";
- $task = &new $task($this->config, $this, PEAR_TASK_INSTALL);
+ $task = new $task($this->config, $this, PEAR_TASK_INSTALL);
if (!$task->isScript()) { // scripts are only handled after installation
$task->init($raw, $attribs, $pkg->getLastInstalledVersion());
$res = $task->startSession($pkg, $contents, $final_dest_file);
@@ -46829,7 +46800,7 @@ class PEAR_Installer extends PEAR_Downloader
$this->config->setInstallRoot(false);
$this->_registry = &$this->config->getRegistry();
if (isset($this->_options['packagingroot'])) {
- $installregistry = &new PEAR_Registry($regdir);
+ $installregistry = new PEAR_Registry($regdir);
if (!$installregistry->channelExists($channel, true)) {
// we need to fake a channel-discover of this channel
$chanobj = $this->_registry->getChannel($channel, true);
@@ -46918,7 +46889,7 @@ class PEAR_Installer extends PEAR_Downloader
}
}
- $pfk = &new PEAR_PackageFile($this->config);
+ $pfk = new PEAR_PackageFile($this->config);
$parentpkg = &$pfk->fromArray($parentreg);
$installregistry->updatePackage2($parentpkg);
}
@@ -47182,7 +47153,7 @@ class PEAR_Installer extends PEAR_Downloader
{
require_once 'PEAR/Builder.php';
$this->log(1, "$this->source_files source files, building");
- $bob = &new PEAR_Builder($this->ui);
+ $bob = new PEAR_Builder($this->ui);
$bob->debug = $this->debug;
$built = $bob->build($filelist, array(&$this, '_buildCallback'));
if (PEAR::isError($built)) {
@@ -47326,7 +47297,7 @@ class PEAR_Installer extends PEAR_Downloader
require_once 'PEAR/Dependency2.php';
}
- $depchecker = &new PEAR_Dependency2($this->config, $options,
+ $depchecker = new PEAR_Dependency2($this->config, $options,
array('channel' => $channel, 'package' => $package),
PEAR_VALIDATE_UNINSTALLING);
$e = $depchecker->validatePackageUninstall($this);
@@ -47467,7 +47438,7 @@ class PEAR_Installer extends PEAR_Downloader
}
// }}}
-}
+}
/**
* PEAR_PackageFile, package.xml parsing utility class
*
@@ -47958,7 +47929,7 @@ class PEAR_PackageFile
$info = PEAR::raiseError("Cannot open '$info' for parsing");
return $info;
}
-}
+}
/**
* PEAR_Packager for generating releases
*
@@ -48010,7 +47981,7 @@ class PEAR_Packager extends PEAR_Common
}
PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
- $pkg = &new PEAR_PackageFile($this->config, $this->debug);
+ $pkg = new PEAR_PackageFile($this->config, $this->debug);
$pf = &$pkg->fromPackageFile($pkgfile, PEAR_VALIDATE_NORMAL);
$main = &$pf;
PEAR::staticPopErrorHandling();
@@ -48158,7 +48129,7 @@ class PEAR_Packager extends PEAR_Common
return $dest_package;
}
-}
+}
/**
* PEAR_Registry
*
@@ -48479,7 +48450,7 @@ class PEAR_Registry extends PEAR
$initializing = true;
if (!$this->_config) { // never used?
$file = OS_WINDOWS ? 'pear.ini' : '.pearrc';
- $this->_config = &new PEAR_Config($this->statedir . DIRECTORY_SEPARATOR .
+ $this->_config = new PEAR_Config($this->statedir . DIRECTORY_SEPARATOR .
$file);
$this->_config->setRegistry($this);
$this->_config->set('php_dir', $this->install_dir);
@@ -48942,16 +48913,9 @@ class PEAR_Registry extends PEAR
}
clearstatcache();
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
$fsize = filesize($this->filemap);
fclose($fp);
$data = file_get_contents($this->filemap);
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
$tmp = unserialize($data);
if (!$tmp && $fsize > 7) {
return $this->raiseError('PEAR_Registry: invalid filemap data', PEAR_REGISTRY_ERROR_FORMAT, null, null, $data);
@@ -49300,16 +49264,9 @@ class PEAR_Registry extends PEAR
return null;
}
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
clearstatcache();
$this->_closePackageFile($fp);
$data = file_get_contents($this->_packageFileName($package, $channel));
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
$data = unserialize($data);
if ($key === null) {
return $data;
@@ -49343,16 +49300,9 @@ class PEAR_Registry extends PEAR
return null;
}
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
clearstatcache();
$this->_closeChannelFile($fp);
$data = file_get_contents($this->_channelFileName($channel));
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
$data = unserialize($data);
return $data;
}
@@ -49619,7 +49569,7 @@ class PEAR_Registry extends PEAR
$a = $this->_config;
if (!$a) {
- $this->_config = &new PEAR_Config;
+ $this->_config = new PEAR_Config;
$this->_config->set('php_dir', $this->statedir);
}
@@ -49627,7 +49577,7 @@ class PEAR_Registry extends PEAR
require_once 'PEAR/PackageFile.php';
}
- $pkg = &new PEAR_PackageFile($this->_config);
+ $pkg = new PEAR_PackageFile($this->_config);
$pf = &$pkg->fromArray($info);
return $pf;
}
@@ -50564,7 +50514,7 @@ class PEAR_Registry extends PEAR
}
return $ret;
}
-}
+}
/**
* PEAR_REST
*
@@ -51054,7 +51004,7 @@ class PEAR_REST
return $data;
}
}
-
+
/**
* PEAR_RunTest
*
@@ -51131,7 +51081,6 @@ class PEAR_RunTest
'error_append_string=',
'auto_prepend_file=',
'auto_append_file=',
- 'magic_quotes_runtime=0',
'xdebug.default_enable=0',
'allow_url_fopen=1',
);
@@ -52037,7 +51986,7 @@ $text
}
}
}
-
+
/**
* PEAR_Validate
*
@@ -52665,7 +52614,7 @@ class PEAR_Validate
{
return true;
}
-}
+}
/**
* PEAR_XMLParser
*
@@ -52917,7 +52866,7 @@ class PEAR_XMLParser
{
$this->_dataStack[$this->_depth] .= $cdata;
}
-}
+}
REM ----------------------------------------------------------------------
REM PHP version 5
@@ -53027,7 +52976,7 @@ GOTO END
:RUN
"%PHP_PEAR_PHP_BIN%" -C -d date.timezone=UTC -d output_buffering=1 -d safe_mode=0 -d open_basedir="" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -d register_argc_argv="On" -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
:END
-@ECHO ON
+@ECHO ON
REM ----------------------------------------------------------------------
REM PHP version 5
@@ -53141,7 +53090,7 @@ GOTO END
:RUN
"%PHP_PEAR_PHP_BIN%" -C -d date.timezone=UTC -d memory_limit="-1" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -d open_basedir="" -d output_buffering=1 -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
:END
-@ECHO ON
+@ECHO ON
REM ----------------------------------------------------------------------
REM PHP version 5
@@ -53255,7 +53204,7 @@ GOTO END
:RUN
"%PHP_PEAR_PHP_BIN%" -C -n -d date.timezone=UTC -d output_buffering=1 -d safe_mode=0 -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -d register_argc_argv="On" -d variables_order=EGPCS -f "%PHP_PEAR_INSTALL_DIR%\peclcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
:END
-@ECHO ON
+@ECHO ON
# first find which PHP binary to use
if test "x$PHP_PEAR_PHP_BIN" != "x"; then
@@ -53283,7 +53232,7 @@ else
fi
exec $PHP -C -q $INCARG -d date.timezone=UTC -d output_buffering=1 -d variables_order=EGPCS -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" $INCDIR/pearcmd.php "$@"
-
+
# first find which PHP binary to use
if test "x$PHP_PEAR_PHP_BIN" != "x"; then
@@ -53311,7 +53260,7 @@ else
fi
exec $PHP -d date.timezone=UTC -d memory_limit="-1" -C -q $INCARG -d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d variables_order=EGPCS -d auto_append_file="" $INCDIR/pearcmd.php "$@"
-
+
# first find which PHP binary to use
if test "x$PHP_PEAR_PHP_BIN" != "x"; then
@@ -53339,7 +53288,7 @@ else
fi
exec $PHP -C -n -q $INCARG -d date.timezone=UTC -d output_buffering=1 -d variables_order=EGPCS -d safe_mode=0 -d register_argc_argv="On" $INCDIR/peclcmd.php "$@"
-
+
/**
* PEAR, the PHP Extension and Application Repository
*
@@ -53382,7 +53331,6 @@ if (!ini_get('safe_mode')) {
ob_implicit_flush(true);
@ini_set('track_errors', true);
@ini_set('html_errors', false);
-@ini_set('magic_quotes_runtime', false);
$_PEAR_PHPDIR = '#$%^&*';
set_error_handler('error_handler');
@@ -53852,7 +53800,7 @@ function error_handler($errno, $errmsg, $file, $line, $vars)
* End:
*/
// vim600:syn=php
-
+
/**
* PEAR, the PHP Extension and Application Repository
*
@@ -53895,7 +53843,7 @@ require_once 'pearcmd.php';
// vim600:syn=php
?>
-
+
Stig Bakken <ssb@php.net>,
Gregory Beaver <cellog@php.net>,
Helgi Þormar Þorbjörnsson <helgi@php.net>,
@@ -53922,7 +53870,7 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
=========================
Installing the PEAR Installer.
@@ -53975,7 +53923,7 @@ related issues.
Happy PHPing, we hope PEAR will be a great tool for your development work!
-$Id$
+$Id$
$Id: package.dtd,v 1.38 2005-11-12 02:23:07 cellog Exp $
This is the PEAR package description, version 1.0.
@@ -54078,7 +54026,7 @@ $Id$
to CDATA #REQUIRED>
-
+
/**
* This is only meant for PHP 5 to get rid of certain strict warning
* that doesn't get hidden since it's in the shutdown function
@@ -54110,7 +54058,7 @@ class PEAR5
return $properties[$class][$var];
}
-}
+}
/**
* PEAR, the PHP Extension and Application Repository
*
@@ -55173,7 +55121,7 @@ class PEAR_Error
* c-basic-offset: 4
* End:
*/
-
+
=========================
What is the PEAR Installer? What is PEAR?
@@ -55204,7 +55152,16 @@ prior to use.
Happy PHPing, we hope PEAR will be a great tool for your development work!
-$Id$
+
+Tests
+=====
+
+Run the tests without installation as follows:
+
+ $ ./scripts/pear.sh run-tests -r tests
+
+You should have the Text_Diff package installed to get nicer error output.
+
/**
* File/Directory manipulation
*
@@ -55850,7 +55807,7 @@ class System
}
return $files;
}
-}
+}
Name: @rpm_package@
Version: @version@
Release: 1
@@ -57183,7 +57140,7 @@ class PEAR_ChannelFile
function PEAR_ChannelFile()
{
- $this->_stack = &new PEAR_ErrorStack('PEAR_ChannelFile');
+ $this->_stack = new PEAR_ErrorStack('PEAR_ChannelFile');
$this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
$this->_isValid = false;
}
@@ -58488,7 +58445,7 @@ class PEAR_ChannelFile
if (isset($this->_channelInfo['validatepackage'])) {
if ($package == $this->_channelInfo['validatepackage']) {
// channel validation packages are always validated by PEAR_Validate
- $val = &new PEAR_Validate;
+ $val = new PEAR_Validate;
return $val;
}
@@ -58500,7 +58457,7 @@ class PEAR_ChannelFile
$this->_channelInfo['validatepackage']['_content']) . '.php';
$vclass = str_replace('.', '_',
$this->_channelInfo['validatepackage']['_content']);
- $val = &new $vclass;
+ $val = new $vclass;
} else {
$a = false;
return $a;
@@ -58508,10 +58465,10 @@ class PEAR_ChannelFile
} else {
$vclass = str_replace('.', '_',
$this->_channelInfo['validatepackage']['_content']);
- $val = &new $vclass;
+ $val = new $vclass;
}
} else {
- $val = &new PEAR_Validate;
+ $val = new PEAR_Validate;
}
return $val;
@@ -58746,7 +58703,7 @@ class PEAR_Command
return $a;
}
$ui =& PEAR_Command::getFrontendObject();
- $obj = &new $class($ui, $config);
+ $obj = new $class($ui, $config);
return $obj;
}
@@ -58763,7 +58720,7 @@ class PEAR_Command
}
$ui =& PEAR_Command::getFrontendObject();
$config = &PEAR_Config::singleton();
- $obj = &new $class($ui, $config);
+ $obj = new $class($ui, $config);
return $obj;
}
@@ -59625,7 +59582,7 @@ Run post-installation scripts in package <package>, if any exist.
if (!class_exists('PEAR_Downloader')) {
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/Downloader.php';
}
- $a = &new PEAR_Downloader($ui, $options, $config);
+ $a = new PEAR_Downloader($ui, $options, $config);
return $a;
}
@@ -59637,7 +59594,7 @@ Run post-installation scripts in package <package>, if any exist.
if (!class_exists('PEAR_Installer')) {
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/Installer.php';
}
- $a = &new PEAR_Installer($ui);
+ $a = new PEAR_Installer($ui);
return $a;
}
@@ -60440,7 +60397,7 @@ Run post-installation scripts in package <package>, if any exist.
$dest .= DIRECTORY_SEPARATOR . $pkgname;
$orig = $pkgname . '-' . $pkgversion;
- $tar = &new Archive_Tar($pkgfile->getArchiveFile());
+ $tar = new Archive_Tar($pkgfile->getArchiveFile());
if (!$tar->extractModify($dest, $orig)) {
return $this->raiseError('unable to unpack ' . $pkgfile->getArchiveFile());
}
@@ -61336,7 +61293,7 @@ class PEAR_Common extends PEAR
*/
function infoFromTgzFile($file)
{
- $packagefile = &new PEAR_PackageFile($this->config);
+ $packagefile = new PEAR_PackageFile($this->config);
$pf = &$packagefile->fromTgzFile($file, PEAR_VALIDATE_NORMAL);
return $this->_postProcessChecks($pf);
}
@@ -61355,7 +61312,7 @@ class PEAR_Common extends PEAR
*/
function infoFromDescriptionFile($descfile)
{
- $packagefile = &new PEAR_PackageFile($this->config);
+ $packagefile = new PEAR_PackageFile($this->config);
$pf = &$packagefile->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
return $this->_postProcessChecks($pf);
}
@@ -61374,7 +61331,7 @@ class PEAR_Common extends PEAR
*/
function infoFromString($data)
{
- $packagefile = &new PEAR_PackageFile($this->config);
+ $packagefile = new PEAR_PackageFile($this->config);
$pf = &$packagefile->fromXmlString($data, PEAR_VALIDATE_NORMAL, false);
return $this->_postProcessChecks($pf);
}
@@ -61418,7 +61375,7 @@ class PEAR_Common extends PEAR
function infoFromAny($info)
{
if (is_string($info) && file_exists($info)) {
- $packagefile = &new PEAR_PackageFile($this->config);
+ $packagefile = new PEAR_PackageFile($this->config);
$pf = &$packagefile->fromAnyFile($info, PEAR_VALIDATE_NORMAL);
if (PEAR::isError($pf)) {
$errs = $pf->getUserinfo();
@@ -61451,7 +61408,7 @@ class PEAR_Common extends PEAR
function xmlFromInfo($pkginfo)
{
$config = &PEAR_Config::singleton();
- $packagefile = &new PEAR_PackageFile($config);
+ $packagefile = new PEAR_PackageFile($config);
$pf = &$packagefile->fromArray($pkginfo);
$gen = &$pf->getDefaultGenerator();
return $gen->toXml(PEAR_VALIDATE_PACKAGING);
@@ -61473,7 +61430,7 @@ class PEAR_Common extends PEAR
function validatePackageInfo($info, &$errors, &$warnings, $dir_prefix = '')
{
$config = &PEAR_Config::singleton();
- $packagefile = &new PEAR_PackageFile($config);
+ $packagefile = new PEAR_PackageFile($config);
PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
if (strpos($info, '<?xml') !== false) {
$pf = &$packagefile->fromXmlString($info, PEAR_VALIDATE_NORMAL, '');
@@ -62330,7 +62287,7 @@ class PEAR_Config extends PEAR
$this->configuration['default'][$key] = $info['default'];
}
- $this->_registry['default'] = &new PEAR_Registry($this->configuration['default']['php_dir']);
+ $this->_registry['default'] = new PEAR_Registry($this->configuration['default']['php_dir']);
$this->_registry['default']->setConfig($this, false);
$this->_regInitialized['default'] = false;
//$GLOBALS['_PEAR_Config_instance'] = &$this;
@@ -62377,7 +62334,7 @@ class PEAR_Config extends PEAR
return $GLOBALS['_PEAR_Config_instance'];
}
- $t_conf = &new PEAR_Config($user_file, $system_file, false, $strict);
+ $t_conf = new PEAR_Config($user_file, $system_file, false, $strict);
if ($t_conf->_errorsFound > 0) {
return $t_conf->lastError;
}
@@ -62437,7 +62394,7 @@ class PEAR_Config extends PEAR
$this->configuration[$layer] = $data;
$this->_setupChannels();
if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
- $this->_registry[$layer] = &new PEAR_Registry($phpdir);
+ $this->_registry[$layer] = new PEAR_Registry($phpdir);
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
} else {
@@ -62466,7 +62423,7 @@ class PEAR_Config extends PEAR
return PEAR::raiseError('PEAR_RemoteInstaller must be installed to use remote config');
}
- $this->_ftp = &new PEAR_FTP;
+ $this->_ftp = new PEAR_FTP;
$this->_ftp->pushErrorHandling(PEAR_ERROR_RETURN);
$e = $this->_ftp->init($path);
if (PEAR::isError($e)) {
@@ -62594,7 +62551,7 @@ class PEAR_Config extends PEAR
$this->_setupChannels();
if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
- $this->_registry[$layer] = &new PEAR_Registry($phpdir);
+ $this->_registry[$layer] = new PEAR_Registry($phpdir);
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
} else {
@@ -62705,20 +62662,12 @@ class PEAR_Config extends PEAR
}
$size = filesize($file);
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
fclose($fp);
$contents = file_get_contents($file);
if (empty($contents)) {
return $this->raiseError('Configuration file "' . $file . '" is empty');
}
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
-
$version = false;
if (preg_match('/^#PEAR_Config\s+(\S+)\s+/si', $contents, $matches)) {
$version = $matches[1];
@@ -63261,7 +63210,7 @@ class PEAR_Config extends PEAR
if ($key == 'php_dir' && !$this->_noRegistry) {
if (!isset($this->_registry[$layer]) ||
$value != $this->_registry[$layer]->install_dir) {
- $this->_registry[$layer] = &new PEAR_Registry($value);
+ $this->_registry[$layer] = new PEAR_Registry($value);
$this->_regInitialized[$layer] = false;
$this->_registry[$layer]->setConfig($this, false);
}
@@ -63291,7 +63240,7 @@ class PEAR_Config extends PEAR
if (!is_object($this->_registry[$layer])) {
if ($phpdir = $this->get('php_dir', $layer, 'pear.php.net')) {
- $this->_registry[$layer] = &new PEAR_Registry($phpdir);
+ $this->_registry[$layer] = new PEAR_Registry($phpdir);
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
} else {
@@ -63722,7 +63671,7 @@ class PEAR_Config extends PEAR
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/REST/' . $version . '.php';
}
- $remote = &new $class($this, $options);
+ $remote = new $class($this, $options);
return $remote;
}
@@ -63775,7 +63724,7 @@ class PEAR_Config extends PEAR
continue;
}
$this->_registry[$layer] =
- &new PEAR_Registry($this->get('php_dir', $layer, 'pear.php.net'));
+ new PEAR_Registry($this->get('php_dir', $layer, 'pear.php.net'));
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
}
@@ -64678,9 +64627,9 @@ class PEAR_Dependency2
if (!class_exists('PEAR_Downloader_Package')) {
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/Downloader/Package.php';
}
- $dp = &new PEAR_Downloader_Package($dl);
+ $dp = new PEAR_Downloader_Package($dl);
$dp->setPackageFile($downloaded[$i]);
- $params[$i] = &$dp;
+ $params[$i] = $dp;
}
// check cache
@@ -64959,7 +64908,7 @@ class PEAR_Dependency2
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/Downloader/Package.php';
}
- $dp = &new PEAR_Downloader_Package($dl);
+ $dp = new PEAR_Downloader_Package($dl);
if (is_object($pkg)) {
$dp->setPackageFile($pkg);
} else {
@@ -64983,7 +64932,7 @@ class PEAR_Dependency2
}
foreach ($ds as $d) {
- $checker = &new PEAR_Dependency2($this->_config, $this->_options,
+ $checker = new PEAR_Dependency2($this->_config, $this->_options,
array('channel' => $channel, 'package' => $package), $this->_state);
$dep = $d['dep'];
$required = $d['type'] == 'required';
@@ -65692,16 +65641,9 @@ class PEAR_DependencyDB
return $err;
}
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
clearstatcache();
fclose($fp);
$data = unserialize(file_get_contents($this->_depdb));
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
$this->_cache = $data;
return $data;
}
@@ -65723,14 +65665,7 @@ class PEAR_DependencyDB
return PEAR::raiseError("Could not open dependencies file `".$this->_depdb."' for writing");
}
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
fwrite($fp, serialize($deps));
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
fclose($fp);
$this->_unlock();
$this->_cache = $deps;
@@ -66153,12 +66088,12 @@ class PEAR_Downloader extends PEAR_Common
* @param PEAR_Downloader
* @return PEAR_Downloader_Package
*/
- function &newDownloaderPackage(&$t)
+ function newDownloaderPackage(&$t)
{
if (!class_exists('PEAR_Downloader_Package')) {
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/Downloader/Package.php';
}
- $a = &new PEAR_Downloader_Package($t);
+ $a = new PEAR_Downloader_Package($t);
return $a;
}
@@ -66174,7 +66109,7 @@ class PEAR_Downloader extends PEAR_Common
if (!class_exists('PEAR_Dependency2')) {
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/Dependency2.php';
}
- $z = &new PEAR_Dependency2($c, $i, $p, $s);
+ $z = new PEAR_Dependency2($c, $i, $p, $s);
return $z;
}
@@ -69067,7 +69002,7 @@ class PEAR_Downloader_Package
$obj->setExplicitState($s);
}
- $obj = &new PEAR_Downloader_Package($params[$i]->getDownloader());
+ $obj = new PEAR_Downloader_Package($params[$i]->getDownloader());
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
if (PEAR::isError($dir = $dl->getDownloadDir())) {
PEAR::popErrorHandling();
@@ -69083,10 +69018,9 @@ class PEAR_Downloader_Package
continue;
}
- $j = &$obj;
- if (!PEAR_Downloader_Package::willDownload($j,
- array_merge($params, $newparams)) && !$param->isInstalled($j)) {
- $newparams[] = &$j;
+ if (!PEAR_Downloader_Package::willDownload($obj,
+ array_merge($params, $newparams)) && !$param->isInstalled($obj)) {
+ $newparams[] = $obj;
}
}
}
@@ -69120,7 +69054,7 @@ class PEAR_Downloader_Package
// convert the dependencies into PEAR_Downloader_Package objects for the next time around
$params[$i]->_downloadDeps = array();
foreach ($newdeps as $dep) {
- $obj = &new PEAR_Downloader_Package($params[$i]->getDownloader());
+ $obj = new PEAR_Downloader_Package($params[$i]->getDownloader());
if ($s = $params[$i]->explicitState()) {
$obj->setExplicitState($s);
}
@@ -69142,8 +69076,7 @@ class PEAR_Downloader_Package
}
}
- $j = &$obj;
- $newparams[] = &$j;
+ $newparams[] = $obj;
}
}
@@ -69184,7 +69117,7 @@ class PEAR_Downloader_Package
*/
function &getPackagefileObject(&$c, $d)
{
- $a = &new PEAR_PackageFile($c, $d);
+ $a = new PEAR_PackageFile($c, $d);
return $a;
}
@@ -69259,7 +69192,7 @@ class PEAR_Downloader_Package
if ($this->_rawpackagefile) {
require_once 'phar://install-pear-nozlib.phar/' . 'Archive/Tar.php';
- $tar = &new Archive_Tar($file);
+ $tar = new Archive_Tar($file);
$packagexml = $tar->extractInString('package2.xml');
if (!$packagexml) {
$packagexml = $tar->extractInString('package.xml');
@@ -70743,7 +70676,7 @@ class PEAR_Frontend extends PEAR
}
if (class_exists($uiclass)) {
- $obj = &new $uiclass;
+ $obj = new $uiclass;
// quick test to see if this class implements a few of the most
// important frontend methods
if (is_a($obj, 'PEAR_Frontend')) {
@@ -72221,7 +72154,7 @@ class PEAR_Installer extends PEAR_Downloader
foreach ($atts as $tag => $raw) {
$tag = str_replace(array($pkg->getTasksNs() . ':', '-'), array('', '_'), $tag);
$task = "PEAR_Task_$tag";
- $task = &new $task($this->config, $this, PEAR_TASK_INSTALL);
+ $task = new $task($this->config, $this, PEAR_TASK_INSTALL);
if (!$task->isScript()) { // scripts are only handled after installation
$task->init($raw, $attribs, $pkg->getLastInstalledVersion());
$res = $task->startSession($pkg, $contents, $final_dest_file);
@@ -72817,7 +72750,7 @@ class PEAR_Installer extends PEAR_Downloader
$this->config->setInstallRoot(false);
$this->_registry = &$this->config->getRegistry();
if (isset($this->_options['packagingroot'])) {
- $installregistry = &new PEAR_Registry($regdir);
+ $installregistry = new PEAR_Registry($regdir);
if (!$installregistry->channelExists($channel, true)) {
// we need to fake a channel-discover of this channel
$chanobj = $this->_registry->getChannel($channel, true);
@@ -72906,7 +72839,7 @@ class PEAR_Installer extends PEAR_Downloader
}
}
- $pfk = &new PEAR_PackageFile($this->config);
+ $pfk = new PEAR_PackageFile($this->config);
$parentpkg = &$pfk->fromArray($parentreg);
$installregistry->updatePackage2($parentpkg);
}
@@ -73170,7 +73103,7 @@ class PEAR_Installer extends PEAR_Downloader
{
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/Builder.php';
$this->log(1, "$this->source_files source files, building");
- $bob = &new PEAR_Builder($this->ui);
+ $bob = new PEAR_Builder($this->ui);
$bob->debug = $this->debug;
$built = $bob->build($filelist, array(&$this, '_buildCallback'));
if (PEAR::isError($built)) {
@@ -73314,7 +73247,7 @@ class PEAR_Installer extends PEAR_Downloader
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/Dependency2.php';
}
- $depchecker = &new PEAR_Dependency2($this->config, $options,
+ $depchecker = new PEAR_Dependency2($this->config, $options,
array('channel' => $channel, 'package' => $package),
PEAR_VALIDATE_UNINSTALLING);
$e = $depchecker->validatePackageUninstall($this);
@@ -74710,7 +74643,7 @@ class PEAR_PackageFile_Generator_v1
// }}}
$packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, 'package.xml', true);
if ($packagexml) {
- $tar =& new Archive_Tar($dest_package, $compress);
+ $tar = new Archive_Tar($dest_package, $compress);
$tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
// ----- Creates with the package.xml file
$ok = $tar->createModify(array($packagexml), '', $where);
@@ -76116,7 +76049,7 @@ http://pear.php.net/dtd/package-2.0.xsd',
array($this->_packagefile->getTasksNs() . ':', '-'),
array('', '_'), $tag);
$task = "PEAR_Task_$tag";
- $task = &new $task($this->_packagefile->_config,
+ $task = new $task($this->_packagefile->_config,
$this->_packagefile->_logger,
PEAR_TASK_PACKAGE);
$task->init($raw, $atts, null);
@@ -76153,7 +76086,7 @@ http://pear.php.net/dtd/package-2.0.xsd',
$name = $pf1 !== null ? 'package2.xml' : 'package.xml';
$packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, $name);
if ($packagexml) {
- $tar =& new Archive_Tar($dest_package, $compress);
+ $tar = new Archive_Tar($dest_package, $compress);
$tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
// ----- Creates with the package.xml file
$ok = $tar->createModify(array($packagexml), '', $where);
@@ -77695,7 +77628,7 @@ class PEAR_PackageFile_v1
*/
function PEAR_PackageFile_v1()
{
- $this->_stack = &new PEAR_ErrorStack('PEAR_PackageFile_v1');
+ $this->_stack = new PEAR_ErrorStack('PEAR_PackageFile_v1');
$this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
$this->_isValid = 0;
}
@@ -78655,7 +78588,7 @@ class PEAR_PackageFile_v1
if (!class_exists('PEAR_PackageFile_Generator_v1')) {
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/PackageFile/Generator/v1.php';
}
- $a = &new PEAR_PackageFile_Generator_v1($this);
+ $a = new PEAR_PackageFile_Generator_v1($this);
return $a;
}
@@ -78678,7 +78611,7 @@ class PEAR_PackageFile_v1
if (!class_exists('Archive_Tar')) {
require_once 'phar://install-pear-nozlib.phar/' . 'Archive/Tar.php';
}
- $tar = &new Archive_Tar($this->_archiveFile);
+ $tar = new Archive_Tar($this->_archiveFile);
$tar->pushErrorHandling(PEAR_ERROR_RETURN);
if ($file != 'package.xml' && $file != 'package2.xml') {
$file = $this->getPackage() . '-' . $this->getVersion() . '/' . $file;
@@ -79104,7 +79037,7 @@ class PEAR_PackageFile_v2
*/
function &getPEARDownloader(&$i, $o, &$c)
{
- $z = &new PEAR_Downloader($i, $o, $c);
+ $z = new PEAR_Downloader($i, $o, $c);
return $z;
}
@@ -79122,7 +79055,7 @@ class PEAR_PackageFile_v2
if (!class_exists('PEAR_Dependency2')) {
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/Dependency2.php';
}
- $z = &new PEAR_Dependency2($c, $o, $p, $s);
+ $z = new PEAR_Dependency2($c, $o, $p, $s);
return $z;
}
@@ -79523,7 +79456,7 @@ class PEAR_PackageFile_v2
$atts = $filelist[$name];
foreach ($tasks as $tag => $raw) {
$task = $this->getTask($tag);
- $task = &new $task($this->_config, $common, PEAR_TASK_INSTALL);
+ $task = new $task($this->_config, $common, PEAR_TASK_INSTALL);
if ($task->isScript()) {
$ret[] = $filelist[$name]['installed_as'];
}
@@ -79569,7 +79502,7 @@ class PEAR_PackageFile_v2
$atts = $filelist[$name];
foreach ($tasks as $tag => $raw) {
$taskname = $this->getTask($tag);
- $task = &new $taskname($this->_config, $common, PEAR_TASK_INSTALL);
+ $task = new $taskname($this->_config, $common, PEAR_TASK_INSTALL);
if (!$task->isScript()) {
continue; // scripts are only handled after installation
}
@@ -80813,7 +80746,7 @@ class PEAR_PackageFile_v2
return implode('', file($file));
}
} else { // tgz
- $tar = &new Archive_Tar($this->_archiveFile);
+ $tar = new Archive_Tar($this->_archiveFile);
$tar->pushErrorHandling(PEAR_ERROR_RETURN);
if ($file != 'package.xml' && $file != 'package2.xml') {
$file = $this->getPackage() . '-' . $this->getVersion() . '/' . $file;
@@ -80852,7 +80785,7 @@ class PEAR_PackageFile_v2
if (!class_exists('PEAR_PackageFile_Generator_v2')) {
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/PackageFile/Generator/v2.php';
}
- $a = &new PEAR_PackageFile_Generator_v2($this);
+ $a = new PEAR_PackageFile_Generator_v2($this);
return $a;
}
@@ -81120,6 +81053,7 @@ class PEAR_PackageFile_v2_Validator
isset($test['dependencies']['required']) &&
isset($test['dependencies']['required']['pearinstaller']) &&
isset($test['dependencies']['required']['pearinstaller']['min']) &&
+ '1.9.5' != '@package' . '_version@' &&
version_compare('1.9.5',
$test['dependencies']['required']['pearinstaller']['min'], '<')
) {
@@ -82745,7 +82679,7 @@ class PEAR_PackageFile_v2_Validator
if (!is_array($info)) {
$info = array($info);
}
- $pkg = &new PEAR_PackageFile($this->_pf->_config);
+ $pkg = new PEAR_PackageFile($this->_pf->_config);
foreach ($info as $package) {
if (!file_exists($dir_prefix . DIRECTORY_SEPARATOR . $package)) {
$this->_fileNotFound($dir_prefix . DIRECTORY_SEPARATOR . $package);
@@ -83481,7 +83415,7 @@ class PEAR_Registry extends PEAR
$initializing = true;
if (!$this->_config) { // never used?
$file = OS_WINDOWS ? 'pear.ini' : '.pearrc';
- $this->_config = &new PEAR_Config($this->statedir . DIRECTORY_SEPARATOR .
+ $this->_config = new PEAR_Config($this->statedir . DIRECTORY_SEPARATOR .
$file);
$this->_config->setRegistry($this);
$this->_config->set('php_dir', $this->install_dir);
@@ -83944,16 +83878,9 @@ class PEAR_Registry extends PEAR
}
clearstatcache();
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
$fsize = filesize($this->filemap);
fclose($fp);
$data = file_get_contents($this->filemap);
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
$tmp = unserialize($data);
if (!$tmp && $fsize > 7) {
return $this->raiseError('PEAR_Registry: invalid filemap data', PEAR_REGISTRY_ERROR_FORMAT, null, null, $data);
@@ -84302,16 +84229,9 @@ class PEAR_Registry extends PEAR
return null;
}
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
clearstatcache();
$this->_closePackageFile($fp);
$data = file_get_contents($this->_packageFileName($package, $channel));
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
$data = unserialize($data);
if ($key === null) {
return $data;
@@ -84345,16 +84265,9 @@ class PEAR_Registry extends PEAR
return null;
}
- if (function_exists('set_magic_quotes_runtime')) {
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
clearstatcache();
$this->_closeChannelFile($fp);
$data = file_get_contents($this->_channelFileName($channel));
- if (function_exists('set_magic_quotes_runtime')) {
- set_magic_quotes_runtime($rt);
- }
$data = unserialize($data);
return $data;
}
@@ -84621,7 +84534,7 @@ class PEAR_Registry extends PEAR
$a = $this->_config;
if (!$a) {
- $this->_config = &new PEAR_Config;
+ $this->_config = new PEAR_Config;
$this->_config->set('php_dir', $this->statedir);
}
@@ -84629,7 +84542,7 @@ class PEAR_Registry extends PEAR
require_once 'phar://install-pear-nozlib.phar/' . 'PEAR/PackageFile.php';
}
- $pkg = &new PEAR_PackageFile($this->_config);
+ $pkg = new PEAR_PackageFile($this->_config);
$pf = &$pkg->fromArray($info);
return $pf;
}
@@ -86097,7 +86010,7 @@ class PEAR_REST_10
var $_rest;
function PEAR_REST_10($config, $options = array())
{
- $this->_rest = &new PEAR_REST($config, $options);
+ $this->_rest = new PEAR_REST($config, $options);
}
/**
@@ -99916,4 +99829,4 @@ class XML_Util
}
}
?>
-
+
View Lorry Controller Status