diff --git a/composer.json b/composer.json
index acf13a422920e3fc85c9e3682ac5d766a2a85a25..c5720e33d4550cace93dd0678ac09f83fff8d9ef 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.2.0",
+ "zendframework/zendframework": "2.2.1",
"zendframework/zendrest": "2.*",
"zendframework/zendservice-amazon": "2.*"
}
diff --git a/composer.lock b/composer.lock
index 62663284324951b47673e7c9d7bf39b6f0e4c760..08c01f79de22142d6ce01880e2028563f2c3dc15 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
"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": "fdb889414f2d72a89f529eb202d2e2c0",
+ "hash": "83fbfd387d9ede9662af03b21e48c831",
"packages": [
{
"name": "johnwohlers/sip2",
@@ -321,17 +321,17 @@
},
{
"name": "symfony/yaml",
- "version": "v2.2.1",
+ "version": "v2.3.1",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "v2.2.1"
+ "reference": "v2.3.1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.1",
- "reference": "v2.2.1",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.3.1",
+ "reference": "v2.3.1",
"shasum": ""
},
"require": {
@@ -340,7 +340,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.3-dev"
}
},
"autoload": {
@@ -364,21 +364,21 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2013-03-23 07:49:54"
+ "time": "2013-05-10 18:12:13"
},
{
"name": "zendframework/zendframework",
- "version": "2.2.0",
+ "version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "release-2.2.0"
+ "reference": "release-2.2.1"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-2.2.0-release-2.2.0-d642a8.zip",
- "reference": "2.2.0",
- "shasum": "d89721110070b0c272be791a3dc83a4092a3b928"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-2.2.1-release-2.2.1-8597ab.zip",
+ "reference": "2.2.1",
+ "shasum": "f8419ea13b7f3f1195b625fa789688b47efe8778"
},
"require": {
"php": ">=5.3.3"
@@ -476,10 +476,10 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.2.0",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.2.1",
"issues": "https://github.com/zendframework/zf2/issues"
},
- "time": "2013-05-15 10:27:32"
+ "time": "2013-06-12 20:13:34"
},
{
"name": "zendframework/zendrest",
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 9ee1c13d094b16e988a6d91b6a1e788d91835896..e936bdc71b0d9a94b26f1dbf54a1dda2f0933fad 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit49ed6490d6a055e51aa9a97efbec6d77::getLoader();
+return ComposerAutoloaderInit9c2a88ea43224869fc72b5250d94e473::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 8758c3615bfe2ff930154c714d3a27db46ffd5da..0ab67602084fe1d43e9201eb6af55b1f3e5b1e0a 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php generated by Composer
-class ComposerAutoloaderInit49ed6490d6a055e51aa9a97efbec6d77
+class ComposerAutoloaderInit9c2a88ea43224869fc72b5250d94e473
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit49ed6490d6a055e51aa9a97efbec6d77
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit49ed6490d6a055e51aa9a97efbec6d77', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit9c2a88ea43224869fc72b5250d94e473', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit49ed6490d6a055e51aa9a97efbec6d77', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit9c2a88ea43224869fc72b5250d94e473', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 9086416f0bf335d5d1d4f3d9bb2994bd07b2178f..bb9092dd7ecabf550956d2cd1deb127ade4a4444 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -337,30 +337,136 @@
],
"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",
+ "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"
+ }
+ },
{
"name": "symfony/yaml",
- "version": "v2.2.1",
- "version_normalized": "2.2.1.0",
+ "version": "v2.3.1",
+ "version_normalized": "2.3.1.0",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "v2.2.1"
+ "reference": "v2.3.1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.1",
- "reference": "v2.2.1",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.3.1",
+ "reference": "v2.3.1",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2013-03-23 07:49:54",
+ "time": "2013-05-10 18:12:13",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.3-dev"
}
},
"installation-source": "dist",
@@ -388,18 +494,18 @@
},
{
"name": "zendframework/zendframework",
- "version": "2.2.0",
- "version_normalized": "2.2.0.0",
+ "version": "2.2.1",
+ "version_normalized": "2.2.1.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "release-2.2.0"
+ "reference": "release-2.2.1"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-2.2.0-release-2.2.0-d642a8.zip",
- "reference": "2.2.0",
- "shasum": "d89721110070b0c272be791a3dc83a4092a3b928"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-2.2.1-release-2.2.1-8597ab.zip",
+ "reference": "2.2.1",
+ "shasum": "f8419ea13b7f3f1195b625fa789688b47efe8778"
},
"require": {
"php": ">=5.3.3"
@@ -471,7 +577,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": "2013-05-15 10:27:32",
+ "time": "2013-06-12 20:13:34",
"bin": [
"bin/classmap_generator.php"
],
@@ -499,114 +605,8 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.2.0",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.2.1",
"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/symfony/yaml/Symfony/Component/Yaml/Parser.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
index bafceb06c8878afe1d8e8ea1d89104d5ef3a5871..680b50349c92e166ad8dd10f07cd862728013c84 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
@@ -102,7 +102,7 @@ class Parser
$parser->refs =& $this->refs;
$block = $values['value'];
- if (!$this->isNextLineIndented()) {
+ if ($this->isNextLineIndented()) {
$block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
}
@@ -174,7 +174,7 @@ class Parser
// hash
} elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
// if next line is less indented or equal, then it means that the current value is null
- if ($this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
+ if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
$data[$key] = null;
} else {
$c = $this->getRealCurrentLineNb() + 1;
@@ -365,7 +365,9 @@ class Parser
/**
* Parses a YAML value.
*
- * @param string $value A YAML value
+ * @param string $value A YAML value
+ * @param Boolean $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
+ * @param Boolean $objectSupport True if object support is enabled, false otherwise
*
* @return mixed A PHP value
*
@@ -419,6 +421,18 @@ class Parser
return '';
}
+ $isCurrentLineBlank = $this->isCurrentLineBlank();
+ $text = '';
+
+ // leading blank lines are consumed before determining indentation
+ while ($notEOF && $isCurrentLineBlank) {
+ // newline only if not EOF
+ if ($notEOF = $this->moveToNextLine()) {
+ $text .= "\n";
+ $isCurrentLineBlank = $this->isCurrentLineBlank();
+ }
+ }
+
// determine indentation if not specified
if (0 === $indentation) {
if (preg_match('/^ +/', $this->currentLine, $matches)) {
@@ -426,11 +440,9 @@ class Parser
}
}
- $text = '';
if ($indentation > 0) {
$pattern = sprintf('/^ {%d}(.*)$/', $indentation);
- $isCurrentLineBlank = $this->isCurrentLineBlank();
while (
$notEOF && (
$isCurrentLineBlank ||
@@ -482,18 +494,18 @@ class Parser
private function isNextLineIndented()
{
$currentIndentation = $this->getCurrentLineIndentation();
- $notEOF = $this->moveToNextLine();
+ $EOF = !$this->moveToNextLine();
- while ($notEOF && $this->isCurrentLineEmpty()) {
- $notEOF = $this->moveToNextLine();
+ while (!$EOF && $this->isCurrentLineEmpty()) {
+ $EOF = !$this->moveToNextLine();
}
- if (false === $notEOF) {
+ if ($EOF) {
return false;
}
$ret = false;
- if ($this->getCurrentLineIndentation() <= $currentIndentation) {
+ if ($this->getCurrentLineIndentation() > $currentIndentation) {
$ret = true;
}
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/InlineTest.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/InlineTest.php
index 04e9d4df80985495c77297c4cfb09b1cd80320d1..a93b91612dcae9c85b7354bbdb6753e010ab8218 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -49,7 +49,7 @@ class InlineTest extends \PHPUnit_Framework_TestCase
$required_locales = array('fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252');
if (false === setlocale(LC_ALL, $required_locales)) {
- $this->markTestSkipped('Could not set any of required locales: ' . implode(", ", $required_locales));
+ $this->markTestSkipped('Could not set any of required locales: '.implode(", ", $required_locales));
}
$this->assertEquals('1.2', Inline::dump(1.2));
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
index ca69aec153a6dae2cd83927cc2cc7b4fba8dd8ad..a8d28b9131de703173773c500258adbfeb3da080 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -396,6 +396,27 @@ EOF;
$this->assertSame($expected, $this->parser->parse($yaml));
}
+ /**
+ * Regression test for issue #7989.
+ *
+ * @see https://github.com/symfony/symfony/issues/7989
+ */
+ public function testBlockLiteralWithLeadingNewlines()
+ {
+ $yaml = <<<'EOF'
+foo: |-
+
+
+ bar
+
+EOF;
+ $expected = array(
+ 'foo' => "\n\nbar"
+ );
+
+ $this->assertSame($expected, $this->parser->parse($yaml));
+ }
+
public function testObjectSupportEnabled()
{
$input = <<<EOF
@@ -492,6 +513,15 @@ yaml:
EOF
);
}
+
+ public function testEmptyValue()
+ {
+ $input = <<<EOF
+hash:
+EOF;
+
+ $this->assertEquals(array('hash' => null), Yaml::parse($input));
+ }
}
class B
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/YamlTest.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/YamlTest.php
index b1a9ba08c1f69590146a5bc73064b5a30d5e6574..633978d63bd5021ffd834e644724ec4d8896fb9a 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/YamlTest.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/YamlTest.php
@@ -15,7 +15,6 @@ use Symfony\Component\Yaml\Yaml;
class YamlTest extends \PHPUnit_Framework_TestCase
{
-
public function testParseAndDump()
{
$data = array('lorem' => 'ipsum', 'dolor' => 'sit');
@@ -29,13 +28,4 @@ class YamlTest extends \PHPUnit_Framework_TestCase
$parsedByContents = Yaml::parse($contents);
$this->assertEquals($parsedByFilename, $parsedByContents);
}
-
- public function testEmbededPhp()
- {
- $filename = __DIR__.'/Fixtures/embededPhp.yml';
- Yaml::enablePhpParsing();
- $parsed = Yaml::parse($filename);
- $this->assertEquals(array('value' => 6), $parsed);
- }
-
}
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php
index adc99c471e4dba938cf0a9e76f71ba08753e6e33..c98f6ecdd96e7f6de8c8ab37c67f1a69882d4afd 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php
@@ -22,53 +22,6 @@ use Symfony\Component\Yaml\Exception\ParseException;
*/
class Yaml
{
- /**
- * Be warned that PHP support will be removed in Symfony 2.3.
- *
- * @deprecated Deprecated since version 2.0, to be removed in 2.3.
- */
- public static $enablePhpParsing = false;
-
- /**
- * Enables PHP support when parsing YAML files.
- *
- * Be warned that PHP support will be removed in Symfony 2.3.
- *
- * @deprecated Deprecated since version 2.0, to be removed in 2.3.
- */
- public static function enablePhpParsing()
- {
- self::$enablePhpParsing = true;
- }
-
- /**
- * Sets the PHP support flag when parsing YAML files.
- *
- * Be warned that PHP support will be removed in Symfony 2.3.
- *
- * @param Boolean $boolean true if PHP parsing support is enabled, false otherwise
- *
- * @deprecated Deprecated since version 2.0, to be removed in 2.3.
- */
- public static function setPhpParsing($boolean)
- {
- self::$enablePhpParsing = (Boolean) $boolean;
- }
-
- /**
- * Checks if PHP support is enabled when parsing YAML files.
- *
- * Be warned that PHP support will be removed in Symfony 2.3.
- *
- * @return Boolean true if PHP parsing support is enabled, false otherwise
- *
- * @deprecated Deprecated since version 2.0, to be removed in 2.3.
- */
- public static function supportsPhpParsing()
- {
- return self::$enablePhpParsing;
- }
-
/**
* Parses YAML into a PHP array.
*
@@ -85,7 +38,9 @@ class Yaml
* you must validate the input before calling this method. Passing a file
* as an input is a deprecated feature and will be removed in 3.0.
*
- * @param string $input Path to a YAML file or a string containing YAML
+ * @param string $input Path to a YAML file or a string containing YAML
+ * @param Boolean $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
+ * @param Boolean $objectSupport True if object support is enabled, false otherwise
*
* @return array The YAML converted to a PHP array
*
@@ -103,21 +58,7 @@ class Yaml
}
$file = $input;
- if (self::$enablePhpParsing) {
- ob_start();
- $retval = include($file);
- $content = ob_get_clean();
-
- // if an array is returned by the config file assume it's in plain php form else in YAML
- $input = is_array($retval) ? $retval : $content;
-
- // if an array is returned by the config file assume it's in plain php form else in YAML
- if (is_array($input)) {
- return $input;
- }
- } else {
- $input = file_get_contents($file);
- }
+ $input = file_get_contents($file);
}
$yaml = new Parser();
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json b/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json
index e04dabf3fc22c3cf2877839dd234b5ca43b5cb4c..1a009c16d6a27bbca9c1dfdb21969a4897a431a0 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json
@@ -25,7 +25,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.3-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/CHANGELOG.md b/vendor/zendframework/zendframework/CHANGELOG.md
index 36c485a2a76f0effd971d5704bafe5afbc639959..27e9c0375a0a532eb15f31b156e3f886becbf549 100644
--- a/vendor/zendframework/zendframework/CHANGELOG.md
+++ b/vendor/zendframework/zendframework/CHANGELOG.md
@@ -1,6 +1,79 @@
# CHANGELOG
-## 2.2.0 (TBD):
+## 2.2.1 (2013-06-12):
+
+- [3647: Problems in the way Zend\Paginator\Adapter\DbSelect count()s](https://github.com/zendframework/zf2/issues/3647)
+- [3853: Log formatters shouldn't override referenced values](https://github.com/zendframework/zf2/issues/3853)
+- [4421: fix docblocks : `Zend_` should be `Zend\\` and some typos](https://github.com/zendframework/zf2/issues/4421)
+- [4452: Zend\Authentication\Result custom result codes not possible](https://github.com/zendframework/zf2/issues/4452)
+- [4456: can't override Zend\Log\Logger::registerExceptionHandler](https://github.com/zendframework/zf2/issues/4456)
+- [4457: Zend\Code\Scanner\ClassScanner don't parse constants with docblock](https://github.com/zendframework/zf2/issues/4457)
+- [4458: Fix for PHP 5.5 unit tests (and XDebug >= 2.2.0)](https://github.com/zendframework/zf2/issues/4458)
+- [4465: Add ConstantScanner to Zend\Code\Scanner](https://github.com/zendframework/zf2/issues/4465)
+- [4470: sync ZF1 svn r24807 - ZF-12128: File Upload validator should display file na...](https://github.com/zendframework/zf2/issues/4470)
+- [4474: Suggest some dependencies in Zend\Mvc](https://github.com/zendframework/zf2/issues/4474)
+- [4480: fixed Cache\StorageFactory::factory()](https://github.com/zendframework/zf2/issues/4480)
+- [4494: Add build.xml to .gitattributes/export-ignore](https://github.com/zendframework/zf2/issues/4494)
+- [4496: Class methods hydrator skips getters with optional parameters](https://github.com/zendframework/zf2/issues/4496)
+- [4497: Fix name of LoggerAbstractServiceFactory test](https://github.com/zendframework/zf2/issues/4497)
+- [4498: Update the method level comment to reflect change in signature](https://github.com/zendframework/zf2/issues/4498)
+- [4499: Add service definition for DateTimeFormatter (related to #3632)](https://github.com/zendframework/zf2/issues/4499)
+- [4503: Zend\Session\Storage\AbstractSessionArrayStorage::fromArray() can receive a string causing a fatal error on shutdown](https://github.com/zendframework/zf2/issues/4503)
+- [4509: `DateTimeFormatter` Format DateTime values correctly](https://github.com/zendframework/zf2/issues/4509)
+- [4516: CollectionInputFilter should respect the keys of collectionData](https://github.com/zendframework/zf2/issues/4516)
+- [4518: Update PhpDoc comment](https://github.com/zendframework/zf2/issues/4518)
+- [4522: Remove unknown invokables from FilterPluginManager](https://github.com/zendframework/zf2/issues/4522)
+- [4524: Add zend-json as a required dependency](https://github.com/zendframework/zf2/issues/4524)
+- [4526: Fill SharedEventManager events with identifiers](https://github.com/zendframework/zf2/issues/4526)
+- [4528: Fix priority not handled in AggregateHydrator](https://github.com/zendframework/zf2/issues/4528)
+- [4529: Allow Zend\Form\Element\Checkbox to return real value instead of always a boolean](https://github.com/zendframework/zf2/issues/4529)
+- [4530: Fix for unmatched routes in navigation](https://github.com/zendframework/zf2/issues/4530)
+- [4535: Update RoleInterface.php](https://github.com/zendframework/zf2/issues/4535)
+- [4538: Zend\Crypt\Password\Bcrypt does not report inability to generate hash](https://github.com/zendframework/zf2/issues/4538)
+- [4539: Update StrategyInterface.php](https://github.com/zendframework/zf2/issues/4539)
+- [4542: Adds ability to specify a template for exceptions retrieved from Exception::getPrevious](https://github.com/zendframework/zf2/issues/4542)
+- [4543: soapVersion key is not reachable](https://github.com/zendframework/zf2/issues/4543)
+- [4546: View: correctly validate input in PartialLoop](https://github.com/zendframework/zf2/issues/4546)
+- [4552: Wincache unexpected return value on internalGetItem](https://github.com/zendframework/zf2/issues/4552)
+- [4553: Remove private variables from AbstractControllerTestCase.](https://github.com/zendframework/zf2/issues/4553)
+- [4561: Fix the controller plugin PostRedirectGet wrong redirection (in MVC)](https://github.com/zendframework/zf2/issues/4561)
+- [4562: Validator Messages Tests](https://github.com/zendframework/zf2/issues/4562)
+- [4566: Fix generating array with unsorted keys](https://github.com/zendframework/zf2/issues/4566)
+- [4568: Cast Parameters](https://github.com/zendframework/zf2/issues/4568)
+- [4571: INI reader breaks when mbstring function overloading is in place](https://github.com/zendframework/zf2/issues/4571)
+- [4572: Zend\Form Should throw exception if try to get() an element that does not exist](https://github.com/zendframework/zf2/issues/4572)
+- [4576: Redis Cache Adapter Config - setLibOptions is broken](https://github.com/zendframework/zf2/issues/4576)
+- [4577: Fix issue with Redis Cache adapter whereby setOption was being called before connecting to Redis server](https://github.com/zendframework/zf2/issues/4577)
+- [4581: Hostname route ignore `HTTP_HOST` and give `SERVER_NAME` precedence](https://github.com/zendframework/zf2/issues/4581)
+- [4582: Fix Nested form element wrapping (relative: #4383)](https://github.com/zendframework/zf2/issues/4582)
+- [4588: set 0 as header value (issue #4583)](https://github.com/zendframework/zf2/issues/4588)
+- [4590: Zend paginator dbselect count](https://github.com/zendframework/zf2/issues/4590)
+- [4595: Missing invokable fo Redis Cache Storage, problem with setting password](https://github.com/zendframework/zf2/issues/4595)
+- [4596: Missing french translations, and wrong class name](https://github.com/zendframework/zf2/issues/4596)
+- [4597: Zend\Validate\Hostname doesn't handle IDN for .UA](https://github.com/zendframework/zf2/issues/4597)
+- [4599: `InputFilter` Input merge should copy over the `continue_if_empty` flag](https://github.com/zendframework/zf2/issues/4599)
+- [4602: Remove needless check](https://github.com/zendframework/zf2/issues/4602)
+- [4603: Redis Storage won't behave correctly after libOptions were set](https://github.com/zendframework/zf2/issues/4603)
+- [4605: Possibility to use camelCase for all soap client options](https://github.com/zendframework/zf2/issues/4605)
+- [4608: Allow the `gc_probability` option to be set to zero.](https://github.com/zendframework/zf2/issues/4608)
+- [4609: Logger: Error/Exception Handler: fixed 3853 & 4456](https://github.com/zendframework/zf2/issues/4609)
+- [4615: Fix #4579 `day_attributes` could not be passed in construct](https://github.com/zendframework/zf2/issues/4615)
+- [4616: fixed 4614: infinite loop in Zend\Log\Formatter::normalize](https://github.com/zendframework/zf2/issues/4616)
+- [4617: Zend\Code: Docblock generates empty line under @tags if docblock was read from existing code](https://github.com/zendframework/zf2/issues/4617)
+- [4618: Missed method findRealpathInIncludePath() in Zend\Code\Reflection\FileReflection](https://github.com/zendframework/zf2/issues/4618)
+- [4621: Update 'Missing captcha fields' translation](https://github.com/zendframework/zf2/issues/4621)
+- [4622: Ensure router factory is used by SM factory](https://github.com/zendframework/zf2/issues/4622)
+- [4624: Notification thrown in Zend\Mvc\Service\ViewHelperManagerFactory](https://github.com/zendframework/zf2/issues/4624)
+- [4628: Fix misstake detect is active Page\Mvc in IndexController](https://github.com/zendframework/zf2/issues/4628)
+- [4629: Zend\Cache\Pattern\CallbackCache doesn't work with NULL](https://github.com/zendframework/zf2/issues/4629)
+- [4630: Allow selecting the TranslatorAwareTreeRouteStack via configuration](https://github.com/zendframework/zf2/issues/4630)
+- [4632: fixed #4552: Wincache::getItem() have to return NULL in cases of missing items](https://github.com/zendframework/zf2/issues/4632)
+- [4633: removed checks of not existing class Zend\Math\BigInteger](https://github.com/zendframework/zf2/issues/4633)
+- [4634: Navigation\Page\Mvc Can't return false whithout call parent::isActive](https://github.com/zendframework/zf2/issues/4634)
+- [4636: Punycode decoding fails if encoded string has not hyphen](https://github.com/zendframework/zf2/issues/4636)
+- [4641: Zend\Paginator\Adapter\DbSelect alternative solution to count, with subselect](https://github.com/zendframework/zf2/issues/4641)
+
+## 2.2.0 (2013-05-15):
- [2865: (Enhancement) Add an easier way to use i18n view helpers.](https://github.com/zendframework/zf2/issues/2865)
- [2903: add AdapterManager in to Zend\Db\Adapter namespace](https://github.com/zendframework/zf2/issues/2903)
diff --git a/vendor/zendframework/zendframework/README.md b/vendor/zendframework/zendframework/README.md
index 2f6e30cafec1e02ec2d430fbd90b75aed098533e..7aa9ae85e2d0a04b2f95fa43a412a5946037f1f9 100644
--- a/vendor/zendframework/zendframework/README.md
+++ b/vendor/zendframework/zendframework/README.md
@@ -5,114 +5,13 @@ Develop: [ release for the version 2 series.
+This is the first maintenance release for the 2.2 series.
-15 May 2013
+12 Jun 2013
-### UPDATES IN 2.2.0
-
-- **Addition of many more plugin managers and abstract service factories.**
- In order to simplify usage of the `ServiceManager` as an
- [Inversion of Control](http://en.wikipedia.org/wiki/Inversion_of_Control)
- container, as well as to provide more flexibility in and consistency in how various
- framework components are consumed, a number of plugin managers and service factories
- were created and enabled.
-
- Among the various plugin managers created are Translator loader manager, a Hydrator
- plugin manager (allowing named hydrator instances), and an InputFilter manager.
-
- New factories include a Translator service factory, and factories for
- both the Session configuration and SessionManager.
-
- New abstract factories include one for the DB component (allowing you to manage
- multiple named adapters), Loggers (for having multiple Logger instances),
- Cache storage (for managing multiple cache backends), and Forms (which makes use
- of the existing FormElementsPluginManager, as well as the new Hydrator and InputFilter
- plugin managers).
-
-- **Data Definition Language (DDL) support in Zend\Db.** DDL
- provides the ability to create, alter, and drop tables in a relational
- database system. Zend\Db now offers abstraction around DDL, and
- specifically MySQL and ANSI SQL-92; we will gradually add this
- capability for the other database vendors we support.
-
-- **Addition of Zend\Stdlib\Hydrator\Aggregate.** The AggregateHydrator provides
- an event-driven way to hydrate/extract hierarchical structures, as well as for
- mapping entities to hydrators for general purpose use.
-
-- **Simplification of dependencies in Zend\Feed.** We either removed or made
- optional several dependencies in Zend\Feed, making it easier to use standalone
- and/or with third-party components. We plan a larger story around this for
- 2.3.0.
-
-- **Authentication:** The DB adapter now supports non-RDBMS credential validation.
-
-- **Cache:** New storage backend: Redis.
-
-- **Code:** The ClassGenerator now has a removeMethod() method.
-
-- **Console:** Incremental improvements to layout and colorization of banners
- and usage messages; fixes for how literal and non-literal matches are
- returned.
-
-- **DB:** New DDL support (noted earlier); many incremental improvements.
-
-- **Di:** Improvements around the handling of Aware interfaces to prevent
- attempts to instantiate interfaces when preferences have not been provided.
-
-- **Filter:** New DateTimeFormatter filter.
-
-- **Form:** Many incremental improvements to selected elements; new
- FormAbstractServiceFactory for defining form services; minor improvements to
- make the form component work with the DI service factory.
-
-- **InputFilter**: new CollectionInputFilter for working with form Collections;
- new InputFilterPluginManager providing integration and services for the
- ServiceManager.
-
-- **I18n:** We removed ext/intl as a hard requirement, and made it only a
- suggested requirement; the Translator has an optional dependency on the
- EventManager, providing the ability to tie into "missing message" and "missing
- translations" events; new country-specific PhoneNumber validator.
-
-- **ModuleManager:** Now allows passing actual Module instances (not just names).
-
-- **Navigation:** Incremental improvements, particularly to URL generation.
-
-- **MVC:** You can now configure the initial set of MVC event listeners in the
- configuration file; the MVC stack now detects generic HTTP responses when
- detecting event short circuiting; the default ExceptionStrategy now allows
- returning JSON; opt-in translatable segment routing; many incremental
- improvements to the AbstractRestfulController to make it more configurable and
- extensible; the Forward plugin was refactored to no longer require a
- ServiceLocatorAware controller, and instead receive the ControllerManager via
- its factory.
-
-- **Paginator:** Support for TableGateway objects.
-
-- **ServiceManager:** Incremental improvements; performance optimizations;
- delegate factories, which provide a way to write factories for objects that
- replace a service with a decorator; "lazy" factories, allowing the ability to
- delay factory creation invocation until the moment of first use.
-
-- **Stdlib:** Addition of a HydratorAwareInterface; creation of a
- HydratorPluginManager.
-
-- **SOAP:** Major refactor of WSDL generation to make it more maintainable.
-
-- **Validator:** New Brazilian IBAN format for IBAN validator; validators now
- only return unique error messages; improved Maestro detection in CreditCard
- validator.
-
-- **Version:** use the ZF website API for finding the latest version, instead of
- GitHub.
-
-- **View:** Many incremental improvements, primarily to helpers; deprecation of
- the Placeholder Registry and removal of it from the implemented placeholder
- system; new explicit factory classes for helpers that have collaborators
- (making them easier to override/replace).
+### UPDATES IN 2.2.1
Please see [CHANGELOG.md](CHANGELOG.md).
diff --git a/vendor/zendframework/zendframework/build.xml b/vendor/zendframework/zendframework/build.xml
deleted file mode 100644
index 2d946f985e4ec6ba5aaab732346552564099becf..0000000000000000000000000000000000000000
--- a/vendor/zendframework/zendframework/build.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="ZF2" default="build">
- <target name="travis" depends="tests-parallel,show-test-results" />
-
- <target name="clean" description="Cleanup build artifacts">
- <delete dir="${basedir}/build"/>
- </target>
-
- <target name="prepare" depends="clean" description="Prepare for build">
- <mkdir dir="${basedir}/build/test-results"/>
- <mkdir dir="${basedir}/build/cs-results"/>
- </target>
-
- <target name="get-cs-fixer" depends="clean" description="Get coding standards fixer">
- <get src="http://cs.sensiolabs.org/get/php-cs-fixer.phar" dest="${basedir}/php-cs-fixer.phar"/>
- </target>
-
- <target name="composer-install" description="Installs dependencies via composer install">
- <sequential>
- <exec executable="composer" failonerror="true">
- <arg value="self-update" />
- </exec>
- <exec executable="composer" failonerror="true">
- <arg value="--version" />
- </exec>
- <exec executable="composer" failonerror="true">
- <arg value="install" />
- <arg value="--dev" />
- <arg value="--prefer-source" />
- </exec>
- </sequential>
- </target>
-
- <target
- name="tests-parallel"
- depends="prepare,composer-install,get-cs-fixer"
- description="Run tests for the various components in parallel"
- >
- <parallel threadCount="8">
- <!--
- If there's a way of having this without the explicit component
- list, please PR
- -->
- <component-test component="Authentication"/>
- <component-test component="Barcode"/>
- <component-test component="Cache"/>
- <component-test component="Captcha"/>
- <component-test component="Code"/>
- <component-test component="Config"/>
- <component-test component="Console"/>
- <component-test component="Crypt"/>
- <component-test component="Db"/>
- <component-test component="Debug"/>
- <component-test component="Di"/>
- <component-test component="Dom"/>
- <component-test component="Escaper"/>
- <component-test component="EventManager"/>
- <component-test component="Feed"/>
- <component-test component="File"/>
- <component-test component="Filter"/>
- <component-test component="Form"/>
- <component-test component="Http"/>
- <component-test component="I18n"/>
- <component-test component="InputFilter"/>
- <component-test component="Json"/>
- <component-test component="Ldap"/>
- <component-test component="Loader"/>
- <component-test component="Log"/>
- <component-test component="Mail"/>
- <component-test component="Math"/>
- <component-test component="Memory"/>
- <component-test component="Mime"/>
- <component-test component="ModuleManager"/>
- <component-test component="Mvc"/>
- <component-test component="Navigation"/>
- <component-test component="Paginator"/>
- <component-test component="Permissions"/>
- <component-test component="ProgressBar"/>
- <component-test component="Serializer"/>
- <component-test component="Server"/>
- <component-test component="ServiceManager"/>
- <component-test component="Session"/>
- <component-test component="Soap"/>
- <component-test component="Stdlib"/>
- <component-test component="Tag"/>
- <component-test component="Test"/>
- <component-test component="Text"/>
- <component-test component="Uri"/>
- <component-test component="Validator"/>
- <component-test component="Version"/>
- <component-test component="View"/>
- <component-test component="XmlRpc"/>
- <check-cs/>
- </parallel>
- </target>
-
- <target name="show-test-results" description="Display logged test results">
- <concat>
- <fileset dir="${basedir}/build/cs-results/"/>
- <fileset dir="${basedir}/build/test-results/"/>
- </concat>
- </target>
-
- <macrodef name="component-test">
- <attribute name="component"/>
- <sequential>
- <echo output="${basedir}/build/test-results/@{component}.log" level="debug">
-
- ZendTest/@{component}
-
- </echo>
- <exec
- executable="${basedir}/vendor/bin/phpunit"
- output="${basedir}/build/test-results/@{component}.log"
- error="${basedir}/build/test-results/@{component}.log"
- failonerror="true"
- append="true"
- >
- <arg value="-c" />
- <arg value="${basedir}/tests/phpunit.xml.dist" />
- <arg value="${basedir}/tests/ZendTest/@{component}" />
- </exec>
- </sequential>
- </macrodef>
-
- <macrodef name="check-cs">
- <sequential>
- <echo output="${basedir}/build/cs-results/check-cs.log" level="debug">
-
- Coding standards
-
- </echo>
- <exec
- executable="${basedir}/bin/check-cs.sh"
- output="${basedir}/build/cs-results/check-cs.log"
- error="${basedir}/build/cs-results/check-cs.log"
- failonerror="true"
- append="true"
- />
- </sequential>
- </macrodef>
-</project>
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Digest.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Digest.php
index 1810a04c7d03587df1990326292d51506eb1dc70..79e933595e14017104181712470db881a6cd469a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Digest.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Digest.php
@@ -11,6 +11,7 @@ namespace Zend\Authentication\Adapter;
use Zend\Authentication\Result as AuthenticationResult;
use Zend\Stdlib\ErrorHandler;
+use Zend\Crypt\Utils as CryptUtils;
class Digest extends AbstractAdapter
{
@@ -178,7 +179,7 @@ class Digest extends AbstractAdapter
break;
}
if (substr($line, 0, $idLength) === $id) {
- if ($this->_secureStringCompare(substr($line, -32), md5("$this->identity:$this->realm:$this->credential"))) {
+ if (CryptUtils::compareStrings(substr($line, -32), md5("$this->identity:$this->realm:$this->credential"))) {
$result['code'] = AuthenticationResult::SUCCESS;
} else {
$result['code'] = AuthenticationResult::FAILURE_CREDENTIAL_INVALID;
@@ -192,26 +193,4 @@ class Digest extends AbstractAdapter
$result['messages'][] = "Username '$this->identity' and realm '$this->realm' combination not found";
return new AuthenticationResult($result['code'], $result['identity'], $result['messages']);
}
-
- /**
- * Securely compare two strings for equality while avoided C level memcmp()
- * optimisations capable of leaking timing information useful to an attacker
- * attempting to iteratively guess the unknown string (e.g. password) being
- * compared against.
- *
- * @param string $a
- * @param string $b
- * @return bool
- */
- protected function _secureStringCompare($a, $b)
- {
- if (strlen($a) !== strlen($b)) {
- return false;
- }
- $result = 0;
- for ($i = 0, $len = strlen($a); $i < $len; $i++) {
- $result |= ord($a[$i]) ^ ord($b[$i]);
- }
- return $result == 0;
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php
index 13d7fdbd80befa755d81457c736a7668b782888c..d5e2fbfa2274390126fabeb08c031daf04623d50 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php
@@ -13,6 +13,7 @@ use Zend\Authentication;
use Zend\Http\Request as HTTPRequest;
use Zend\Http\Response as HTTPResponse;
use Zend\Uri\UriFactory;
+use Zend\Crypt\Utils as CryptUtils;
/**
* HTTP Authentication Adapter
@@ -489,7 +490,7 @@ class Http implements AdapterInterface
if (!$result instanceof Authentication\Result
&& !is_array($result)
- && $this->_secureStringCompare($result, $creds[1])
+ && CryptUtils::compareStrings($result, $creds[1])
) {
$identity = array('username' => $creds[0], 'realm' => $this->realm);
return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
@@ -582,7 +583,7 @@ class Http implements AdapterInterface
// If our digest matches the client's let them in, otherwise return
// a 401 code and exit to prevent access to the protected resource.
- if ($this->_secureStringCompare($digest, $data['response'])) {
+ if (CryptUtils::compareStrings($digest, $data['response'])) {
$identity = array('username' => $data['username'], 'realm' => $data['realm']);
return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
}
@@ -798,26 +799,4 @@ class Http implements AdapterInterface
return $data;
}
-
- /**
- * Securely compare two strings for equality while avoided C level memcmp()
- * optimisations capable of leaking timing information useful to an attacker
- * attempting to iteratively guess the unknown string (e.g. password) being
- * compared against.
- *
- * @param string $a
- * @param string $b
- * @return bool
- */
- protected function _secureStringCompare($a, $b)
- {
- if (strlen($a) !== strlen($b)) {
- return false;
- }
- $result = 0;
- for ($i = 0, $len = strlen($a); $i < $len; $i++) {
- $result |= ord($a[$i]) ^ ord($b[$i]);
- }
- return $result == 0;
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php
index 3c90d9ce4a5024264ecf38dfad3e549e42dfb497..954aec5a1a0a7f756a5783cbe04dcb8c2544d11c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php
@@ -73,15 +73,7 @@ class Result
*/
public function __construct($code, $identity, array $messages = array())
{
- $code = (int) $code;
-
- if ($code < self::FAILURE_UNCATEGORIZED) {
- $code = self::FAILURE;
- } elseif ($code > self::SUCCESS) {
- $code = 1;
- }
-
- $this->code = $code;
+ $this->code = (int) $code;
$this->identity = $identity;
$this->messages = $messages;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json b/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json
index 79eea9108a039fb66e43c2e1a2ba40ff5d57fbd7..bdcc937935a3cd51cd083edd1c934ee2a0ff55e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json
@@ -18,6 +18,7 @@
},
"suggest": {
"zendframework/zend-db": "Zend\\Db component",
+ "zendframework/zend-crypt": "Zend\\Crypt component",
"zendframework/zend-uri": "Zend\\Uri component",
"zendframework/zend-session": "Zend\\Session component"
},
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php
index 5fe07f63a469f1a763d001ba15518ec7b6ff7413..1547a58ac2a87c4cd2e0e848a41c158c76083c42 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php
@@ -71,7 +71,7 @@ abstract class Barcode
}
/**
- * Factory for Zend_Barcode classes.
+ * Factory for Zend\Barcode classes.
*
* First argument may be a string containing the base of the adapter class
* name, e.g. 'int25' corresponds to class Object\Int25. This
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/ExceptionInterface.php
index 03ecada2b765db27e7435b8283fd3e8f6ae46254..5912f45ec9f9da5c8b48666f820440ba2753ee04 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/ExceptionInterface.php
@@ -10,7 +10,7 @@
namespace Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
interface ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/InvalidArgumentException.php
index 1f09fe53f15d253f2bb7bafe9bff261ae72d5440..1b3dda383b5ddfaa4632438b45bd74f0008c33f8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/InvalidArgumentException.php
@@ -10,7 +10,7 @@
namespace Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class InvalidArgumentException
extends \InvalidArgumentException
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/OutOfRangeException.php
index 34f337c4c6b916348e5e696f94a9b4c3023d8ae5..3e86c50310dcf93cf68c1556f4d5d49703f85988 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/OutOfRangeException.php
@@ -10,7 +10,7 @@
namespace Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class OutOfRangeException extends \OutOfRangeException implements ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RendererCreationException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RendererCreationException.php
index ef739228a27256ea26a0310b7c2f0734ee146da0..89432814512fb18e2ef0d82fd19a25a8abec1820 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RendererCreationException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RendererCreationException.php
@@ -10,7 +10,7 @@
namespace Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class RendererCreationException
extends \InvalidArgumentException
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RuntimeException.php
index aa748997ce22dbaae16865dd6d3d526390c68f1e..c34a44ad860b61d1466906093940717571568c64 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RuntimeException.php
@@ -10,7 +10,7 @@
namespace Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/UnexpectedValueException.php
index 49847cdb2b3d203441a5ddb625b4f92f2b22c6b2..6cfe98b370e4757f14d967427b17d6bdb0710317 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/UnexpectedValueException.php
@@ -10,7 +10,7 @@
namespace Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class UnexpectedValueException extends \UnexpectedValueException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
index ae14cbc8d471287e0a816f2cf40895a600b05e4f..9a5b28059b60d9549b58c3eb6a01d9281f46e95a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
@@ -10,7 +10,7 @@
namespace Zend\Barcode\Object\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class BarcodeValidationException extends InvalidArgumentException
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
index 13a3560b0098404e2c166aa849bb21eb517c8b6b..ea0714ca41d8281000e594675a347866d5d3bdb8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
@@ -10,7 +10,7 @@
namespace Zend\Barcode\Object\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class ExtensionNotLoadedException extends RuntimeException
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
index c6ef34e630f9bd65a9df6c7fe0b02570dfe346c3..d008e86e57c8a8d8e86f5494917808af3203fc14 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
@@ -12,7 +12,7 @@ namespace Zend\Barcode\Object\Exception;
use Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
index ecd4d856c3f37951cc15039f5539a66c8f9db851..6642105b5e5b695afa4406acaf321a2807a83e56 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
@@ -12,7 +12,7 @@ namespace Zend\Barcode\Object\Exception;
use Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class OutOfRangeException extends Exception\OutOfRangeException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/RuntimeException.php
index e244826c15118a6745e03b0cb76e6ff99f2d8ea6..bc106391359aa2958d56d8186859c7ac62c58f06 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/RuntimeException.php
@@ -12,7 +12,7 @@ namespace Zend\Barcode\Object\Exception;
use Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
index b83b0ff96df9935fb9131faa637158fe52fc6e71..682f2f630d46005cbe0f0d2acecb7ee5a37d915d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
@@ -12,7 +12,7 @@ namespace Zend\Barcode\Renderer\Exception;
use Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
index 524e4bda3cd07c66740265a55c1c921dde2467b9..a5328632c9d7946f709f294f2dcfabefdb9b71f7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
@@ -12,7 +12,7 @@ namespace Zend\Barcode\Renderer\Exception;
use Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class OutOfRangeException extends Exception\OutOfRangeException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
index cba7e774a04e18f7633c4a9f247d830200a96c5e..6e2cde4a412d8c91b332d34c1ad99d108179727b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
@@ -12,7 +12,7 @@ namespace Zend\Barcode\Renderer\Exception;
use Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
index eb8d9a8a6d87cf866c99c14ba4a6b35a0143e339..b8f2b4afa2ace7b1a13dbc9cde2871667dff75cb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
@@ -12,7 +12,7 @@ namespace Zend\Barcode\Renderer\Exception;
use Zend\Barcode\Exception;
/**
- * Exception for Zend_Barcode component.
+ * Exception for Zend\Barcode component.
*/
class UnexpectedValueException extends Exception\UnexpectedValueException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CallbackCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CallbackCache.php
index 013f757bc20b7cbc33417a4c572cc785c63a9da7..694aec0e98915c677f53c4933ac8109fd155eb3f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CallbackCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CallbackCache.php
@@ -48,7 +48,7 @@ class CallbackCache extends AbstractPattern
$key = $this->generateCallbackKey($callback, $args);
$result = $storage->getItem($key, $success);
if ($success) {
- if (!isset($result[0])) {
+ if (!array_key_exists(0, $result)) {
throw new Exception\RuntimeException("Invalid cached data for key '{$key}'");
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php
index 89467aca1d55200d40337a26c70b9dae4d88193c..94b7c8c381730ca26d5e349ab16566f1c32ea89e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php
@@ -80,7 +80,6 @@ class Redis extends AbstractAdapter implements
*/
protected function getRedisResource()
{
-
if (!$this->initialized) {
$options = $this->getOptions();
@@ -222,9 +221,10 @@ class Redis extends AbstractAdapter implements
*/
protected function internalSetItem(& $normalizedKey, & $value)
{
+ $redis = $this->getRedisResource();
+ $ttl = $this->getOptions()->getTtl();
+
try {
- $redis = $this->getRedisResource();
- $ttl = $this->getOptions()->getTtl();
if ($ttl) {
if ($this->resourceManager->getMayorVersion($this->resourceId) < 2) {
throw new Exception\UnsupportedMethodCallException("To use ttl you need version >= 2.0.0");
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
index 1b90cd95a053f0a377051cbc18e769a5e3bbc8e5..b167dd9ba5f4df4f01d1f55e5d5fdf2110ef1a30 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
@@ -172,6 +172,7 @@ class RedisOptions extends AdapterOptions
*/
public function setLibOptions(array $libOptions)
{
+ $this->triggerOptionEvent('lib_option', $libOptions);
$this->getResourceManager()->setLibOptions($this->getResourceId(), $libOptions);
return $this;
}
@@ -237,4 +238,27 @@ class RedisOptions extends AdapterOptions
{
return $this->getResourceManager()->getDatabase($this->getResourceId());
}
+
+ /**
+ * Set resource password
+ *
+ * @param string $password Password
+ *
+ * @return RedisOptions
+ */
+ public function setPassword($password)
+ {
+ $this->getResourceManager()->setPassword($this->getResourceId(), $password);
+ return $this;
+ }
+
+ /**
+ * Get resource password
+ *
+ * @return string
+ */
+ public function getPassword()
+ {
+ return $this->getResourceManager()->getPassword($this->getResourceId());
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
index d91deba547aecb9ac7a2a243f96351820ae4bdfd..691f827b73d8ac9544e6922f605bbd160abefb96 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
@@ -66,13 +66,13 @@ class RedisResourceManager
$redis = new RedisResource();
+ $resource['resource'] = $redis;
+ $this->connect($resource);
+
foreach ($resource['lib_options'] as $k => $v) {
$redis->setOption($k, $v);
}
- $resource['resource'] = $redis;
- $this->connect($resource);
-
$info = $redis->info();
$resource['version'] = $info['redis_version'];
$this->resources[$id]['resource'] = $redis;
@@ -107,6 +107,7 @@ class RedisResourceManager
if (!$success) {
throw new Exception\RuntimeException('Could not estabilish connection with Redis instance');
}
+
$resource['initialized'] = true;
if ($resource['password']) {
$redis->auth($resource['password']);
@@ -256,18 +257,19 @@ class RedisResourceManager
}
$this->normalizeLibOptions($libOptions);
-
$resource = & $this->resources[$id];
- if ($resource instanceof RedisResource) {
- if (method_exists($resource, 'setOptions')) {
- $resource->setOptions($libOptions);
+
+ $resource['lib_options'] = $libOptions;
+
+ if ($resource['resource'] instanceof RedisResource) {
+ $redis = & $resource['resource'];
+ if (method_exists($redis, 'setOptions')) {
+ $redis->setOptions($libOptions);
} else {
foreach ($libOptions as $key => $value) {
- $resource->setOption($key, $value);
+ $redis->setOption($key, $value);
}
}
- } else {
- $resource['lib_options'] = $libOptions;
}
return $this;
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php
index 24cbfd9eef5442b118c85917028be025bba0d584..729157329da1a2bcdcf7ce6e568f8395fd127340 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php
@@ -140,6 +140,8 @@ class WinCache extends AbstractAdapter implements
if ($success) {
$casToken = $result;
+ } else {
+ $result = null;
}
return $result;
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AdapterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AdapterPluginManager.php
index 146d68e3a087f6dda1757b3aed9860276155ed9d..9f133fb0e94c5487d02a8054569820d3a17e6280 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AdapterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AdapterPluginManager.php
@@ -32,6 +32,7 @@ class AdapterPluginManager extends AbstractPluginManager
'filesystem' => 'Zend\Cache\Storage\Adapter\Filesystem',
'memcached' => 'Zend\Cache\Storage\Adapter\Memcached',
'memory' => 'Zend\Cache\Storage\Adapter\Memory',
+ 'redis' => 'Zend\Cache\Storage\Adapter\Redis',
'session' => 'Zend\Cache\Storage\Adapter\Session',
'xcache' => 'Zend\Cache\Storage\Adapter\XCache',
'wincache' => 'Zend\Cache\Storage\Adapter\WinCache',
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/StorageFactory.php b/vendor/zendframework/zendframework/library/Zend/Cache/StorageFactory.php
index 6bde52f31c2bc6c002efc1683547b07c01174aa3..5779e9d09ba18dfd0bcc21a546c6d99d3a8aecd8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/StorageFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/StorageFactory.php
@@ -54,16 +54,16 @@ abstract class StorageFactory
throw new Exception\InvalidArgumentException('Missing "adapter"');
}
$adapterName = $cfg['adapter'];
- $adapterOptions = null;
+ $adapterOptions = array();
if (is_array($cfg['adapter'])) {
if (!isset($cfg['adapter']['name'])) {
throw new Exception\InvalidArgumentException('Missing "adapter.name"');
}
$adapterName = $cfg['adapter']['name'];
- $adapterOptions = isset($cfg['adapter']['options']) ? $cfg['adapter']['options'] : null;
+ $adapterOptions = isset($cfg['adapter']['options']) ? $cfg['adapter']['options'] : array();
}
- if ($adapterOptions && isset($cfg['options'])) {
+ if (isset($cfg['options'])) {
$adapterOptions = array_merge($adapterOptions, $cfg['options']);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExceptionInterface.php
index 9cca7bb17039deda92f8c1e19a0ef59149cd6bc0..baeb937a85d3288e2635b4291ebf0e5f2025bcb2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExceptionInterface.php
@@ -10,7 +10,7 @@
namespace Zend\Captcha\Exception;
/**
- * Exception for Zend_Form component.
+ * Exception for Zend\Form component.
*/
interface ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
index 4c17b1f8b223d465141a6090fe7dbfa422a32516..883fc2d1f7fba281ebd75025c60e42447f05dfcd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
@@ -10,7 +10,7 @@
namespace Zend\Captcha\Exception;
/**
- * Exception for Zend_Form component.
+ * Exception for Zend\Form component.
*/
class ExtensionNotLoadedException extends RuntimeException
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ImageNotLoadableException.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ImageNotLoadableException.php
index 5bbdea3c49e6fd4132224a4bba6dc62b1bd9f238..f38ceb5a8df3c3d8bd5dc773b76377dbd62626ed 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ImageNotLoadableException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ImageNotLoadableException.php
@@ -10,7 +10,7 @@
namespace Zend\Captcha\Exception;
/**
- * Exception for Zend_Form component.
+ * Exception for Zend\Form component.
*/
class ImageNotLoadableException extends RuntimeException
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/NoFontProvidedException.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/NoFontProvidedException.php
index bcfed6b040ac951413622d1ec0f32023ff8d5359..409d78be6a66bf8eb10fc90a7cfbc0b878ff841e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/NoFontProvidedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/NoFontProvidedException.php
@@ -10,7 +10,7 @@
namespace Zend\Captcha\Exception;
/**
- * Exception for Zend_Form component.
+ * Exception for Zend\Form component.
*/
class NoFontProvidedException extends InvalidArgumentException
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
index bd1ac882428e517b2bfe2717aa3510801d5f976f..0758fb3e36dce76b26385487c08c90f1225ad01c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
@@ -218,7 +218,7 @@ class DocBlockGenerator extends AbstractGenerator
public function generate()
{
if (!$this->isSourceDirty()) {
- return $this->docCommentize($this->getSourceContent());
+ return $this->docCommentize(trim($this->getSourceContent()));
}
$output = '';
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php
index bcb5ac5d1f3b90e7b604b3de3a0f6e0b45e50b94..79381d0e0b203b7fdf8cf8db426e09518710e09f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php
@@ -66,20 +66,22 @@ class FileGenerator extends AbstractGenerator
*
* @param string $filePath
* @param bool $includeIfNotAlreadyIncluded
- * @throws Exception\InvalidArgumentException
+ * @throws Exception\InvalidArgumentException If file does not exists
+ * @throes Exception\RuntimeException If file exists but is not included or required
* @return FileGenerator
*/
public static function fromReflectedFileName($filePath, $includeIfNotAlreadyIncluded = true)
{
$realpath = realpath($filePath);
- if (
- $realpath === false
- && ($realpath = FileReflection::findRealpathInIncludePath($filePath)) === false
- ) {
+ if ($realpath === false) {
+ $realpath = stream_resolve_include_path($filePath);
+ }
+
+ if (!$realpath) {
throw new Exception\InvalidArgumentException(sprintf(
'No file for %s was found.',
- $realpath
+ $filePath
));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGeneratorRegistry.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGeneratorRegistry.php
index dfdd6a8db3f813c259ba7c5e3a3537f2e6b61aae..27538e85b4a1a4dc6c995d15ef827316ccf38545 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGeneratorRegistry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGeneratorRegistry.php
@@ -19,7 +19,7 @@ class FileGeneratorRegistry
private static $fileCodeGenerators = array();
/**
- * Registry for the Zend_Code package. Zend_Tool uses this
+ * Registry for the Zend\Code package.
*
* @param FileGenerator $fileCodeGenerator
* @param string $fileName
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ParameterGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ParameterGenerator.php
index f32f191f9768f62d95b7d5832581734d31f5841c..f85d7d4c944efd5151a1b627685a2419dd322389 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ParameterGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ParameterGenerator.php
@@ -61,7 +61,14 @@ class ParameterGenerator extends AbstractGenerator
} else {
$typeClass = $reflectionParameter->getClass();
if ($typeClass) {
- $param->setType($typeClass->getName());
+ $parameterType = $typeClass->getName();
+ $currentNamespace = $reflectionParameter->getDeclaringClass()->getNamespaceName();
+
+ if (substr($parameterType, 0, strlen($currentNamespace)) == $currentNamespace) {
+ $parameterType = substr($parameterType, strlen($currentNamespace)+1);
+ }
+
+ $param->setType($parameterType);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php
index 8170a0920b285dde266fb1ff9b12a9789257f568..6150da8b6b8aa9a5dc893732f35d60b17ebaa00f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php
@@ -364,9 +364,18 @@ class ValueGenerator extends AbstractGenerator
/* @var $v ValueGenerator */
$v->setArrayDepth($this->arrayDepth + 1);
$partV = $v->generate();
- if ($n === $noKeyIndex) {
+ $short = false;
+ if (is_int($n)) {
+ if ($n === $noKeyIndex) {
+ $short = true;
+ $noKeyIndex++;
+ } else {
+ $noKeyIndex = max($n + 1, $noKeyIndex);
+ }
+ }
+
+ if ($short) {
$outputParts[] = $partV;
- $noKeyIndex++;
} else {
$outputParts[] = (is_int($n) ? $n : self::escape($n)) . ' => ' . $partV;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ClassScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ClassScanner.php
index 1f11645848edc49bd4cb5b10faca40fa21ef47dd..ae02f24a9d9c844348a5d504963fcc1751e5393b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ClassScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ClassScanner.php
@@ -122,6 +122,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return documentation comment
+ *
* @return null|string
*/
public function getDocComment()
@@ -132,6 +134,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return documentation block
+ *
* @return false|DocBlockScanner
*/
public function getDocBlock()
@@ -144,6 +148,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return a name of class
+ *
* @return null|string
*/
public function getName()
@@ -153,6 +159,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return short name of class
+ *
* @return null|string
*/
public function getShortName()
@@ -162,6 +170,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return number of first line
+ *
* @return int|null
*/
public function getLineStart()
@@ -171,6 +181,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return number of last line
+ *
* @return int|null
*/
public function getLineEnd()
@@ -180,6 +192,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Verify if class is final
+ *
* @return bool
*/
public function isFinal()
@@ -189,6 +203,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Verify if class is instantiable
+ *
* @return bool
*/
public function isInstantiable()
@@ -198,6 +214,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Verify if class is an abstract class
+ *
* @return bool
*/
public function isAbstract()
@@ -207,6 +225,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Verify if class is an interface
+ *
* @return bool
*/
public function isInterface()
@@ -216,6 +236,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Verify if class has parent
+ *
* @return bool
*/
public function hasParentClass()
@@ -225,6 +247,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return a name of parent class
+ *
* @return null|string
*/
public function getParentClass()
@@ -234,6 +258,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return a list of interface names
+ *
* @return array
*/
public function getInterfaces()
@@ -243,9 +269,11 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return a list of constant names
+ *
* @return array
*/
- public function getConstants()
+ public function getConstantNames()
{
$this->scan();
@@ -262,7 +290,95 @@ class ClassScanner implements ScannerInterface
}
/**
- * Returns a list of property names
+ * Return a list of constants
+ *
+ * @param bool $namesOnly Set false to return instances of ConstantScanner
+ * @return array|ConstantScanner[]
+ */
+ public function getConstants($namesOnly = true)
+ {
+ if (true === $namesOnly) {
+ trigger_error('Use method getConstantNames() instead', E_USER_DEPRECATED);
+ return $this->getConstantNames();
+ }
+
+ $this->scan();
+
+ $return = array();
+ foreach ($this->infos as $info) {
+ if ($info['type'] != 'constant') {
+ continue;
+ }
+
+ $return[] = $this->getConstant($info['name']);
+ }
+
+ return $return;
+ }
+
+ /**
+ * Return a single constant by given name or index of info
+ *
+ * @param string|int $constantNameOrInfoIndex
+ * @throws Exception\InvalidArgumentException
+ * @return bool|ConstantScanner
+ */
+ public function getConstant($constantNameOrInfoIndex)
+ {
+ $this->scan();
+
+ if (is_int($constantNameOrInfoIndex)) {
+ $info = $this->infos[$constantNameOrInfoIndex];
+ if ($info['type'] != 'constant') {
+ throw new Exception\InvalidArgumentException('Index of info offset is not about a constant');
+ }
+ } elseif (is_string($constantNameOrInfoIndex)) {
+ $constantFound = false;
+ foreach ($this->infos as $info) {
+ if ($info['type'] === 'constant' && $info['name'] === $constantNameOrInfoIndex) {
+ $constantFound = true;
+ break;
+ }
+ }
+ if (!$constantFound) {
+ return false;
+ }
+ } else {
+ throw new Exception\InvalidArgumentException('Invalid constant name of info index type. Must be of type int or string');
+ }
+ if (!isset($info)) {
+ return false;
+ }
+ $p = new ConstantScanner(
+ array_slice($this->tokens, $info['tokenStart'], $info['tokenEnd'] - $info['tokenStart'] + 1),
+ $this->nameInformation
+ );
+ $p->setClass($this->name);
+ $p->setScannerClass($this);
+ return $p;
+ }
+
+ /**
+ * Verify if class has constant
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function hasConstant($name)
+ {
+ $this->scan();
+
+ foreach ($this->infos as $info) {
+ if ($info['type'] === 'constant' && $info['name'] === $name) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Return a list of property names
*
* @return array
*/
@@ -283,9 +399,9 @@ class ClassScanner implements ScannerInterface
}
/**
- * Returns a list of properties
+ * Return a list of properties
*
- * @return array
+ * @return PropertyScanner
*/
public function getProperties()
{
@@ -303,6 +419,13 @@ class ClassScanner implements ScannerInterface
return $return;
}
+ /**
+ * Return a single property by given name or index of info
+ *
+ * @param string|int $propertyNameOrInfoIndex
+ * @throws Exception\InvalidArgumentException
+ * @return bool|PropertyScanner
+ */
public function getProperty($propertyNameOrInfoIndex)
{
$this->scan();
@@ -339,6 +462,27 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Verify if class has property
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function hasProperty($name)
+ {
+ $this->scan();
+
+ foreach ($this->infos as $info) {
+ if ($info['type'] === 'property' && $info['name'] === $name) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Return a list of method names
+ *
* @return array
*/
public function getMethodNames()
@@ -358,6 +502,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return a list of methods
+ *
* @return MethodScanner[]
*/
public function getMethods()
@@ -377,6 +523,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Return a single method by given name or index of info
+ *
* @param string|int $methodNameOrInfoIndex
* @throws Exception\InvalidArgumentException
* @return MethodScanner
@@ -417,6 +565,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Verify if class has method by given name
+ *
* @param string $name
* @return bool
*/
@@ -444,6 +594,8 @@ class ClassScanner implements ScannerInterface
}
/**
+ * Scan tokens
+ *
* @return void
* @throws Exception\RuntimeException
*/
@@ -487,6 +639,7 @@ class ClassScanner implements ScannerInterface
return false;
}
$token = $tokens[$tokenIndex];
+
if (is_string($token)) {
$tokenType = null;
$tokenContent = $token;
@@ -638,7 +791,7 @@ class ClassScanner implements ScannerInterface
goto SCANNER_CLASS_BODY_CONST_END;
}
- if ($tokenType === T_STRING) {
+ if ($tokenType === T_STRING && null === $infos[$infoIndex]['name']) {
$infos[$infoIndex]['name'] = $tokenContent;
}
@@ -699,8 +852,14 @@ class ClassScanner implements ScannerInterface
}
}
+
switch ($tokenType) {
+ case T_CONST:
+ $memberContext = 'constant';
+ $infos[$infoIndex]['type'] = 'constant';
+ goto SCANNER_CLASS_BODY_CONST_CONTINUE;
+
case T_VARIABLE:
if ($memberContext === null) {
$memberContext = 'property';
@@ -715,7 +874,7 @@ class ClassScanner implements ScannerInterface
goto SCANNER_CLASS_BODY_MEMBER_CONTINUE;
case T_STRING:
- if ($memberContext === 'method' && $infos[$infoIndex]['name'] === null) {
+ if ($memberContext === 'method' && null === $infos[$infoIndex]['name']) {
$infos[$infoIndex]['name'] = $tokenContent;
}
goto SCANNER_CLASS_BODY_MEMBER_CONTINUE;
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ConstantScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ConstantScanner.php
new file mode 100644
index 0000000000000000000000000000000000000000..02617c710bc1c912bb230462da150867ff47e436
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ConstantScanner.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Code\Scanner;
+
+use Zend\Code\Annotation;
+use Zend\Code\Exception;
+use Zend\Code\NameInformation;
+
+class ConstantScanner implements ScannerInterface
+{
+ /**
+ * @var bool
+ */
+ protected $isScanned = false;
+
+ /**
+ * @var array
+ */
+ protected $tokens;
+
+ /**
+ * @var NameInformation
+ */
+ protected $nameInformation;
+
+ /**
+ * @var string
+ */
+ protected $class;
+
+ /**
+ * @var ClassScanner
+ */
+ protected $scannerClass;
+
+ /**
+ * @var int
+ */
+ protected $lineStart;
+
+ /**
+ * @var string
+ */
+ protected $docComment;
+
+ /**
+ * @var string
+ */
+ protected $name;
+
+ /**
+ * @var string
+ */
+ protected $value;
+
+ /**
+ * Constructor
+ *
+ * @param array $constantTokens
+ * @param NameInformation $nameInformation
+ */
+ public function __construct(array $constantTokens, NameInformation $nameInformation = null)
+ {
+ $this->tokens = $constantTokens;
+ $this->nameInformation = $nameInformation;
+ }
+
+ /**
+ * @param string $class
+ */
+ public function setClass($class)
+ {
+ $this->class = $class;
+ }
+
+ /**
+ * @param ClassScanner $scannerClass
+ */
+ public function setScannerClass(ClassScanner $scannerClass)
+ {
+ $this->scannerClass = $scannerClass;
+ }
+
+ /**
+ * @return ClassScanner
+ */
+ public function getClassScanner()
+ {
+ return $this->scannerClass;
+ }
+
+ /**
+ * @return string
+ */
+ public function getName()
+ {
+ $this->scan();
+ return $this->name;
+ }
+
+ /**
+ * @return string
+ */
+ public function getValue()
+ {
+ $this->scan();
+ return $this->value;
+ }
+
+ /**
+ * @return string
+ */
+ public function getDocComment()
+ {
+ $this->scan();
+ return $this->docComment;
+ }
+
+ /**
+ * @param Annotation\AnnotationManager $annotationManager
+ * @return AnnotationScanner
+ */
+ public function getAnnotations(Annotation\AnnotationManager $annotationManager)
+ {
+ if (($docComment = $this->getDocComment()) == '') {
+ return false;
+ }
+
+ return new AnnotationScanner($annotationManager, $docComment, $this->nameInformation);
+ }
+
+ /**
+ * @return string
+ */
+ public function __toString()
+ {
+ $this->scan();
+ return var_export($this, true);
+ }
+
+ /**
+ * Scan tokens
+ *
+ * @throws Exception\RuntimeException
+ */
+ protected function scan()
+ {
+ if ($this->isScanned) {
+ return;
+ }
+
+ if (!$this->tokens) {
+ throw new Exception\RuntimeException('No tokens were provided');
+ }
+
+ /**
+ * Variables & Setup
+ */
+ $tokens = &$this->tokens;
+
+ reset($tokens);
+
+ SCANNER_TOP:
+
+ $token = current($tokens);
+
+ if (!is_string($token)) {
+ list($tokenType, $tokenContent, $tokenLine) = $token;
+
+ switch ($tokenType) {
+ case T_DOC_COMMENT:
+ if ($this->docComment === null && $this->name === null) {
+ $this->docComment = $tokenContent;
+ }
+ goto SCANNER_CONTINUE;
+
+ case T_STRING:
+ $string = (is_string($token)) ? $token : $tokenContent;
+
+ if (null === $this->name) {
+ $this->name = $string;
+ } else {
+ if ('self' == strtolower($string)) {
+ list($tokenNextType, $tokenNextContent, $tokenNextLine) = next($tokens);
+
+ if ('::' == $tokenNextContent) {
+ list($tokenNextType, $tokenNextContent, $tokenNextLine) = next($tokens);
+
+ if ($this->getClassScanner()->getConstant($tokenNextContent)) {
+ $this->value = $this->getClassScanner()->getConstant($tokenNextContent)->getValue();
+ }
+ }
+ }
+ }
+
+ goto SCANNER_CONTINUE;
+
+ case T_CONSTANT_ENCAPSED_STRING:
+ case T_DNUMBER:
+ case T_LNUMBER:
+ $string = (is_string($token)) ? $token : $tokenContent;
+
+ if (substr($string, 0, 1) === '"' || substr($string, 0, 1) === "'") {
+ $this->value = substr($string, 1, -1); // Remove quotes
+ } else {
+ $this->value = $string;
+ }
+ goto SCANNER_CONTINUE;
+
+ default:
+ goto SCANNER_CONTINUE;
+ }
+ }
+
+ SCANNER_CONTINUE:
+
+ if (next($this->tokens) === false) {
+ goto SCANNER_END;
+ }
+ goto SCANNER_TOP;
+
+ SCANNER_END:
+
+ $this->isScanned = true;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DerivedClassScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DerivedClassScanner.php
index 210a6bd679c99c961d4811a404ca84a20e167bf0..76156bab2c29b87cf1b1dbe3febb6e2004716797 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DerivedClassScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DerivedClassScanner.php
@@ -153,18 +153,102 @@ class DerivedClassScanner extends ClassScanner
}
/**
+ * Return a list of constant names
+ *
* @return array
*/
- public function getConstants()
+ public function getConstantNames()
{
+ $constants = $this->classScanner->getConstantNames();
+ foreach ($this->parentClassScanners as $pClassScanner) {
+ $constants = array_merge($constants, $pClassScanner->getConstantNames());
+ }
+
+ return $constants;
+ }
+
+ /**
+ * Return a list of constants
+ *
+ * @param bool $namesOnly Set false to return instances of ConstantScanner
+ * @return array|ConstantScanner[]
+ */
+ public function getConstants($namesOnly = true)
+ {
+ if (true === $namesOnly) {
+ trigger_error('Use method getConstantNames() instead', E_USER_DEPRECATED);
+ return $this->getConstantNames();
+ }
+
$constants = $this->classScanner->getConstants();
foreach ($this->parentClassScanners as $pClassScanner) {
- $constants = array_merge($constants, $pClassScanner->getConstants());
+ $constants = array_merge($constants, $pClassScanner->getConstants($namesOnly));
}
return $constants;
}
+ /**
+ * Return a single constant by given name or index of info
+ *
+ * @param string|int $constantNameOrInfoIndex
+ * @throws Exception\InvalidArgumentException
+ * @return bool|ConstantScanner
+ */
+ public function getConstant($constantNameOrInfoIndex)
+ {
+ if ($this->classScanner->hasConstant($constantNameOrInfoIndex)) {
+ return $this->classScanner->getConstant($constantNameOrInfoIndex);
+ }
+
+ foreach ($this->parentClassScanners as $pClassScanner) {
+ if ($pClassScanner->hasConstant($constantNameOrInfoIndex)) {
+ return $pClassScanner->getConstant($constantNameOrInfoIndex);
+ }
+ }
+
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Constant %s not found in %s',
+ $constantNameOrInfoIndex,
+ $this->classScanner->getName()
+ ));
+ }
+
+ /**
+ * Verify if class or parent class has constant
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function hasConstant($name)
+ {
+ if ($this->classScanner->hasConstant($name)) {
+ return true;
+ }
+ foreach ($this->parentClassScanners as $pClassScanner) {
+ if ($pClassScanner->hasConstant($name)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Return a list of property names
+ *
+ * @return array
+ */
+ public function getPropertyNames()
+ {
+ $properties = $this->classScanner->getPropertyNames();
+ foreach ($this->parentClassScanners as $pClassScanner) {
+ $properties = array_merge($properties, $pClassScanner->getPropertyNames());
+ }
+
+ return $properties;
+ }
+
/**
* @param bool $returnScannerProperty
* @return array
@@ -179,6 +263,52 @@ class DerivedClassScanner extends ClassScanner
return $properties;
}
+ /**
+ * Return a single property by given name or index of info
+ *
+ * @param string|int $propertyNameOrInfoIndex
+ * @throws Exception\InvalidArgumentException
+ * @return bool|PropertyScanner
+ */
+ public function getProperty($propertyNameOrInfoIndex)
+ {
+ if ($this->classScanner->hasProperty($propertyNameOrInfoIndex)) {
+ return $this->classScanner->getProperty($propertyNameOrInfoIndex);
+ }
+
+ foreach ($this->parentClassScanners as $pClassScanner) {
+ if ($pClassScanner->hasProperty($propertyNameOrInfoIndex)) {
+ return $pClassScanner->getProperty($propertyNameOrInfoIndex);
+ }
+ }
+
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Property %s not found in %s',
+ $propertyNameOrInfoIndex,
+ $this->classScanner->getName()
+ ));
+ }
+
+ /**
+ * Verify if class or parent class has property
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function hasProperty($name)
+ {
+ if ($this->classScanner->hasProperty($name)) {
+ return true;
+ }
+ foreach ($this->parentClassScanners as $pClassScanner) {
+ if ($pClassScanner->hasProperty($name)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
/**
* @return array
*/
@@ -230,6 +360,8 @@ class DerivedClassScanner extends ClassScanner
}
/**
+ * Verify if class or parent class has method by given name
+ *
* @param string $name
* @return bool
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/composer.json b/vendor/zendframework/zendframework/library/Zend/Config/composer.json
index 73f2c712f4e4afccd50a740130d49c2528bb3209..f515b057a3e80509b5ff32b52a91caabec031816 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Config/composer.json
@@ -17,6 +17,7 @@
"zendframework/zend-stdlib": "self.version"
},
"suggest": {
+ "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
"zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
},
"extra": {
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Getopt.php b/vendor/zendframework/zendframework/library/Zend/Console/Getopt.php
index e7de857b2420fd2896a47906502fd22d7db97ca6..617d8fd5ac11190795e53c64e52301e6b63841e2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Getopt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Getopt.php
@@ -341,7 +341,7 @@ class Getopt
/**
* Define multiple configuration options from an associative array.
* These are not program options, but properties to configure
- * the behavior of Zend_Console_Getopt.
+ * the behavior of Zend\Console\Getopt.
*
* @param array $getoptConfig
* @return \Zend\Console\Getopt Provides a fluent interface
@@ -359,7 +359,7 @@ class Getopt
/**
* Define one configuration option as a key/value pair.
* These are not program options, but properties to configure
- * the behavior of Zend_Console_Getopt.
+ * the behavior of Zend\Console\Getopt.
*
* @param string $configKey
* @param string $configValue
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
index d1afcc12b51303f53d19fda98740c2252b81e706..45b3370443191a8d045ccaf1b88b3d9d9f5a1e38 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
@@ -97,7 +97,7 @@ class Bcrypt implements PasswordInterface
}
}
$hash = crypt($password, $prefix . $this->cost . '$' . $salt64);
- if (strlen($hash) <= 13) {
+ if (strlen($hash) < 13) {
throw new Exception\RuntimeException('Error during the bcrypt generation');
}
return $hash;
@@ -108,11 +108,32 @@ class Bcrypt implements PasswordInterface
*
* @param string $password
* @param string $hash
+ * @throws Exception\RuntimeException when the hash is unable to be processed
* @return bool
*/
public function verify($password, $hash)
{
- return ($hash === crypt($password, $hash));
+ $result = crypt($password, $hash);
+ if ($result === $hash) {
+ return true;
+ }
+ if (strlen($result) <= 13) {
+ /* This should only happen if the algorithm that generated hash is
+ * either unsupported by this version of crypt(), or is invalid.
+ *
+ * An example of when this can happen, is if you generate
+ * non-backwards-compatible hashes on 5.3.7+, and then try to verify
+ * them on < 5.3.7.
+ *
+ * This is needed, because version comparisons are not possible due
+ * to back-ported functionality by some distributions.
+ */
+ throw new Exception\RuntimeException(
+ 'The supplied password hash could not be verified. Please check ' .
+ 'backwards compatibility settings.'
+ );
+ }
+ return false;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Mysql.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Mysql.php
index 85c3c0b334e0185a3690c954bc6ccac98995104c..3b16f260e46523c2faf03d364ddfa6f565cb9b5f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Mysql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Mysql.php
@@ -33,7 +33,7 @@ class Mysql implements PlatformInterface
*/
public function setDriver($driver)
{
- // handle Zend_Db drivers
+ // handle Zend\Db drivers
if ($driver instanceof Mysqli\Mysqli
|| ($driver instanceof Pdo\Pdo && $driver->getDatabasePlatformName() == 'Mysql')
|| ($driver instanceof \mysqli)
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/BigInteger.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/BigInteger.php
new file mode 100644
index 0000000000000000000000000000000000000000..53ae6ee1265f7133b6e97d5d7fc524bb57af4a1f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/BigInteger.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+class BigInteger extends Integer
+{
+ /**
+ * @var string
+ */
+ protected $type = 'BIGINT';
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Text.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Text.php
new file mode 100644
index 0000000000000000000000000000000000000000..ee07aafb3013050d9bfcf3cd8a79809d3af49f27
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Text.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Ddl\Column;
+
+use Zend\Db\Sql\Ddl\Column\Column;
+
+class Text extends Column
+{
+ /**
+ * @var string
+ */
+ protected $specification = '%s TEXT %s %s';
+
+ /**
+ * @param null|string $name
+ */
+ public function __construct($name)
+ {
+ $this->name = $name;
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpressionData()
+ {
+ $spec = $this->specification;
+ $params = array();
+
+ $types = array(self::TYPE_IDENTIFIER, self::TYPE_LITERAL);
+ $params[] = $this->name;
+
+ $types[] = self::TYPE_LITERAL;
+ $params[] = (!$this->isNullable) ? 'NOT NULL' : '';
+
+ $types[] = ($this->default !== null) ? self::TYPE_VALUE : self::TYPE_LITERAL;
+ $params[] = ($this->default !== null) ? $this->default : '';
+
+ return array(array(
+ $spec,
+ $params,
+ $types,
+ ));
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
index 5046f74876d8f78ac19d7ef8a61af4450a3d5e91..73e8d25e4bb4ee9a9cd00f9eb11afc2e12cc2318 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
@@ -65,7 +65,7 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
}
if ($driver) {
$sql = $driver->formatParameterName('limit');
- $parameterContainer->offsetSet('limit', $this->limit, ParameterContainer::TYPE_INTEGER);
+ $parameterContainer->offsetSet('limit', (int) $this->limit, ParameterContainer::TYPE_INTEGER);
} else {
$sql = $this->limit;
}
@@ -79,7 +79,7 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
return null;
}
if ($driver) {
- $parameterContainer->offsetSet('offset', $this->offset, ParameterContainer::TYPE_INTEGER);
+ $parameterContainer->offsetSet('offset', (int) $this->offset, ParameterContainer::TYPE_INTEGER);
return array($driver->formatParameterName('offset'));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
index a7c8695ad338e09cdd522aa64ad0048fce5ab94c..dea84756c0996851a2caa1c0301b766643abc0f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
@@ -47,12 +47,17 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
const SQL_STAR = '*';
const ORDER_ASCENDING = 'ASC';
const ORDER_DESCENDING = 'DESC';
+ const COMBINE = 'combine';
+ const COMBINE_UNION = 'union';
+ const COMBINE_EXCEPT = 'except';
+ const COMBINE_INTERSECT = 'intersect';
/**#@-*/
/**
* @var array Specifications
*/
protected $specifications = array(
+ 'statementStart' => '%1$s',
self::SELECT => array(
'SELECT %1$s FROM %2$s' => array(
array(1 => '%1$s', 2 => '%1$s AS %2$s', 'combinedby' => ', '),
@@ -82,7 +87,9 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
)
),
self::LIMIT => 'LIMIT %1$s',
- self::OFFSET => 'OFFSET %1$s'
+ self::OFFSET => 'OFFSET %1$s',
+ 'statementEnd' => '%1$s',
+ self::COMBINE => '%1$s ( %2$s )',
);
/**
@@ -145,6 +152,11 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
*/
protected $offset = null;
+ /**
+ * @var array
+ */
+ protected $combine = array();
+
/**
* Constructor
*
@@ -396,6 +408,14 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
*/
public function limit($limit)
{
+ if (!is_numeric($limit)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects parameter to be numeric, "%s" given',
+ __METHOD__,
+ (is_object($limit) ? get_class($limit) : gettype($limit))
+ ));
+ }
+
$this->limit = $limit;
return $this;
}
@@ -406,10 +426,38 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
*/
public function offset($offset)
{
+ if (!is_numeric($offset)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects parameter to be numeric, "%s" given',
+ __METHOD__,
+ (is_object($offset) ? get_class($offset) : gettype($offset))
+ ));
+ }
+
$this->offset = $offset;
return $this;
}
+ /**
+ * @param Select $select
+ * @param string $type
+ * @param string $modifier
+ * @return Select
+ * @throws Exception\InvalidArgumentException
+ */
+ public function combine(Select $select, $type = self::COMBINE_UNION, $modifier = '')
+ {
+ if ($this->combine !== array()) {
+ throw new Exception\InvalidArgumentException('This Select object is already combined and cannot be combined with multiple Selects objects');
+ }
+ $this->combine = array(
+ 'select' => $select,
+ 'type' => $type,
+ 'modifier' => $modifier
+ );
+ return $this;
+ }
+
/**
* @param string $part
* @return Select
@@ -453,6 +501,9 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
case self::ORDER:
$this->order = null;
break;
+ case self::COMBINE:
+ $this->combine = array();
+ break;
}
return $this;
}
@@ -478,7 +529,8 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
self::GROUP => $this->group,
self::HAVING => $this->having,
self::LIMIT => $this->limit,
- self::OFFSET => $this->offset
+ self::OFFSET => $this->offset,
+ self::COMBINE => $this->combine
);
return (isset($key) && array_key_exists($key, $rawState)) ? $rawState[$key] : $rawState;
}
@@ -569,6 +621,20 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
return $sql;
}
+ protected function processStatementStart(PlatformInterface $platform, DriverInterface $driver = null, ParameterContainer $parameterContainer = null)
+ {
+ if ($this->combine !== array()) {
+ return array('(');
+ }
+ }
+
+ protected function processStatementEnd(PlatformInterface $platform, DriverInterface $driver = null, ParameterContainer $parameterContainer = null)
+ {
+ if ($this->combine !== array()) {
+ return array(')');
+ }
+ }
+
/**
* Process the select part
*
@@ -845,11 +911,14 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
if ($this->limit === null) {
return null;
}
+
+ $limit = (int) $this->limit;
+
if ($driver) {
$sql = $driver->formatParameterName('limit');
- $parameterContainer->offsetSet('limit', $this->limit, ParameterContainer::TYPE_INTEGER);
+ $parameterContainer->offsetSet('limit', $limit, ParameterContainer::TYPE_INTEGER);
} else {
- $sql = $platform->quoteValue($this->limit);
+ $sql = $platform->quoteValue($limit);
}
return array($sql);
@@ -860,12 +929,37 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
if ($this->offset === null) {
return null;
}
+
+ $offset = (int) $this->offset;
+
if ($driver) {
- $parameterContainer->offsetSet('offset', $this->offset, ParameterContainer::TYPE_INTEGER);
+ $parameterContainer->offsetSet('offset', $offset, ParameterContainer::TYPE_INTEGER);
return array($driver->formatParameterName('offset'));
}
- return array($platform->quoteValue($this->offset));
+ return array($platform->quoteValue($offset));
+ }
+
+ protected function processCombine(PlatformInterface $platform, DriverInterface $driver = null, ParameterContainer $parameterContainer = null)
+ {
+ if ($this->combine == array()) {
+ return null;
+ }
+
+ $type = $this->combine['type'];
+ if ($this->combine['modifier']) {
+ $type .= ' ' . $this->combine['modifier'];
+ }
+ $type = strtoupper($type);
+
+ if ($driver) {
+ $sql = $this->processSubSelect($this->combine['select'], $platform, $driver, $parameterContainer);
+ return array($type, $sql);
+ }
+ return array(
+ $type,
+ $this->processSubSelect($this->combine['select'], $platform)
+ );
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature.php
index 0d8b31846a212f60fb2448a6f396894e5a707f5f..b0699be6e623799a8796574008c30fbbde9a0e69 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature.php
@@ -44,7 +44,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
? $eventManager
: new EventManager;
- $this->eventManager->setIdentifiers(array(
+ $this->eventManager->addIdentifiers(array(
'Zend\Db\TableGateway\TableGateway',
));
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MetadataFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
index f2e13052211c4e38c9c8051267b83acf7a2d9c86..3bd74f2073130f57fee983ade7da5ef2013e5b4e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
@@ -12,6 +12,7 @@ namespace Zend\Db\TableGateway\Feature;
use Zend\Db\Metadata\Metadata;
use Zend\Db\Metadata\MetadataInterface;
use Zend\Db\TableGateway\Exception;
+use Zend\Db\Metadata\Object\TableObject;
class MetadataFeature extends AbstractFeature
{
@@ -54,7 +55,11 @@ class MetadataFeature extends AbstractFeature
// set locally
$this->sharedData['metadata']['columns'] = $columns;
- // process primary key
+ // process primary key only if table is a table; there are no PK constraints on views
+ if (!($m->getTable($t->table) instanceof TableObject)) {
+ return;
+ }
+
$pkc = null;
foreach ($m->getConstraints($t->table) as $constraint) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/BadMethodCallException.php
index b613b249b6bbbbbbb350452007b39d3e33e519fc..efa6f2c243e91ce7a23c300edc87ab31c14fe975 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/BadMethodCallException.php
@@ -10,7 +10,7 @@
namespace Zend\Dom\Exception;
/**
- * Zend_Dom Exceptions
+ * Zend\Dom Exceptions
*/
class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/ExceptionInterface.php
index ef6b89e61b5d5384292a04e1a506e84b19b9a10a..ff866f023b906cfc5ed0a254769f7f72f582de7a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/ExceptionInterface.php
@@ -10,7 +10,7 @@
namespace Zend\Dom\Exception;
/**
- * Zend_Dom Exceptions
+ * Zend\Dom Exceptions
*/
interface ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/RuntimeException.php
index 8675e586bb80b1b24a451bbb3dc89aba0e2a3c88..229e8e69cb1f0316349099691be4ebedbbd79805 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/RuntimeException.php
@@ -10,7 +10,7 @@
namespace Zend\Dom\Exception;
/**
- * Zend_Dom Exceptions
+ * Zend\Dom Exceptions
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php b/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php
index e251413630717e7616dc79ae9c431a61f486a4fb..51a54abd692a2cfa8644f24e4056913758dbb551 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php
@@ -57,7 +57,7 @@ class NodeList implements Iterator, Countable, ArrayAccess
* @param DOMDocument $document
* @param DOMNodeList $nodeList
*/
- public function __construct($cssQuery, $xpathQuery, DOMDocument $document, DOMNodeList $nodeList)
+ public function __construct($cssQuery, $xpathQuery, DOMDocument $document, DOMNodeList $nodeList)
{
$this->cssQuery = $cssQuery;
$this->xpathQuery = $xpathQuery;
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManager.php b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManager.php
index 4cc17208fafb3009a6c0719f95c304580b4ab839..2d1c29a0a5ed78b687e34ba2d1437776c3b76d27 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManager.php
@@ -65,7 +65,7 @@ class SharedEventManager implements
$listeners = array();
foreach ($ids as $id) {
if (!array_key_exists($id, $this->identifiers)) {
- $this->identifiers[$id] = new EventManager();
+ $this->identifiers[$id] = new EventManager($id);
}
$listeners[] = $this->identifiers[$id]->attach($event, $callback, $priority);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/AbstractCallback.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
index cc408e56a6a088e6bfa2cff8b5ff2ae94ca45a95..b3ab1907465ad78faca673ca322bbb1bcb211182 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
@@ -84,7 +84,7 @@ abstract class AbstractCallback implements CallbackInterface
/**
* Send the response, including all headers.
- * If you wish to handle this via Zend_Http, use the getter methods
+ * If you wish to handle this via Zend\Http, use the getter methods
* to retrieve any data needed to be set on your HTTP Response object, or
* simply give this object the HTTP Response instance to work with for you!
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/CallbackInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
index 4131eeff74719f4835c9809822fd1c8926723b1a..050c2746088198b0136a2ebeeb2e750929500651 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
@@ -23,7 +23,7 @@ interface CallbackInterface
/**
* Send the response, including all headers.
- * If you wish to handle this via Zend_Controller, use the getter methods
+ * If you wish to handle this via Zend\Mvc\Controller, use the getter methods
* to retrieve any data needed to be set on your HTTP Response object, or
* simply give this object the HTTP Response instance to work with for you!
*
@@ -33,8 +33,8 @@ interface CallbackInterface
/**
* An instance of a class handling Http Responses. This is implemented in
- * Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with
- * (i.e. not inherited from) Zend_Controller_Response_Http.
+ * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
+ * (i.e. not inherited from) Zend\Feed\Pubsubhubbub\AbstractCallback.
*
* @param HttpResponse|\Zend\Http\PhpEnvironment\Response $httpResponse
*/
@@ -42,8 +42,8 @@ interface CallbackInterface
/**
* An instance of a class handling Http Responses. This is implemented in
- * Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with
- * (i.e. not inherited from) Zend_Controller_Response_Http.
+ * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
+ * (i.e. not inherited from) Zend\Feed\Pubsubhubbub\AbstractCallback.
*
* @return HttpResponse|\Zend\Http\PhpEnvironment\Response
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
index 67dca9572fe996824847a021caf2bd2c7cbdc025..1d941426769ab18acfa2a0ae468ecb49792c3d3e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
@@ -43,7 +43,7 @@ class PubSubHubbub
/**
* Simple utility function which imports any feed URL and
* determines the existence of Hub Server endpoints. This works
- * best if directly given an instance of Zend_Feed_Reader_Atom|Rss
+ * best if directly given an instance of Zend\Feed\Reader\Atom|Rss
* to leverage off.
*
* @param \Zend\Feed\Reader\Feed\AbstractFeed|string $source
@@ -65,7 +65,7 @@ class PubSubHubbub
}
/**
- * Allows the external environment to make Zend_Oauth use a specific
+ * Allows the external environment to make ZendOAuth use a specific
* Client instance.
*
* @param Http\Client $httpClient
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php
index fb2bd8f79d4b49bd8a467b53460b615fce001e85..0156b638314bb01cd2a304924de7dcd338147b18 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php
@@ -34,7 +34,7 @@ class Publisher
/**
* An array of any errors including keys for 'response', 'hubUrl'.
- * The response is the actual Zend_Http_Response object.
+ * The response is the actual Zend\Http\Response object.
*
* @var array
*/
@@ -49,7 +49,7 @@ class Publisher
protected $parameters = array();
/**
- * Constructor; accepts an array or Zend_Config instance to preset
+ * Constructor; accepts an array or Zend\Config\Config instance to preset
* options for the Publisher without calling all supported setter
* methods in turn.
*
@@ -241,7 +241,7 @@ class Publisher
* If a Hub notification fails, certain data will be retained in an
* an array retrieved using getErrors(), if a failure occurs for any Hubs
* the isSuccess() check will return FALSE. This method is designed not
- * to needlessly fail with an Exception/Error unless from Zend_Http_Client.
+ * to needlessly fail with an Exception/Error unless from Zend\Http\Client.
*
* @return void
* @throws Exception\RuntimeException
@@ -353,7 +353,7 @@ class Publisher
/**
* Return an array of errors met from any failures, including keys:
- * 'response' => the Zend_Http_Response object from the failure
+ * 'response' => the Zend\Http\Response object from the failure
* 'hubUrl' => the URL of the Hub Server whose notification failed
*
* @return array
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractEntry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractEntry.php
index 4212cf2eb3135902ff4a46c4a5a77cb53a66e617..797562eaa03a0f41e8a3fe6428f0787eea84a354 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractEntry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractEntry.php
@@ -203,7 +203,7 @@ abstract class AbstractEntry
}
/**
- * Load extensions from Zend_Feed_Reader
+ * Load extensions from Zend\Feed\Reader\Reader
*
* @return void
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/AbstractEntry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/AbstractEntry.php
index f6cc948df36f41861e8b6d886a9c20aa61118d41..68ff4f9485925cbfa1e0e1dd77e6dca4a36ac8ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/AbstractEntry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/AbstractEntry.php
@@ -207,7 +207,7 @@ abstract class AbstractEntry
}
/**
- * Load extensions from Zend_Feed_Reader
+ * Load extensions from Zend\Feed\Reader\Reader
*
* @return void
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php
index 465ee9c15e06cc61e84b95a6b72aa5d775331fdc..389a987d2fec556d701c8a21fb4b78ea47d4f01b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php
@@ -827,7 +827,7 @@ class AbstractFeed
}
/**
- * Load extensions from Zend_Feed_Writer
+ * Load extensions from Zend\Feed\Writer\Writer
*
* @throws Exception\RuntimeException
* @return void
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php
index 219dd43889bd0f554371808966ef9351b146e468..88a6fea320e28a16cb6418657e04060e676a9eff 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php
@@ -709,7 +709,7 @@ class Entry
}
/**
- * Creates a new Zend_Feed_Writer_Source data container for use. This is NOT
+ * Creates a new Zend\Feed\Writer\Source data container for use. This is NOT
* added to the current feed automatically, but is necessary to create a
* container with some initial values preset based on the current feed data.
*
@@ -726,7 +726,7 @@ class Entry
}
/**
- * Appends a Zend_Feed_Writer_Entry object representing a new entry/item
+ * Appends a Zend\Feed\Writer\Entry object representing a new entry/item
* the feed data container's internal group of entries.
*
* @param Source $source
@@ -750,7 +750,7 @@ class Entry
}
/**
- * Load extensions from Zend_Feed_Writer
+ * Load extensions from Zend\Feed\Writer\Writer
*
* @return void
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
index c630fdf2fa7ce0665df35e99a2cd1bd68f142a6e..f981f49a01365f8ff41c047238489027f2c28dea 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
@@ -209,7 +209,7 @@ class AbstractRenderer
}
/**
- * Load extensions from Zend_Feed_Writer
+ * Load extensions from Zend\Feed\Writer\Writer
*
* @return void
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php
index 7e9ad1397d4487bae8e4bb2721e14b4aecd67e41..d63f484688ac09be9462c3e92f722b046b8d21d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php
@@ -192,7 +192,7 @@ class Compress extends AbstractFilter
}
/**
- * Defined by Zend_Filter_Filter
+ * Defined by Zend\Filter\FilterInterface
*
* Compresses the content $value with the defined settings
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php b/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
index 690ae2f3584c5355aaf9584c1a92a5311305696e..08fcc2025a0d16b13266dda84f0c3cde45bc8375 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
@@ -74,11 +74,11 @@ class DateTimeFormatter extends AbstractFilter
if ($value === '' || $value === null) {
return $value;
} elseif (is_int($value)) {
- $dateTime = new DateTime('@' . $value);
+ $value = new DateTime('@' . $value);
} elseif (!$value instanceof DateTime) {
- $dateTime = new DateTime($value);
+ $value = new DateTime($value);
}
- return $dateTime->format($this->format);
+ return $value->format($this->format);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
index 87f5639512664a6629434828bae2514249d5c42f..83c437e9e0e455702d16d1b9eea9831854ff0103 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
@@ -24,8 +24,8 @@ class Rename extends Filter\AbstractFilter
/**
* Class constructor
*
- * Options argument may be either a string, a Zend_Config object, or an array.
- * If an array or Zend_Config object, it accepts the following keys:
+ * Options argument may be either a string, a Zend\Config\Config object, or an array.
+ * If an array or Zend\Config\Config object, it accepts the following keys:
* 'source' => Source filename or directory which will be renamed
* 'target' => Target filename or directory, the new name of the source file
* 'overwrite' => Shall existing files be overwritten ?
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/FilterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Filter/FilterPluginManager.php
index 90712fbccddee678018232fcd403db319521ed1b..0f07483f8facd96b46dd06602a5490b5b4cb4ed7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/FilterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/FilterPluginManager.php
@@ -39,6 +39,7 @@ class FilterPluginManager extends AbstractPluginManager
'compresssnappy' => 'Zend\Filter\Compress\Snappy',
'compresstar' => 'Zend\Filter\Compress\Tar',
'compresszip' => 'Zend\Filter\Compress\Zip',
+ 'datetimeformatter' => 'Zend\Filter\DateTimeFormatter',
'decompress' => 'Zend\Filter\Decompress',
'decrypt' => 'Zend\Filter\Decrypt',
'digits' => 'Zend\Filter\Digits',
@@ -55,8 +56,6 @@ class FilterPluginManager extends AbstractPluginManager
'htmlentities' => 'Zend\Filter\HtmlEntities',
'inflector' => 'Zend\Filter\Inflector',
'int' => 'Zend\Filter\Int',
- 'localizedtonormalized' => 'Zend\Filter\LocalizedToNormalized',
- 'normalizedtolocalized' => 'Zend\Filter\NormalizedToLocalized',
'null' => 'Zend\Filter\Null',
'numberformat' => 'Zend\I18n\Filter\NumberFormat',
'pregreplace' => 'Zend\Filter\PregReplace',
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StaticFilter.php b/vendor/zendframework/zendframework/library/Zend/Filter/StaticFilter.php
index 55696391922b4a26991d149ea30dedb520d76ec0..ee319d61eda0a1356bb02eed95f1e12c6b7a4738 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StaticFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StaticFilter.php
@@ -50,7 +50,7 @@ class StaticFilter
*
* The first argument of this method is a data input value, that you would have filtered.
* The second argument is a string, which corresponds to the basename of the filter class,
- * relative to the Zend_Filter namespace. This method automatically loads the class,
+ * relative to the Zend\Filter namespace. This method automatically loads the class,
* creates an instance, and applies the filter() method to the data input. You can also pass
* an array of constructor arguments, if they are needed for the filter class.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php
index 10f075f56241700a14749308be33676003c4d772..1fa99e9d8c0a9395d312c7912e5ef34df19ac341 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php
@@ -195,7 +195,7 @@ class Checkbox extends Element implements InputProviderInterface
*/
public function isChecked()
{
- return (bool) $this->value;
+ return $this->value === $this->getCheckedValue();
}
/**
@@ -206,7 +206,7 @@ class Checkbox extends Element implements InputProviderInterface
*/
public function setChecked($value)
{
- $this->value = (bool) $value;
+ $this->value = $value ? $this->getCheckedValue() : $this->getUncheckedValue();
return $this;
}
@@ -218,11 +218,9 @@ class Checkbox extends Element implements InputProviderInterface
*/
public function setValue($value)
{
- if (is_bool($value)) {
- $this->value = $value;
- } else {
- $this->value = $value === $this->getCheckedValue();
- }
+ // Cast to strings because POST data comes in string form
+ $checked = (string) $value === (string) $this->getCheckedValue();
+ $this->value = $checked ? $this->getCheckedValue() : $this->getUncheckedValue();
return $this;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php
index 5605ea784fb3f4a7f214af0044d27bee75783f88..ccee6878335e40a8507e3f6376044683c0b8c95b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php
@@ -33,9 +33,9 @@ class DateSelect extends MonthSelect
*/
public function __construct($name = null, $options = array())
{
- parent::__construct($name, $options);
-
$this->dayElement = new Select('day');
+
+ parent::__construct($name, $options);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php b/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
index 53ea961259ec1b01d638700ca7ccb0918d29e43d..1133c5115ffe8b24b6503b29d810cf7f66a080c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
@@ -206,14 +206,16 @@ class Fieldset extends Element implements FieldsetInterface
/**
* Retrieve a named element or fieldset
*
- * @todo Should this raise an exception if no entry is found?
* @param string $elementOrFieldset
* @return ElementInterface
*/
public function get($elementOrFieldset)
{
if (!$this->has($elementOrFieldset)) {
- return null;
+ throw new Exception\InvalidElementException(sprintf(
+ "No element by the name of [%s] found in form",
+ $elementOrFieldset
+ ));
}
return $this->byName[$elementOrFieldset];
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Form.php b/vendor/zendframework/zendframework/library/Zend/Form/Form.php
index 9417d0056896a01d3d485a5fe32081f14dd1f338..b79658ffdb7e051e228ae0451b8a637380bf68ce 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Form.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Form.php
@@ -177,7 +177,9 @@ class Form extends Fieldset implements FormInterface
$this->prepareElement($this);
} else {
foreach ($this->getIterator() as $elementOrFieldset) {
- if ($elementOrFieldset instanceof ElementPrepareAwareInterface) {
+ if ($elementOrFieldset instanceof FormInterface) {
+ $elementOrFieldset->prepare();
+ } elseif ($elementOrFieldset instanceof ElementPrepareAwareInterface) {
$elementOrFieldset->prepareElement($this);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
index 2f66e5afd8a8b854228cfb7f00d9443d94879e71..7b688c5a5b36bf4a664c0807149ca6f196cd5559 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
@@ -9,6 +9,7 @@
namespace Zend\Form\View\Helper;
+use Zend\Form\Element\Button;
use Zend\Form\ElementInterface;
use Zend\Form\Exception;
use Zend\Form\View\Helper\AbstractHelper;
@@ -80,6 +81,7 @@ class FormRow extends AbstractHelper
* @param null|ElementInterface $element
* @param null|string $labelPosition
* @param bool $renderErrors
+ * @param string|null $partial
* @return string|FormRow
*/
public function __invoke(ElementInterface $element = null, $labelPosition = null, $renderErrors = null, $partial = null)
@@ -187,6 +189,11 @@ class FormRow extends AbstractHelper
$label = '<span>' . $label . '</span>';
}
+ // Button element is a special case, because label is always rendered inside it
+ if ($element instanceof Button) {
+ $labelOpen = $labelClose = $label = '';
+ }
+
switch ($this->labelPosition) {
case self::LABEL_PREPEND:
$markup = $labelOpen . $label . $elementString . $labelClose;
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/AdapterInterface.php
index c870aa5cb7c675b507633581ca85caebb29f21fa..ae608048744ea9b2e17edcf1d0eb32d4e1d33f9f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/AdapterInterface.php
@@ -10,9 +10,9 @@
namespace Zend\Http\Client\Adapter;
/**
- * An interface description for Zend_Http_Client_Adapter classes.
+ * An interface description for Zend\Http\Client\Adapter classes.
*
- * These classes are used as connectors for Zend_Http_Client, performing the
+ * These classes are used as connectors for Zend\Http\Client, performing the
* tasks of connecting, writing, reading and closing connection to the server.
*/
interface AdapterInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php
index c5a11078df6781b9b1c822463b7ef927a8b98f7d..413f2c7b2f83aad29f8ca805a7cf69df7c291953 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php
@@ -15,11 +15,11 @@ use Zend\Http\Response;
use Zend\Stdlib\ErrorHandler;
/**
- * HTTP Proxy-supporting Zend_Http_Client adapter class, based on the default
+ * HTTP Proxy-supporting Zend\Http\Client adapter class, based on the default
* socket based adapter.
*
* Should be used if proxy HTTP access is required. If no proxy is set, will
- * fall back to Zend_Http_Client_Adapter_Socket behavior. Just like the
+ * fall back to Zend\Http\Client\Adapter\Socket behavior. Just like the
* default Socket adapter, this adapter does not require any special extensions
* installed.
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Socket.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Socket.php
index 68604e01ec5dfc9f1b87d01cb9d11da45d4adcc0..d6d09a6bfefb0470408b02fcc97220bd5bc34538 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Socket.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Socket.php
@@ -106,7 +106,7 @@ class Socket implements HttpAdapter, StreamInterface
}
if (!is_array($options)) {
throw new AdapterException\InvalidArgumentException(
- 'Array or Zend_Config object expected, got ' . gettype($options)
+ 'Array or Zend\Config object expected, got ' . gettype($options)
);
}
@@ -483,7 +483,7 @@ class Socket implements HttpAdapter, StreamInterface
}
// We automatically decode chunked-messages when writing to a stream
- // this means we have to disallow the Zend_Http_Response to do it again
+ // this means we have to disallow the Zend\Http\Response to do it again
if ($this->outStream) {
$response = str_ireplace("Transfer-Encoding: chunked\r\n", '', $response);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/StreamInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/StreamInterface.php
index aaf72d92fcb4b4ddca869f33f3f42a31a71dbe1d..ecfc83bcc331718460276453e114858ddc24c00f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/StreamInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/StreamInterface.php
@@ -10,9 +10,9 @@
namespace Zend\Http\Client\Adapter;
/**
- * An interface description for Zend_Http_Client_Adapter_Stream classes.
+ * An interface description for Zend\Http\Client\Adapter\Stream classes.
*
- * This interface describes Zend_Http_Client_Adapter which supports streaming.
+ * This interface describes Zend\Http\Client\Adapter which supports streaming.
*/
interface StreamInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php
index 7ccd62541c33f5f66fc45a04651dc8aaa5356299..1be5b43cae9186e089ee3e8bbdbdeb9f4a166580 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php
@@ -16,7 +16,7 @@ use Zend\Stdlib\ArrayUtils;
/**
* A testing-purposes adapter.
*
- * Should be used to test all components that rely on Zend_Http_Client,
+ * Should be used to test all components that rely on Zend\Http\Client,
* without actually performing an HTTP request. You should instantiate this
* object manually, and then set it as the client's adapter. Then, you can
* set the expected response using the setResponse() method.
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Cookies.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Cookies.php
index 1624e81794faed8df4110aec09adc4d3e5b73381..fafb3fa3a6ba9a73b8c2709be862c69554a55999 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Cookies.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Cookies.php
@@ -18,7 +18,7 @@ use Zend\Uri;
/**
* A Cookies object is designed to contain and maintain HTTP cookies, and should
- * be used along with Zend_Http_Client in order to manage cookies across HTTP requests and
+ * be used along with Zend\Http\Client in order to manage cookies across HTTP requests and
* responses.
*
* The class contains an array of Zend\Http\Header\Cookie objects. Cookies can be added
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Cookies.php b/vendor/zendframework/zendframework/library/Zend/Http/Cookies.php
index f3e9aa50c0a14e3f31375ac0cc0a8c62226a1664..ba38326a6e053e56db90556ca50af23b61ff75dc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Cookies.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Cookies.php
@@ -16,8 +16,8 @@ use Zend\Uri;
/**
- * A Zend_Http_CookieJar object is designed to contain and maintain HTTP cookies, and should
- * be used along with Zend_Http_Client in order to manage cookies across HTTP requests and
+ * A Zend\Http\Cookies object is designed to contain and maintain HTTP cookies, and should
+ * be used along with Zend\Http\Client in order to manage cookies across HTTP requests and
* responses.
*
* The class contains an array of Zend\Http\Header\Cookie objects. Cookies can be added
@@ -36,7 +36,7 @@ use Zend\Uri;
class Cookies extends Headers
{
/**
- * Return cookie(s) as a Zend_Http_Cookie object
+ * Return cookie(s) as a Zend\Http\Cookie object
*
*/
const COOKIE_OBJECT = 0;
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericHeader.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericHeader.php
index 848f84a81247a66eb38dc95d85637b7e5e0a6637..768660c7a7bc5451f51948f93f3667f76386362d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericHeader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericHeader.php
@@ -51,7 +51,7 @@ class GenericHeader implements HeaderInterface
$this->setFieldName($fieldName);
}
- if ($fieldValue) {
+ if ($fieldValue !== null) {
$this->setFieldValue($fieldValue);
}
}
@@ -103,7 +103,7 @@ class GenericHeader implements HeaderInterface
{
$fieldValue = (string) $fieldValue;
- if (empty($fieldValue) || preg_match('/^\s+$/', $fieldValue)) {
+ if (preg_match('/^\s+$/', $fieldValue)) {
$fieldValue = '';
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Request.php b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Request.php
index eefcaeea889f4de1ab743cf789e835569f895ee4..9b57fcad7c9da0ac5929ab630b2bf6143bae0c6c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Request.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Request.php
@@ -14,6 +14,7 @@ use Zend\Http\Request as HttpRequest;
use Zend\Stdlib\Parameters;
use Zend\Stdlib\ParametersInterface;
use Zend\Uri\Http as HttpUri;
+use Zend\Validator\Hostname as HostnameValidator;
/**
* HTTP Request for current PHP environment
@@ -257,7 +258,31 @@ class Request extends HttpRequest
// URI host & port
$host = null;
$port = null;
- if (isset($this->serverParams['SERVER_NAME'])) {
+
+ // Set the host
+ if ($this->getHeaders()->get('host')) {
+ $host = $this->getHeaders()->get('host')->getFieldValue();
+
+ // works for regname, IPv4 & IPv6
+ if (preg_match('|\:(\d+)$|', $host, $matches)) {
+ $host = substr($host, 0, -1 * (strlen($matches[1]) + 1));
+ $port = (int) $matches[1];
+ }
+
+ // set up a validator that check if the hostname is legal (not spoofed)
+ $hostnameValidator = new HostnameValidator(array(
+ 'allow' => HostnameValidator::ALLOW_ALL,
+ 'useIdnCheck' => false,
+ 'useTldCheck' => false,
+ ));
+ // If invalid. Reset the host & port
+ if (!$hostnameValidator->isValid($host)) {
+ $host = null;
+ $port = null;
+ }
+ }
+
+ if (!$host && isset($this->serverParams['SERVER_NAME'])) {
$host = $this->serverParams['SERVER_NAME'];
if (isset($this->serverParams['SERVER_PORT'])) {
$port = (int) $this->serverParams['SERVER_PORT'];
@@ -272,13 +297,6 @@ class Request extends HttpRequest
$port = null;
}
}
- } elseif ($this->getHeaders()->get('host')) {
- $host = $this->getHeaders()->get('host')->getFieldValue();
- // works for regname, IPv4 & IPv6
- if (preg_match('|\:(\d+)$|', $host, $matches)) {
- $host = substr($host, 0, -1 * (strlen($matches[1]) + 1));
- $port = (int) $matches[1];
- }
}
$uri->setHost($host);
$uri->setPort($port);
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/composer.json b/vendor/zendframework/zendframework/library/Zend/Http/composer.json
index cfb5416e026e690e72da8772d0cc6b00a12d22a0..423eb57007ad936918c42bc5d45a71c543e834f3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Http/composer.json
@@ -16,7 +16,8 @@
"php": ">=5.3.3",
"zendframework/zend-loader": "self.version",
"zendframework/zend-stdlib": "self.version",
- "zendframework/zend-uri": "self.version"
+ "zendframework/zend-uri": "self.version",
+ "zendframework/zend-validator": "self.version"
},
"extra": {
"branch-alias": {
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php
index 8aa8a933c82fce791f0539eed485601f7d75d183..f947fef69c30968ce541dbacc18185f9960bff96 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php
@@ -145,7 +145,7 @@ class CollectionInputFilter extends InputFilter
*/
public function setData($data)
{
- $this->collectionData = array_values($data);
+ $this->collectionData = $data;
}
/**
@@ -162,13 +162,16 @@ class CollectionInputFilter extends InputFilter
return $valid;
}
- $inputCollection = array_fill(0, $this->getCount(), $this->validationGroup ?: array_keys($this->inputs));
+ if (count($this->collectionData) < $this->getCount()) {
+ $valid = false;
+ }
- foreach ($inputCollection as $key => $inputs) {
- $this->data = array();
- if (isset($this->collectionData[$key])) {
- $this->data = $this->collectionData[$key];
+ $inputs = $this->validationGroup ?: array_keys($this->inputs);
+ foreach ($this->collectionData as $key => $data) {
+ if (!is_array($data)) {
+ $data = array();
}
+ $this->data = $data;
$this->populate();
if ($this->validateInputs($inputs)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
index e4cf2bf0bd880bdd97e73728fd5848f3969b8916..ca7688f5f682b4b4be573e5e269ecb3b89631b6c 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
@@ -278,6 +278,7 @@ class Input implements InputInterface, EmptyContextInterface
{
$this->setAllowEmpty($input->allowEmpty());
$this->setBreakOnFailure($input->breakOnFailure());
+ $this->setContinueIfEmpty($input->continueIfEmpty());
$this->setErrorMessage($input->getErrorMessage());
$this->setName($input->getName());
$this->setRequired($input->isRequired());
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php
index fb22b3d80b6951095f1d58bbd8b91120356bd6eb..85f9b17fbde5fed306a563192e28e962a6ce1683 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php
@@ -11,6 +11,7 @@ namespace Zend\Log\Formatter;
use DateTime;
use Traversable;
+use Zend\Stdlib\ErrorHandler;
class Base implements FormatterInterface
{
@@ -75,16 +76,21 @@ class Base implements FormatterInterface
return $value;
}
+ // better readable JSON
+ static $jsonFlags;
+ if ($jsonFlags === null) {
+ $jsonFlags = 0;
+ $jsonFlags |= defined('JSON_UNESCAPED_SLASHES') ? JSON_UNESCAPED_SLASHES : 0;
+ $jsonFlags |= defined('JSON_UNESCAPED_UNICODE') ? JSON_UNESCAPED_UNICODE : 0;
+ }
+
+ ErrorHandler::start();
if ($value instanceof DateTime) {
$value = $value->format($this->getDateTimeFormat());
- } elseif (is_array($value) || $value instanceof Traversable) {
- if ($value instanceof Traversable) {
- $value = iterator_to_array($value);
- }
- foreach ($value as $key => $subvalue) {
- $value[$key] = $this->normalize($subvalue);
- }
- $value = json_encode($value);
+ } elseif ($value instanceof Traversable) {
+ $value = json_encode(iterator_to_array($value), $jsonFlags);
+ } elseif (is_array($value)) {
+ $value = json_encode($value, $jsonFlags);
} elseif (is_object($value) && !method_exists($value, '__toString')) {
$value = sprintf('object(%s) %s', get_class($value), json_encode($value));
} elseif (is_resource($value)) {
@@ -92,6 +98,7 @@ class Base implements FormatterInterface
} elseif (!is_object($value)) {
$value = gettype($value);
}
+ ErrorHandler::stop();
return (string) $value;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Logger.php b/vendor/zendframework/zendframework/library/Zend/Log/Logger.php
index 82ddc8bf41a8775faad6442f178aa73f15356eac..0eaff585d8340e2cb01248084174e2f0be9a4435 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Logger.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Logger.php
@@ -147,11 +147,11 @@ class Logger implements LoggerInterface
}
if (isset($options['exceptionhandler']) && $options['exceptionhandler'] === true) {
- self::registerExceptionHandler($this);
+ static::registerExceptionHandler($this);
}
if (isset($options['errorhandler']) && $options['errorhandler'] === true) {
- self::registerErrorHandler($this);
+ static::registerErrorHandler($this);
}
}
@@ -517,16 +517,16 @@ class Logger implements LoggerInterface
return false;
}
- $errorHandlerMap = static::$errorPriorityMap;
+ $errorPriorityMap = static::$errorPriorityMap;
- $previous = set_error_handler(function ($level, $message, $file, $line, $context)
- use ($logger, $errorHandlerMap, $continueNativeHandler)
+ $previous = set_error_handler(function ($level, $message, $file, $line)
+ use ($logger, $errorPriorityMap, $continueNativeHandler)
{
$iniLevel = error_reporting();
if ($iniLevel & $level) {
- if (isset(Logger::$errorPriorityMap[$level])) {
- $priority = $errorHandlerMap[$level];
+ if (isset($errorPriorityMap[$level])) {
+ $priority = $errorPriorityMap[$level];
} else {
$priority = Logger::INFO;
}
@@ -534,7 +534,6 @@ class Logger implements LoggerInterface
'errno' => $level,
'file' => $file,
'line' => $line,
- 'context' => $context,
));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php
index 51f50c3c90926441591b94c590e23b3ab86c3026..b0e7f896a74a330d99b3f7aeb502c11204e99e27 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php
@@ -20,7 +20,7 @@ use Zend\Log\Logger;
class Syslog extends AbstractWriter
{
/**
- * Maps Zend_Log priorities to PHP's syslog priorities
+ * Maps Zend\Log priorities to PHP's syslog priorities
*
* @var array
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/BadMethodCallException.php
index 3c379c8c361ba39251ac1609f14b70343d3bc91a..2734fa851c09fd6664469c712a8c7bd5f0b627c7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/BadMethodCallException.php
@@ -10,7 +10,7 @@
namespace Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/DomainException.php
index c723d86f0427d61e967790c09676aa973c0330da..8de22d7810b19fa70d67a5c51e5aa89c38560ef6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/DomainException.php
@@ -12,7 +12,7 @@ namespace Zend\Mail\Exception;
use Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class DomainException extends \DomainException implements ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/InvalidArgumentException.php
index 6b29a92f0ce1f7339cb5d9fa4139161c72ef124e..5c5790053e5adedbbced4b1440d85136fc5fe7a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/InvalidArgumentException.php
@@ -10,7 +10,7 @@
namespace Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/OutOfBoundsException.php
index 86afef2915b204534653845250917402b5980258..71754b1fff1e00fff0db9c6ffba2083d71a937cc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/OutOfBoundsException.php
@@ -10,7 +10,7 @@
namespace Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/RuntimeException.php
index d81200930f20ef1e5ff177433b9b0c2ef9e7e6c7..c82b09c26f0f6ddf8bb1f8af61a3a55358344e7e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/RuntimeException.php
@@ -10,7 +10,7 @@
namespace Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php
index 478d639662f7cd738885cef472537322d987ec98..25e2b0656d0573db79f74adb7eb4f65712565c89 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php
@@ -316,7 +316,7 @@ abstract class AbstractProtocol
* Parse server response for successful codes
*
* Read the response from the stream and check for expected return code.
- * Throws a Zend_Mail_Protocol_Exception if an unexpected code is returned.
+ * Throws a Zend\Mail\Protocol\Exception\ExceptionInterface if an unexpected code is returned.
*
* @param string|array $code One or more codes that indicate a successful response
* @param int $timeout Per-request timeout value if applicable
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
index 8503248671b25a193c91ee3f79971703bcbf28ae..2f5ca3beac53b5c11668d8c8b11890a221d34d93 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
@@ -12,7 +12,7 @@ namespace Zend\Mail\Protocol\Exception;
use Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/RuntimeException.php
index c47d3d3280015c02fdbc6a8222bb90117345fdb2..6d9207c04332aa97681d5784bb0bec1de589fd27 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/RuntimeException.php
@@ -12,7 +12,7 @@ namespace Zend\Mail\Protocol\Exception;
use Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
index 28c8cd6844f2d9397c2f54f4a269f2b982b75ae4..941ead5969f33594d6248cbc4b9ef4ce2800e1d6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
@@ -317,7 +317,7 @@ class Smtp extends AbstractProtocol
/**
* Issues the NOOP command end validates answer
*
- * Not used by Zend_Mail, could be used to keep a connection alive or check if it is still open.
+ * Not used by Zend\Mail, could be used to keep a connection alive or check if it is still open.
*
*/
public function noop()
@@ -330,7 +330,7 @@ class Smtp extends AbstractProtocol
/**
* Issues the VRFY command end validates answer
*
- * Not used by Zend_Mail.
+ * Not used by Zend\Mail.
*
* @param string $user User Name or eMail to verify
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
index 0426b61f4b64246cc1db89c3749d4bbd384355ec..afee6a402933439a65e5a9cff316576c60d83cc1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
@@ -12,7 +12,7 @@ namespace Zend\Mail\Storage\Exception;
use Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
index f280090a5064059a8b85b5e9107dbae85ec1d0e7..59889d2741fa56be70c253f98d776cd67fc8dafc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
@@ -12,7 +12,7 @@ namespace Zend\Mail\Storage\Exception;
use Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class OutOfBoundsException extends Exception\OutOfBoundsException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/RuntimeException.php
index c60a5e3842c78236e390080de4398758b8c05129..d641e90760e01a6891cffa29d9d34ab66c32271d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/RuntimeException.php
@@ -12,7 +12,7 @@ namespace Zend\Mail\Storage\Exception;
use Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/File.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/File.php
index f1eaf27629a9073fd76864e29bf1a60cc468eb7d..8ae8ed69627a1e73ba217b081656aab116fe967c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/File.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/File.php
@@ -22,8 +22,8 @@ class File extends Part\File implements MessageInterface
/**
* Public constructor
*
- * In addition to the parameters of Zend_Mail_Part::__construct() this constructor supports:
- * - flags array with flags for message, keys are ignored, use constants defined in Zend_Mail_Storage
+ * In addition to the parameters of Zend\Mail\Storage\Part::__construct() this constructor supports:
+ * - flags array with flags for message, keys are ignored, use constants defined in Zend\Mail\Storage
*
* @param array $params
* @throws \Zend\Mail\Storage\Exception\ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
index ed38c79d84e18c461ce2318a44ef86dc78242611..6e53aa00939fb08b8ba30869f46c73ebb1418577 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
@@ -12,7 +12,7 @@ namespace Zend\Mail\Storage\Part\Exception;
use Zend\Mail\Storage\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
index b067ba001e4f582d608ce95da0e2fa2d4781ed8e..7f8385bd9bffb0847d07290499e8b94927707a59 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
@@ -12,7 +12,7 @@ namespace Zend\Mail\Storage\Part\Exception;
use Zend\Mail\Storage\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
index f86e8569a9da5b337ca0c31ed52a8a6a5e5bcc84..4384df4b82b039b422cddc5868b5ffbb16af1ae4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
@@ -12,7 +12,7 @@ namespace Zend\Mail\Transport\Exception;
use Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/RuntimeException.php
index c86a94d68ebb0e8ecf5fffb0b1f6ddb137a577ac..3a184da2f551b2db0ba3430d46619f807bb6dcc0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/RuntimeException.php
@@ -12,7 +12,7 @@ namespace Zend\Mail\Transport\Exception;
use Zend\Mail\Exception;
/**
- * Exception for Zend_Mail component.
+ * Exception for Zend\Mail component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/InvalidArgumentException.php
index 92361ae4c8cfe22daa17050b6a9268451fb9812e..7a38188f9ea4f15a27ad338bfd205f22e7737ba2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/InvalidArgumentException.php
@@ -10,7 +10,7 @@
namespace Zend\Memory\Exception;
/**
- * Exception for Zend_Memory component.
+ * Exception for Zend\Memory component.
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/RuntimeException.php
index 732e4692b4a7a386678c2f6256da4e11078a076a..cf3695453d8933eeedebd038afc234ebb97d0df4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/RuntimeException.php
@@ -10,7 +10,7 @@
namespace Zend\Memory\Exception;
/**
- * Exception for Zend_Memory component.
+ * Exception for Zend\Memory component.
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php b/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php
index 8bea6cf314c04d49e759a2293e6c1c936b8d9e58..c2c8dea7f3011eb16684ea4961c33aa186d557f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php
@@ -54,7 +54,7 @@ class MemoryManager
private $memorySize = 0;
/**
- * Id for next Zend_Memory object
+ * Id for next Zend\Memory object
*
* @var int
*/
@@ -214,7 +214,7 @@ class MemoryManager
}
/**
- * Create new Zend_Memory value container
+ * Create new Zend\Memory value container
*
* @param string $value
* @return Container\ContainerInterface
@@ -226,7 +226,7 @@ class MemoryManager
}
/**
- * Create new Zend_Memory value container, which has value always
+ * Create new Zend\Memory value container, which has value always
* locked in memory
*
* @param string $value
@@ -239,7 +239,7 @@ class MemoryManager
}
/**
- * Create new Zend_Memory object
+ * Create new Zend\Memory object
*
* @param string $value
* @param bool $locked
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php b/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php
index 1505b6a766a057392bff59ad27c0b7f4d9ed0ea8..37a90cea3dfe5dfec06524db363d80357160cf36 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php
@@ -65,7 +65,7 @@ class Decode
*
* @param string $message raw message content
* @param string $boundary boundary as found in content-type
- * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+ * @param string $EOL EOL string; defaults to {@link Zend\Mime\Mime::LINEEND}
* @return array|null parts as array('header' => array(name => value), 'body' => content), null if no parts found
* @throws Exception\RuntimeException
*/
@@ -95,7 +95,7 @@ class Decode
* @param string|Headers $message raw message with header and optional content
* @param Headers $headers output param, headers container
* @param string $body output param, content of message
- * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+ * @param string $EOL EOL string; defaults to {@link Zend\Mime\Mime::LINEEND}
* @param bool $strict enable strict mode for parsing message
* @return null
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mime/Exception/RuntimeException.php
index 72ff87e265d99cbcebd0023b994ac89b8087f6ab..cdbe5fcae1dbf75c1b7e5f4239cf6d15fdbf2f26 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Exception/RuntimeException.php
@@ -10,7 +10,7 @@
namespace Zend\Mime\Exception;
/**
- * Exception for Zend_Mime component.
+ * Exception for Zend\Mime component.
*/
class RuntimeException
extends \RuntimeException
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Message.php b/vendor/zendframework/zendframework/library/Zend/Mime/Message.php
index a3107a3249fc5bc6695749e5ac9f076684a6b1cd..e8021534c1d3c0b2ca1238b6127cbff1da73f664 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Message.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Message.php
@@ -16,7 +16,7 @@ class Message
protected $mime = null;
/**
- * Returns the list of all Zend_Mime_Parts in the message
+ * Returns the list of all Zend\Mime\Part in the message
*
* @return array of \Zend\Mime\Part
*/
@@ -26,7 +26,7 @@ class Message
}
/**
- * Sets the given array of Zend_Mime_Parts as the array for the message
+ * Sets the given array of Zend\Mime\Part as the array for the message
*
* @param array $parts
*/
@@ -36,7 +36,7 @@ class Message
}
/**
- * Append a new Zend_Mime_Part to the current message
+ * Append a new Zend\Mime\Part to the current message
*
* @param \Zend\Mime\Part $part
*/
@@ -60,10 +60,10 @@ class Message
}
/**
- * Set Zend_Mime object for the message
+ * Set Zend\Mime\Mime object for the message
*
* This can be used to set the boundary specifically or to use a subclass of
- * Zend_Mime for generating the boundary.
+ * Zend\Mime for generating the boundary.
*
* @param \Zend\Mime\Mime $mime
*/
@@ -73,7 +73,7 @@ class Message
}
/**
- * Returns the Zend_Mime object in use by the message
+ * Returns the Zend\Mime\Mime object in use by the message
*
* If the object was not present, it is created and returned. Can be used to
* determine the boundary used in this message.
@@ -96,12 +96,12 @@ class Message
* only one part is present, the content of this part is returned. If no
* part had been added, an empty string is returned.
*
- * Parts are separated by the mime boundary as defined in Zend_Mime. If
- * {@link setMime()} has been called before this method, the Zend_Mime
- * object set by this call will be used. Otherwise, a new Zend_Mime object
+ * Parts are separated by the mime boundary as defined in Zend\Mime\Mime. If
+ * {@link setMime()} has been called before this method, the Zend\Mime\Mime
+ * object set by this call will be used. Otherwise, a new Zend\Mime\Mime object
* is generated and used.
*
- * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+ * @param string $EOL EOL string; defaults to {@link Zend\Mime\Mime::LINEEND}
* @return string
*/
public function generateMessage($EOL = Mime::LINEEND)
@@ -207,12 +207,12 @@ class Message
}
/**
- * Decodes a MIME encoded string and returns a Zend_Mime_Message object with
+ * Decodes a MIME encoded string and returns a Zend\Mime\Message object with
* all the MIME parts set according to the given string
*
* @param string $message
* @param string $boundary
- * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+ * @param string $EOL EOL string; defaults to {@link Zend\Mime\Mime::LINEEND}
* @throws Exception\RuntimeException
* @return \Zend\Mime\Message
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Mime.php b/vendor/zendframework/zendframework/library/Zend/Mime/Mime.php
index df75b2f9cfb9b4d65d2f43a82abeb865fa7a109f..bf4fe1f3fa67e47580c54c6bc2273fb613c73e7c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Mime.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Mime.php
@@ -292,7 +292,7 @@ class Mime
*
* @param string $str
* @param string $encoding
- * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+ * @param string $EOL EOL string; defaults to {@link LINEEND}
* @return string
*/
public static function encode($str, $encoding, $EOL = self::LINEEND)
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractController.php
index aa4902c10313425b610c5774bee6edc1ec8557f6..41a3ce9e38f5dc2659a839c5a5bcfbe61f5323ff 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractController.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractController.php
@@ -198,7 +198,7 @@ abstract class AbstractController implements
*/
public function setEvent(Event $e)
{
- if ($e instanceof Event && !$e instanceof MvcEvent) {
+ if (!$e instanceof MvcEvent) {
$eventParams = $e->getParams();
$e = new MvcEvent();
$e->setParams($eventParams);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
index 9d178fe55c702140d49917ab614d90373d7acf44..1123c4116e1ba0684f47d313a831e86c2bbb36ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
@@ -93,14 +93,17 @@ class PostRedirectGet extends AbstractPlugin
*/
protected function redirect($redirect, $redirectToUrl)
{
- $controller = $this->getController();
- $params = array();
+ $controller = $this->getController();
+ $params = array();
+ $options = array();
+ $reuseMatchedParams = false;
if (null === $redirect) {
$routeMatch = $controller->getEvent()->getRouteMatch();
$redirect = $routeMatch->getMatchedRouteName();
- $params = $routeMatch->getParams();
+ //null indicates to redirect for self.
+ $reuseMatchedParams = true;
}
if (method_exists($controller, 'getPluginManager')) {
@@ -119,7 +122,7 @@ class PostRedirectGet extends AbstractPlugin
}
if ($redirectToUrl === false) {
- $response = $redirector->toRoute($redirect, $params);
+ $response = $redirector->toRoute($redirect, $params, $options, $reuseMatchedParams);
$response->setStatusCode(303);
return $response;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php
index 25fbbae561c0445e772dbde9b1f772ce67dddbf9..3a7d868ff19d95ea8e539f376a0374660dc39c4a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php
@@ -73,12 +73,13 @@ class SimpleRouteStack implements RouteStackInterface
throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable set of options');
}
- $instance = new static();
-
+ $routePluginManager = null;
if (isset($options['route_plugins'])) {
- $instance->setRoutePluginManager($options['route_plugins']);
+ $routePluginManager = $options['route_plugins'];
}
+ $instance = new static($routePluginManager);
+
if (isset($options['routes'])) {
$instance->addRoutes($options['routes']);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
index 7b10a90f5871f4e6d6f0f0d489cab973ef988e63..248776bb029132b9184bba233e3d2f0df178292f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
@@ -31,39 +31,37 @@ class RouterFactory implements FactoryInterface
*/
public function createService(ServiceLocatorInterface $serviceLocator, $cName = null, $rName = null)
{
- $config = $serviceLocator->get('Config');
- $routePluginManager = $serviceLocator->get('RoutePluginManager');
+ $config = $serviceLocator->has('Config') ? $serviceLocator->get('Config') : array();
- if (
- $rName === 'ConsoleRouter' || // force console router
- ($cName === 'router' && Console::isConsole()) // auto detect console
+ // Defaults
+ $routerClass = 'Zend\Mvc\Router\Http\TreeRouteStack';
+ $routerConfig = isset($config['router']) ? $config['router'] : array();
+
+ // Console environment?
+ if ($rName === 'ConsoleRouter' // force console router
+ || ($cName === 'router' && Console::isConsole()) // auto detect console
) {
// We are in a console, use console router.
if (isset($config['console']) && isset($config['console']['router'])) {
$routerConfig = $config['console']['router'];
- } else {
- $routerConfig = array();
}
- $router = new ConsoleRouter($routePluginManager);
- } else {
- // This is an HTTP request, so use HTTP router
- $router = new HttpRouter($routePluginManager);
- $routerConfig = isset($config['router']) ? $config['router'] : array();
- }
-
- if (isset($routerConfig['route_plugins'])) {
- $router->setRoutePluginManager($routerConfig['route_plugins']);
+ $routerClass = 'Zend\Mvc\Router\Console\SimpleRouteStack';
}
- if (isset($routerConfig['routes'])) {
- $router->addRoutes($routerConfig['routes']);
+ // Obtain the configured router class, if any
+ if (isset($routerConfig['router_class']) && class_exists($routerConfig['router_class'])) {
+ $routerClass = $routerConfig['router_class'];
}
- if (isset($routerConfig['default_params'])) {
- $router->setDefaultParams($routerConfig['default_params']);
+ // Inject the route plugins
+ if (!isset($routerConfig['route_plugins'])) {
+ $routePluginManager = $serviceLocator->get('RoutePluginManager');
+ $routerConfig['route_plugins'] = $routePluginManager;
}
- return $router;
+ // Obtain an instance
+ $factory = sprintf('%s::factory', $routerClass);
+ return call_user_func($factory, $routerConfig);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewHelperManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
index defba0a8efa4bd629264d5219691878e2e85b8c1..c236da1a778cae9fe1fd0c8420bd7dd08b9baf39 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
@@ -60,7 +60,7 @@ class ViewHelperManagerFactory extends AbstractPluginManagerFactory
}
// Configure URL view helper with router
- $plugins->setFactory('url', function ($sm) use($serviceLocator) {
+ $plugins->setFactory('url', function ($sm) use ($serviceLocator) {
$helper = new ViewHelper\Url;
$router = Console::isConsole() ? 'HttpRouter' : 'Router';
$helper->setRouter($serviceLocator->get($router));
@@ -77,8 +77,8 @@ class ViewHelperManagerFactory extends AbstractPluginManagerFactory
return $helper;
});
- $plugins->setFactory('basepath', function ($sm) use($serviceLocator) {
- $config = $serviceLocator->get('Config');
+ $plugins->setFactory('basepath', function ($sm) use ($serviceLocator) {
+ $config = $serviceLocator->has('Config') ? $serviceLocator->get('Config') : array();
$basePathHelper = new ViewHelper\BasePath;
if (isset($config['view_manager']) && isset($config['view_manager']['base_path'])) {
$basePath = $config['view_manager']['base_path'];
@@ -95,11 +95,11 @@ class ViewHelperManagerFactory extends AbstractPluginManagerFactory
* Other view helpers depend on this to decide which spec to generate their tags
* based on. This is why it must be set early instead of later in the layout phtml.
*/
- $plugins->setFactory('doctype', function ($sm) use($serviceLocator) {
- $config = $serviceLocator->get('Config');
- $config = $config['view_manager'];
+ $plugins->setFactory('doctype', function ($sm) use ($serviceLocator) {
+ $config = $serviceLocator->has('Config') ? $serviceLocator->get('Config') : array();
+ $config = isset($config['view_manager']) ? $config['view_manager'] : array();
$doctypeHelper = new ViewHelper\Doctype;
- if (isset($config['doctype'])) {
+ if (isset($config['doctype']) && $config['doctype']) {
$doctypeHelper->setDoctype($config['doctype']);
}
return $doctypeHelper;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php
index d2fe957f784be805fe8e0d917362f508a6d333f6..a920f8d17395c5807d1eb6e1119bcc51992b0d06 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php
@@ -39,9 +39,22 @@ class ExceptionStrategy extends AbstractListenerAggregate
:stack
======================================================================
Previous Exception(s):
-======================================================================
:previous
+EOT;
+
+ /**
+ * A template for message to show in console when an exception has previous exceptions.
+ * @var string
+ */
+ protected $previousMessage = <<<EOT
+======================================================================
+ :className
+ :message
+----------------------------------------------------------------------
+:file::line
+:stack
+
EOT;
/**
@@ -111,6 +124,26 @@ EOT;
return $this;
}
+ /**
+ * Sets template for previous message that will be shown in Console.
+ *
+ * @param string $previousMessage
+ * @return ExceptionStrategy
+ */
+ public function setPreviousMessage($previousMessage)
+ {
+ $this->previousMessage = $previousMessage;
+ return $this;
+ }
+
+ /**
+ * @return callable|string
+ */
+ public function getPreviousMessage()
+ {
+ return $this->previousMessage;
+ }
+
/**
* Create an exception view model, and set the HTTP status code
*
@@ -152,6 +185,30 @@ EOT;
$callback = $this->message;
$message = (string) $callback($exception, $this->displayExceptions);
} elseif ($this->displayExceptions && $exception instanceof \Exception) {
+ $previous = '';
+ $previousException = $exception->getPrevious();
+ while($previousException) {
+ $previous .= str_replace(
+ array(
+ ':className',
+ ':message',
+ ':code',
+ ':file',
+ ':line',
+ ':stack',
+ ),array(
+ get_class($previousException),
+ $previousException->getMessage(),
+ $previousException->getCode(),
+ $previousException->getFile(),
+ $previousException->getLine(),
+ $exception->getTraceAsString(),
+ ),
+ $this->previousMessage
+ );
+ $previousException = $previousException->getPrevious();
+ }
+
/* @var $exception \Exception */
$message = str_replace(
array(
@@ -169,7 +226,7 @@ EOT;
$exception->getFile(),
$exception->getLine(),
$exception->getTraceAsString(),
- $exception->getPrevious(),
+ $previous
),
$this->message
);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json b/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json
index 75b048c369c1e2e6f20cb8129e1cde2f1a234268..b21a903b88c253aac9a0e61499d36bbc88d1334b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json
@@ -14,21 +14,26 @@
"target-dir": "Zend/Mvc",
"require": {
"php": ">=5.3.3",
- "zendframework/zend-config": "self.version",
- "zendframework/zend-console": "self.version",
- "zendframework/zend-di": "self.version",
"zendframework/zend-eventmanager": "self.version",
- "zendframework/zend-form": "self.version",
- "zendframework/zend-modulemanager": "self.version",
- "zendframework/zend-http": "self.version",
- "zendframework/zend-uri": "self.version",
"zendframework/zend-servicemanager": "self.version",
- "zendframework/zend-stdlib": "self.version",
- "zendframework/zend-text": "self.version",
- "zendframework/zend-view": "self.version"
+ "zendframework/zend-stdlib": "self.version"
},
"suggest": {
- "zendframework/zend-i18n": "Zend\\I18n component for translatable segments"
+ "zendframework/zend-config": "Zend\\Config component",
+ "zendframework/zend-console": "Zend\\Console component",
+ "zendframework/zend-di": "Zend\\Di component",
+ "zendframework/zend-filter": "Zend\\Filter component",
+ "zendframework/zend-http": "Zend\\Http component",
+ "zendframework/zend-form": "Zend\\Form component",
+ "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
+ "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
+ "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
+ "zendframework/zend-serializer": "Zend\\Serializer component",
+ "zendframework/zend-stdlib": "Zend\\Stdlib component",
+ "zendframework/zend-text": "Zend\\Text component",
+ "zendframework/zend-uri": "Zend\\Uri component",
+ "zendframework/zend-validator": "Zend\\Validator component",
+ "zendframework/zend-view": "Zend\\View component"
},
"extra": {
"branch-alias": {
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/Navigation/AbstractContainer.php
index 56a250eaad23b459288b4103d3bcd31762e6f836..aabfcc577884962317106c921b908f708f8c4c50 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/AbstractContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/AbstractContainer.php
@@ -16,7 +16,7 @@ use Traversable;
use Zend\Stdlib\ErrorHandler;
/**
- * Zend_Navigation_Container
+ * Zend\Navigation\Container
*
* AbstractContainer class for Zend\Navigation\Page classes.
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Navigation.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Navigation.php
index 997ce8d3b80a3857f0d2148e1cc20bdafaf5b91d..f256f185fedbeb01cdfb34e4b01df4b429444d75 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Navigation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Navigation.php
@@ -12,7 +12,7 @@ namespace Zend\Navigation;
use Traversable;
/**
- * A simple container class for {@link Zend_Navigation_Page} pages
+ * A simple container class for {@link Zend\Navigation\Page} pages
*/
class Navigation extends AbstractContainer
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
index 1f5023a6b58073cbd2788f189de4e71071a17bb0..3642bf687617eb51e5f7dd4c37ba9fa054535cca 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
@@ -146,19 +146,19 @@ abstract class AbstractPage extends AbstractContainer
// Initialization:
/**
- * Factory for Zend_Navigation_Page classes
+ * Factory for Zend\Navigation\Page classes
*
* A specific type to construct can be specified by specifying the key
* 'type' in $options. If type is 'uri' or 'mvc', the type will be resolved
- * to Zend_Navigation_Page_Uri or Zend_Navigation_Page_Mvc. Any other value
+ * to Zend\Navigation\Page\Uri or Zend\Navigation\Page\Mvc. Any other value
* for 'type' will be considered the full name of the class to construct.
- * A valid custom page class must extend Zend_Navigation_Page.
+ * A valid custom page class must extend Zend\Navigation\Page\AbstractPage.
*
* If 'type' is not given, the type of page to construct will be determined
* by the following rules:
* - If $options contains either of the keys 'action', 'controller',
- * or 'route', a Zend_Navigation_Page_Mvc page will be created.
- * - If $options contains the key 'uri', a Zend_Navigation_Page_Uri page
+ * or 'route', a Zend\Navigation\Page\Mvc page will be created.
+ * - If $options contains the key 'uri', a Zend\Navigation\Page\Uri page
* will be created.
*
* @param array|Traversable $options options used for creating page
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php
index a7509c0208b5571e08d951d7cd0cd6f2588d35c1..cdda1c478d160b18f12613caa72ab7a132b6fbaf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php
@@ -131,12 +131,16 @@ class Mvc extends AbstractPage
$myParams['action'] = $this->action;
}
- if (null !== $this->getRoute()
- && $this->routeMatch->getMatchedRouteName() === $this->getRoute()
- && (count(array_intersect_assoc($reqParams, $myParams)) == count($myParams))
- ) {
- $this->active = true;
- return true;
+ if (null !== $this->getRoute()) {
+ if (
+ $this->routeMatch->getMatchedRouteName() === $this->getRoute()
+ && (count(array_intersect_assoc($reqParams, $myParams)) == count($myParams))
+ ) {
+ $this->active = true;
+ return $this->active;
+ } else {
+ return parent::isActive($recursive);
+ }
}
}
@@ -197,7 +201,7 @@ class Mvc extends AbstractPage
);
}
- if ($this->useRouteMatch()) {
+ if ($this->useRouteMatch() && $this->getRouteMatch()) {
$rmParams = $this->getRouteMatch()->getParams();
if (isset($rmParams[ModuleRouteListener::ORIGINAL_CONTROLLER])) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php
index 92c7b532810cd2e31a090e93c8dacd4fbca5ca5c..c9ade7292ba0744f000fbc3bb756eca2f4f066f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php
@@ -103,22 +103,15 @@ class DbSelect implements AdapterInterface
}
$select = clone $this->select;
- $select->reset(Select::COLUMNS);
$select->reset(Select::LIMIT);
$select->reset(Select::OFFSET);
$select->reset(Select::ORDER);
- $select->reset(Select::GROUP);
- // get join information, clear, and repopulate without columns
- $joins = $select->getRawState(Select::JOINS);
- $select->reset(Select::JOINS);
- foreach ($joins as $join) {
- $select->join($join['name'], $join['on'], array(), $join['type']);
- }
-
- $select->columns(array('c' => new Expression('COUNT(1)')));
+ $countSelect = new Select;
+ $countSelect->columns(array('c' => new Expression('COUNT(1)')));
+ $countSelect->from(array('original_select' => $select));
- $statement = $this->sql->prepareStatementForSqlObject($select);
+ $statement = $this->sql->prepareStatementForSqlObject($countSelect);
$result = $statement->execute();
$row = $result->current();
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php
index 40dc29283dbf15be44204faa5984ed6f8caca173..88c0917ed65c83382e4e500080c6c02d7207935f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php
@@ -29,7 +29,7 @@ interface AclInterface
*
* If either $role or $resource is null, then the query applies to all Roles or all Resources,
* respectively. Both may be null to query whether the ACL has a "blacklist" rule
- * (allow everything to all). By default, Zend_Acl creates a "whitelist" rule (deny
+ * (allow everything to all). By default, Zend\Permissions\Acl creates a "whitelist" rule (deny
* everything to all), and this method would return false unless this default has
* been overridden (i.e., by executing $acl->allow()).
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php
index 6b9d734c92629cd264659df4045803f353a2e6d5..df75d79a95827ba471ecbfc5b21e7328cda0e500 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php
@@ -9,7 +9,7 @@
namespace Zend\Permissions\Rbac;
-interface RoleInterface
+interface RoleInterface extends \RecursiveIterator
{
/**
* Get the name of the role.
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
index 715ad586aadc9b443535568c8fb3e47b59e0b8c5..672e2b26cea079ed420d9c15eb7ba4fae88dd0a5 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
@@ -13,7 +13,7 @@ use Traversable;
use Zend\Stdlib\ArrayUtils;
/**
- * Abstract class for Zend_ProgressBar_Adapters
+ * Abstract class for Zend\ProgressBar Adapters
*/
abstract class AbstractAdapter
{
@@ -30,7 +30,7 @@ abstract class AbstractAdapter
/**
* Create a new adapter
*
- * $options may be either be an array or a Zend_Config object which
+ * $options may be either be an array or a Zend\Config object which
* specifies adapter related options.
*
* @param array|Traversable $options
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php
index d985a640dead35c2a92111c246622b23be2d479b..8bd3788afadc49e3d5dee5942c6d6122e8bdc51e 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php
@@ -14,7 +14,7 @@ use Zend\Stdlib\ErrorHandler;
use Zend\Stdlib\StringUtils;
/**
- * Zend_ProgressBar_Adapter_Console offers a text-based progressbar for console
+ * Zend\ProgressBar\Adapter\Console offers a text-based progressbar for console
* applications
*/
class Console extends AbstractAdapter
@@ -136,7 +136,7 @@ class Console extends AbstractAdapter
protected $charset = 'utf-8';
/**
- * Defined by Zend_ProgressBar_Adapter
+ * Defined by Zend\ProgressBar adapter
*
* @param array|\Traversable $options
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
index 2c9391770c7a468b269041bbcedee754f700ca73..5fa70304bf09195212e83fef4e75b3f719527b8e 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
@@ -12,7 +12,7 @@ namespace Zend\ProgressBar\Adapter\Exception;
use Zend\ProgressBar\Exception\ExceptionInterface as ProgressBarException;
/**
- * Exception class for Zend_ProgressBar_Adapter
+ * Exception class for Zend\ProgressBar\Adapter
*/
interface ExceptionInterface extends ProgressBarException
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
index ffb905e8f911c38db2139eab0b25eca6383cc078..d47def50a872f6eb5958622e104d5180c4082bfb 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
@@ -12,7 +12,7 @@ namespace Zend\ProgressBar\Adapter\Exception;
use Zend\ProgressBar\Exception;
/**
- * Exception for Zend_Progressbar component.
+ * Exception for Zend\Progressbar component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
index f7d5af753e0238156a7a0961324aa7f47a5a3133..8091121bf27c386b0f1b7712bf58061ecdaca70d 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
@@ -12,7 +12,7 @@ namespace Zend\ProgressBar\Adapter\Exception;
use Zend\ProgressBar\Exception;
/**
- * Exception for Zend_Progressbar component.
+ * Exception for Zend\Progressbar component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php
index 9bdca288af642d1c908a9cb4670c7244c6a292f3..e1626c77e60df841a7c9b12fef92020f9ce6fc9a 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php
@@ -12,7 +12,7 @@ namespace Zend\ProgressBar\Adapter;
use Zend\Json\Json;
/**
- * Zend_ProgressBar_Adapter_JsPull offers a simple method for updating a
+ * Zend\ProgressBar\Adapter\JsPull offers a simple method for updating a
* progressbar in a browser.
*/
class JsPull extends AbstractAdapter
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php
index 13b6b00d9c558406aa540e2b5f6d57fef36a582b..11ab2f8a55fa190ffb3f842dd7f20a5b289ad7a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php
@@ -12,7 +12,7 @@ namespace Zend\ProgressBar\Adapter;
use Zend\Json\Json;
/**
- * Zend_ProgressBar_Adapter_JsPush offers a simple method for updating a
+ * Zend\ProgressBar\Adapter\JsPush offers a simple method for updating a
* progressbar in a browser.
*/
class JsPush extends AbstractAdapter
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/ExceptionInterface.php
index cb753a09f34fb141feae4fe1f25666ea42e396a8..614c14d730deb58e7f9e81bb1b9f0e0ab903190d 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/ExceptionInterface.php
@@ -10,7 +10,7 @@
namespace Zend\ProgressBar\Exception;
/**
- * Exception class for Zend_ProgressBar
+ * Exception class for Zend\ProgressBar
*/
interface ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
index 589238aa22526de36e085ce47c83ef54293ba221..b1c30d0065793de6b67205b73b10b4aa032256d7 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
@@ -10,7 +10,7 @@
namespace Zend\ProgressBar\Exception;
/**
- * Exception for Zend_Progressbar component.
+ * Exception for Zend\Progressbar component.
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/OutOfRangeException.php
index 7afd5eab4e832e5b7c5feb5f5044f61290039c60..bcae9b5ad6097df0201a26d6418742068550da44 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/OutOfRangeException.php
@@ -10,7 +10,7 @@
namespace Zend\ProgressBar\Exception;
/**
- * Exception for Zend_Progressbar component.
+ * Exception for Zend\Progressbar component.
*/
class OutOfRangeException extends \OutOfRangeException implements ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/RuntimeException.php
index b1a1d5020c1a4f5fa6ef4f4ccd51122d5baa2259..8fcb1339e9f60b9cadd9afccc1e503ff91922d6a 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/RuntimeException.php
@@ -10,7 +10,7 @@
namespace Zend\ProgressBar\Exception;
/**
- * Exception for Zend_Progressbar component.
+ * Exception for Zend\Progressbar component.
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
index 2c64135bfc9932d76b1b7b41404706ad9ff92be9..f802dbe32e1fe93f713b2e8452d5cfb43f5e4d42 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
@@ -13,7 +13,7 @@ use Zend\ProgressBar\Exception;
use Zend\Session;
/**
- * Zend_ProgressBar offers an interface for multiple environments.
+ * Zend\ProgressBar offers an interface for multiple environments.
*/
class ProgressBar
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Server/Exception/ExceptionInterface.php
index 98a3a0a6093884ace3b623c6846d2dfb75281d61..ab0219c47bf637b20dce90945294860fde69e80a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Exception/ExceptionInterface.php
@@ -10,7 +10,7 @@
namespace Zend\Server\Exception;
/**
- * Zend_Server exceptions
+ * Zend\Server exceptions
*/
interface ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
index fbd2d452a326666ad5cf4c4481614a86b199a76a..a97f54f632f5ebd8aba5e0dbd65ccda5c6aae9a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
@@ -12,7 +12,7 @@ namespace Zend\Server\Reflection\Exception;
use Zend\Server\Exception\ExceptionInterface as Exception;
/**
- * Zend_Server_Reflection exceptions
+ * Zend\Server\Reflection exceptions
*/
interface ExceptionInterface extends Exception
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Node.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Node.php
index 4eeab4f96528ff66b92aef4c0d37d8cc8f189a20..87d788b1b41fd8cf5f32b78596b5cf3de2341aed 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Node.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Node.php
@@ -10,7 +10,7 @@
namespace Zend\Server\Reflection;
/**
- * Node Tree class for Zend_Server reflection operations
+ * Node Tree class for Zend\Server reflection operations
*/
class Node
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionClass.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionClass.php
index 8999aae00fbfe83016379a75cbba0f7be25b72e6..146d64c307cee6c3499a0832d110ffec50c6f649 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionClass.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionClass.php
@@ -15,7 +15,7 @@ use ReflectionClass as PhpReflectionClass;
* Class/Object reflection
*
* Proxies calls to a ReflectionClass object, and decorates getMethods() by
- * creating its own list of {@link Zend_Server_Reflection_Method}s.
+ * creating its own list of {@link Zend\Server\Reflection\ReflectionMethod}s.
*/
class ReflectionClass
{
@@ -122,7 +122,7 @@ class ReflectionClass
}
/**
- * Return array of dispatchable {@link \Zend\Server\Reflection\Method}s.
+ * Return array of dispatchable {@link \Zend\Server\Reflection\ReflectionMethod}s.
*
* @access public
* @return array
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php b/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
index 64bafc61ac08eedd90ea931ee9177069e454643e..bda078ba3feb9e17320fd00a2d213cea0e3e7e56 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
@@ -297,7 +297,7 @@ class StandardConfig implements ConfigInterface
throw new Exception\InvalidArgumentException('Invalid gc_probability; must be numeric');
}
$gcProbability = (int) $gcProbability;
- if (1 > $gcProbability || 100 < $gcProbability) {
+ if (0 > $gcProbability || 100 < $gcProbability) {
throw new Exception\InvalidArgumentException('Invalid gc_probability; must be a percentage');
}
$this->setOption('gc_probability', $gcProbability);
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/Exception/ExceptionInterface.php
index 859fd799d668b5c2b2672b7a7eeaa334d0ff761b..1afd964c1fc16df74d4b942895989d138eba2e40 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Exception/ExceptionInterface.php
@@ -10,7 +10,7 @@
namespace Zend\Session\Exception;
/**
- * Zend_Session_Exception
+ * Zend\Session\Exception
*/
interface ExceptionInterface
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Client.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client.php
index ef9b9ef0da0d3e4b9472102d23ffc3e451aee696..7766a497d0738e8d16fd7807e30d3e7c524d9111 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Client.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Client.php
@@ -180,7 +180,7 @@ class Client implements ServerClient
$this->setEncoding($value);
break;
- case 'soapVersion':
+ case 'soapversion':
case 'soap_version':
$this->setSoapVersion($value);
break;
@@ -213,22 +213,27 @@ class Client implements ServerClient
$this->setHttpPassword($value);
break;
+ case 'proxyhost':
case 'proxy_host':
$this->setProxyHost($value);
break;
+ case 'proxyport':
case 'proxy_port':
$this->setProxyPort($value);
break;
+ case 'proxylogin':
case 'proxy_login':
$this->setProxyLogin($value);
break;
+ case 'proxypassword':
case 'proxy_password':
$this->setProxyPassword($value);
break;
+ case 'localcert':
case 'local_cert':
$this->setHttpsCertificate($value);
break;
@@ -241,6 +246,7 @@ class Client implements ServerClient
$this->setCompressionOptions($value);
break;
+ case 'streamcontext':
case 'stream_context':
$this->setStreamContext($value);
break;
@@ -249,6 +255,7 @@ class Client implements ServerClient
$this->setSoapFeatures($value);
break;
+ case 'cachewsdl':
case 'cache_wsdl':
$this->setWSDLCache($value);
break;
@@ -258,8 +265,8 @@ class Client implements ServerClient
$this->setUserAgent($value);
break;
- case 'type_map':
case 'typemap':
+ case 'type_map':
$this->setTypemap($value);
break;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
index 68cc67274cb96510c9ac58daa1cb01efeb8fcdaf..0ce5ddac03a026a979b3e5b934f35e85141ee0c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
@@ -37,10 +37,10 @@ class HydratorListener extends AbstractListenerAggregate
/**
* {@inheritDoc}
*/
- public function attach(EventManagerInterface $events)
+ public function attach(EventManagerInterface $events, $priority = 1)
{
- $this->listeners[] = $events->attach(HydrateEvent::EVENT_HYDRATE, array($this, 'onHydrate'));
- $this->listeners[] = $events->attach(ExtractEvent::EVENT_EXTRACT, array($this, 'onExtract'));
+ $this->listeners[] = $events->attach(HydrateEvent::EVENT_HYDRATE, array($this, 'onHydrate'), $priority);
+ $this->listeners[] = $events->attach(ExtractEvent::EVENT_EXTRACT, array($this, 'onExtract'), $priority);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
index e0c3f99ed4735839d9aeacc0cfc317c8796c8d09..df1f2ea3ecc603a7c6b6765054745ee25882074c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
@@ -19,7 +19,7 @@ use Zend\Stdlib\Hydrator\Filter\GetFilter;
use Zend\Stdlib\Hydrator\Filter\HasFilter;
use Zend\Stdlib\Hydrator\Filter\IsFilter;
use Zend\Stdlib\Hydrator\Filter\MethodMatchFilter;
-use Zend\Stdlib\Hydrator\Filter\NumberOfParameterFilter;
+use Zend\Stdlib\Hydrator\Filter\OptionalParametersFilter;
class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
{
@@ -29,6 +29,11 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
*/
protected $underscoreSeparatedKeys = true;
+ /**
+ * @var \Zend\Stdlib\Hydrator\Filter\FilterInterface
+ */
+ private $callableMethodFilter;
+
/**
* Define if extract values will use camel case or name with underscore
* @param bool|array $underscoreSeparatedKeys
@@ -38,10 +43,12 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
parent::__construct();
$this->setUnderscoreSeparatedKeys($underscoreSeparatedKeys);
+ $this->callableMethodFilter = new OptionalParametersFilter();
+
$this->filterComposite->addFilter("is", new IsFilter());
$this->filterComposite->addFilter("has", new HasFilter());
$this->filterComposite->addFilter("get", new GetFilter());
- $this->filterComposite->addFilter("parameter", new NumberOfParameterFilter(), FilterComposite::CONDITION_AND);
+ $this->filterComposite->addFilter("parameter", new OptionalParametersFilter(), FilterComposite::CONDITION_AND);
}
/**
@@ -128,8 +135,7 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
continue;
}
- $reflectionMethod = new ReflectionMethod(get_class($object) . '::' . $method);
- if ($reflectionMethod->getNumberOfParameters() > 0) {
+ if (!$this->callableMethodFilter->filter(get_class($object) . '::' . $method)) {
continue;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php
new file mode 100644
index 0000000000000000000000000000000000000000..de97037800ca6e3e43a1a525b2b5c2086b2777a1
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+namespace Zend\Stdlib\Hydrator\Filter;
+
+use InvalidArgumentException;
+use ReflectionException;
+use ReflectionMethod;
+use ReflectionParameter;
+
+/**
+ * Filter that includes methods which have no parameters or only optional parameters
+ */
+class OptionalParametersFilter implements FilterInterface
+{
+ /**
+ * Map of methods already analyzed
+ * by {@see \Zend\Stdlib\Hydrator\Filter\OptionalParametersFilter::filter()},
+ * cached for performance reasons
+ *
+ * @var bool[]
+ */
+ private static $propertiesCache = array();
+
+ /**
+ * {@inheritDoc}
+ */
+ public function filter($property)
+ {
+ if (isset(self::$propertiesCache[$property])) {
+ return self::$propertiesCache[$property];
+ }
+
+ try {
+ $reflectionMethod = new ReflectionMethod($property);
+ } catch (ReflectionException $exception) {
+ throw new InvalidArgumentException(sprintf('Method %s doesn\'t exist', $property));
+ }
+
+ $mandatoryParameters = array_filter(
+ $reflectionMethod->getParameters(),
+ function (ReflectionParameter $parameter) {
+ return ! $parameter->isOptional();
+ }
+ );
+
+ return self::$propertiesCache[$property] = empty($mandatoryParameters);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php
index 85c21cc3f8fc0bfd3019b15342451020a7972f65..8a16355fb3845c0251b06fa3ea5a2da04898fe1d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php
@@ -9,12 +9,16 @@
namespace Zend\Stdlib\Hydrator\Strategy;
+/**
+ * @todo v3.0, add optional object/data to extract/hydrate.
+ */
interface StrategyInterface
{
/**
* Converts the given value so that it can be extracted by the hydrator.
*
- * @param mixed $value The original value.
+ * @param mixed $value The original value.
+ * @param object $object (optional) The original object for context.
* @return mixed Returns the value that should be extracted.
*/
public function extract($value);
@@ -23,6 +27,7 @@ interface StrategyInterface
* Converts the given value so that it can be hydrated by the hydrator.
*
* @param mixed $value The original value.
+ * @param array $data (optional) The original data for context.
* @return mixed Returns the value that should be hydrated.
*/
public function hydrate($value);
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php
index 5cbb5580af2732d647b1a4c1206a2427e0f997d6..41fda04c4ecea80df75d64d4a74d16742811b790 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php
@@ -18,7 +18,7 @@ interface StrategyEnabledInterface
*
* @param string $name The name of the strategy to register.
* @param StrategyInterface $strategy The strategy to register.
- * @return HydratorInterface
+ * @return StrategyEnabledInterface
*/
public function addStrategy($name, StrategyInterface $strategy);
@@ -42,7 +42,7 @@ interface StrategyEnabledInterface
* Removes the strategy with the given name.
*
* @param string $name The name of the strategy to remove.
- * @return HydratorInterface
+ * @return StrategyEnabledInterface
*/
public function removeStrategy($name);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
index 2291dfe24620a99bbe80a9b71c15aa57f19ef2bc..df89300517b0a01244c5a6bb83488e75973ac60f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
@@ -12,7 +12,7 @@ namespace Zend\Tag\Cloud\Decorator\Exception;
use Zend\Tag\Exception\ExceptionInterface as Exception;
/**
- * Exception class for Zend_Tag_Cloud_Decorator
+ * Exception class for Zend\Tag\Cloud\Decorator
*/
interface ExceptionInterface extends Exception
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
index 6317577f4d63a06dd37f23b875b1ba8bebee619a..87dbbf8f18c917d0935a38b50e317fe68a406bd6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -25,12 +25,12 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* @var \Zend\Mvc\ApplicationInterface
*/
- private $application;
+ protected $application;
/**
* @var array
*/
- private $applicationConfig;
+ protected $applicationConfig;
/**
* Flag to use console router or not
@@ -42,7 +42,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
* Flag console used before tests
* @var bool
*/
- private $usedConsoleBackup;
+ protected $usedConsoleBackup;
/**
* Trace error when exception is throwed in application
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
index 14b496061cf78680a2d11bfa8178a91de11aaa3d..28287c2bcffd2ddeaf43fd7800c24e02c9bbe33b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
@@ -12,7 +12,7 @@ namespace Zend\Text\Figlet\Exception;
use Zend\Text\Exception;
/**
- * Exception class for Zend_Text
+ * Exception class for Zend\Text
*/
class InvalidArgumentException
extends Exception\InvalidArgumentException
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/RuntimeException.php
index 556361638f09473d63ccdf77d5f5e0471662e93f..f732623aac23101977001c8573155c4374b26eec 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/RuntimeException.php
@@ -12,7 +12,7 @@ namespace Zend\Text\Figlet\Exception;
use Zend\Text\Exception;
/**
- * Exception class for Zend_Text
+ * Exception class for Zend\Text
*/
class RuntimeException
extends Exception\RuntimeException
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
index a909539430db5f81815e2da148b3537fa9005749..302d336ff4a3c281e7f6c4275e9397c33effdada 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
@@ -12,7 +12,7 @@ namespace Zend\Text\Figlet\Exception;
use Zend\Text\Exception;
/**
- * Exception class for Zend_Text
+ * Exception class for Zend\Text
*/
class UnexpectedValueException
extends Exception\UnexpectedValueException
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php
index 98ed636dd3a5149cbd6be34c7ea503b7c8f0bf15..e2ccb363ab89b4660ad851d15c134ee409fe4fee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php
@@ -259,7 +259,7 @@ class Figlet
* Instantiate the FIGlet with a specific font. If no font is given, the
* standard font is used. You can also supply multiple options via
* the $options variable, which can either be an array or an instance of
- * Zend_Config.
+ * Zend\Config\Config.
*
* @param array|Traversable $options Options for the output
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php
index 99bf5318dec72dd718f658528ae74d9ffe127a6b..0c58e15d06e147af82bb54a1019dc8ff49686549 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php
@@ -300,7 +300,7 @@ class Table
* Append a row to the table
*
* @param array|Row $row The row to append to the table
- * @throws Exception\InvalidArgumentException When $row is neither an array nor Zend_Zext_Table_Row
+ * @throws Exception\InvalidArgumentException When $row is neither an array nor Zend\Text\Table\Row
* @throws Exception\OverflowException When a row contains too many columns
* @return Table
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/ExceptionInterface.php
index 4901bb9f1ae7eb5d57fa5c033169d417163ca5bd..3a5aa413a397692a789707c30f24d75b39b33ffc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/ExceptionInterface.php
@@ -10,7 +10,7 @@
namespace Zend\Uri\Exception;
/**
- * Exception for Zend_Uri
+ * Exception for Zend\Uri
*/
interface ExceptionInterface
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriException.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriException.php
index 52136a77898067461791ccb46ca8530438a0575f..fc5fec3081652791d12ad8485343b659cac8af26 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriException.php
@@ -10,7 +10,7 @@
namespace Zend\Uri\Exception;
/**
- * Exceptions for Zend_Uri
+ * Exceptions for Zend\Uri
*/
class InvalidUriException extends InvalidArgumentException implements ExceptionInterface
{}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Upload.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Upload.php
index b3cd005ba9721fbbdc0c845cb222b6c24fbb412f..24bc743dd37cb24cc5d39a2d507f2bb8583260f5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Upload.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Upload.php
@@ -55,7 +55,7 @@ class Upload extends AbstractValidator
/**
* Sets validator options
*
- * The array $files must be given in syntax of Zend_File_Transfer to be checked
+ * The array $files must be given in syntax of Zend\File\Transfer\Transfer to be checked
* If no files are given the $_FILES array will be used automatically.
* NOTE: This validator will only work with HTTP POST uploads!
*
@@ -163,40 +163,40 @@ class Upload extends AbstractValidator
switch ($content['error']) {
case 0:
if (!is_uploaded_file($content['tmp_name'])) {
- $this->throwError($file, self::ATTACK);
+ $this->throwError($content, self::ATTACK);
}
break;
case 1:
- $this->throwError($file, self::INI_SIZE);
+ $this->throwError($content, self::INI_SIZE);
break;
case 2:
- $this->throwError($file, self::FORM_SIZE);
+ $this->throwError($content, self::FORM_SIZE);
break;
case 3:
- $this->throwError($file, self::PARTIAL);
+ $this->throwError($content, self::PARTIAL);
break;
case 4:
- $this->throwError($file, self::NO_FILE);
+ $this->throwError($content, self::NO_FILE);
break;
case 6:
- $this->throwError($file, self::NO_TMP_DIR);
+ $this->throwError($content, self::NO_TMP_DIR);
break;
case 7:
- $this->throwError($file, self::CANT_WRITE);
+ $this->throwError($content, self::CANT_WRITE);
break;
case 8:
- $this->throwError($file, self::EXTENSION);
+ $this->throwError($content, self::EXTENSION);
break;
default:
- $this->throwError($file, self::UNKNOWN);
+ $this->throwError($content, self::UNKNOWN);
break;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/UploadFile.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/UploadFile.php
index f5c4e036c4a69dbe039530ed86b7fc57ccf79de9..39f17db1747ccad366ac54696d2a497825c28655 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/UploadFile.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/UploadFile.php
@@ -52,6 +52,7 @@ class UploadFile extends AbstractValidator
*
* @param string $value File to check for upload errors
* @return bool
+ * @throws Exception\InvalidArgumentException
*/
public function isValid($value)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php
index 9f3cb21a1fc280d81ff080a129abf54561e75d94..ef66a200a4bdcc9f05e9af602c9f8ae9fa7c0229 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php
@@ -140,6 +140,7 @@ class Hostname extends AbstractValidator
* (.TH) Thailand http://www.iana.org/domains/idn-tables/tables/th_th-th_1.0.html
* (.TM) Turkmenistan http://www.nic.tm/TM-IDN-Policy.pdf
* (.TR) Turkey https://www.nic.tr/index.php
+ * (.UA) Ukraine http://www.iana.org/domains/idn-tables/tables/ua_cyrl_1.2.html
* (.VE) Venice http://www.iana.org/domains/idn-tables/tables/ve_es_1.0.html
* (.VN) Vietnam http://www.vnnic.vn/english/5-6-300-2-2-04-20071115.htm#1.%20Introduction
*
@@ -247,6 +248,7 @@ class Hostname extends AbstractValidator
'TM' => array(1 => '/^[\x{002d}0-9a-zà -öø-ÿÄăąćĉċÄÄđēėęěÄġģĥħīįĵķĺļľŀłńņňŋőœŕŗřśÅşšţťŧūÅůűųŵŷźżž]{1,63}$/iu'),
'TW' => 'Hostname/Cn.php',
'TR' => array(1 => '/^[\x{002d}0-9a-zğıüşöç]{1,63}$/iu'),
+ 'UA' => array(1 => '/^[\x{002d}0-9a-zабвгдежзийклмнопрÑтуфхцчшщъыьÑÑŽÑÑёђѓєѕіїјљњћќÑўџґӂʼ]{1,63}$/iu'),
'VE' => array(1 => '/^[\x{002d}0-9a-záéÃóúüñ]{1,63}$/iu'),
'VN' => array(1 => '/^[ÀÃÂÃÈÉÊÌÃÒÓÔÕÙÚÃà áâãèéêìÃòóôõùúýĂăÄÄ‘Ä¨Ä©Å¨Å©Æ Æ¡Æ¯Æ°\x{1EA0}-\x{1EF9}]{1,63}$/iu'),
'ä¸å›½' => 'Hostname/Cn.php',
@@ -633,22 +635,19 @@ class Hostname extends AbstractValidator
*/
protected function decodePunycode($encoded)
{
- $found = preg_match('/([^a-z0-9\x2d]{1,10})$/i', $encoded);
- if (empty($encoded) || ($found > 0)) {
- // no punycode encoded string, return as is
+ if (!preg_match('/^[a-z0-9-]+$/i', $encoded)) {
+ // no punycode encoded string
$this->error(self::CANNOT_DECODE_PUNYCODE);
return false;
}
+ $decoded = array();
$separator = strrpos($encoded, '-');
if ($separator > 0) {
for ($x = 0; $x < $separator; ++$x) {
// prepare decoding matrix
$decoded[] = ord($encoded[$x]);
}
- } else {
- $this->error(self::CANNOT_DECODE_PUNYCODE);
- return false;
}
$lengthd = count($decoded);
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/Version.php b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
index 870c90511321d23ea3ae34a52dc30e9c7412f776..8de7371b0a17c3a7ca8cdf5c624a6b35053aadbf 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.2.0';
+ const VERSION = '2.2.1';
/**
* Github Service Identifier for version information is retreived from
@@ -40,7 +40,7 @@ final class Version
/**
* Compare the specified Zend Framework version string $version
- * with the current Zend_Version::VERSION of Zend Framework.
+ * with the current Zend\Version\Version::VERSION of Zend Framework.
*
* @param string $version A version string (e.g. "0.7.1").
* @return int -1 if the $version is older,
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php
index a37330edc472850c5dd2d7279ef8016ece86334b..ad1fb2b59b627e29113ffccf255a822d833ca9b5 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php
@@ -56,6 +56,13 @@ class Gravatar extends AbstractHtmlElement
*/
protected $email;
+ /**
+ * True or false if the email address passed is already an MD5 hash
+ *
+ * @var bool
+ */
+ protected $emailIsHashed;
+
/**
* Options
*
@@ -104,7 +111,7 @@ class Gravatar extends AbstractHtmlElement
*
* @return string
*/
- public function __toString()
+ public function __toString()
{
return $this->getImgTag();
}
@@ -135,7 +142,7 @@ class Gravatar extends AbstractHtmlElement
protected function getAvatarUrl()
{
$src = $this->getGravatarUrl()
- . '/' . md5($this->getEmail())
+ . '/' . ($this->emailIsHashed ? $this->getEmail() : md5($this->getEmail()))
. '?s=' . $this->getImgSize()
. '&d=' . $this->getDefaultImg()
. '&r=' . $this->getRating();
@@ -231,6 +238,7 @@ class Gravatar extends AbstractHtmlElement
*/
public function setEmail($email)
{
+ $this->emailIsHashed = (bool) preg_match('/^[A-Za-z0-9]{32}$/', $email);
$this->email = $email;
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
index b80a8548c635fccb13036dc0aaf57bb492614690..9927d46bc15dc100b018855e1583c2c8fe174011 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
@@ -14,7 +14,7 @@ use Zend\View;
use Zend\View\Exception;
/**
- * Zend_Layout_View_Helper_HeadMeta
+ * Zend\View\Helper\HeadMeta
*
* @see http://www.w3.org/TR/xhtml1/dtds.html
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php
index 02ddff7fc58962b12c9b165f5b91ae8158fbc71d..88806857c355e3ae8d59d4eb3752e99a4cabd281 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php
@@ -464,8 +464,9 @@ class Menu extends AbstractHelper
*
* Overrides {@link AbstractHelper::htmlify()}.
*
- * @param AbstractPage $page page to generate HTML for
- * @param bool $escapeLabel Whether or not to escape the label
+ * @param AbstractPage $page page to generate HTML for
+ * @param bool $escapeLabel Whether or not to escape the label
+ * @param bool $addClassToListItem Whether or not to add the page class to the list item
* @return string
*/
public function htmlify(AbstractPage $page, $escapeLabel = true, $addClassToListItem = false)
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
index 7b9f9f8201a06a14a9b04897d29338fd81c9ee7a..7ea3b315ad55c334504c32511c06ad4d594ba961 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
@@ -44,22 +44,14 @@ class PartialLoop extends Partial
return $this;
}
- if (!is_array($values)
- && (!$values instanceof Traversable)
- && (is_object($values) && !method_exists($values, 'toArray'))
- ) {
- throw new Exception\InvalidArgumentException('PartialLoop helper requires iterable data');
- }
-
- if (is_object($values)
- && (!$values instanceof Traversable)
- && method_exists($values, 'toArray')
- ) {
- $values = $values->toArray();
- }
-
- if ($values instanceof Iterator) {
- $values = ArrayUtils::iteratorToArray($values);
+ if (!is_array($values)) {
+ if ($values instanceof Traversable) {
+ $values = ArrayUtils::iteratorToArray($values);
+ } elseif (is_object($values) && method_exists($values, 'toArray')) {
+ $values = $values->toArray();
+ } else {
+ throw new Exception\InvalidArgumentException('PartialLoop helper requires iterable data');
+ }
}
// reset the counter if it's called again
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/AbstractValue.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/AbstractValue.php
index f283c0c9a932f2a78cc9b524e90452e49ee0c1e1..5ceec16728c5dff1fc81abe184d92acf13acf3bb 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/AbstractValue.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/AbstractValue.php
@@ -10,7 +10,6 @@
namespace Zend\XmlRpc;
use DateTime;
-use Zend\Math\BigInteger;
/**
* Represent a native XML-RPC value entity, used as parameters for the methods
@@ -277,17 +276,8 @@ abstract class AbstractValue
protected static function _phpVarToNativeXmlRpc($value)
{
// @see http://framework.zend.com/issues/browse/ZF-8623
- if (is_object($value)) {
- if ($value instanceof AbstractValue) {
- return $value;
- }
- if ($value instanceof BigInteger) {
- throw new Exception\InvalidArgumentException(
- 'Using Zend\Math\BigInteger to get an ' .
- 'instance of Value_BigInteger is not ' .
- 'available anymore.'
- );
- }
+ if ($value instanceof AbstractValue) {
+ return $value;
}
switch (static::getXmlRpcTypeByValue($value)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
index 05d0df9b990af43aefbb380f100d0237ab6be169..bcf8b4a267e7e238ca29279d43095324c4d04c84 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
@@ -12,7 +12,7 @@ namespace Zend\XmlRpc\Client\Exception;
use Zend\XmlRpc\Exception\ExceptionInterface as Exception;
/**
- * Base class for all Zend_XmlRpc_Client_* exceptions
+ * Base class for all Zend\XmlRpc\Client\* exceptions
*/
interface ExceptionInterface extends Exception
{
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/FaultException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/FaultException.php
index a32af28e4b50861dd58af87639960ad91f5e549b..c8cdf0c21e1eb80fe6b6b96a8fc6cc989eb98196 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/FaultException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/FaultException.php
@@ -12,7 +12,7 @@ namespace Zend\XmlRpc\Client\Exception;
use Zend\XmlRpc\Exception;
/**
- * Thrown by Zend_XmlRpc_Client when an XML-RPC fault response is returned.
+ * Thrown by Zend\XmlRpc\Client when an XML-RPC fault response is returned.
*/
class FaultException extends Exception\BadMethodCallException implements ExceptionInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/HttpException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/HttpException.php
index f28b1e6802070a7312774ef5c9d4b637ce9c17cb..d7778be1e69f47ee59436e22c682636ab7cfc8c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/HttpException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/HttpException.php
@@ -10,7 +10,7 @@
namespace Zend\XmlRpc\Client\Exception;
/**
- * Thrown by Zend_XmlRpc_Client when an HTTP error occurs during an
+ * Thrown by Zend\XmlRpc\Client when an HTTP error occurs during an
* XML-RPC method call.
*/
class HttpException extends RuntimeException
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/IntrospectException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
index d35863f3c8846364b447b6484f4994915ac3a23c..f8aa6090b33084ec061e1fcee2fe906fff7af610 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
@@ -10,7 +10,7 @@
namespace Zend\XmlRpc\Client\Exception;
/**
- * Thrown by Zend_XmlRpc_Client_Introspection when any error occurs.
+ * Thrown by Zend\XmlRpc\Client\ServerIntrospection when any error occurs.
*/
class IntrospectException extends InvalidArgumentException
{
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Fault.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Fault.php
index 7f85ad9f08dbd538ce197e33a1bb542ad44a8e83..2480baa3c006e8e782ec8240871121465d306404 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Fault.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Fault.php
@@ -19,7 +19,7 @@ use SimpleXMLElement;
* fault, as well as generating the XML for an XMLRPC fault response.
*
* To allow method chaining, you may only use the {@link getInstance()} factory
- * to instantiate a Zend_XmlRpc_Server_Fault.
+ * to instantiate a Zend\XmlRpc\Server\Fault.
*/
class Fault
{
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Http.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Http.php
index 1b903e110290e9088d8b5a9ae3879ede044ed12e..c8425d3ef98cffb16071c4848ed6db158dee9a06 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Http.php
@@ -16,7 +16,7 @@ use Zend\XmlRpc\Request as XmlRpcRequest;
/**
* XmlRpc Request object -- Request via HTTP
*
- * Extends {@link Zend_XmlRpc_Request} to accept a request via HTTP. Request is
+ * Extends {@link Zend\XmlRpc\Request} to accept a request via HTTP. Request is
* built at construction time using a raw POST; if no data is available, the
* request is declared a fault.
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php
index 9b3201bbe283387209a54bb6e88085e1e6a5b456..058204b7c44d153bffa632dd50274cc076748bd3 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php
@@ -15,7 +15,7 @@ use Zend\XmlRpc\Server\Exception as ServerException;
/**
* XmlRpc Request object -- Request via STDIN
*
- * Extends {@link Zend_XmlRpc_Request} to accept a request via STDIN. Request is
+ * Extends {@link Zend\XmlRpc\Request} to accept a request via STDIN. Request is
* built at construction time using data from STDIN; if no data is available, the
* request is declared a fault.
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server.php
index 3943acc31336fcb90af10a34da15195908094a81..9746184b86c3f3b1d0871cf05d0f4c851a8e8c99 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server.php
@@ -79,7 +79,6 @@ class Server extends AbstractServer
'i4' => 'i4',
'int' => 'int',
'integer' => 'int',
- 'Zend\Math\BigInteger' => 'i8',
'i8' => 'i8',
'ex:i8' => 'i8',
'double' => 'double',
@@ -331,7 +330,7 @@ class Server extends AbstractServer
} else {
$type = gettype($definition);
}
- throw new Server\Exception\InvalidArgumentException('Unable to load server definition; must be an array or Zend_Server_Definition, received ' . $type, 612);
+ throw new Server\Exception\InvalidArgumentException('Unable to load server definition; must be an array or Zend\Server\Definition, received ' . $type, 612);
}
$this->table->clearMethods();
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Cache.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Cache.php
index cf6ae85f78bb8236ff8ca28cacc4df66f0fdaeed..9bf293de35415f266dea4ae35fb296d07a511132 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Cache.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Cache.php
@@ -10,7 +10,7 @@
namespace Zend\XmlRpc\Server;
/**
- * Zend_XmlRpc_Server_Cache: cache Zend_XmlRpc_Server server definition
+ * Zend\XmlRpc\Server\Cache: cache Zend\XmlRpc\Server server definition
*/
class Cache extends \Zend\Server\Cache
{
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
index a62e9f8a3e3fd2b89bd5d132b89fc14a6e51001c..d90fcfccf815a61f5a5f823cd87e13f1d00748d1 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
@@ -12,7 +12,7 @@ namespace Zend\XmlRpc\Server\Exception;
use Zend\XmlRpc\Exception\ExceptionInterface as Exception;
/**
- * Zend_XmlRpc_Server_Exception
+ * Zend\XmlRpc\Server\Exception
*/
interface ExceptionInterface extends Exception
{
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Fault.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Fault.php
index b25aa3123ff679388facad32ef049779242afa5a..0518ec00c9113d3df01e1579c8d8c17e784b3528 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Fault.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Fault.php
@@ -22,7 +22,7 @@ namespace Zend\XmlRpc\Server;
* need only implement a static 'observe' method.
*
* To allow method chaining, you may use the {@link getInstance()} factory
- * to instantiate a Zend_XmlRpc_Server_Fault.
+ * to instantiate a Zend\XmlRpc\Server\Fault.
*/
class Fault extends \Zend\XmlRpc\Fault
{
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractCollection.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractCollection.php
index dfab2327574e71c409f14811308f010727f8f7e7..a65eb03d98a3a515d88c05aa42e13432eb1c69ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractCollection.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractCollection.php
@@ -23,7 +23,7 @@ abstract class AbstractCollection extends AbstractValue
{
$values = (array)$value; // Make sure that the value is an array
foreach ($values as $key => $value) {
- // If the elements of the given array are not Zend_XmlRpc_Value objects,
+ // If the elements of the given array are not Zend\XmlRpc\Value objects,
// we need to convert them as such (using auto-detection from PHP value)
if (!$value instanceof parent) {
$value = static::getXmlRpcValue($value, self::AUTO_DETECT_TYPE);
diff --git a/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php
index 5205adf0cd1e442c3c61dd54aa0a02b12771814e..0e6862802277efa9dfc87c9e2a950a2336152543 100644
--- a/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php
@@ -18,47 +18,47 @@
/**
- * FR-Revision: 09.Sept.2012
+ * FR-Revision: 06.June.2013
*/
return array(
- // Zend_I18n_Validator_Alnum
+ // Zend\I18n\Validator\Alnum
"Invalid type given. String, integer or float expected" => "Type invalide. Chaîne, entier ou flottant attendu",
"The input contains characters which are non alphabetic and no digits" => "L'entrée contient des caractères non alphabétiques et non numériques",
"The input is an empty string" => "L'entrée est une chaîne vide",
- // Zend_I18n_Validator_Alpha
+ // Zend\I18n\Validator\Alpha
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
"The input contains non alphabetic characters" => "L'entrée contient des caractères non alphabétiques",
"The input is an empty string" => "L'entrée est une chaîne vide",
- // Zend_I18n_Validator_Float
+ // Zend\I18n\Validator\Float
"Invalid type given. String, integer or float expected" => "Type invalide. Chaîne, entier ou flottant attendu",
"The input does not appear to be a float" => "L'entrée n'est pas un nombre flottant",
- // Zend_I18n_Validator_Int
+ // Zend\I18n\Validator\Int
"Invalid type given. String or integer expected" => "Type invalide. Chaîne ou entier attendu",
"The input does not appear to be an integer" => "L'entrée n'est pas un entier",
- // Zend_I18n_Validator_PostCode
+ // Zend\I18n\Validator\PostCode
"Invalid type given. String or integer expected" => "Type invalid. Chaîne ou entier attendu",
"The input does not appear to be a postal code" => "L'entrée ne semble pas être un code postal valide",
"An exception has been raised while validating the input" => "Une exception a été levée lors de la validation de l'entrée",
- // Zend_Validator_Barcode
+ // Zend\Validator\Barcode
"The input failed checksum validation" => "L'entrée n'a pas passé la validation de la somme de contrôle",
"The input contains invalid characters" => "L'entrée contient des caractères invalides",
"The input should have a length of %length% characters" => "L'entrée devrait contenir %length% caractères",
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
- // Zend_Validator_Between
+ // Zend\Validator\Between
"The input is not between '%min%' and '%max%', inclusively" => "L'entrée n'est pas comprise entre '%min%' et '%max%', inclusivement",
"The input is not strictly between '%min%' and '%max%'" => "L'entrée n'est pas strictement comprise entre '%min%' et '%max%'",
- // Zend_Validator_Callback
+ // Zend\Validator\Callback
"The input is not valid" => "L'entrée n'est pas valide",
"An exception has been raised within the callback" => "Une exception a été levée dans la fonction de rappel",
- // Zend_Validator_CreditCard
+ // Zend\Validator\CreditCard
"The input seems to contain an invalid checksum" => "L'entrée semble contenir une somme de contrôle invalide",
"The input must contain only digits" => "L'entrée ne doit contenir que des chiffres",
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
@@ -67,29 +67,29 @@ return array(
"The input seems to be an invalid creditcard number" => "L'entrée semble être un numéro de carte bancaire invalide",
"An exception has been raised while validating the input" => "Une exception a été levée lors de la validation de l'entrée",
- // Zend_Validator_Csrf
+ // Zend\Validator\Csrf
"The form submitted did not originate from the expected site" => "Le formulaire ne provient pas du site attendu",
- // Zend_Validator_Date
+ // Zend\Validator\Date
"Invalid type given. String, integer, array or DateTime expected" => "Type invalide. Chaîne, entier, tableau ou DateTime attendu",
"The input does not appear to be a valid date" => "L'entrée ne semble pas être une date valide",
"The input does not fit the date format '%format%'" => "L'entrée ne correspond pas au format '%format%'",
- // Zend_Validator_DateStep
+ // Zend\Validator\DateStep
"Invalid type given. String, integer, array or DateTime expected" => "Entrée invalide. Chaîne, entier, tableau ou DateTime attendu",
"The input does not appear to be a valid date" => "L'entrée ne semble pas être une date valide",
"The input is not a valid step" => "L'entrée n'est pas une step valide",
- // Zend_Validator_Db_AbstractDb
+ // Zend\Validator\Db\AbstractDb
"No record matching the input was found" => "Aucun enregistrement trouvé",
"A record matching the input was found" => "Un enregistrement a été trouvé",
- // Zend_Validator_Digits
+ // Zend\Validator\Digits
"The input must contain only digits" => "L'entrée ne doit contenir que des chiffres",
"The input is an empty string" => "L'entrée est une chaîne vide",
"Invalid type given. String, integer or float expected" => "Type invalide. Chaîne, entier ou flottant attendu",
- // Zend_Validator_EmailAddress
+ // Zend\Validator\EmailAddress
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
"The input is not a valid email address. Use the basic format local-part@hostname" => "L'entrée n'est pas une adresse email valide. Utilisez le format local-part@hostname",
"'%hostname%' is not a valid hostname for the email address" => "'%hostname%' n'est pas un nom d'hôte valide pour l'adresse email",
@@ -100,40 +100,40 @@ return array(
"'%localPart%' is not a valid local part for the email address" => "'%localPart%' n'est pas une partie locale valide pour l'adresse email",
"The input exceeds the allowed length" => "L'entrée dépasse la taille autorisée",
- // Zend_Validator_Explode
+ // Zend\Validator\Explode
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
- // Zend_Validator_File_Count
+ // Zend\Validator\File\Count
"Too many files, maximum '%max%' are allowed but '%count%' are given" => "Trop de fichiers. '%max%' sont autorisés au maximum, mais '%count%' reçu(s)",
"Too few files, minimum '%min%' are expected but '%count%' are given" => "Trop peu de fichiers. '%min%' sont attendus, mais '%count%' reçu(s)",
- // Zend_Validator_File_Crc32
+ // Zend\Validator\File\Crc32
"File '%value%' does not match the given crc32 hashes" => "Le fichier '%value%' ne correspond pas aux sommes de contrôle CRC32 données",
"A crc32 hash could not be evaluated for the given file" => "Une somme de contrôle CRC32 n'a pas pu être calculée pour le fichier",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_ExcludeExtension
+ // Zend\Validator\File\ExcludeExtension
"File '%value%' has a false extension" => "Le fichier '%value%' a une mauvaise extension",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_Exists
+ // Zend\Validator\File\Exists
"File '%value%' does not exist" => "Le fichier '%value%' n'existe pas",
- // Zend_Validator_File_Extension
+ // Zend\Validator\File\Extension
"File '%value%' has a false extension" => "Le fichier '%value%' a une mauvaise extension",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_FilesSize
+ // Zend\Validator\File\FilesSize
"All files in sum should have a maximum size of '%max%' but '%size%' were detected" => "Tous les fichiers devraient avoir une taille maximale de '%max%' mais une taille de '%size%' a été détectée",
"All files in sum should have a minimum size of '%min%' but '%size%' were detected" => "Tous les fichiers devraient avoir une taille minimale de '%max%' mais une taille de '%size%' a été détectée",
"One or more files can not be read" => "Un ou plusieurs fichiers ne peut pas être lu",
- // Zend_Validator_File_Hash
+ // Zend\Validator\File\Hash
"File '%value%' does not match the given hashes" => "Le fichier '%value%' ne correspond pas aux sommes de contrôle données",
"A hash could not be evaluated for the given file" => "Une somme de contrôle n'a pas pu être calculée pour le fichier",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_ImageSize
+ // Zend\Validator\File\ImageSize
"Maximum allowed width for image '%value%' should be '%maxwidth%' but '%width%' detected" => "La largeur maximale pour l'image '%value%' devrait être '%maxwidth%', mais '%width%' détecté",
"Minimum expected width for image '%value%' should be '%minwidth%' but '%width%' detected" => "La largeur minimale pour l'image '%value%' devrait être '%minwidth%', mais '%width%' détecté",
"Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected" => "La hauteur maximale pour l'image '%value%' devrait être '%maxheight%', mais '%height%' détecté",
@@ -141,41 +141,41 @@ return array(
"The size of image '%value%' could not be detected" => "La taille de l'image '%value%' n'a pas pu être détectée",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_IsCompressed
+ // Zend\Validator\File\IsCompressed
"File '%value%' is not compressed, '%type%' detected" => "Le fichier '%value%' n'est pas compressé, '%type%' détecté",
"The mimetype of file '%value%' could not be detected" => "Le type MIME du fichier '%value%' n'a pas pu être détecté",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_IsImage
+ // Zend\Validator\File\IsImage
"File '%value%' is no image, '%type%' detected" => "Le fichier '%value%' n'est pas une image, '%type%' détecté",
"The mimetype of file '%value%' could not be detected" => "Le type MIME du fichier '%value%' n'a pas pu être détecté",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_Md5
+ // Zend\Validator\File\Md5
"File '%value%' does not match the given md5 hashes" => "Le fichier '%value%' ne correspond pas aux sommes de contrôle MD5 données",
"A md5 hash could not be evaluated for the given file" => "Une somme de contrôle MD5 n'a pas pu être calculée pour le fichier",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_MimeType
+ // Zend\Validator\File\MimeType
"File '%value%' has a false mimetype of '%type%'" => "Le fichier '%value%' a un faux type MIME : '%type%'",
"The mimetype of file '%value%' could not be detected" => "Le type MIME du fichier '%value%' n'a pas pu être détecté",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_NotExists
+ // Zend\Validator\File\NotExists
"File '%value%' exists" => "Le fichier '%value%' existe",
- // Zend_Validator_File_Sha1
+ // Zend\Validator\File\Sha1
"File '%value%' does not match the given sha1 hashes" => "Le fichier '%value%' ne correspond pas aux sommes de contrôle SHA1 données",
"A sha1 hash could not be evaluated for the given file" => "Une somme de contrôle SHA1 n'a pas pu être calculée pour le fichier",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_Size
+ // Zend\Validator\File\Size
"Maximum allowed size for file '%value%' is '%max%' but '%size%' detected" => "La taille de fichier maximale pour '%value%' est '%max%', mais '%size%' détectée",
"Minimum expected size for file '%value%' is '%min%' but '%size%' detected" => "La taille de fichier minimale pour '%value%' est '%min%', mais '%size%' détectée",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_File_Upload
- "File '%value%' exceeds the defined ini size" => "File '%value%' dépasse la taille défini dans le fichier INI",
+ // Zend\Validator\File\Upload
+ "File '%value%' exceeds the defined ini size" => "Le fichier '%value%' dépasse la taille définie dans le fichier INI",
"File '%value%' exceeds the defined form size" => "Le fichier '%value%' dépasse la taille définie dans le formulaire",
"File '%value%' was only partially uploaded" => "Le fichier '%value%' n'a été que partiellement envoyé",
"File '%value%' was not uploaded" => "Le fichier '%value%' n'a pas été envoyé",
@@ -186,20 +186,32 @@ return array(
"File '%value%' was not found" => "Le fichier '%value%' n'a pas été trouvé",
"Unknown error while uploading file '%value%'" => "Erreur inconnue lors de l'envoi du fichier '%value%'",
- // Zend_Validator_File_WordCount
+ // Zend\Validator\File\UploadFile
+ "File exceeds the defined ini size" => "Le fichier dépasse la taille définie dans le fichier INI",
+ "File exceeds the defined form size" => "Le fichier dépasse la taille définie dans le formulaire",
+ "File was only partially uploaded" => "Le fichier n'a été que partiellement envoyé",
+ "File was not uploaded" => "Le fichier n'a pas été envoyé",
+ "No temporary directory was found for file" => "Le dossier temporaire n'a pas été trouvé pour le fichier",
+ "File can't be written" => "Impossible d'écrire dans le fichier",
+ "A PHP extension returned an error while uploading the file" => "Une extension PHP a retourné une erreur en envoyant le fichier",
+ "File was illegally uploaded. This could be a possible attack" => "Le fichier a été envoyé illégalement. Il peut s'agir d'une attaque",
+ "File was not found" => "Le fichier n'a pas été trouvé",
+ "Unknown error while uploading file" => "Erreur inconnue lors de l'envoi du fichier",
+
+ // Zend\Validator\File\WordCount
"Too much words, maximum '%max%' are allowed but '%count%' were counted" => "Trop de mots. '%max%' sont autorisés, '%count%' comptés",
"Too few words, minimum '%min%' are expected but '%count%' were counted" => "Pas assez de mots. '%min%' sont attendus, '%count%' comptés",
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",
- // Zend_Validator_GreaterThan
+ // Zend\Validator\GreaterThan
"The input is not greater than '%min%'" => "L'entrée n'est pas supérieure à '%min%'",
"The input is not greater or equal than '%min%'" => "L'entrée n'est pas supérieure ou égale à '%min%'",
- // Zend_Validator_Hex
+ // Zend\Validator\Hex
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
"The input contains non-hexadecimal characters" => "L'entrée contient des caractères non-hexadécimaux",
- // Zend_Validator_Hostname
+ // Zend\Validator\Hostname
"The input appears to be a DNS hostname but the given punycode notation cannot be decoded" => "L'entrée semble être un DNS valide mais le code n'a pu être décodé",
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
"The input appears to be a DNS hostname but contains a dash in an invalid position" => "L'entrée semble être un nom d'hôte DNS mais il contient un tiret à une position invalide",
@@ -212,66 +224,66 @@ return array(
"The input appears to be a DNS hostname but cannot extract TLD part" => "L'entrée semble être un nom d'hôte DNS mais l'extension TLD ne peut être extraite",
"The input appears to be a DNS hostname but cannot match TLD against known list" => "L'entrée semble être un nom d'hôte DNS mais son extension TLD semble inconnue",
- // Zend_Validator_Iban
+ // Zend\Validator\Iban
"Unknown country within the IBAN" => "Pays inconnu pour l'IBAN",
"Countries outside the Single Euro Payments Area (SEPA) are not supported" => "Les pays en dehors du Single Euro Payments Area (SEPA) ne sont pas supportés",
"The input has a false IBAN format" => "L'entrée n'a pas un format IBAN valide",
"The input has failed the IBAN check" => "L'entrée n'a pas passé la validation IBAN",
- // Zend_Validator_Identical
+ // Zend\Validator\Identical
"The two given tokens do not match" => "Les deux jetons passés ne correspondent pas",
"No token was provided to match against" => "Aucun jeton de correspondance n'a été donné",
- // Zend_Validator_InArray
+ // Zend\Validator\InArray
"The input was not found in the haystack" => "L'entrée ne fait pas partie des valeurs attendues",
- // Zend_Validator_Ip
+ // Zend\Validator\Ip
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
"The input does not appear to be a valid IP address" => "L'entrée ne semble pas être une adresse IP valide",
- // Zend_Validator_Isbn
+ // Zend\Validator\Isbn
"Invalid type given. String or integer expected" => "Type invalide. Chaîne ou entier attendu",
"The input is not a valid ISBN number" => "L'entrée n'est pas un nombre ISBN valide",
- // Zend_Validator_LessThan
+ // Zend\Validator\LessThan
"The input is not less than '%max%'" => "L'entrée n'est pas inférieure à '%max%'",
"The input is not less or equal than '%max%'" => "L'entrée n'est pas inférieure ou égale à '%max%'",
- // Zend_Validator_NotEmpty
+ // Zend\Validator\NotEmpty
"Value is required and can't be empty" => "Une valeur est requise et ne peut être vide",
"Invalid type given. String, integer, float, boolean or array expected" => "Type invalide. Chaîne, entier, flottant, booléen ou tableau attendu",
- // Zend_Validator_Regex
+ // Zend\Validator\Regex
"Invalid type given. String, integer or float expected" => "Type invalide. Chaîne, entier ou flottant attendu",
"The input does not match against pattern '%pattern%'" => "L'entrée n'est pas valide avec l'expression '%pattern%'",
"There was an internal error while using the pattern '%pattern%'" => "Une erreur interne est survenue avec l'expression '%pattern%'",
- // Zend_Validator_Sitemap_Changefreq
+ // Zend\Validator\Sitemap\Changefreq
"The input is not a valid sitemap changefreq" => "L'entrée n'est pas une valeur de fréquence de sitemap valide",
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
- // Zend_Validator_Sitemap_Lastmod
+ // Zend\Validator\Sitemap\Lastmod
"The input is not a valid sitemap lastmod" => "L'entrée n'est pas une date de modification de sitemap valide",
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
- // Zend_Validator_Sitemap_Loc
+ // Zend\Validator\Sitemap\Loc
"The input is not a valid sitemap location" => "L'entrée n'est pas un emplacement de sitemap valide",
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
- // Zend_Validator_Sitemap_Priority
+ // Zend\Validator\Sitemap\Priority
"The input is not a valid sitemap priority" => "L'entrée n'est pas une priorité de sitemap valide",
"Invalid type given. Numeric string, integer or float expected" => "Type invalide. Chaîne numérique, entier ou flottant attendu",
- // Zend_Validator_Step
+ // Zend\Validator\Step
"Invalid value given. Scalar expected" => "Type invalide. Scalaire attendu",
"The input is not a valid step" => "L'entrée n'est pas un multiple valide",
- // Zend_Validator_StringLength
+ // Zend\Validator\StringLength
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
"The input is less than %min% characters long" => "L'entrée contient moins de %min% caractères",
"The input is more than %max% characters long" => "L'entrée contient plus de %max% caractères",
- // Zend_Validator_Uri
+ // Zend\Validator\Uri
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
"The input does not appear to be a valid Uri" => "L'entrée ne semble pas être une URI valide",
);
diff --git a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php
index 6288ab9e1e894b31a8e121f56df94e1171408ed3..3e130ee54e06805fc6a0c33d20751d62039cceab 100644
--- a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php
@@ -21,7 +21,7 @@
*/
return array(
// Zend_Captcha_ReCaptcha
- "Missing captcha fields" => "沒有找到驗è‰ç¢¼å€åŸŸ",
+ "Missing captcha fields" => "請輸入驗è‰ç¢¼",
"Failed to validate captcha" => "é©—è‰ç¢¼æ ¡é©—失敗",
"Captcha value is wrong: %value%" => "é©—è‰ç¢¼ä¸åŒ¹é…: %value%",