diff --git a/composer.json b/composer.json
index 409429a2d9230eccc18f874daffe6c47b1f4f382..d1b6aa54ce90e799969604ad3a7563984cc8a92b 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
"symfony/yaml": "*",
"vufind-org/vufindcode": "*",
"vufind-org/vufindhttp": "*",
- "zendframework/zendframework": "2.3.6",
+ "zendframework/zendframework": "2.3.7",
"zendframework/zendrest": "2.*",
"zendframework/zendservice-amazon": "2.*",
"zendframework/zendservice-recaptcha": "2.*",
diff --git a/composer.lock b/composer.lock
index 928e1f90743ed4c7ceca052460442dadd6972736..53f5991dd7dedbaf58d7b4b76a27676e7ad58468 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "a789b6d59c5f4174e268ab7f4307ee5d",
+ "hash": "ad7918adabede04ad206b2d095d581db",
"packages": [
{
"name": "aferrandini/phpqrcode",
@@ -653,17 +653,17 @@
},
{
"name": "zendframework/zendframework",
- "version": "2.3.6",
+ "version": "2.3.7",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "cf1f2212b5ff772ba695f9efbb315505ec0211eb"
+ "reference": "a1aae5fdd27a422beb32c56ddf5a197654a0f94a"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-cf1f2212b5ff772ba695f9efbb315505ec0211eb-zip-e766c5.zip",
- "reference": "2.3.6",
- "shasum": "a4b747410c7ec9fabf1738692be8450155cfcc24"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-a1aae5fdd27a422beb32c56ddf5a197654a0f94a-zip-06d4c7.zip",
+ "reference": "2.3.7",
+ "shasum": "7033dd58d94b0c75fae8a00001f8a7275c218209"
},
"require": {
"php": ">=5.3.23",
@@ -767,10 +767,10 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.3.6",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.3.7",
"issues": "https://github.com/zendframework/zf2/issues"
},
- "time": "2015-03-12 14:02:09"
+ "time": "2015-03-12 16:55:53"
},
{
"name": "zendframework/zendrest",
diff --git a/vendor/autoload.php b/vendor/autoload.php
index e809f6ab9e05bb07ec9e46bf5e2da048e20dc6e5..05f28f65e870c9d6f573550ec001bc1c05d785ee 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInita5d1611df39273f32106e09e521d7aa7::getLoader();
+return ComposerAutoloaderInit92f7acc9a48874264e5f443ba6590f50::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 27839311af043ca4aae45e79d35b7f4194d5b030..c13b459e24153bbad7193eadaf2090d573c6fffc 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInita5d1611df39273f32106e09e521d7aa7
+class ComposerAutoloaderInit92f7acc9a48874264e5f443ba6590f50
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInita5d1611df39273f32106e09e521d7aa7
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInita5d1611df39273f32106e09e521d7aa7', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit92f7acc9a48874264e5f443ba6590f50', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInita5d1611df39273f32106e09e521d7aa7', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit92f7acc9a48874264e5f443ba6590f50', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
array_push($includePaths, get_include_path());
@@ -48,7 +48,7 @@ class ComposerAutoloaderInita5d1611df39273f32106e09e521d7aa7
}
}
-function composerRequirea5d1611df39273f32106e09e521d7aa7($file)
+function composerRequire92f7acc9a48874264e5f443ba6590f50($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 3ff55dd98afd645c1a3e3a0804748fe0e73bb752..588624907d4bd701d15f7744d5b9c7c8d78dc0c9 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1232,18 +1232,18 @@
},
{
"name": "zendframework/zendframework",
- "version": "2.3.6",
- "version_normalized": "2.3.6.0",
+ "version": "2.3.7",
+ "version_normalized": "2.3.7.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "cf1f2212b5ff772ba695f9efbb315505ec0211eb"
+ "reference": "a1aae5fdd27a422beb32c56ddf5a197654a0f94a"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-cf1f2212b5ff772ba695f9efbb315505ec0211eb-zip-e766c5.zip",
- "reference": "2.3.6",
- "shasum": "a4b747410c7ec9fabf1738692be8450155cfcc24"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-a1aae5fdd27a422beb32c56ddf5a197654a0f94a-zip-06d4c7.zip",
+ "reference": "2.3.7",
+ "shasum": "7033dd58d94b0c75fae8a00001f8a7275c218209"
},
"require": {
"php": ">=5.3.23",
@@ -1320,7 +1320,7 @@
"zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
"zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
},
- "time": "2015-03-12 14:02:09",
+ "time": "2015-03-12 16:55:53",
"bin": [
"bin/classmap_generator.php",
"bin/pluginmap_generator.php",
@@ -1349,7 +1349,7 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.3.6",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.3.7",
"issues": "https://github.com/zendframework/zf2/issues"
}
}
diff --git a/vendor/zendframework/zendframework/CHANGELOG.md b/vendor/zendframework/zendframework/CHANGELOG.md
index 3d2a7cf66cc998470d4fef8c912f975a231fffcf..a5335f5dd76d57f8dcc35656cacc3c515a67fc1f 100644
--- a/vendor/zendframework/zendframework/CHANGELOG.md
+++ b/vendor/zendframework/zendframework/CHANGELOG.md
@@ -1,5 +1,9 @@
# CHANGELOG
+## 2.3.7 (2015-03-12)
+
+- [7255: Revert BC break against AbstractRestfulController](https://github.com/zendframework/zf2/pull/7255)
+
## 2.3.6 (2015-03-12)
### SECURITY UPDATES
diff --git a/vendor/zendframework/zendframework/README.md b/vendor/zendframework/zendframework/README.md
index 40e35c4274659155b8cecd9aaa1398d8201f8e48..75cd1dbec6049860f599b36eccd3f4ccf36507ba 100644
--- a/vendor/zendframework/zendframework/README.md
+++ b/vendor/zendframework/zendframework/README.md
@@ -11,21 +11,16 @@ Develop:
## RELEASE INFORMATION
-*Zend Framework 2.3.6*
+*Zend Framework 2.3.7*
-This is the sixth maintenance release for the version 2.3 series.
+This is the seventh maintenance release for the version 2.3 series.
-DD MMM YYYY
+12 Mar 2015
-### UPDATES IN 2.3.6
+### UPDATES IN 2.3.7
-This release contains security updates:
-
-- **ZF2015-03** `Zend\Validator\Csrf` was incorrectly testing null or
- improperly formatted token identifiers, allowing them to pass validation. This
- release provides patches to correct the behavior. If you use the validator, or
- the corresponding `Zend\Form\Element\Csrf`, we recommend upgrading
- immediately.
+- This release reverts [#7255](https://github.com/zendframework/zf2/pull/7255),
+ as it introduced a BC break against `Zend\Mvc\Controller\AbstractRestfulController`.
Please see [CHANGELOG.md](CHANGELOG.md).
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
index 88b0725ccbbb0e5648623eae02b358a52cabef31..75850cb73230dbbc70e52d6a4604acaaad79a89a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
@@ -116,7 +116,7 @@ abstract class AbstractRestfulController extends AbstractController
*
* @return mixed
*/
- public function deleteList($data)
+ public function deleteList()
{
$this->response->setStatusCode(405);
@@ -347,8 +347,6 @@ abstract class AbstractRestfulController extends AbstractController
// DELETE
case 'delete':
$id = $this->getIdentifier($routeMatch, $request);
- $data = $this->processBodyContent($request);
-
if ($id !== false) {
$action = 'delete';
$return = $this->delete($id);
@@ -356,7 +354,7 @@ abstract class AbstractRestfulController extends AbstractController
}
$action = 'deleteList';
- $return = $this->deleteList($data);
+ $return = $this->deleteList();
break;
// GET
case 'get':
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/Version.php b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
index 6db81be907d040c1e3066326accb15aa5cbbb313..12ff267790d62bb0971eb1a4e23e48bf53ab8741 100644
--- a/vendor/zendframework/zendframework/library/Zend/Version/Version.php
+++ b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
@@ -20,7 +20,7 @@ final class Version
/**
* Zend Framework version identification - see compareVersion()
*/
- const VERSION = '2.3.6';
+ const VERSION = '2.3.7';
/**
* Github Service Identifier for version information is retrieved from