diff --git a/composer.lock b/composer.lock
index b7c4a4a59da6f00eaba9643a5817108a313b4e51..80adabc3e9aa7628316abdc550d3475694079801 100644
--- a/composer.lock
+++ b/composer.lock
@@ -406,28 +406,28 @@
},
{
"name": "pear-pear.php.net/PEAR",
- "version": "1.9.5",
+ "version": "1.10.1",
"dist": {
"type": "file",
- "url": "http://pear.php.net/get/PEAR-1.9.5.tgz",
+ "url": "http://pear.php.net/get/PEAR-1.10.1.tgz",
"reference": null,
"shasum": null
},
"require": {
"ext-pcre": "*",
"ext-xml": "*",
- "pear-pear.php.net/archive_tar": ">=1.3.11.0",
- "pear-pear.php.net/console_getopt": ">=1.2.0.0",
- "pear-pear.php.net/structures_graph": ">=1.0.2.0",
- "pear-pear.php.net/xml_util": ">=1.2.0.0",
- "php": ">=4.4.0.0,!=5.0.0.0,!=5.1.0.0,!=5.1.1.0,!=5.1.2.0,!=5.1.3.0,!=5.1.4.0,!=5.1.5.0"
+ "pear-pear.php.net/archive_tar": ">=1.4.0.0",
+ "pear-pear.php.net/console_getopt": ">=1.4.1.0",
+ "pear-pear.php.net/structures_graph": ">=1.1.0.0",
+ "pear-pear.php.net/xml_util": ">=1.3.0.0",
+ "php": ">=5.4.0.0"
},
"conflict": {
"pear-pear.php.net/pear_frontend_gtk": "<0.4.0.0",
"pear-pear.php.net/pear_frontend_web": "<=0.4.0.0"
},
"replace": {
- "pear-pear/pear": "== 1.9.5.0"
+ "pear-pear/pear": "== 1.10.1.0"
},
"type": "pear-library",
"autoload": {
@@ -596,24 +596,21 @@
},
{
"name": "symfony/yaml",
- "version": "v2.7.5",
+ "version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
+ "reference": "eca9019c88fbe250164affd107bc8057771f3f4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
- "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d",
+ "reference": "eca9019c88fbe250164affd107bc8057771f3f4d",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
"type": "library",
"extra": {
"branch-alias": {
@@ -641,7 +638,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2015-09-14 14:14:09"
+ "time": "2015-10-11 09:39:48"
},
{
"name": "vufind-org/vufindcode",
@@ -1247,24 +1244,21 @@
},
{
"name": "symfony/css-selector",
- "version": "v2.7.5",
+ "version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "abe19cc0429a06be0c133056d1f9859854860970"
+ "reference": "e1b865b26be4a56d22a8dee398375044a80c865b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/abe19cc0429a06be0c133056d1f9859854860970",
- "reference": "abe19cc0429a06be0c133056d1f9859854860970",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/e1b865b26be4a56d22a8dee398375044a80c865b",
+ "reference": "e1b865b26be4a56d22a8dee398375044a80c865b",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
"type": "library",
"extra": {
"branch-alias": {
@@ -1296,28 +1290,25 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2015-09-22 13:49:29"
+ "time": "2015-10-11 09:39:48"
},
{
"name": "symfony/process",
- "version": "v2.7.5",
+ "version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9"
+ "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
- "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
+ "url": "https://api.github.com/repos/symfony/process/zipball/4a959dd4e19c2c5d7512689413921e0a74386ec7",
+ "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
"type": "library",
"extra": {
"branch-alias": {
@@ -1345,7 +1336,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2015-09-19 19:59:23"
+ "time": "2015-10-23 14:47:27"
}
],
"aliases": [],
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 065890bfa1d8cba6c47fc951a46deb6f372aafec..b81224706a2c7e3dd36a6550fe73f3a1f4493ccf 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -71,7 +71,6 @@ return array(
'LosReCaptcha\\Service\\Response' => $vendorDir . '/los/losrecaptcha/src/LosReCaptcha/Service/Response.php',
'OS_Guess' => $vendorDir . '/pear-pear.php.net/PEAR/OS/Guess.php',
'PEAR' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR.php',
- 'PEAR5' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR5.php',
'PEAR_Autoloader' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR/Autoloader.php',
'PEAR_Builder' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR/Builder.php',
'PEAR_ChannelFile' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR/ChannelFile.php',
@@ -107,6 +106,7 @@ return array(
'PEAR_Installer_Role_Data' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR/Installer/Role/Data.php',
'PEAR_Installer_Role_Doc' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR/Installer/Role/Doc.php',
'PEAR_Installer_Role_Ext' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR/Installer/Role/Ext.php',
+ 'PEAR_Installer_Role_Man' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR/Installer/Role/Man.php',
'PEAR_Installer_Role_Php' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR/Installer/Role/Php.php',
'PEAR_Installer_Role_Script' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR/Installer/Role/Script.php',
'PEAR_Installer_Role_Src' => $vendorDir . '/pear-pear.php.net/PEAR/PEAR/Installer/Role/Src.php',
diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php
index 20086434d9314eb7aa6cba077a8c577ede2e3f47..05711d600dccc7c7392c852f5abd3fc876b7cf85 100644
--- a/vendor/composer/include_paths.php
+++ b/vendor/composer/include_paths.php
@@ -7,11 +7,11 @@ $baseDir = dirname($vendorDir);
return array(
$vendorDir . '/pear-pear.php.net/XML_Util',
- $vendorDir . '/pear-pear.php.net/PEAR',
$vendorDir . '/pear-pear.php.net/Validate',
$vendorDir . '/pear-pear.php.net/Validate_ISPN',
$vendorDir . '/pear-pear.php.net/Archive_Tar',
$vendorDir . '/pear-pear.php.net/Console_Getopt',
$vendorDir . '/pear-pear.php.net/Structures_Graph',
$vendorDir . '/pear-pear.php.net/File_MARC',
+ $vendorDir . '/pear-pear.php.net/PEAR',
);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 31118853a26e045476abe007a9129e092afbfa62..b5f8724b9377e001b1cc3cc28b36f3d01f14722a 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -265,47 +265,6 @@
],
"description": "Selection of methods that are often needed when working with XML documents. Functionality includes creating of attribute lists from arrays, creation of tags, validation of XML names and more."
},
- {
- "name": "pear-pear.php.net/PEAR",
- "version": "1.9.5",
- "version_normalized": "1.9.5.0",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/PEAR-1.9.5.tgz",
- "reference": null,
- "shasum": null
- },
- "require": {
- "ext-pcre": "*",
- "ext-xml": "*",
- "pear-pear.php.net/archive_tar": ">=1.3.11.0",
- "pear-pear.php.net/console_getopt": ">=1.2.0.0",
- "pear-pear.php.net/structures_graph": ">=1.0.2.0",
- "pear-pear.php.net/xml_util": ">=1.2.0.0",
- "php": ">=4.4.0.0,!=5.0.0.0,!=5.1.0.0,!=5.1.1.0,!=5.1.2.0,!=5.1.3.0,!=5.1.4.0,!=5.1.5.0"
- },
- "conflict": {
- "pear-pear.php.net/pear_frontend_gtk": "<0.4.0.0",
- "pear-pear.php.net/pear_frontend_web": "<=0.4.0.0"
- },
- "replace": {
- "pear-pear/pear": "== 1.9.5.0"
- },
- "type": "pear-library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
- ],
- "license": [
- "New BSD License"
- ],
- "description": "The PEAR package contains:\n * the PEAR installer, for creating, distributing\n and installing packages\n * the PEAR_Exception PHP5 error handling mechanism\n * the PEAR_ErrorStack advanced error handling mechanism\n * the PEAR_Error error handling mechanism\n * the OS_Guess class for retrieving info about the OS\n where PHP is running on\n * the System class for quick handling of common operations\n with files and directories\n * the PEAR base class\n Features in a nutshell:\n * full support for channels\n * pre-download dependency validation\n * new package.xml 2.0 format allows tremendous flexibility while maintaining BC\n * support for optional dependency groups and limited support for sub-packaging\n * robust dependency support\n * full dependency validation on uninstall\n * remote install for hosts with only ftp access - no more problems with\n restricted host installation\n * full support for mirroring\n * support for bundling several packages into a single tarball\n * support for static dependencies on a url-based package\n * support for custom file roles and installation tasks"
- },
{
"name": "pear-pear.php.net/Validate",
"version": "0.8.5",
@@ -1116,37 +1075,44 @@
"description": "The standard for machine-readable cataloging (MARC) records is documented at http://loc.gov/marc/. This package enables you to read existing MARC records from a file, string, or (using the YAZ extension), from a Z39.50 source. You can also use this package to create new MARC records.\n\nThis package is based on the PHP MARC package, originally called \"php-marc\", that is part of the Emilda Project (http://www.emilda.org). Christoffer Landtman generously agreed to make the \"php-marc\" code available under the GNU LGPL so it could be used as the basis of this PEAR package."
},
{
- "name": "symfony/yaml",
- "version": "v2.7.5",
- "version_normalized": "2.7.5.0",
+ "name": "behat/mink",
+ "version": "v1.7.0",
+ "version_normalized": "1.7.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/yaml.git",
- "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
+ "url": "https://github.com/minkphp/Mink.git",
+ "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
- "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
+ "url": "https://api.github.com/repos/minkphp/Mink/zipball/6c129030ec2cc029905cf969a56ca8f087b2dfdf",
+ "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "php": ">=5.3.1",
+ "symfony/css-selector": "~2.1"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-09-14 14:14:09",
+ "suggest": {
+ "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
+ "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
+ "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
+ "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
+ },
+ "time": "2015-09-20 20:24:03",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.7.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Yaml\\": ""
+ "Behat\\Mink\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1155,49 +1121,54 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Konstantin Kudryashov",
+ "email": "ever.zet@gmail.com",
+ "homepage": "http://everzet.com"
}
],
- "description": "Symfony Yaml Component",
- "homepage": "https://symfony.com"
+ "description": "Browser controller/emulator abstraction for PHP",
+ "homepage": "http://mink.behat.org/",
+ "keywords": [
+ "browser",
+ "testing",
+ "web"
+ ]
},
{
- "name": "symfony/css-selector",
- "version": "v2.7.5",
- "version_normalized": "2.7.5.0",
+ "name": "behat/mink-zombie-driver",
+ "version": "v1.3.0",
+ "version_normalized": "1.3.0.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/css-selector.git",
- "reference": "abe19cc0429a06be0c133056d1f9859854860970"
+ "url": "https://github.com/minkphp/MinkZombieDriver.git",
+ "reference": "257a2d46ffdc8cba28d107c2f1368fc1e5637d1b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/abe19cc0429a06be0c133056d1f9859854860970",
- "reference": "abe19cc0429a06be0c133056d1f9859854860970",
+ "url": "https://api.github.com/repos/minkphp/MinkZombieDriver/zipball/257a2d46ffdc8cba28d107c2f1368fc1e5637d1b",
+ "reference": "257a2d46ffdc8cba28d107c2f1368fc1e5637d1b",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "behat/mink": "~1.7@dev",
+ "ext-sockets": "*",
+ "php": ">=5.3.1",
+ "symfony/process": "~2.1"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-09-22 13:49:29",
- "type": "library",
+ "time": "2015-09-21 21:07:53",
+ "type": "mink-driver",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "1.3.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\CssSelector\\": ""
+ "Behat\\Mink\\Driver\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1206,43 +1177,87 @@
],
"authors": [
{
- "name": "Jean-François Simon",
- "email": "jeanfrancois.simon@sensiolabs.com"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Konstantin Kudryashov",
+ "email": "ever.zet@gmail.com",
+ "homepage": "http://everzet.com"
},
{
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Pascal Cremer",
+ "email": "b00gizm@gmail.com",
+ "homepage": "http://github.com/b00gizm"
}
],
- "description": "Symfony CssSelector Component",
- "homepage": "https://symfony.com"
+ "description": "Zombie.js driver for Mink framework",
+ "homepage": "http://mink.behat.org/",
+ "keywords": [
+ "ajax",
+ "browser",
+ "headless",
+ "javascript",
+ "testing",
+ "zombie"
+ ]
},
{
- "name": "symfony/process",
- "version": "v2.7.5",
- "version_normalized": "2.7.5.0",
+ "name": "pear-pear.php.net/PEAR",
+ "version": "1.10.1",
+ "version_normalized": "1.10.1.0",
+ "dist": {
+ "type": "file",
+ "url": "http://pear.php.net/get/PEAR-1.10.1.tgz",
+ "reference": null,
+ "shasum": null
+ },
+ "require": {
+ "ext-pcre": "*",
+ "ext-xml": "*",
+ "pear-pear.php.net/archive_tar": ">=1.4.0.0",
+ "pear-pear.php.net/console_getopt": ">=1.4.1.0",
+ "pear-pear.php.net/structures_graph": ">=1.1.0.0",
+ "pear-pear.php.net/xml_util": ">=1.3.0.0",
+ "php": ">=5.4.0.0"
+ },
+ "conflict": {
+ "pear-pear.php.net/pear_frontend_gtk": "<0.4.0.0",
+ "pear-pear.php.net/pear_frontend_web": "<=0.4.0.0"
+ },
+ "replace": {
+ "pear-pear/pear": "== 1.10.1.0"
+ },
+ "type": "pear-library",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ ""
+ ]
+ },
+ "include-path": [
+ "/"
+ ],
+ "license": [
+ "New BSD License"
+ ],
+ "description": "The PEAR package contains:\n * the PEAR installer, for creating, distributing\n and installing packages\n * the PEAR_Exception PHP5 error handling mechanism\n * the PEAR_ErrorStack advanced error handling mechanism\n * the PEAR_Error error handling mechanism\n * the OS_Guess class for retrieving info about the OS\n where PHP is running on\n * the System class for quick handling of common operations\n with files and directories\n * the PEAR base class\n Features in a nutshell:\n * full support for channels\n * pre-download dependency validation\n * new package.xml 2.0 format allows tremendous flexibility while maintaining BC\n * support for optional dependency groups and limited support for sub-packaging\n * robust dependency support\n * full dependency validation on uninstall\n * remote install for hosts with only ftp access - no more problems with\n restricted host installation\n * full support for mirroring\n * support for bundling several packages into a single tarball\n * support for static dependencies on a url-based package\n * support for custom file roles and installation tasks"
+ },
+ {
+ "name": "symfony/yaml",
+ "version": "v2.7.6",
+ "version_normalized": "2.7.6.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/process.git",
- "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9"
+ "url": "https://github.com/symfony/yaml.git",
+ "reference": "eca9019c88fbe250164affd107bc8057771f3f4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
- "reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d",
+ "reference": "eca9019c88fbe250164affd107bc8057771f3f4d",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
- "time": "2015-09-19 19:59:23",
+ "time": "2015-10-11 09:39:48",
"type": "library",
"extra": {
"branch-alias": {
@@ -1252,7 +1267,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Process\\": ""
+ "Symfony\\Component\\Yaml\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1269,48 +1284,38 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Process Component",
+ "description": "Symfony Yaml Component",
"homepage": "https://symfony.com"
},
{
- "name": "behat/mink",
- "version": "v1.7.0",
- "version_normalized": "1.7.0.0",
+ "name": "symfony/css-selector",
+ "version": "v2.7.6",
+ "version_normalized": "2.7.6.0",
"source": {
"type": "git",
- "url": "https://github.com/minkphp/Mink.git",
- "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf"
+ "url": "https://github.com/symfony/css-selector.git",
+ "reference": "e1b865b26be4a56d22a8dee398375044a80c865b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/minkphp/Mink/zipball/6c129030ec2cc029905cf969a56ca8f087b2dfdf",
- "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/e1b865b26be4a56d22a8dee398375044a80c865b",
+ "reference": "e1b865b26be4a56d22a8dee398375044a80c865b",
"shasum": ""
},
"require": {
- "php": ">=5.3.1",
- "symfony/css-selector": "~2.1"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
- "suggest": {
- "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
- "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
- "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
- "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
+ "php": ">=5.3.9"
},
- "time": "2015-09-20 20:24:03",
+ "time": "2015-10-11 09:39:48",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Behat\\Mink\\": "src/"
+ "Symfony\\Component\\CssSelector\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1319,54 +1324,50 @@
],
"authors": [
{
- "name": "Konstantin Kudryashov",
- "email": "ever.zet@gmail.com",
- "homepage": "http://everzet.com"
+ "name": "Jean-François Simon",
+ "email": "jeanfrancois.simon@sensiolabs.com"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Browser controller/emulator abstraction for PHP",
- "homepage": "http://mink.behat.org/",
- "keywords": [
- "browser",
- "testing",
- "web"
- ]
+ "description": "Symfony CssSelector Component",
+ "homepage": "https://symfony.com"
},
{
- "name": "behat/mink-zombie-driver",
- "version": "v1.3.0",
- "version_normalized": "1.3.0.0",
+ "name": "symfony/process",
+ "version": "v2.7.6",
+ "version_normalized": "2.7.6.0",
"source": {
"type": "git",
- "url": "https://github.com/minkphp/MinkZombieDriver.git",
- "reference": "257a2d46ffdc8cba28d107c2f1368fc1e5637d1b"
+ "url": "https://github.com/symfony/process.git",
+ "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/minkphp/MinkZombieDriver/zipball/257a2d46ffdc8cba28d107c2f1368fc1e5637d1b",
- "reference": "257a2d46ffdc8cba28d107c2f1368fc1e5637d1b",
+ "url": "https://api.github.com/repos/symfony/process/zipball/4a959dd4e19c2c5d7512689413921e0a74386ec7",
+ "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7",
"shasum": ""
},
"require": {
- "behat/mink": "~1.7@dev",
- "ext-sockets": "*",
- "php": ">=5.3.1",
- "symfony/process": "~2.1"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
+ "php": ">=5.3.9"
},
- "time": "2015-09-21 21:07:53",
- "type": "mink-driver",
+ "time": "2015-10-23 14:47:27",
+ "type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "2.7-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Behat\\Mink\\Driver\\": "src/"
+ "Symfony\\Component\\Process\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1375,25 +1376,15 @@
],
"authors": [
{
- "name": "Konstantin Kudryashov",
- "email": "ever.zet@gmail.com",
- "homepage": "http://everzet.com"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
},
{
- "name": "Pascal Cremer",
- "email": "b00gizm@gmail.com",
- "homepage": "http://github.com/b00gizm"
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Zombie.js driver for Mink framework",
- "homepage": "http://mink.behat.org/",
- "keywords": [
- "ajax",
- "browser",
- "headless",
- "javascript",
- "testing",
- "zombie"
- ]
+ "description": "Symfony Process Component",
+ "homepage": "https://symfony.com"
}
]
diff --git a/vendor/pear-pear.php.net/PEAR/OS/Guess.php b/vendor/pear-pear.php.net/PEAR/OS/Guess.php
index 3fd4ab95835ea148ac977bf7ec37b3d67cd1b84c..4c9254a26f157504f701d3a3e5f23983f27aff5e 100644
--- a/vendor/pear-pear.php.net/PEAR/OS/Guess.php
+++ b/vendor/pear-pear.php.net/PEAR/OS/Guess.php
@@ -10,7 +10,6 @@
* @author Gregory Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since PEAR 0.1
*/
@@ -87,7 +86,7 @@
* @author Gregory Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -99,7 +98,7 @@ class OS_Guess
var $release;
var $extra;
- function OS_Guess($uname = null)
+ function __construct($uname = null)
{
list($this->sysname,
$this->release,
@@ -335,4 +334,4 @@ class OS_Guess
* indent-tabs-mode: nil
* c-basic-offset: 4
* End:
- */
\ No newline at end of file
+ */
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR.php b/vendor/pear-pear.php.net/PEAR/PEAR.php
index e6f8edc2aa9b88493ceda52223246cdc4b9c5cb4..d661cc212392c67217b1e55efa817e85c4617d41 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR.php
@@ -14,7 +14,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2010 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -33,8 +32,6 @@ define('PEAR_ERROR_CALLBACK', 16);
*/
define('PEAR_ERROR_EXCEPTION', 32);
/**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
- version_compare(zend_version(), "2-dev", "ge")));
if (substr(PHP_OS, 0, 3) == 'WIN') {
define('OS_WINDOWS', true);
@@ -78,7 +75,7 @@ $GLOBALS['_PEAR_error_handler_stack'] = array();
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2006 The PHP Group
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @see PEAR_Error
* @since Class available since PHP 4.0.2
@@ -136,6 +133,18 @@ class PEAR
*/
var $_expected_errors = array();
+ /**
+ * List of methods that can be called both statically and non-statically.
+ * @var array
+ */
+ protected static $bivalentMethods = array(
+ 'setErrorHandling' => true,
+ 'raiseError' => true,
+ 'throwError' => true,
+ 'pushErrorHandling' => true,
+ 'popErrorHandling' => true,
+ );
+
/**
* Constructor. Registers this object in
* $_PEAR_destructor_object_list for destructor emulation if a
@@ -146,7 +155,7 @@ class PEAR
* @access public
* @return void
*/
- function PEAR($error_class = null)
+ function __construct($error_class = null)
{
$classname = strtolower(get_class($this));
if ($this->_debug) {
@@ -173,6 +182,18 @@ class PEAR
}
}
+ /**
+ * Only here for backwards compatibility.
+ * E.g. Archive_Tar calls $this->PEAR() in its constructor.
+ *
+ * @param string $error_class Which class to use for error objects,
+ * defaults to PEAR_Error.
+ */
+ public function PEAR($error_class = null)
+ {
+ self::__construct($error_class);
+ }
+
/**
* Destructor (the emulated type of...). Does nothing right now,
* but is included for forward compatibility, so subclass
@@ -190,19 +211,44 @@ class PEAR
}
}
+ public function __call($method, $arguments)
+ {
+ if (!isset(self::$bivalentMethods[$method])) {
+ trigger_error(
+ 'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+ );
+ }
+ return call_user_func_array(
+ array(get_class(), '_' . $method),
+ array_merge(array($this), $arguments)
+ );
+ }
+
+ public static function __callStatic($method, $arguments)
+ {
+ if (!isset(self::$bivalentMethods[$method])) {
+ trigger_error(
+ 'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+ );
+ }
+ return call_user_func_array(
+ array(get_class(), '_' . $method),
+ array_merge(array(null), $arguments)
+ );
+ }
+
/**
* If you have a class that's mostly/entirely static, and you need static
* properties, you can use this method to simulate them. Eg. in your method(s)
* do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
* You MUST use a reference, or they will not persist!
*
- * @access public
* @param string $class The calling classname, to prevent clashes
* @param string $var The variable to retrieve.
* @return mixed A reference to the variable. If not set it will be
* auto initialised to NULL.
*/
- function &getStaticProperty($class, $var)
+ public static function &getStaticProperty($class, $var)
{
static $properties;
if (!isset($properties[$class])) {
@@ -220,12 +266,12 @@ class PEAR
* Use this function to register a shutdown method for static
* classes.
*
- * @access public
* @param mixed $func The function name (or array of class/method) to call
* @param mixed $args The arguments to pass to the function
+ *
* @return void
*/
- function registerShutdownFunc($func, $args = array())
+ public static function registerShutdownFunc($func, $args = array())
{
// if we are called statically, there is a potential
// that no shutdown func is registered. Bug #6445
@@ -244,10 +290,10 @@ class PEAR
* only if $code is a string and
* $obj->getMessage() == $code or
* $code is an integer and $obj->getCode() == $code
- * @access public
+ *
* @return bool true if parameter is an error
*/
- function isError($data, $code = null)
+ public static function isError($data, $code = null)
{
if (!is_a($data, 'PEAR_Error')) {
return false;
@@ -269,6 +315,9 @@ class PEAR
* PEAR objects. If called in an object, setErrorHandling sets
* the default behaviour for that object.
*
+ * @param object $object
+ * Object the method was called on (non-static mode)
+ *
* @param int $mode
* One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
* PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
@@ -300,11 +349,12 @@ class PEAR
*
* @since PHP 4.0.5
*/
- function setErrorHandling($mode = null, $options = null)
- {
- if (isset($this) && is_a($this, 'PEAR')) {
- $setmode = &$this->_default_error_mode;
- $setoptions = &$this->_default_error_options;
+ protected static function _setErrorHandling(
+ $object, $mode = null, $options = null
+ ) {
+ if ($object !== null) {
+ $setmode = &$object->_default_error_mode;
+ $setoptions = &$object->_default_error_options;
} else {
$setmode = &$GLOBALS['_PEAR_default_error_mode'];
$setoptions = &$GLOBALS['_PEAR_default_error_options'];
@@ -464,12 +514,12 @@ class PEAR
* @param bool $skipmsg If true, raiseError will only pass error codes,
* the error message parameter will be dropped.
*
- * @access public
* @return object a PEAR error object
* @see PEAR::setErrorHandling
* @since PHP 4.0.5
*/
- function &raiseError($message = null,
+ protected static function _raiseError($object,
+ $message = null,
$code = null,
$mode = null,
$options = null,
@@ -487,10 +537,10 @@ class PEAR
}
if (
- isset($this) &&
- isset($this->_expected_errors) &&
- count($this->_expected_errors) > 0 &&
- count($exp = end($this->_expected_errors))
+ $object !== null &&
+ isset($object->_expected_errors) &&
+ count($object->_expected_errors) > 0 &&
+ count($exp = end($object->_expected_errors))
) {
if ($exp[0] == "*" ||
(is_int(reset($exp)) && in_array($code, $exp)) ||
@@ -503,9 +553,9 @@ class PEAR
// No mode given, try global ones
if ($mode === null) {
// Class error handler
- if (isset($this) && isset($this->_default_error_mode)) {
- $mode = $this->_default_error_mode;
- $options = $this->_default_error_options;
+ if ($object !== null && isset($object->_default_error_mode)) {
+ $mode = $object->_default_error_mode;
+ $options = $object->_default_error_options;
// Global error handler
} elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
$mode = $GLOBALS['_PEAR_default_error_mode'];
@@ -515,18 +565,12 @@ class PEAR
if ($error_class !== null) {
$ec = $error_class;
- } elseif (isset($this) && isset($this->_error_class)) {
- $ec = $this->_error_class;
+ } elseif ($object !== null && isset($object->_error_class)) {
+ $ec = $object->_error_class;
} else {
$ec = 'PEAR_Error';
}
- if (intval(PHP_VERSION) < 5) {
- // little non-eval hack to fix bug #12147
- include 'PEAR/FixPHP5PEARWarnings.php';
- return $a;
- }
-
if ($skipmsg) {
$a = new $ec($code, $mode, $options, $userinfo);
} else {
@@ -548,14 +592,13 @@ class PEAR
* @param string $userinfo If you need to pass along for example debug
* information, this parameter is meant for that.
*
- * @access public
* @return object a PEAR error object
* @see PEAR::raiseError
*/
- function &throwError($message = null, $code = null, $userinfo = null)
+ protected static function _throwError($object, $message = null, $code = null, $userinfo = null)
{
- if (isset($this) && is_a($this, 'PEAR')) {
- $a = &$this->raiseError($message, $code, null, null, $userinfo);
+ if ($object !== null) {
+ $a = &$object->raiseError($message, $code, null, null, $userinfo);
return $a;
}
@@ -563,7 +606,7 @@ class PEAR
return $a;
}
- function staticPushErrorHandling($mode, $options = null)
+ public static function staticPushErrorHandling($mode, $options = null)
{
$stack = &$GLOBALS['_PEAR_error_handler_stack'];
$def_mode = &$GLOBALS['_PEAR_default_error_mode'];
@@ -598,7 +641,7 @@ class PEAR
return true;
}
- function staticPopErrorHandling()
+ public static function staticPopErrorHandling()
{
$stack = &$GLOBALS['_PEAR_error_handler_stack'];
$setmode = &$GLOBALS['_PEAR_default_error_mode'];
@@ -646,20 +689,20 @@ class PEAR
*
* @see PEAR::setErrorHandling
*/
- function pushErrorHandling($mode, $options = null)
+ protected static function _pushErrorHandling($object, $mode, $options = null)
{
$stack = &$GLOBALS['_PEAR_error_handler_stack'];
- if (isset($this) && is_a($this, 'PEAR')) {
- $def_mode = &$this->_default_error_mode;
- $def_options = &$this->_default_error_options;
+ if ($object !== null) {
+ $def_mode = &$object->_default_error_mode;
+ $def_options = &$object->_default_error_options;
} else {
$def_mode = &$GLOBALS['_PEAR_default_error_mode'];
$def_options = &$GLOBALS['_PEAR_default_error_options'];
}
$stack[] = array($def_mode, $def_options);
- if (isset($this) && is_a($this, 'PEAR')) {
- $this->setErrorHandling($mode, $options);
+ if ($object !== null) {
+ $object->setErrorHandling($mode, $options);
} else {
PEAR::setErrorHandling($mode, $options);
}
@@ -674,14 +717,14 @@ class PEAR
*
* @see PEAR::pushErrorHandling
*/
- function popErrorHandling()
+ protected static function _popErrorHandling($object)
{
$stack = &$GLOBALS['_PEAR_error_handler_stack'];
array_pop($stack);
list($mode, $options) = $stack[sizeof($stack) - 1];
array_pop($stack);
- if (isset($this) && is_a($this, 'PEAR')) {
- $this->setErrorHandling($mode, $options);
+ if ($object !== null) {
+ $object->setErrorHandling($mode, $options);
} else {
PEAR::setErrorHandling($mode, $options);
}
@@ -695,7 +738,7 @@ class PEAR
* @param string $ext The extension name
* @return bool Success or not on the dl() call
*/
- function loadExtension($ext)
+ public static function loadExtension($ext)
{
if (extension_loaded($ext)) {
return true;
@@ -704,8 +747,7 @@ class PEAR
// if either returns true dl() will produce a FATAL error, stop that
if (
function_exists('dl') === false ||
- ini_get('enable_dl') != 1 ||
- ini_get('safe_mode') == 1
+ ini_get('enable_dl') != 1
) {
return false;
}
@@ -726,10 +768,6 @@ class PEAR
}
}
-if (PEAR_ZE2) {
- include_once 'PEAR5.php';
-}
-
function _PEAR_call_destructors()
{
global $_PEAR_destructor_object_list;
@@ -737,11 +775,8 @@ function _PEAR_call_destructors()
sizeof($_PEAR_destructor_object_list))
{
reset($_PEAR_destructor_object_list);
- if (PEAR_ZE2) {
- $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
- } else {
- $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
- }
+
+ $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
if ($destructLifoExists) {
$_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
@@ -788,7 +823,7 @@ function _PEAR_call_destructors()
* @author Gregory Beaver <cellog@php.net>
* @copyright 1997-2006 The PHP Group
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/manual/en/core.pear.pear-error.php
* @see PEAR::raiseError(), PEAR::throwError()
* @since Class available since PHP 4.0.2
@@ -823,7 +858,7 @@ class PEAR_Error
* @access public
*
*/
- function PEAR_Error($message = 'unknown error', $code = null,
+ function __construct($message = 'unknown error', $code = null,
$mode = null, $options = null, $userinfo = null)
{
if ($mode === null) {
@@ -834,11 +869,7 @@ class PEAR_Error
$this->mode = $mode;
$this->userinfo = $userinfo;
- if (PEAR_ZE2) {
- $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
- } else {
- $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
- }
+ $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
if (!$skiptrace) {
$this->backtrace = debug_backtrace();
@@ -896,6 +927,24 @@ class PEAR_Error
}
}
+ /**
+ * Only here for backwards compatibility.
+ *
+ * Class "Cache_Error" still uses it, among others.
+ *
+ * @param string $message Message
+ * @param int $code Error code
+ * @param int $mode Error mode
+ * @param mixed $options See __construct()
+ * @param string $userinfo Additional user/debug info
+ */
+ public function PEAR_Error(
+ $message = 'unknown error', $code = null, $mode = null,
+ $options = null, $userinfo = null
+ ) {
+ self::__construct($message, $code, $mode, $options, $userinfo);
+ }
+
/**
* Get the error mode from an error object.
*
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Autoloader.php b/vendor/pear-pear.php.net/PEAR/PEAR/Autoloader.php
index 74a4f78bc5e426fa92a9d07147ee7ab2f6c4a627..bcb57f65b98a07ed37ec660f51a9b421b9f636eb 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Autoloader.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Autoloader.php
@@ -10,7 +10,6 @@
* @author Stig Bakken <ssb@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/manual/en/core.ppm.php#core.ppm.pear-autoloader
* @since File available since Release 0.1
* @deprecated File deprecated in Release 1.4.0a1
@@ -45,7 +44,7 @@ require_once "PEAR.php";
* @author Stig Bakken <ssb@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/manual/en/core.ppm.php#core.ppm.pear-autoloader
* @since File available since Release 0.1
* @deprecated File deprecated in Release 1.4.0a1
@@ -144,7 +143,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
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Builder.php b/vendor/pear-pear.php.net/PEAR/PEAR/Builder.php
index 88b7b61d35a662c30907c3f8485e7adefa696149..94b09f08d6a0e6a4687d408a98028ea9afa41b7c 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Builder.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Builder.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*
@@ -23,6 +22,7 @@
*/
require_once 'PEAR/Common.php';
require_once 'PEAR/PackageFile.php';
+require_once 'System.php';
/**
* Class to handle building (compiling) extensions.
@@ -33,7 +33,7 @@ require_once 'PEAR/PackageFile.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since PHP 4.0.2
* @see http://pear.php.net/manual/en/core.ppm.pear-builder.php
@@ -63,9 +63,9 @@ class PEAR_Builder extends PEAR_Common
*
* @access public
*/
- function PEAR_Builder(&$ui)
+ function __construct(&$ui)
{
- parent::PEAR_Common();
+ parent::__construct();
$this->setFrontendObject($ui);
}
@@ -79,7 +79,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;
@@ -279,7 +279,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;
@@ -322,6 +322,16 @@ class PEAR_Builder extends PEAR_Common
// {{{ start of interactive part
$configure_command = "$dir/configure";
+
+ $phpConfigName = $this->config->get('php_prefix')
+ . 'php-config'
+ . $this->config->get('php_suffix');
+ $phpConfigPath = System::which($phpConfigName);
+ if ($phpConfigPath !== false) {
+ $configure_command .= ' --with-php-config='
+ . $phpConfigPath;
+ }
+
$configure_options = $pkg->getConfigureOptions();
if ($configure_options) {
foreach ($configure_options as $o) {
@@ -375,7 +385,7 @@ class PEAR_Builder extends PEAR_Common
if (!file_exists($build_dir) || !is_dir($build_dir) || !chdir($build_dir)) {
return $this->raiseError("could not chdir to $build_dir");
}
- putenv('PHP_PEAR_VERSION=1.9.5');
+ putenv('PHP_PEAR_VERSION=1.10.1');
foreach ($to_run as $cmd) {
$err = $this->_runCommand($cmd, $callback);
if (PEAR::isError($err)) {
@@ -476,7 +486,7 @@ class PEAR_Builder extends PEAR_Common
return ($exitcode == 0);
}
- function log($level, $msg)
+ function log($level, $msg, $append_crlf = true)
{
if ($this->current_callback) {
if ($this->debug >= $level) {
@@ -484,6 +494,6 @@ class PEAR_Builder extends PEAR_Common
}
return;
}
- return PEAR_Common::log($level, $msg);
+ return parent::log($level, $msg, $append_crlf);
}
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/ChannelFile.php b/vendor/pear-pear.php.net/PEAR/PEAR/ChannelFile.php
index 5769fa96026893173f2d8f222f7a54a8f67df07a..f993764c84c8763f5738b39bedcfa8082089b373 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/ChannelFile.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/ChannelFile.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -146,7 +145,7 @@ $GLOBALS['_PEAR_CHANNELS_MIRROR_TYPES'] = array('server');
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -194,9 +193,9 @@ class PEAR_ChannelFile
*/
var $_isValid = false;
- function PEAR_ChannelFile()
+ function __construct()
{
- $this->_stack = &new PEAR_ErrorStack('PEAR_ChannelFile');
+ $this->_stack = new PEAR_ErrorStack('PEAR_ChannelFile');
$this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
$this->_isValid = false;
}
@@ -306,11 +305,12 @@ class PEAR_ChannelFile
/**
* @param array
- * @static
+ *
* @return PEAR_ChannelFile|false false if invalid
*/
- function &fromArray($data, $compatibility = false, $stackClass = 'PEAR_ErrorStack')
- {
+ public static function &fromArray(
+ $data, $compatibility = false, $stackClass = 'PEAR_ErrorStack'
+ ) {
$a = new PEAR_ChannelFile($compatibility, $stackClass);
$a->_fromArray($data);
if (!$a->validate()) {
@@ -322,13 +322,14 @@ class PEAR_ChannelFile
/**
* Unlike {@link fromArray()} this does not do any validation
+ *
* @param array
- * @static
+ *
* @return PEAR_ChannelFile
*/
- function &fromArrayWithErrors($data, $compatibility = false,
- $stackClass = 'PEAR_ErrorStack')
- {
+ public static function &fromArrayWithErrors(
+ $data, $compatibility = false, $stackClass = 'PEAR_ErrorStack'
+ ) {
$a = new PEAR_ChannelFile($compatibility, $stackClass);
$a->_fromArray($data);
return $a;
@@ -1501,7 +1502,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;
}
@@ -1513,7 +1514,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;
@@ -1521,10 +1522,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;
@@ -1556,4 +1557,4 @@ class PEAR_ChannelFile
return time();
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/ChannelFile/Parser.php b/vendor/pear-pear.php.net/PEAR/PEAR/ChannelFile/Parser.php
index fa965819d99e79ea24de1d1c3dd34fb57597f766..a27e8fd06c100bfb1779659e59f6136af9e5965e 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/ChannelFile/Parser.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/ChannelFile/Parser.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -26,7 +25,7 @@ require_once 'PEAR/ChannelFile.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command.php
index ea7f67925a95551bbca4e82b2ccbf72d507d09dd..9ec55507d9d9a4cff5d27bd60fd6e1cba5af7ede 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -94,7 +93,7 @@ $GLOBALS['_PEAR_Command_objects'] = array();
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -109,11 +108,8 @@ class PEAR_Command
* @param object $config Instance of PEAR_Config object
*
* @return object the command object or a PEAR error
- *
- * @access public
- * @static
*/
- function &factory($command, &$config)
+ public static function &factory($command, &$config)
{
if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
PEAR_Command::registerCommands();
@@ -134,13 +130,13 @@ class PEAR_Command
return $a;
}
$ui =& PEAR_Command::getFrontendObject();
- $obj = &new $class($ui, $config);
+ $obj = new $class($ui, $config);
return $obj;
}
// }}}
// {{{ & getObject()
- function &getObject($command)
+ public static function &getObject($command)
{
$class = $GLOBALS['_PEAR_Command_commandlist'][$command];
if (!class_exists($class)) {
@@ -151,7 +147,7 @@ class PEAR_Command
}
$ui =& PEAR_Command::getFrontendObject();
$config = &PEAR_Config::singleton();
- $obj = &new $class($ui, $config);
+ $obj = new $class($ui, $config);
return $obj;
}
@@ -162,9 +158,8 @@ class PEAR_Command
* Get instance of frontend object.
*
* @return object|PEAR_Error
- * @static
*/
- function &getFrontendObject()
+ public static function &getFrontendObject()
{
$a = &PEAR_Frontend::singleton();
return $a;
@@ -179,9 +174,8 @@ class PEAR_Command
* @param string $uiclass Name of class implementing the frontend
*
* @return object the frontend object, or a PEAR error
- * @static
*/
- function &setFrontendClass($uiclass)
+ public static function &setFrontendClass($uiclass)
{
$a = &PEAR_Frontend::setFrontendClass($uiclass);
return $a;
@@ -196,9 +190,8 @@ class PEAR_Command
* @param string $uitype Name of the frontend type (for example "CLI")
*
* @return object the frontend object, or a PEAR error
- * @static
*/
- function setFrontendType($uitype)
+ public static function setFrontendType($uitype)
{
$uiclass = 'PEAR_Frontend_' . $uitype;
return PEAR_Command::setFrontendClass($uiclass);
@@ -221,11 +214,8 @@ class PEAR_Command
* included.
*
* @return bool TRUE on success, a PEAR error on failure
- *
- * @access public
- * @static
*/
- function registerCommands($merge = false, $dir = null)
+ public static function registerCommands($merge = false, $dir = null)
{
$parser = new PEAR_XMLParser;
if ($dir === null) {
@@ -305,11 +295,8 @@ class PEAR_Command
* classes implement them.
*
* @return array command => implementing class
- *
- * @access public
- * @static
*/
- function getCommands()
+ public static function getCommands()
{
if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
PEAR_Command::registerCommands();
@@ -324,11 +311,8 @@ class PEAR_Command
* Get the list of command shortcuts.
*
* @return array shortcut => command
- *
- * @access public
- * @static
*/
- function getShortcuts()
+ public static function getShortcuts()
{
if (empty($GLOBALS['_PEAR_Command_shortcuts'])) {
PEAR_Command::registerCommands();
@@ -347,11 +331,8 @@ class PEAR_Command
* @param array $long_args (reference) long getopt format
*
* @return void
- *
- * @access public
- * @static
*/
- function getGetoptArgs($command, &$short_args, &$long_args)
+ public static function getGetoptArgs($command, &$short_args, &$long_args)
{
if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
PEAR_Command::registerCommands();
@@ -375,11 +356,8 @@ class PEAR_Command
* @param string $command Name of the command
*
* @return string command description
- *
- * @access public
- * @static
*/
- function getDescription($command)
+ public static function getDescription($command)
{
if (!isset($GLOBALS['_PEAR_Command_commanddesc'][$command])) {
return null;
@@ -394,11 +372,8 @@ class PEAR_Command
* Get help for command.
*
* @param string $command Name of the command to return help for
- *
- * @access public
- * @static
*/
- function getHelp($command)
+ public static function getHelp($command)
{
$cmds = PEAR_Command::getCommands();
if (isset($GLOBALS['_PEAR_Command_shortcuts'][$command])) {
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Auth.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Auth.php
index dd292fbe262ebc65b8ce61d2495c098f2842f318..aa021ec26f54f6bf8bd869de65440a371a080006 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Auth.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Auth.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
* @deprecated since 1.8.0alpha1
@@ -30,7 +29,7 @@ require_once 'PEAR/Command/Channels.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
* @deprecated since 1.8.0alpha1
@@ -74,8 +73,8 @@ password from your user configuration.',
*
* @access public
*/
- function PEAR_Command_Auth(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Channels($ui, $config);
+ parent::__construct($ui, $config);
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Build.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Build.php
index 014ab261049079c0efa24c6b1ebed5721cb39a13..7f851932d47f71b87b93986d1f35eebc764bfeb5 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Build.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Build.php
@@ -11,7 +11,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -31,7 +30,7 @@ require_once 'PEAR/Command/Common.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -53,9 +52,9 @@ Builds one or more extensions contained in a package.'
*
* @access public
*/
- function PEAR_Command_Build(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Common($ui, $config);
+ parent::__construct($ui, $config);
}
function doBuild($command, $options, $params)
@@ -65,7 +64,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)) {
@@ -82,4 +81,4 @@ Builds one or more extensions contained in a package.'
$this->ui->outputData(rtrim($data), 'build');
}
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Channels.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Channels.php
index 258f12f2db38412a1049934a67112a3609a15b67..690483d1dcf1265e8665eb44044f8246256fc402 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Channels.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Channels.php
@@ -12,7 +12,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -32,7 +31,7 @@ define('PEAR_COMMAND_CHANNELS_CHANNEL_EXISTS', -500);
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -167,9 +166,9 @@ configuration.',
*
* @access public
*/
- function PEAR_Command_Channels(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Common($ui, $config);
+ parent::__construct($ui, $config);
}
function _sortChannels($a, $b)
@@ -695,7 +694,7 @@ configuration.',
'already aliased to "' . strtolower($params[1]) . '", cannot re-alias');
}
- $chan = &$reg->getChannel($params[0]);
+ $chan = $reg->getChannel($params[0]);
if (PEAR::isError($chan)) {
return $this->raiseError('Corrupt registry? Error retrieving channel "' . $params[0] .
'" information (' . $chan->getMessage() . ')');
@@ -880,4 +879,4 @@ configuration.',
$this->config->store();
return true;
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Common.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Common.php
index df4890f985058de0da7764af223e3a8616988afe..4be537629cc2f5ace5922447c41c85d432771040 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Common.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Common.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -29,7 +28,7 @@ require_once 'PEAR.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -81,9 +80,9 @@ class PEAR_Command_Common extends PEAR
*
* @access public
*/
- function PEAR_Command_Common(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR();
+ parent::__construct();
$this->config = &$config;
$this->ui = &$ui;
}
@@ -270,4 +269,4 @@ class PEAR_Command_Common extends PEAR
return $this->$func($command, $options, $params);
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Config.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Config.php
index 3af4ca102fa4d6ec07867136ae23cc8ff2e63cac..705a7cbb83a38671d7519c7a5ea4005a2dfcc564 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Config.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Config.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -29,7 +28,7 @@ require_once 'PEAR/Command/Common.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -133,9 +132,9 @@ and uninstall).
*
* @access public
*/
- function PEAR_Command_Config(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Common($ui, $config);
+ parent::__construct($ui, $config);
}
function doConfigShow($command, $options, $params)
@@ -338,7 +337,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);
}
@@ -355,6 +354,7 @@ and uninstall).
$config->set('download_dir', $windows ? "$root\\pear\\download" : "$root/pear/download");
$config->set('temp_dir', $windows ? "$root\\pear\\temp" : "$root/pear/temp");
$config->set('bin_dir', $windows ? "$root\\pear" : "$root/pear");
+ $config->set('man_dir', $windows ? "$root\\pear\\man" : "$root/pear/man");
$config->writeConfigFile();
$this->_showConfig($config);
$this->ui->outputData('Successfully created default configuration file "' . $params[1] . '"',
@@ -411,4 +411,4 @@ and uninstall).
return false;
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Install.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Install.php
index 8ccaa105d99d769038e48d6cfc914450eb1cc353..9d572eda8498bd27cdaf8d158708ea39c587121c 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Install.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Install.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -30,7 +29,7 @@ require_once 'PEAR/Command/Common.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -313,9 +312,9 @@ Run post-installation scripts in package <package>, if any exist.
*
* @access public
*/
- function PEAR_Command_Install(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Common($ui, $config);
+ parent::__construct($ui, $config);
}
// }}}
@@ -328,7 +327,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;
}
@@ -340,7 +339,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;
}
@@ -556,7 +555,13 @@ Run post-installation scripts in package <package>, if any exist.
$packrootphp_dir = $this->installer->_prependPath(
$this->config->get('php_dir', null, 'pear.php.net'),
$options['packagingroot']);
- $instreg = new PEAR_Registry($packrootphp_dir); // other instreg!
+ $metadata_dir = $this->config->get('metadata_dir', null, 'pear.php.net');
+ if ($metadata_dir) {
+ $metadata_dir = $this->installer->_prependPath(
+ $metadata_dir,
+ $options['packagingroot']);
+ }
+ $instreg = new PEAR_Registry($packrootphp_dir, false, false, $metadata_dir); // other instreg!
if ($this->config->get('verbose') > 2) {
$this->ui->outputData('using package root: ' . $options['packagingroot']);
@@ -770,18 +775,7 @@ Run post-installation scripts in package <package>, if any exist.
$exttype = 'extension';
$extpath = $pinfo[1]['basename'];
} else {
- if (version_compare(PHP_VERSION, '5.3.0', '<')) {
- ob_start();
- phpinfo(INFO_GENERAL);
- $info = ob_get_contents();
- ob_end_clean();
- $debug = function_exists('leak') ? '_debug' : '';
- $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
- } else {
- $debug = '';
- $ts = '';
- }
- $exttype = 'zend_extension' . $debug . $ts;
+ $exttype = 'zend_extension';
$extpath = $atts['installed_as'];
}
$extrainfo[] = 'You should add "' . $exttype . '=' .
@@ -1143,7 +1137,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());
}
@@ -1205,7 +1199,7 @@ Run post-installation scripts in package <package>, if any exist.
if (!isset($latestReleases[$channel])) {
// fill in cache for this channel
- $chan = &$reg->getChannel($channel);
+ $chan = $reg->getChannel($channel);
if (PEAR::isError($chan)) {
return $this->raiseError($chan);
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Mirror.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Mirror.php
index 428246a9f24f96975b81722e9882ac99be26c3a5..bae7ad13eb68ca0cf7518dc745af213a45f9fa67 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Mirror.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Mirror.php
@@ -9,7 +9,6 @@
* @author Alexander Merz <alexmerz@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.2.0
*/
@@ -27,7 +26,7 @@ require_once 'PEAR/Command/Common.php';
* @author Alexander Merz <alexmerz@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.2.0
*/
@@ -60,9 +59,9 @@ packages within preferred_state ({config preferred_state}) will be downloaded'
* @param object PEAR_Frontend a reference to an frontend
* @param object PEAR_Config a reference to the configuration data
*/
- function PEAR_Command_Mirror(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Common($ui, $config);
+ parent::__construct($ui, $config);
}
/**
@@ -136,4 +135,4 @@ packages within preferred_state ({config preferred_state}) will be downloaded'
return true;
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Package.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Package.php
index 67a38be6f0dc0bb3d07fea86474aed585a010601..6904c01caf1dba6f142beb1e8fbee90fb9ef4f49 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Package.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Package.php
@@ -12,7 +12,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -32,7 +31,7 @@ require_once 'PEAR/Command/Common.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -283,9 +282,9 @@ used for automated conversion or learning the format.
*
* @access public
*/
- function PEAR_Command_Package(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Common($ui, $config);
+ parent::__construct($ui, $config);
}
function _displayValidationResults($err, $warn, $strict = false)
@@ -310,7 +309,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;
}
@@ -322,7 +321,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);
@@ -372,7 +371,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 .
@@ -881,7 +880,7 @@ used for automated conversion or learning the format.
);
foreach ($deps as $type => $subd) {
$req = ($type == 'required') ? 'Yes' : 'No';
- if ($type == 'group') {
+ if ($type == 'group' && isset($subd['attribs']['name'])) {
$group = $subd['attribs']['name'];
} else {
$group = '';
@@ -1031,7 +1030,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;
}
@@ -1048,7 +1047,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;
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Pickle.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Pickle.php
index 78b7b42b18a76a089189b3644aef4f59ee5bbd10..af6079b69fb1f2accaa9631ab470b7ffdd6b479b 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Pickle.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Pickle.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 2005-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.1
*/
@@ -27,7 +26,7 @@ require_once 'PEAR/Command/Common.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 2005-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.1
*/
@@ -76,9 +75,9 @@ generate both package.xml.
*
* @access public
*/
- function PEAR_Command_Pickle(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Common($ui, $config);
+ parent::__construct($ui, $config);
}
/**
@@ -92,7 +91,7 @@ generate both package.xml.
require_once 'PEAR/Packager.php';
}
- $a = &new PEAR_Packager;
+ $a = new PEAR_Packager;
return $a;
}
@@ -114,7 +113,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);
@@ -418,4 +417,4 @@ generate both package.xml.
$gen = &$pf->getDefaultGenerator();
$gen->toPackageFile('.');
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Registry.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Registry.php
index 1050d92b2c8f8d7df5782c971f42219fdfb4aa52..37ee48beab8e71b2aa006b55267f5a0761f28565 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Registry.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Registry.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -29,7 +28,7 @@ require_once 'PEAR/Command/Common.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -98,9 +97,9 @@ installed package.'
*
* @access public
*/
- function PEAR_Command_Registry(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Common($ui, $config);
+ parent::__construct($ui, $config);
}
function _sortinfo($a, $b)
@@ -261,7 +260,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();
@@ -435,7 +434,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();
@@ -1142,4 +1141,4 @@ installed package.'
$data['raw'] = $obj->getArray(); // no validation needed
$this->ui->outputData($data, 'package-info');
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Remote.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Remote.php
index 509e45ed926f4f2b46ee3e795ed6fab2eef15cd9..f73db24f896cbe2787e03d5473db0c46366f7656 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Remote.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Remote.php
@@ -11,7 +11,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -31,7 +30,7 @@ require_once 'PEAR/REST.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -155,9 +154,9 @@ parameter.
*
* @access public
*/
- function PEAR_Command_Remote(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Common($ui, $config);
+ parent::__construct($ui, $config);
}
function _checkChannelForStatus($channel, $chan)
@@ -579,7 +578,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;
}
@@ -668,13 +667,13 @@ parameter.
$preferred_mirror = $this->config->get('preferred_mirror');
if ($chan->supportsREST($preferred_mirror) &&
(
- //($base2 = $chan->getBaseURL('REST1.4', $preferred_mirror)) ||
- ($base = $chan->getBaseURL('REST1.0', $preferred_mirror))
+ ($base2 = $chan->getBaseURL('REST1.3', $preferred_mirror))
+ || ($base = $chan->getBaseURL('REST1.0', $preferred_mirror))
)
) {
if ($base2) {
- $rest = &$this->config->getREST('1.4', array());
+ $rest = &$this->config->getREST('1.3', array());
$base = $base2;
} else {
$rest = &$this->config->getREST('1.0', array());
@@ -807,4 +806,4 @@ parameter.
$this->ui->outputData(rtrim($output), $command);
return $num;
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Test.php b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Test.php
index 8be5b98376331dd48a2cba74cb649d4446bbd8b8..a59b1cf81e91dc0620e24fbafdb4707a3374db4a 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Command/Test.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Command/Test.php
@@ -11,7 +11,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -31,7 +30,7 @@ require_once 'PEAR/Command/Common.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -87,6 +86,10 @@ If none is found, all .phpt tests will be tried instead.',
'shortopt' => 'x',
'doc' => 'Generate a code coverage report (requires Xdebug 2.0.0+)',
),
+ 'showdiff' => array(
+ 'shortopt' => 'd',
+ 'doc' => 'Output diff on test failure',
+ ),
),
'doc' => '[testfile|dir ...]
Run regression tests with PHP\'s regression testing script (run-tests.php).',
@@ -100,9 +103,9 @@ Run regression tests with PHP\'s regression testing script (run-tests.php).',
*
* @access public
*/
- function PEAR_Command_Test(&$ui, &$config)
+ function __construct(&$ui, &$config)
{
- parent::PEAR_Command_Common($ui, $config);
+ parent::__construct($ui, $config);
}
function doRunTests($command, $options, $params)
@@ -332,6 +335,9 @@ 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');
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Common.php b/vendor/pear-pear.php.net/PEAR/PEAR/Common.php
index 2792434f43f1c059519baaccdb6e55707c82e6ed..5fe76ad18b6a17b1fcca8d57229b3b7a03c18f4b 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Common.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Common.php
@@ -11,7 +11,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1.0
* @deprecated File deprecated since Release 1.4.0a1
@@ -118,7 +117,7 @@ $GLOBALS['_PEAR_Common_script_phases'] = array('pre-install', 'post-install', 'p
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
* @deprecated This class will disappear, and its components will be spread
@@ -165,9 +164,9 @@ class PEAR_Common extends PEAR
*
* @access public
*/
- function PEAR_Common()
+ function __construct()
{
- parent::PEAR();
+ parent::__construct();
$this->config = &PEAR_Config::singleton();
$this->debug = $this->config->get('verbose');
}
@@ -241,11 +240,8 @@ class PEAR_Common extends PEAR
* @param string $msg message to write to the log
*
* @return void
- *
- * @access public
- * @static
*/
- function log($level, $msg, $append_crlf = true)
+ public function log($level, $msg, $append_crlf = true)
{
if ($this->debug >= $level) {
if (!class_exists('PEAR_Frontend')) {
@@ -325,9 +321,8 @@ class PEAR_Common extends PEAR
* Get the valid roles for a PEAR package maintainer
*
* @return array
- * @static
*/
- function getUserRoles()
+ public static function getUserRoles()
{
return $GLOBALS['_PEAR_Common_maintainer_roles'];
}
@@ -336,9 +331,8 @@ class PEAR_Common extends PEAR
* Get the valid package release states of packages
*
* @return array
- * @static
*/
- function getReleaseStates()
+ public static function getReleaseStates()
{
return $GLOBALS['_PEAR_Common_release_states'];
}
@@ -347,9 +341,8 @@ class PEAR_Common extends PEAR
* Get the implemented dependency types (php, ext, pkg etc.)
*
* @return array
- * @static
*/
- function getDependencyTypes()
+ public static function getDependencyTypes()
{
return $GLOBALS['_PEAR_Common_dependency_types'];
}
@@ -358,9 +351,8 @@ class PEAR_Common extends PEAR
* Get the implemented dependency relations (has, lt, ge etc.)
*
* @return array
- * @static
*/
- function getDependencyRelations()
+ public static function getDependencyRelations()
{
return $GLOBALS['_PEAR_Common_dependency_relations'];
}
@@ -369,9 +361,8 @@ class PEAR_Common extends PEAR
* Get the implemented file roles
*
* @return array
- * @static
*/
- function getFileRoles()
+ public static function getFileRoles()
{
return $GLOBALS['_PEAR_Common_file_roles'];
}
@@ -380,9 +371,8 @@ class PEAR_Common extends PEAR
* Get the implemented file replacement types in
*
* @return array
- * @static
*/
- function getReplacementTypes()
+ public static function getReplacementTypes()
{
return $GLOBALS['_PEAR_Common_replacement_types'];
}
@@ -391,9 +381,8 @@ class PEAR_Common extends PEAR
* Get the implemented file replacement types in
*
* @return array
- * @static
*/
- function getProvideTypes()
+ public static function getProvideTypes()
{
return $GLOBALS['_PEAR_Common_provide_types'];
}
@@ -402,9 +391,8 @@ class PEAR_Common extends PEAR
* Get the implemented file replacement types in
*
* @return array
- * @static
*/
- function getScriptPhases()
+ public static function getScriptPhases()
{
return $GLOBALS['_PEAR_Common_script_phases'];
}
@@ -440,9 +428,8 @@ class PEAR_Common extends PEAR
/**
* @param string $path relative or absolute include path
* @return boolean
- * @static
*/
- function isIncludeable($path)
+ public static function isIncludeable($path)
{
if (file_exists($path) && is_readable($path)) {
return true;
@@ -489,7 +476,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);
}
@@ -508,7 +495,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);
}
@@ -527,7 +514,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);
}
@@ -571,7 +558,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();
@@ -604,7 +591,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);
@@ -626,7 +613,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, '');
@@ -814,24 +801,38 @@ class PEAR_Common extends PEAR
* @param string $save_dir (optional) directory to save file in
* @param mixed $callback (optional) function/method to call for status
* updates
- *
- * @return string Returns the full path of the downloaded file or a PEAR
- * error on failure. If the error is caused by
- * socket-related errors, the error object will
- * have the fsockopen error code available through
- * getCode().
+ * @param false|string|array $lastmodified header values to check against
+ * for caching
+ * use false to return the header
+ * values from this download
+ * @param false|array $accept Accept headers to send
+ * @param false|string $channel Channel to use for retrieving
+ * authentication
+ *
+ * @return mixed Returns the full path of the downloaded file or a PEAR
+ * error on failure. If the error is caused by
+ * socket-related errors, the error object will
+ * have the fsockopen error code available through
+ * getCode(). If caching is requested, then return the header
+ * values.
+ * If $lastmodified was given and the there are no changes,
+ * boolean false is returned.
*
* @access public
- * @deprecated in favor of PEAR_Downloader::downloadHttp()
*/
- function downloadHttp($url, &$ui, $save_dir = '.', $callback = null)
- {
+ function downloadHttp(
+ $url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null,
+ $accept = false, $channel = false
+ ) {
if (!class_exists('PEAR_Downloader')) {
require_once 'PEAR/Downloader.php';
}
- return PEAR_Downloader::downloadHttp($url, $ui, $save_dir, $callback);
+ return PEAR_Downloader::_downloadHttp(
+ $this, $url, $ui, $save_dir, $callback, $lastmodified,
+ $accept, $channel
+ );
}
}
require_once 'PEAR/Config.php';
-require_once 'PEAR/PackageFile.php';
\ No newline at end of file
+require_once 'PEAR/PackageFile.php';
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Config.php b/vendor/pear-pear.php.net/PEAR/PEAR/Config.php
index edaef745b3844240a8d031615a29c43f7c8229d3..3856acb1064812952a362cf9629ebdd6abe7f8c7 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Config.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Config.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -87,6 +86,13 @@ if (getenv('PHP_PEAR_INSTALL_DIR')) {
}
}
+// Default for metadata_dir
+if (getenv('PHP_PEAR_METADATA_DIR')) {
+ define('PEAR_CONFIG_DEFAULT_METADATA_DIR', getenv('PHP_PEAR_METADATA_DIR'));
+} else {
+ define('PEAR_CONFIG_DEFAULT_METADATA_DIR', '');
+}
+
// Default for ext_dir
if (getenv('PHP_PEAR_EXTENSION_DIR')) {
define('PEAR_CONFIG_DEFAULT_EXT_DIR', getenv('PHP_PEAR_EXTENSION_DIR'));
@@ -142,6 +148,18 @@ if (getenv('PHP_PEAR_WWW_DIR')) {
$PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'www');
}
+// Default for man_dir
+if (getenv('PHP_PEAR_MAN_DIR')) {
+ define('PEAR_CONFIG_DEFAULT_MAN_DIR', getenv('PHP_PEAR_MAN_DIR'));
+} else {
+ if (defined('PHP_MANDIR')) { // Added in PHP5.3.7
+ define('PEAR_CONFIG_DEFAULT_MAN_DIR', PHP_MANDIR);
+ } else {
+ define('PEAR_CONFIG_DEFAULT_MAN_DIR', PHP_PREFIX . DIRECTORY_SEPARATOR .
+ 'local' . DIRECTORY_SEPARATOR .'man');
+ }
+}
+
// Default for test_dir
if (getenv('PHP_PEAR_TEST_DIR')) {
define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
@@ -246,7 +264,7 @@ if (getenv('PHP_PEAR_SIG_KEYDIR')) {
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -440,6 +458,13 @@ class PEAR_Config extends PEAR
'prompt' => 'PEAR www files directory',
'group' => 'File Locations (Advanced)',
),
+ 'man_dir' => array(
+ 'type' => 'directory',
+ 'default' => PEAR_CONFIG_DEFAULT_MAN_DIR,
+ 'doc' => 'directory where unix manual pages are installed',
+ 'prompt' => 'Systems manpage files directory',
+ 'group' => 'File Locations (Advanced)',
+ ),
'test_dir' => array(
'type' => 'directory',
'default' => PEAR_CONFIG_DEFAULT_TEST_DIR,
@@ -496,6 +521,13 @@ class PEAR_Config extends PEAR
'prompt' => 'php.ini location',
'group' => 'File Locations (Advanced)',
),
+ 'metadata_dir' => array(
+ 'type' => 'directory',
+ 'default' => PEAR_CONFIG_DEFAULT_METADATA_DIR,
+ 'doc' => 'directory where metadata files are installed (registry, filemap, channels, ...)',
+ 'prompt' => 'PEAR metadata directory',
+ 'group' => 'File Locations (Advanced)',
+ ),
// Maintainers
'username' => array(
'type' => 'string',
@@ -592,10 +624,10 @@ class PEAR_Config extends PEAR
*
* @see PEAR_Config::singleton
*/
- function PEAR_Config($user_file = '', $system_file = '', $ftp_file = false,
+ function __construct($user_file = '', $system_file = '', $ftp_file = false,
$strict = true)
{
- $this->PEAR();
+ parent::__construct();
PEAR_Installer_Role::initializeConfig($this);
$sl = DIRECTORY_SEPARATOR;
if (empty($user_file)) {
@@ -647,7 +679,9 @@ 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'], false, false,
+ $this->configuration['default']['metadata_dir']);
$this->_registry['default']->setConfig($this, false);
$this->_regInitialized['default'] = false;
//$GLOBALS['_PEAR_Config_instance'] = &$this;
@@ -655,9 +689,8 @@ class PEAR_Config extends PEAR
/**
* Return the default locations of user and system configuration files
- * @static
*/
- function getDefaultConfigFiles()
+ public static function getDefaultConfigFiles()
{
$sl = DIRECTORY_SEPARATOR;
if (OS_WINDOWS) {
@@ -684,17 +717,15 @@ class PEAR_Config extends PEAR
*
* @return object an existing or new PEAR_Config instance
*
- * @access public
- *
* @see PEAR_Config::PEAR_Config
*/
- function &singleton($user_file = '', $system_file = '', $strict = true)
+ public static function &singleton($user_file = '', $system_file = '', $strict = true)
{
if (is_object($GLOBALS['_PEAR_Config_instance'])) {
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;
}
@@ -754,7 +785,9 @@ 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, false, false,
+ $this->get('metadata_dir', $layer, 'pear.php.net'));
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
} else {
@@ -783,7 +816,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)) {
@@ -911,7 +944,9 @@ 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, false, false,
+ $this->get('metadata_dir', $layer, 'pear.php.net'));
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
} else {
@@ -924,9 +959,8 @@ class PEAR_Config extends PEAR
* @param array
* @param array
* @return array
- * @static
*/
- function arrayMergeRecursive($arr2, $arr1)
+ public static function arrayMergeRecursive($arr2, $arr1)
{
$ret = array();
foreach ($arr2 as $key => $data) {
@@ -1022,16 +1056,12 @@ class PEAR_Config extends PEAR
}
$size = filesize($file);
- $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');
}
- set_magic_quotes_runtime($rt);
-
$version = false;
if (preg_match('/^#PEAR_Config\s+(\S+)\s+/si', $contents, $matches)) {
$version = $matches[1];
@@ -1357,7 +1387,7 @@ class PEAR_Config extends PEAR
if ($key == 'preferred_mirror') {
$reg = &$this->getRegistry();
if (is_object($reg)) {
- $chan = &$reg->getChannel($channel);
+ $chan = $reg->getChannel($channel);
if (PEAR::isError($chan)) {
return $channel;
}
@@ -1383,7 +1413,7 @@ class PEAR_Config extends PEAR
if ($key == 'preferred_mirror') {
$reg = &$this->getRegistry();
if (is_object($reg)) {
- $chan = &$reg->getChannel($channel);
+ $chan = $reg->getChannel($channel);
if (PEAR::isError($chan)) {
return $channel;
}
@@ -1434,7 +1464,7 @@ class PEAR_Config extends PEAR
if ($ret !== null) {
$reg = &$this->getRegistry($layer);
if (is_object($reg)) {
- $chan = &$reg->getChannel($channel);
+ $chan = $reg->getChannel($channel);
if (PEAR::isError($chan)) {
return $channel;
}
@@ -1492,7 +1522,7 @@ class PEAR_Config extends PEAR
$reg = &$this->getRegistry($layer);
if (is_object($reg)) {
- $chan = &$reg->getChannel($channel ? $channel : 'pear.php.net');
+ $chan = $reg->getChannel($channel ? $channel : 'pear.php.net');
if (PEAR::isError($chan)) {
return false;
}
@@ -1574,7 +1604,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);
}
@@ -1604,7 +1634,9 @@ 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, false, false,
+ $this->get('metadata_dir', $layer, 'pear.php.net'));
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
} else {
@@ -2035,7 +2067,7 @@ class PEAR_Config extends PEAR
require_once 'PEAR/REST/' . $version . '.php';
}
- $remote = &new $class($this, $options);
+ $remote = new $class($this, $options);
return $remote;
}
@@ -2088,7 +2120,9 @@ 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'), false, false,
+ $this->get('metadata_dir', $layer, 'pear.php.net'));
$this->_registry[$layer]->setConfig($this, false);
$this->_regInitialized[$layer] = false;
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Dependency2.php b/vendor/pear-pear.php.net/PEAR/PEAR/Dependency2.php
index b42281795e65b0025cd7535a5ae061ff18732955..635c551ecbce4295a513d4dbcf0da82dfb8236bd 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Dependency2.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Dependency2.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -31,7 +30,7 @@ require_once 'PEAR/Validate.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -82,7 +81,7 @@ class PEAR_Dependency2
* @param array format of PEAR_Registry::parsedPackageName()
* @param int installation state (one of PEAR_VALIDATE_*)
*/
- function PEAR_Dependency2(&$config, $installoptions, $package,
+ function __construct(&$config, $installoptions, $package,
$state = PEAR_VALIDATE_INSTALLING)
{
$this->_config = &$config;
@@ -541,7 +540,7 @@ class PEAR_Dependency2
*/
function getPEARVersion()
{
- return '1.9.5';
+ return '1.10.1';
}
function validatePearinstallerDependency($dep)
@@ -894,9 +893,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
@@ -1175,7 +1174,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 {
@@ -1199,7 +1198,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';
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/DependencyDB.php b/vendor/pear-pear.php.net/PEAR/PEAR/DependencyDB.php
index 41bee038e73ee627419f849b490599762226d20b..1ee604343143a3a1c5c14c3148a321c3de3efead 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/DependencyDB.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/DependencyDB.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -30,7 +29,7 @@ $GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE'] = array();
* @author Tomas V.V.Cox <cox@idec.net.com>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -89,9 +88,8 @@ class PEAR_DependencyDB
* @param PEAR_Config
* @param string|false full path to the dependency database, or false to use default
* @return PEAR_DependencyDB|PEAR_Error
- * @static
*/
- function &singleton(&$config, $depdb = false)
+ public static function &singleton(&$config, $depdb = false)
{
$phpdir = $config->get('php_dir', null, 'pear.php.net');
if (!isset($GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE'][$phpdir])) {
@@ -122,8 +120,11 @@ class PEAR_DependencyDB
$this->_registry = &$this->_config->getRegistry();
if (!$depdb) {
- $this->_depdb = $this->_config->get('php_dir', null, 'pear.php.net') .
- DIRECTORY_SEPARATOR . '.depdb';
+ $dir = $this->_config->get('metadata_dir', null, 'pear.php.net');
+ if (!$dir) {
+ $dir = $this->_config->get('php_dir', null, 'pear.php.net');
+ }
+ $this->_depdb = $dir . DIRECTORY_SEPARATOR . '.depdb';
} else {
$this->_depdb = $depdb;
}
@@ -550,12 +551,9 @@ class PEAR_DependencyDB
return $err;
}
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
clearstatcache();
fclose($fp);
$data = unserialize(file_get_contents($this->_depdb));
- set_magic_quotes_runtime($rt);
$this->_cache = $data;
return $data;
}
@@ -577,10 +575,7 @@ class PEAR_DependencyDB
return PEAR::raiseError("Could not open dependencies file `".$this->_depdb."' for writing");
}
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
fwrite($fp, serialize($deps));
- set_magic_quotes_runtime($rt);
fclose($fp);
$this->_unlock();
$this->_cache = $deps;
@@ -766,4 +761,4 @@ class PEAR_DependencyDB
);
}
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Downloader.php b/vendor/pear-pear.php.net/PEAR/PEAR/Downloader.php
index 8ccc072e83f49d480b7fcb0708d3ba12a59d6997..6d6cdd7a23bd3b053f727daabdb785e645e2b1fb 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Downloader.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Downloader.php
@@ -12,7 +12,6 @@
* @author Martin Jansen <mj@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.3.0
*/
@@ -39,7 +38,7 @@ define('PEAR_INSTALLER_ERROR_NO_PREF_STATE', 2);
* @author Martin Jansen <mj@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.3.0
*/
@@ -140,27 +139,44 @@ class PEAR_Downloader extends PEAR_Common
*/
var $_downloadDir;
+ /**
+ * List of methods that can be called both statically and non-statically.
+ * @var array
+ */
+ protected static $bivalentMethods = array(
+ 'setErrorHandling' => true,
+ 'raiseError' => true,
+ 'throwError' => true,
+ 'pushErrorHandling' => true,
+ 'popErrorHandling' => true,
+ 'downloadHttp' => true,
+ );
+
/**
* @param PEAR_Frontend_*
* @param array
* @param PEAR_Config
*/
- function PEAR_Downloader(&$ui, $options, &$config)
+ function __construct($ui = null, $options = array(), $config = null)
{
- parent::PEAR_Common();
+ parent::__construct();
$this->_options = $options;
- $this->config = &$config;
- $this->_preferredState = $this->config->get('preferred_state');
+ if ($config !== null) {
+ $this->config = &$config;
+ $this->_preferredState = $this->config->get('preferred_state');
+ }
$this->ui = &$ui;
if (!$this->_preferredState) {
// don't inadvertantly use a non-set preferred_state
$this->_preferredState = null;
}
- if (isset($this->_options['installroot'])) {
- $this->config->setInstallRoot($this->_options['installroot']);
+ if ($config !== null) {
+ if (isset($this->_options['installroot'])) {
+ $this->config->setInstallRoot($this->_options['installroot']);
+ }
+ $this->_registry = &$config->getRegistry();
}
- $this->_registry = &$config->getRegistry();
if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
$this->_installed = $this->_registry->listAllPackages();
@@ -235,12 +251,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;
}
@@ -256,7 +272,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;
}
@@ -274,7 +290,7 @@ class PEAR_Downloader extends PEAR_Common
$channelschecked = array();
// convert all parameters into PEAR_Downloader_Package objects
foreach ($params as $i => $param) {
- $params[$i] = &$this->newDownloaderPackage($this);
+ $params[$i] = $this->newDownloaderPackage($this);
PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
$err = $params[$i]->initialize($param);
PEAR::staticPopErrorHandling();
@@ -315,7 +331,7 @@ class PEAR_Downloader extends PEAR_Common
require_once 'System.php';
}
- $curchannel = &$this->_registry->getChannel($params[$i]->getChannel());
+ $curchannel = $this->_registry->getChannel($params[$i]->getChannel());
if (PEAR::isError($curchannel)) {
PEAR::staticPopErrorHandling();
return $this->raiseError($curchannel);
@@ -331,7 +347,10 @@ class PEAR_Downloader extends PEAR_Common
$a = $this->downloadHttp($url, $this->ui, $dir, null, $curchannel->lastModified());
PEAR::staticPopErrorHandling();
- if (PEAR::isError($a) || !$a) {
+ if ($a === false) {
+ //channel.xml not modified
+ break;
+ } else if (PEAR::isError($a)) {
// Attempt fallback to https automatically
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
$a = $this->downloadHttp('https://' . $mirror .
@@ -806,7 +825,7 @@ class PEAR_Downloader extends PEAR_Common
} while (false);
}
- $chan = &$this->_registry->getChannel($parr['channel']);
+ $chan = $this->_registry->getChannel($parr['channel']);
if (PEAR::isError($chan)) {
return $chan;
}
@@ -929,7 +948,7 @@ class PEAR_Downloader extends PEAR_Common
$curchannel = $this->config->get('default_channel');
if (isset($dep['uri'])) {
$xsdversion = '2.0';
- $chan = &$this->_registry->getChannel('__uri');
+ $chan = $this->_registry->getChannel('__uri');
if (PEAR::isError($chan)) {
return $chan;
}
@@ -954,7 +973,7 @@ class PEAR_Downloader extends PEAR_Common
} while (false);
}
- $chan = &$this->_registry->getChannel($remotechannel);
+ $chan = $this->_registry->getChannel($remotechannel);
if (PEAR::isError($chan)) {
return $chan;
}
@@ -969,7 +988,7 @@ class PEAR_Downloader extends PEAR_Common
}
if (isset($dep['uri'])) {
- $info = &$this->newDownloaderPackage($this);
+ $info = $this->newDownloaderPackage($this);
PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
$err = $info->initialize($dep);
PEAR::staticPopErrorHandling();
@@ -1523,18 +1542,21 @@ class PEAR_Downloader extends PEAR_Common
* use false to return the header values from this download
* @param false|array $accept Accept headers to send
* @param false|string $channel Channel to use for retrieving authentication
- * @return string|array Returns the full path of the downloaded file or a PEAR
- * error on failure. If the error is caused by
- * socket-related errors, the error object will
- * have the fsockopen error code available through
- * getCode(). If caching is requested, then return the header
- * values.
+ * @return mixed Returns the full path of the downloaded file or a PEAR
+ * error on failure. If the error is caused by
+ * socket-related errors, the error object will
+ * have the fsockopen error code available through
+ * getCode(). If caching is requested, then return the header
+ * values.
+ * If $lastmodified was given and the there are no changes,
+ * boolean false is returned.
*
* @access public
*/
- function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null,
- $accept = false, $channel = false)
- {
+ public static function _downloadHttp(
+ $object, $url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null,
+ $accept = false, $channel = false
+ ) {
static $redirect = 0;
// always reset , so we are clean case of error
$wasredirect = $redirect;
@@ -1556,8 +1578,8 @@ class PEAR_Downloader extends PEAR_Common
$port = isset($info['port']) ? $info['port'] : null;
$path = isset($info['path']) ? $info['path'] : null;
- if (isset($this)) {
- $config = &$this->config;
+ if ($object !== null) {
+ $config = $object->config;
} else {
$config = &PEAR_Config::singleton();
}
@@ -1639,9 +1661,9 @@ class PEAR_Downloader extends PEAR_Common
}
$request .= $ifmodifiedsince .
- "User-Agent: PEAR/1.9.5/PHP/" . PHP_VERSION . "\r\n";
+ "User-Agent: PEAR/1.10.1/PHP/" . PHP_VERSION . "\r\n";
- if (isset($this)) { // only pass in authentication for non-static calls
+ if ($object !== null) { // only pass in authentication for non-static calls
$username = $config->get('username', null, $channel);
$password = $config->get('password', null, $channel);
if ($username && $password) {
@@ -1689,7 +1711,7 @@ class PEAR_Downloader extends PEAR_Common
}
$redirect = $wasredirect + 1;
- return $this->downloadHttp($headers['location'],
+ return static::_downloadHttp($object, $headers['location'],
$ui, $save_dir, $callback, $lastmodified, $accept);
}
@@ -1763,4 +1785,4 @@ class PEAR_Downloader extends PEAR_Common
}
return $dest_file;
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Downloader/Package.php b/vendor/pear-pear.php.net/PEAR/PEAR/Downloader/Package.php
index 9303b488361d5ee96615ff3664c2a6bbd0c20943..fe979eb67e1a4e605c44fcda0acbe5d8fa1fe234 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Downloader/Package.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Downloader/Package.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -50,7 +49,7 @@ define('PEAR_DOWNLOADER_PACKAGE_PHPVERSION', -1004);
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -130,7 +129,7 @@ class PEAR_Downloader_Package
/**
* @param PEAR_Downloader
*/
- function PEAR_Downloader_Package(&$downloader)
+ function __construct(&$downloader)
{
$this->_downloader = &$downloader;
$this->_config = &$this->_downloader->config;
@@ -397,9 +396,8 @@ class PEAR_Downloader_Package
/**
* Remove packages to be downloaded that are already installed
* @param array of PEAR_Downloader_Package objects
- * @static
*/
- function removeInstalled(&$params)
+ public static function removeInstalled(&$params)
{
if (!isset($params[0])) {
return;
@@ -415,7 +413,7 @@ class PEAR_Downloader_Package
if ($param->_installRegistry->packageExists($package, $channel)) {
$packageVersion = $param->_installRegistry->packageInfo($package, 'version', $channel);
if (version_compare($packageVersion, $param->getVersion(), '==')) {
- if (!isset($options['force'])) {
+ if (!isset($options['force']) && !isset($options['packagingroot'])) {
$info = $param->getParsedPackage();
unset($info['version']);
unset($info['state']);
@@ -427,7 +425,7 @@ class PEAR_Downloader_Package
$params[$i] = false;
}
} elseif (!isset($options['force']) && !isset($options['upgrade']) &&
- !isset($options['soft'])) {
+ !isset($options['soft']) && !isset($options['packagingroot'])) {
$info = $param->getParsedPackage();
$param->_downloader->log(1, 'Skipping package "' .
$param->getShortName() .
@@ -1243,7 +1241,7 @@ class PEAR_Downloader_Package
* @param array $errorparams empty array
* @return array array of stupid duplicated packages in PEAR_Downloader_Package obejcts
*/
- function detectStupidDuplicates($params, &$errorparams)
+ public static function detectStupidDuplicates($params, &$errorparams)
{
$existing = array();
foreach ($params as $i => $param) {
@@ -1281,9 +1279,8 @@ class PEAR_Downloader_Package
/**
* @param array
* @param bool ignore install groups - for final removal of dupe packages
- * @static
*/
- function removeDuplicates(&$params, $ignoreGroups = false)
+ public static function removeDuplicates(&$params, $ignoreGroups = false)
{
$pnames = array();
foreach ($params as $i => $param) {
@@ -1345,9 +1342,8 @@ class PEAR_Downloader_Package
}
/**
- * @static
*/
- function mergeDependencies(&$params)
+ public static function mergeDependencies(&$params)
{
$bundles = $newparams = array();
foreach ($params as $i => $param) {
@@ -1384,14 +1380,14 @@ 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();
return $dir;
}
-
- $e = $obj->_fromFile($a = $dir . DIRECTORY_SEPARATOR . $file);
+ $a = $dir . DIRECTORY_SEPARATOR . $file;
+ $e = $obj->_fromFile($a);
PEAR::popErrorHandling();
if (PEAR::isError($e)) {
if (!isset($options['soft'])) {
@@ -1400,10 +1396,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;
}
}
}
@@ -1437,7 +1432,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);
}
@@ -1459,8 +1454,7 @@ class PEAR_Downloader_Package
}
}
- $j = &$obj;
- $newparams[] = &$j;
+ $newparams[] = $obj;
}
}
@@ -1476,9 +1470,8 @@ class PEAR_Downloader_Package
/**
- * @static
*/
- function willDownload($param, $params)
+ public static function willDownload($param, $params)
{
if (!is_array($params)) {
return false;
@@ -1501,7 +1494,7 @@ class PEAR_Downloader_Package
*/
function &getPackagefileObject(&$c, $d)
{
- $a = &new PEAR_PackageFile($c, $d);
+ $a = new PEAR_PackageFile($c, $d);
return $a;
}
@@ -1576,7 +1569,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');
@@ -1985,4 +1978,4 @@ class PEAR_Downloader_Package
return $info;
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/ErrorStack.php b/vendor/pear-pear.php.net/PEAR/PEAR/ErrorStack.php
index c1b0396a9fc8c0ad6c55e1b466ac516f16ec5092..7b705bdbbad486f320b2f256f977bb4e247fd5da 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/ErrorStack.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/ErrorStack.php
@@ -23,7 +23,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 2004-2008 Greg Beaver
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR_ErrorStack
*/
@@ -132,12 +131,11 @@ define('PEAR_ERRORSTACK_ERR_OBJTOSTRING', 2);
* $local_stack = new PEAR_ErrorStack('MyPackage');
* </code>
* @author Greg Beaver <cellog@php.net>
- * @version 1.9.5
+ * @version 1.10.1
* @package PEAR_ErrorStack
* @category Debugging
* @copyright 2004-2008 Greg Beaver
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR_ErrorStack
*/
class PEAR_ErrorStack {
@@ -194,43 +192,43 @@ class PEAR_ErrorStack {
* @access protected
*/
var $_contextCallback = false;
-
+
/**
* If set to a valid callback, this will be called every time an error
* is pushed onto the stack. The return value will be used to determine
* whether to allow an error to be pushed or logged.
- *
+ *
* The return value must be one an PEAR_ERRORSTACK_* constant
* @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
* @var false|string|array
* @access protected
*/
var $_errorCallback = array();
-
+
/**
* PEAR::Log object for logging errors
* @var false|Log
* @access protected
*/
var $_logger = false;
-
+
/**
* Error messages - designed to be overridden
* @var array
* @abstract
*/
var $_errorMsgs = array();
-
+
/**
* Set up a new error stack
- *
+ *
* @param string $package name of the package this error stack represents
* @param callback $msgCallback callback used for error message generation
* @param callback $contextCallback callback used for context generation,
* defaults to {@link getFileLine()}
* @param boolean $throwPEAR_Error
*/
- function PEAR_ErrorStack($package, $msgCallback = false, $contextCallback = false,
+ function __construct($package, $msgCallback = false, $contextCallback = false,
$throwPEAR_Error = false)
{
$this->_package = $package;
@@ -250,12 +248,13 @@ class PEAR_ErrorStack {
* defaults to {@link getFileLine()}
* @param boolean $throwPEAR_Error
* @param string $stackClass class to instantiate
- * @static
+ *
* @return PEAR_ErrorStack
*/
- function &singleton($package, $msgCallback = false, $contextCallback = false,
- $throwPEAR_Error = false, $stackClass = 'PEAR_ErrorStack')
- {
+ public static function &singleton(
+ $package, $msgCallback = false, $contextCallback = false,
+ $throwPEAR_Error = false, $stackClass = 'PEAR_ErrorStack'
+ ) {
if (isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package];
}
@@ -297,15 +296,14 @@ class PEAR_ErrorStack {
/**
* Set up a PEAR::Log object for all error stacks that don't have one
* @param Log $log
- * @static
*/
- function setDefaultLogger(&$log)
+ public static function setDefaultLogger(&$log)
{
if (is_object($log) && method_exists($log, 'log') ) {
$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
} elseif (is_callable($log)) {
$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
- }
+ }
}
/**
@@ -358,9 +356,8 @@ class PEAR_ErrorStack {
* messages for a singleton
* @param array|string Callback function/method
* @param string Package name, or false for all packages
- * @static
*/
- function setDefaultCallback($callback = false, $package = false)
+ public static function setDefaultCallback($callback = false, $package = false)
{
if (!is_callable($callback)) {
$callback = false;
@@ -432,9 +429,8 @@ class PEAR_ErrorStack {
* @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
* @see staticPopCallback(), pushCallback()
* @param string|array $cb
- * @static
*/
- function staticPushCallback($cb)
+ public static function staticPushCallback($cb)
{
array_push($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'], $cb);
}
@@ -443,9 +439,8 @@ class PEAR_ErrorStack {
* Remove a temporary overriding error callback
* @see staticPushCallback()
* @return array|string|false
- * @static
*/
- function staticPopCallback()
+ public static function staticPopCallback()
{
$ret = array_pop($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK']);
if (!is_array($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'])) {
@@ -604,11 +599,11 @@ class PEAR_ErrorStack {
* to find error context
* @return PEAR_Error|array if compatibility mode is on, a PEAR_Error is also
* thrown. see docs for {@link push()}
- * @static
*/
- function staticPush($package, $code, $level = 'error', $params = array(),
- $msg = false, $repackage = false, $backtrace = false)
- {
+ public static function staticPush(
+ $package, $code, $level = 'error', $params = array(),
+ $msg = false, $repackage = false, $backtrace = false
+ ) {
$s = &PEAR_ErrorStack::singleton($package);
if ($s->_contextCallback) {
if (!$backtrace) {
@@ -750,9 +745,8 @@ class PEAR_ErrorStack {
* @param string|false Package name to check for errors
* @param string Level name to check for a particular severity
* @return boolean
- * @static
*/
- function staticHasErrors($package = false, $level = false)
+ public static function staticHasErrors($package = false, $level = false)
{
if ($package) {
if (!isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
@@ -776,12 +770,13 @@ class PEAR_ErrorStack {
* @param boolean $merge Set to return a flat array, not organized by package
* @param array $sortfunc Function used to sort a merged array - default
* sorts by time, and should be good for most cases
- * @static
+ *
* @return array
*/
- function staticGetErrors($purge = false, $level = false, $merge = false,
- $sortfunc = array('PEAR_ErrorStack', '_sortErrors'))
- {
+ public static function staticGetErrors(
+ $purge = false, $level = false, $merge = false,
+ $sortfunc = array('PEAR_ErrorStack', '_sortErrors')
+ ) {
$ret = array();
if (!is_callable($sortfunc)) {
$sortfunc = array('PEAR_ErrorStack', '_sortErrors');
@@ -806,7 +801,7 @@ class PEAR_ErrorStack {
* Error sorting function, sorts by time
* @access private
*/
- function _sortErrors($a, $b)
+ public static function _sortErrors($a, $b)
{
if ($a['time'] == $b['time']) {
return 0;
@@ -829,9 +824,8 @@ class PEAR_ErrorStack {
* @param unused
* @param integer backtrace frame.
* @param array Results of debug_backtrace()
- * @static
*/
- function getFileLine($code, $params, $backtrace = null)
+ public static function getFileLine($code, $params, $backtrace = null)
{
if ($backtrace === null) {
return false;
@@ -903,10 +897,10 @@ class PEAR_ErrorStack {
* @param PEAR_ErrorStack
* @param array
* @param string|false Pre-generated error message template
- * @static
+ *
* @return string
*/
- function getErrorMessage(&$stack, $err, $template = false)
+ public static function getErrorMessage(&$stack, $err, $template = false)
{
if ($template) {
$mainmsg = $template;
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Exception.php b/vendor/pear-pear.php.net/PEAR/PEAR/Exception.php
index 2990cb612a2527c5e7e7dce1b35fb58be6370bcd..0aba171041f0f97ac3ae3b801065071d38569124 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Exception.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Exception.php
@@ -13,7 +13,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.3.3
*/
@@ -89,7 +88,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.3.3
*
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/FixPHP5PEARWarnings.php b/vendor/pear-pear.php.net/PEAR/PEAR/FixPHP5PEARWarnings.php
deleted file mode 100644
index be5dc3ce707c3e06189b89395819ae49edbab19c..0000000000000000000000000000000000000000
--- a/vendor/pear-pear.php.net/PEAR/PEAR/FixPHP5PEARWarnings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-if ($skipmsg) {
- $a = &new $ec($code, $mode, $options, $userinfo);
-} else {
- $a = &new $ec($message, $code, $mode, $options, $userinfo);
-}
-?>
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Frontend.php b/vendor/pear-pear.php.net/PEAR/PEAR/Frontend.php
index 5a87d7a622f71c705979363b0d623a5da0ac77c3..8c8c8c6b47d36c1c21f7af68e689aa7348c5a499 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Frontend.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Frontend.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -39,7 +38,7 @@ $GLOBALS['_PEAR_FRONTEND_SINGLETON'] = null;
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -48,9 +47,8 @@ class PEAR_Frontend extends PEAR
/**
* Retrieve the frontend object
* @return PEAR_Frontend_CLI|PEAR_Frontend_Web|PEAR_Frontend_Gtk
- * @static
*/
- function &singleton($type = null)
+ public static function &singleton($type = null)
{
if ($type === null) {
if (!isset($GLOBALS['_PEAR_FRONTEND_SINGLETON'])) {
@@ -71,9 +69,8 @@ class PEAR_Frontend extends PEAR
* _ => DIRECTORY_SEPARATOR (PEAR_Frontend_CLI is in PEAR/Frontend/CLI.php)
* @param string $uiclass full class name
* @return PEAR_Frontend
- * @static
*/
- function &setFrontendClass($uiclass)
+ public static function &setFrontendClass($uiclass)
{
if (is_object($GLOBALS['_PEAR_FRONTEND_SINGLETON']) &&
is_a($GLOBALS['_PEAR_FRONTEND_SINGLETON'], $uiclass)) {
@@ -88,7 +85,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')) {
@@ -111,9 +108,8 @@ class PEAR_Frontend extends PEAR
* Frontends are expected to be a descendant of PEAR_Frontend
* @param PEAR_Frontend
* @return PEAR_Frontend
- * @static
*/
- function &setFrontendObject($uiobject)
+ public static function &setFrontendObject($uiobject)
{
if (is_object($GLOBALS['_PEAR_FRONTEND_SINGLETON']) &&
is_a($GLOBALS['_PEAR_FRONTEND_SINGLETON'], get_class($uiobject))) {
@@ -134,9 +130,8 @@ class PEAR_Frontend extends PEAR
/**
* @param string $path relative or absolute include path
* @return boolean
- * @static
*/
- function isIncludeable($path)
+ public static function isIncludeable($path)
{
if (file_exists($path) && is_readable($path)) {
return true;
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Frontend/CLI.php b/vendor/pear-pear.php.net/PEAR/PEAR/Frontend/CLI.php
index 06d9a2b72663911625df977526ad25c25085342e..f0723d039df32d38aea8a06397fc3b3475351ded 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Frontend/CLI.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Frontend/CLI.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -27,7 +26,7 @@ require_once 'PEAR/Frontend.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -47,9 +46,9 @@ class PEAR_Frontend_CLI extends PEAR_Frontend
'normal' => '',
);
- function PEAR_Frontend_CLI()
+ function __construct()
{
- parent::PEAR();
+ parent::__construct();
$term = getenv('TERM'); //(cox) $_ENV is empty for me in 4.1.1
if (function_exists('posix_isatty') && !posix_isatty(1)) {
// output is being redirected to a file or through a pipe
@@ -748,4 +747,4 @@ class PEAR_Frontend_CLI extends PEAR_Frontend
{
print $text;
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer.php
index 1037ee929a61acb59a163b190c91690f9c7a3b61..d5cc7df6920cd8d213c87dadf29f9e871034bb54 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer.php
@@ -12,7 +12,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -36,7 +35,7 @@ define('PEAR_INSTALLER_NOBINARY', -240);
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -116,9 +115,9 @@ class PEAR_Installer extends PEAR_Downloader
*
* @access public
*/
- function PEAR_Installer(&$ui)
+ function __construct(&$ui)
{
- parent::PEAR_Common();
+ parent::__construct($ui, array(), null);
$this->setFrontendObject($ui);
$this->debug = $this->config->get('verbose');
}
@@ -589,7 +588,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);
@@ -1020,42 +1019,6 @@ class PEAR_Installer extends PEAR_Downloader
return parent::mkDirHier($dir);
}
- // }}}
- // {{{ download()
-
- /**
- * Download any files and their dependencies, if necessary
- *
- * @param array a mixed list of package names, local files, or package.xml
- * @param PEAR_Config
- * @param array options from the command line
- * @param array this is the array that will be populated with packages to
- * install. Format of each entry:
- *
- * <code>
- * array('pkg' => 'package_name', 'file' => '/path/to/local/file',
- * 'info' => array() // parsed package.xml
- * );
- * </code>
- * @param array this will be populated with any error messages
- * @param false private recursion variable
- * @param false private recursion variable
- * @param false private recursion variable
- * @deprecated in favor of PEAR_Downloader
- */
- function download($packages, $options, &$config, &$installpackages,
- &$errors, $installed = false, $willinstall = false, $state = false)
- {
- // trickiness: initialize here
- parent::PEAR_Downloader($this->ui, $options, $config);
- $ret = parent::download($packages);
- $errors = $this->getErrorMsgs();
- $installpackages = $this->getDownloadedPackages();
- trigger_error("PEAR Warning: PEAR_Installer::download() is deprecated " .
- "in favor of PEAR_Downloader class", E_USER_WARNING);
- return $ret;
- }
-
// }}}
// {{{ _parsePackageXml()
@@ -1165,15 +1128,6 @@ class PEAR_Installer extends PEAR_Downloader
$pkgname = $pkg->getName();
$channel = $pkg->getChannel();
- if (isset($this->_options['packagingroot'])) {
- $regdir = $this->_prependPath(
- $this->config->get('php_dir', null, 'pear.php.net'),
- $this->_options['packagingroot']);
-
- $packrootphp_dir = $this->_prependPath(
- $this->config->get('php_dir', null, $channel),
- $this->_options['packagingroot']);
- }
if (isset($options['installroot'])) {
$this->config->setInstallRoot($options['installroot']);
@@ -1185,7 +1139,21 @@ 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);
+ $regdir = $this->_prependPath(
+ $this->config->get('php_dir', null, 'pear.php.net'),
+ $this->_options['packagingroot']);
+
+ $metadata_dir = $this->config->get('metadata_dir', null, 'pear.php.net');
+ if ($metadata_dir) {
+ $metadata_dir = $this->_prependPath(
+ $metadata_dir,
+ $this->_options['packagingroot']);
+ }
+ $packrootphp_dir = $this->_prependPath(
+ $this->config->get('php_dir', null, $channel),
+ $this->_options['packagingroot']);
+
+ $installregistry = new PEAR_Registry($regdir, false, false, $metadata_dir);
if (!$installregistry->channelExists($channel, true)) {
// we need to fake a channel-discover of this channel
$chanobj = $this->_registry->getChannel($channel, true);
@@ -1274,7 +1242,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);
}
@@ -1538,7 +1506,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)) {
@@ -1682,7 +1650,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);
@@ -1823,4 +1791,4 @@ class PEAR_Installer extends PEAR_Downloader
}
// }}}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role.php
index 5cc7a33f00c1f41aedec46a75082a1c37d45e575..0623424a2e51e5ca51d950d7f96c9acc1ab194d0 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -25,7 +24,7 @@ require_once 'PEAR/XMLParser.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -36,10 +35,8 @@ class PEAR_Installer_Role
*
* Never call this directly, it is called by the PEAR_Config constructor
* @param PEAR_Config
- * @access private
- * @static
*/
- function initializeConfig(&$config)
+ public static function initializeConfig(&$config)
{
if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
PEAR_Installer_Role::registerRoles();
@@ -59,9 +56,8 @@ class PEAR_Installer_Role
* @param string role name
* @param PEAR_Config
* @return PEAR_Installer_Role_Common
- * @static
*/
- function &factory($pkg, $role, &$config)
+ public static function &factory($pkg, $role, &$config)
{
if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
PEAR_Installer_Role::registerRoles();
@@ -88,9 +84,8 @@ class PEAR_Installer_Role
* @param string
* @param bool clear cache
* @return array
- * @static
*/
- function getValidRoles($release, $clear = false)
+ public static function getValidRoles($release, $clear = false)
{
if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
PEAR_Installer_Role::registerRoles();
@@ -123,9 +118,8 @@ class PEAR_Installer_Role
* roles are actually fully bundled releases of a package
* @param bool clear cache
* @return array
- * @static
*/
- function getInstallableRoles($clear = false)
+ public static function getInstallableRoles($clear = false)
{
if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
PEAR_Installer_Role::registerRoles();
@@ -158,9 +152,8 @@ class PEAR_Installer_Role
* so a tests file tests/file.phpt is installed into PackageName/tests/filepath.php
* @param bool clear cache
* @return array
- * @static
*/
- function getBaseinstallRoles($clear = false)
+ public static function getBaseinstallRoles($clear = false)
{
if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
PEAR_Installer_Role::registerRoles();
@@ -190,9 +183,8 @@ class PEAR_Installer_Role
* like the "php" role.
* @param bool clear cache
* @return array
- * @static
*/
- function getPhpRoles($clear = false)
+ public static function getPhpRoles($clear = false)
{
if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
PEAR_Installer_Role::registerRoles();
@@ -226,10 +218,8 @@ class PEAR_Installer_Role
* included.
*
* @return bool TRUE on success, a PEAR error on failure
- * @access public
- * @static
*/
- function registerRoles($dir = null)
+ public static function registerRoles($dir = null)
{
$GLOBALS['_PEAR_INSTALLER_ROLES'] = array();
$parser = new PEAR_XMLParser;
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Cfg.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Cfg.php
index 0945f83c6caf99545fd9433056f4132130ba0d03..903b1d6415970fd8ef2d0d9efc33457140ac2afb 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Cfg.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Cfg.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 2007-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.7.0
*/
@@ -20,7 +19,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 2007-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.7.0
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Common.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Common.php
index 837799d815ff12346720f56ccb909176af032a60..df0b3c66cef0621403be809cfa1efde8786520a5 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Common.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Common.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2006 The PHP Group
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -24,7 +23,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2006 The PHP Group
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -39,7 +38,7 @@ class PEAR_Installer_Role_Common
/**
* @param PEAR_Config
*/
- function PEAR_Installer_Role_Common(&$config)
+ function __construct(&$config)
{
$this->config = $config;
}
@@ -171,4 +170,4 @@ class PEAR_Installer_Role_Common
return $roleInfo['phpextension'];
}
}
-?>
\ No newline at end of file
+?>
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Data.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Data.php
index 79498c48d64bc18e2ba045af14564a32827b8ffa..1a2c9c30cb446b91ae14dd81d9aefb823bf2cdd0 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Data.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Data.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -20,7 +19,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Doc.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Doc.php
index 7e58876c4bb0cbf157b1d12a5e74bacd814ad277..675cc87775438cbdd7247ecea6be646d6240f70e 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Doc.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Doc.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -20,7 +19,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Ext.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Ext.php
index 5854320480564c597ce373d68062e940be51a38c..6224e2b8922d96a17e4b2435f891cdf4ff0bb310 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Ext.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Ext.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -20,7 +19,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Man.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Man.php
new file mode 100644
index 0000000000000000000000000000000000000000..5c3a842b8f1d89db7c17bce4bbe152b25729252e
--- /dev/null
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Man.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * PEAR_Installer_Role_Man
+ *
+ * PHP versions 4 and 5
+ *
+ * @category pear
+ * @package PEAR
+ * @author Hannes Magnusson <bjori@php.net>
+ * @copyright 2011 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version SVN: $Id: $
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 1.10.0
+ */
+
+/**
+ * @category pear
+ * @package PEAR
+ * @author Hannes Magnusson <bjori@php.net>
+ * @copyright 2011 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version Release: 1.10.1
+ * @link http://pear.php.net/package/PEAR
+ * @since Class available since Release 1.10.0
+ */
+class PEAR_Installer_Role_Man extends PEAR_Installer_Role_Common {}
+?>
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Man.xml b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Man.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ec2bd76c35badfe3186d463757bf8cdf1a2fa0b5
--- /dev/null
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Man.xml
@@ -0,0 +1,15 @@
+<role version="1.0">
+ <releasetypes>php</releasetypes>
+ <releasetypes>extsrc</releasetypes>
+ <releasetypes>extbin</releasetypes>
+ <releasetypes>zendextsrc</releasetypes>
+ <releasetypes>zendextbin</releasetypes>
+ <installable>1</installable>
+ <locationconfig>man_dir</locationconfig>
+ <honorsbaseinstall>1</honorsbaseinstall>
+ <unusualbaseinstall />
+ <phpfile />
+ <executable />
+ <phpextension />
+ <config_vars />
+</role>
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Php.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Php.php
index fa11b9259b8162657614dce1ad8aace667d9e2be..d1b97a8635ef94fb8c8237abf32528145cab4701 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Php.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Php.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -20,7 +19,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Script.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Script.php
index f758c8eda09d9fbd9c980c655d56ef6a510dd148..f1eeda0b6e874b9ba5093491e0373f62062de401 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Script.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Script.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -20,7 +19,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Src.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Src.php
index aca36361f41eea57dccb6b17c36173e126bba53d..2c7ae21422c7f72d0f092ce115894ca772d25ed9 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Src.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Src.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -20,7 +19,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Test.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Test.php
index 5f513a6655d0d4e3fc354ea9c24b1d7eb7c823b4..c19c5dc0608142e465da763d61e678138a1a5281 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Test.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Test.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -20,7 +19,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Www.php b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Www.php
index 6b1c3818d48a664d531792f44a45b44c1668e875..42b197a90ab1c289c8ceb18446cbd56d0008f30c 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Www.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Installer/Role/Www.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 2007-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.7.0
*/
@@ -20,7 +19,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 2007-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.7.0
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile.php b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile.php
index 9f90d6f21386419d871c635bc044371d6542c353..8fb6e41fa4cc185f1911e713d241d2478fd022e7 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -35,7 +34,7 @@ define('PEAR_PACKAGEFILE_ERROR_INVALID_PACKAGEVERSION', 2);
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -67,7 +66,7 @@ class PEAR_PackageFile
* @param string @tmpdir Optional temporary directory for uncompressing
* files
*/
- function PEAR_PackageFile(&$config, $debug = false)
+ function __construct(&$config, $debug = false)
{
$this->_config = $config;
$this->_debug = $debug;
@@ -489,4 +488,4 @@ class PEAR_PackageFile
$info = PEAR::raiseError("Cannot open '$info' for parsing");
return $info;
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Generator/v1.php b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Generator/v1.php
index 5368e9c2c127515b122262c4fc889ae4f28b1e25..5a963787ccbde6758c671d61017132157c25e0da 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Generator/v1.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Generator/v1.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -29,7 +28,7 @@ require_once 'PEAR/PackageFile/v2.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -39,14 +38,14 @@ class PEAR_PackageFile_Generator_v1
* @var PEAR_PackageFile_v1
*/
var $_packagefile;
- function PEAR_PackageFile_Generator_v1(&$packagefile)
+ function __construct(&$packagefile)
{
$this->_packagefile = &$packagefile;
}
function getPackagerVersion()
{
- return '1.9.5';
+ return '1.10.1';
}
/**
@@ -109,7 +108,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);
@@ -168,9 +167,6 @@ class PEAR_PackageFile_Generator_v1
*/
function _fixXmlEncoding($string)
{
- if (version_compare(phpversion(), '5.0.0', 'lt')) {
- $string = utf8_encode($string);
- }
return strtr($string, array(
'&' => '&',
'>' => '>',
@@ -200,7 +196,7 @@ class PEAR_PackageFile_Generator_v1
);
$ret = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n";
$ret .= "<!DOCTYPE package SYSTEM \"http://pear.php.net/dtd/package-1.0\">\n";
- $ret .= "<package version=\"1.0\" packagerversion=\"1.9.5\">\n" .
+ $ret .= "<package version=\"1.0\" packagerversion=\"1.10.1\">\n" .
" <name>$pkginfo[package]</name>";
if (isset($pkginfo['extends'])) {
$ret .= "\n<extends>$pkginfo[extends]</extends>";
@@ -1178,13 +1174,15 @@ class PEAR_PackageFile_Generator_v1
}
if (count($min)) {
// get the highest minimum
- $min = array_pop($a = array_flip($min));
+ $a = array_flip($min);
+ $min = array_pop($a);
} else {
$min = false;
}
if (count($max)) {
// get the lowest maximum
- $max = array_shift($a = array_flip($max));
+ $a = array_flip($max);
+ $max = array_shift($a);
} else {
$max = false;
}
@@ -1250,13 +1248,15 @@ class PEAR_PackageFile_Generator_v1
}
if (count($min)) {
// get the highest minimum
- $min = array_pop($a = array_flip($min));
+ $a = array_flip($min);
+ $min = array_pop($a);
} else {
$min = false;
}
if (count($max)) {
// get the lowest maximum
- $max = array_shift($a = array_flip($max));
+ $a = array_flip($max);
+ $max = array_shift($a);
} else {
$max = false;
}
@@ -1281,4 +1281,4 @@ class PEAR_PackageFile_Generator_v1
return $ret;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Generator/v2.php b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Generator/v2.php
index 889548da25d6f1681b04a25cdcccb1b6144786ae..24e89f3aaa71cd2917f4c29a88f14d761ca33201 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Generator/v2.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Generator/v2.php
@@ -10,7 +10,6 @@
* @author Stephan Schmidt (original XML_Serializer code)
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -31,7 +30,7 @@ require_once 'XML/Util.php';
* @author Stephan Schmidt (original XML_Serializer code)
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -100,7 +99,7 @@ http://pear.php.net/dtd/package-2.0.xsd',
/**
* @param PEAR_PackageFile_v2
*/
- function PEAR_PackageFile_Generator_v2(&$packagefile)
+ function __construct(&$packagefile)
{
$this->_packagefile = &$packagefile;
if (isset($this->_packagefile->encoding)) {
@@ -113,7 +112,7 @@ http://pear.php.net/dtd/package-2.0.xsd',
*/
function getPackagerVersion()
{
- return '1.9.5';
+ return '1.10.1';
}
/**
@@ -232,7 +231,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);
@@ -269,7 +268,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);
@@ -398,7 +397,7 @@ http://pear.php.net/dtd/package-2.0.xsd',
$this->options['beautifyFilelist'] = true;
}
- $arr['attribs']['packagerversion'] = '1.9.5';
+ $arr['attribs']['packagerversion'] = '1.10.1';
if ($this->serialize($arr, $options)) {
return $this->_serializedData . "\n";
}
@@ -869,12 +868,6 @@ http://pear.php.net/dtd/package-2.0.xsd',
}
if (is_scalar($tag['content']) || is_null($tag['content'])) {
- if ($this->options['encoding'] == 'UTF-8' &&
- version_compare(phpversion(), '5.0.0', 'lt')
- ) {
- $tag['content'] = utf8_encode($tag['content']);
- }
-
if ($replaceEntities === true) {
$replaceEntities = XML_UTIL_ENTITIES_XML;
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Parser/v1.php b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Parser/v1.php
index bbf5989e8c47e5ff0045a9ba5f7607c123f77068..8e08e0b424f65775463af572622bd1687388184c 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Parser/v1.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Parser/v1.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -91,7 +90,7 @@ class PEAR_PackageFile_Parser_v1
$code = xml_get_error_code($xp);
$line = xml_get_current_line_number($xp);
xml_parser_free($xp);
- $a = &PEAR::raiseError(sprintf("XML error: %s at line %d",
+ $a = PEAR::raiseError(sprintf("XML error: %s at line %d",
$str = xml_error_string($code), $line), 2);
return $a;
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Parser/v2.php b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Parser/v2.php
index cb8104102e5052d40bbd836b74738b9da69e2cc0..49a29f1aa2f711366b9a81652770a3c8a1bd35ed 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Parser/v2.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/Parser/v2.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -93,9 +92,9 @@ class PEAR_PackageFile_Parser_v2 extends PEAR_XMLParser
* a subclass
* @return PEAR_PackageFile_v2
*/
- function &parse($data, $file, $archive = false, $class = 'PEAR_PackageFile_v2')
+ function parse($data, $file = null, $archive = false, $class = 'PEAR_PackageFile_v2')
{
- if (PEAR::isError($err = parent::parse($data, $file))) {
+ if (PEAR::isError($err = parent::parse($data))) {
return $err;
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v1.php b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v1.php
index ecff288a8b8cfbacfcd36b59c5d8347a6967bc9f..413db67d1d290b948bbb3ccd1fd04b5ea36fd9d9 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v1.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v1.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -275,7 +274,7 @@ define('PEAR_PACKAGEFILE_ERROR_INVALID_FILENAME', 52);
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -346,9 +345,9 @@ class PEAR_PackageFile_v1
* @param bool determines whether to return a PEAR_Error object, or use the PEAR_ErrorStack
* @param string Name of Error Stack class to use.
*/
- function PEAR_PackageFile_v1()
+ function __construct()
{
- $this->_stack = &new PEAR_ErrorStack('PEAR_PackageFile_v1');
+ $this->_stack = new PEAR_ErrorStack('PEAR_PackageFile_v1');
$this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
$this->_isValid = 0;
}
@@ -1308,7 +1307,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;
}
@@ -1331,7 +1330,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;
@@ -1466,15 +1465,6 @@ class PEAR_PackageFile_v1
$look_for = $token;
continue 2;
case T_STRING:
- if (version_compare(zend_version(), '2.0', '<')) {
- if (in_array(strtolower($data),
- array('public', 'private', 'protected', 'abstract',
- 'interface', 'implements', 'throw')
- )) {
- $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_PHP5,
- array($file));
- }
- }
if ($look_for == T_CLASS) {
$current_class = $data;
$current_class_level = $brace_level;
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2.php b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2.php
index 025d6e8291fe7bc6cce74d0cbd8e26d9883b90b3..ae0a1fa891ccdca97486b7b2c365faad1e15ba68 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -23,7 +22,7 @@ require_once 'PEAR/ErrorStack.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -129,12 +128,21 @@ class PEAR_PackageFile_v2
/**
* The constructor merely sets up the private error stack
*/
- function PEAR_PackageFile_v2()
+ function __construct()
{
$this->_stack = new PEAR_ErrorStack('PEAR_PackageFile_v2', false, null);
$this->_isValid = false;
}
+ /**
+ * PHP 4 style constructor for backwards compatibility.
+ * Used by PEAR_PackageFileManager2
+ */
+ public function PEAR_PackageFile_v2()
+ {
+ $this->__construct();
+ }
+
/**
* To make unit-testing easier
* @param PEAR_Frontend_*
@@ -145,7 +153,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;
}
@@ -163,7 +171,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;
}
@@ -564,7 +572,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'];
}
@@ -610,7 +618,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
}
@@ -1177,6 +1185,9 @@ class PEAR_PackageFile_v2
$contents['dir']['file'] = array($contents['dir']['file']);
}
foreach ($contents['dir']['file'] as $file) {
+ if (!isset($file['attribs']['name'])) {
+ continue;
+ }
$name = $file['attribs']['name'];
if (!$preserve) {
$file = $file['attribs'];
@@ -1854,7 +1865,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;
@@ -1893,7 +1904,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;
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2/Validator.php b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2/Validator.php
index 8444afb6ea74502a19d941d61097b01ee394b1c8..eff9d03ca6b684a131490f1a19eebffe3125914f 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2/Validator.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2/Validator.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a8
*/
@@ -21,7 +20,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a8
* @access private
@@ -112,7 +111,8 @@ class PEAR_PackageFile_v2_Validator
isset($test['dependencies']['required']) &&
isset($test['dependencies']['required']['pearinstaller']) &&
isset($test['dependencies']['required']['pearinstaller']['min']) &&
- version_compare('1.9.5',
+ '1.10.1' != '@package' . '_version@' &&
+ version_compare('1.10.1',
$test['dependencies']['required']['pearinstaller']['min'], '<')
) {
$this->_pearVersionTooLow($test['dependencies']['required']['pearinstaller']['min']);
@@ -1350,7 +1350,7 @@ class PEAR_PackageFile_v2_Validator
$this->_stack->push(__FUNCTION__, 'error',
array('version' => $version),
'This package.xml requires PEAR version %version% to parse properly, we are ' .
- 'version 1.9.5');
+ 'version 1.10.1');
}
function _invalidTagOrder($oktags, $actual, $root)
@@ -1737,7 +1737,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);
@@ -1980,25 +1980,6 @@ class PEAR_PackageFile_v2_Validator
$look_for = $token;
continue 2;
case T_STRING:
- if (version_compare(zend_version(), '2.0', '<')) {
- if (in_array(strtolower($data),
- array('public', 'private', 'protected', 'abstract',
- 'interface', 'implements', 'throw')
- )
- ) {
- if (isset($this->_stack)) {
- $this->_stack->push(__FUNCTION__, 'warning', array(
- 'file' => $file),
- 'Error, PHP5 token encountered in %file%,' .
- ' analysis should be in PHP5');
- } else {
- PEAR::raiseError('Error: PHP5 token encountered in ' . $file .
- 'packaging should be done in PHP 5');
- return false;
- }
- }
- }
-
if ($look_for == T_CLASS) {
$current_class = $data;
$current_class_level = $brace_level;
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2/rw.php b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2/rw.php
index 5680d8a7194f868bee8061484826e70f09d72d1b..f2b58e3964d374ec1b4cefd57612c64fa4a18348 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2/rw.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/PackageFile/v2/rw.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a8
*/
@@ -23,7 +22,7 @@ require_once 'PEAR/PackageFile/v2.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a8
*/
@@ -242,7 +241,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;
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Packager.php b/vendor/pear-pear.php.net/PEAR/PEAR/Packager.php
index 5172790fba9d72d3d1b46e5b15378a3d598c5bcb..3303f4c10dddcd16385a6b8e98f827b6435e762d 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Packager.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Packager.php
@@ -11,7 +11,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -31,7 +30,7 @@ require_once 'System.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
*/
@@ -50,7 +49,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();
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/REST.php b/vendor/pear-pear.php.net/PEAR/PEAR/REST.php
index 4b1797b9bdc4ac255eb49c6829054665a11dd8d5..c0dfeaa6983f4bfc3977563fdc92073d4cc2d3b8 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/REST.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/REST.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -28,7 +27,7 @@ require_once 'PEAR/XMLParser.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -37,7 +36,7 @@ class PEAR_REST
var $config;
var $_options;
- function PEAR_REST(&$config, $options = array())
+ function __construct(&$config, $options = array())
{
$this->config = &$config;
$this->_options = $options;
@@ -236,6 +235,13 @@ class PEAR_REST
}
}
+ if (!is_writeable($cache_dir)) {
+ // If writing to the cache dir is not going to work, silently do nothing.
+ // An ugly hack, but retains compat with PEAR 1.9.1 where many commands
+ // work fine as non-root user (w/out write access to default cache dir).
+ return true;
+ }
+
if ($cacheid === null && $nochange) {
$cacheid = unserialize(implode('', file($cacheidfile)));
}
@@ -390,7 +396,7 @@ class PEAR_REST
}
$request .= $ifmodifiedsince .
- "User-Agent: PEAR/1.9.5/PHP/" . PHP_VERSION . "\r\n";
+ "User-Agent: PEAR/1.10.1/PHP/" . PHP_VERSION . "\r\n";
$username = $this->config->get('username', null, $channel);
$password = $this->config->get('password', null, $channel);
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/REST/10.php b/vendor/pear-pear.php.net/PEAR/PEAR/REST/10.php
index 563577a1c7f96cdc20c47f94e4ea1f28637726a1..affcc18ee2a1befaea4e9f7f65b2484beab68bf9 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/REST/10.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/REST/10.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a12
*/
@@ -27,7 +26,7 @@ require_once 'PEAR/REST.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a12
*/
@@ -37,9 +36,9 @@ class PEAR_REST_10
* @var PEAR_REST
*/
var $_rest;
- function PEAR_REST_10($config, $options = array())
+ function __construct($config, $options = array())
{
- $this->_rest = &new PEAR_REST($config, $options);
+ $this->_rest = new PEAR_REST($config, $options);
}
/**
@@ -868,4 +867,4 @@ class PEAR_REST_10
return 1;
}
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/REST/11.php b/vendor/pear-pear.php.net/PEAR/PEAR/REST/11.php
index f6e365d39d52d19b614dbfda9494fddae220622f..9bd51ba6f5d6f65acc6c6d482e946d5a1346fe45 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/REST/11.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/REST/11.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.3
*/
@@ -27,7 +26,7 @@ require_once 'PEAR/REST.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.3
*/
@@ -38,9 +37,9 @@ class PEAR_REST_11
*/
var $_rest;
- function PEAR_REST_11($config, $options = array())
+ function __construct($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)
@@ -338,4 +337,4 @@ class PEAR_REST_11
return array_slice($states, $i + 1);
}
}
-?>
\ No newline at end of file
+?>
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/REST/13.php b/vendor/pear-pear.php.net/PEAR/PEAR/REST/13.php
index 7911e49f088b7c7e029d8ea1fe62bbfdb93d4c4e..3855c6e05995a91b0f7541b67f3fe977b76d73b4 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/REST/13.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/REST/13.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a12
*/
@@ -28,7 +27,7 @@ require_once 'PEAR/REST/10.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a12
*/
@@ -296,4 +295,102 @@ class PEAR_REST_13 extends PEAR_REST_10
return $this->_returnDownloadURL($base, $package, $release, $info, $found, $skippedphp, $channel);
}
+
+ /**
+ * List package upgrades but take the PHP version into account.
+ */
+ function listLatestUpgrades($base, $pref_state, $installed, $channel, &$reg)
+ {
+ $packagelist = $this->_rest->retrieveData($base . 'p/packages.xml', false, false, $channel);
+ if (PEAR::isError($packagelist)) {
+ return $packagelist;
+ }
+
+ $ret = array();
+ if (!is_array($packagelist) || !isset($packagelist['p'])) {
+ return $ret;
+ }
+
+ if (!is_array($packagelist['p'])) {
+ $packagelist['p'] = array($packagelist['p']);
+ }
+
+ foreach ($packagelist['p'] as $package) {
+ if (!isset($installed[strtolower($package)])) {
+ continue;
+ }
+
+ $inst_version = $reg->packageInfo($package, 'version', $channel);
+ $inst_state = $reg->packageInfo($package, 'release_state', $channel);
+ PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
+ $info = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
+ '/allreleases2.xml', false, false, $channel);
+ PEAR::popErrorHandling();
+ if (PEAR::isError($info)) {
+ continue; // no remote releases
+ }
+
+ if (!isset($info['r'])) {
+ continue;
+ }
+
+ $release = $found = false;
+ if (!is_array($info['r']) || !isset($info['r'][0])) {
+ $info['r'] = array($info['r']);
+ }
+
+ // $info['r'] is sorted by version number
+ usort($info['r'], array($this, '_sortReleasesByVersionNumber'));
+ foreach ($info['r'] as $release) {
+ if ($inst_version && version_compare($release['v'], $inst_version, '<=')) {
+ // not newer than the one installed
+ break;
+ }
+ if (version_compare($release['m'], phpversion(), '>')) {
+ // skip dependency releases that require a PHP version
+ // newer than our PHP version
+ continue;
+ }
+
+ // new version > installed version
+ if (!$pref_state) {
+ // every state is a good state
+ $found = true;
+ break;
+ } else {
+ $new_state = $release['s'];
+ // if new state >= installed state: go
+ if (in_array($new_state, $this->betterStates($inst_state, true))) {
+ $found = true;
+ break;
+ } else {
+ // only allow to lower the state of package,
+ // if new state >= preferred state: go
+ if (in_array($new_state, $this->betterStates($pref_state, true))) {
+ $found = true;
+ break;
+ }
+ }
+ }
+ }
+
+ if (!$found) {
+ continue;
+ }
+
+ $relinfo = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package) . '/' .
+ $release['v'] . '.xml', false, false, $channel);
+ if (PEAR::isError($relinfo)) {
+ return $relinfo;
+ }
+
+ $ret[$package] = array(
+ 'version' => $release['v'],
+ 'state' => $release['s'],
+ 'filesize' => $relinfo['f'],
+ );
+ }
+
+ return $ret;
+ }
}
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Registry.php b/vendor/pear-pear.php.net/PEAR/PEAR/Registry.php
index 06fed47fcff5444837fa3b73932cbf434c4598d5..c22d82f4a26301a76a358ec40a9fb201a2304b30 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Registry.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Registry.php
@@ -11,7 +11,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -37,7 +36,7 @@ define('PEAR_REGISTRY_ERROR_CHANNEL_FILE', -6);
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -131,24 +130,27 @@ class PEAR_Registry extends PEAR
*
* @access public
*/
- function PEAR_Registry($pear_install_dir = PEAR_INSTALL_DIR, $pear_channel = false,
- $pecl_channel = false)
+ function __construct($pear_install_dir = PEAR_INSTALL_DIR, $pear_channel = false,
+ $pecl_channel = false, $pear_metadata_dir = '')
{
- parent::PEAR();
- $this->setInstallDir($pear_install_dir);
+ parent::__construct();
+ $this->setInstallDir($pear_install_dir, $pear_metadata_dir);
$this->_pearChannel = $pear_channel;
$this->_peclChannel = $pecl_channel;
$this->_config = false;
}
- function setInstallDir($pear_install_dir = PEAR_INSTALL_DIR)
+ function setInstallDir($pear_install_dir = PEAR_INSTALL_DIR, $pear_metadata_dir = '')
{
$ds = DIRECTORY_SEPARATOR;
$this->install_dir = $pear_install_dir;
- $this->channelsdir = $pear_install_dir.$ds.'.channels';
- $this->statedir = $pear_install_dir.$ds.'.registry';
- $this->filemap = $pear_install_dir.$ds.'.filemap';
- $this->lockfile = $pear_install_dir.$ds.'.lock';
+ if (!$pear_metadata_dir) {
+ $pear_metadata_dir = $pear_install_dir;
+ }
+ $this->channelsdir = $pear_metadata_dir.$ds.'.channels';
+ $this->statedir = $pear_metadata_dir.$ds.'.registry';
+ $this->filemap = $pear_metadata_dir.$ds.'.filemap';
+ $this->lockfile = $pear_metadata_dir.$ds.'.lock';
}
function hasWriteAccess()
@@ -181,7 +183,7 @@ class PEAR_Registry extends PEAR
{
$this->_config = &$config;
if ($resetInstallDir) {
- $this->setInstallDir($config->get('php_dir'));
+ $this->setInstallDir($config->get('php_dir'), $config->get('metadata_dir'));
}
}
@@ -319,7 +321,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);
@@ -328,9 +330,9 @@ class PEAR_Registry extends PEAR
$this->_dependencyDB = &PEAR_DependencyDB::singleton($this->_config);
if (PEAR::isError($this->_dependencyDB)) {
// attempt to recover by removing the dep db
- if (file_exists($this->_config->get('php_dir', null, 'pear.php.net') .
+ if (file_exists($this->_config->get('metadata_dir', null, 'pear.php.net') .
DIRECTORY_SEPARATOR . '.depdb')) {
- @unlink($this->_config->get('php_dir', null, 'pear.php.net') .
+ @unlink($this->_config->get('metadata_dir', null, 'pear.php.net') .
DIRECTORY_SEPARATOR . '.depdb');
}
@@ -782,12 +784,9 @@ class PEAR_Registry extends PEAR
}
clearstatcache();
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
$fsize = filesize($this->filemap);
fclose($fp);
$data = file_get_contents($this->filemap);
- 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);
@@ -1136,12 +1135,9 @@ class PEAR_Registry extends PEAR
return null;
}
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
clearstatcache();
$this->_closePackageFile($fp);
$data = file_get_contents($this->_packageFileName($package, $channel));
- set_magic_quotes_runtime($rt);
$data = unserialize($data);
if ($key === null) {
return $data;
@@ -1175,12 +1171,9 @@ class PEAR_Registry extends PEAR
return null;
}
- $rt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
clearstatcache();
$this->_closeChannelFile($fp);
$data = file_get_contents($this->_channelFileName($channel));
- set_magic_quotes_runtime($rt);
$data = unserialize($data);
return $data;
}
@@ -1447,7 +1440,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);
}
@@ -1455,7 +1448,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;
}
@@ -1934,12 +1927,12 @@ class PEAR_Registry extends PEAR
* @param bool whether to strictly return raw channels (no aliases)
* @return PEAR_ChannelFile|PEAR_Error
*/
- function &getChannel($channel, $noaliases = false)
+ function getChannel($channel, $noaliases = false)
{
if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
return $e;
}
- $ret = &$this->_getChannel($channel, $noaliases);
+ $ret = $this->_getChannel($channel, $noaliases);
$this->_unlock();
if (!$ret) {
return PEAR::raiseError('Unknown channel: ' . $channel);
@@ -2392,4 +2385,4 @@ class PEAR_Registry extends PEAR
}
return $ret;
}
-}
\ No newline at end of file
+}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/RunTest.php b/vendor/pear-pear.php.net/PEAR/PEAR/RunTest.php
index 260fc6e46beb8e3fbf9e71ddbe1862edff96782d..59dedbf9bf263a74336b67411990014a35fa9c7d 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/RunTest.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/RunTest.php
@@ -10,7 +10,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.3.3
*/
@@ -38,7 +37,7 @@ putenv("PHP_PEAR_RUNTESTS=1");
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.3.3
*/
@@ -60,7 +59,6 @@ class PEAR_RunTest
var $ini_overwrites = array(
'output_handler=',
'open_basedir=',
- 'safe_mode=0',
'disable_functions=',
'output_buffering=Off',
'display_errors=1',
@@ -75,7 +73,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',
);
@@ -84,7 +81,7 @@ class PEAR_RunTest
* An object that supports the PEAR_Common->log() signature, or null
* @param PEAR_Common|null
*/
- function PEAR_RunTest($logger = null, $options = array())
+ function __construct($logger = null, $options = array())
{
if (!defined('E_DEPRECATED')) {
define('E_DEPRECATED', 0);
@@ -115,19 +112,11 @@ class PEAR_RunTest
function system_with_timeout($commandline, $env = null, $stdin = null)
{
$data = '';
- if (version_compare(phpversion(), '5.0.0', '<')) {
- $proc = proc_open($commandline, array(
- 0 => array('pipe', 'r'),
- 1 => array('pipe', 'w'),
- 2 => array('pipe', 'w')
- ), $pipes);
- } else {
- $proc = proc_open($commandline, array(
- 0 => array('pipe', 'r'),
- 1 => array('pipe', 'w'),
- 2 => array('pipe', 'w')
- ), $pipes, null, $env, array('suppress_errors' => true));
- }
+ $proc = proc_open($commandline, array(
+ 0 => array('pipe', 'r'),
+ 1 => array('pipe', 'w'),
+ 2 => array('pipe', 'w')
+ ), $pipes, null, $env, array('suppress_errors' => true));
if (!$proc) {
return false;
@@ -231,12 +220,7 @@ class PEAR_RunTest
function _preparePhpBin($php, $file, $ini_settings)
{
$file = escapeshellarg($file);
- // This was fixed in php 5.3 and is not needed after that
- if (OS_WINDOWS && version_compare(PHP_VERSION, '5.3', '<')) {
- $cmd = '"'.escapeshellarg($php).' '.$ini_settings.' -f ' . $file .'"';
- } else {
- $cmd = $php . $ini_settings . ' -f ' . $file;
- }
+ $cmd = $php . $ini_settings . ' -f ' . $file;
return $cmd;
}
@@ -638,6 +622,11 @@ class PEAR_RunTest
$expectf = isset($section_text['EXPECTF']) ? $wanted_re : null;
$data = $this->generate_diff($wanted, $output, $returns, $expectf);
$res = $this->_writeLog($diff_filename, $data);
+ if (isset($this->_options['showdiff'])) {
+ $this->_logger->log(0, "========DIFF========");
+ $this->_logger->log(0, $data);
+ $this->_logger->log(0, "========DONE========");
+ }
if (PEAR::isError($res)) {
return $res;
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Common.php b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Common.php
index a091ed4eab205a4e9db0c9a277273f27642eb2ca..ebb71dc8a83365360aefe5bb006353ab8d011936 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Common.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Common.php
@@ -4,14 +4,13 @@
*
* PHP versions 4 and 5
*
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 1.4.0a1
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 1.4.0a1
*/
/**#@+
* Error codes for task validation routines
@@ -42,14 +41,15 @@ define('PEAR_TASK_PACKAGEANDINSTALL', 3);
* This will first replace any instance of @data-dir@ in the test.php file
* with the path to the current data directory. Then, it will include the
* test.php file and run the script it contains to configure the package post-installation.
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
- * @link http://pear.php.net/package/PEAR
- * @since Class available since Release 1.4.0a1
+ *
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version Release: 1.10.1
+ * @link http://pear.php.net/package/PEAR
+ * @since Class available since Release 1.4.0a1
* @abstract
*/
class PEAR_Task_Common
@@ -62,34 +62,35 @@ class PEAR_Task_Common
* changes directly to disk
*
* Child task classes must override this property.
+ *
* @access protected
*/
- var $type = 'simple';
+ protected $type = 'simple';
/**
* Determines which install phase this task is executed under
*/
- var $phase = PEAR_TASK_INSTALL;
+ public $phase = PEAR_TASK_INSTALL;
/**
* @access protected
*/
- var $config;
+ protected $config;
/**
* @access protected
*/
- var $registry;
+ protected $registry;
/**
* @access protected
*/
- var $logger;
+ public $logger;
/**
* @access protected
*/
- var $installphase;
+ protected $installphase;
/**
* @param PEAR_Config
* @param PEAR_Common
*/
- function PEAR_Task_Common(&$config, &$logger, $phase)
+ function __construct(&$config, &$logger, $phase)
{
$this->config = &$config;
$this->registry = &$config->getRegistry();
@@ -102,101 +103,105 @@ class PEAR_Task_Common
/**
* Validate the basic contents of a task tag.
+ *
* @param PEAR_PackageFile_v2
* @param array
* @param PEAR_Config
* @param array the entire parsed <file> tag
+ *
* @return true|array On error, return an array in format:
- * array(PEAR_TASK_ERROR_???[, param1][, param2][, ...])
+ * array(PEAR_TASK_ERROR_???[, param1][, param2][, ...])
+ *
+ * For PEAR_TASK_ERROR_MISSING_ATTRIB, pass the attribute name in
+ * For PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, pass the attribute name and
+ * an array of legal values in
*
- * For PEAR_TASK_ERROR_MISSING_ATTRIB, pass the attribute name in
- * For PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, pass the attribute name and an array
- * of legal values in
- * @static
* @abstract
*/
- function validateXml($pkg, $xml, $config, $fileXml)
+ public static function validateXml($pkg, $xml, $config, $fileXml)
{
}
/**
* Initialize a task instance with the parameters
- * @param array raw, parsed xml
- * @param array attributes from the <file> tag containing this task
- * @param string|null last installed version of this package
+ *
+ * @param array raw, parsed xml
+ * @param array attributes from the <file> tag containing this task
+ * @param string|null last installed version of this package
* @abstract
*/
- function init($xml, $fileAttributes, $lastVersion)
+ public function init($xml, $fileAttributes, $lastVersion)
{
}
/**
- * Begin a task processing session. All multiple tasks will be processed after each file
- * has been successfully installed, all simple tasks should perform their task here and
- * return any errors using the custom throwError() method to allow forward compatibility
+ * Begin a task processing session. All multiple tasks will be processed
+ * after each file has been successfully installed, all simple tasks should
+ * perform their task here and return any errors using the custom
+ * throwError() method to allow forward compatibility
*
* This method MUST NOT write out any changes to disk
- * @param PEAR_PackageFile_v2
- * @param string file contents
- * @param string the eventual final file location (informational only)
- * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
- * (use $this->throwError), otherwise return the new contents
+ *
+ * @param PEAR_PackageFile_v2
+ * @param string file contents
+ * @param string the eventual final file location (informational only)
+ * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
+ * (use $this->throwError), otherwise return the new contents
* @abstract
*/
- function startSession($pkg, $contents, $dest)
+ public function startSession($pkg, $contents, $dest)
{
}
/**
- * This method is used to process each of the tasks for a particular multiple class
- * type. Simple tasks need not implement this method.
- * @param array an array of tasks
- * @access protected
- * @static
- * @abstract
+ * This method is used to process each of the tasks for a particular
+ * multiple class type. Simple tasks need not implement this method.
+ *
+ * @param array an array of tasks
+ * @access protected
*/
- function run($tasks)
+ public static function run($tasks)
{
}
/**
- * @static
* @final
*/
- function hasPostinstallTasks()
+ public static function hasPostinstallTasks()
{
return isset($GLOBALS['_PEAR_TASK_POSTINSTANCES']);
}
- /**
- * @static
- * @final
- */
- function runPostinstallTasks()
- {
- foreach ($GLOBALS['_PEAR_TASK_POSTINSTANCES'] as $class => $tasks) {
- $err = call_user_func(array($class, 'run'),
- $GLOBALS['_PEAR_TASK_POSTINSTANCES'][$class]);
- if ($err) {
- return PEAR_Task_Common::throwError($err);
- }
- }
- unset($GLOBALS['_PEAR_TASK_POSTINSTANCES']);
+ /**
+ * @final
+ */
+ public static function runPostinstallTasks()
+ {
+ foreach ($GLOBALS['_PEAR_TASK_POSTINSTANCES'] as $class => $tasks) {
+ $err = call_user_func(
+ array($class, 'run'),
+ $GLOBALS['_PEAR_TASK_POSTINSTANCES'][$class]
+ );
+ if ($err) {
+ return PEAR_Task_Common::throwError($err);
+ }
+ }
+ unset($GLOBALS['_PEAR_TASK_POSTINSTANCES']);
}
/**
* Determines whether a role is a script
* @return bool
*/
- function isScript()
+ public function isScript()
{
- return $this->type == 'script';
+ return $this->type == 'script';
}
- function throwError($msg, $code = -1)
+ public function throwError($msg, $code = -1)
{
include_once 'PEAR.php';
+
return PEAR::raiseError($msg, $code);
}
}
-?>
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Postinstallscript.php b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Postinstallscript.php
index 35a89e842d9f7f0e091b8694af457cbc5df613a6..950deb5ceb6b7a9bd2f80968e91a7ec8228ff2f5 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Postinstallscript.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Postinstallscript.php
@@ -4,14 +4,13 @@
*
* PHP versions 4 and 5
*
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 1.4.0a1
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 1.4.0a1
*/
/**
* Base class
@@ -22,85 +21,95 @@ require_once 'PEAR/Task/Common.php';
*
* Note that post-install scripts are handled separately from installation, by the
* "pear run-scripts" command
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
- * @link http://pear.php.net/package/PEAR
- * @since Class available since Release 1.4.0a1
+ *
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version Release: 1.10.1
+ * @link http://pear.php.net/package/PEAR
+ * @since Class available since Release 1.4.0a1
*/
class PEAR_Task_Postinstallscript extends PEAR_Task_Common
{
- var $type = 'script';
- var $_class;
- var $_params;
- var $_obj;
+ public $type = 'script';
+ public $_class;
+ public $_params;
+ public $_obj;
/**
*
* @var PEAR_PackageFile_v2
*/
- var $_pkg;
- var $_contents;
- var $phase = PEAR_TASK_INSTALL;
+ public $_pkg;
+ public $_contents;
+ public $phase = PEAR_TASK_INSTALL;
/**
* Validate the raw xml at parsing-time.
*
* This also attempts to validate the script to make sure it meets the criteria
* for a post-install script
- * @param PEAR_PackageFile_v2
- * @param array The XML contents of the <postinstallscript> tag
- * @param PEAR_Config
- * @param array the entire parsed <file> tag
- * @static
+ *
+ * @param PEAR_PackageFile_v2
+ * @param array The XML contents of the <postinstallscript> tag
+ * @param PEAR_Config
+ * @param array the entire parsed <file> tag
*/
- function validateXml($pkg, $xml, $config, $fileXml)
+ public static function validateXml($pkg, $xml, $config, $fileXml)
{
if ($fileXml['role'] != 'php') {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" must be role="php"');
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" must be role="php"', );
}
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
$file = $pkg->getFileContents($fileXml['name']);
if (PEAR::isError($file)) {
PEAR::popErrorHandling();
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" is not valid: ' .
- $file->getMessage());
+
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" is not valid: '.
+ $file->getMessage(), );
} elseif ($file === null) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" could not be retrieved for processing!');
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" could not be retrieved for processing!', );
} else {
$analysis = $pkg->analyzeSourceCode($file, true);
if (!$analysis) {
PEAR::popErrorHandling();
$warnings = '';
foreach ($pkg->getValidationWarnings() as $warn) {
- $warnings .= $warn['message'] . "\n";
+ $warnings .= $warn['message']."\n";
}
- return array(PEAR_TASK_ERROR_INVALID, 'Analysis of post-install script "' .
- $fileXml['name'] . '" failed: ' . $warnings);
+
+ return array(PEAR_TASK_ERROR_INVALID, 'Analysis of post-install script "'.
+ $fileXml['name'].'" failed: '.$warnings, );
}
if (count($analysis['declared_classes']) != 1) {
PEAR::popErrorHandling();
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" must declare exactly 1 class');
+
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" must declare exactly 1 class', );
}
$class = $analysis['declared_classes'][0];
- if ($class != str_replace(array('/', '.php'), array('_', ''),
- $fileXml['name']) . '_postinstall') {
+ if ($class != str_replace(
+ array('/', '.php'), array('_', ''),
+ $fileXml['name']
+ ).'_postinstall') {
PEAR::popErrorHandling();
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" class "' . $class . '" must be named "' .
- str_replace(array('/', '.php'), array('_', ''),
- $fileXml['name']) . '_postinstall"');
+
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" class "'.$class.'" must be named "'.
+ str_replace(
+ array('/', '.php'), array('_', ''),
+ $fileXml['name']
+ ).'_postinstall"', );
}
if (!isset($analysis['declared_methods'][$class])) {
PEAR::popErrorHandling();
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" must declare methods init() and run()');
+
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" must declare methods init() and run()', );
}
$methods = array('init' => 0, 'run' => 1);
foreach ($analysis['declared_methods'][$class] as $method) {
@@ -110,129 +119,137 @@ class PEAR_Task_Postinstallscript extends PEAR_Task_Common
}
if (count($methods)) {
PEAR::popErrorHandling();
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" must declare methods init() and run()');
+
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" must declare methods init() and run()', );
}
}
PEAR::popErrorHandling();
$definedparams = array();
- $tasksNamespace = $pkg->getTasksNs() . ':';
- if (!isset($xml[$tasksNamespace . 'paramgroup']) && isset($xml['paramgroup'])) {
+ $tasksNamespace = $pkg->getTasksNs().':';
+ if (!isset($xml[$tasksNamespace.'paramgroup']) && isset($xml['paramgroup'])) {
// in order to support the older betas, which did not expect internal tags
// to also use the namespace
$tasksNamespace = '';
}
- if (isset($xml[$tasksNamespace . 'paramgroup'])) {
- $params = $xml[$tasksNamespace . 'paramgroup'];
+ if (isset($xml[$tasksNamespace.'paramgroup'])) {
+ $params = $xml[$tasksNamespace.'paramgroup'];
if (!is_array($params) || !isset($params[0])) {
$params = array($params);
}
foreach ($params as $param) {
- if (!isset($param[$tasksNamespace . 'id'])) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" <paramgroup> must have ' .
- 'an ' . $tasksNamespace . 'id> tag');
+ if (!isset($param[$tasksNamespace.'id'])) {
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" <paramgroup> must have '.
+ 'an '.$tasksNamespace.'id> tag', );
}
- if (isset($param[$tasksNamespace . 'name'])) {
- if (!in_array($param[$tasksNamespace . 'name'], $definedparams)) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" ' . $tasksNamespace .
- 'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
- '" parameter "' . $param[$tasksNamespace . 'name'] .
- '" has not been previously defined');
+ if (isset($param[$tasksNamespace.'name'])) {
+ if (!in_array($param[$tasksNamespace.'name'], $definedparams)) {
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" '.$tasksNamespace.
+ 'paramgroup> id "'.$param[$tasksNamespace.'id'].
+ '" parameter "'.$param[$tasksNamespace.'name'].
+ '" has not been previously defined', );
}
- if (!isset($param[$tasksNamespace . 'conditiontype'])) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" ' . $tasksNamespace .
- 'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
- '" must have a ' . $tasksNamespace .
- 'conditiontype> tag containing either "=", ' .
- '"!=", or "preg_match"');
+ if (!isset($param[$tasksNamespace.'conditiontype'])) {
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" '.$tasksNamespace.
+ 'paramgroup> id "'.$param[$tasksNamespace.'id'].
+ '" must have a '.$tasksNamespace.
+ 'conditiontype> tag containing either "=", '.
+ '"!=", or "preg_match"', );
}
- if (!in_array($param[$tasksNamespace . 'conditiontype'],
- array('=', '!=', 'preg_match'))) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" ' . $tasksNamespace .
- 'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
- '" must have a ' . $tasksNamespace .
- 'conditiontype> tag containing either "=", ' .
- '"!=", or "preg_match"');
+ if (!in_array(
+ $param[$tasksNamespace.'conditiontype'],
+ array('=', '!=', 'preg_match')
+ )) {
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" '.$tasksNamespace.
+ 'paramgroup> id "'.$param[$tasksNamespace.'id'].
+ '" must have a '.$tasksNamespace.
+ 'conditiontype> tag containing either "=", '.
+ '"!=", or "preg_match"', );
}
- if (!isset($param[$tasksNamespace . 'value'])) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" ' . $tasksNamespace .
- 'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
- '" must have a ' . $tasksNamespace .
- 'value> tag containing expected parameter value');
+ if (!isset($param[$tasksNamespace.'value'])) {
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" '.$tasksNamespace.
+ 'paramgroup> id "'.$param[$tasksNamespace.'id'].
+ '" must have a '.$tasksNamespace.
+ 'value> tag containing expected parameter value', );
}
}
- if (isset($param[$tasksNamespace . 'instructions'])) {
- if (!is_string($param[$tasksNamespace . 'instructions'])) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" ' . $tasksNamespace .
- 'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
- '" ' . $tasksNamespace . 'instructions> must be simple text');
+ if (isset($param[$tasksNamespace.'instructions'])) {
+ if (!is_string($param[$tasksNamespace.'instructions'])) {
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" '.$tasksNamespace.
+ 'paramgroup> id "'.$param[$tasksNamespace.'id'].
+ '" '.$tasksNamespace.'instructions> must be simple text', );
}
}
- if (!isset($param[$tasksNamespace . 'param'])) {
+ if (!isset($param[$tasksNamespace.'param'])) {
continue; // <param> is no longer required
}
- $subparams = $param[$tasksNamespace . 'param'];
+ $subparams = $param[$tasksNamespace.'param'];
if (!is_array($subparams) || !isset($subparams[0])) {
$subparams = array($subparams);
}
foreach ($subparams as $subparam) {
- if (!isset($subparam[$tasksNamespace . 'name'])) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" parameter for ' .
- $tasksNamespace . 'paramgroup> id "' .
- $param[$tasksNamespace . 'id'] . '" must have ' .
- 'a ' . $tasksNamespace . 'name> tag');
+ if (!isset($subparam[$tasksNamespace.'name'])) {
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" parameter for '.
+ $tasksNamespace.'paramgroup> id "'.
+ $param[$tasksNamespace.'id'].'" must have '.
+ 'a '.$tasksNamespace.'name> tag', );
}
- if (!preg_match('/[a-zA-Z0-9]+/',
- $subparam[$tasksNamespace . 'name'])) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" parameter "' .
- $subparam[$tasksNamespace . 'name'] .
- '" for ' . $tasksNamespace . 'paramgroup> id "' .
- $param[$tasksNamespace . 'id'] .
- '" is not a valid name. Must contain only alphanumeric characters');
+ if (!preg_match(
+ '/[a-zA-Z0-9]+/',
+ $subparam[$tasksNamespace.'name']
+ )) {
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" parameter "'.
+ $subparam[$tasksNamespace.'name'].
+ '" for '.$tasksNamespace.'paramgroup> id "'.
+ $param[$tasksNamespace.'id'].
+ '" is not a valid name. Must contain only alphanumeric characters', );
}
- if (!isset($subparam[$tasksNamespace . 'prompt'])) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" parameter "' .
- $subparam[$tasksNamespace . 'name'] .
- '" for ' . $tasksNamespace . 'paramgroup> id "' .
- $param[$tasksNamespace . 'id'] .
- '" must have a ' . $tasksNamespace . 'prompt> tag');
+ if (!isset($subparam[$tasksNamespace.'prompt'])) {
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" parameter "'.
+ $subparam[$tasksNamespace.'name'].
+ '" for '.$tasksNamespace.'paramgroup> id "'.
+ $param[$tasksNamespace.'id'].
+ '" must have a '.$tasksNamespace.'prompt> tag', );
}
- if (!isset($subparam[$tasksNamespace . 'type'])) {
- return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
- $fileXml['name'] . '" parameter "' .
- $subparam[$tasksNamespace . 'name'] .
- '" for ' . $tasksNamespace . 'paramgroup> id "' .
- $param[$tasksNamespace . 'id'] .
- '" must have a ' . $tasksNamespace . 'type> tag');
+ if (!isset($subparam[$tasksNamespace.'type'])) {
+ return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+ $fileXml['name'].'" parameter "'.
+ $subparam[$tasksNamespace.'name'].
+ '" for '.$tasksNamespace.'paramgroup> id "'.
+ $param[$tasksNamespace.'id'].
+ '" must have a '.$tasksNamespace.'type> tag', );
}
- $definedparams[] = $param[$tasksNamespace . 'id'] . '::' .
- $subparam[$tasksNamespace . 'name'];
+ $definedparams[] = $param[$tasksNamespace.'id'].'::'.
+ $subparam[$tasksNamespace.'name'];
}
}
}
+
return true;
}
/**
* Initialize a task instance with the parameters
- * @param array raw, parsed xml
- * @param array attributes from the <file> tag containing this task
- * @param string|null last installed version of this package, if any (useful for upgrades)
+ * @param array $xml raw, parsed xml
+ * @param array $fileattribs attributes from the <file> tag containing
+ * this task
+ * @param string|null $lastversion last installed version of this package,
+ * if any (useful for upgrades)
*/
- function init($xml, $fileattribs, $lastversion)
+ public function init($xml, $fileattribs, $lastversion)
{
$this->_class = str_replace('/', '_', $fileattribs['name']);
$this->_filename = $fileattribs['name'];
- $this->_class = str_replace ('.php', '', $this->_class) . '_postinstall';
+ $this->_class = str_replace('.php', '', $this->_class).'_postinstall';
$this->_params = $xml;
$this->_lastversion = $lastversion;
}
@@ -242,7 +259,7 @@ class PEAR_Task_Postinstallscript extends PEAR_Task_Common
*
* @access private
*/
- function _stripNamespace($params = null)
+ public function _stripNamespace($params = null)
{
if ($params === null) {
$params = array();
@@ -253,7 +270,7 @@ class PEAR_Task_Postinstallscript extends PEAR_Task_Common
if (is_array($param)) {
$param = $this->_stripNamespace($param);
}
- $params[str_replace($this->_pkg->getTasksNs() . ':', '', $i)] = $param;
+ $params[str_replace($this->_pkg->getTasksNs().':', '', $i)] = $param;
}
$this->_params = $params;
} else {
@@ -262,21 +279,24 @@ class PEAR_Task_Postinstallscript extends PEAR_Task_Common
if (is_array($param)) {
$param = $this->_stripNamespace($param);
}
- $newparams[str_replace($this->_pkg->getTasksNs() . ':', '', $i)] = $param;
+ $newparams[str_replace($this->_pkg->getTasksNs().':', '', $i)] = $param;
}
+
return $newparams;
}
}
/**
- * Unlike other tasks, the installed file name is passed in instead of the file contents,
- * because this task is handled post-installation
- * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
- * @param string file name
+ * Unlike other tasks, the installed file name is passed in instead of the
+ * file contents, because this task is handled post-installation
+ *
+ * @param mixed $pkg PEAR_PackageFile_v1|PEAR_PackageFile_v2
+ * @param string $contents file name
+ *
* @return bool|PEAR_Error false to skip this file, PEAR_Error to fail
- * (use $this->throwError)
+ * (use $this->throwError)
*/
- function startSession($pkg, $contents)
+ public function startSession($pkg, $contents)
{
if ($this->installphase != PEAR_TASK_INSTALL) {
return false;
@@ -284,40 +304,46 @@ class PEAR_Task_Postinstallscript extends PEAR_Task_Common
// remove the tasks: namespace if present
$this->_pkg = $pkg;
$this->_stripNamespace();
- $this->logger->log(0, 'Including external post-installation script "' .
- $contents . '" - any errors are in this script');
+ $this->logger->log(
+ 0, 'Including external post-installation script "'.
+ $contents.'" - any errors are in this script'
+ );
include_once $contents;
if (class_exists($this->_class)) {
$this->logger->log(0, 'Inclusion succeeded');
} else {
- return $this->throwError('init of post-install script class "' . $this->_class
- . '" failed');
+ return $this->throwError(
+ 'init of post-install script class "'.$this->_class
+ .'" failed'
+ );
}
- $this->_obj = new $this->_class;
- $this->logger->log(1, 'running post-install script "' . $this->_class . '->init()"');
+ $this->_obj = new $this->_class();
+ $this->logger->log(1, 'running post-install script "'.$this->_class.'->init()"');
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
$res = $this->_obj->init($this->config, $pkg, $this->_lastversion);
PEAR::popErrorHandling();
if ($res) {
$this->logger->log(0, 'init succeeded');
} else {
- return $this->throwError('init of post-install script "' . $this->_class .
- '->init()" failed');
+ return $this->throwError(
+ 'init of post-install script "'.$this->_class.
+ '->init()" failed'
+ );
}
$this->_contents = $contents;
+
return true;
}
/**
* No longer used
- * @see PEAR_PackageFile_v2::runPostinstallScripts()
- * @param array an array of tasks
- * @param string install or upgrade
+ *
+ * @see PEAR_PackageFile_v2::runPostinstallScripts()
+ * @param array an array of tasks
+ * @param string install or upgrade
* @access protected
- * @static
*/
- function run()
+ public static function run()
{
}
}
-?>
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Postinstallscript/rw.php b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Postinstallscript/rw.php
index 8c0a6fb93f3cc7498b408b1943bb4db41ba79ca2..662960062e708bfe9cc4484ccfb581cfabc4b047 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Postinstallscript/rw.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Postinstallscript/rw.php
@@ -4,14 +4,13 @@
*
* PHP versions 4 and 5
*
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 1.4.0a10
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 1.4.0a10
*/
/**
* Base class
@@ -24,7 +23,7 @@ require_once 'PEAR/Task/Postinstallscript.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a10
*/
@@ -35,30 +34,31 @@ class PEAR_Task_Postinstallscript_rw extends PEAR_Task_Postinstallscript
*
* @var PEAR_PackageFile_v2_rw
*/
- var $_pkg;
+ public $_pkg;
/**
* Enter description here...
*
- * @param PEAR_PackageFile_v2_rw $pkg
- * @param PEAR_Config $config
- * @param PEAR_Frontend $logger
- * @param array $fileXml
+ * @param PEAR_PackageFile_v2_rw $pkg Package
+ * @param PEAR_Config $config Config
+ * @param PEAR_Frontend $logger Logger
+ * @param array $fileXml XML
+ *
* @return PEAR_Task_Postinstallscript_rw
*/
- function PEAR_Task_Postinstallscript_rw(&$pkg, &$config, &$logger, $fileXml)
+ function __construct(&$pkg, &$config, &$logger, $fileXml)
{
- parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
+ parent::__construct($config, $logger, PEAR_TASK_PACKAGE);
$this->_contents = $fileXml;
$this->_pkg = &$pkg;
$this->_params = array();
}
- function validate()
+ public function validate()
{
return $this->validateXml($this->_pkg, $this->_params, $this->config, $this->_contents);
}
- function getName()
+ public function getName()
{
return 'postinstallscript';
}
@@ -73,30 +73,31 @@ class PEAR_Task_Postinstallscript_rw extends PEAR_Task_Postinstallscript
*
* Use {@link addConditionTypeGroup()} to add a <paramgroup> containing
* a <conditiontype> tag
- * @param string $id <paramgroup> id as seen by the script
- * @param array|false $params array of getParam() calls, or false for no params
+ *
+ * @param string $id <paramgroup> id as seen by the script
+ * @param array|false $params array of getParam() calls, or false for no params
* @param string|false $instructions
*/
- function addParamGroup($id, $params = false, $instructions = false)
+ public function addParamGroup($id, $params = false, $instructions = false)
{
if ($params && isset($params[0]) && !isset($params[1])) {
$params = $params[0];
}
$stuff =
array(
- $this->_pkg->getTasksNs() . ':id' => $id,
+ $this->_pkg->getTasksNs().':id' => $id,
);
if ($instructions) {
- $stuff[$this->_pkg->getTasksNs() . ':instructions'] = $instructions;
+ $stuff[$this->_pkg->getTasksNs().':instructions'] = $instructions;
}
if ($params) {
- $stuff[$this->_pkg->getTasksNs() . ':param'] = $params;
+ $stuff[$this->_pkg->getTasksNs().':param'] = $params;
}
- $this->_params[$this->_pkg->getTasksNs() . ':paramgroup'][] = $stuff;
+ $this->_params[$this->_pkg->getTasksNs().':paramgroup'][] = $stuff;
}
/**
- * add a complex <paramgroup> to the post-install script with conditions
+ * Add a complex <paramgroup> to the post-install script with conditions
*
* This inserts a <paramgroup> with
*
@@ -107,63 +108,75 @@ class PEAR_Task_Postinstallscript_rw extends PEAR_Task_Postinstallscript
*
* Use {@link addParamGroup()} to add a simple <paramgroup>
*
- * @param string $id <paramgroup> id as seen by the script
- * @param string $oldgroup <paramgroup> id of the section referenced by
- * <conditiontype>
- * @param string $param name of the <param> from the older section referenced
- * by <contitiontype>
- * @param string $value value to match of the parameter
- * @param string $conditiontype one of '=', '!=', 'preg_match'
- * @param array|false $params array of getParam() calls, or false for no params
+ * @param string $id <paramgroup> id as seen by the script
+ * @param string $oldgroup <paramgroup> id of the section referenced by
+ * <conditiontype>
+ * @param string $param name of the <param> from the older section referenced
+ * by <contitiontype>
+ * @param string $value value to match of the parameter
+ * @param string $conditiontype one of '=', '!=', 'preg_match'
+ * @param array|false $params array of getParam() calls, or false for no params
* @param string|false $instructions
*/
- function addConditionTypeGroup($id, $oldgroup, $param, $value, $conditiontype = '=',
- $params = false, $instructions = false)
- {
+ public function addConditionTypeGroup($id,
+ $oldgroup,
+ $param,
+ $value,
+ $conditiontype = '=',
+ $params = false,
+ $instructions = false
+ ) {
if ($params && isset($params[0]) && !isset($params[1])) {
$params = $params[0];
}
$stuff = array(
- $this->_pkg->getTasksNs() . ':id' => $id,
+ $this->_pkg->getTasksNs().':id' => $id,
);
if ($instructions) {
- $stuff[$this->_pkg->getTasksNs() . ':instructions'] = $instructions;
+ $stuff[$this->_pkg->getTasksNs().':instructions'] = $instructions;
}
- $stuff[$this->_pkg->getTasksNs() . ':name'] = $oldgroup . '::' . $param;
- $stuff[$this->_pkg->getTasksNs() . ':conditiontype'] = $conditiontype;
- $stuff[$this->_pkg->getTasksNs() . ':value'] = $value;
+ $stuff[$this->_pkg->getTasksNs().':name'] = $oldgroup.'::'.$param;
+ $stuff[$this->_pkg->getTasksNs().':conditiontype'] = $conditiontype;
+ $stuff[$this->_pkg->getTasksNs().':value'] = $value;
if ($params) {
- $stuff[$this->_pkg->getTasksNs() . ':param'] = $params;
+ $stuff[$this->_pkg->getTasksNs().':param'] = $params;
}
- $this->_params[$this->_pkg->getTasksNs() . ':paramgroup'][] = $stuff;
+ $this->_params[$this->_pkg->getTasksNs().':paramgroup'][] = $stuff;
}
- function getXml()
+ public function getXml()
{
return $this->_params;
}
/**
* Use to set up a param tag for use in creating a paramgroup
- * @static
+ *
+ * @param mixed $name Name of parameter
+ * @param mixed $prompt Prompt
+ * @param string $type Type, defaults to 'string'
+ * @param mixed $default Default value
+ *
+ * @return array
*/
- function getParam($name, $prompt, $type = 'string', $default = null)
- {
+ public static function getParam(
+ $name, $prompt, $type = 'string', $default = null
+ ) {
if ($default !== null) {
return
array(
- $this->_pkg->getTasksNs() . ':name' => $name,
- $this->_pkg->getTasksNs() . ':prompt' => $prompt,
- $this->_pkg->getTasksNs() . ':type' => $type,
- $this->_pkg->getTasksNs() . ':default' => $default
+ $this->_pkg->getTasksNs().':name' => $name,
+ $this->_pkg->getTasksNs().':prompt' => $prompt,
+ $this->_pkg->getTasksNs().':type' => $type,
+ $this->_pkg->getTasksNs().':default' => $default,
);
}
+
return
array(
- $this->_pkg->getTasksNs() . ':name' => $name,
- $this->_pkg->getTasksNs() . ':prompt' => $prompt,
- $this->_pkg->getTasksNs() . ':type' => $type,
+ $this->_pkg->getTasksNs().':name' => $name,
+ $this->_pkg->getTasksNs().':prompt' => $prompt,
+ $this->_pkg->getTasksNs().':type' => $type,
);
}
}
-?>
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Replace.php b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Replace.php
index e872ff5e0e9f0735a611e474161f59759a7ec4d8..7483282bb77b39ac5ab2d3539c4feb2b0d96cb6f 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Replace.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Replace.php
@@ -4,14 +4,13 @@
*
* PHP versions 4 and 5
*
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 1.4.0a1
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 1.4.0a1
*/
/**
* Base class
@@ -24,24 +23,24 @@ require_once 'PEAR/Task/Common.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
class PEAR_Task_Replace extends PEAR_Task_Common
{
- var $type = 'simple';
- var $phase = PEAR_TASK_PACKAGEANDINSTALL;
- var $_replacements;
+ public $type = 'simple';
+ public $phase = PEAR_TASK_PACKAGEANDINSTALL;
+ public $_replacements;
/**
* Validate the raw xml at parsing-time.
- * @param PEAR_PackageFile_v2
- * @param array raw, parsed xml
- * @param PEAR_Config
- * @static
+ *
+ * @param PEAR_PackageFile_v2
+ * @param array raw, parsed xml
+ * @param PEAR_Config
*/
- function validateXml($pkg, $xml, $config, $fileXml)
+ public static function validateXml($pkg, $xml, $config, $fileXml)
{
if (!isset($xml['attribs'])) {
return array(PEAR_TASK_ERROR_NOATTRIBS);
@@ -58,33 +57,36 @@ class PEAR_Task_Replace extends PEAR_Task_Common
if ($xml['attribs']['type'] == 'pear-config') {
if (!in_array($xml['attribs']['to'], $config->getKeys())) {
return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
- $config->getKeys());
+ $config->getKeys(), );
}
} elseif ($xml['attribs']['type'] == 'php-const') {
if (defined($xml['attribs']['to'])) {
return true;
} else {
return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
- array('valid PHP constant'));
+ array('valid PHP constant'), );
}
} elseif ($xml['attribs']['type'] == 'package-info') {
- if (in_array($xml['attribs']['to'],
+ if (in_array(
+ $xml['attribs']['to'],
array('name', 'summary', 'channel', 'notes', 'extends', 'description',
'release_notes', 'license', 'release-license', 'license-uri',
'version', 'api-version', 'state', 'api-state', 'release_date',
- 'date', 'time'))) {
+ 'date', 'time', )
+ )) {
return true;
} else {
return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
array('name', 'summary', 'channel', 'notes', 'extends', 'description',
'release_notes', 'license', 'release-license', 'license-uri',
'version', 'api-version', 'state', 'api-state', 'release_date',
- 'date', 'time'));
+ 'date', 'time', ), );
}
} else {
return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'type', $xml['attribs']['type'],
- array('pear-config', 'package-info', 'php-const'));
+ array('pear-config', 'package-info', 'php-const'), );
}
+
return true;
}
@@ -92,8 +94,9 @@ class PEAR_Task_Replace extends PEAR_Task_Common
* Initialize a task instance with the parameters
* @param array raw, parsed xml
* @param unused
+ * @param unused
*/
- function init($xml, $attribs)
+ public function init($xml, $attribs, $lastVersion = null)
{
$this->_replacements = isset($xml['attribs']) ? array($xml) : $xml;
}
@@ -102,13 +105,14 @@ class PEAR_Task_Replace extends PEAR_Task_Common
* Do a package.xml 1.0 replacement, with additional package-info fields available
*
* See validateXml() source for the complete list of allowed fields
- * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
- * @param string file contents
- * @param string the eventual final file location (informational only)
+ *
+ * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
+ * @param string file contents
+ * @param string the eventual final file location (informational only)
* @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
- * (use $this->throwError), otherwise return the new contents
+ * (use $this->throwError), otherwise return the new contents
*/
- function startSession($pkg, $contents, $dest)
+ public function startSession($pkg, $contents, $dest)
{
$subst_from = $subst_to = array();
foreach ($this->_replacements as $a) {
@@ -124,6 +128,7 @@ class PEAR_Task_Replace extends PEAR_Task_Common
$to = $chan->getServer();
} else {
$this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
+
return false;
}
} else {
@@ -140,6 +145,7 @@ class PEAR_Task_Replace extends PEAR_Task_Common
}
if (is_null($to)) {
$this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
+
return false;
}
} elseif ($a['type'] == 'php-const') {
@@ -150,6 +156,7 @@ class PEAR_Task_Replace extends PEAR_Task_Common
$to = constant($a['to']);
} else {
$this->logger->log(0, "$dest: invalid php-const replacement: $a[to]");
+
return false;
}
} else {
@@ -157,6 +164,7 @@ class PEAR_Task_Replace extends PEAR_Task_Common
$to = $t;
} else {
$this->logger->log(0, "$dest: invalid package-info replacement: $a[to]");
+
return false;
}
}
@@ -165,12 +173,14 @@ class PEAR_Task_Replace extends PEAR_Task_Common
$subst_to[] = $to;
}
}
- $this->logger->log(3, "doing " . sizeof($subst_from) .
- " substitution(s) for $dest");
+ $this->logger->log(
+ 3, "doing ".sizeof($subst_from).
+ " substitution(s) for $dest"
+ );
if (sizeof($subst_from)) {
$contents = str_replace($subst_from, $subst_to, $contents);
}
+
return $contents;
}
}
-?>
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Replace/rw.php b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Replace/rw.php
index e0e30cd867fb0281ffe5528a61d3e9266e6e9cba..ace1e9ea21523b6624c44673998241a38a4278ac 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Replace/rw.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Replace/rw.php
@@ -4,14 +4,13 @@
*
* PHP versions 4 and 5
*
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 1.4.0a10
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 1.4.0a10
*/
/**
* Base class
@@ -24,38 +23,37 @@ require_once 'PEAR/Task/Replace.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a10
*/
class PEAR_Task_Replace_rw extends PEAR_Task_Replace
{
- function PEAR_Task_Replace_rw(&$pkg, &$config, &$logger, $fileXml)
+ public function __construct(&$pkg, &$config, &$logger, $fileXml)
{
- parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
+ parent::__construct($config, $logger, PEAR_TASK_PACKAGE);
$this->_contents = $fileXml;
$this->_pkg = &$pkg;
$this->_params = array();
}
- function validate()
+ public function validate()
{
return $this->validateXml($this->_pkg, $this->_params, $this->config, $this->_contents);
}
- function setInfo($from, $to, $type)
+ public function setInfo($from, $to, $type)
{
$this->_params = array('attribs' => array('from' => $from, 'to' => $to, 'type' => $type));
}
- function getName()
+ public function getName()
{
return 'replace';
}
- function getXml()
+ public function getXml()
{
return $this->_params;
}
}
-?>
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Unixeol.php b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Unixeol.php
index 1ddabd7d350582713e19f016567b25c4efacfc2a..6ef7174bbf57db4fbc6c8b493e96b1c203886ca9 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Unixeol.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Unixeol.php
@@ -4,14 +4,13 @@
*
* PHP versions 4 and 5
*
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 1.4.0a1
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 1.4.0a1
*/
/**
* Base class
@@ -24,28 +23,29 @@ require_once 'PEAR/Task/Common.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
class PEAR_Task_Unixeol extends PEAR_Task_Common
{
- var $type = 'simple';
- var $phase = PEAR_TASK_PACKAGE;
- var $_replacements;
+ public $type = 'simple';
+ public $phase = PEAR_TASK_PACKAGE;
+ public $_replacements;
/**
* Validate the raw xml at parsing-time.
- * @param PEAR_PackageFile_v2
- * @param array raw, parsed xml
- * @param PEAR_Config
- * @static
+ *
+ * @param PEAR_PackageFile_v2
+ * @param array raw, parsed xml
+ * @param PEAR_Config
*/
- function validateXml($pkg, $xml, $config, $fileXml)
+ public static function validateXml($pkg, $xml, $config, $fileXml)
{
if ($xml != '') {
return array(PEAR_TASK_ERROR_INVALID, 'no attributes allowed');
}
+
return true;
}
@@ -53,8 +53,9 @@ class PEAR_Task_Unixeol extends PEAR_Task_Common
* Initialize a task instance with the parameters
* @param array raw, parsed xml
* @param unused
+ * @param unused
*/
- function init($xml, $attribs)
+ public function init($xml, $attribs, $lastVersion = null)
{
}
@@ -62,16 +63,17 @@ class PEAR_Task_Unixeol extends PEAR_Task_Common
* Replace all line endings with line endings customized for the current OS
*
* See validateXml() source for the complete list of allowed fields
- * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
- * @param string file contents
- * @param string the eventual final file location (informational only)
+ *
+ * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
+ * @param string file contents
+ * @param string the eventual final file location (informational only)
* @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
- * (use $this->throwError), otherwise return the new contents
+ * (use $this->throwError), otherwise return the new contents
*/
- function startSession($pkg, $contents, $dest)
+ public function startSession($pkg, $contents, $dest)
{
$this->logger->log(3, "replacing all line endings with \\n in $dest");
+
return preg_replace("/\r\n|\n\r|\r|\n/", "\n", $contents);
}
}
-?>
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Unixeol/rw.php b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Unixeol/rw.php
index 1b47bf8cbb939e311471ea1e3c7fd518645ef0ae..9134e2c933800b31678a474f7f8cb336658e8674 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Unixeol/rw.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Unixeol/rw.php
@@ -4,14 +4,13 @@
*
* PHP versions 4 and 5
*
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 1.4.0a10
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 1.4.0a10
*/
/**
* Base class
@@ -24,33 +23,33 @@ require_once 'PEAR/Task/Unixeol.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a10
*/
class PEAR_Task_Unixeol_rw extends PEAR_Task_Unixeol
{
- function PEAR_Task_Unixeol_rw(&$pkg, &$config, &$logger, $fileXml)
+ function __construct(&$pkg, &$config, &$logger, $fileXml)
{
- parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
+ parent::__construct($config, $logger, PEAR_TASK_PACKAGE);
$this->_contents = $fileXml;
$this->_pkg = &$pkg;
$this->_params = array();
}
- function validate()
+ public function validate()
{
return true;
}
- function getName()
+ public function getName()
{
return 'unixeol';
}
- function getXml()
+ public function getXml()
{
return '';
}
}
-?>
\ No newline at end of file
+?>
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Windowseol.php b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Windowseol.php
index 42ed7dd39159136483f24539bc64d1e2134ab0c3..620c940fe2305cbf4d5997a64882ee72678235c8 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Windowseol.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Windowseol.php
@@ -4,14 +4,13 @@
*
* PHP versions 4 and 5
*
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 1.4.0a1
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 1.4.0a1
*/
/**
* Base class
@@ -19,33 +18,35 @@
require_once 'PEAR/Task/Common.php';
/**
* Implements the windows line endsings file task.
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
- * @link http://pear.php.net/package/PEAR
- * @since Class available since Release 1.4.0a1
+ *
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version Release: 1.10.1
+ * @link http://pear.php.net/package/PEAR
+ * @since Class available since Release 1.4.0a1
*/
class PEAR_Task_Windowseol extends PEAR_Task_Common
{
- var $type = 'simple';
- var $phase = PEAR_TASK_PACKAGE;
- var $_replacements;
+ public $type = 'simple';
+ public $phase = PEAR_TASK_PACKAGE;
+ public $_replacements;
/**
* Validate the raw xml at parsing-time.
- * @param PEAR_PackageFile_v2
- * @param array raw, parsed xml
- * @param PEAR_Config
- * @static
+ *
+ * @param PEAR_PackageFile_v2
+ * @param array raw, parsed xml
+ * @param PEAR_Config
*/
- function validateXml($pkg, $xml, $config, $fileXml)
+ public static function validateXml($pkg, $xml, $config, $fileXml)
{
if ($xml != '') {
return array(PEAR_TASK_ERROR_INVALID, 'no attributes allowed');
}
+
return true;
}
@@ -53,8 +54,9 @@ class PEAR_Task_Windowseol extends PEAR_Task_Common
* Initialize a task instance with the parameters
* @param array raw, parsed xml
* @param unused
+ * @param unused
*/
- function init($xml, $attribs)
+ public function init($xml, $attribs, $lastVersion = null)
{
}
@@ -62,16 +64,17 @@ class PEAR_Task_Windowseol extends PEAR_Task_Common
* Replace all line endings with windows line endings
*
* See validateXml() source for the complete list of allowed fields
- * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
- * @param string file contents
- * @param string the eventual final file location (informational only)
+ *
+ * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
+ * @param string file contents
+ * @param string the eventual final file location (informational only)
* @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
- * (use $this->throwError), otherwise return the new contents
+ * (use $this->throwError), otherwise return the new contents
*/
- function startSession($pkg, $contents, $dest)
+ public function startSession($pkg, $contents, $dest)
{
$this->logger->log(3, "replacing all line endings with \\r\\n in $dest");
+
return preg_replace("/\r\n|\n\r|\r|\n/", "\r\n", $contents);
}
}
-?>
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Windowseol/rw.php b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Windowseol/rw.php
index a0dd3d25abd00d88e0c96e12bc6b51340b5506af..e3cf0052b2a9c1fb0e96cb5f461dcaf948e3495f 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Task/Windowseol/rw.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Task/Windowseol/rw.php
@@ -4,14 +4,13 @@
*
* PHP versions 4 and 5
*
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 1.4.0a10
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link http://pear.php.net/package/PEAR
+ * @since File available since Release 1.4.0a10
*/
/**
* Base class
@@ -19,38 +18,39 @@
require_once 'PEAR/Task/Windowseol.php';
/**
* Abstracts the windowseol task xml.
- * @category pear
- * @package PEAR
- * @author Greg Beaver <cellog@php.net>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
- * @link http://pear.php.net/package/PEAR
- * @since Class available since Release 1.4.0a10
+ *
+ * @category pear
+ * @package PEAR
+ * @author Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version Release: 1.10.1
+ * @link http://pear.php.net/package/PEAR
+ * @since Class available since Release 1.4.0a10
*/
class PEAR_Task_Windowseol_rw extends PEAR_Task_Windowseol
{
- function PEAR_Task_Windowseol_rw(&$pkg, &$config, &$logger, $fileXml)
+ function __construct(&$pkg, &$config, &$logger, $fileXml)
{
- parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
+ parent::__construct($config, $logger, PEAR_TASK_PACKAGE);
$this->_contents = $fileXml;
$this->_pkg = &$pkg;
$this->_params = array();
}
- function validate()
+ public function validate()
{
return true;
}
- function getName()
+ public function getName()
{
return 'windowseol';
}
- function getXml()
+ public function getXml()
{
return '';
}
}
-?>
\ No newline at end of file
+?>
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Validate.php b/vendor/pear-pear.php.net/PEAR/PEAR/Validate.php
index bc7ecbd0f2f9bb52d08f572c26df9ae27d581cb1..8e29b7cd2a0b89fd46ded342a7940476af2309cb 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Validate.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Validate.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -32,7 +31,7 @@ require_once 'PEAR/Validator/PECL.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -85,9 +84,8 @@ class PEAR_Validate
* to the PEAR naming convention, so the method is final and static.
* @param string
* @final
- * @static
*/
- function validGroupName($name)
+ public static function validGroupName($name)
{
return (bool) preg_match('/^' . _PEAR_COMMON_PACKAGE_NAME_PREG . '\\z/', $name);
}
@@ -96,10 +94,9 @@ class PEAR_Validate
* Determine whether $state represents a valid stability level
* @param string
* @return bool
- * @static
* @final
*/
- function validState($state)
+ public static function validState($state)
{
return in_array($state, array('snapshot', 'devel', 'alpha', 'beta', 'stable'));
}
@@ -107,10 +104,9 @@ class PEAR_Validate
/**
* Get a list of valid stability levels
* @return array
- * @static
* @final
*/
- function getValidStates()
+ public static function getValidStates()
{
return array('snapshot', 'devel', 'alpha', 'beta', 'stable');
}
@@ -120,10 +116,9 @@ class PEAR_Validate
* by version_compare
* @param string
* @return bool
- * @static
* @final
*/
- function validVersion($ver)
+ public static function validVersion($ver)
{
return (bool) preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $ver);
}
@@ -207,7 +202,8 @@ class PEAR_Validate
$this->_packagexml->getExtends()) {
$version = $this->_packagexml->getVersion() . '';
$name = $this->_packagexml->getPackage();
- $test = array_shift($a = explode('.', $version));
+ $a = explode('.', $version);
+ $test = array_shift($a);
if ($test == '0') {
return true;
}
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/Validator/PECL.php b/vendor/pear-pear.php.net/PEAR/PEAR/Validator/PECL.php
index 416d1abfd8dae69a5bb659fa80394321d50e80e1..830c8e9b28d9b730284a8332d0860680fb81c621 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/Validator/PECL.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/Validator/PECL.php
@@ -9,7 +9,6 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2006 The PHP Group
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a5
*/
@@ -24,7 +23,7 @@ require_once 'PEAR/Validate.php';
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a5
*/
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR/XMLParser.php b/vendor/pear-pear.php.net/PEAR/PEAR/XMLParser.php
index 83e4f96530e587cf44a75ddaaae22fbd8a92e5c6..619743bcd8edcf422dcd7388a57274a9077f694e 100644
--- a/vendor/pear-pear.php.net/PEAR/PEAR/XMLParser.php
+++ b/vendor/pear-pear.php.net/PEAR/PEAR/XMLParser.php
@@ -10,7 +10,6 @@
* @author Stephan Schmidt (original XML_Unserializer code)
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -23,7 +22,7 @@
* @author Stephan Schmidt (original XML_Unserializer code)
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license New BSD License
- * @version Release: 1.9.5
+ * @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.4.0a1
*/
@@ -95,11 +94,6 @@ class PEAR_XMLParser
$this->encoding = 'UTF-8';
}
- if (version_compare(phpversion(), '5.0.0', 'lt') && $this->encoding == 'UTF-8') {
- $data = utf8_decode($data);
- $this->encoding = 'ISO-8859-1';
- }
-
$xp = xml_parser_create($this->encoding);
xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, 0);
xml_set_object($xp, $this);
diff --git a/vendor/pear-pear.php.net/PEAR/PEAR5.php b/vendor/pear-pear.php.net/PEAR/PEAR5.php
deleted file mode 100644
index 428606780b7bf322bbf8bf2379da80d1340cb86b..0000000000000000000000000000000000000000
--- a/vendor/pear-pear.php.net/PEAR/PEAR5.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * 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
- */
-class PEAR5
-{
- /**
- * If you have a class that's mostly/entirely static, and you need static
- * properties, you can use this method to simulate them. Eg. in your method(s)
- * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
- * You MUST use a reference, or they will not persist!
- *
- * @access public
- * @param string $class The calling classname, to prevent clashes
- * @param string $var The variable to retrieve.
- * @return mixed A reference to the variable. If not set it will be
- * auto initialised to NULL.
- */
- static function &getStaticProperty($class, $var)
- {
- static $properties;
- if (!isset($properties[$class])) {
- $properties[$class] = array();
- }
-
- if (!array_key_exists($var, $properties[$class])) {
- $properties[$class][$var] = null;
- }
-
- return $properties[$class][$var];
- }
-}
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/System.php b/vendor/pear-pear.php.net/PEAR/System.php
index e3693b10c56753b039b080e337ecea5237296e4a..9ff3fedb9463544808b825525008a4318bd455da 100644
--- a/vendor/pear-pear.php.net/PEAR/System.php
+++ b/vendor/pear-pear.php.net/PEAR/System.php
@@ -9,7 +9,6 @@
* @author Tomas V.V.Cox <cox@idecnet.com>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -51,7 +50,7 @@ $GLOBALS['_System_temp_files'] = array();
* @author Tomas V.V. Cox <cox@idecnet.com>
* @copyright 1997-2006 The PHP Group
* @license http://opensource.org/licenses/bsd-license.php New BSD License
-* @version Release: 1.9.5
+* @version Release: 1.10.1
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 0.1
* @static
@@ -65,10 +64,8 @@ class System
* @param string $short_options the allowed option short-tags
* @param string $long_options the allowed option long-tags
* @return array the given options and there values
- * @static
- * @access private
*/
- function _parseArgs($argv, $short_options, $long_options = null)
+ public static function _parseArgs($argv, $short_options, $long_options = null)
{
if (!is_array($argv) && $argv !== null) {
/*
@@ -108,10 +105,8 @@ class System
*
* @param mixed $error a PEAR error or a string with the error message
* @return bool false
- * @static
- * @access private
*/
- function raiseError($error)
+ protected static function raiseError($error)
{
if (PEAR::isError($error)) {
$error = $error->getMessage();
@@ -142,10 +137,8 @@ class System
* @param integer $aktinst starting deep of the lookup
* @param bool $silent if true, do not emit errors.
* @return array the structure of the dir
- * @static
- * @access private
*/
- function _dirToStruct($sPath, $maxinst, $aktinst = 0, $silent = false)
+ protected static function _dirToStruct($sPath, $maxinst, $aktinst = 0, $silent = false)
{
$struct = array('dirs' => array(), 'files' => array());
if (($dir = @opendir($sPath)) === false) {
@@ -188,7 +181,7 @@ class System
* @static
* @see System::_dirToStruct()
*/
- function _multipleToStruct($files)
+ protected static function _multipleToStruct($files)
{
$struct = array('dirs' => array(), 'files' => array());
settype($files, 'array');
@@ -214,7 +207,7 @@ class System
* @static
* @access public
*/
- function rm($args)
+ public static function rm($args)
{
$opts = System::_parseArgs($args, 'rf'); // "f" does nothing but I like it :-)
if (PEAR::isError($opts)) {
@@ -257,10 +250,8 @@ class System
* The -p option will create parent directories
* @param string $args the name of the director(y|ies) to create
* @return bool True for success
- * @static
- * @access public
*/
- function mkDir($args)
+ public static function mkDir($args)
{
$opts = System::_parseArgs($args, 'pm:');
if (PEAR::isError($opts)) {
@@ -328,10 +319,8 @@ class System
*
* @param string $args the arguments
* @return boolean true on success
- * @static
- * @access public
*/
- function &cat($args)
+ public static function &cat($args)
{
$ret = null;
$files = array();
@@ -402,10 +391,8 @@ class System
* @param string $args The arguments
* @return mixed the full path of the created (file|dir) or false
* @see System::tmpdir()
- * @static
- * @access public
*/
- function mktemp($args = null)
+ public static function mktemp($args = null)
{
static $first_time = true;
$opts = System::_parseArgs($args, 't:d');
@@ -454,11 +441,8 @@ class System
/**
* Remove temporary files created my mkTemp. This function is executed
* at script shutdown time
- *
- * @static
- * @access private
*/
- function _removeTmpFiles()
+ public static function _removeTmpFiles()
{
if (count($GLOBALS['_System_temp_files'])) {
$delete = $GLOBALS['_System_temp_files'];
@@ -474,10 +458,9 @@ class System
* Note: php.ini-recommended removes the "E" from the variables_order setting,
* making unavaible the $_ENV array, that s why we do tests with _ENV
*
- * @static
* @return string The temporary directory on the system
*/
- function tmpdir()
+ public static function tmpdir()
{
if (OS_WINDOWS) {
if ($var = isset($_ENV['TMP']) ? $_ENV['TMP'] : getenv('TMP')) {
@@ -507,10 +490,9 @@ class System
* @param mixed $fallback Value to return if $program is not found
*
* @return mixed A string with the full path or false if not found
- * @static
* @author Stig Bakken <ssb@php.net>
*/
- function which($program, $fallback = false)
+ public static function which($program, $fallback = false)
{
// enforce API
if (!is_string($program) || '' == $program) {
@@ -522,13 +504,11 @@ class System
$path_elements[] = dirname($program);
$program = basename($program);
} else {
- // Honor safe mode
- if (!ini_get('safe_mode') || !$path = ini_get('safe_mode_exec_dir')) {
- $path = getenv('PATH');
- if (!$path) {
- $path = getenv('Path'); // some OSes are just stupid enough to do this
- }
+ $path = getenv('PATH');
+ if (!$path) {
+ $path = getenv('Path'); // some OSes are just stupid enough to do this
}
+
$path_elements = explode(PATH_SEPARATOR, $path);
}
@@ -540,17 +520,14 @@ class System
if (strpos($program, '.') !== false) {
array_unshift($exe_suffixes, '');
}
- // is_executable() is not available on windows for PHP4
- $pear_is_executable = (function_exists('is_executable')) ? 'is_executable' : 'is_file';
} else {
$exe_suffixes = array('');
- $pear_is_executable = 'is_executable';
}
foreach ($exe_suffixes as $suff) {
foreach ($path_elements as $dir) {
$file = $dir . DIRECTORY_SEPARATOR . $program . $suff;
- if (@$pear_is_executable($file)) {
+ if (is_executable($file)) {
return $file;
}
}
@@ -579,10 +556,8 @@ class System
*
* @param mixed Either array or string with the command line
* @return array Array of found files
- * @static
- *
*/
- function find($args)
+ public static function find($args)
{
if (!is_array($args)) {
$args = preg_split('/\s+/', $args, -1, PREG_SPLIT_NO_EMPTY);
diff --git a/vendor/pear-pear.php.net/PEAR/pearcmd.php b/vendor/pear-pear.php.net/PEAR/pearcmd.php
index e7abe92b70e602cd71e3d8f54d8cc1bad659315f..99d1f18d2705c3b432bea2ca8c2e0cb36161e704 100644
--- a/vendor/pear-pear.php.net/PEAR/pearcmd.php
+++ b/vendor/pear-pear.php.net/PEAR/pearcmd.php
@@ -6,14 +6,13 @@
*
* PHP versions 4 and 5
*
- * @category pear
- * @package PEAR
- * @author Stig Bakken <ssb@php.net>
- * @author Tomas V.V.Cox <cox@idecnet.com>
- * @copyright 1997-2009 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
- * @link http://pear.php.net/package/PEAR
+ * @category pear
+ * @package PEAR
+ * @author Stig Bakken <ssb@php.net>
+ * @author Tomas V.V.Cox <cox@idecnet.com>
+ * @copyright 1997-2009 The Authors
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link http://pear.php.net/package/PEAR
*/
@ob_end_clean();
@@ -28,24 +27,21 @@ define('PEAR_IGNORE_BACKTRACE', 1);
//the space is needed for windows include paths with trailing backslash
// http://pear.php.net/bugs/bug.php?id=19482
if ('/home/dkatz/vufind3/vendor/pear-pear.php.net/PEAR ' != '@'.'include_path'.'@ ') {
- ini_set('include_path', trim('/home/dkatz/vufind3/vendor/pear-pear.php.net/PEAR '));
+ ini_set('include_path', trim('/home/dkatz/vufind3/vendor/pear-pear.php.net/PEAR '). PATH_SEPARATOR . get_include_path());
$raw = false;
} else {
// this is a raw, uninstalled pear, either a cvs checkout, or php distro
$raw = true;
}
@ini_set('allow_url_fopen', true);
-if (!ini_get('safe_mode')) {
- @set_time_limit(0);
-}
+@set_time_limit(0);
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');
-$pear_package_version = "1.9.5";
+$pear_package_version = "1.10.1";
require_once 'PEAR.php';
require_once 'PEAR/Frontend.php';
@@ -59,7 +55,8 @@ $all_commands = PEAR_Command::getCommands();
// remove this next part when we stop supporting that crap-ass PHP 4.2
if (!isset($_SERVER['argv']) && !isset($argv) && !isset($HTTP_SERVER_VARS['argv'])) {
- echo 'ERROR: either use the CLI php executable, or set register_argc_argv=On in php.ini';
+ echo 'ERROR: either use the CLI php executable, ' .
+ 'or set register_argc_argv=On in php.ini';
exit(1);
}
@@ -80,18 +77,14 @@ $opts = $options[0];
$fetype = 'CLI';
if ($progname == 'gpear' || $progname == 'pear-gtk') {
- $fetype = 'Gtk';
+ $fetype = 'Gtk2';
} else {
foreach ($opts as $opt) {
if ($opt[0] == 'G') {
- $fetype = 'Gtk';
+ $fetype = 'Gtk2';
}
}
}
-//Check if Gtk and PHP >= 5.1.0
-if ($fetype == 'Gtk' && version_compare(phpversion(), '5.1.0', '>=')) {
- $fetype = 'Gtk2';
-}
$pear_user_config = '';
$pear_system_config = '';
@@ -101,12 +94,12 @@ $verbose = 1;
foreach ($opts as $opt) {
switch ($opt[0]) {
- case 'c':
- $pear_user_config = $opt[1];
- break;
- case 'C':
- $pear_system_config = $opt[1];
- break;
+ case 'c':
+ $pear_user_config = $opt[1];
+ break;
+ case 'C':
+ $pear_system_config = $opt[1];
+ break;
}
}
@@ -117,10 +110,10 @@ $config = &PEAR_Config::singleton($pear_user_config, $pear_system_config);
if (PEAR::isError($config)) {
$_file = '';
if ($pear_user_config !== false) {
- $_file .= $pear_user_config;
+ $_file .= $pear_user_config;
}
if ($pear_system_config !== false) {
- $_file .= '/' . $pear_system_config;
+ $_file .= '/' . $pear_system_config;
}
if ($_file == '/') {
$_file = 'The default config file';
@@ -135,11 +128,6 @@ if (PEAR::isError($config)) {
$_PEAR_PHPDIR = $config->get('php_dir');
$ui->setConfig($config);
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, array($ui, "displayFatalError"));
-if (ini_get('safe_mode')) {
- $ui->outputData('WARNING: running in safe mode requires that all files created ' .
- 'be the same uid as the current script. PHP reports this script is uid: ' .
- @getmyuid() . ', and current user is: ' . @get_current_user());
-}
$verbose = $config->get("verbose");
$cmdopts = array();
@@ -149,17 +137,20 @@ if ($raw) {
$found = false;
foreach ($opts as $opt) {
if ($opt[0] == 'd' || $opt[0] == 'D') {
- $found = true; // the user knows what they are doing, and are setting config values
+ // the user knows what they are doing, and are setting config values
+ $found = true;
}
}
if (!$found) {
// no prior runs, try to install PEAR
- if (strpos(dirname(__FILE__), 'scripts')) {
- $packagexml = dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'package2.xml';
- $pearbase = dirname(dirname(__FILE__));
+ $parent = dirname(__FILE__);
+ if (strpos($parent, 'scripts')) {
+ $grandparent = dirname($parent);
+ $packagexml = $grandparent . DIRECTORY_SEPARATOR . 'package2.xml';
+ $pearbase = $grandparent;
} else {
- $packagexml = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'package2.xml';
- $pearbase = dirname(__FILE__);
+ $packagexml = $parent . DIRECTORY_SEPARATOR . 'package2.xml';
+ $pearbase = $parent;
}
if (file_exists($packagexml)) {
$options[1] = array(
@@ -170,7 +161,10 @@ if ($raw) {
$config->set('data_dir', $pearbase . DIRECTORY_SEPARATOR . 'data');
$config->set('doc_dir', $pearbase . DIRECTORY_SEPARATOR . 'docs');
$config->set('test_dir', $pearbase . DIRECTORY_SEPARATOR . 'tests');
- $config->set('ext_dir', $pearbase . DIRECTORY_SEPARATOR . 'extensions');
+ $config->set(
+ 'ext_dir',
+ $pearbase . DIRECTORY_SEPARATOR . 'extensions'
+ );
$config->set('bin_dir', $pearbase);
$config->mergeConfigFile($pearbase . 'pear.ini', false);
$config->store();
@@ -182,56 +176,64 @@ if ($raw) {
foreach ($opts as $opt) {
$param = !empty($opt[1]) ? $opt[1] : true;
switch ($opt[0]) {
- case 'd':
- if ($param === true) {
- die('Invalid usage of "-d" option, expected -d config_value=value, ' .
- 'received "-d"' . "\n");
- }
- $possible = explode('=', $param);
- if (count($possible) != 2) {
- die('Invalid usage of "-d" option, expected -d config_value=value, received "' .
- $param . '"' . "\n");
- }
- list($key, $value) = explode('=', $param);
- $config->set($key, $value, 'user');
- break;
- case 'D':
- if ($param === true) {
- die('Invalid usage of "-d" option, expected -d config_value=value, ' .
- 'received "-d"' . "\n");
- }
- $possible = explode('=', $param);
- if (count($possible) != 2) {
- die('Invalid usage of "-d" option, expected -d config_value=value, received "' .
- $param . '"' . "\n");
- }
- list($key, $value) = explode('=', $param);
- $config->set($key, $value, 'system');
- break;
- case 's':
- $store_user_config = true;
- break;
- case 'S':
- $store_system_config = true;
- break;
- case 'u':
- $config->remove($param, 'user');
- break;
- case 'v':
- $config->set('verbose', $config->get('verbose') + 1);
- break;
- case 'q':
- $config->set('verbose', $config->get('verbose') - 1);
- break;
- case 'V':
- usage(null, 'version');
- case 'c':
- case 'C':
- break;
- default:
- // all non pear params goes to the command
- $cmdopts[$opt[0]] = $param;
- break;
+ case 'd':
+ if ($param === true) {
+ die(
+ 'Invalid usage of "-d" option, expected -d config_value=value, ' .
+ 'received "-d"' . "\n"
+ );
+ }
+ $possible = explode('=', $param);
+ if (count($possible) != 2) {
+ die(
+ 'Invalid usage of "-d" option, expected ' .
+ '-d config_value=value, received "' . $param . '"' . "\n"
+ );
+ }
+ list($key, $value) = explode('=', $param);
+ $config->set($key, $value, 'user');
+ break;
+ case 'D':
+ if ($param === true) {
+ die(
+ 'Invalid usage of "-d" option, expected ' .
+ '-d config_value=value, received "-d"' . "\n"
+ );
+ }
+ $possible = explode('=', $param);
+ if (count($possible) != 2) {
+ die(
+ 'Invalid usage of "-d" option, expected ' .
+ '-d config_value=value, received "' . $param . '"' . "\n"
+ );
+ }
+ list($key, $value) = explode('=', $param);
+ $config->set($key, $value, 'system');
+ break;
+ case 's':
+ $store_user_config = true;
+ break;
+ case 'S':
+ $store_system_config = true;
+ break;
+ case 'u':
+ $config->remove($param, 'user');
+ break;
+ case 'v':
+ $config->set('verbose', $config->get('verbose') + 1);
+ break;
+ case 'q':
+ $config->set('verbose', $config->get('verbose') - 1);
+ break;
+ case 'V':
+ usage(null, 'version');
+ case 'c':
+ case 'C':
+ break;
+ default:
+ // all non pear params goes to the command
+ $cmdopts[$opt[0]] = $param;
+ break;
}
}
@@ -248,75 +250,93 @@ if (empty($command) && ($store_user_config || $store_system_config)) {
exit;
}
-if ($fetype == 'Gtk' || $fetype == 'Gtk2') {
+if ($fetype == 'Gtk2') {
if (!$config->validConfiguration()) {
- PEAR::raiseError('CRITICAL ERROR: no existing valid configuration files found in files ' .
- "'$pear_user_config' or '$pear_system_config', please copy an existing configuration" .
- 'file to one of these locations, or use the -c and -s options to create one');
+ PEAR::raiseError(
+ "CRITICAL ERROR: no existing valid configuration files found in " .
+ "files '$pear_user_config' or '$pear_system_config', " .
+ "please copy an existing configuration file to one of these " .
+ "locations, or use the -c and -s options to create one"
+ );
}
Gtk::main();
-} else do {
- if ($command == 'help') {
- usage(null, @$options[1][1]);
- }
-
- if (!$config->validConfiguration()) {
- PEAR::raiseError('CRITICAL ERROR: no existing valid configuration files found in files ' .
- "'$pear_user_config' or '$pear_system_config', please copy an existing configuration" .
- 'file to one of these locations, or use the -c and -s options to create one');
- }
+} else {
+ do {
+ if ($command == 'help') {
+ usage(null, isset($options[1][1]) ? $options[1][1] : null);
+ }
- PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
- $cmd = PEAR_Command::factory($command, $config);
- PEAR::popErrorHandling();
- if (PEAR::isError($cmd)) {
- usage(null, @$options[1][0]);
- }
+ if (!$config->validConfiguration()) {
+ PEAR::raiseError(
+ "CRITICAL ERROR: no existing valid configuration files found " .
+ "in files '$pear_user_config' or '$pear_system_config', " .
+ "please copy an existing configuration file to one of " .
+ "these locations, or use the -c and -s options to create one"
+ );
+ }
- $short_args = $long_args = null;
- PEAR_Command::getGetoptArgs($command, $short_args, $long_args);
- array_shift($options[1]);
- $tmp = Console_Getopt::getopt2($options[1], $short_args, $long_args);
+ PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
+ $cmd = PEAR_Command::factory($command, $config);
+ PEAR::popErrorHandling();
+ if (PEAR::isError($cmd)) {
+ usage(null, isset($options[1][0]) ? $options[1][0] : null);
+ }
- if (PEAR::isError($tmp)) {
- break;
- }
+ $short_args = $long_args = null;
+ PEAR_Command::getGetoptArgs($command, $short_args, $long_args);
+ array_shift($options[1]);
+ $tmp = Console_Getopt::getopt2($options[1], $short_args, $long_args);
- list($tmpopt, $params) = $tmp;
- $opts = array();
- foreach ($tmpopt as $foo => $tmp2) {
- list($opt, $value) = $tmp2;
- if ($value === null) {
- $value = true; // options without args
+ if (PEAR::isError($tmp)) {
+ break;
}
- if (strlen($opt) == 1) {
- $cmdoptions = $cmd->getOptions($command);
- foreach ($cmdoptions as $o => $d) {
- if (isset($d['shortopt']) && $d['shortopt'] == $opt) {
- $opts[$o] = $value;
- }
+ list($tmpopt, $params) = $tmp;
+ $opts = array();
+ foreach ($tmpopt as $foo => $tmp2) {
+ list($opt, $value) = $tmp2;
+ if ($value === null) {
+ $value = true; // options without args
}
- } else {
- if (substr($opt, 0, 2) == '--') {
- $opts[substr($opt, 2)] = $value;
+
+ if (strlen($opt) == 1) {
+ $cmdoptions = $cmd->getOptions($command);
+ foreach ($cmdoptions as $o => $d) {
+ if (isset($d['shortopt']) && $d['shortopt'] == $opt) {
+ $opts[$o] = $value;
+ }
+ }
+ } else {
+ if (substr($opt, 0, 2) == '--') {
+ $opts[substr($opt, 2)] = $value;
+ }
}
}
- }
- $ok = $cmd->run($command, $opts, $params);
- if ($ok === false) {
- PEAR::raiseError("unknown command `$command'");
- }
+ $ok = $cmd->run($command, $opts, $params);
+ if ($ok === false) {
+ PEAR::raiseError("unknown command `$command'");
+ }
- if (PEAR::isError($ok)) {
- PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, array($ui, "displayFatalError"));
- PEAR::raiseError($ok);
- }
-} while (false);
+ if (PEAR::isError($ok)) {
+ PEAR::setErrorHandling(
+ PEAR_ERROR_CALLBACK, array($ui, "displayFatalError")
+ );
+ PEAR::raiseError($ok);
+ }
+ } while (false);
+}
// {{{ usage()
+/**
+ * Display usage information
+ *
+ * @param mixed $error Optional error message
+ * @param mixed $helpsubject Optional subject/command to display help for
+ *
+ * @return void
+ */
function usage($error = null, $helpsubject = null)
{
global $progname, $all_commands;
@@ -341,7 +361,10 @@ function usage($error = null, $helpsubject = null)
"Usage: $progname [options] command [command-options] <parameters>\n".
"Type \"$progname help options\" to list all options.\n".
"Type \"$progname help shortcuts\" to list all command shortcuts.\n".
- "Type \"$progname help <command>\" to get the help for the specified command.";
+ "Type \"$progname help version\" or ".
+ "\"$progname version\" to list version information.\n".
+ "Type \"$progname help <command>\" to get the help ".
+ "for the specified command.";
}
fputs($stdout, "$put\n");
fclose($stdout);
@@ -352,6 +375,13 @@ function usage($error = null, $helpsubject = null)
exit(1);
}
+/**
+ * Return help string for specified command
+ *
+ * @param string $command Command to return help for
+ *
+ * @return void
+ */
function cmdHelp($command)
{
global $progname, $all_commands, $config;
@@ -401,23 +431,40 @@ function cmdHelp($command)
// }}}
-function error_handler($errno, $errmsg, $file, $line, $vars) {
- if ((defined('E_STRICT') && $errno & E_STRICT) || (defined('E_DEPRECATED') &&
- $errno & E_DEPRECATED) || !error_reporting()) {
- if (defined('E_STRICT') && $errno & E_STRICT) {
+/**
+ * error_handler
+ *
+ * @param mixed $errno Error number
+ * @param mixed $errmsg Message
+ * @param mixed $file Filename
+ * @param mixed $line Line number
+ * @param mixed $vars Variables
+ *
+ * @access public
+ * @return boolean
+ */
+function error_handler($errno, $errmsg, $file, $line, $vars)
+{
+ if ($errno & E_STRICT
+ || $errno & E_DEPRECATED
+ || !error_reporting()
+ ) {
+ if ($errno & E_STRICT) {
return; // E_STRICT
}
- if (defined('E_DEPRECATED') && $errno & E_DEPRECATED) {
+ if ($errno & E_DEPRECATED) {
return; // E_DEPRECATED
}
- if ($GLOBALS['config']->get('verbose') < 4) {
+ if (!error_reporting() && isset($GLOBALS['config']) && $GLOBALS['config']->get('verbose') < 4) {
return false; // @silenced error, show all if debug is high enough
}
}
$errortype = array (
+ E_DEPRECATED => 'Deprecated Warning',
E_ERROR => "Error",
E_WARNING => "Warning",
E_PARSE => "Parsing Error",
+ E_STRICT => 'Strict Warning',
E_NOTICE => "Notice",
E_CORE_ERROR => "Core Error",
E_CORE_WARNING => "Core Warning",
@@ -447,4 +494,4 @@ function error_handler($errno, $errmsg, $file, $line, $vars) {
* mode: php
* End:
*/
-// vim600:syn=php
\ No newline at end of file
+// vim600:syn=php
diff --git a/vendor/pear-pear.php.net/PEAR/peclcmd.php b/vendor/pear-pear.php.net/PEAR/peclcmd.php
index d416a0747c2952605fc62462e14d2e13d45b120d..e2745b3db1f0ee7a4c4aa456ad9dfb746249e8ee 100644
--- a/vendor/pear-pear.php.net/PEAR/peclcmd.php
+++ b/vendor/pear-pear.php.net/PEAR/peclcmd.php
@@ -12,7 +12,6 @@
* @author Tomas V.V.Cox <cox@idecnet.com>
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id$
* @link http://pear.php.net/package/PEAR
*/
@@ -22,7 +21,7 @@
//the space is needed for windows include paths with trailing backslash
// http://pear.php.net/bugs/bug.php?id=19482
if ('/home/dkatz/vufind3/vendor/pear-pear.php.net/PEAR ' != '@'.'include_path'.'@ ') {
- ini_set('include_path', trim('/home/dkatz/vufind3/vendor/pear-pear.php.net/PEAR '));
+ ini_set('include_path', trim('/home/dkatz/vufind3/vendor/pear-pear.php.net/PEAR '). PATH_SEPARATOR . get_include_path());
$raw = false;
} else {
// this is a raw, uninstalled pear, either a cvs checkout, or php distro
diff --git a/vendor/symfony/css-selector/CssSelector.php b/vendor/symfony/css-selector/CssSelector.php
index 82c9283ea2a9d382fdbbf9421f00883b322cb940..579700a61c600f31050b3783043b56ddf9a56d2e 100644
--- a/vendor/symfony/css-selector/CssSelector.php
+++ b/vendor/symfony/css-selector/CssSelector.php
@@ -61,8 +61,6 @@ use Symfony\Component\CssSelector\XPath\Translator;
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
*/
class CssSelector
{
@@ -77,8 +75,6 @@ class CssSelector
* @param string $prefix An optional prefix for the XPath expression.
*
* @return string
- *
- * @api
*/
public static function toXPath($cssExpr, $prefix = 'descendant-or-self::')
{
diff --git a/vendor/symfony/css-selector/composer.json b/vendor/symfony/css-selector/composer.json
index c7aebf7098550603d78c6987840a95ddc807651f..99eb4da2da9d9835e18d29d32f10c92271da4b66 100644
--- a/vendor/symfony/css-selector/composer.json
+++ b/vendor/symfony/css-selector/composer.json
@@ -22,9 +22,6 @@
"require": {
"php": ">=5.3.9"
},
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
"autoload": {
"psr-4": { "Symfony\\Component\\CssSelector\\": "" }
},
diff --git a/vendor/symfony/process/ExecutableFinder.php b/vendor/symfony/process/ExecutableFinder.php
index a9c0a5c8795bf2b525a8534e008bdc740c96b271..fa11cb6e402c6decbb4d5fcd075b4e4acaedd14b 100644
--- a/vendor/symfony/process/ExecutableFinder.php
+++ b/vendor/symfony/process/ExecutableFinder.php
@@ -56,7 +56,8 @@ class ExecutableFinder
$searchPath = explode(PATH_SEPARATOR, ini_get('open_basedir'));
$dirs = array();
foreach ($searchPath as $path) {
- if (is_dir($path)) {
+ // Silencing against https://bugs.php.net/69240
+ if (@is_dir($path)) {
$dirs[] = $path;
} else {
if (basename($path) == $name && is_executable($path)) {
diff --git a/vendor/symfony/process/PhpProcess.php b/vendor/symfony/process/PhpProcess.php
index 6a5858748a16501677c8354f40d0bad45096cd06..1adbd977adf8842accbb61d5cf776263ea29bde8 100644
--- a/vendor/symfony/process/PhpProcess.php
+++ b/vendor/symfony/process/PhpProcess.php
@@ -21,23 +21,19 @@ use Symfony\Component\Process\Exception\RuntimeException;
* print $p->getOutput()."\n";
*
* @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
*/
class PhpProcess extends Process
{
/**
* Constructor.
*
- * @param string $script The PHP script to run (as a string)
- * @param string $cwd The working directory
- * @param array $env The environment variables
- * @param int $timeout The timeout in seconds
- * @param array $options An array of options for proc_open
- *
- * @api
+ * @param string $script The PHP script to run (as a string)
+ * @param string|null $cwd The working directory or null to use the working dir of the current PHP process
+ * @param array|null $env The environment variables or null to use the same environment as the current PHP process
+ * @param int $timeout The timeout in seconds
+ * @param array $options An array of options for proc_open
*/
- public function __construct($script, $cwd = null, array $env = array(), $timeout = 60, array $options = array())
+ public function __construct($script, $cwd = null, array $env = null, $timeout = 60, array $options = array())
{
$executableFinder = new PhpExecutableFinder();
if (false === $php = $executableFinder->find()) {
@@ -49,8 +45,6 @@ class PhpProcess extends Process
/**
* Sets the path to the PHP binary to use.
- *
- * @api
*/
public function setPhpBinary($php)
{
diff --git a/vendor/symfony/process/Pipes/WindowsPipes.php b/vendor/symfony/process/Pipes/WindowsPipes.php
index b20f3ec34dd44b3d5d082b3381ee2d6a5a8077ee..1472f8c6c4aa0c635ad1ad5277e2b42f3969a890 100644
--- a/vendor/symfony/process/Pipes/WindowsPipes.php
+++ b/vendor/symfony/process/Pipes/WindowsPipes.php
@@ -48,12 +48,11 @@ class WindowsPipes extends AbstractPipes
//
// @see https://bugs.php.net/bug.php?id=51800
$this->files = array(
- Process::STDOUT => tempnam(sys_get_temp_dir(), 'sf_proc_stdout'),
- Process::STDERR => tempnam(sys_get_temp_dir(), 'sf_proc_stderr'),
+ Process::STDOUT => tempnam(sys_get_temp_dir(), 'out_sf_proc'),
+ Process::STDERR => tempnam(sys_get_temp_dir(), 'err_sf_proc'),
);
foreach ($this->files as $offset => $file) {
- $this->fileHandles[$offset] = fopen($this->files[$offset], 'rb');
- if (false === $this->fileHandles[$offset]) {
+ if (false === $file || false === $this->fileHandles[$offset] = fopen($file, 'rb')) {
throw new RuntimeException('A temporary file could not be opened to write the process output to, verify that your TEMP environment variable is writable');
}
}
diff --git a/vendor/symfony/process/Process.php b/vendor/symfony/process/Process.php
index f87792be7a5fdf31dafb691af7c6dfbde63aaca3..699151f384921e7f4237752c075286545b85b844 100644
--- a/vendor/symfony/process/Process.php
+++ b/vendor/symfony/process/Process.php
@@ -26,8 +26,6 @@ use Symfony\Component\Process\Pipes\WindowsPipes;
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Romain Neutron <imprec@gmail.com>
- *
- * @api
*/
class Process
{
@@ -133,14 +131,12 @@ class Process
*
* @param string $commandline The command line to run
* @param string|null $cwd The working directory or null to use the working dir of the current PHP process
- * @param array|null $env The environment variables or null to inherit
+ * @param array|null $env The environment variables or null to use the same environment as the current PHP process
* @param string|null $input The input
* @param int|float|null $timeout The timeout in seconds or null to disable
* @param array $options An array of options for proc_open
*
* @throws RuntimeException When proc_open is not installed
- *
- * @api
*/
public function __construct($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array())
{
@@ -200,8 +196,6 @@ class Process
* @throws RuntimeException When process can't be launched
* @throws RuntimeException When process stopped after receiving signal
* @throws LogicException In case a callback is provided and output has been disabled
- *
- * @api
*/
public function run($callback = null)
{
@@ -463,8 +457,6 @@ class Process
*
* @throws LogicException in case the output has been disabled
* @throws LogicException In case the process is not started
- *
- * @api
*/
public function getOutput()
{
@@ -527,8 +519,6 @@ class Process
*
* @throws LogicException in case the output has been disabled
* @throws LogicException In case the process is not started
- *
- * @api
*/
public function getErrorOutput()
{
@@ -591,8 +581,6 @@ class Process
* @return null|int The exit status code, null if the Process is not terminated
*
* @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled
- *
- * @api
*/
public function getExitCode()
{
@@ -631,8 +619,6 @@ class Process
* Checks if the process ended successfully.
*
* @return bool true if the process ended successfully, false otherwise
- *
- * @api
*/
public function isSuccessful()
{
@@ -648,8 +634,6 @@ class Process
*
* @throws RuntimeException In case --enable-sigchild is activated
* @throws LogicException In case the process is not terminated
- *
- * @api
*/
public function hasBeenSignaled()
{
@@ -673,8 +657,6 @@ class Process
*
* @throws RuntimeException In case --enable-sigchild is activated
* @throws LogicException In case the process is not terminated
- *
- * @api
*/
public function getTermSignal()
{
@@ -697,8 +679,6 @@ class Process
* @return bool
*
* @throws LogicException In case the process is not terminated
- *
- * @api
*/
public function hasBeenStopped()
{
@@ -717,8 +697,6 @@ class Process
* @return int
*
* @throws LogicException In case the process is not terminated
- *
- * @api
*/
public function getStopSignal()
{
@@ -1052,7 +1030,7 @@ class Process
$this->env = array();
foreach ($env as $key => $value) {
- $this->env[(binary) $key] = (binary) $value;
+ $this->env[$key] = (string) $value;
}
return $this;
@@ -1292,7 +1270,7 @@ class Process
*
* @param callable|null $callback The user defined PHP callback
*
- * @return callable A PHP callable
+ * @return \Closure A PHP closure
*/
protected function buildCallback($callback)
{
diff --git a/vendor/symfony/process/README.md b/vendor/symfony/process/README.md
index 7c83ed413e565455377502a16122c3128e62b499..7222fe8957e9dd5ac39fb8efceebbeb1d43afafb 100644
--- a/vendor/symfony/process/README.md
+++ b/vendor/symfony/process/README.md
@@ -7,12 +7,13 @@ In this example, we run a simple directory listing and get the result back:
```php
use Symfony\Component\Process\Process;
+use Symfony\Component\Process\Exception\ProcessFailedException;
$process = new Process('ls -lsa');
$process->setTimeout(3600);
$process->run();
if (!$process->isSuccessful()) {
- throw new RuntimeException($process->getErrorOutput());
+ throw new ProcessFailedException($process);
}
print $process->getOutput();
@@ -21,6 +22,19 @@ print $process->getOutput();
You can think that this is easy to achieve with plain PHP but it's not especially
if you want to take care of the subtle differences between the different platforms.
+You can simplify the code by using `mustRun()` instead of `run()`, which will
+throw a `ProcessFailedException` automatically in case of a problem:
+
+```php
+use Symfony\Component\Process\Process;
+
+$process = new Process('ls -lsa');
+$process->setTimeout(3600);
+$process->mustRun();
+
+print $process->getOutput();
+```
+
And if you want to be able to get some feedback in real-time, just pass an
anonymous function to the ``run()`` method and you will get the output buffer
as it becomes available:
diff --git a/vendor/symfony/process/Tests/AbstractProcessTest.php b/vendor/symfony/process/Tests/AbstractProcessTest.php
index 93b5779ad2134c55265206774e90309a6e8729b3..b2f60f9ffd98417b87b84e38797fd15d88e9d5e7 100644
--- a/vendor/symfony/process/Tests/AbstractProcessTest.php
+++ b/vendor/symfony/process/Tests/AbstractProcessTest.php
@@ -74,7 +74,9 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testStopWithTimeoutIsActuallyWorking()
{
- $this->verifyPosixIsEnabled();
+ if (!extension_loaded('pcntl')) {
+ $this->markTestSkipped('Extension pcntl is required.');
+ }
// exec is mandatory here since we send a signal to the process
// see https://github.com/symfony/symfony/issues/5030 about prepending
@@ -722,12 +724,8 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testProcessThrowsExceptionWhenExternallySignaled()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
- $this->markTestSkipped('Windows does not support POSIX signals');
- }
-
if (!function_exists('posix_kill')) {
- $this->markTestSkipped('posix_kill is required for this test');
+ $this->markTestSkipped('Function posix_kill is required.');
}
$termSignal = defined('SIGKILL') ? SIGKILL : 9;
@@ -904,7 +902,9 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testSignal()
{
- $this->verifyPosixIsEnabled();
+ if (!extension_loaded('pcntl')) {
+ $this->markTestSkipped('Extension pcntl is required.');
+ }
$process = $this->getProcess('exec php -f '.__DIR__.'/SignalListener.php');
$process->start();
@@ -920,7 +920,9 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
public function testExitCodeIsAvailableAfterSignal()
{
- $this->verifyPosixIsEnabled();
+ if (!extension_loaded('pcntl')) {
+ $this->markTestSkipped('Extension pcntl is required.');
+ }
$process = $this->getProcess('sleep 4');
$process->start();
@@ -941,7 +943,10 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
*/
public function testSignalProcessNotRunning()
{
- $this->verifyPosixIsEnabled();
+ if (!extension_loaded('pcntl')) {
+ $this->markTestSkipped('Extension pcntl is required.');
+ }
+
$process = $this->getProcess(self::$phpBin.' -v');
$process->signal(SIGHUP);
}
@@ -995,16 +1000,6 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
);
}
- private function verifyPosixIsEnabled()
- {
- if ('\\' === DIRECTORY_SEPARATOR) {
- $this->markTestSkipped('POSIX signals do not work on Windows');
- }
- if (!defined('SIGUSR1')) {
- $this->markTestSkipped('The pcntl extension is not enabled');
- }
- }
-
/**
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
diff --git a/vendor/symfony/process/Tests/ExecutableFinderTest.php b/vendor/symfony/process/Tests/ExecutableFinderTest.php
index 61a471b4f6dfdd57a2ec6d4fdbaca61423a99b13..812429e8867e0548b65e62fd3e115c319f4cfcbe 100644
--- a/vendor/symfony/process/Tests/ExecutableFinderTest.php
+++ b/vendor/symfony/process/Tests/ExecutableFinderTest.php
@@ -34,12 +34,11 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
putenv('PATH='.$path);
}
+ /**
+ * @requires PHP 5.4
+ */
public function testFind()
{
- if (!defined('PHP_BINARY')) {
- $this->markTestSkipped('Requires the PHP_BINARY constant');
- }
-
if (ini_get('open_basedir')) {
$this->markTestSkipped('Cannot test when open_basedir is set');
}
@@ -68,12 +67,11 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $result);
}
+ /**
+ * @requires PHP 5.4
+ */
public function testFindWithExtraDirs()
{
- if (!defined('PHP_BINARY')) {
- $this->markTestSkipped('Requires the PHP_BINARY constant');
- }
-
if (ini_get('open_basedir')) {
$this->markTestSkipped('Cannot test when open_basedir is set');
}
@@ -88,12 +86,11 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
$this->assertSamePath(PHP_BINARY, $result);
}
+ /**
+ * @requires PHP 5.4
+ */
public function testFindWithOpenBaseDir()
{
- if (!defined('PHP_BINARY')) {
- $this->markTestSkipped('Requires the PHP_BINARY constant');
- }
-
if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Cannot run test on windows');
}
@@ -110,16 +107,14 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
$this->assertSamePath(PHP_BINARY, $result);
}
+ /**
+ * @requires PHP 5.4
+ */
public function testFindProcessInOpenBasedir()
{
if (ini_get('open_basedir')) {
$this->markTestSkipped('Cannot test when open_basedir is set');
}
-
- if (!defined('PHP_BINARY')) {
- $this->markTestSkipped('Requires the PHP_BINARY constant');
- }
-
if ('\\' === DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Cannot run test on windows');
}
diff --git a/vendor/symfony/process/Tests/NonStopableProcess.php b/vendor/symfony/process/Tests/NonStopableProcess.php
index 692feebba2a2be56c844f143cc833dd279f95de1..54510c16a375593e8151e8fb4d4cb35389c52303 100644
--- a/vendor/symfony/process/Tests/NonStopableProcess.php
+++ b/vendor/symfony/process/Tests/NonStopableProcess.php
@@ -1,5 +1,14 @@
<?php
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
/**
* Runs a PHP script that can be stopped only with a SIGKILL (9) signal for 3 seconds.
*
diff --git a/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php b/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
index 26673ea45a1c3436ec1db5e0fc376bcf516c20d4..bbd7ddfeb284e07c07ba195a7969e05268b0c06b 100644
--- a/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
+++ b/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
@@ -1,5 +1,14 @@
<?php
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
define('ERR_SELECT_FAILED', 1);
define('ERR_TIMEOUT', 2);
define('ERR_READ_FAILED', 3);
diff --git a/vendor/symfony/process/Tests/SignalListener.php b/vendor/symfony/process/Tests/SignalListener.php
index bd4d138b047612bbf58229cc4e0e232aaf2b4a0a..4206550f5b8b7b849e81c05954030049db365b42 100644
--- a/vendor/symfony/process/Tests/SignalListener.php
+++ b/vendor/symfony/process/Tests/SignalListener.php
@@ -1,5 +1,14 @@
<?php
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
// required for signal handling
declare (ticks = 1);
diff --git a/vendor/symfony/process/Tests/SimpleProcessTest.php b/vendor/symfony/process/Tests/SimpleProcessTest.php
index 98eeb0ecbc9a4dbdb34c20661691cc5e60bbaa0b..b3ee5c00f8894cc68f1059ccb1ac7cf6206918b8 100644
--- a/vendor/symfony/process/Tests/SimpleProcessTest.php
+++ b/vendor/symfony/process/Tests/SimpleProcessTest.php
@@ -121,9 +121,12 @@ class SimpleProcessTest extends AbstractProcessTest
parent::testExitCodeIsAvailableAfterSignal();
}
+ /**
+ * @expectedException \Symfony\Component\Process\Exception\LogicException
+ * @expectedExceptionMessage Can not send signal on a non running process.
+ */
public function testSignalProcessNotRunning()
{
- $this->setExpectedException('Symfony\Component\Process\Exception\LogicException', 'Can not send signal on a non running process.');
parent::testSignalProcessNotRunning();
}
diff --git a/vendor/symfony/process/composer.json b/vendor/symfony/process/composer.json
index d0cae4d8e0494ca45ea40c2c5a32903456c3a4fb..8d21bafccaccde16586d9b628447abd4bea56212 100644
--- a/vendor/symfony/process/composer.json
+++ b/vendor/symfony/process/composer.json
@@ -18,9 +18,6 @@
"require": {
"php": ">=5.3.9"
},
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
"autoload": {
"psr-4": { "Symfony\\Component\\Process\\": "" }
},
diff --git a/vendor/symfony/yaml/Exception/DumpException.php b/vendor/symfony/yaml/Exception/DumpException.php
index 9b3e6de079588525af41501b8836cf4fb7cea646..cce972f2468c93228fa3b7e24276eaf3ebd540b8 100644
--- a/vendor/symfony/yaml/Exception/DumpException.php
+++ b/vendor/symfony/yaml/Exception/DumpException.php
@@ -15,8 +15,6 @@ namespace Symfony\Component\Yaml\Exception;
* Exception class thrown when an error occurs during dumping.
*
* @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
*/
class DumpException extends RuntimeException
{
diff --git a/vendor/symfony/yaml/Exception/ExceptionInterface.php b/vendor/symfony/yaml/Exception/ExceptionInterface.php
index 92e5c2ea4e84118771ab94785f7e8f7d8f714983..ad850eea1d70fed08fb31077ab9da3274b6bece1 100644
--- a/vendor/symfony/yaml/Exception/ExceptionInterface.php
+++ b/vendor/symfony/yaml/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@ namespace Symfony\Component\Yaml\Exception;
* Exception interface for all exceptions thrown by the component.
*
* @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
*/
interface ExceptionInterface
{
diff --git a/vendor/symfony/yaml/Exception/ParseException.php b/vendor/symfony/yaml/Exception/ParseException.php
index 0447dff13734573410d12550af0715b479bee127..b74eb9132f513babfaf369568ed5c2bec77cc335 100644
--- a/vendor/symfony/yaml/Exception/ParseException.php
+++ b/vendor/symfony/yaml/Exception/ParseException.php
@@ -15,8 +15,6 @@ namespace Symfony\Component\Yaml\Exception;
* Exception class thrown when an error occurs during parsing.
*
* @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
*/
class ParseException extends RuntimeException
{
diff --git a/vendor/symfony/yaml/Exception/RuntimeException.php b/vendor/symfony/yaml/Exception/RuntimeException.php
index 3573bf15abb81bae0b9dcefe263615a9299324c6..3f36b73bec1355bd0607cb24bfbc914a7057af03 100644
--- a/vendor/symfony/yaml/Exception/RuntimeException.php
+++ b/vendor/symfony/yaml/Exception/RuntimeException.php
@@ -15,8 +15,6 @@ namespace Symfony\Component\Yaml\Exception;
* Exception class thrown when an error occurs during parsing.
*
* @author Romain Neutron <imprec@gmail.com>
- *
- * @api
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
diff --git a/vendor/symfony/yaml/Inline.php b/vendor/symfony/yaml/Inline.php
index 6e3877bff041f02391bc62980fd0a134b3d8b9fb..a5b53bd9658c441468dc3c2efcbf519e751c664e 100644
--- a/vendor/symfony/yaml/Inline.php
+++ b/vendor/symfony/yaml/Inline.php
@@ -224,8 +224,8 @@ class Inline
$i += strlen($output);
// remove comments
- if (false !== $strpos = strpos($output, ' #')) {
- $output = rtrim(substr($output, 0, $strpos));
+ if (preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {
+ $output = substr($output, 0, $match[0][1]);
}
} elseif (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
$output = $match[1];
diff --git a/vendor/symfony/yaml/Parser.php b/vendor/symfony/yaml/Parser.php
index 651c017049664e453d1e9b68f1fd514bc14b5500..04f2237be27ed9568fa15d51cd7a8a2991baa2db 100644
--- a/vendor/symfony/yaml/Parser.php
+++ b/vendor/symfony/yaml/Parser.php
@@ -20,7 +20,9 @@ use Symfony\Component\Yaml\Exception\ParseException;
*/
class Parser
{
- const FOLDED_SCALAR_PATTERN = '(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?';
+ const BLOCK_SCALAR_HEADER_PATTERN = '(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?';
+ // BC - wrongly named
+ const FOLDED_SCALAR_PATTERN = self::BLOCK_SCALAR_HEADER_PATTERN;
private $offset = 0;
private $lines = array();
@@ -373,8 +375,8 @@ class Parser
$isItUnindentedCollection = $this->isStringUnIndentedCollectionItem($this->currentLine);
- // Comments must not be removed inside a string block (ie. after a line ending with "|")
- $removeCommentsPattern = '~'.self::FOLDED_SCALAR_PATTERN.'$~';
+ // Comments must not be removed inside a block scalar
+ $removeCommentsPattern = '~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~';
$removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
while ($this->moveToNextLine()) {
@@ -464,10 +466,10 @@ class Parser
return $this->refs[$value];
}
- if (preg_match('/^'.self::FOLDED_SCALAR_PATTERN.'$/', $value, $matches)) {
+ if (preg_match('/^'.self::BLOCK_SCALAR_HEADER_PATTERN.'$/', $value, $matches)) {
$modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
- return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
+ return $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
}
try {
@@ -481,15 +483,15 @@ class Parser
}
/**
- * Parses a folded scalar.
+ * Parses a block scalar.
*
- * @param string $separator The separator that was used to begin this folded scalar (| or >)
- * @param string $indicator The indicator that was used to begin this folded scalar (+ or -)
- * @param int $indentation The indentation that was used to begin this folded scalar
+ * @param string $style The style indicator that was used to begin this block scalar (| or >)
+ * @param string $chomping The chomping indicator that was used to begin this block scalar (+ or -)
+ * @param int $indentation The indentation indicator that was used to begin this block scalar
*
* @return string The text value
*/
- private function parseFoldedScalar($separator, $indicator = '', $indentation = 0)
+ private function parseBlockScalar($style, $chomping = '', $indentation = 0)
{
$notEOF = $this->moveToNextLine();
if (!$notEOF) {
@@ -544,17 +546,23 @@ class Parser
$this->moveToPreviousLine();
}
- // replace all non-trailing single newlines with spaces in folded blocks
- if ('>' === $separator) {
+ // folded style
+ if ('>' === $style) {
+ // folded lines
+ // replace all non-leading/non-trailing single newlines with spaces
preg_match('/(\n*)$/', $text, $matches);
- $text = preg_replace('/(?<!\n)\n(?!\n)/', ' ', rtrim($text, "\n"));
+ $text = preg_replace('/(?<!\n|^)\n(?!\n)/', ' ', rtrim($text, "\n"));
$text .= $matches[1];
+
+ // empty separation lines
+ // remove one newline from each group of non-leading/non-trailing newlines
+ $text = preg_replace('/[^\n]\n+\K\n(?=[^\n])/', '', $text);
}
- // deal with trailing newlines as indicated
- if ('' === $indicator) {
+ // deal with trailing newlines
+ if ('' === $chomping) {
$text = preg_replace('/\n+$/', "\n", $text);
- } elseif ('-' === $indicator) {
+ } elseif ('-' === $chomping) {
$text = preg_replace('/\n+$/', '', $text);
}
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml b/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
index 6a7ffeca46f3b9491c1d4731feaa5eb02802a7c7..b72a9b6996565eaba0a725b596e64d526c542986 100644
--- a/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
+++ b/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
@@ -7,8 +7,11 @@ yaml: |
ex2: "foo # bar" # comment
ex3: 'foo # bar' # comment
ex4: foo # comment
+ ex5: foo # comment with tab before
+ ex6: foo#foo # comment here
+ ex7: foo # ignore me # and me
php: |
- array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo')
+ array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo', 'ex5' => 'foo', 'ex6' => 'foo#foo', 'ex7' => 'foo')
---
test: Comments in the middle
brief: >
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml b/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
index 7a54f1639b117417f27d1ce72bbfa7414d0e50e2..a427be1c846909f69eb10c8c37964fe65df4f3fa 100644
--- a/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
+++ b/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
@@ -51,9 +51,9 @@ php: |
'~',
)
---
-test: Empty lines in folded blocks
+test: Empty lines in literal blocks
brief: >
- Empty lines in folded blocks
+ Empty lines in literal blocks
yaml: |
foo:
bar: |
@@ -65,6 +65,20 @@ yaml: |
php: |
array('foo' => array('bar' => "foo\n\n\n \nbar\n"))
---
+test: Empty lines in folded blocks
+brief: >
+ Empty lines in folded blocks
+yaml: |
+ foo:
+ bar: >
+
+ foo
+
+
+ bar
+php: |
+ array('foo' => array('bar' => "\nfoo\n\nbar\n"))
+---
test: IP addresses
brief: >
IP addresses
diff --git a/vendor/symfony/yaml/Tests/ParserTest.php b/vendor/symfony/yaml/Tests/ParserTest.php
index 08ef43faa51c861af85fcb64cbea0559dc502aaf..0ccc6ee979660ed8120b83ff12ca8e0703ca561c 100644
--- a/vendor/symfony/yaml/Tests/ParserTest.php
+++ b/vendor/symfony/yaml/Tests/ParserTest.php
@@ -446,14 +446,11 @@ EOF;
$this->parser->parse('foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}', true, false);
}
+ /**
+ * @requires extension iconv
+ */
public function testNonUtf8Exception()
{
- if (!function_exists('iconv')) {
- $this->markTestSkipped('Exceptions for non-utf8 charsets require the iconv() function.');
-
- return;
- }
-
$yamls = array(
iconv('UTF-8', 'ISO-8859-1', "foo: 'äöüß'"),
iconv('UTF-8', 'ISO-8859-15', "euro: '€'"),
@@ -622,6 +619,32 @@ EOF;
$this->assertEquals(array('hash' => null), Yaml::parse($input));
}
+ public function testCommentAtTheRootIndent()
+ {
+ $this->assertEquals(array(
+ 'services' => array(
+ 'app.foo_service' => array(
+ 'class' => 'Foo',
+ ),
+ 'app/bar_service' => array(
+ 'class' => 'Bar',
+ ),
+ ),
+ ), Yaml::parse(<<<EOF
+# comment 1
+services:
+# comment 2
+ # comment 3
+ app.foo_service:
+ class: Foo
+# comment 4
+ # comment 5
+ app/bar_service:
+ class: Bar
+EOF
+ ));
+ }
+
public function testStringBlockWithComments()
{
$this->assertEquals(array('content' => <<<EOT
diff --git a/vendor/symfony/yaml/Yaml.php b/vendor/symfony/yaml/Yaml.php
index b6def51749e6c6b14c75dfc5d94dc4bd64a0272f..2d5f62c32623ac256d58e73191e7471824cd8f6f 100644
--- a/vendor/symfony/yaml/Yaml.php
+++ b/vendor/symfony/yaml/Yaml.php
@@ -17,8 +17,6 @@ use Symfony\Component\Yaml\Exception\ParseException;
* Yaml offers convenience methods to load and dump YAML.
*
* @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
*/
class Yaml
{
@@ -48,8 +46,6 @@ class Yaml
* @return array The YAML converted to a PHP array
*
* @throws ParseException If the YAML is not valid
- *
- * @api
*/
public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
{
@@ -92,8 +88,6 @@ class Yaml
* @param bool $objectSupport true if object support is enabled, false otherwise
*
* @return string A YAML string representing the original PHP array
- *
- * @api
*/
public static function dump($array, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false)
{
diff --git a/vendor/symfony/yaml/composer.json b/vendor/symfony/yaml/composer.json
index b07b439c96ec4ad14290816e133b8b0bc478c270..b798141542c16272dcaae3baedc5a17eb5acd722 100644
--- a/vendor/symfony/yaml/composer.json
+++ b/vendor/symfony/yaml/composer.json
@@ -18,9 +18,6 @@
"require": {
"php": ">=5.3.9"
},
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
"autoload": {
"psr-4": { "Symfony\\Component\\Yaml\\": "" }
},