From bc3347d4479e5141bbb191e16b480aeecebf7df5 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 22 May 2013 10:34:30 -0400
Subject: [PATCH] Updated dependencies.
---
composer.lock | 48 ++--
vendor/autoload.php | 2 +-
vendor/composer/ClassLoader.php | 36 +--
vendor/composer/autoload_namespaces.php | 12 +-
vendor/composer/autoload_real.php | 8 +-
vendor/composer/installed.json | 212 +++++++++---------
.../summon/SerialsSolutions/Summon/Zend2.php | 40 +++-
vendor/zendframework/zendrest/.gitignore | 1 +
vendor/zendframework/zendrest/README.txt | 12 -
vendor/zendframework/zendrest/composer.json | 33 ++-
.../zendservice-amazon/.gitignore | 3 +
.../zendservice-amazon/.travis.yml | 17 ++
.../zendservice-amazon/README.txt | 12 -
.../zendservice-amazon/composer.json | 45 +++-
14 files changed, 305 insertions(+), 176 deletions(-)
create mode 100644 vendor/zendframework/zendrest/.gitignore
delete mode 100644 vendor/zendframework/zendrest/README.txt
create mode 100644 vendor/zendframework/zendservice-amazon/.gitignore
create mode 100644 vendor/zendframework/zendservice-amazon/.travis.yml
delete mode 100644 vendor/zendframework/zendservice-amazon/README.txt
diff --git a/composer.lock b/composer.lock
index 46602e0a55d..62663284324 100644
--- a/composer.lock
+++ b/composer.lock
@@ -290,12 +290,12 @@
"source": {
"type": "git",
"url": "https://github.com/summon/Summon.php.git",
- "reference": "c77862d88e5d928d04ef8491d63177c91a4732de"
+ "reference": "e660100499afa047ba8d83c065df1c489fa1d87e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/summon/Summon.php/zipball/c77862d88e5d928d04ef8491d63177c91a4732de",
- "reference": "c77862d88e5d928d04ef8491d63177c91a4732de",
+ "url": "https://api.github.com/repos/summon/Summon.php/zipball/e660100499afa047ba8d83c065df1c489fa1d87e",
+ "reference": "e660100499afa047ba8d83c065df1c489fa1d87e",
"shasum": ""
},
"type": "library",
@@ -317,7 +317,7 @@
"support": {
"source": "https://github.com/summon/Summon.php/tree/master"
},
- "time": "2013-02-22 14:04:58"
+ "time": "2013-05-22 14:23:13"
},
{
"name": "symfony/yaml",
@@ -484,11 +484,16 @@
{
"name": "zendframework/zendrest",
"version": "2.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/ZendRest.git",
+ "reference": "release-2.0.1"
+ },
"dist": {
"type": "zip",
- "url": "http://packages.zendframework.com/composer/ZendRest-2.0.1.zip",
- "reference": null,
- "shasum": null
+ "url": "https://packages.zendframework.com/composer/zendframework-zendrest-2.0.1-release-2.0.1-97c8b5.zip",
+ "reference": "2.0.1",
+ "shasum": "e5c2ae15280bfbfb090601752dcb1f193d8617f8"
},
"require": {
"php": ">=5.3.3",
@@ -516,20 +521,24 @@
"zf2"
],
"support": {
- "email": "fw-general-subscribe@lists.zend.com",
- "irc": "irc://irc.freenode.net/zftalk",
- "issues": "https://github.com/zendframework/zf2/issues",
- "source": "https://github.com/zendframework/zf2"
- }
+ "source": "https://github.com/zendframework/ZendRest/tree/release-2.0.1",
+ "issues": "https://github.com/zendframework/ZendRest/issues"
+ },
+ "time": "2012-09-24 15:17:53"
},
{
"name": "zendframework/zendservice-amazon",
"version": "2.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/ZendService_Amazon.git",
+ "reference": "release-2.0.2"
+ },
"dist": {
"type": "zip",
- "url": "http://packages.zendframework.com/composer/ZendService_Amazon-2.0.2.zip",
- "reference": null,
- "shasum": null
+ "url": "https://packages.zendframework.com/composer/zendframework-zendservice-amazon-2.0.2-release-2.0.2-91b73f.zip",
+ "reference": "2.0.2",
+ "shasum": "4d83d67516a107b0110ca3473c8ef6c37464eddb"
},
"require": {
"php": ">=5.3.3",
@@ -569,11 +578,10 @@
"zf2"
],
"support": {
- "email": "fw-general-subscribe@lists.zend.com",
- "irc": "irc://irc.freenode.net/zftalk",
- "issues": "https://github.com/zendframework/zf2/issues",
- "source": "https://github.com/zendframework/zf2"
- }
+ "source": "https://github.com/zendframework/ZendService_Amazon/tree/release-2.0.2",
+ "issues": "https://github.com/zendframework/ZendService_Amazon/issues"
+ },
+ "time": "2012-10-17 19:02:58"
}
],
"packages-dev": [
diff --git a/vendor/autoload.php b/vendor/autoload.php
index cc734df7ab0..9ee1c13d094 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitf153ffa92768764e506b87ee6f65b343::getLoader();
+return ComposerAutoloaderInit49ed6490d6a055e51aa9a97efbec6d77::getLoader();
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index bcf980915da..ef9924516ae 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -49,7 +49,7 @@ class ClassLoader
public function getPrefixes()
{
- return $this->prefixes;
+ return call_user_func_array('array_merge', $this->prefixes);
}
public function getFallbackDirs()
@@ -98,19 +98,21 @@ class ClassLoader
return;
}
- if (!isset($this->prefixes[$prefix])) {
- $this->prefixes[$prefix] = (array) $paths;
+
+ $first = $prefix[0];
+ if (!isset($this->prefixes[$first][$prefix])) {
+ $this->prefixes[$first][$prefix] = (array) $paths;
return;
}
if ($prepend) {
- $this->prefixes[$prefix] = array_merge(
+ $this->prefixes[$first][$prefix] = array_merge(
(array) $paths,
- $this->prefixes[$prefix]
+ $this->prefixes[$first][$prefix]
);
} else {
- $this->prefixes[$prefix] = array_merge(
- $this->prefixes[$prefix],
+ $this->prefixes[$first][$prefix] = array_merge(
+ $this->prefixes[$first][$prefix],
(array) $paths
);
}
@@ -129,7 +131,7 @@ class ClassLoader
return;
}
- $this->prefixes[$prefix] = (array) $paths;
+ $this->prefixes[substr($prefix, 0, 1)][$prefix] = (array) $paths;
}
/**
@@ -195,6 +197,7 @@ class ClassLoader
*/
public function findFile($class)
{
+ // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
if ('\\' == $class[0]) {
$class = substr($class, 1);
}
@@ -205,7 +208,7 @@ class ClassLoader
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
- $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)) . DIRECTORY_SEPARATOR;
+ $classPath = strtr(substr($class, 0, $pos), '\\', DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
$className = substr($class, $pos + 1);
} else {
// PEAR-like class name
@@ -213,13 +216,16 @@ class ClassLoader
$className = $class;
}
- $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+ $classPath .= strtr($className, '_', DIRECTORY_SEPARATOR) . '.php';
- foreach ($this->prefixes as $prefix => $dirs) {
- if (0 === strpos($class, $prefix)) {
- foreach ($dirs as $dir) {
- if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
- return $dir . DIRECTORY_SEPARATOR . $classPath;
+ $first = $class[0];
+ if (isset($this->prefixes[$first])) {
+ foreach ($this->prefixes[$first] as $prefix => $dirs) {
+ if (0 === strpos($class, $prefix)) {
+ foreach ($dirs as $dir) {
+ if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
+ return $dir . DIRECTORY_SEPARATOR . $classPath;
+ }
}
}
}
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 99e7b1e7784..07fb04d56b5 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -6,10 +6,10 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
- 'Zend\\' => $vendorDir . '/zendframework/zendframework/library',
- 'ZendTest\\' => $vendorDir . '/zendframework/zendframework/tests',
- 'ZendService' => $vendorDir . '/zendframework/zendservice-amazon/library',
- 'ZendRest' => $vendorDir . '/zendframework/zendrest/library',
- 'Symfony\\Component\\Yaml\\' => $vendorDir . '/symfony/yaml',
- 'SerialsSolutions' => $vendorDir . '/serialssolutions/summon',
+ 'Zend\\' => array($vendorDir . '/zendframework/zendframework/library'),
+ 'ZendTest\\' => array($vendorDir . '/zendframework/zendframework/tests'),
+ 'ZendService' => array($vendorDir . '/zendframework/zendservice-amazon/library'),
+ 'ZendRest' => array($vendorDir . '/zendframework/zendrest/library'),
+ 'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
+ 'SerialsSolutions' => array($vendorDir . '/serialssolutions/summon'),
);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 9bf5c06fec3..8758c3615bf 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php generated by Composer
-class ComposerAutoloaderInitf153ffa92768764e506b87ee6f65b343
+class ComposerAutoloaderInit49ed6490d6a055e51aa9a97efbec6d77
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitf153ffa92768764e506b87ee6f65b343
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitf153ffa92768764e506b87ee6f65b343', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit49ed6490d6a055e51aa9a97efbec6d77', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitf153ffa92768764e506b87ee6f65b343', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit49ed6490d6a055e51aa9a97efbec6d77', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -32,7 +32,7 @@ class ComposerAutoloaderInitf153ffa92768764e506b87ee6f65b343
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
- $loader->add($namespace, $path);
+ $loader->set($namespace, $path);
}
$classMap = require __DIR__ . '/autoload_classmap.php';
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 46ee7ec8033..9086416f0bf 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -42,15 +42,15 @@
"source": {
"type": "git",
"url": "https://github.com/summon/Summon.php.git",
- "reference": "c77862d88e5d928d04ef8491d63177c91a4732de"
+ "reference": "e660100499afa047ba8d83c065df1c489fa1d87e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/summon/Summon.php/zipball/c77862d88e5d928d04ef8491d63177c91a4732de",
- "reference": "c77862d88e5d928d04ef8491d63177c91a4732de",
+ "url": "https://api.github.com/repos/summon/Summon.php/zipball/e660100499afa047ba8d83c065df1c489fa1d87e",
+ "reference": "e660100499afa047ba8d83c065df1c489fa1d87e",
"shasum": ""
},
- "time": "2013-02-22 14:04:58",
+ "time": "2013-05-22 14:23:13",
"type": "library",
"installation-source": "source",
"autoload": {
@@ -337,104 +337,6 @@
],
"description": "Package containes ISPN (International Standard Product Numbers) validations such as:\n * ISSN\n * ISBN\n * ISMN\n * ISRC (International Standard Recording Code)\n * EAN8\n * EAN13\n * EAN14\n * UCC12\n * SSCC"
},
- {
- "name": "zendframework/zendrest",
- "version": "2.0.1",
- "version_normalized": "2.0.1.0",
- "dist": {
- "type": "zip",
- "url": "http://packages.zendframework.com/composer/ZendRest-2.0.1.zip",
- "reference": null,
- "shasum": null
- },
- "require": {
- "php": ">=5.3.3",
- "zendframework/zend-http": ">=2.0.0",
- "zendframework/zend-uri": ">=2.0.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "ZendRest": "library/"
- }
- },
- "license": [
- "BSD-3-Clause"
- ],
- "description": " ",
- "homepage": "http://packages.zendframework.com/",
- "keywords": [
- "rest",
- "zf2"
- ],
- "support": {
- "email": "fw-general-subscribe@lists.zend.com",
- "irc": "irc://irc.freenode.net/zftalk",
- "issues": "https://github.com/zendframework/zf2/issues",
- "source": "https://github.com/zendframework/zf2"
- }
- },
- {
- "name": "zendframework/zendservice-amazon",
- "version": "2.0.2",
- "version_normalized": "2.0.2.0",
- "dist": {
- "type": "zip",
- "url": "http://packages.zendframework.com/composer/ZendService_Amazon-2.0.2.zip",
- "reference": null,
- "shasum": null
- },
- "require": {
- "php": ">=5.3.3",
- "zendframework/zend-crypt": ">=2.0.0",
- "zendframework/zend-http": ">=2.0.0",
- "zendframework/zend-json": ">=2.0.0",
- "zendframework/zendrest": ">=2.0.0"
- },
- "require-dev": {
- "zendframework/zend-i18n": ">=2.0.0"
- },
- "suggest": {
- "zendframework/zend-uri": "Zend\\Uri component"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "ZendService": "library/"
- }
- },
- "license": [
- "BSD-3-Clause"
- ],
- "description": "OOP wrapper for the Amazon web service",
- "homepage": "http://packages.zendframework.com/",
- "keywords": [
- "amazon",
- "ec2",
- "s3",
- "simpledb",
- "sqs",
- "zf2"
- ],
- "support": {
- "email": "fw-general-subscribe@lists.zend.com",
- "irc": "irc://irc.freenode.net/zftalk",
- "issues": "https://github.com/zendframework/zf2/issues",
- "source": "https://github.com/zendframework/zf2"
- }
- },
{
"name": "symfony/yaml",
"version": "v2.2.1",
@@ -600,5 +502,111 @@
"source": "https://github.com/zendframework/zf2/tree/release-2.2.0",
"issues": "https://github.com/zendframework/zf2/issues"
}
+ },
+ {
+ "name": "zendframework/zendrest",
+ "version": "2.0.1",
+ "version_normalized": "2.0.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/ZendRest.git",
+ "reference": "release-2.0.1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://packages.zendframework.com/composer/zendframework-zendrest-2.0.1-release-2.0.1-97c8b5.zip",
+ "reference": "2.0.1",
+ "shasum": "e5c2ae15280bfbfb090601752dcb1f193d8617f8"
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-http": ">=2.0.0",
+ "zendframework/zend-uri": ">=2.0.0"
+ },
+ "time": "2012-09-24 15:17:53",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "ZendRest": "library/"
+ }
+ },
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": " ",
+ "homepage": "http://packages.zendframework.com/",
+ "keywords": [
+ "rest",
+ "zf2"
+ ],
+ "support": {
+ "source": "https://github.com/zendframework/ZendRest/tree/release-2.0.1",
+ "issues": "https://github.com/zendframework/ZendRest/issues"
+ }
+ },
+ {
+ "name": "zendframework/zendservice-amazon",
+ "version": "2.0.2",
+ "version_normalized": "2.0.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/ZendService_Amazon.git",
+ "reference": "release-2.0.2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://packages.zendframework.com/composer/zendframework-zendservice-amazon-2.0.2-release-2.0.2-91b73f.zip",
+ "reference": "2.0.2",
+ "shasum": "4d83d67516a107b0110ca3473c8ef6c37464eddb"
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-crypt": ">=2.0.0",
+ "zendframework/zend-http": ">=2.0.0",
+ "zendframework/zend-json": ">=2.0.0",
+ "zendframework/zendrest": ">=2.0.0"
+ },
+ "require-dev": {
+ "zendframework/zend-i18n": ">=2.0.0"
+ },
+ "suggest": {
+ "zendframework/zend-uri": "Zend\\Uri component"
+ },
+ "time": "2012-10-17 19:02:58",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "ZendService": "library/"
+ }
+ },
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "OOP wrapper for the Amazon web service",
+ "homepage": "http://packages.zendframework.com/",
+ "keywords": [
+ "amazon",
+ "ec2",
+ "s3",
+ "simpledb",
+ "sqs",
+ "zf2"
+ ],
+ "support": {
+ "source": "https://github.com/zendframework/ZendService_Amazon/tree/release-2.0.2",
+ "issues": "https://github.com/zendframework/ZendService_Amazon/issues"
+ }
}
]
diff --git a/vendor/serialssolutions/summon/SerialsSolutions/Summon/Zend2.php b/vendor/serialssolutions/summon/SerialsSolutions/Summon/Zend2.php
index e309e271a85..f0f52993e51 100644
--- a/vendor/serialssolutions/summon/SerialsSolutions/Summon/Zend2.php
+++ b/vendor/serialssolutions/summon/SerialsSolutions/Summon/Zend2.php
@@ -27,7 +27,8 @@
* @link http://api.summon.serialssolutions.com/help/api/ API Documentation
*/
namespace SerialsSolutions\Summon;
-use SerialsSolutions_Summon_Exception, Zend\Http\Client as HttpClient;
+use SerialsSolutions_Summon_Exception, Zend\Http\Client as HttpClient,
+ Zend\Log\LoggerAwareInterface, Zend\Log\LoggerInterface;
/**
* Summon Search API Interface (Zend Framework 2 implementation)
@@ -39,7 +40,7 @@ use SerialsSolutions_Summon_Exception, Zend\Http\Client as HttpClient;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://api.summon.serialssolutions.com/help/api/ API Documentation
*/
-class Zend2 extends \SerialsSolutions_Summon_Base
+class Zend2 extends \SerialsSolutions_Summon_Base implements LoggerAwareInterface
{
/**
* The HTTP_Request object used for API transactions
@@ -47,6 +48,13 @@ class Zend2 extends \SerialsSolutions_Summon_Base
*/
protected $client;
+ /**
+ * Logger object for debug info (or false for no debugging).
+ *
+ * @var LoggerInterface|bool
+ */
+ protected $logger = false;
+
/**
* Constructor
*
@@ -71,6 +79,34 @@ class Zend2 extends \SerialsSolutions_Summon_Base
$this->client = is_object($client) ? $client : new HttpClient();
}
+ /**
+ * Set the logger
+ *
+ * @param LoggerInterface $logger Logger to use.
+ *
+ * @return void
+ */
+ public function setLogger(LoggerInterface $logger)
+ {
+ $this->logger = $logger;
+ }
+
+ /**
+ * Print a message if debug is enabled.
+ *
+ * @param string $msg Message to print
+ *
+ * @return void
+ */
+ protected function debugPrint($msg)
+ {
+ if ($this->logger) {
+ $this->logger->debug("$msg\n");
+ } else {
+ parent::debugPrint($msg);
+ }
+ }
+
/**
* Handle a fatal error.
*
diff --git a/vendor/zendframework/zendrest/.gitignore b/vendor/zendframework/zendrest/.gitignore
new file mode 100644
index 00000000000..a725465aee2
--- /dev/null
+++ b/vendor/zendframework/zendrest/.gitignore
@@ -0,0 +1 @@
+vendor/
\ No newline at end of file
diff --git a/vendor/zendframework/zendrest/README.txt b/vendor/zendframework/zendrest/README.txt
deleted file mode 100644
index 4bdc26cc6aa..00000000000
--- a/vendor/zendframework/zendrest/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a composer based component package from Zend Framework.
-The Zend Framework source for this package is located here:
-
- https://github.com/zendframework/zf2/
-
-You can install using:
-
- curl -s https://getcomposer.org/installer | php
- php composer.phar install
-
-At that point, follow the instructions in the documentation folder for actual
-usage of the component. (Documentation is forthcoming.)
\ No newline at end of file
diff --git a/vendor/zendframework/zendrest/composer.json b/vendor/zendframework/zendrest/composer.json
index aee41b72c8b..3a7ea7c9c4e 100644
--- a/vendor/zendframework/zendrest/composer.json
+++ b/vendor/zendframework/zendrest/composer.json
@@ -1 +1,32 @@
-{"name":"zendframework\/zendrest","description":" ","type":"library","license":"BSD-3-Clause","keywords":["zf2","rest"],"homepage":"http:\/\/packages.zendframework.com\/","autoload":{"psr-0":{"ZendRest":"library\/"}},"repositories":[{"type":"composer","url":"http:\/\/packages.zendframework.com\/"}],"require":{"php":">=5.3.3","zendframework\/zend-http":">=2.0.0","zendframework\/zend-uri":">=2.0.0"},"extra":{"branch-alias":{"dev-master":"2.0.x-dev"}},"version":"2.0.1","dist":{"url":"http:\/\/packages.zendframework.com\/composer\/ZendRest-2.0.1.zip","type":"zip"}}
\ No newline at end of file
+{
+ "name": "zendframework/zendrest",
+ "description": " ",
+ "type": "library",
+ "license": "BSD-3-Clause",
+ "keywords": [
+ "zf2",
+ "rest"
+ ],
+ "homepage": "http://packages.zendframework.com/",
+ "autoload": {
+ "psr-0": {
+ "ZendRest": "library/"
+ }
+ },
+ "repositories": [
+ {
+ "type": "composer",
+ "url": "http://packages.zendframework.com/"
+ }
+ ],
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-http": ">=2.0.0",
+ "zendframework/zend-uri": ">=2.0.0"
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ }
+}
diff --git a/vendor/zendframework/zendservice-amazon/.gitignore b/vendor/zendframework/zendservice-amazon/.gitignore
new file mode 100644
index 00000000000..40367ecafb0
--- /dev/null
+++ b/vendor/zendframework/zendservice-amazon/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+composer.phar
\ No newline at end of file
diff --git a/vendor/zendframework/zendservice-amazon/.travis.yml b/vendor/zendframework/zendservice-amazon/.travis.yml
new file mode 100644
index 00000000000..409b789c100
--- /dev/null
+++ b/vendor/zendframework/zendservice-amazon/.travis.yml
@@ -0,0 +1,17 @@
+language: php
+
+php:
+ - 5.3.3
+ - 5.3
+ - 5.4
+
+before_install:
+ - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
+ - curl -s https://getcomposer.org/installer | php
+ - php composer.phar install --dev
+
+script:
+ - php ./tests/run-tests.php
+
+notifications:
+ irc: "irc.freenode.org#zftalk.2"
diff --git a/vendor/zendframework/zendservice-amazon/README.txt b/vendor/zendframework/zendservice-amazon/README.txt
deleted file mode 100644
index 4bdc26cc6aa..00000000000
--- a/vendor/zendframework/zendservice-amazon/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a composer based component package from Zend Framework.
-The Zend Framework source for this package is located here:
-
- https://github.com/zendframework/zf2/
-
-You can install using:
-
- curl -s https://getcomposer.org/installer | php
- php composer.phar install
-
-At that point, follow the instructions in the documentation folder for actual
-usage of the component. (Documentation is forthcoming.)
\ No newline at end of file
diff --git a/vendor/zendframework/zendservice-amazon/composer.json b/vendor/zendframework/zendservice-amazon/composer.json
index a523d50c0a2..fb7423feb88 100644
--- a/vendor/zendframework/zendservice-amazon/composer.json
+++ b/vendor/zendframework/zendservice-amazon/composer.json
@@ -1 +1,44 @@
-{"name":"zendframework\/zendservice-amazon","description":"OOP wrapper for the Amazon web service","type":"library","keywords":["zf2","amazon","ec2","s3","simpledb","sqs"],"homepage":"http:\/\/packages.zendframework.com\/","license":"BSD-3-Clause","autoload":{"psr-0":{"ZendService":"library\/"}},"repositories":[{"type":"composer","url":"http:\/\/packages.zendframework.com\/"}],"require":{"php":">=5.3.3","zendframework\/zend-http":">=2.0.0","zendframework\/zendrest":">=2.0.0","zendframework\/zend-crypt":">=2.0.0","zendframework\/zend-json":">=2.0.0"},"require-dev":{"zendframework\/zend-i18n":">=2.0.0"},"suggest":{"zendframework\/zend-uri":"Zend\\Uri component"},"extra":{"branch-alias":{"dev-master":"2.0.x-dev"}},"version":"2.0.2","dist":{"url":"http:\/\/packages.zendframework.com\/composer\/ZendService_Amazon-2.0.2.zip","type":"zip"}}
\ No newline at end of file
+{
+ "name": "zendframework/zendservice-amazon",
+ "description": "OOP wrapper for the Amazon web service",
+ "type": "library",
+ "keywords": [
+ "zf2",
+ "amazon",
+ "ec2",
+ "s3",
+ "simpledb",
+ "sqs"
+ ],
+ "homepage": "http://packages.zendframework.com/",
+ "license": "BSD-3-Clause",
+ "autoload": {
+ "psr-0": {
+ "ZendService": "library/"
+ }
+ },
+ "repositories": [
+ {
+ "type": "composer",
+ "url": "http://packages.zendframework.com/"
+ }
+ ],
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-http": ">=2.0.0",
+ "zendframework/zendrest": ">=2.0.0",
+ "zendframework/zend-crypt": ">=2.0.0",
+ "zendframework/zend-json": ">=2.0.0"
+ },
+ "require-dev": {
+ "zendframework/zend-i18n": ">=2.0.0"
+ },
+ "suggest": {
+ "zendframework/zend-uri": "Zend\\Uri component"
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ }
+}
--
GitLab