diff --git a/composer.json b/composer.json
index 89f122fac35b7a8dc748be3e771f75e810e04184..ec3f7756f6365984e26347281d1a1248956f7161 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,7 @@
"pear-pear.php.net/validate_ispn": "*",
"serialssolutions/summon": "dev-master",
"symfony/yaml": "*",
- "zendframework/zendframework": "2.1.2",
+ "zendframework/zendframework": "2.1.3",
"zendframework/zendrest": "2.*",
"zendframework/zendservice-amazon": "2.*"
}
diff --git a/composer.lock b/composer.lock
index 15a460da409b9ed1c74d8189d84e51ad474b6bb8..df7d6e41737a04fa9d90dd04da9b17b0808f6716 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,5 +1,5 @@
{
- "hash": "709e2b5d13b45aebfbf45b88c857b8dd",
+ "hash": "c516fa0d575b47b9d78683aa619eb196",
"packages": [
{
"name": "johnwohlers/sip2",
@@ -360,17 +360,17 @@
},
{
"name": "zendframework/zendframework",
- "version": "2.1.2",
+ "version": "2.1.3",
"source": {
"type": "git",
"url": "git://github.com/zendframework/zf2.git",
- "reference": "release-2.1.2"
+ "reference": "release-2.1.3"
},
"dist": {
"type": "zip",
- "url": "http://packages.zendframework.com/releases/ZendFramework-2.1.2/ZendFramework-2.1.2.zip",
- "reference": "release-2.1.2",
- "shasum": "fd99fc5ce007c5856e3817f351a2184f7e1f4a98"
+ "url": "http://packages.zendframework.com/releases/ZendFramework-2.1.3/ZendFramework-2.1.3.zip",
+ "reference": "release-2.1.3",
+ "shasum": "506246b4bfa78db0d19852b26f0d4e383f10603f"
},
"require": {
"php": ">=5.3.3"
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 4177d578fc3d8994aff7033e0f90f2ddda5b62fe..1ea64728de1e24a2dbfe6b669eeafae890f7c206 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit2d7591a4f6c6287536d5b7aa8ddbb5d9::getLoader();
+return ComposerAutoloaderInitf8edfa470619c0f3266e059ebb0f621e::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 3c55a37a9979272d209782781ae27862ffa2ea44..e9ebda06a66506d297a9e456cd6ff01f04218d37 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php generated by Composer
-class ComposerAutoloaderInit2d7591a4f6c6287536d5b7aa8ddbb5d9
+class ComposerAutoloaderInitf8edfa470619c0f3266e059ebb0f621e
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit2d7591a4f6c6287536d5b7aa8ddbb5d9
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit2d7591a4f6c6287536d5b7aa8ddbb5d9', 'loadClassLoader'));
+ spl_autoload_register(array('ComposerAutoloaderInitf8edfa470619c0f3266e059ebb0f621e', 'loadClassLoader'));
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit2d7591a4f6c6287536d5b7aa8ddbb5d9', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitf8edfa470619c0f3266e059ebb0f621e', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 4ad991f5abde94a535e497a4f95ce0fb01cf211c..605715cc907e395be31619271d7181fe1c79dcef 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -382,106 +382,6 @@
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com"
},
- {
- "name": "zendframework/zendframework",
- "version": "2.1.2",
- "version_normalized": "2.1.2.0",
- "source": {
- "type": "git",
- "url": "git://github.com/zendframework/zf2.git",
- "reference": "release-2.1.2"
- },
- "dist": {
- "type": "zip",
- "url": "http://packages.zendframework.com/releases/ZendFramework-2.1.2/ZendFramework-2.1.2.zip",
- "reference": "release-2.1.2",
- "shasum": "fd99fc5ce007c5856e3817f351a2184f7e1f4a98"
- },
- "require": {
- "php": ">=5.3.3"
- },
- "replace": {
- "zendframework/zend-acl": "self.version",
- "zendframework/zend-authentication": "self.version",
- "zendframework/zend-barcode": "self.version",
- "zendframework/zend-cache": "self.version",
- "zendframework/zend-captcha": "self.version",
- "zendframework/zend-code": "self.version",
- "zendframework/zend-config": "self.version",
- "zendframework/zend-console": "self.version",
- "zendframework/zend-crypt": "self.version",
- "zendframework/zend-db": "self.version",
- "zendframework/zend-di": "self.version",
- "zendframework/zend-dom": "self.version",
- "zendframework/zend-escaper": "self.version",
- "zendframework/zend-eventmanager": "self.version",
- "zendframework/zend-feed": "self.version",
- "zendframework/zend-file": "self.version",
- "zendframework/zend-filter": "self.version",
- "zendframework/zend-form": "self.version",
- "zendframework/zend-http": "self.version",
- "zendframework/zend-i18n": "self.version",
- "zendframework/zend-inputfilter": "self.version",
- "zendframework/zend-json": "self.version",
- "zendframework/zend-ldap": "self.version",
- "zendframework/zend-loader": "self.version",
- "zendframework/zend-log": "self.version",
- "zendframework/zend-mail": "self.version",
- "zendframework/zend-markup": "self.version",
- "zendframework/zend-math": "self.version",
- "zendframework/zend-memory": "self.version",
- "zendframework/zend-mime": "self.version",
- "zendframework/zend-modulemanager": "self.version",
- "zendframework/zend-mvc": "self.version",
- "zendframework/zend-navigation": "self.version",
- "zendframework/zend-paginator": "self.version",
- "zendframework/zend-progressbar": "self.version",
- "zendframework/zend-serializer": "self.version",
- "zendframework/zend-server": "self.version",
- "zendframework/zend-servicemanager": "self.version",
- "zendframework/zend-session": "self.version",
- "zendframework/zend-soap": "self.version",
- "zendframework/zend-stdlib": "self.version",
- "zendframework/zend-tag": "self.version",
- "zendframework/zend-text": "self.version",
- "zendframework/zend-uri": "self.version",
- "zendframework/zend-validator": "self.version",
- "zendframework/zend-view": "self.version",
- "zendframework/zend-xmlrpc": "self.version"
- },
- "require-dev": {
- "doctrine/common": ">=2.1"
- },
- "suggest": {
- "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
- "ext-intl": "ext/intl for i18n features",
- "pecl-weakref": "Implementation of weak references for Zend\\Stdlib\\CallbackHandler",
- "zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
- "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
- },
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Zend\\": "library/",
- "ZendTest\\": "tests/"
- }
- },
- "license": [
- "BSD-3-Clause"
- ],
- "description": "Zend Framework 2",
- "keywords": [
- "framework",
- "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/zendrest",
"version": "2.0.1",
@@ -579,5 +479,105 @@
"issues": "https://github.com/zendframework/zf2/issues",
"source": "https://github.com/zendframework/zf2"
}
+ },
+ {
+ "name": "zendframework/zendframework",
+ "version": "2.1.3",
+ "version_normalized": "2.1.3.0",
+ "source": {
+ "type": "git",
+ "url": "git://github.com/zendframework/zf2.git",
+ "reference": "release-2.1.3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "http://packages.zendframework.com/releases/ZendFramework-2.1.3/ZendFramework-2.1.3.zip",
+ "reference": "release-2.1.3",
+ "shasum": "506246b4bfa78db0d19852b26f0d4e383f10603f"
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "replace": {
+ "zendframework/zend-acl": "self.version",
+ "zendframework/zend-authentication": "self.version",
+ "zendframework/zend-barcode": "self.version",
+ "zendframework/zend-cache": "self.version",
+ "zendframework/zend-captcha": "self.version",
+ "zendframework/zend-code": "self.version",
+ "zendframework/zend-config": "self.version",
+ "zendframework/zend-console": "self.version",
+ "zendframework/zend-crypt": "self.version",
+ "zendframework/zend-db": "self.version",
+ "zendframework/zend-di": "self.version",
+ "zendframework/zend-dom": "self.version",
+ "zendframework/zend-escaper": "self.version",
+ "zendframework/zend-eventmanager": "self.version",
+ "zendframework/zend-feed": "self.version",
+ "zendframework/zend-file": "self.version",
+ "zendframework/zend-filter": "self.version",
+ "zendframework/zend-form": "self.version",
+ "zendframework/zend-http": "self.version",
+ "zendframework/zend-i18n": "self.version",
+ "zendframework/zend-inputfilter": "self.version",
+ "zendframework/zend-json": "self.version",
+ "zendframework/zend-ldap": "self.version",
+ "zendframework/zend-loader": "self.version",
+ "zendframework/zend-log": "self.version",
+ "zendframework/zend-mail": "self.version",
+ "zendframework/zend-markup": "self.version",
+ "zendframework/zend-math": "self.version",
+ "zendframework/zend-memory": "self.version",
+ "zendframework/zend-mime": "self.version",
+ "zendframework/zend-modulemanager": "self.version",
+ "zendframework/zend-mvc": "self.version",
+ "zendframework/zend-navigation": "self.version",
+ "zendframework/zend-paginator": "self.version",
+ "zendframework/zend-progressbar": "self.version",
+ "zendframework/zend-serializer": "self.version",
+ "zendframework/zend-server": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-session": "self.version",
+ "zendframework/zend-soap": "self.version",
+ "zendframework/zend-stdlib": "self.version",
+ "zendframework/zend-tag": "self.version",
+ "zendframework/zend-text": "self.version",
+ "zendframework/zend-uri": "self.version",
+ "zendframework/zend-validator": "self.version",
+ "zendframework/zend-view": "self.version",
+ "zendframework/zend-xmlrpc": "self.version"
+ },
+ "require-dev": {
+ "doctrine/common": ">=2.1"
+ },
+ "suggest": {
+ "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
+ "ext-intl": "ext/intl for i18n features",
+ "pecl-weakref": "Implementation of weak references for Zend\\Stdlib\\CallbackHandler",
+ "zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
+ "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
+ },
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Zend\\": "library/",
+ "ZendTest\\": "tests/"
+ }
+ },
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "Zend Framework 2",
+ "keywords": [
+ "framework",
+ "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"
+ }
}
]
diff --git a/vendor/zendframework/zendframework/README.md b/vendor/zendframework/zendframework/README.md
index 1ace0bca960743a199bef5710db38200aac3ba6b..ce8d08bc7b2924af691c6582e93328d97fcb917a 100644
--- a/vendor/zendframework/zendframework/README.md
+++ b/vendor/zendframework/zendframework/README.md
@@ -5,13 +5,13 @@ Develop: [.
diff --git a/vendor/zendframework/zendframework/bin/check-cs.sh b/vendor/zendframework/zendframework/bin/check-cs.sh
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/bin/classmap_generator.php b/vendor/zendframework/zendframework/bin/classmap_generator.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/bin/pluginmap_generator.php b/vendor/zendframework/zendframework/bin/pluginmap_generator.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/IbmDb2.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/IbmDb2.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Oracle.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Oracle.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/Oracle.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/Oracle.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
index e083d25c8a324e510294a2068e17c07d8e7feead..fddafd26c610cb0f597c91a901cc9e71a927213b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
@@ -306,7 +306,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
$predicate = new Predicate\Operator($pkey, Predicate\Operator::OP_EQ, $pvalue);
}
} elseif ($pvalue instanceof Predicate\PredicateInterface) {
- // Predicate type is ok
+ // Predicate type is ok
$predicate = $pvalue;
} else {
// must be an array of expressions (with int-indexed array)
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/composer.json b/vendor/zendframework/zendframework/library/Zend/Db/composer.json
old mode 100644
new mode 100755
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
index 15428dc781746bac9d75a78d9be7be6d36a7d5b3..d13c576afc2050d2aff11aed056c98244e327c7c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
@@ -205,7 +205,7 @@ class Simple implements RouteInterface
*/
if (preg_match('/\G--(?<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+)(?<hasValue>=\S*?)?(?: +|$)/s', $def, $m, 0, $pos)) {
$item = array(
- 'name' => strtolower( $m['name'] ),
+ 'name' => $m['name'],
'short' => false,
'literal' => false,
'required' => true,
@@ -221,7 +221,7 @@ class Simple implements RouteInterface
'/\G\[ *?--(?<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+) *?\](?: +|$)/s', $def, $m, 0, $pos
)) {
$item = array(
- 'name' => strtolower($m['name']),
+ 'name' => $m['name'],
'short' => false,
'literal' => false,
'required' => false,
@@ -238,7 +238,7 @@ class Simple implements RouteInterface
'/\G\[ *?--(?<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+)(?<hasValue>=\S*?)? *?\](?: +|$)/s', $def, $m, 0, $pos
)) {
$item = array(
- 'name' => strtolower( $m['name'] ),
+ 'name' => $m['name'],
'short' => false,
'literal' => false,
'required' => false,
@@ -255,7 +255,7 @@ class Simple implements RouteInterface
*/
elseif (preg_match('/\G-(?<name>[a-zA-Z0-9])(?:=(?<type>[ns]))?(?: +|$)/s', $def, $m, 0, $pos)) {
$item = array(
- 'name' => strtolower($m['name']),
+ 'name' => $m['name'],
'short' => true,
'literal' => false,
'required' => true,
@@ -271,7 +271,7 @@ class Simple implements RouteInterface
*/
elseif (preg_match('/\G\[ *?-(?<name>[a-zA-Z0-9])(?:=(?<type>[ns]))? *?\](?: +|$)/s', $def, $m, 0, $pos)) {
$item = array(
- 'name' => strtolower( $m['name'] ),
+ 'name' => $m['name'],
'short' => true,
'literal' => false,
'required' => false,
@@ -578,23 +578,23 @@ class Simple implements RouteInterface
if ($part['hasValue']) {
$regex .= ')(?:\=(?<value>.*?)$)?$/';
} else {
- $regex .= ')$/';
+ $regex .= ')$/i';
}
} else {
// a single named flag
if ($part['short'] === true) {
// short variant
if ($part['hasValue']) {
- $regex = '/^\-' . $part['name'] . '(?:\=(?<value>.*?)$)?$/';
+ $regex = '/^\-' . $part['name'] . '(?:\=(?<value>.*?)$)?$/i';
} else {
- $regex = '/^\-' . $part['name'] . '$/';
+ $regex = '/^\-' . $part['name'] . '$/i';
}
} elseif ($part['short'] === false) {
// long variant
if ($part['hasValue']) {
- $regex = '/^\-{2,}' . $part['name'] . '(?:\=(?<value>.*?)$)?$/';
+ $regex = '/^\-{2,}' . $part['name'] . '(?:\=(?<value>.*?)$)?$/i';
} else {
- $regex = '/^\-{2,}' . $part['name'] . '$/';
+ $regex = '/^\-{2,}' . $part['name'] . '$/i';
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php
index de5ca8df44dc40ee56fa4b26ad3301dfbaf0b927..35b4fd235491401110cefac9a87200866e42ace0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php
@@ -170,11 +170,10 @@ class Hostname implements RouteInterface
{
$regex = '';
- // Reverse the parts to build the regex in reverse
- foreach (array_reverse($parts) as $part) {
+ foreach ($parts as $part) {
switch ($part[0]) {
case 'literal':
- $regex .= preg_quote(strrev($part[1]));
+ $regex .= preg_quote($part[1]);
break;
case 'parameter':
@@ -275,8 +274,7 @@ class Hostname implements RouteInterface
$uri = $request->getUri();
$host = $uri->getHost();
- // reverse the host as the regex was built backwards
- $result = preg_match('(^' . $this->regex . '$)', strrev($host), $matches);
+ $result = preg_match('(^' . $this->regex . '$)', $host, $matches);
if (!$result) {
return null;
@@ -286,8 +284,7 @@ class Hostname implements RouteInterface
foreach ($this->paramMap as $index => $name) {
if (isset($matches[$index]) && $matches[$index] !== '') {
- // reverse the param as the preg_match was done on reverse host
- $params[$name] = strrev($matches[$index]);
+ $params[$name] = $matches[$index];
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/compatibility/autoload.php b/vendor/zendframework/zendframework/library/Zend/Session/compatibility/autoload.php
index 9eabad4ec8838da762b41205a006f91e057ae3de..24e9531d0edf051e856c1e81b7017743fab66896 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/compatibility/autoload.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/compatibility/autoload.php
@@ -1,5 +1,11 @@
<?php
if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
+ if (!class_exists('Zend\Stdlib\ArrayObject', false)
+ && file_exists(__DIR__ . '/../../Stdlib/compatibility/autoload.php')
+ ) {
+ require __DIR__ . '/../../Stdlib/compatibility/autoload.php';
+ }
+
require_once __DIR__ . '/Container.php';
require_once __DIR__ . '/Storage/SessionArrayStorage.php';
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/compatibility/autoload.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/compatibility/autoload.php
index 8141ab34bc80e0d315ad115eb1a4a7eeb5b87564..fc6c3974a066188bfffe7203b7b668dd7d047608 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/compatibility/autoload.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/compatibility/autoload.php
@@ -1,4 +1,6 @@
<?php
-if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
+if (version_compare(PHP_VERSION, '5.3.4', 'lt')
+ && !class_exists('Zend\Stdlib\ArrayObject', false)
+) {
require_once __DIR__ . '/ArrayObject.php';
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/Version.php b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
index 06947637720e0fd9a766b60802d363089717b508..0c56ad41d246580502bbdb4404ac8e3632542273 100644
--- a/vendor/zendframework/zendframework/library/Zend/Version/Version.php
+++ b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
@@ -19,7 +19,7 @@ final class Version
/**
* Zend Framework version identification - see compareVersion()
*/
- const VERSION = '2.1.2';
+ const VERSION = '2.1.3';
/**
* Github Service Identifier for version information is retreived from