From 4637d72a63b107bf12e7470b8b1f078e6d53bec9 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 10 Mar 2015 12:29:41 -0400
Subject: [PATCH] Updated dependencies.
---
composer.lock | 52 +-
vendor/autoload.php | 2 +-
vendor/composer/autoload_real.php | 8 +-
vendor/composer/include_paths.php | 8 +-
vendor/composer/installed.json | 334 ++++++------
.../Archive_Tar/Archive/Tar.php | 9 +-
.../Console_Getopt/Console/Getopt.php | 28 +-
.../Structures_Graph/Structures/Graph.php | 148 ++---
.../Graph/Manipulator/AcyclicTest.php | 12 +-
.../Graph/Manipulator/TopologicalSorter.php | 133 +++--
.../Structures/Graph/Node.php | 4 +-
.../data/Structures_Graph/LICENSE | 504 ------------------
.../pear-pear.php.net/XML_Util/XML/Util.php | 330 ++++++------
.../vufindhttp/src/VuFindHttp/HttpService.php | 8 +-
.../src/VuFindTest/HttpServiceTest.php | 25 +
15 files changed, 601 insertions(+), 1004 deletions(-)
delete mode 100644 vendor/pear-pear.php.net/Structures_Graph/data/Structures_Graph/LICENSE
diff --git a/composer.lock b/composer.lock
index d9215c7a6a3..801cc3900a8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -259,10 +259,10 @@
},
{
"name": "pear-pear.php.net/Archive_Tar",
- "version": "1.3.13",
+ "version": "1.3.15",
"dist": {
"type": "file",
- "url": "http://pear.php.net/get/Archive_Tar-1.3.13.tgz",
+ "url": "http://pear.php.net/get/Archive_Tar-1.3.15.tgz",
"reference": null,
"shasum": null
},
@@ -270,7 +270,7 @@
"php": ">=4.3.0.0"
},
"replace": {
- "pear-pear/archive_tar": "== 1.3.13.0"
+ "pear-pear/archive_tar": "== 1.3.15.0"
},
"type": "pear-library",
"autoload": {
@@ -281,22 +281,25 @@
"include-path": [
"/"
],
+ "license": [
+ "New BSD\n License"
+ ],
"description": "This class provides handling of tar files in PHP.\nIt supports creating, listing, extracting and adding to tar files.\nGzip support is available if PHP has the zlib extension built-in or\nloaded. Bz2 compression is also supported with the bz2 extension loaded."
},
{
"name": "pear-pear.php.net/Console_Getopt",
- "version": "1.3.1",
+ "version": "1.4.0",
"dist": {
"type": "file",
- "url": "http://pear.php.net/get/Console_Getopt-1.3.1.tgz",
+ "url": "http://pear.php.net/get/Console_Getopt-1.4.0.tgz",
"reference": null,
"shasum": null
},
"require": {
- "php": ">=4.3.0.0"
+ "php": ">=5.4.0.0"
},
"replace": {
- "pear-pear/console_getopt": "== 1.3.1.0"
+ "pear-pear/console_getopt": "== 1.4.0.0"
},
"type": "pear-library",
"autoload": {
@@ -307,6 +310,9 @@
"include-path": [
"/"
],
+ "license": [
+ "PHP License"
+ ],
"description": "This is a PHP implementation of "getopt" supporting both\nshort and long options."
},
{
@@ -373,18 +379,18 @@
},
{
"name": "pear-pear.php.net/Structures_Graph",
- "version": "1.0.4",
+ "version": "1.1.0",
"dist": {
"type": "file",
- "url": "http://pear.php.net/get/Structures_Graph-1.0.4.tgz",
+ "url": "http://pear.php.net/get/Structures_Graph-1.1.0.tgz",
"reference": null,
"shasum": null
},
"require": {
- "php": ">=4.2.0.0"
+ "php": ">=5.3.0.0"
},
"replace": {
- "pear-pear/structures_graph": "== 1.0.4.0"
+ "pear-pear/structures_graph": "== 1.1.0.0"
},
"type": "pear-library",
"autoload": {
@@ -395,6 +401,9 @@
"include-path": [
"/"
],
+ "license": [
+ "LGPL License"
+ ],
"description": "Structures_Graph is a package for creating and manipulating graph datastructures. It allows building of directed\nand undirected graphs, with data and metadata stored in nodes. The library provides functions for graph traversing\nas well as for characteristic extraction from the graph topology."
},
{
@@ -452,19 +461,19 @@
},
{
"name": "pear-pear.php.net/XML_Util",
- "version": "1.2.3",
+ "version": "1.3.0",
"dist": {
"type": "file",
- "url": "http://pear.php.net/get/XML_Util-1.2.3.tgz",
+ "url": "http://pear.php.net/get/XML_Util-1.3.0.tgz",
"reference": null,
"shasum": null
},
"require": {
"ext-pcre": "*",
- "php": ">=4.3.0.0"
+ "php": ">=5.3.0.0"
},
"replace": {
- "pear-pear/xml_util": "== 1.2.3.0"
+ "pear-pear/xml_util": "== 1.3.0.0"
},
"type": "pear-library",
"autoload": {
@@ -475,6 +484,9 @@
"include-path": [
"/"
],
+ "license": [
+ "BSD License"
+ ],
"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."
},
{
@@ -595,16 +607,16 @@
},
{
"name": "vufind-org/vufindhttp",
- "version": "v1.0.3",
+ "version": "v1.0.4",
"source": {
"type": "git",
"url": "https://github.com/vufind-org/vufindhttp.git",
- "reference": "63b16b9c345b5e52eb3fa254abf9c3d260e92c87"
+ "reference": "1b03d31c914faa6e50b6fe811fe609328d1d287b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vufind-org/vufindhttp/zipball/63b16b9c345b5e52eb3fa254abf9c3d260e92c87",
- "reference": "63b16b9c345b5e52eb3fa254abf9c3d260e92c87",
+ "url": "https://api.github.com/repos/vufind-org/vufindhttp/zipball/1b03d31c914faa6e50b6fe811fe609328d1d287b",
+ "reference": "1b03d31c914faa6e50b6fe811fe609328d1d287b",
"shasum": ""
},
"require": {
@@ -637,7 +649,7 @@
],
"description": "VuFind 2.x HTTP service library",
"homepage": "http://vufind.org/",
- "time": "2015-02-06 16:09:37"
+ "time": "2015-03-10 16:22:47"
},
{
"name": "zendframework/zendframework",
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 13f509d16c0..d56b404e8b5 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit5e68da56cccfcc8abc8c4813710f1c62::getLoader();
+return ComposerAutoloaderInite41f4086e246f975b818fc74feba2689::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 60102a37942..de15c3fe7df 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit5e68da56cccfcc8abc8c4813710f1c62
+class ComposerAutoloaderInite41f4086e246f975b818fc74feba2689
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit5e68da56cccfcc8abc8c4813710f1c62
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit5e68da56cccfcc8abc8c4813710f1c62', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInite41f4086e246f975b818fc74feba2689', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit5e68da56cccfcc8abc8c4813710f1c62', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInite41f4086e246f975b818fc74feba2689', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
array_push($includePaths, get_include_path());
@@ -48,7 +48,7 @@ class ComposerAutoloaderInit5e68da56cccfcc8abc8c4813710f1c62
}
}
-function composerRequire5e68da56cccfcc8abc8c4813710f1c62($file)
+function composerRequiree41f4086e246f975b818fc74feba2689($file)
{
require $file;
}
diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php
index 20869ac55f9..190e4ed1162 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/File_MARC',
- $vendorDir . '/pear-pear.php.net/XML_Util',
- $vendorDir . '/pear-pear.php.net/Console_Getopt',
- $vendorDir . '/pear-pear.php.net/Structures_Graph',
- $vendorDir . '/pear-pear.php.net/Archive_Tar',
$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/XML_Util',
);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 822f118636e..903ca4a3f6c 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -260,119 +260,6 @@
],
"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": "pear-pear.php.net/XML_Util",
- "version": "1.2.3",
- "version_normalized": "1.2.3.0",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/XML_Util-1.2.3.tgz",
- "reference": null,
- "shasum": null
- },
- "require": {
- "ext-pcre": "*",
- "php": ">=4.3.0.0"
- },
- "replace": {
- "pear-pear/xml_util": "== 1.2.3.0"
- },
- "type": "pear-library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
- ],
- "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/Console_Getopt",
- "version": "1.3.1",
- "version_normalized": "1.3.1.0",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/Console_Getopt-1.3.1.tgz",
- "reference": null,
- "shasum": null
- },
- "require": {
- "php": ">=4.3.0.0"
- },
- "replace": {
- "pear-pear/console_getopt": "== 1.3.1.0"
- },
- "type": "pear-library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
- ],
- "description": "This is a PHP implementation of "getopt" supporting both\nshort and long options."
- },
- {
- "name": "pear-pear.php.net/Structures_Graph",
- "version": "1.0.4",
- "version_normalized": "1.0.4.0",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/Structures_Graph-1.0.4.tgz",
- "reference": null,
- "shasum": null
- },
- "require": {
- "php": ">=4.2.0.0"
- },
- "replace": {
- "pear-pear/structures_graph": "== 1.0.4.0"
- },
- "type": "pear-library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
- ],
- "description": "Structures_Graph is a package for creating and manipulating graph datastructures. It allows building of directed\nand undirected graphs, with data and metadata stored in nodes. The library provides functions for graph traversing\nas well as for characteristic extraction from the graph topology."
- },
- {
- "name": "pear-pear.php.net/Archive_Tar",
- "version": "1.3.13",
- "version_normalized": "1.3.13.0",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/Archive_Tar-1.3.13.tgz",
- "reference": null,
- "shasum": null
- },
- "require": {
- "php": ">=4.3.0.0"
- },
- "replace": {
- "pear-pear/archive_tar": "== 1.3.13.0"
- },
- "type": "pear-library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
- ],
- "description": "This class provides handling of tar files in PHP.\nIt supports creating, listing, extracting and adding to tar files.\nGzip support is available if PHP has the zlib extension built-in or\nloaded. Bz2 compression is also supported with the bz2 extension loaded."
- },
{
"name": "pear-pear.php.net/PEAR",
"version": "1.9.5",
@@ -1040,54 +927,6 @@
"description": "Symfony Process Component",
"homepage": "http://symfony.com"
},
- {
- "name": "vufind-org/vufindhttp",
- "version": "v1.0.3",
- "version_normalized": "1.0.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/vufind-org/vufindhttp.git",
- "reference": "63b16b9c345b5e52eb3fa254abf9c3d260e92c87"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/vufind-org/vufindhttp/zipball/63b16b9c345b5e52eb3fa254abf9c3d260e92c87",
- "reference": "63b16b9c345b5e52eb3fa254abf9c3d260e92c87",
- "shasum": ""
- },
- "require": {
- "zendframework/zend-http": ">=2.2"
- },
- "require-dev": {
- "zendframework/zend-uri": ">=2.2"
- },
- "time": "2015-02-06 16:09:37",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "VuFindHttp\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-2.0"
- ],
- "authors": [
- {
- "name": "David Maus",
- "email": "maus@hab.de",
- "role": "Developer"
- },
- {
- "name": "Demian Katz",
- "email": "demian.katz@villanova.edu",
- "role": "Maintainer"
- }
- ],
- "description": "VuFind 2.x HTTP service library",
- "homepage": "http://vufind.org/"
- },
{
"name": "zfr/rbac",
"version": "1.2.0",
@@ -1340,5 +1179,178 @@
"source": "https://github.com/zendframework/zf2/tree/release-2.3.5",
"issues": "https://github.com/zendframework/zf2/issues"
}
+ },
+ {
+ "name": "vufind-org/vufindhttp",
+ "version": "v1.0.4",
+ "version_normalized": "1.0.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/vufind-org/vufindhttp.git",
+ "reference": "1b03d31c914faa6e50b6fe811fe609328d1d287b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/vufind-org/vufindhttp/zipball/1b03d31c914faa6e50b6fe811fe609328d1d287b",
+ "reference": "1b03d31c914faa6e50b6fe811fe609328d1d287b",
+ "shasum": ""
+ },
+ "require": {
+ "zendframework/zend-http": ">=2.2"
+ },
+ "require-dev": {
+ "zendframework/zend-uri": ">=2.2"
+ },
+ "time": "2015-03-10 16:22:47",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "VuFindHttp\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0"
+ ],
+ "authors": [
+ {
+ "name": "David Maus",
+ "email": "maus@hab.de",
+ "role": "Developer"
+ },
+ {
+ "name": "Demian Katz",
+ "email": "demian.katz@villanova.edu",
+ "role": "Maintainer"
+ }
+ ],
+ "description": "VuFind 2.x HTTP service library",
+ "homepage": "http://vufind.org/"
+ },
+ {
+ "name": "pear-pear.php.net/Archive_Tar",
+ "version": "1.3.15",
+ "version_normalized": "1.3.15.0",
+ "dist": {
+ "type": "file",
+ "url": "http://pear.php.net/get/Archive_Tar-1.3.15.tgz",
+ "reference": null,
+ "shasum": null
+ },
+ "require": {
+ "php": ">=4.3.0.0"
+ },
+ "replace": {
+ "pear-pear/archive_tar": "== 1.3.15.0"
+ },
+ "type": "pear-library",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ ""
+ ]
+ },
+ "include-path": [
+ "/"
+ ],
+ "license": [
+ "New BSD\n License"
+ ],
+ "description": "This class provides handling of tar files in PHP.\nIt supports creating, listing, extracting and adding to tar files.\nGzip support is available if PHP has the zlib extension built-in or\nloaded. Bz2 compression is also supported with the bz2 extension loaded."
+ },
+ {
+ "name": "pear-pear.php.net/Console_Getopt",
+ "version": "1.4.0",
+ "version_normalized": "1.4.0.0",
+ "dist": {
+ "type": "file",
+ "url": "http://pear.php.net/get/Console_Getopt-1.4.0.tgz",
+ "reference": null,
+ "shasum": null
+ },
+ "require": {
+ "php": ">=5.4.0.0"
+ },
+ "replace": {
+ "pear-pear/console_getopt": "== 1.4.0.0"
+ },
+ "type": "pear-library",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ ""
+ ]
+ },
+ "include-path": [
+ "/"
+ ],
+ "license": [
+ "PHP License"
+ ],
+ "description": "This is a PHP implementation of "getopt" supporting both\nshort and long options."
+ },
+ {
+ "name": "pear-pear.php.net/Structures_Graph",
+ "version": "1.1.0",
+ "version_normalized": "1.1.0.0",
+ "dist": {
+ "type": "file",
+ "url": "http://pear.php.net/get/Structures_Graph-1.1.0.tgz",
+ "reference": null,
+ "shasum": null
+ },
+ "require": {
+ "php": ">=5.3.0.0"
+ },
+ "replace": {
+ "pear-pear/structures_graph": "== 1.1.0.0"
+ },
+ "type": "pear-library",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ ""
+ ]
+ },
+ "include-path": [
+ "/"
+ ],
+ "license": [
+ "LGPL License"
+ ],
+ "description": "Structures_Graph is a package for creating and manipulating graph datastructures. It allows building of directed\nand undirected graphs, with data and metadata stored in nodes. The library provides functions for graph traversing\nas well as for characteristic extraction from the graph topology."
+ },
+ {
+ "name": "pear-pear.php.net/XML_Util",
+ "version": "1.3.0",
+ "version_normalized": "1.3.0.0",
+ "dist": {
+ "type": "file",
+ "url": "http://pear.php.net/get/XML_Util-1.3.0.tgz",
+ "reference": null,
+ "shasum": null
+ },
+ "require": {
+ "ext-pcre": "*",
+ "php": ">=5.3.0.0"
+ },
+ "replace": {
+ "pear-pear/xml_util": "== 1.3.0.0"
+ },
+ "type": "pear-library",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ ""
+ ]
+ },
+ "include-path": [
+ "/"
+ ],
+ "license": [
+ "BSD License"
+ ],
+ "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."
}
]
diff --git a/vendor/pear-pear.php.net/Archive_Tar/Archive/Tar.php b/vendor/pear-pear.php.net/Archive_Tar/Archive/Tar.php
index 5aa82013ed2..7ff17164d6c 100644
--- a/vendor/pear-pear.php.net/Archive_Tar/Archive/Tar.php
+++ b/vendor/pear-pear.php.net/Archive_Tar/Archive/Tar.php
@@ -710,7 +710,7 @@ class Archive_Tar extends PEAR
break;
default :
- $this->_error('Unknow attribute code ' . $v_att_list[$i] . '');
+ $this->_error('Unknown attribute code ' . $v_att_list[$i] . '');
return false;
}
@@ -1718,7 +1718,7 @@ class Archive_Tar extends PEAR
}
// ----- Extract the properties
- $v_header['filename'] = $v_data['filename'];
+ $v_header['filename'] = rtrim($v_data['filename'], "\0");
if ($this->_maliciousFilename($v_header['filename'])) {
$this->_error(
'Malicious .tar detected, file "' . $v_header['filename'] .
@@ -1776,6 +1776,7 @@ class Archive_Tar extends PEAR
function _readLongHeader(&$v_header)
{
$v_filename = '';
+ $v_filesize = $v_header['size'];
$n = floor($v_header['size'] / 512);
for ($i = 0; $i < $n; $i++) {
$v_content = $this->_readBlock();
@@ -1783,7 +1784,7 @@ class Archive_Tar extends PEAR
}
if (($v_header['size'] % 512) != 0) {
$v_content = $this->_readBlock();
- $v_filename .= trim($v_content);
+ $v_filename .= $v_content;
}
// ----- Read the next header
@@ -1793,7 +1794,7 @@ class Archive_Tar extends PEAR
return false;
}
- $v_filename = trim($v_filename);
+ $v_filename = rtrim(substr($v_filename, 0, $v_filesize), "\0");
$v_header['filename'] = $v_filename;
if ($this->_maliciousFilename($v_filename)) {
$this->_error(
diff --git a/vendor/pear-pear.php.net/Console_Getopt/Console/Getopt.php b/vendor/pear-pear.php.net/Console_Getopt/Console/Getopt.php
index d8abfc491d4..0da88585d71 100644
--- a/vendor/pear-pear.php.net/Console_Getopt/Console/Getopt.php
+++ b/vendor/pear-pear.php.net/Console_Getopt/Console/Getopt.php
@@ -17,7 +17,7 @@
* @package Console_Getopt
* @author Andrei Zmievski <andrei@php.net>
* @license http://www.php.net/license/3_0.txt PHP 3.0
- * @version CVS: $Id: Getopt.php 306067 2010-12-08 00:13:31Z dufuz $
+ * @version CVS: $Id$
* @link http://pear.php.net/package/Console_Getopt
*/
@@ -68,9 +68,8 @@ class Console_Getopt
*
* @return array two-element array containing the list of parsed options and
* the non-option arguments
- * @access public
*/
- function getopt2($args, $short_options, $long_options = null, $skip_unknown = false)
+ public static function getopt2($args, $short_options, $long_options = null, $skip_unknown = false)
{
return Console_Getopt::doGetopt(2, $args, $short_options, $long_options, $skip_unknown);
}
@@ -87,7 +86,7 @@ class Console_Getopt
* @return array two-element array containing the list of parsed options and
* the non-option arguments
*/
- function getopt($args, $short_options, $long_options = null, $skip_unknown = false)
+ public static function getopt($args, $short_options, $long_options = null, $skip_unknown = false)
{
return Console_Getopt::doGetopt(1, $args, $short_options, $long_options, $skip_unknown);
}
@@ -103,7 +102,7 @@ class Console_Getopt
*
* @return array
*/
- function doGetopt($version, $args, $short_options, $long_options = null, $skip_unknown = false)
+ public static function doGetopt($version, $args, $short_options, $long_options = null, $skip_unknown = false)
{
// in case you pass directly readPHPArgv() as the first arg
if (PEAR::isError($args)) {
@@ -182,10 +181,9 @@ class Console_Getopt
* @param string[] &$args
* @param boolean $skip_unknown suppresses Console_Getopt: unrecognized option
*
- * @access private
* @return void
*/
- function _parseShortOption($arg, $short_options, &$opts, &$args, $skip_unknown)
+ protected static function _parseShortOption($arg, $short_options, &$opts, &$args, $skip_unknown)
{
for ($i = 0; $i < strlen($arg); $i++) {
$opt = $arg{$i};
@@ -220,11 +218,11 @@ class Console_Getopt
if (Console_Getopt::_isShortOpt($opt_arg)
|| Console_Getopt::_isLongOpt($opt_arg)) {
$msg = "option requires an argument --$opt";
- return PEAR::raiseError("Console_Getopt:" . $msg);
+ return PEAR::raiseError("Console_Getopt: " . $msg);
}
} else {
$msg = "option requires an argument --$opt";
- return PEAR::raiseError("Console_Getopt:" . $msg);
+ return PEAR::raiseError("Console_Getopt: " . $msg);
}
}
}
@@ -238,10 +236,9 @@ class Console_Getopt
*
* @param string $arg Argument to check
*
- * @access private
* @return bool
*/
- function _isShortOpt($arg)
+ protected static function _isShortOpt($arg)
{
return strlen($arg) == 2 && $arg[0] == '-'
&& preg_match('/[a-zA-Z]/', $arg[1]);
@@ -252,10 +249,9 @@ class Console_Getopt
*
* @param string $arg Argument to check
*
- * @access private
* @return bool
*/
- function _isLongOpt($arg)
+ protected static function _isLongOpt($arg)
{
return strlen($arg) > 2 && $arg[0] == '-' && $arg[1] == '-' &&
preg_match('/[a-zA-Z]+$/', substr($arg, 2));
@@ -269,10 +265,9 @@ class Console_Getopt
* @param string[][] &$opts
* @param string[] &$args
*
- * @access private
* @return void|PEAR_Error
*/
- function _parseLongOption($arg, $long_options, &$opts, &$args, $skip_unknown)
+ protected static function _parseLongOption($arg, $long_options, &$opts, &$args, $skip_unknown)
{
@list($opt, $opt_arg) = explode('=', $arg, 2);
@@ -344,10 +339,9 @@ class Console_Getopt
* Safely read the $argv PHP array across different PHP configurations.
* Will take care on register_globals and register_argc_argv ini directives
*
- * @access public
* @return mixed the $argv PHP array or PEAR error if not registered
*/
- function readPHPArgv()
+ public static function readPHPArgv()
{
global $argv;
if (!is_array($argv)) {
diff --git a/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph.php b/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph.php
index 3757f1584fd..5a64f6e0bf2 100644
--- a/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph.php
+++ b/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph.php
@@ -26,14 +26,11 @@
/**
* The Graph.php file contains the definition of the Structures_Graph class
*
- * @see Structures_Graph
* @package Structures_Graph
*/
/* dependencies {{{ */
-/** PEAR base classes */
require_once 'PEAR.php';
-/** Graph Node */
require_once 'Structures/Graph/Node.php';
/* }}} */
@@ -48,65 +45,86 @@ define('STRUCTURES_GRAPH_ERROR_GENERIC', 100);
* directional, and can be traveled only one way. In an undirected graph, arcs
* are bidirectional, and can be traveled both ways.
*
- * @author Sérgio Carvalho <sergio.carvalho@portugalmail.com>
- * @copyright (c) 2004 by Sérgio Carvalho
- * @package Structures_Graph
+ * @author Sérgio Carvalho <sergio.carvalho@portugalmail.com>
+ * @copyright (c) 2004 by Sérgio Carvalho
+ * @package Structures_Graph
*/
/* }}} */
-class Structures_Graph {
- /* fields {{{ */
+class Structures_Graph
+{
/**
+ * List of node objects in this graph
* @access private
*/
var $_nodes = array();
+
/**
+ * If the graph is directed or not
* @access private
*/
var $_directed = false;
- /* }}} */
- /* Constructor {{{ */
+
/**
- *
- * Constructor
- *
- * @param boolean Set to true if the graph is directed. Set to false if it is not directed. (Optional, defaults to true)
- * @access public
- */
- function Structures_Graph($directed = true) {
+ * Constructor
+ *
+ * @param boolean $directed Set to true if the graph is directed.
+ * Set to false if it is not directed.
+ */
+ public function __construct($directed = true)
+ {
$this->_directed = $directed;
}
- /* }}} */
- /* isDirected {{{ */
/**
- *
- * Return true if a graph is directed
- *
- * @return boolean true if the graph is directed
- * @access public
- */
- function isDirected() {
+ * Old constructor (PHP4-style; kept for BC with extending classes)
+ *
+ * @param boolean $directed Set to true if the graph is directed.
+ * Set to false if it is not directed.
+ *
+ * @return void
+ */
+ public function Structures_Graph($directed = true)
+ {
+ $this->__construct($directed);
+ }
+
+ /**
+ * Return true if a graph is directed
+ *
+ * @return boolean true if the graph is directed
+ */
+ public function isDirected()
+ {
return (boolean) $this->_directed;
}
- /* }}} */
- /* addNode {{{ */
/**
- *
- * Add a Node to the Graph
- *
- * @param Structures_Graph_Node The node to be added.
- * @access public
- */
- function addNode(&$newNode) {
+ * Add a Node to the Graph
+ *
+ * @param Structures_Graph_Node $newNode The node to be added.
+ *
+ * @return void
+ */
+ public function addNode(&$newNode)
+ {
// We only add nodes
- if (!is_a($newNode, 'Structures_Graph_Node')) return Pear::raiseError('Structures_Graph::addNode received an object that is not a Structures_Graph_Node', STRUCTURES_GRAPH_ERROR_GENERIC);
- // Graphs are node *sets*, so duplicates are forbidden. We allow nodes that are exactly equal, but disallow equal references.
- foreach($this->_nodes as $key => $node) {
+ if (!is_a($newNode, 'Structures_Graph_Node')) {
+ return Pear::raiseError(
+ 'Structures_Graph::addNode received an object that is not'
+ . ' a Structures_Graph_Node',
+ STRUCTURES_GRAPH_ERROR_GENERIC
+ );
+ }
+
+ //Graphs are node *sets*, so duplicates are forbidden.
+ // We allow nodes that are exactly equal, but disallow equal references.
+ foreach ($this->_nodes as $key => $node) {
/*
- ZE1 equality operators choke on the recursive cycle introduced by the _graph field in the Node object.
- So, we'll check references the hard way (change $this->_nodes[$key] and check if the change reflects in
+ ZE1 equality operators choke on the recursive cycle introduced
+ by the _graph field in the Node object.
+ So, we'll check references the hard way
+ (change $this->_nodes[$key] and check if the change reflects in
$node)
*/
$savedData = $this->_nodes[$key];
@@ -114,41 +132,45 @@ class Structures_Graph {
$this->_nodes[$key] = true;
if ($node === true) {
$this->_nodes[$key] = false;
- if ($node === false) $referenceIsEqualFlag = true;
+ if ($node === false) {
+ $referenceIsEqualFlag = true;
+ }
}
$this->_nodes[$key] = $savedData;
- if ($referenceIsEqualFlag) return Pear::raiseError('Structures_Graph::addNode received an object that is a duplicate for this dataset', STRUCTURES_GRAPH_ERROR_GENERIC);
+ if ($referenceIsEqualFlag) {
+ return Pear::raiseError(
+ 'Structures_Graph::addNode received an object that is'
+ . ' a duplicate for this dataset',
+ STRUCTURES_GRAPH_ERROR_GENERIC
+ );
+ }
}
$this->_nodes[] =& $newNode;
$newNode->setGraph($this);
}
- /* }}} */
- /* removeNode (unimplemented) {{{ */
/**
- *
- * Remove a Node from the Graph
- *
- * @todo This is unimplemented
- * @param Structures_Graph_Node The node to be removed from the graph
- * @access public
- */
- function removeNode(&$node) {
+ * Remove a Node from the Graph
+ *
+ * @param Structures_Graph_Node $node The node to be removed from the graph
+ *
+ * @return void
+ * @todo This is unimplemented
+ */
+ public function removeNode(&$node)
+ {
}
- /* }}} */
- /* getNodes {{{ */
/**
- *
- * Return the node set, in no particular order. For ordered node sets, use a Graph Manipulator insted.
- *
- * @access public
- * @see Structures_Graph_Manipulator_TopologicalSorter
- * @return array The set of nodes in this graph
- */
- function &getNodes() {
+ * Return the node set, in no particular order.
+ * For ordered node sets, use a Graph Manipulator insted.
+ *
+ * @return array The set of nodes in this graph
+ * @see Structures_Graph_Manipulator_TopologicalSorter
+ */
+ public function &getNodes()
+ {
return $this->_nodes;
}
- /* }}} */
}
?>
diff --git a/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Manipulator/AcyclicTest.php b/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Manipulator/AcyclicTest.php
index fc1ba92f6a2..7ecd7563ce5 100644
--- a/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Manipulator/AcyclicTest.php
+++ b/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Manipulator/AcyclicTest.php
@@ -59,10 +59,9 @@ class Structures_Graph_Manipulator_AcyclicTest {
* This is a variant of Structures_Graph::inDegree which does
* not count nodes marked as visited.
*
- * @access private
* @return integer Number of non-visited nodes that link to this one
*/
- function _nonVisitedInDegree(&$node) {
+ protected static function _nonVisitedInDegree(&$node) {
$result = 0;
$graphNodes =& $node->_graph->getNodes();
foreach (array_keys($graphNodes) as $key) {
@@ -75,9 +74,9 @@ class Structures_Graph_Manipulator_AcyclicTest {
/* _isAcyclic {{{ */
/**
- * @access private
- */
- function _isAcyclic(&$graph) {
+ * Check if the graph is acyclic
+ */
+ protected static function _isAcyclic(&$graph) {
// Mark every node as not visited
$nodes =& $graph->getNodes();
$nodeKeys = array_keys($nodes);
@@ -121,9 +120,8 @@ class Structures_Graph_Manipulator_AcyclicTest {
* isAcyclic returns true if a graph contains no cycles, false otherwise.
*
* @return boolean true iff graph is acyclic
- * @access public
*/
- function isAcyclic(&$graph) {
+ public static function isAcyclic(&$graph) {
// We only test graphs
if (!is_a($graph, 'Structures_Graph')) return Pear::raiseError('Structures_Graph_Manipulator_AcyclicTest::isAcyclic received an object that is not a Structures_Graph', STRUCTURES_GRAPH_ERROR_GENERIC);
if (!$graph->isDirected()) return false; // Only directed graphs may be acyclic
diff --git a/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Manipulator/TopologicalSorter.php b/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Manipulator/TopologicalSorter.php
index 98a9fa0b607..f57ee10c6d0 100644
--- a/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Manipulator/TopologicalSorter.php
+++ b/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Manipulator/TopologicalSorter.php
@@ -26,22 +26,14 @@
/**
* This file contains the definition of the Structures_Graph_Manipulator_TopologicalSorter class.
*
- * @see Structures_Graph_Manipulator_TopologicalSorter
* @package Structures_Graph
*/
-/* dependencies {{{ */
-/** */
require_once 'PEAR.php';
-/** */
require_once 'Structures/Graph.php';
-/** */
require_once 'Structures/Graph/Node.php';
-/** */
require_once 'Structures/Graph/Manipulator/AcyclicTest.php';
-/* }}} */
-/* class Structures_Graph_Manipulator_TopologicalSorter {{{ */
/**
* The Structures_Graph_Manipulator_TopologicalSorter is a manipulator
* which is able to return the set of nodes in a graph, sorted by topological
@@ -50,44 +42,55 @@ require_once 'Structures/Graph/Manipulator/AcyclicTest.php';
* A graph may only be sorted topologically iff it's a DAG. You can test it
* with the Structures_Graph_Manipulator_AcyclicTest.
*
- * @author Sérgio Carvalho <sergio.carvalho@portugalmail.com>
- * @copyright (c) 2004 by Sérgio Carvalho
- * @see Structures_Graph_Manipulator_AcyclicTest
- * @package Structures_Graph
+ * @author Sérgio Carvalho <sergio.carvalho@portugalmail.com>
+ * @copyright (c) 2004 by Sérgio Carvalho
+ * @see Structures_Graph_Manipulator_AcyclicTest
+ * @package Structures_Graph
*/
-class Structures_Graph_Manipulator_TopologicalSorter {
- /* _nonVisitedInDegree {{{ */
+class Structures_Graph_Manipulator_TopologicalSorter
+{
/**
- *
- * This is a variant of Structures_Graph::inDegree which does
- * not count nodes marked as visited.
- *
- * @access private
- * @return integer Number of non-visited nodes that link to this one
- */
- function _nonVisitedInDegree(&$node) {
+ * This is a variant of Structures_Graph::inDegree which does
+ * not count nodes marked as visited.
+ *
+ * @param object $node Node to check
+ *
+ * @return integer Number of non-visited nodes that link to this one
+ */
+ protected static function _nonVisitedInDegree(&$node)
+ {
$result = 0;
$graphNodes =& $node->_graph->getNodes();
foreach (array_keys($graphNodes) as $key) {
- if ((!$graphNodes[$key]->getMetadata('topological-sort-visited')) && $graphNodes[$key]->connectsTo($node)) $result++;
+ if ((!$graphNodes[$key]->getMetadata('topological-sort-visited'))
+ && $graphNodes[$key]->connectsTo($node)
+ ) {
+ $result++;
+ }
}
return $result;
}
- /* }}} */
- /* _sort {{{ */
/**
- * @access private
- */
- function _sort(&$graph) {
+ * Sort implementation
+ *
+ * @param object $graph Graph to sort
+ *
+ * @return void
+ */
+ protected static function _sort(&$graph)
+ {
// Mark every node as not visited
$nodes =& $graph->getNodes();
$nodeKeys = array_keys($nodes);
$refGenerator = array();
- foreach($nodeKeys as $key) {
+ foreach ($nodeKeys as $key) {
$refGenerator[] = false;
- $nodes[$key]->setMetadata('topological-sort-visited', $refGenerator[sizeof($refGenerator) - 1]);
+ $nodes[$key]->setMetadata(
+ 'topological-sort-visited',
+ $refGenerator[sizeof($refGenerator) - 1]
+ );
}
// Iteratively peel off leaf nodes
@@ -95,43 +98,61 @@ class Structures_Graph_Manipulator_TopologicalSorter {
do {
// Find out which nodes are leafs (excluding visited nodes)
$leafNodes = array();
- foreach($nodeKeys as $key) {
- if ((!$nodes[$key]->getMetadata('topological-sort-visited')) && Structures_Graph_Manipulator_TopologicalSorter::_nonVisitedInDegree($nodes[$key]) == 0) {
+ foreach ($nodeKeys as $key) {
+ if ((!$nodes[$key]->getMetadata('topological-sort-visited'))
+ && static::_nonVisitedInDegree($nodes[$key]) == 0
+ ) {
$leafNodes[] =& $nodes[$key];
}
}
// Mark leafs as visited
$refGenerator[] = $topologicalLevel;
- for ($i=sizeof($leafNodes) - 1; $i>=0; $i--) {
+ for ($i = sizeof($leafNodes) - 1; $i>=0; $i--) {
$visited =& $leafNodes[$i]->getMetadata('topological-sort-visited');
$visited = true;
$leafNodes[$i]->setMetadata('topological-sort-visited', $visited);
- $leafNodes[$i]->setMetadata('topological-sort-level', $refGenerator[sizeof($refGenerator) - 1]);
+ $leafNodes[$i]->setMetadata(
+ 'topological-sort-level',
+ $refGenerator[sizeof($refGenerator) - 1]
+ );
}
$topologicalLevel++;
} while (sizeof($leafNodes) > 0);
// Cleanup visited marks
- foreach($nodeKeys as $key) $nodes[$key]->unsetMetadata('topological-sort-visited');
+ foreach ($nodeKeys as $key) {
+ $nodes[$key]->unsetMetadata('topological-sort-visited');
+ }
}
- /* }}} */
- /* sort {{{ */
/**
- *
- * sort returns the graph's nodes, sorted by topological order.
- *
- * The result is an array with
- * as many entries as topological levels. Each entry in this array is an array of nodes within
- * the given topological level.
- *
- * @return array The graph's nodes, sorted by topological order.
- * @access public
- */
- function sort(&$graph) {
+ * Sort returns the graph's nodes, sorted by topological order.
+ *
+ * The result is an array with as many entries as topological levels.
+ * Each entry in this array is an array of nodes within
+ * the given topological level.
+ *
+ * @param object $graph Graph to sort
+ *
+ * @return array The graph's nodes, sorted by topological order.
+ */
+ public static function sort(&$graph)
+ {
// We only sort graphs
- if (!is_a($graph, 'Structures_Graph')) return Pear::raiseError('Structures_Graph_Manipulator_TopologicalSorter::sort received an object that is not a Structures_Graph', STRUCTURES_GRAPH_ERROR_GENERIC);
- if (!Structures_Graph_Manipulator_AcyclicTest::isAcyclic($graph)) return Pear::raiseError('Structures_Graph_Manipulator_TopologicalSorter::sort received an graph that has cycles', STRUCTURES_GRAPH_ERROR_GENERIC);
+ if (!is_a($graph, 'Structures_Graph')) {
+ return Pear::raiseError(
+ 'Structures_Graph_Manipulator_TopologicalSorter::sort received'
+ . ' an object that is not a Structures_Graph',
+ STRUCTURES_GRAPH_ERROR_GENERIC
+ );
+ }
+ if (!Structures_Graph_Manipulator_AcyclicTest::isAcyclic($graph)) {
+ return Pear::raiseError(
+ 'Structures_Graph_Manipulator_TopologicalSorter::sort'
+ . ' received an graph that has cycles',
+ STRUCTURES_GRAPH_ERROR_GENERIC
+ );
+ }
Structures_Graph_Manipulator_TopologicalSorter::_sort($graph);
$result = array();
@@ -139,15 +160,17 @@ class Structures_Graph_Manipulator_TopologicalSorter {
// Fill out result array
$nodes =& $graph->getNodes();
$nodeKeys = array_keys($nodes);
- foreach($nodeKeys as $key) {
- if (!array_key_exists($nodes[$key]->getMetadata('topological-sort-level'), $result)) $result[$nodes[$key]->getMetadata('topological-sort-level')] = array();
- $result[$nodes[$key]->getMetadata('topological-sort-level')][] =& $nodes[$key];
+ foreach ($nodeKeys as $key) {
+ if (!array_key_exists($nodes[$key]->getMetadata('topological-sort-level'), $result)) {
+ $result[$nodes[$key]->getMetadata('topological-sort-level')]
+ = array();
+ }
+ $result[$nodes[$key]->getMetadata('topological-sort-level')][]
+ =& $nodes[$key];
$nodes[$key]->unsetMetadata('topological-sort-level');
}
return $result;
}
- /* }}} */
}
-/* }}} */
?>
diff --git a/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Node.php b/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Node.php
index 95afa2b12f9..21c76301ced 100644
--- a/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Node.php
+++ b/vendor/pear-pear.php.net/Structures_Graph/Structures/Graph/Node.php
@@ -131,7 +131,7 @@ class Structures_Graph_Node {
* @return mixed Data to store in node
* @access public
*/
- function setData($data) {
+ function setData(&$data) {
$this->_data =& $data;
}
/* }}} */
@@ -213,7 +213,7 @@ class Structures_Graph_Node {
* @param mixed Data
* @access public
*/
- function setMetadata($key, $data) {
+ function setMetadata($key, &$data) {
$this->_metadata[$key] =& $data;
}
/* }}} */
diff --git a/vendor/pear-pear.php.net/Structures_Graph/data/Structures_Graph/LICENSE b/vendor/pear-pear.php.net/Structures_Graph/data/Structures_Graph/LICENSE
deleted file mode 100644
index b1e3f5a2638..00000000000
--- a/vendor/pear-pear.php.net/Structures_Graph/data/Structures_Graph/LICENSE
+++ /dev/null
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/vendor/pear-pear.php.net/XML_Util/XML/Util.php b/vendor/pear-pear.php.net/XML_Util/XML/Util.php
index 6895e10147c..e3dbdeadac9 100644
--- a/vendor/pear-pear.php.net/XML_Util/XML/Util.php
+++ b/vendor/pear-pear.php.net/XML_Util/XML/Util.php
@@ -1,7 +1,4 @@
<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
/**
* XML_Util
*
@@ -48,54 +45,54 @@
*/
/**
- * error code for invalid chars in XML name
+ * Error code for invalid chars in XML name
*/
define('XML_UTIL_ERROR_INVALID_CHARS', 51);
/**
- * error code for invalid chars in XML name
+ * Error code for invalid chars in XML name
*/
define('XML_UTIL_ERROR_INVALID_START', 52);
/**
- * error code for non-scalar tag content
+ * Error code for non-scalar tag content
*/
define('XML_UTIL_ERROR_NON_SCALAR_CONTENT', 60);
/**
- * error code for missing tag name
+ * Error code for missing tag name
*/
define('XML_UTIL_ERROR_NO_TAG_NAME', 61);
/**
- * replace XML entities
+ * Replace XML entities
*/
define('XML_UTIL_REPLACE_ENTITIES', 1);
/**
- * embedd content in a CData Section
+ * Embedd content in a CData Section
*/
define('XML_UTIL_CDATA_SECTION', 5);
/**
- * do not replace entitites
+ * Do not replace entitites
*/
define('XML_UTIL_ENTITIES_NONE', 0);
/**
- * replace all XML entitites
+ * Replace all XML entitites
* This setting will replace <, >, ", ' and &
*/
define('XML_UTIL_ENTITIES_XML', 1);
/**
- * replace only required XML entitites
+ * Replace only required XML entitites
* This setting will replace <, " and &
*/
define('XML_UTIL_ENTITIES_XML_REQUIRED', 2);
/**
- * replace HTML entitites
+ * Replace HTML entitites
* @link http://www.php.net/htmlentities
*/
define('XML_UTIL_ENTITIES_HTML', 3);
@@ -111,33 +108,30 @@ define('XML_UTIL_COLLAPSE_ALL', 1);
define('XML_UTIL_COLLAPSE_XHTML_ONLY', 2);
/**
- * utility class for working with XML documents
+ * Utility class for working with XML documents
*
-
* @category XML
* @package XML_Util
* @author Stephan Schmidt <schst@php.net>
* @copyright 2003-2008 Stephan Schmidt <schst@php.net>
* @license http://opensource.org/licenses/bsd-license New BSD License
- * @version Release: 1.2.3
+ * @version Release: 1.3.0
* @link http://pear.php.net/package/XML_Util
*/
class XML_Util
{
/**
- * return API version
+ * Return API version
*
* @return string $version API version
- * @access public
- * @static
*/
- function apiVersion()
+ public static function apiVersion()
{
return '1.1';
}
/**
- * replace XML entities
+ * Replace XML entities
*
* With the optional second parameter, you may select, which
* entities should be replaced.
@@ -172,27 +166,33 @@ class XML_Util
* by the htmlentities() function
*
* @return string string with replaced chars
- * @access public
- * @static
- * @see reverseEntities()
+ * @see reverseEntities()
*/
- function replaceEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
- $encoding = 'ISO-8859-1')
- {
+ public static function replaceEntities(
+ $string, $replaceEntities = XML_UTIL_ENTITIES_XML, $encoding = 'ISO-8859-1'
+ ) {
switch ($replaceEntities) {
case XML_UTIL_ENTITIES_XML:
- return strtr($string, array(
- '&' => '&',
- '>' => '>',
- '<' => '<',
- '"' => '"',
- '\'' => ''' ));
+ return strtr(
+ $string,
+ array(
+ '&' => '&',
+ '>' => '>',
+ '<' => '<',
+ '"' => '"',
+ '\'' => '''
+ )
+ );
break;
case XML_UTIL_ENTITIES_XML_REQUIRED:
- return strtr($string, array(
- '&' => '&',
- '<' => '<',
- '"' => '"' ));
+ return strtr(
+ $string,
+ array(
+ '&' => '&',
+ '<' => '<',
+ '"' => '"'
+ )
+ );
break;
case XML_UTIL_ENTITIES_HTML:
return htmlentities($string, ENT_COMPAT, $encoding);
@@ -202,7 +202,7 @@ class XML_Util
}
/**
- * reverse XML entities
+ * Reverse XML entities
*
* With the optional second parameter, you may select, which
* entities should be reversed.
@@ -238,27 +238,33 @@ class XML_Util
* by the html_entity_decode() function
*
* @return string string with replaced chars
- * @access public
- * @static
- * @see replaceEntities()
+ * @see replaceEntities()
*/
- function reverseEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
- $encoding = 'ISO-8859-1')
- {
+ public static function reverseEntities(
+ $string, $replaceEntities = XML_UTIL_ENTITIES_XML, $encoding = 'ISO-8859-1'
+ ) {
switch ($replaceEntities) {
case XML_UTIL_ENTITIES_XML:
- return strtr($string, array(
- '&' => '&',
- '>' => '>',
- '<' => '<',
- '"' => '"',
- ''' => '\'' ));
+ return strtr(
+ $string,
+ array(
+ '&' => '&',
+ '>' => '>',
+ '<' => '<',
+ '"' => '"',
+ ''' => '\''
+ )
+ );
break;
case XML_UTIL_ENTITIES_XML_REQUIRED:
- return strtr($string, array(
- '&' => '&',
- '<' => '<',
- '"' => '"' ));
+ return strtr(
+ $string,
+ array(
+ '&' => '&',
+ '<' => '<',
+ '"' => '"'
+ )
+ );
break;
case XML_UTIL_ENTITIES_HTML:
return html_entity_decode($string, ENT_COMPAT, $encoding);
@@ -268,7 +274,7 @@ class XML_Util
}
/**
- * build an xml declaration
+ * Build an xml declaration
*
* <code>
* require_once 'XML/Util.php';
@@ -282,13 +288,12 @@ class XML_Util
* @param bool $standalone document is standalone (or not)
*
* @return string xml declaration
- * @access public
- * @static
- * @uses attributesToString() to serialize the attributes of the XML declaration
+ * @uses attributesToString() to serialize the attributes of the
+ * XML declaration
*/
- function getXMLDeclaration($version = '1.0', $encoding = null,
- $standalone = null)
- {
+ public static function getXMLDeclaration(
+ $version = '1.0', $encoding = null, $standalone = null
+ ) {
$attributes = array(
'version' => $version,
);
@@ -301,12 +306,14 @@ class XML_Util
$attributes['standalone'] = $standalone ? 'yes' : 'no';
}
- return sprintf('<?xml%s?>',
- XML_Util::attributesToString($attributes, false));
+ return sprintf(
+ '<?xml%s?>',
+ XML_Util::attributesToString($attributes, false)
+ );
}
/**
- * build a document type declaration
+ * Build a document type declaration
*
* <code>
* require_once 'XML/Util.php';
@@ -321,12 +328,11 @@ class XML_Util
* @param string $internalDtd internal dtd entries
*
* @return string doctype declaration
- * @access public
- * @static
- * @since 0.2
+ * @since 0.2
*/
- function getDocTypeDeclaration($root, $uri = null, $internalDtd = null)
- {
+ public static function getDocTypeDeclaration(
+ $root, $uri = null, $internalDtd = null
+ ) {
if (is_array($uri)) {
$ref = sprintf(' PUBLIC "%s" "%s"', $uri['id'], $uri['uri']);
} elseif (!empty($uri)) {
@@ -343,7 +349,7 @@ class XML_Util
}
/**
- * create string representation of an attribute list
+ * Create string representation of an attribute list
*
* <code>
* require_once 'XML/Util.php';
@@ -375,14 +381,13 @@ class XML_Util
* XML_UTIL_ENTITIES_HTML)
*
* @return string string representation of the attributes
- * @access public
- * @static
- * @uses replaceEntities() to replace XML entities in attribute values
- * @todo allow sort also to be an options array
+ * @uses replaceEntities() to replace XML entities in attribute values
+ * @todo allow sort also to be an options array
*/
- function attributesToString($attributes, $sort = true, $multiline = false,
- $indent = ' ', $linebreak = "\n", $entities = XML_UTIL_ENTITIES_XML)
- {
+ public static function attributesToString(
+ $attributes, $sort = true, $multiline = false,
+ $indent = ' ', $linebreak = "\n", $entities = XML_UTIL_ENTITIES_XML
+ ) {
/*
* second parameter may be an array
*/
@@ -410,7 +415,7 @@ class XML_Util
if ($sort) {
ksort($attributes);
}
- if ( !$multiline || count($attributes) == 1) {
+ if (!$multiline || count($attributes) == 1) {
foreach ($attributes as $key => $value) {
if ($entities != XML_UTIL_ENTITIES_NONE) {
if ($entities === XML_UTIL_CDATA_SECTION) {
@@ -446,26 +451,23 @@ class XML_Util
* or only XHTML (XML_UTIL_COLLAPSE_XHTML_ONLY) ones.
*
* @return string XML
- * @access public
- * @static
- * @todo PEAR CS - unable to avoid "space after open parens" error
- * in the IF branch
*/
- function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL)
+ public static function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL)
{
if ($mode == XML_UTIL_COLLAPSE_XHTML_ONLY) {
return preg_replace(
'/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
. 'param)([^>]*)><\/\\1>/s',
'<\\1\\2 />',
- $xml);
+ $xml
+ );
} else {
return preg_replace('/<(\w+)([^>]*)><\/\\1>/s', '<\\1\\2 />', $xml);
}
}
/**
- * create a tag
+ * Create a tag
*
* This method will call XML_Util::createTagFromArray(), which
* is more flexible.
@@ -496,16 +498,15 @@ class XML_Util
* @param bool $sortAttributes Whether to sort the attributes or not
*
* @return string XML tag
- * @access public
- * @static
- * @see createTagFromArray()
- * @uses createTagFromArray() to create the tag
+ * @see createTagFromArray()
+ * @uses createTagFromArray() to create the tag
*/
- function createTag($qname, $attributes = array(), $content = null,
+ public static function createTag(
+ $qname, $attributes = array(), $content = null,
$namespaceUri = null, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
$multiline = false, $indent = '_auto', $linebreak = "\n",
- $sortAttributes = true)
- {
+ $sortAttributes = true
+ ) {
$tag = array(
'qname' => $qname,
'attributes' => $attributes
@@ -521,13 +522,15 @@ class XML_Util
$tag['namespaceUri'] = $namespaceUri;
}
- return XML_Util::createTagFromArray($tag, $replaceEntities, $multiline,
- $indent, $linebreak, $sortAttributes);
+ return XML_Util::createTagFromArray(
+ $tag, $replaceEntities, $multiline,
+ $indent, $linebreak, $sortAttributes
+ );
}
/**
- * create a tag from an array
- * this method awaits an array in the following format
+ * Create a tag from an array.
+ * This method awaits an array in the following format
* <pre>
* array(
* // qualified name of the tag
@@ -576,27 +579,31 @@ class XML_Util
* @param bool $sortAttributes Whether to sort the attributes or not
*
* @return string XML tag
- * @access public
- * @static
- * @see createTag()
+ *
+ * @see createTag()
* @uses attributesToString() to serialize the attributes of the tag
* @uses splitQualifiedName() to get local part and namespace of a qualified name
* @uses createCDataSection()
* @uses raiseError()
*/
- function createTagFromArray($tag, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
+ public static function createTagFromArray(
+ $tag, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
$multiline = false, $indent = '_auto', $linebreak = "\n",
- $sortAttributes = true)
- {
+ $sortAttributes = true
+ ) {
if (isset($tag['content']) && !is_scalar($tag['content'])) {
- return XML_Util::raiseError('Supplied non-scalar value as tag content',
- XML_UTIL_ERROR_NON_SCALAR_CONTENT);
+ return XML_Util::raiseError(
+ 'Supplied non-scalar value as tag content',
+ XML_UTIL_ERROR_NON_SCALAR_CONTENT
+ );
}
if (!isset($tag['qname']) && !isset($tag['localPart'])) {
- return XML_Util::raiseError('You must either supply a qualified name '
+ return XML_Util::raiseError(
+ 'You must either supply a qualified name '
. '(qname) or local tag name (localPart).',
- XML_UTIL_ERROR_NO_TAG_NAME);
+ XML_UTIL_ERROR_NO_TAG_NAME
+ );
}
// if no attributes hav been set, use empty attributes
@@ -633,8 +640,8 @@ class XML_Util
if (isset($tag['namespaceUri']) && !empty($tag['namespaceUri'])) {
// is a namespace given
if (isset($tag['namespace']) && !empty($tag['namespace'])) {
- $tag['attributes']['xmlns:' . $tag['namespace']] =
- $tag['namespaceUri'];
+ $tag['attributes']['xmlns:' . $tag['namespace']]
+ = $tag['namespaceUri'];
} else {
// define this Uri as the default namespace
$tag['attributes']['xmlns'] = $tag['namespaceUri'];
@@ -649,8 +656,10 @@ class XML_Util
}
// create attribute list
- $attList = XML_Util::attributesToString($tag['attributes'],
- $sortAttributes, $multiline, $indent, $linebreak);
+ $attList = XML_Util::attributesToString(
+ $tag['attributes'],
+ $sortAttributes, $multiline, $indent, $linebreak
+ );
if (!isset($tag['content']) || (string)$tag['content'] == '') {
$tag = sprintf('<%s%s />', $tag['qname'], $attList);
} else {
@@ -661,18 +670,21 @@ class XML_Util
$tag['content'] = XML_Util::createCDataSection($tag['content']);
break;
default:
- $tag['content'] = XML_Util::replaceEntities($tag['content'],
- $replaceEntities);
+ $tag['content'] = XML_Util::replaceEntities(
+ $tag['content'], $replaceEntities
+ );
break;
}
- $tag = sprintf('<%s%s>%s</%s>', $tag['qname'], $attList, $tag['content'],
- $tag['qname']);
+ $tag = sprintf(
+ '<%s%s>%s</%s>', $tag['qname'], $attList, $tag['content'],
+ $tag['qname']
+ );
}
return $tag;
}
/**
- * create a start element
+ * Create a start element
*
* <code>
* require_once 'XML/Util.php';
@@ -693,14 +705,13 @@ class XML_Util
* @param bool $sortAttributes Whether to sort the attributes or not
*
* @return string XML start element
- * @access public
- * @static
- * @see createEndElement(), createTag()
+ * @see createEndElement(), createTag()
*/
- function createStartElement($qname, $attributes = array(), $namespaceUri = null,
+ public static function createStartElement(
+ $qname, $attributes = array(), $namespaceUri = null,
$multiline = false, $indent = '_auto', $linebreak = "\n",
- $sortAttributes = true)
- {
+ $sortAttributes = true
+ ) {
// if no attributes hav been set, use empty attributes
if (!isset($attributes) || !is_array($attributes)) {
$attributes = array();
@@ -728,14 +739,16 @@ class XML_Util
}
// create attribute list
- $attList = XML_Util::attributesToString($attributes, $sortAttributes,
- $multiline, $indent, $linebreak);
+ $attList = XML_Util::attributesToString(
+ $attributes, $sortAttributes,
+ $multiline, $indent, $linebreak
+ );
$element = sprintf('<%s%s>', $qname, $attList);
return $element;
}
/**
- * create an end element
+ * Create an end element
*
* <code>
* require_once 'XML/Util.php';
@@ -747,18 +760,16 @@ class XML_Util
* @param string $qname qualified tagname (including namespace)
*
* @return string XML end element
- * @access public
- * @static
- * @see createStartElement(), createTag()
+ * @see createStartElement(), createTag()
*/
- function createEndElement($qname)
+ public static function createEndElement($qname)
{
$element = sprintf('</%s>', $qname);
return $element;
}
/**
- * create an XML comment
+ * Create an XML comment
*
* <code>
* require_once 'XML/Util.php';
@@ -770,17 +781,15 @@ class XML_Util
* @param string $content content of the comment
*
* @return string XML comment
- * @access public
- * @static
*/
- function createComment($content)
+ public static function createComment($content)
{
$comment = sprintf('<!-- %s -->', $content);
return $comment;
}
/**
- * create a CData section
+ * Create a CData section
*
* <code>
* require_once 'XML/Util.php';
@@ -792,18 +801,17 @@ class XML_Util
* @param string $data data of the CData section
*
* @return string CData section with content
- * @access public
- * @static
*/
- function createCDataSection($data)
+ public static function createCDataSection($data)
{
- return sprintf('<![CDATA[%s]]>',
- preg_replace('/\]\]>/', ']]]]><![CDATA[>', strval($data)));
-
+ return sprintf(
+ '<![CDATA[%s]]>',
+ preg_replace('/\]\]>/', ']]]]><![CDATA[>', strval($data))
+ );
}
/**
- * split qualified name and return namespace and local part
+ * Split qualified name and return namespace and local part
*
* <code>
* require_once 'XML/Util.php';
@@ -823,10 +831,8 @@ class XML_Util
* @param string $defaultNs default namespace (optional)
*
* @return array array containing namespace and local part
- * @access public
- * @static
*/
- function splitQualifiedName($qname, $defaultNs = null)
+ public static function splitQualifiedName($qname, $defaultNs = null)
{
if (strstr($qname, ':')) {
$tmp = explode(':', $qname);
@@ -842,7 +848,7 @@ class XML_Util
}
/**
- * check, whether string is valid XML name
+ * Check, whether string is valid XML name
*
* <p>XML names are used for tagname, attribute names and various
* other, lesser known entities.</p>
@@ -863,33 +869,39 @@ class XML_Util
* @param string $string string that should be checked
*
* @return mixed true, if string is a valid XML name, PEAR error otherwise
- * @access public
- * @static
+ *
* @todo support for other charsets
* @todo PEAR CS - unable to avoid 85-char limit on second preg_match
*/
- function isValidName($string)
+ public static function isValidName($string)
{
// check for invalid chars
if (!preg_match('/^[[:alpha:]_]\\z/', $string{0})) {
- return XML_Util::raiseError('XML names may only start with letter '
- . 'or underscore', XML_UTIL_ERROR_INVALID_START);
+ return XML_Util::raiseError(
+ 'XML names may only start with letter or underscore',
+ XML_UTIL_ERROR_INVALID_START
+ );
}
// check for invalid chars
- if (!preg_match('/^([[:alpha:]_]([[:alnum:]\-\.]*)?:)?[[:alpha:]_]([[:alnum:]\_\-\.]+)?\\z/',
- $string)
- ) {
- return XML_Util::raiseError('XML names may only contain alphanumeric '
+ $match = preg_match(
+ '/^([[:alpha:]_]([[:alnum:]\-\.]*)?:)?'
+ . '[[:alpha:]_]([[:alnum:]\_\-\.]+)?\\z/',
+ $string
+ );
+ if (!$match) {
+ return XML_Util::raiseError(
+ 'XML names may only contain alphanumeric '
. 'chars, period, hyphen, colon and underscores',
- XML_UTIL_ERROR_INVALID_CHARS);
+ XML_UTIL_ERROR_INVALID_CHARS
+ );
}
// XML name is valid
return true;
}
/**
- * replacement for XML_Util::raiseError
+ * Replacement for XML_Util::raiseError
*
* Avoids the necessity to always require
* PEAR.php
@@ -898,13 +910,11 @@ class XML_Util
* @param int $code error code
*
* @return PEAR_Error
- * @access public
- * @static
- * @todo PEAR CS - should this use include_once instead?
+ * @todo PEAR CS - should this use include_once instead?
*/
- function raiseError($msg, $code)
+ public static function raiseError($msg, $code)
{
- require_once 'PEAR.php';
+ include_once 'PEAR.php';
return PEAR::raiseError($msg, $code);
}
}
diff --git a/vendor/vufind-org/vufindhttp/src/VuFindHttp/HttpService.php b/vendor/vufind-org/vufindhttp/src/VuFindHttp/HttpService.php
index 7bf3f9d41c1..0bb9ebfd334 100644
--- a/vendor/vufind-org/vufindhttp/src/VuFindHttp/HttpService.php
+++ b/vendor/vufind-org/vufindhttp/src/VuFindHttp/HttpService.php
@@ -145,17 +145,21 @@ class HttpService implements HttpServiceInterface
* @param mixed $body Request body document
* @param string $type Request body content type
* @param float $timeout Request timeout in seconds
+ * @param array $headers Request http-headers
*
* @return \Zend\Http\Response
*/
public function post($url, $body = null, $type = 'application/octet-stream',
- $timeout = null
+ $timeout = null, array $headers = array()
) {
$client
= $this->createClient($url, \Zend\Http\Request::METHOD_POST, $timeout);
$client->setRawBody($body);
$client->setHeaders(
- array('Content-Type' => $type, 'Content-Length' => strlen($body))
+ array_merge(
+ array('Content-Type' => $type, 'Content-Length' => strlen($body)),
+ $headers
+ )
);
return $this->send($client);
}
diff --git a/vendor/vufind-org/vufindhttp/tests/unit-tests/src/VuFindTest/HttpServiceTest.php b/vendor/vufind-org/vufindhttp/tests/unit-tests/src/VuFindTest/HttpServiceTest.php
index 0e3ea2a65d0..8b3448bb2b1 100644
--- a/vendor/vufind-org/vufindhttp/tests/unit-tests/src/VuFindTest/HttpServiceTest.php
+++ b/vendor/vufind-org/vufindhttp/tests/unit-tests/src/VuFindTest/HttpServiceTest.php
@@ -153,6 +153,31 @@ class ProxyServiceTest extends \PHPUnit_Framework_TestCase
$service->get('http://example.tld', array('foo=bar'), 'test', array("Content-type: application/json", "Accept: application/json"));
}
+ /**
+ * Test POST request appends headers.
+ *
+ * @return void
+ */
+ public function testPostAppendsHeaders()
+ {
+ $service = new Service();
+ $adapter = $this->getMock('Zend\Http\Client\Adapter\Test', array('write'));
+ $adapter->expects($this->once())
+ ->method('write')
+ ->with(
+ $this->equalTo('POST'),
+ $this->equalTo(
+ new \Zend\Uri\Http('http://example.tld')
+ ),
+ $this->equalTo('1.1'),
+ $this->equalTo(
+ array('Host' => 'example.tld', 'Connection' => 'close', 'Accept-Encoding' => 'gzip, deflate','User-Agent' => 'Zend\Http\Client', 'Content-Type' => 'application/json', 'Accept' => 'application/json', 'Content-Length' => '5')
+ )
+ );
+ $service->setDefaultAdapter($adapter);
+ $service->post('http://example.tld', 'dummy', 'application/json', null, array('Accept: application/json'));
+ }
+
/**
* Test POST request of form data.
*
--
GitLab