From a6be94a8988f25eb8c3728a08e6c363b8ee73846 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Thu, 3 Oct 2013 10:26:10 -0400
Subject: [PATCH] Updated dependencies.
---
composer.lock | 53 +-
vendor/autoload.php | 2 +-
vendor/composer/autoload_classmap.php | 5 +-
vendor/composer/autoload_real.php | 6 +-
vendor/composer/include_paths.php | 1 -
vendor/composer/installed.json | 191 +++----
.../docs/examples/example_advanced_saml11.php | 10 +-
.../docs/examples/example_custom_urls.php | 2 +-
.../phpcas/docs/examples/example_gateway.php | 2 +-
.../docs/examples/example_hardening.php | 10 +-
.../phpcas/docs/examples/example_html.php | 2 +-
.../phpcas/docs/examples/example_lang.php | 2 +-
.../phpcas/docs/examples/example_logout.php | 2 +-
.../examples/example_no_ssl_cn_validation.php | 2 +-
.../docs/examples/example_pgt_storage_db.php | 2 +-
.../examples/example_pgt_storage_file.php | 2 +-
.../docs/examples/example_proxy_GET.php | 2 +-
.../docs/examples/example_proxy_POST.php | 2 +-
.../examples/example_proxy_serviceWeb.php | 2 +-
.../example_proxy_serviceWeb_chaining.php | 2 +-
.../phpcas/docs/examples/example_service.php | 2 +-
.../docs/examples/example_service_POST.php | 2 +-
.../examples/example_service_that_proxies.php | 2 +-
.../phpcas/docs/examples/example_simple.php | 2 +-
vendor/jasig/phpcas/docs/index.html | 38 +-
vendor/jasig/phpcas/source/CAS.php | 12 +-
vendor/jasig/phpcas/source/CAS/Autoload.php | 6 +-
...uenceBeforeAuthenticationCallException.php | 4 +-
.../OutOfSequenceBeforeClientException.php | 12 +-
.../CAS/OutOfSequenceBeforeProxyException.php | 12 +-
vendor/jasig/phpcas/utils/Doxyfile | 418 +++++++-------
vendor/jasig/phpcas/utils/version.properties | 12 +-
.../pear-pear.php.net/File_MARC/File/MARC.php | 1 -
.../File_MARC/File/MARC/Data_Field.php | 22 +-
.../File_MARC/File/MARC/Field.php | 7 +-
.../File_MARC/File/MARC/List.php | 198 ++++++-
.../File_MARC/File/MARC/Subfield.php | 39 +-
.../File_MARC/File/MARCXML.php | 1 -
.../Structures/LinkedList/Double.php | 375 ------------
.../Structures/LinkedList/Single.php | 535 ------------------
.../Yaml/Exception/ParseException.php | 11 +-
.../yaml/Symfony/Component/Yaml/README.md | 2 +-
.../Yaml/Tests/ParseExceptionTest.php | 30 +
.../yaml/Symfony/Component/Yaml/Unescaper.php | 4 +-
44 files changed, 671 insertions(+), 1378 deletions(-)
delete mode 100644 vendor/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Double.php
delete mode 100644 vendor/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Single.php
create mode 100644 vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParseExceptionTest.php
diff --git a/composer.lock b/composer.lock
index 35ad7a4c5cc..8a55bf369c6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -55,12 +55,12 @@
"source": {
"type": "git",
"url": "https://github.com/Jasig/phpCAS.git",
- "reference": "13c17276481a5fb55de2ce4c0cf513197fb1ee24"
+ "reference": "673feb404d3c07869ed7e186128d70a8c85473d6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Jasig/phpCAS/zipball/13c17276481a5fb55de2ce4c0cf513197fb1ee24",
- "reference": "13c17276481a5fb55de2ce4c0cf513197fb1ee24",
+ "url": "https://api.github.com/repos/Jasig/phpCAS/zipball/673feb404d3c07869ed7e186128d70a8c85473d6",
+ "reference": "673feb404d3c07869ed7e186128d70a8c85473d6",
"shasum": ""
},
"require": {
@@ -98,7 +98,7 @@
"source": "https://github.com/Jasig/phpCAS/tree/master",
"issues": "https://github.com/Jasig/phpCAS/issues"
},
- "time": "2013-07-25 07:36:06"
+ "time": "2013-10-01 20:06:01"
},
{
"name": "johnwohlers/sip2",
@@ -186,19 +186,18 @@
},
{
"name": "pear-pear.php.net/File_MARC",
- "version": "0.7.3",
+ "version": "0.8.0",
"dist": {
"type": "file",
- "url": "http://pear.php.net/get/File_MARC-0.7.3.tgz",
+ "url": "http://pear.php.net/get/File_MARC-0.8.0.tgz",
"reference": null,
"shasum": null
},
"require": {
- "pear-pear.php.net/structures_linkedlist": "*",
- "php": ">=5.2.0.0"
+ "php": ">=5.3.0.0"
},
"replace": {
- "pear-pear/file_marc": "== 0.7.3.0"
+ "pear-pear/file_marc": "== 0.8.0.0"
},
"type": "pear-library",
"autoload": {
@@ -273,32 +272,6 @@
],
"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/Structures_LinkedList",
- "version": "0.2.2",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/Structures_LinkedList-0.2.2.tgz",
- "reference": null,
- "shasum": null
- },
- "require": {
- "php": ">=5.0.0.0"
- },
- "replace": {
- "pear-pear/structures_linkedlist": "== 0.2.2.0"
- },
- "type": "pear-library",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
- ],
- "description": "A singly-linked list offers the ability to insert or delete\n nodes at any point within the list. A doubly-linked list also offers the\n ability to request previous nodes in the list."
- },
{
"name": "pear-pear.php.net/Validate",
"version": "0.8.5",
@@ -417,17 +390,17 @@
},
{
"name": "symfony/yaml",
- "version": "v2.3.4",
+ "version": "v2.3.5",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847"
+ "reference": "6bb881b948368482e1abf1a75c08bcf88a1c5fc3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
- "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/6bb881b948368482e1abf1a75c08bcf88a1c5fc3",
+ "reference": "6bb881b948368482e1abf1a75c08bcf88a1c5fc3",
"shasum": ""
},
"require": {
@@ -460,7 +433,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2013-08-24 15:26:22"
+ "time": "2013-09-22 18:04:39"
},
{
"name": "zendframework/zendframework",
diff --git a/vendor/autoload.php b/vendor/autoload.php
index b61cea966f3..fdbd4dfccb7 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit67cab821955a746708c64afc7d720bfb::getLoader();
+return ComposerAutoloaderInit76d7c2b43ca2e5b3c2aa96954ca03d59::getLoader();
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 6f709fded3c..6b4919cea8f 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -58,6 +58,7 @@ return array(
'File_MARC_Data_Field' => $vendorDir . '/pear-pear.php.net/File_MARC/File/MARC/Data_Field.php',
'File_MARC_Exception' => $vendorDir . '/pear-pear.php.net/File_MARC/File/MARC/Exception.php',
'File_MARC_Field' => $vendorDir . '/pear-pear.php.net/File_MARC/File/MARC/Field.php',
+ 'File_MARC_Lint' => $vendorDir . '/pear-pear.php.net/File_MARC/File/MARC/Lint.php',
'File_MARC_Lint_CodeData' => $vendorDir . '/pear-pear.php.net/File_MARC/File/MARC/Lint/CodeData.php',
'File_MARC_List' => $vendorDir . '/pear-pear.php.net/File_MARC/File/MARC/List.php',
'File_MARC_Record' => $vendorDir . '/pear-pear.php.net/File_MARC/File/MARC/Record.php',
@@ -137,10 +138,6 @@ return array(
'Structures_Graph_Manipulator_AcyclicTest' => $vendorDir . '/pear-pear.php.net/Structures_Graph/Structures/Graph/Manipulator/AcyclicTest.php',
'Structures_Graph_Manipulator_TopologicalSorter' => $vendorDir . '/pear-pear.php.net/Structures_Graph/Structures/Graph/Manipulator/TopologicalSorter.php',
'Structures_Graph_Node' => $vendorDir . '/pear-pear.php.net/Structures_Graph/Structures/Graph/Node.php',
- 'Structures_LinkedList_Double' => $vendorDir . '/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Double.php',
- 'Structures_LinkedList_DoubleNode' => $vendorDir . '/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Double.php',
- 'Structures_LinkedList_Single' => $vendorDir . '/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Single.php',
- 'Structures_LinkedList_SingleNode' => $vendorDir . '/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Single.php',
'System' => $vendorDir . '/pear-pear.php.net/PEAR/System.php',
'Validate' => $vendorDir . '/pear-pear.php.net/Validate/Validate.php',
'Validate_ISPN' => $vendorDir . '/pear-pear.php.net/Validate_ISPN/Validate/ISPN.php',
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 9fcd6284149..0061945beb8 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit67cab821955a746708c64afc7d720bfb
+class ComposerAutoloaderInit76d7c2b43ca2e5b3c2aa96954ca03d59
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit67cab821955a746708c64afc7d720bfb
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit67cab821955a746708c64afc7d720bfb', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit76d7c2b43ca2e5b3c2aa96954ca03d59', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit67cab821955a746708c64afc7d720bfb', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit76d7c2b43ca2e5b3c2aa96954ca03d59', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php
index f571a41430a..ef6a1cbc30f 100644
--- a/vendor/composer/include_paths.php
+++ b/vendor/composer/include_paths.php
@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
- $vendorDir . '/pear-pear.php.net/Structures_LinkedList',
$vendorDir . '/pear-pear.php.net/XML_Util',
$vendorDir . '/pear-pear.php.net/Console_Getopt',
$vendorDir . '/pear-pear.php.net/Structures_Graph',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a051d1928e3..a31e59b18dc 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -35,34 +35,6 @@
]
}
},
- {
- "name": "pear-pear.php.net/Structures_LinkedList",
- "version": "0.2.2",
- "version_normalized": "0.2.2.0",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/Structures_LinkedList-0.2.2.tgz",
- "reference": null,
- "shasum": null
- },
- "require": {
- "php": ">=5.0.0.0"
- },
- "replace": {
- "pear-pear/structures_linkedlist": "== 0.2.2.0"
- },
- "type": "pear-library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
- ],
- "description": "A singly-linked list offers the ability to insert or delete\n nodes at any point within the list. A doubly-linked list also offers the\n ability to request previous nodes in the list."
- },
{
"name": "pear-pear.php.net/XML_Util",
"version": "1.2.1",
@@ -377,55 +349,6 @@
"issues": "https://github.com/zendframework/ZendService_Amazon/issues"
}
},
- {
- "name": "symfony/yaml",
- "version": "v2.3.4",
- "version_normalized": "2.3.4.0",
- "target-dir": "Symfony/Component/Yaml",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Yaml.git",
- "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
- "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "time": "2013-08-24 15:26:22",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Yaml\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- }
- ],
- "description": "Symfony Yaml Component",
- "homepage": "http://symfony.com"
- },
{
"name": "zendframework/zendframework",
"version": "2.2.4",
@@ -545,35 +468,6 @@
"issues": "https://github.com/zendframework/zf2/issues"
}
},
- {
- "name": "pear-pear.php.net/File_MARC",
- "version": "0.7.3",
- "version_normalized": "0.7.3.0",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/File_MARC-0.7.3.tgz",
- "reference": null,
- "shasum": null
- },
- "require": {
- "pear-pear.php.net/structures_linkedlist": "*",
- "php": ">=5.2.0.0"
- },
- "replace": {
- "pear-pear/file_marc": "== 0.7.3.0"
- },
- "type": "pear-library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- ""
- ]
- },
- "include-path": [
- "/"
- ],
- "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": "aferrandini/phpqrcode",
"version": "dev-master",
@@ -658,6 +552,83 @@
"issues": "https://github.com/summon/Summon.php/issues"
}
},
+ {
+ "name": "pear-pear.php.net/File_MARC",
+ "version": "0.8.0",
+ "version_normalized": "0.8.0.0",
+ "dist": {
+ "type": "file",
+ "url": "http://pear.php.net/get/File_MARC-0.8.0.tgz",
+ "reference": null,
+ "shasum": null
+ },
+ "require": {
+ "php": ">=5.3.0.0"
+ },
+ "replace": {
+ "pear-pear/file_marc": "== 0.8.0.0"
+ },
+ "type": "pear-library",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ ""
+ ]
+ },
+ "include-path": [
+ "/"
+ ],
+ "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.3.5",
+ "version_normalized": "2.3.5.0",
+ "target-dir": "Symfony/Component/Yaml",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/Yaml.git",
+ "reference": "6bb881b948368482e1abf1a75c08bcf88a1c5fc3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/6bb881b948368482e1abf1a75c08bcf88a1c5fc3",
+ "reference": "6bb881b948368482e1abf1a75c08bcf88a1c5fc3",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "time": "2013-09-22 18:04:39",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.3-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Component\\Yaml\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Yaml Component",
+ "homepage": "http://symfony.com"
+ },
{
"name": "jasig/phpcas",
"version": "dev-master",
@@ -665,12 +636,12 @@
"source": {
"type": "git",
"url": "https://github.com/Jasig/phpCAS.git",
- "reference": "13c17276481a5fb55de2ce4c0cf513197fb1ee24"
+ "reference": "673feb404d3c07869ed7e186128d70a8c85473d6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Jasig/phpCAS/zipball/13c17276481a5fb55de2ce4c0cf513197fb1ee24",
- "reference": "13c17276481a5fb55de2ce4c0cf513197fb1ee24",
+ "url": "https://api.github.com/repos/Jasig/phpCAS/zipball/673feb404d3c07869ed7e186128d70a8c85473d6",
+ "reference": "673feb404d3c07869ed7e186128d70a8c85473d6",
"shasum": ""
},
"require": {
@@ -679,7 +650,7 @@
"require-dev": {
"phpunit/phpunit": "~3.7.10"
},
- "time": "2013-07-25 07:36:06",
+ "time": "2013-10-01 20:06:01",
"type": "library",
"installation-source": "source",
"autoload": {
diff --git a/vendor/jasig/phpcas/docs/examples/example_advanced_saml11.php b/vendor/jasig/phpcas/docs/examples/example_advanced_saml11.php
index 82a35234443..c11ab5faf4e 100644
--- a/vendor/jasig/phpcas/docs/examples/example_advanced_saml11.php
+++ b/vendor/jasig/phpcas/docs/examples/example_advanced_saml11.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
@@ -43,9 +43,9 @@ phpCAS::handleLogoutRequests(true, $cas_real_hosts);
// Force CAS authentication on any page that includes this file
phpCAS::forceAuthentication();
-// Some small code triggered by the logout button
-if (isset($_REQUEST['logout'])) {
- phpCAS::logout();
+// Some small code triggered by the logout button
+if (isset($_REQUEST['logout'])) {
+ phpCAS::logout();
}
?>
<html>
@@ -77,4 +77,4 @@ foreach (phpCAS::getAttributes() as $key => $value) {
</ul>
<p><a href="?logout=">Logout</a></p>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/vendor/jasig/phpcas/docs/examples/example_custom_urls.php b/vendor/jasig/phpcas/docs/examples/example_custom_urls.php
index 01809737252..1feb2adf3f2 100644
--- a/vendor/jasig/phpcas/docs/examples/example_custom_urls.php
+++ b/vendor/jasig/phpcas/docs/examples/example_custom_urls.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_gateway.php b/vendor/jasig/phpcas/docs/examples/example_gateway.php
index 25be1a2ec22..82860afa326 100644
--- a/vendor/jasig/phpcas/docs/examples/example_gateway.php
+++ b/vendor/jasig/phpcas/docs/examples/example_gateway.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_hardening.php b/vendor/jasig/phpcas/docs/examples/example_hardening.php
index 4f407c496f3..c8f41eaf90e 100644
--- a/vendor/jasig/phpcas/docs/examples/example_hardening.php
+++ b/vendor/jasig/phpcas/docs/examples/example_hardening.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Harden session cookie to prevent some attacks on the cookie (e.g. XSS)
@@ -46,9 +46,9 @@ phpCAS::handleLogoutRequests(true, $cas_real_hosts);
// Force CAS authentication on any page that includes this file
phpCAS::forceAuthentication();
-// Some small code triggered by the logout button
-if (isset($_REQUEST['logout'])) {
- phpCAS::logout();
+// Some small code triggered by the logout button
+if (isset($_REQUEST['logout'])) {
+ phpCAS::logout();
}
?>
<html>
@@ -80,4 +80,4 @@ foreach (phpCAS::getAttributes() as $key => $value) {
</ul>
<p><a href="?logout=">Logout</a></p>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/vendor/jasig/phpcas/docs/examples/example_html.php b/vendor/jasig/phpcas/docs/examples/example_html.php
index 204a83f17f8..25c9b823887 100644
--- a/vendor/jasig/phpcas/docs/examples/example_html.php
+++ b/vendor/jasig/phpcas/docs/examples/example_html.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_lang.php b/vendor/jasig/phpcas/docs/examples/example_lang.php
index 1e1225790f1..ab615379639 100644
--- a/vendor/jasig/phpcas/docs/examples/example_lang.php
+++ b/vendor/jasig/phpcas/docs/examples/example_lang.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_logout.php b/vendor/jasig/phpcas/docs/examples/example_logout.php
index 4eb156272db..0ea51122f43 100644
--- a/vendor/jasig/phpcas/docs/examples/example_logout.php
+++ b/vendor/jasig/phpcas/docs/examples/example_logout.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_no_ssl_cn_validation.php b/vendor/jasig/phpcas/docs/examples/example_no_ssl_cn_validation.php
index b16e1e4c096..74455d98e2d 100644
--- a/vendor/jasig/phpcas/docs/examples/example_no_ssl_cn_validation.php
+++ b/vendor/jasig/phpcas/docs/examples/example_no_ssl_cn_validation.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_pgt_storage_db.php b/vendor/jasig/phpcas/docs/examples/example_pgt_storage_db.php
index f759a0e9dfd..705ba229041 100644
--- a/vendor/jasig/phpcas/docs/examples/example_pgt_storage_db.php
+++ b/vendor/jasig/phpcas/docs/examples/example_pgt_storage_db.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_pgt_storage_file.php b/vendor/jasig/phpcas/docs/examples/example_pgt_storage_file.php
index 908892e8c3b..cfb45509c49 100644
--- a/vendor/jasig/phpcas/docs/examples/example_pgt_storage_file.php
+++ b/vendor/jasig/phpcas/docs/examples/example_pgt_storage_file.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_proxy_GET.php b/vendor/jasig/phpcas/docs/examples/example_proxy_GET.php
index ba46e34719f..f0afc548d8f 100755
--- a/vendor/jasig/phpcas/docs/examples/example_proxy_GET.php
+++ b/vendor/jasig/phpcas/docs/examples/example_proxy_GET.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_proxy_POST.php b/vendor/jasig/phpcas/docs/examples/example_proxy_POST.php
index 6e032267639..a4bf357d2f9 100755
--- a/vendor/jasig/phpcas/docs/examples/example_proxy_POST.php
+++ b/vendor/jasig/phpcas/docs/examples/example_proxy_POST.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_proxy_serviceWeb.php b/vendor/jasig/phpcas/docs/examples/example_proxy_serviceWeb.php
index 69d1e7e3666..1dc3b6a9479 100644
--- a/vendor/jasig/phpcas/docs/examples/example_proxy_serviceWeb.php
+++ b/vendor/jasig/phpcas/docs/examples/example_proxy_serviceWeb.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_proxy_serviceWeb_chaining.php b/vendor/jasig/phpcas/docs/examples/example_proxy_serviceWeb_chaining.php
index b4b8de8d10d..e75efc88453 100644
--- a/vendor/jasig/phpcas/docs/examples/example_proxy_serviceWeb_chaining.php
+++ b/vendor/jasig/phpcas/docs/examples/example_proxy_serviceWeb_chaining.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_service.php b/vendor/jasig/phpcas/docs/examples/example_service.php
index 9af528db729..6c0daa6a981 100644
--- a/vendor/jasig/phpcas/docs/examples/example_service.php
+++ b/vendor/jasig/phpcas/docs/examples/example_service.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_service_POST.php b/vendor/jasig/phpcas/docs/examples/example_service_POST.php
index 31f3d5fae6c..438af8f3e19 100755
--- a/vendor/jasig/phpcas/docs/examples/example_service_POST.php
+++ b/vendor/jasig/phpcas/docs/examples/example_service_POST.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_service_that_proxies.php b/vendor/jasig/phpcas/docs/examples/example_service_that_proxies.php
index dc83b7b7f91..7094a04860d 100644
--- a/vendor/jasig/phpcas/docs/examples/example_service_that_proxies.php
+++ b/vendor/jasig/phpcas/docs/examples/example_service_that_proxies.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/examples/example_simple.php b/vendor/jasig/phpcas/docs/examples/example_simple.php
index c0a11c55386..301e7eda056 100644
--- a/vendor/jasig/phpcas/docs/examples/example_simple.php
+++ b/vendor/jasig/phpcas/docs/examples/example_simple.php
@@ -19,7 +19,7 @@ require_once 'config.php';
// Load the CAS lib
require_once $phpcas_path . '/CAS.php';
-// Uncomment to enable debugging
+// Enable debugging
phpCAS::setDebug();
// Initialize phpCAS
diff --git a/vendor/jasig/phpcas/docs/index.html b/vendor/jasig/phpcas/docs/index.html
index 68f1295890e..f478f521899 100644
--- a/vendor/jasig/phpcas/docs/index.html
+++ b/vendor/jasig/phpcas/docs/index.html
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>phpCAS</title>
- </head>
- <body>
- <p><img src="images/phpcas.png" width="191" height="68"/></p>
- <p>phpCAS documentation is hosted at <a href="https://wiki.jasig.org/display/CASC/phpCAS">https://wiki.jasig.org/display/CASC/phpCAS</a>.</p>
- <ul>
- <li><a href="examples">examples</a></li>
- <li><a href="http://downloads.jasig.org/cas-clients/php/1.3.2/docs/api/">source documentation</a></li>
- </ul>
- <p><img src="images/esup-portail.png" width="182" height="68"/> <img src="images/jasig.png" width="169" height="87"/></p>
- <p> </p>
- </body>
-</html>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <title>phpCAS</title>
+ </head>
+ <body>
+ <p><img src="images/phpcas.png" width="191" height="68"/></p>
+ <p>phpCAS documentation is hosted at <a href="https://wiki.jasig.org/display/CASC/phpCAS">https://wiki.jasig.org/display/CASC/phpCAS</a>.</p>
+ <ul>
+ <li><a href="examples">examples</a></li>
+ <li><a href="http://downloads.jasig.org/cas-clients/php/1.3.2/docs/api/">source documentation</a></li>
+ </ul>
+ <p><img src="images/esup-portail.png" width="182" height="68"/> <img src="images/jasig.png" width="169" height="87"/></p>
+ <p> </p>
+ </body>
+</html>
+
diff --git a/vendor/jasig/phpcas/source/CAS.php b/vendor/jasig/phpcas/source/CAS.php
index edb8656e365..5e489a110f8 100644
--- a/vendor/jasig/phpcas/source/CAS.php
+++ b/vendor/jasig/phpcas/source/CAS.php
@@ -1712,8 +1712,8 @@ class phpCAS
*/
private static function _validateClientExists()
{
- if (!is_object(self::$_PHPCAS_CLIENT)) {
- throw new CAS_OutOfSequenceBeforeClientException();
+ if (!is_object(self::$_PHPCAS_CLIENT)) {
+ throw new CAS_OutOfSequenceBeforeClientException();
}
}
@@ -1725,10 +1725,10 @@ class phpCAS
* @return void
*/
private static function _validateProxyExists()
- {
- if (!is_object(self::$_PHPCAS_CLIENT)) {
- throw new CAS_OutOfSequenceBeforeProxyException();
- }
+ {
+ if (!is_object(self::$_PHPCAS_CLIENT)) {
+ throw new CAS_OutOfSequenceBeforeProxyException();
+ }
}
}
// ########################################################################
diff --git a/vendor/jasig/phpcas/source/CAS/Autoload.php b/vendor/jasig/phpcas/source/CAS/Autoload.php
index e56dbdfa93f..b7a0b5534a2 100644
--- a/vendor/jasig/phpcas/source/CAS/Autoload.php
+++ b/vendor/jasig/phpcas/source/CAS/Autoload.php
@@ -26,12 +26,12 @@ function CAS_autoload($class)
// Static to hold the Include Path to CAS
static $include_path;
// Check only for CAS classes
- if (substr($class, 0, 4) !== 'CAS_') {
- return false;
+ if (substr($class, 0, 4) !== 'CAS_') {
+ return false;
}
// Setup the include path if it's not already set from a previous call
if (empty($include_path)) {
- $include_path = array(dirname(dirname(__FILE__)), dirname(dirname(__FILE__)) . '/../test/' );
+ $include_path = array(dirname(dirname(__FILE__)), dirname(dirname(__FILE__)) . '/../test/' );
}
// Declare local variable to store the expected full path to the file
diff --git a/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeAuthenticationCallException.php b/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeAuthenticationCallException.php
index ef830979586..6ab222bf4f2 100755
--- a/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeAuthenticationCallException.php
+++ b/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeAuthenticationCallException.php
@@ -50,7 +50,7 @@ implements CAS_Exception
* @return void
*/
public function __construct ()
- {
- parent::__construct('An authentication call hasn\'t happened yet.');
+ {
+ parent::__construct('An authentication call hasn\'t happened yet.');
}
}
diff --git a/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeClientException.php b/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeClientException.php
index f1ea7e2447e..b1f2a5fa6c4 100755
--- a/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeClientException.php
+++ b/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeClientException.php
@@ -44,15 +44,15 @@ class CAS_OutOfSequenceBeforeClientException
extends CAS_OutOfSequenceException
implements CAS_Exception
{
- /**
- * Return standard error message
- *
- * @return void
+ /**
+ * Return standard error message
+ *
+ * @return void
*/
public function __construct ()
- {
+ {
parent::__construct(
'this method cannot be called before phpCAS::client() or phpCAS::proxy()'
- );
+ );
}
}
diff --git a/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeProxyException.php b/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeProxyException.php
index 928a7772983..1603b405161 100755
--- a/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeProxyException.php
+++ b/vendor/jasig/phpcas/source/CAS/OutOfSequenceBeforeProxyException.php
@@ -45,15 +45,15 @@ extends CAS_OutOfSequenceException
implements CAS_Exception
{
- /**
- * Return standard error message
- *
- * @return void
+ /**
+ * Return standard error message
+ *
+ * @return void
*/
public function __construct ()
- {
+ {
parent::__construct(
'this method cannot be called before phpCAS::proxy()''
- );
+ );
}
}
diff --git a/vendor/jasig/phpcas/utils/Doxyfile b/vendor/jasig/phpcas/utils/Doxyfile
index 0d778057397..7d93dd19eb0 100644
--- a/vendor/jasig/phpcas/utils/Doxyfile
+++ b/vendor/jasig/phpcas/utils/Doxyfile
@@ -1,209 +1,209 @@
-# Doxyfile 1.3.6
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME = phpCAS
-PROJECT_NUMBER = "version ${phpcas.version}"
-OUTPUT_DIRECTORY = ${basedir}/tmp/CAS-${phpcas.version}/docs
-OUTPUT_LANGUAGE = English
-USE_WINDOWS_ENCODING = YES
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF =
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = YES
-STRIP_FROM_PATH = ${basedir}/tmp/CAS-${phpcas.version}
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-DISTRIBUTE_GROUP_DOC = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = YES
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = YES
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = ${basedir}/tmp/CAS-${phpcas.version}
-FILE_PATTERNS = "*.php"
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXAMPLE_PATH = ${basedir}/tmp/CAS-${phpcas.version}/docs/examples
-EXAMPLE_PATTERNS =
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = NO
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = api
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = YES
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
-MAX_DOT_GRAPH_DEPTH = 0
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
+# Doxyfile 1.3.6
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME = phpCAS
+PROJECT_NUMBER = "version ${phpcas.version}"
+OUTPUT_DIRECTORY = ${basedir}/tmp/CAS-${phpcas.version}/docs
+OUTPUT_LANGUAGE = English
+USE_WINDOWS_ENCODING = YES
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF =
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = YES
+STRIP_FROM_PATH = ${basedir}/tmp/CAS-${phpcas.version}
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+DISTRIBUTE_GROUP_DOC = NO
+TAB_SIZE = 8
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = NO
+OPTIMIZE_OUTPUT_JAVA = NO
+SUBGROUPING = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
+EXTRACT_STATIC = YES
+EXTRACT_LOCAL_CLASSES = YES
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = NO
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = ${basedir}/tmp/CAS-${phpcas.version}
+FILE_PATTERNS = "*.php"
+RECURSIVE = YES
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH = ${basedir}/tmp/CAS-${phpcas.version}/docs/examples
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = YES
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = NO
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = api
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
+GENERATE_HTMLHELP = NO
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+BINARY_TOC = NO
+TOC_EXPAND = NO
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = NO
+TREEVIEW_WIDTH = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = NO
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = NO
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+MAX_DOT_GRAPH_WIDTH = 1024
+MAX_DOT_GRAPH_HEIGHT = 1024
+MAX_DOT_GRAPH_DEPTH = 0
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
diff --git a/vendor/jasig/phpcas/utils/version.properties b/vendor/jasig/phpcas/utils/version.properties
index c7a3011c80e..22a28dfedd9 100644
--- a/vendor/jasig/phpcas/utils/version.properties
+++ b/vendor/jasig/phpcas/utils/version.properties
@@ -1,6 +1,6 @@
-# Version number devX, alphaX, RCX
-phpcas.version=1.3.2
-# devel, alpha, beta, stable
-phpcas.releaseStability=stable
-# devel, alpha, beta, stable
-phpcas.apiStability=stable
+# Version number devX, alphaX, RCX
+phpcas.version=1.3.2
+# devel, alpha, beta, stable
+phpcas.releaseStability=stable
+# devel, alpha, beta, stable
+phpcas.apiStability=stable
diff --git a/vendor/pear-pear.php.net/File_MARC/File/MARC.php b/vendor/pear-pear.php.net/File_MARC/File/MARC.php
index 561c6d92701..7f6bef014f7 100644
--- a/vendor/pear-pear.php.net/File_MARC/File/MARC.php
+++ b/vendor/pear-pear.php.net/File_MARC/File/MARC.php
@@ -40,7 +40,6 @@
*/
require_once 'PEAR/Exception.php';
-require_once 'Structures/LinkedList/Double.php';
require_once 'File/MARCBASE.php';
require_once 'File/MARC/Record.php';
require_once 'File/MARC/Field.php';
diff --git a/vendor/pear-pear.php.net/File_MARC/File/MARC/Data_Field.php b/vendor/pear-pear.php.net/File_MARC/File/MARC/Data_Field.php
index f5889a64174..cd77bb80e1e 100644
--- a/vendor/pear-pear.php.net/File_MARC/File/MARC/Data_Field.php
+++ b/vendor/pear-pear.php.net/File_MARC/File/MARC/Data_Field.php
@@ -179,15 +179,14 @@ class File_MARC_Data_Field extends File_MARC_Field
*/
function appendSubfield(File_MARC_Subfield $new_subfield)
{
- /* Append as the last field in the record */
+ /* Append as the last subfield in the field */
$this->subfields->appendNode($new_subfield);
- return $new_subfield;
}
// }}}
// {{{ prependSubfield()
/**
- * Prepends subfield to subfield liss
+ * Prepends subfield to subfield list
*
* Adds a File_MARC_Subfield object to the start of the existing list
* of subfields.
@@ -198,7 +197,15 @@ class File_MARC_Data_Field extends File_MARC_Field
*/
function prependSubfield(File_MARC_Subfield $new_subfield)
{
- $this->subfields->prependNode($new_subfield);
+ $pos = 0;
+ $new_subfield->setPosition($pos);
+ $this->subfields->shift($new_subfield);
+ $node = null;
+ $this->subfields->rewind();
+ while ($node = $this->subfields->next()) {
+ $pos++;
+ $node->setPosition($pos);
+ }
return $new_subfield;
}
// }}}
@@ -279,14 +286,11 @@ class File_MARC_Data_Field extends File_MARC_Field
*
* @param File_MARC_Subfield $subfield The subfield to delete
*
- * @return bool Success or failure
+ * @return void
*/
function deleteSubfield(File_MARC_Subfield $subfield)
{
- if ($this->subfields->deleteNode($subfield)) {
- return true;
- }
- return false;
+ $this->subfields->deleteNode($subfield);
}
// }}}
diff --git a/vendor/pear-pear.php.net/File_MARC/File/MARC/Field.php b/vendor/pear-pear.php.net/File_MARC/File/MARC/Field.php
index 672e39478b8..24e6a5bd919 100644
--- a/vendor/pear-pear.php.net/File_MARC/File/MARC/Field.php
+++ b/vendor/pear-pear.php.net/File_MARC/File/MARC/Field.php
@@ -36,7 +36,9 @@
* @link http://pear.php.net/package/File_MARC
*/
-// {{{ class File_MARC_Field extends Structures_LinkedList_DoubleNode
+require_once 'File/MARC/List.php';
+
+// {{{ class File_MARC_Field extends File_MARC_List
/**
* The File_MARC_Field class is expected to be extended to reflect the
* requirements of control and data fields.
@@ -50,7 +52,7 @@
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @link http://pear.php.net/package/File_MARC
*/
-class File_MARC_Field extends Structures_LinkedList_DoubleNode
+class File_MARC_Field extends File_MARC_List
{
// {{{ properties
@@ -93,7 +95,6 @@ class File_MARC_Field extends Structures_LinkedList_DoubleNode
function __destruct()
{
$this->tag = null;
- parent::__destruct();
}
// }}}
diff --git a/vendor/pear-pear.php.net/File_MARC/File/MARC/List.php b/vendor/pear-pear.php.net/File_MARC/File/MARC/List.php
index 909b9fee1d2..9f7a2ed0353 100644
--- a/vendor/pear-pear.php.net/File_MARC/File/MARC/List.php
+++ b/vendor/pear-pear.php.net/File_MARC/File/MARC/List.php
@@ -36,9 +36,9 @@
* @link http://pear.php.net/package/File_MARC
*/
-// {{{ class File_MARC_List extends Structures_LinkedList_Double
+// {{{ class File_MARC_List extends SplDoublyLinkedList
/**
- * The File_MARC_List class extends the Structures_LinkedList_Double class
+ * The File_MARC_List class extends the SplDoublyLinkedList class
* to override the key() method in a meaningful way for foreach() iterators.
*
* For the list of {@link File_MARC_Field} objects in a {@link File_MARC_Record}
@@ -71,8 +71,18 @@
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @link http://pear.php.net/package/File_MARC
*/
-class File_MARC_List extends Structures_LinkedList_Double
+class File_MARC_List extends SplDoublyLinkedList
{
+
+ // {{{ properties
+ /**
+ * Position of the subfield
+ * @var int
+ */
+ protected $position;
+
+ // }}}
+
// {{{ key()
/**
* Returns the tag for a {@link File_MARC_Field} object, or the code
@@ -93,6 +103,188 @@ class File_MARC_List extends Structures_LinkedList_Double
return false;
}
// }}}
+
+ // {{{ function insertNode()
+ /**
+ * Inserts a node into the linked list, based on a reference node that
+ * already exists in the list.
+ *
+ * @param mixed $new_node New node to add to the list
+ * @param mixed $existing_node Reference position node
+ * @param bool $before Insert new node before or after the existing node
+ *
+ * @return bool Success or failure
+ **/
+ public function insertNode($new_node, $existing_node, $before = false)
+ {
+ $pos = 0;
+ $exist_pos = $existing_node->getPosition();
+ $temp_list = unserialize(serialize($this));
+ $this->rewind();
+ $temp_list->rewind();
+
+ // Now add the node according to the requested mode
+ switch ($before) {
+
+ case true:
+ $new_node->setPosition($exist_pos);
+
+ if ($exist_pos == 0) {
+ $this->unshift($new_node);
+ while ($n = $temp_list->next()) {
+ $pos++;
+ $this->next()->setPosition($pos);
+ }
+ } else {
+ $prev_node = $temp_list->offsetGet($existing_node->getPosition());
+ $num_nodes = $this->count();
+ $this->rewind();
+ // Copy up to the existing position, add in node, copy rest
+ try {
+ while ($n = $temp_list->shift()) {
+ $this->next();
+ $pos++;
+ if ($pos < $exist_pos) {
+ // no-op
+ } elseif ($pos == $exist_pos) {
+ $this->offsetSet($pos, $new_node);
+ } elseif ($pos == $num_nodes) {
+ $n->setPosition($pos);
+ $this->push($n);
+ } elseif ($pos > $exist_pos) {
+ $n->setPosition($pos);
+ $this->offsetSet($pos, $n);
+ }
+ }
+ }
+ catch (Exception $e) {
+ // no-op - shift() throws an exception, sigh
+ }
+ }
+ break;
+
+ // after
+ case false:
+ $prev_node = $temp_list->offsetGet($existing_node->getPosition());
+ $num_nodes = $this->count();
+ $this->rewind();
+ // Copy up to the existing position inclusively, add node, copy rest
+ try {
+ while ($n = $temp_list->shift()) {
+ $this->next();
+ $pos++;
+ if ($pos <= $exist_pos) {
+ // no-op
+ } elseif ($pos == $exist_pos + 1) {
+ $this->offsetSet($pos, $new_node);
+ } elseif ($pos == $num_nodes) {
+ $n->setPosition($pos);
+ $this->push($n);
+ } elseif ($pos > $exist_pos + 1) {
+ $n->setPosition($pos);
+ $this->offsetSet($pos, $n);
+ }
+ }
+ }
+ catch (Exception $e) {
+ // no-op - shift() throws an exception, sigh
+ }
+ break;
+ }
+
+ return true;
+ }
+ // }}}
+
+ // {{{ function appendNode()
+ /**
+ * Adds a node onto the linked list.
+ *
+ * @param mixed $new_node New node to add to the list
+ *
+ * @return void
+ **/
+ public function appendNode($new_node)
+ {
+ $pos = $this->count();
+ $new_node->setPosition($pos);
+ $this->push($new_node);
+ }
+ // }}}
+
+ // {{{ function prependNode()
+ /**
+ * Adds a node to the start of the linked list.
+ *
+ * @param mixed $new_node New node to add to the list
+ *
+ * @return void
+ **/
+ public function prependNode($new_node)
+ {
+ $this->insertNode($new_node, $this->bottom(), true);
+ }
+ // }}}
+
+ // {{{ function deleteNode()
+ /**
+ * Deletes a node from the linked list.
+ *
+ * @param mixed $node Node to delete from the list
+ *
+ * @return void
+ **/
+ public function deleteNode($node)
+ {
+ $target_pos = $node->getPosition();
+ $this->rewind();
+ $pos = 0;
+
+ // Omit target node and adjust pos of remainder
+ try {
+ while ($n = $this->current()) {
+ if ($pos == $target_pos) {
+ $this->offsetUnset($pos);
+ } elseif ($pos > $target_pos) {
+ $n->setPosition($pos);
+ }
+ $pos++;
+ $this->next();
+ }
+ }
+ catch (Exception $e) {
+ // no-op - shift() throws an exception, sigh
+ }
+
+ }
+ // }}}
+
+ // {{{ setPosition()
+ /**
+ * Sets position of the subfield
+ *
+ * @param string $pos new position of the subfield
+ *
+ * @return void
+ */
+ function setPosition($pos)
+ {
+ $this->position = $pos;
+ }
+ // }}}
+
+ // {{{ getPosition()
+ /**
+ * Return position of the subfield
+ *
+ * @return int data
+ */
+ function getPosition()
+ {
+ return $this->position;
+ }
+ // }}}
+
}
// }}}
diff --git a/vendor/pear-pear.php.net/File_MARC/File/MARC/Subfield.php b/vendor/pear-pear.php.net/File_MARC/File/MARC/Subfield.php
index cf8a7b9efd4..583aa450bdf 100644
--- a/vendor/pear-pear.php.net/File_MARC/File/MARC/Subfield.php
+++ b/vendor/pear-pear.php.net/File_MARC/File/MARC/Subfield.php
@@ -36,7 +36,7 @@
* @link http://pear.php.net/package/File_MARC
*/
-// {{{ class File_MARC_Subfield extends Structures_LinkedList_DoubleNode
+// {{{ class File_MARC_Subfield
/**
* The File_MARC_Subfield class represents a single subfield in a MARC
* record field.
@@ -53,7 +53,7 @@
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @link http://pear.php.net/package/File_MARC
*/
-class File_MARC_Subfield extends Structures_LinkedList_DoubleNode
+class File_MARC_Subfield
{
// {{{ properties
/**
@@ -67,6 +67,13 @@ class File_MARC_Subfield extends Structures_LinkedList_DoubleNode
* @var string
*/
protected $data;
+
+ /**
+ * Position of the subfield
+ * @var int
+ */
+ protected $position;
+
// }}}
// {{{ Constructor: function __construct()
@@ -93,7 +100,7 @@ class File_MARC_Subfield extends Structures_LinkedList_DoubleNode
{
$this->code = null;
$this->data = null;
- parent::__destruct();
+ $this->position = null;
}
// }}}
@@ -133,6 +140,18 @@ class File_MARC_Subfield extends Structures_LinkedList_DoubleNode
}
// }}}
+ // {{{ getPosition()
+ /**
+ * Return position of the subfield
+ *
+ * @return int data
+ */
+ function getPosition()
+ {
+ return $this->position;
+ }
+ // }}}
+
// {{{ __toString()
/**
* Return string representation of subfield
@@ -195,6 +214,20 @@ class File_MARC_Subfield extends Structures_LinkedList_DoubleNode
}
// }}}
+ // {{{ setPosition()
+ /**
+ * Sets position of the subfield
+ *
+ * @param string $pos new position of the subfield
+ *
+ * @return void
+ */
+ function setPosition($pos)
+ {
+ $this->position = $pos;
+ }
+ // }}}
+
// {{{ isEmpty()
/**
* Checks whether the subfield is empty or not
diff --git a/vendor/pear-pear.php.net/File_MARC/File/MARCXML.php b/vendor/pear-pear.php.net/File_MARC/File/MARCXML.php
index c08e9729f95..b24a28d9ee6 100644
--- a/vendor/pear-pear.php.net/File_MARC/File/MARCXML.php
+++ b/vendor/pear-pear.php.net/File_MARC/File/MARCXML.php
@@ -39,7 +39,6 @@
*/
require_once 'PEAR/Exception.php';
-require_once 'Structures/LinkedList/Double.php';
require_once 'File/MARCBASE.php';
require_once 'File/MARC.php';
require_once 'File/MARC/Record.php';
diff --git a/vendor/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Double.php b/vendor/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Double.php
deleted file mode 100644
index 75e696c0e1b..00000000000
--- a/vendor/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Double.php
+++ /dev/null
@@ -1,375 +0,0 @@
-<?php
-
-/* vim: set expandtab shiftwidth=4 tabstop=4 softtabstop=4 foldmethod=marker textwidth=80: */
-
-/**
- * Linked list structure
- *
- * This package implements a doubly linked list structure. Each node
- * (Structures_LinkedList_DoubleNode object) in the list
- * (Structures_LinkedList_Double) knows the previous node and the next
- * node in the list. Unlike an array, you can insert or delete nodes at
- * arbitrary points in the list.
- *
- * If your application normally traverses the linked list in a forward-only
- * direction, use the singly-linked list implemented by
- * {@link Structures_LinkedList_Single}. If, however, your application
- * needs to traverse the list backwards, or insert nodes into the list before
- * other nodes in the list, use the double-linked list implemented by
- * {@link Structures_LinkedList_Double} to give your application better
- * performance at the cost of a slightly larger memory footprint.
- *
- * Structures_LinkedList_Double implements the Iterator interface so control
- * structures like foreach($list as $node) and while($list->next()) work
- * as expected.
- *
- * To use this package, derive a child class from
- * Structures_LinkedList_DoubleNode and add data to the object. Then use the
- * Structures_LinkedList_Double class to access the nodes.
- *
- * PHP version 5
- *
- * LICENSE: Copyright 2006 Dan Scott
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @category Structures
- * @package Structures_LinkedList_Double
- * @author Dan Scott <dscott@laurentian.ca>
- * @copyright 2006 Dan Scott
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version CVS: $Id: Double.php -1 $
- * @link http://pear.php.net/package/Structures_LinkedList
- * @example double_link_example.php
- *
- * @todo Add some actual error conditions
- **/
-
-require_once 'PEAR/Exception.php';
-require_once 'Single.php';
-
-// {{{ class Structures_LinkedList_Double
-/**
- * The Structures_LinkedList_Double class represents a linked list structure
- * composed of {@link Structures_LinkedList_DoubleNode} objects.
- *
- * @category Structures
- * @package Structures_LinkedList_Double
- * @author Dan Scott <dscott@laurentian.ca>
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @link http://pear.php.net/package/Structures_LinkedList
- */
-class Structures_LinkedList_Double extends Structures_LinkedList_Single implements Iterator
-{
- // {{{ properties
- /**
- * Tail node of the linked list
- * @var Structures_LinkedList_DoubleNode
- */
- protected $tail_node;
- // }}}
-
- // {{{ Constructor: function __construct()
- /**
- * Structures_LinkedList_Double constructor
- *
- * @param Structures_LinkedList_DoubleNode $root root node for the
- * linked list
- */
- function __construct(Structures_LinkedList_DoubleNode $root = null)
- {
- if ($root) {
- $this->tail_node = $root;
- } else {
- $this->tail_node = null;
- }
- parent::__construct($root);
- }
- // }}}
-
- // {{{ Destructor: function __destruct()
- /**
- * Structures_LinkedList_Double destructor
- *
- * If we do not destroy all of the references in the linked list,
- * we will quickly run out of memory for large / complex structures.
- *
- */
- function __destruct()
- {
- /*
- * Starting with root node, set last node = root_node
- * get next node
- * if next node exists:
- * delete last node's references to next node and previous node
- * make the old next node the new last node
- */
- if (!$last_node = $this->root_node) {
- return;
- }
- while (($next_node = $last_node->next()) !== false) {
- $last_node->setNext(null);
- $last_node->setPrevious(null);
- $last_node = $next_node;
- }
- $this->current = null;
- $this->root_node = null;
- $this->tail_node = null;
- $last_node = null;
- $next_node = null;
- }
- // }}}
-
- // {{{ function end()
- /**
- * Sets the pointer for the linked list to its last node
- *
- * @return Structures_LinkedList_DoubleNode last node in the linked list
- */
- public function end()
- {
- if ($this->tail_node) {
- $this->current = $this->tail_node;
- } else {
- $this->current = null;
- }
- return $this->current;
- }
- // }}}
-
- // {{{ function previous()
- /**
- * Sets the pointer for the linked list to the previous node and
- * returns that node
- *
- * @return Structures_LinkedList_DoubleNode previous node in the linked list
- */
- public function previous()
- {
- if (!$this->current()->previous()) {
- return false;
- }
- $this->current = $this->current()->previous();
- return $this->current();
- }
- // }}}
-
- // {{{ function insertNode()
- /**
- * Inserts a {@link Structures_LinkedList_DoubleNode} object into the linked
- * list, based on a reference node that already exists in the list.
- *
- * @param Structures_LinkedList_DoubleNode $new_node New node to add to the list
- * @param Structures_LinkedList_DoubleNode $existing_node Reference position node
- * @param bool $before Insert new node before or after the existing node
- *
- * @return bool Success or failure
- **/
- public function insertNode($new_node, $existing_node, $before = false)
- {
- if (!$this->root_node) {
- $this->__construct($new_node);
- }
-
- // Now add the node according to the requested mode
- switch ($before) {
-
- case true:
- $previous_node = $existing_node->previous();
- if ($previous_node) {
- $previous_node->setNext($new_node);
- $new_node->setPrevious($previous_node);
- } else {
- // The existing node must be root node; make new node root
- $this->root_node = $new_node;
- $new_node->setPrevious();
- }
- $new_node->setNext($existing_node);
- $existing_node->setPrevious($new_node);
-
- break;
-
- case false:
- $new_node->setPrevious($existing_node);
- $next_node = $existing_node->next();
- if ($next_node) {
- $new_node->setNext($next_node);
- $next_node->setPrevious($new_node);
- } else {
- // The existing node must have been the tail node
- $this->tail_node = $new_node;
- }
- $existing_node->setNext($new_node);
-
- break;
-
- }
-
- return true;
- }
- // }}}
-
- // {{{ protected function getTailNode()
- /**
- * Returns the tail node of the linked list.
- *
- * This is a cheap operation for a doubly-linked list.
- *
- * @return bool Success or failure
- **/
- protected function getTailNode()
- {
- return $this->tail_node;
- }
- // }}}
-
- // {{{ function deleteNode()
- /**
- * Deletes a {@link Structures_LinkedList_DoubleNode} from the list.
- *
- * @param Structures_LinkedList_DoubleNode $node Node to delete.
- *
- * @return null
- */
- public function deleteNode($node)
- {
- /* If this is the root node, and there are more nodes in the list,
- * make the next node the new root node before deleting this node.
- */
- if ($node === $this->root_node) {
- $this->root_node = $node->next();
- }
-
- /* If this is the tail node, and there are more nodes in the list,
- * make the previous node the tail node before deleting this node
- */
- if ($node === $this->tail_node) {
- $this->tail_node = $node->previous();
- }
-
- /* If this is the current node, and there are other nodes in the list,
- * try making the previous node the current node so that next() works
- * as expected.
- *
- * If that fails, make the next node the current node.
- *
- * If that fails, null isn't such a bad place to be.
- */
- if ($node === $this->current) {
- if ($node->previous()) {
- $this->current = $node->previous();
- } elseif ($node->next()) {
- $this->current = $node->next();
- } else {
- $this->current = null;
- }
- }
- $node->__destruct();
- }
- // }}}
-
-}
-// }}}
-
-// {{{ class Structures_LinkedList_DoubleNode
-/**
- * The Structures_LinkedList_DoubleNode class represents a node in a
- * {@link Structures_LinkedList_Double} linked list structure.
- *
- * @category Structures
- * @package Structures_LinkedList_Double
- * @author Dan Scott <dscott@laurentian.ca>
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @link http://pear.php.net/package/Structures_LinkedList
- */
-class Structures_LinkedList_DoubleNode extends Structures_LinkedList_SingleNode
-{
- // {{{ properties
- /**
- * Previous node in the linked list
- * @var Structures_LinkedList_DoubleNode
- */
- protected $previous;
- // }}}
-
- // {{{ Constructor: function __construct()
- /**
- * Structures_LinkedList_DoubleNode constructor
- */
- public function __construct()
- {
- $this->next = null;
- $this->previous = null;
- }
- // }}}
-
- // {{{ Destructor: function __destruct()
- /**
- * Removes node from the list, adjusting the related nodes accordingly.
- *
- * This is a problem if the node is the root node for the list.
- * At this point, however, we do not have access to the list itself. Hmm.
- */
- public function __destruct()
- {
- $next = $this->next();
- $previous = $this->previous();
- if ($previous && $next) {
- $previous->setNext($next);
- $next->setPrevious($previous);
- } elseif ($previous) {
- $previous->setNext();
- } elseif ($next) {
- $next->setPrevious();
- }
- }
- // }}}
-
- // {{{ function previous()
- /**
- * Return the previous node in the linked list
- *
- * @return Structures_LinkedList_DoubleNode previous node in the linked list
- */
- public function previous()
- {
- if ($this->previous) {
- return $this->previous;
- } else {
- return false;
- }
- }
- // }}}
-
- // {{{ function setPrevious()
- /**
- * Sets the pointer for the previous node in the linked list
- * to the specified node
- *
- * @param Structures_LinkedList_DoubleNode $node new previous node
- * in the linked list
- *
- * @return Structures_LinkedList_DoubleNode new previous node in
- * the linked list
- */
- public function setPrevious($node = null)
- {
- $this->previous = $node;
- return $this->previous;
- }
- // }}}
-
-}
-// }}}
-
-?>
diff --git a/vendor/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Single.php b/vendor/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Single.php
deleted file mode 100644
index 6f0d7078b5a..00000000000
--- a/vendor/pear-pear.php.net/Structures_LinkedList/Structures/LinkedList/Single.php
+++ /dev/null
@@ -1,535 +0,0 @@
-<?php
-
-/* vim: set expandtab shiftwidth=4 tabstop=4 softtabstop=4 foldmethod=marker textwidth=80: */
-
-/**
- * Linked list structure
- *
- * This package implements a singly linked list structure. Each node
- * (Structures_LinkedList_SingleNode object) in the list
- * (Structures_LinkedList_Single) knows the the next node in the list.
- * Unlike an array, you can insert or delete nodes at arbitrary points
- * in the list.
- *
- * If your application normally traverses the linked list in a forward-only
- * direction, use the singly-linked list implemented by
- * {@link Structures_LinkedList_Single}. If, however, your application
- * needs to traverse the list backwards, or insert nodes into the list before
- * other nodes in the list, use the double-linked list implemented by
- * {@link Structures_LinkedList_Double} to give your application better
- * performance at the cost of a slightly larger memory footprint.
- *
- * Structures_LinkedList_Single implements the Iterator interface so control
- * structures like foreach($list as $node) and while($list->next()) work
- * as expected.
- *
- * To use this package, derive a child class from
- * Structures_LinkedList_SingleNode and add data to the object. Then use the
- * Structures_LinkedList_Single class to access the nodes.
- *
- * PHP version 5
- *
- * LICENSE: Copyright 2006 Dan Scott
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @category Structures
- * @package Structures_LinkedList_Single
- * @author Dan Scott <dscott@laurentian.ca>
- * @copyright 2006 Dan Scott
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version CVS: $Id: Single.php -1 $
- * @link http://pear.php.net/package/Structures_LinkedList_Single
- * @example single_link_example.php
- *
- * @todo Add some actual error conditions
- **/
-
-require_once 'PEAR/Exception.php';
-
-// {{{ class Structures_LinkedList_Single
-/**
- * The Structures_LinkedList_Single class represents a linked list structure
- * composed of {@link Structures_LinkedList_SingleNode} objects.
- *
- * @category Structures
- * @package Structures_LinkedList_Single
- * @author Dan Scott <dscott@laurentian.ca>
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @link http://pear.php.net/package/Structures_LinkedList_Single
- */
-class Structures_LinkedList_Single implements Iterator
-{
- // {{{ properties
- /**
- * Current node in the linked list
- * @var Structures_LinkedList_SingleNode
- */
- protected $current;
-
- /**
- * Root node of the linked list
- * @var Structures_LinkedList_SingleNode
- */
- protected $root_node;
-
- /**
- * The linked list contains no nodes
- */
- const ERROR_EMPTY = -1;
-
- public static $messages = array(
- self::ERROR_EMPTY => 'No nodes in this linked list'
- );
- // }}}
-
- // {{{ Constructor: function __construct()
- /**
- * Structures_LinkedList_Single constructor
- *
- * @param Structures_LinkedList_SingleNode $root root node for the
- * linked list
- */
- function __construct(Structures_LinkedList_SingleNode $root = null)
- {
- if ($root) {
- $this->root_node = $root;
- $this->current = $root;
- } else {
- $this->root_node = null;
- $this->current = null;
- }
- }
- // }}}
-
- // {{{ Destructor: function __destruct()
- /**
- * Structures_LinkedList_Single destructor
- *
- * If we do not destroy all of the references in the linked list,
- * we will quickly run out of memory for large / complex structures.
- *
- */
- function __destruct()
- {
- /*
- * Starting with root node, set last node = root_node
- * get next node
- * if next node exists, delete last node reference to next node
- */
- if (!$last_node = $this->root_node) {
- return;
- }
- while (($next_node = $last_node->next()) !== false) {
- $last_node->setNext(null);
- $temp_node = $last_node;
- $last_node = $next_node;
- unset($temp_node);
- }
- $this->current = null;
- $this->root_node = null;
- $last_node = null;
- $next_node = null;
- }
- // }}}
-
- // {{{ function current()
- /**
- * Returns the current node in the linked list
- *
- * @return Structures_LinkedList_SingleNode current node in the linked list
- */
- public function current()
- {
- return $this->current;
- }
- // }}}
-
- // {{{ function rewind()
- /**
- * Sets the pointer for the linked list to the root node
- *
- * @return Structures_LinkedList_SingleNode root node in the linked list
- */
- public function rewind()
- {
- if ($this->root_node) {
- $this->current = $this->root_node;
- } else {
- $this->current = null;
- }
- return $this->current;
- }
- // }}}
-
- // {{{ function end()
- /**
- * Sets the pointer for the linked list to the root node
- *
- * @return Structures_LinkedList_SingleNode root node in the linked list
- */
- public function end()
- {
- $this->current = $this->getTailNode();
- return $this->current;
- }
- // }}}
-
- // {{{ function key()
- /**
- * Stub for Iterator interface that simply returns the current node
- *
- * @return Structures_LinkedList_SingleNode current node in the linked list
- */
- public function key()
- {
- return $this->current;
- }
- // }}}
-
- // {{{ function valid()
- /**
- * Stub for Iterator interface that simply returns the current node
- *
- * @return Structures_LinkedList_SingleNode current node in the linked list
- */
- public function valid()
- {
- return $this->current();
- }
- // }}}
-
- // {{{ function next()
- /**
- * Sets the pointer for the linked list to the next node and
- * returns that node
- *
- * @return Structures_LinkedList_SingleNode next node in the linked list
- */
- public function next()
- {
- if (!$this->current) {
- return false;
- }
- $this->current = $this->current()->next();
- return $this->current;
- }
- // }}}
-
- // {{{ function previous()
- /**
- * Sets the pointer for the linked list to the previous node and
- * returns that node
- *
- * @return Structures_LinkedList_SingleNode previous node in the linked list
- */
- public function previous()
- {
- if (!$this->current) {
- return false;
- }
- $this->current = $this->_getPreviousNode();
- return $this->current;
- }
- // }}}
-
- // {{{ protected function getTailNode()
- /**
- * Returns the tail node of the linked list.
- *
- * This is an expensive operation!
- *
- * @return bool Success or failure
- **/
- protected function getTailNode()
- {
- $tail_node = $this->root_node;
- while (($y = $tail_node->next()) !== false) {
- $tail_node = $y;
- }
- return $tail_node;
- }
- // }}}
-
- // {{{ private function _getPreviousNode()
- /**
- * Returns the node prior to the current node in the linked list.
- *
- * This is an expensive operation for a singly linked list!
- *
- * @param Structures_LinkedList_SingleNode $node (Optional) Specific node
- * for which we want to find the previous node
- *
- * @return Structures_LinkedList_SingleNode Previous node
- **/
- private function _getPreviousNode($node = null)
- {
- if (!$node) {
- $node = $this->current;
- }
- $prior_node = $this->root_node;
- while (($y = $prior_node->next()) !== false) {
- if ($y == $node) {
- return $prior_node;
- }
- $prior_node = $y;
- }
- return null;
- }
- // }}}
-
- // {{{ function appendNode()
- /**
- * Adds a {@link Structures_LinkedList_SingleNode} object to the end of
- * the linked list.
- *
- * @param Structures_LinkedList_SingleNode $new_node New node to append
- *
- * @return bool Success or failure
- **/
- public function appendNode(Structures_LinkedList_SingleNode $new_node)
- {
- if (!$this->root_node) {
- $this->__construct($new_node);
- return true;
- }
-
- // This is just a special case of insertNode()
- $this->insertNode($new_node, $this->getTailNode());
-
- return true;
- }
- // }}}
-
- // {{{ function insertNode()
- /**
- * Inserts a {@link Structures_LinkedList_SingleNode} object into the linked
- * list, based on a reference node that already exists in the list.
- *
- * @param Structures_LinkedList_SingleNode $new_node New node to add to
- * the list
- * @param Structures_LinkedList_SingleNode $existing_node Reference
- * position node
- * @param bool $before Insert new node
- * before or after the existing node
- *
- * @return bool Success or failure
- **/
- public function insertNode($new_node, $existing_node, $before = false)
- {
- if (!$this->root_node) {
- $this->__construct($new_node);
- return true;
- }
-
- // Now add the node according to the requested mode
- switch ($before) {
-
- case true:
- if ($existing_node === $this->root_node) {
- $this->root_node = $new_node;
- }
- $previous_node = $this->_getPreviousNode($existing_node);
- if ($previous_node) {
- $previous_node->setNext($new_node);
- }
- $new_node->setNext($existing_node);
-
- break;
-
- case false:
- $next_node = $existing_node->next();
- if ($next_node) {
- $new_node->setNext($next_node);
- }
- $existing_node->setNext($new_node);
-
- break;
-
- }
-
- return true;
- }
- // }}}
-
- // {{{ function prependNode()
- /**
- * Adds a {@link Structures_LinkedList_SingleNode} object to the start
- * of the linked list.
- *
- * @param Structures_LinkedList_SingleNode $new_node Node to prepend
- * to the list
- *
- * @return bool Success or failure
- **/
- public function prependNode(Structures_LinkedList_SingleNode $new_node)
- {
- if (!$this->root_node) {
- $this->__construct($new_node);
- return true;
- }
-
- // This is just a special case of insertNode()
- $this->insertNode($new_node, $this->root_node, true);
-
- return true;
- }
- // }}}
-
- // {{{ function deleteNode()
- /**
- * Deletes a {@link Structures_LinkedList_SingleNode} from the list.
- *
- * @param Structures_LinkedList_SingleNode $node Node to delete.
- *
- * @return null
- */
- public function deleteNode($node)
- {
- /* If this is the root node, and there are more nodes in the list,
- * make the next node the new root node before deleting this node.
- */
- if ($node === $this->root_node) {
- $this->root_node = $node->next();
- }
-
- /* If this is the current node, make the next node the current node.
- *
- * If that fails, null isn't such a bad place to be.
- */
- if ($node === $this->current) {
- if ($node->next()) {
- $this->current = $node->next();
- } else {
- $this->current = null;
- }
- }
- $node->__destruct();
- }
- // }}}
-
-}
-// }}}
-
-// {{{ class Structures_LinkedList_SingleNode
-/**
- * The Structures_LinkedList_SingleNode class represents a node in a
- * {@link Structures_LinkedList_Single} linked list structure.
- *
- * @category Structures
- * @package Structures_LinkedList_Single
- * @author Dan Scott <dscott@laurentian.ca>
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @link http://pear.php.net/package/Structures_LinkedList_Single
- */
-class Structures_LinkedList_SingleNode
-{
- // {{{ properties
- /**
- * Next node in the linked list
- * @var Structures_LinkedList_SingleNode
- */
- protected $next;
- // }}}
-
- // {{{ Constructor: function __construct()
- /**
- * Structures_LinkedList_SingleNode constructor
- */
- public function __construct()
- {
- $this->next = null;
- }
- // }}}
-
- // {{{ Destructor: function __destruct()
- /**
- * Removes node from the list, adjusting the related nodes accordingly.
- *
- * This is a problem if the node is the root node for the list.
- * At this point, however, we do not have access to the list itself. Hmm.
- */
- public function __destruct()
- {
- }
- // }}}
-
- // {{{ function next()
- /**
- * Return the next node in the linked list
- *
- * @return Structures_LinkedList_SingleNode next node in the linked list
- */
- public function next()
- {
- if ($this->next) {
- return $this->next;
- } else {
- return false;
- }
- }
- // }}}
-
- // {{{ function previous()
- /**
- * Return the previous node in the linked list
- *
- * Stub method for Structures_LinkedList_DoubleNode to override.
- *
- * @return Structures_LinkedList_SingleNode previous node in the linked list
- */
- public function previous()
- {
- return false;
- }
- // }}}
-
- // {{{ function setNext()
- /**
- * Sets the pointer for the next node in the linked list to the
- * specified node
- *
- * @param Structures_LinkedList_SingleNode $node new next node in
- * the linked list
- *
- * @return Structures_LinkedList_SingleNode new next node in the linked list
- */
- public function setNext($node = null)
- {
- $this->next = $node;
- return $this->next;
- }
- // }}}
-
- // {{{ function setPrevious()
- /**
- * Sets the pointer for the next node in the linked list to the
- * specified node
- *
- * Stub method for Structures_LinkedList_DoubleNode to override.
- *
- * @param Structures_LinkedList_SingleNode $node new next node in
- * the linked list
- *
- * @return Structures_LinkedList_SingleNode new next node in the linked list
- */
- public function setPrevious($node = null)
- {
- return false;
- }
- // }}}
-}
-
-// }}}
-
-?>
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php
index a27a005e6f5..938097b8b3e 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php
@@ -11,6 +11,11 @@
namespace Symfony\Component\Yaml\Exception;
+if (!defined('JSON_UNESCAPED_UNICODE')) {
+ define('JSON_UNESCAPED_SLASHES', 64);
+ define('JSON_UNESCAPED_UNICODE', 256);
+}
+
/**
* Exception class thrown when an error occurs during parsing.
*
@@ -32,9 +37,9 @@ class ParseException extends RuntimeException
* @param integer $parsedLine The line where the error occurred
* @param integer $snippet The snippet of code near the problem
* @param string $parsedFile The file name where the error occurred
- * @param Exception $previous The previous exception
+ * @param \Exception $previous The previous exception
*/
- public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, Exception $previous = null)
+ public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, \Exception $previous = null)
{
$this->parsedFile = $parsedFile;
$this->parsedLine = $parsedLine;
@@ -125,7 +130,7 @@ class ParseException extends RuntimeException
}
if (null !== $this->parsedFile) {
- $this->message .= sprintf(' in %s', json_encode($this->parsedFile));
+ $this->message .= sprintf(' in %s', json_encode($this->parsedFile, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
}
if ($this->parsedLine >= 0) {
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/README.md b/vendor/symfony/yaml/Symfony/Component/Yaml/README.md
index 0864e49dca0..941a3460e31 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/README.md
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/README.md
@@ -15,5 +15,5 @@ Resources
You can run the unit tests with the following command:
$ cd path/to/Symfony/Component/Yaml/
- $ composer.phar install --dev
+ $ composer.phar install
$ phpunit
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParseExceptionTest.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParseExceptionTest.php
new file mode 100644
index 00000000000..289965e8d96
--- /dev/null
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParseExceptionTest.php
@@ -0,0 +1,30 @@
+<?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.
+ */
+
+namespace Symfony\Component\Yaml\Tests;
+
+use Symfony\Component\Yaml\Exception\ParseException;
+use Symfony\Component\Yaml\Yaml;
+
+class ParseExceptionTest extends \PHPUnit_Framework_TestCase
+{
+ public function testGetMessage()
+ {
+ $exception = new ParseException('Error message', 42, 'foo: bar', '/var/www/app/config.yml');
+ if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
+ $message = 'Error message in "/var/www/app/config.yml" at line 42 (near "foo: bar")';
+ } else {
+ $message = 'Error message in "\\/var\\/www\\/app\\/config.yml" at line 42 (near "foo: bar")';
+ }
+
+ $this->assertEquals($message, $exception->getMessage());
+ }
+}
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php
index 708f2a18f28..ac3a576b677 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php
@@ -130,7 +130,7 @@ class Unescaper
*
* @return string The string with the new encoding
*
- * @throws RuntimeException if no suitable encoding function is found (iconv or mbstring)
+ * @throws \RuntimeException if no suitable encoding function is found (iconv or mbstring)
*/
private function convertEncoding($value, $to, $from)
{
@@ -140,6 +140,6 @@ class Unescaper
return iconv($from, $to, $value);
}
- throw new RuntimeException('No suitable convert encoding function (install the iconv or mbstring extension).');
+ throw new \RuntimeException('No suitable convert encoding function (install the iconv or mbstring extension).');
}
}
--
GitLab