diff --git a/vendor/ZF2/library/Zend/Db/Sql/Select.php b/vendor/ZF2/library/Zend/Db/Sql/Select.php
index ba39c1c37ab4c5d0e23a532464edfbaab3d8a1e5..05b92600ffc88d1391cea60cbf848396a5bfbdbd 100644
--- a/vendor/ZF2/library/Zend/Db/Sql/Select.php
+++ b/vendor/ZF2/library/Zend/Db/Sql/Select.php
@@ -573,7 +573,9 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
$adapter,
$this->processInfo['paramPrefix'] . ((is_string($jKey)) ? $jKey : 'column')
);
- $parameterContainer->merge($jColumnParts->getParameterContainer());
+ if ($parameterContainer) {
+ $parameterContainer->merge($jColumnParts->getParameterContainer());
+ }
$jColumns[] = $jColumnParts->getSql();
} else {
$name = (is_array($join['name'])) ? key($join['name']) : $name = $join['name'];
diff --git a/vendor/ZF2/library/Zend/Form/Element/Number.php b/vendor/ZF2/library/Zend/Form/Element/Number.php
index e2954655c077a5c620f06b9c8dfc95f5d8674fbb..4dbb307bfe65558fadbf80a6f61eff5be7a4ea63 100644
--- a/vendor/ZF2/library/Zend/Form/Element/Number.php
+++ b/vendor/ZF2/library/Zend/Form/Element/Number.php
@@ -77,8 +77,8 @@ class Number extends Element implements InputProviderInterface
|| 'any' !== $this->attributes['step']
) {
$validators[] = new StepValidator(array(
- 'baseValue' => (isset($this->attributes['min'])) ?: 0,
- 'step' => (isset($this->attributes['step'])) ?: 1,
+ 'baseValue' => (isset($this->attributes['min'])) ? $this->attributes['min'] : 0,
+ 'step' => (isset($this->attributes['step'])) ? $this->attributes['step'] : 1,
));
}
diff --git a/vendor/ZF2/library/Zend/Form/Element/Range.php b/vendor/ZF2/library/Zend/Form/Element/Range.php
index 2b15b1077d96f9c4930cbae6175dbe32804189bf..f762981ba16e2974149366be77046cf1f01373cd 100644
--- a/vendor/ZF2/library/Zend/Form/Element/Range.php
+++ b/vendor/ZF2/library/Zend/Form/Element/Range.php
@@ -53,12 +53,12 @@ class Range extends NumberElement
}
$validators[] = new GreaterThanValidator(array(
- 'min' => (isset($this->attributes['min'])) ?: 0,
+ 'min' => (isset($this->attributes['min'])) ? $this->attributes['min'] : 0,
'inclusive' => $inclusive
));
$validators[] = new LessThanValidator(array(
- 'max' => (isset($this->attributes['max'])) ?: 100,
+ 'max' => (isset($this->attributes['max'])) ? $this->attributes['max'] : 100,
'inclusive' => $inclusive
));
@@ -67,8 +67,8 @@ class Range extends NumberElement
|| 'any' !== $this->attributes['step']
) {
$validators[] = new StepValidator(array(
- 'baseValue' => (isset($this->attributes['min'])) ?: 0,
- 'step' => (isset($this->attributes['step'])) ?: 1,
+ 'baseValue' => (isset($this->attributes['min'])) ? $this->attributes['min'] : 0,
+ 'step' => (isset($this->attributes['step'])) ? $this->attributes['step'] : 1,
));
}
diff --git a/vendor/ZF2/library/Zend/Http/Response.php b/vendor/ZF2/library/Zend/Http/Response.php
index 2de4dda1902de3cf8ebf2467f83d096bed6b9ac5..9ab7636af91d1e5d8ba6969e249bc6f3060198fe 100644
--- a/vendor/ZF2/library/Zend/Http/Response.php
+++ b/vendor/ZF2/library/Zend/Http/Response.php
@@ -180,7 +180,7 @@ class Response extends AbstractMessage implements ResponseInterface
$response = new static();
- $regex = '/^HTTP\/(?P<version>1\.[01]) (?P<status>\d{3})(?:[ ]+(?P<reason>.+))?$/';
+ $regex = '/^HTTP\/(?P<version>1\.[01]) (?P<status>\d{3})(?:[ ]+(?P<reason>.*))?$/';
$matches = array();
if (!preg_match($regex, $firstLine, $matches)) {
throw new Exception\InvalidArgumentException(
diff --git a/vendor/ZF2/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php b/vendor/ZF2/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
index 521a7896ff1f97b891ebc051b673b96030737c5f..c34d462616d348f0b3dd109d4f22b6cc7fcef074 100644
--- a/vendor/ZF2/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
+++ b/vendor/ZF2/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
@@ -27,9 +27,13 @@ class PostRedirectGet extends AbstractPlugin
{
$controller = $this->getController();
$request = $controller->getRequest();
+ $params = array();
if (null === $redirect) {
- $redirect = $controller->getEvent()->getRouteMatch()->getMatchedRouteName();
+ $routeMatch = $controller->getEvent()->getRouteMatch();
+
+ $redirect = $routeMatch->getMatchedRouteName();
+ $params = $routeMatch->getParams();
}
$container = new Container('prg_post1');
@@ -42,9 +46,8 @@ class PostRedirectGet extends AbstractPlugin
// get the redirect plugin from the plugin manager
$redirector = $controller->getPluginManager()->get('Redirect');
} else {
-
/*
- * if the user wants to redirect to a route, the redirector has to come
+ * If the user wants to redirect to a route, the redirector has to come
* from the plugin manager -- otherwise no router will be injected
*/
if ($redirectToUrl === false) {
@@ -55,13 +58,14 @@ class PostRedirectGet extends AbstractPlugin
}
if ($redirectToUrl === false) {
- $response = $redirector->toRoute($redirect);
+ $response = $redirector->toRoute($redirect, $params);
$response->setStatusCode(303);
return $response;
}
$response = $redirector->toUrl($redirect);
$response->setStatusCode(303);
+
return $response;
} else {
if ($container->post !== null) {
diff --git a/vendor/ZF2/library/Zend/Validator/composer.json b/vendor/ZF2/library/Zend/Validator/composer.json
index b9636b76b9bcf4a2c8dce04ec2d7af59aa78d4ad..015a02a2b04d055396d55f4c294c36295e9fc1d1 100644
--- a/vendor/ZF2/library/Zend/Validator/composer.json
+++ b/vendor/ZF2/library/Zend/Validator/composer.json
@@ -14,13 +14,13 @@
"target-dir": "Zend/Validator",
"require": {
"php": ">=5.3.3",
+ "zendframework/zend-i18n": "self.version",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
"zendframework/zend-math": "self.version"
},
"suggest": {
- "zendframework/zend-i18n": "Zend\\I18n component",
"zendframework/zend-db": "Zend\\Db component",
"zendframework/zend-math": "Zend\\Math component"
}
diff --git a/vendor/ZF2/library/Zend/Version/Version.php b/vendor/ZF2/library/Zend/Version/Version.php
index 4e36eb155a143a7ad88f71bb17c605ebcbd147cd..ac00afb48bd175975d932a2533ec56f7d6580670 100644
--- a/vendor/ZF2/library/Zend/Version/Version.php
+++ b/vendor/ZF2/library/Zend/Version/Version.php
@@ -23,7 +23,7 @@ final class Version
/**
* Zend Framework version identification - see compareVersion()
*/
- const VERSION = '2.0.0rc7';
+ const VERSION = '2.0.0';
/**
* The latest stable version Zend Framework available