From c1ad65e5c5b7b316662ce0eb179584ac23d691cd Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 1 Nov 2013 12:02:38 -0400
Subject: [PATCH] Upgraded File_MARC dependency.
---
composer.lock | 6 +-
vendor/autoload.php | 2 +-
vendor/composer/autoload_real.php | 6 +-
vendor/composer/installed.json | 56 +++++++++----------
.../File_MARC/File/MARC/Subfield.php | 2 +-
5 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/composer.lock b/composer.lock
index 47c65a15452..09b34fff9b6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -186,10 +186,10 @@
},
{
"name": "pear-pear.php.net/File_MARC",
- "version": "1.0.0",
+ "version": "1.0.1",
"dist": {
"type": "file",
- "url": "http://pear.php.net/get/File_MARC-1.0.0.tgz",
+ "url": "http://pear.php.net/get/File_MARC-1.0.1.tgz",
"reference": null,
"shasum": null
},
@@ -197,7 +197,7 @@
"php": ">=5.3.0.0"
},
"replace": {
- "pear-pear/file_marc": "== 1.0.0.0"
+ "pear-pear/file_marc": "== 1.0.1.0"
},
"type": "pear-library",
"autoload": {
diff --git a/vendor/autoload.php b/vendor/autoload.php
index f999dc3d4a7..3b08781e704 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitc402854ef8a8993a2e83e8b4c43ebd4d::getLoader();
+return ComposerAutoloaderInit051c0821dd0a7122afa1b731228664e9::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 27d15b690e3..43cbf7f1d2e 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitc402854ef8a8993a2e83e8b4c43ebd4d
+class ComposerAutoloaderInit051c0821dd0a7122afa1b731228664e9
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitc402854ef8a8993a2e83e8b4c43ebd4d
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitc402854ef8a8993a2e83e8b4c43ebd4d', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit051c0821dd0a7122afa1b731228664e9', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitc402854ef8a8993a2e83e8b4c43ebd4d', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit051c0821dd0a7122afa1b731228664e9', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a4647c0269c..7d5c3d20821 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -605,34 +605,6 @@
"issues": "https://github.com/Jasig/phpCAS/issues"
}
},
- {
- "name": "pear-pear.php.net/File_MARC",
- "version": "1.0.0",
- "version_normalized": "1.0.0.0",
- "dist": {
- "type": "file",
- "url": "http://pear.php.net/get/File_MARC-1.0.0.tgz",
- "reference": null,
- "shasum": null
- },
- "require": {
- "php": ">=5.3.0.0"
- },
- "replace": {
- "pear-pear/file_marc": "== 1.0.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.6",
@@ -681,5 +653,33 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com"
+ },
+ {
+ "name": "pear-pear.php.net/File_MARC",
+ "version": "1.0.1",
+ "version_normalized": "1.0.1.0",
+ "dist": {
+ "type": "file",
+ "url": "http://pear.php.net/get/File_MARC-1.0.1.tgz",
+ "reference": null,
+ "shasum": null
+ },
+ "require": {
+ "php": ">=5.3.0.0"
+ },
+ "replace": {
+ "pear-pear/file_marc": "== 1.0.1.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."
}
]
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 583aa450bdf..227d4af5b03 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
@@ -237,7 +237,7 @@ class File_MARC_Subfield
function isEmpty()
{
// There is data
- if ($this->data) {
+ if (strlen($this->data)) {
return false;
}
--
GitLab