From 8adb57d28c1b542c615e276daa7b77baa7152c9a Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 16 Sep 2013 14:55:55 -0400
Subject: [PATCH] Added QR code library.
---
composer.json | 1 +
composer.lock | 47 ++++++++++++++++++++++++-
vendor/aferrandini/phpqrcode | 1 +
vendor/autoload.php | 2 +-
vendor/composer/autoload_namespaces.php | 1 +
vendor/composer/autoload_real.php | 6 ++--
vendor/composer/installed.json | 46 ++++++++++++++++++++++++
7 files changed, 99 insertions(+), 5 deletions(-)
create mode 160000 vendor/aferrandini/phpqrcode
diff --git a/composer.json b/composer.json
index ca9defae21a..8d0b6aa9aaa 100644
--- a/composer.json
+++ b/composer.json
@@ -51,6 +51,7 @@
}
],
"require": {
+ "aferrandini/phpqrcode": "dev-master",
"johnwohlers/sip2": "dev-master",
"mobileesp/mdetect": "dev-master",
"pear-pear.php.net/file_marc": "*",
diff --git a/composer.lock b/composer.lock
index 9ba073ee11b..b18bec1b890 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,8 +3,52 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "10db919570986743f7e37b8dfec2723a",
+ "hash": "3a96cca5a1467ae59946ca4a60ea154b",
"packages": [
+ {
+ "name": "aferrandini/phpqrcode",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/aferrandini/PHPQRCode.git",
+ "reference": "3c1c0454d43710ab5bbe19a51ad4cb41c22e3d46"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/aferrandini/PHPQRCode/zipball/3c1c0454d43710ab5bbe19a51ad4cb41c22e3d46",
+ "reference": "3c1c0454d43710ab5bbe19a51ad4cb41c22e3d46",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "PHPQRCode": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ariel Ferrandini",
+ "email": "arielferrandini@gmail.com",
+ "homepage": "http://www.ferrandini.com/",
+ "role": "Developer"
+ }
+ ],
+ "description": "PHPQRCode porting and changed for PHP 5.3 compatibility",
+ "homepage": "https://github.com/aferrandini/PHPQRCode",
+ "keywords": [
+ "barcode",
+ "php",
+ "qrcode"
+ ],
+ "time": "2013-07-08 09:39:08"
+ },
{
"name": "johnwohlers/sip2",
"version": "dev-master",
@@ -595,6 +639,7 @@
],
"minimum-stability": "stable",
"stability-flags": {
+ "aferrandini/phpqrcode": 20,
"johnwohlers/sip2": 20,
"mobileesp/mdetect": 20,
"serialssolutions/summon": 20
diff --git a/vendor/aferrandini/phpqrcode b/vendor/aferrandini/phpqrcode
new file mode 160000
index 00000000000..3c1c0454d43
--- /dev/null
+++ b/vendor/aferrandini/phpqrcode
@@ -0,0 +1 @@
+Subproject commit 3c1c0454d43710ab5bbe19a51ad4cb41c22e3d46
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 3dc9591adfa..1a4b33ebf6d 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInite06f82407c4bb1da9bf31e7b3aeb8f10::getLoader();
+return ComposerAutoloaderInit65f48b04e66313b3a80ddd362a925670::getLoader();
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 1bbc3b650e8..51846d6df7a 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -11,4 +11,5 @@ return array(
'ZendRest' => array($vendorDir . '/zendframework/zendrest/library'),
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
'SerialsSolutions' => array($vendorDir . '/serialssolutions/summon'),
+ 'PHPQRCode' => array($vendorDir . '/aferrandini/phpqrcode/lib'),
);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index dd4fce7faad..dd5d334ff67 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php generated by Composer
-class ComposerAutoloaderInite06f82407c4bb1da9bf31e7b3aeb8f10
+class ComposerAutoloaderInit65f48b04e66313b3a80ddd362a925670
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInite06f82407c4bb1da9bf31e7b3aeb8f10
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInite06f82407c4bb1da9bf31e7b3aeb8f10', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit65f48b04e66313b3a80ddd362a925670', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInite06f82407c4bb1da9bf31e7b3aeb8f10', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit65f48b04e66313b3a80ddd362a925670', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 22ee295c2f1..b01a766cbd7 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -611,5 +611,51 @@
"/"
],
"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",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/aferrandini/PHPQRCode.git",
+ "reference": "3c1c0454d43710ab5bbe19a51ad4cb41c22e3d46"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/aferrandini/PHPQRCode/zipball/3c1c0454d43710ab5bbe19a51ad4cb41c22e3d46",
+ "reference": "3c1c0454d43710ab5bbe19a51ad4cb41c22e3d46",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "time": "2013-07-08 09:39:08",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "psr-0": {
+ "PHPQRCode": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ariel Ferrandini",
+ "email": "arielferrandini@gmail.com",
+ "homepage": "http://www.ferrandini.com/",
+ "role": "Developer"
+ }
+ ],
+ "description": "PHPQRCode porting and changed for PHP 5.3 compatibility",
+ "homepage": "https://github.com/aferrandini/PHPQRCode",
+ "keywords": [
+ "barcode",
+ "php",
+ "qrcode"
+ ]
}
]
--
GitLab