From d30e7db5bd40deea1160aa734623e1983e826755 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 27 Aug 2013 14:17:17 -0400
Subject: [PATCH] Upgrade to ZF 2.2.2.
---
composer.json | 2 +-
composer.lock | 26 ++--
module/VuFind/config/module.config.php | 2 +
vendor/autoload.php | 2 +-
vendor/bin/pluginmap_generator.php | 1 +
vendor/bin/templatemap_generator.php | 1 +
vendor/composer/autoload_namespaces.php | 1 -
vendor/composer/autoload_real.php | 6 +-
vendor/composer/installed.json | 124 ++++++++---------
.../zendframework/zendframework/CHANGELOG.md | 66 +++++++++
vendor/zendframework/zendframework/README.md | 8 +-
.../zendframework/bin/autoload_example.php | 2 +-
.../zendframework/bin/autoload_examples.php | 2 +-
.../zendframework/bin/classmap_generator.php | 11 +-
.../zendframework/bin/pluginmap_generator.php | 13 +-
.../bin/templatemap_generator.php | 2 +-
.../zendframework/zendframework/composer.json | 10 +-
.../Zend/Cache/Storage/Adapter/Redis.php | 6 +-
.../Cache/Storage/Adapter/RedisOptions.php | 2 +-
.../Storage/Adapter/RedisResourceManager.php | 14 ++
.../library/Zend/Captcha/AbstractWord.php | 2 +-
.../library/Zend/Captcha/ReCaptcha.php | 6 +
.../library/Zend/Captcha/composer.json | 3 +-
.../Zend/Code/Generator/DocBlock/Tag.php | 13 --
.../Zend/Code/Generator/FileGenerator.php | 24 +---
.../Zend/Code/Reflection/FileReflection.php | 23 +++-
.../library/Zend/Config/Reader/Ini.php | 2 +-
.../library/Zend/Crypt/Password/Bcrypt.php | 2 +-
.../Zend/Db/Adapter/Driver/Oci8/Result.php | 3 +-
.../Zend/Db/Adapter/Driver/Sqlsrv/Result.php | 3 +-
.../Zend/Db/Adapter/ParameterContainer.php | 6 +-
.../Zend/Db/ResultSet/ResultSetInterface.php | 5 +-
.../zendframework/library/Zend/Di/Di.php | 13 ++
.../library/Zend/Feed/Reader/Collection.php | 6 +-
.../Reader/Collection/AbstractCollection.php | 4 +-
.../Feed/Reader/Collection/Collection.php | 6 +-
.../Reader/Extension/Syndication/Feed.php | 4 +-
.../Writer/Renderer/Entry/Atom/Deleted.php | 12 +-
.../Feed/Writer/Renderer/Feed/Atom/Source.php | 10 +-
.../library/Zend/Filter/AbstractFilter.php | 3 +-
.../library/Zend/Filter/AbstractUnicode.php | 2 +-
.../library/Zend/Filter/BaseName.php | 23 +++-
.../library/Zend/Filter/Boolean.php | 6 +-
.../library/Zend/Filter/Callback.php | 4 +-
.../library/Zend/Filter/Compress.php | 6 +-
.../Compress/AbstractCompressionAlgorithm.php | 2 +-
.../library/Zend/Filter/Compress/Bz2.php | 4 +-
.../library/Zend/Filter/Compress/Gz.php | 6 +-
.../library/Zend/Filter/Compress/Rar.php | 8 +-
.../library/Zend/Filter/Compress/Tar.php | 6 +-
.../library/Zend/Filter/Compress/Zip.php | 4 +-
.../library/Zend/Filter/DateTimeFormatter.php | 6 +-
.../library/Zend/Filter/Digits.php | 21 ++-
.../library/Zend/Filter/Encrypt.php | 2 +-
.../Zend/Filter/Encrypt/BlockCipher.php | 8 +-
.../library/Zend/Filter/Encrypt/Openssl.php | 14 +-
.../library/Zend/Filter/File/Decrypt.php | 2 +-
.../library/Zend/Filter/File/Encrypt.php | 2 +-
.../library/Zend/Filter/File/Rename.php | 2 +-
.../library/Zend/Filter/File/RenameUpload.php | 15 ++-
.../library/Zend/Filter/FilterChain.php | 14 +-
.../library/Zend/Filter/HtmlEntities.php | 31 ++++-
.../library/Zend/Filter/Inflector.php | 70 +++++-----
.../zendframework/library/Zend/Filter/Int.php | 21 ++-
.../library/Zend/Filter/Null.php | 2 +-
.../library/Zend/Filter/PregReplace.php | 4 +-
.../library/Zend/Filter/RealPath.php | 23 +++-
.../library/Zend/Filter/StringToLower.php | 21 ++-
.../library/Zend/Filter/StringToUpper.php | 23 +++-
.../library/Zend/Filter/StringTrim.php | 2 +-
.../library/Zend/Filter/StripTags.php | 26 +++-
.../library/Zend/Filter/UriNormalize.php | 4 +-
.../Zend/Filter/Word/AbstractSeparator.php | 6 +-
.../Zend/Filter/Word/SeparatorToDash.php | 2 +-
.../Zend/Filter/Word/SeparatorToSeparator.php | 16 +--
.../Form/Annotation/AnnotationBuilder.php | 10 +-
.../library/Zend/Form/Annotation/Object.php | 13 +-
.../Zend/Form/Annotation/ValidationGroup.php | 13 +-
.../library/Zend/Form/Element/Button.php | 17 +--
.../library/Zend/Form/Element/Checkbox.php | 17 +--
.../library/Zend/Form/Element/File.php | 17 +--
.../library/Zend/Form/Element/Hidden.php | 17 +--
.../library/Zend/Form/Element/Image.php | 17 +--
.../library/Zend/Form/Element/MonthSelect.php | 4 +-
.../library/Zend/Form/Element/Password.php | 17 +--
.../library/Zend/Form/Element/Select.php | 17 +--
.../library/Zend/Form/Element/Submit.php | 17 +--
.../library/Zend/Form/Element/Text.php | 17 +--
.../library/Zend/Form/Element/Textarea.php | 17 +--
.../library/Zend/Form/Factory.php | 69 ++++++++++
.../Zend/Form/View/Helper/FormDateSelect.php | 4 +-
.../Form/View/Helper/FormElementErrors.php | 10 +-
.../Zend/Form/View/Helper/FormMonthSelect.php | 6 +-
.../library/Zend/Form/View/Helper/FormRow.php | 2 +-
.../library/Zend/Http/Client/Adapter/Curl.php | 8 ++
.../library/Zend/Http/Header/Accept.php | 29 ++--
.../library/Zend/Http/Header/SetCookie.php | 126 +++++++++---------
.../Zend/I18n/Validator/PhoneNumber.php | 2 +
.../Zend/I18n/View/Helper/CurrencyFormat.php | 26 +++-
.../library/Zend/I18n/composer.json | 3 +-
.../Zend/InputFilter/BaseInputFilter.php | 1 +
.../library/Zend/InputFilter/Factory.php | 6 +-
.../library/Zend/InputFilter/Input.php | 1 +
.../library/Zend/Json/Server/Error.php | 2 +-
.../library/Zend/Json/Server/Request.php | 24 +++-
.../library/Zend/Json/Server/Server.php | 4 +
.../library/Zend/Ldap/Collection.php | 5 +-
.../Zend/Ldap/Collection/DefaultIterator.php | 4 +-
.../zendframework/library/Zend/Ldap/Dn.php | 4 +-
.../zendframework/library/Zend/Ldap/Node.php | 4 +-
.../library/Zend/Ldap/Node/AbstractNode.php | 4 +-
.../Zend/Ldap/Node/ChildrenIterator.php | 6 +-
.../Zend/Ldap/Node/Schema/AbstractItem.php | 4 +-
.../Zend/Loader/PluginClassLocator.php | 3 +-
.../library/Zend/Mail/Protocol/Smtp.php | 1 +
.../Zend/Mail/Protocol/Smtp/Auth/Crammd5.php | 20 +--
.../Zend/Mail/Storage/Writable/Maildir.php | 3 +-
.../library/Zend/Mail/composer.json | 1 +
.../library/Zend/Mime/Decode.php | 2 +-
.../Controller/AbstractRestfulController.php | 99 ++++++++++----
.../Controller/Plugin/FilePostRedirectGet.php | 11 +-
.../Zend/Mvc/Controller/PluginManager.php | 1 -
.../Zend/Mvc/Router/Console/Catchall.php | 13 +-
.../Mvc/Router/Console/RouteInterface.php | 13 +-
.../Zend/Mvc/Router/Console/RouteMatch.php | 13 +-
.../Zend/Mvc/Router/Console/Simple.php | 13 +-
.../Zend/Mvc/Service/RouterFactory.php | 7 +-
.../View/Console/CreateViewModelListener.php | 13 +-
.../Zend/Navigation/Page/AbstractPage.php | 8 +-
.../Paginator/SerializableLimitIterator.php | 5 +-
.../Zend/Permissions/Rbac/RoleInterface.php | 4 +-
.../library/Zend/ProgressBar/composer.json | 3 +
.../library/Zend/Server/Definition.php | 5 +-
.../Storage/AbstractSessionArrayStorage.php | 5 +-
.../Controller/AbstractControllerTestCase.php | 4 +-
.../Zend/Text/Figlet/zend-framework.flf | 2 +-
.../library/Zend/Validator/EmailAddress.php | 15 +--
.../library/Zend/Validator/File/MimeType.php | 42 +++---
.../Zend/Validator/ValidatorPluginManager.php | 2 +
.../library/Zend/Validator/composer.json | 3 +
.../library/Zend/Version/Version.php | 16 +--
.../Zend/View/Helper/AbstractHtmlElement.php | 2 +
.../library/Zend/View/Helper/Cycle.php | 9 +-
.../library/Zend/View/Helper/HeadLink.php | 35 +++--
.../library/Zend/View/Helper/HeadMeta.php | 28 ++--
.../library/Zend/View/Helper/HeadScript.php | 22 +--
.../library/Zend/View/Helper/HeadStyle.php | 12 +-
.../library/Zend/View/Helper/InlineScript.php | 2 +-
.../Container/AbstractContainer.php | 3 +-
.../library/Zend/View/HelperPluginManager.php | 4 +-
.../library/Zend/View/Model/ConsoleModel.php | 17 +--
.../library/Zend/XmlRpc/Request/Stdin.php | 4 +-
.../resources/languages/ar/Zend_Captcha.php | 13 +-
.../resources/languages/ar/Zend_Validate.php | 13 +-
.../resources/languages/bg/Zend_Captcha.php | 13 +-
.../resources/languages/bg/Zend_Validate.php | 13 +-
.../resources/languages/ca/Zend_Captcha.php | 13 +-
.../resources/languages/ca/Zend_Validate.php | 13 +-
.../resources/languages/cs/Zend_Captcha.php | 13 +-
.../resources/languages/cs/Zend_Validate.php | 13 +-
.../resources/languages/de/Zend_Captcha.php | 13 +-
.../resources/languages/de/Zend_Validate.php | 2 +-
.../resources/languages/en/Zend_Captcha.php | 13 +-
.../resources/languages/en/Zend_Validate.php | 24 ++--
.../resources/languages/es/Zend_Validate.php | 13 +-
.../resources/languages/fi/Zend_Validate.php | 13 +-
.../resources/languages/fr/Zend_Captcha.php | 13 +-
.../resources/languages/fr/Zend_Validate.php | 13 +-
.../resources/languages/hr/Zend_Validate.php | 13 +-
.../resources/languages/it/Zend_Captcha.php | 13 +-
.../resources/languages/it/Zend_Validate.php | 13 +-
.../resources/languages/ja/Zend_Validate.php | 13 +-
.../resources/languages/nl/Zend_Validate.php | 13 +-
.../resources/languages/no/Zend_Captcha.php | 13 +-
.../resources/languages/no/Zend_Validate.php | 13 +-
.../resources/languages/pl/Zend_Validate.php | 13 +-
.../languages/pt_BR/Zend_Captcha.php | 13 +-
.../languages/pt_BR/Zend_Validate.php | 13 +-
.../resources/languages/ru/Zend_Validate.php | 13 +-
.../resources/languages/se/Zend_Captcha.php | 13 +-
.../resources/languages/se/Zend_Validate.php | 13 +-
.../resources/languages/sk/Zend_Captcha.php | 13 +-
.../resources/languages/sk/Zend_Validate.php | 13 +-
.../resources/languages/sl/Zend_Captcha.php | 13 +-
.../resources/languages/sl/Zend_Validate.php | 13 +-
.../resources/languages/sr/Zend_Validate.php | 13 +-
.../resources/languages/tr/Zend_Captcha.php | 13 +-
.../resources/languages/tr/Zend_Validate.php | 13 +-
.../resources/languages/uk/Zend_Validate.php | 13 +-
.../resources/languages/zh/Zend_Captcha.php | 13 +-
.../resources/languages/zh/Zend_Validate.php | 13 +-
.../languages/zh_TW/Zend_Captcha.php | 13 +-
.../languages/zh_TW/Zend_Validate.php | 13 +-
193 files changed, 1173 insertions(+), 1248 deletions(-)
create mode 120000 vendor/bin/pluginmap_generator.php
create mode 120000 vendor/bin/templatemap_generator.php
mode change 100644 => 100755 vendor/zendframework/zendframework/bin/pluginmap_generator.php
mode change 100644 => 100755 vendor/zendframework/zendframework/bin/templatemap_generator.php
diff --git a/composer.json b/composer.json
index c5720e33d45..b1fd7892dd1 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.1",
+ "zendframework/zendframework": "2.2.2",
"zendframework/zendrest": "2.*",
"zendframework/zendservice-amazon": "2.*"
}
diff --git a/composer.lock b/composer.lock
index b984d7ef160..41ae5fc5498 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": "83fbfd387d9ede9662af03b21e48c831",
+ "hash": "491fdb42e52e4e1f5c562c15af39febf",
"packages": [
{
"name": "johnwohlers/sip2",
@@ -368,17 +368,17 @@
},
{
"name": "zendframework/zendframework",
- "version": "2.2.1",
+ "version": "2.2.2",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "release-2.2.1"
+ "reference": "7469e0ca45e55f6179cea109e7d4e210ba9b2b10"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-2.2.1-release-2.2.1-8597ab.zip",
- "reference": "2.2.1",
- "shasum": "f8419ea13b7f3f1195b625fa789688b47efe8778"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-7469e0ca45e55f6179cea109e7d4e210ba9b2b10-zip-bb08c0.zip",
+ "reference": "2.2.2",
+ "shasum": "3f6fc92c3c428f37f9ef2fde78c58551ca718dfd"
},
"require": {
"php": ">=5.3.3"
@@ -420,6 +420,7 @@
"zendframework/zend-permissions-acl": "self.version",
"zendframework/zend-permissions-rbac": "self.version",
"zendframework/zend-progressbar": "self.version",
+ "zendframework/zend-resources": "self.version",
"zendframework/zend-serializer": "self.version",
"zendframework/zend-server": "self.version",
"zendframework/zend-servicemanager": "self.version",
@@ -439,7 +440,7 @@
"doctrine/annotations": ">=1.0",
"ircmaxell/random-lib": "dev-master",
"ircmaxell/security-lib": "dev-master",
- "ocramius/proxy-manager": "0.3.*",
+ "ocramius/proxy-manager": "0.4.*",
"phpunit/phpunit": "3.7.*"
},
"suggest": {
@@ -451,7 +452,9 @@
"zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
},
"bin": [
- "bin/classmap_generator.php"
+ "bin/classmap_generator.php",
+ "bin/pluginmap_generator.php",
+ "bin/templatemap_generator.php"
],
"type": "library",
"extra": {
@@ -462,8 +465,7 @@
},
"autoload": {
"psr-0": {
- "Zend\\": "library/",
- "ZendTest\\": "tests/"
+ "Zend\\": "library/"
}
},
"license": [
@@ -476,10 +478,10 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.2.1",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.2.2",
"issues": "https://github.com/zendframework/zf2/issues"
},
- "time": "2013-06-12 20:13:34"
+ "time": "2013-07-24 14:02:19"
},
{
"name": "zendframework/zendrest",
diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index 83a2b98697a..6d256530178 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -138,6 +138,7 @@ $config = array(
)
),
'service_manager' => array(
+ 'allow_override' => true,
'factories' => array(
'VuFind\AuthManager' => function ($sm) {
return new \VuFind\Auth\Manager(
@@ -325,6 +326,7 @@ $config = array(
array('VuFind\ServiceManager\Initializer', 'initInstance'),
),
'aliases' => array(
+ 'mvctranslator' => 'VuFind\Translator',
'translator' => 'VuFind\Translator',
),
),
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 5347e7c08c1..d965d44fd94 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitead8bc6e07874aa3993992df7474c87b::getLoader();
+return ComposerAutoloaderInitd4dc7abf7910770a4d1ce5bcecd7c1d7::getLoader();
diff --git a/vendor/bin/pluginmap_generator.php b/vendor/bin/pluginmap_generator.php
new file mode 120000
index 00000000000..40956b819a3
--- /dev/null
+++ b/vendor/bin/pluginmap_generator.php
@@ -0,0 +1 @@
+../zendframework/zendframework/bin/pluginmap_generator.php
\ No newline at end of file
diff --git a/vendor/bin/templatemap_generator.php b/vendor/bin/templatemap_generator.php
new file mode 120000
index 00000000000..4dc96c371cb
--- /dev/null
+++ b/vendor/bin/templatemap_generator.php
@@ -0,0 +1 @@
+../zendframework/zendframework/bin/templatemap_generator.php
\ No newline at end of file
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 07fb04d56b5..1bbc3b650e8 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -7,7 +7,6 @@ $baseDir = dirname($vendorDir);
return array(
'Zend\\' => array($vendorDir . '/zendframework/zendframework/library'),
- 'ZendTest\\' => array($vendorDir . '/zendframework/zendframework/tests'),
'ZendService' => array($vendorDir . '/zendframework/zendservice-amazon/library'),
'ZendRest' => array($vendorDir . '/zendframework/zendrest/library'),
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 6dfdc15c513..eb58b54db49 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php generated by Composer
-class ComposerAutoloaderInitead8bc6e07874aa3993992df7474c87b
+class ComposerAutoloaderInitd4dc7abf7910770a4d1ce5bcecd7c1d7
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitead8bc6e07874aa3993992df7474c87b
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitead8bc6e07874aa3993992df7474c87b', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitd4dc7abf7910770a4d1ce5bcecd7c1d7', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitead8bc6e07874aa3993992df7474c87b', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitd4dc7abf7910770a4d1ce5bcecd7c1d7', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 0345ac3982e..eff2f1151c2 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -443,20 +443,69 @@
"issues": "https://github.com/zendframework/ZendService_Amazon/issues"
}
},
+ {
+ "name": "symfony/yaml",
+ "version": "v2.3.4",
+ "version_normalized": "2.3.4.0",
+ "target-dir": "Symfony/Component/Yaml",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/Yaml.git",
+ "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
+ "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "time": "2013-08-24 15:26:22",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.3-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Component\\Yaml\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Yaml Component",
+ "homepage": "http://symfony.com"
+ },
{
"name": "zendframework/zendframework",
- "version": "2.2.1",
- "version_normalized": "2.2.1.0",
+ "version": "2.2.2",
+ "version_normalized": "2.2.2.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "release-2.2.1"
+ "reference": "7469e0ca45e55f6179cea109e7d4e210ba9b2b10"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-2.2.1-release-2.2.1-8597ab.zip",
- "reference": "2.2.1",
- "shasum": "f8419ea13b7f3f1195b625fa789688b47efe8778"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-7469e0ca45e55f6179cea109e7d4e210ba9b2b10-zip-bb08c0.zip",
+ "reference": "2.2.2",
+ "shasum": "3f6fc92c3c428f37f9ef2fde78c58551ca718dfd"
},
"require": {
"php": ">=5.3.3"
@@ -498,6 +547,7 @@
"zendframework/zend-permissions-acl": "self.version",
"zendframework/zend-permissions-rbac": "self.version",
"zendframework/zend-progressbar": "self.version",
+ "zendframework/zend-resources": "self.version",
"zendframework/zend-serializer": "self.version",
"zendframework/zend-server": "self.version",
"zendframework/zend-servicemanager": "self.version",
@@ -517,7 +567,7 @@
"doctrine/annotations": ">=1.0",
"ircmaxell/random-lib": "dev-master",
"ircmaxell/security-lib": "dev-master",
- "ocramius/proxy-manager": "0.3.*",
+ "ocramius/proxy-manager": "0.4.*",
"phpunit/phpunit": "3.7.*"
},
"suggest": {
@@ -528,9 +578,11 @@
"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-06-12 20:13:34",
+ "time": "2013-07-24 14:02:19",
"bin": [
- "bin/classmap_generator.php"
+ "bin/classmap_generator.php",
+ "bin/pluginmap_generator.php",
+ "bin/templatemap_generator.php"
],
"type": "library",
"extra": {
@@ -542,8 +594,7 @@
"installation-source": "dist",
"autoload": {
"psr-0": {
- "Zend\\": "library/",
- "ZendTest\\": "tests/"
+ "Zend\\": "library/"
}
},
"license": [
@@ -556,57 +607,8 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.2.1",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.2.2",
"issues": "https://github.com/zendframework/zf2/issues"
}
- },
- {
- "name": "symfony/yaml",
- "version": "v2.3.4",
- "version_normalized": "2.3.4.0",
- "target-dir": "Symfony/Component/Yaml",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Yaml.git",
- "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
- "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "time": "2013-08-24 15:26:22",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Yaml\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- }
- ],
- "description": "Symfony Yaml Component",
- "homepage": "http://symfony.com"
}
]
diff --git a/vendor/zendframework/zendframework/CHANGELOG.md b/vendor/zendframework/zendframework/CHANGELOG.md
index 27e9c0375a0..3e95fe2a857 100644
--- a/vendor/zendframework/zendframework/CHANGELOG.md
+++ b/vendor/zendframework/zendframework/CHANGELOG.md
@@ -1,5 +1,71 @@
# CHANGELOG
+## 2.2.2 (2013-07-24):
+
+- [4105: Method "headLink" does not exist](https://github.com/zendframework/zf2/issues/4105)
+- [4555: Zend\Http\Response::getBody() tries to decode gzip that has already been decoded by cURL](https://github.com/zendframework/zf2/issues/4555)
+- [4564: [Navigation\ Allow non-string permissions](https://github.com/zendframework/zf2/issues/4564)
+- [4567: [InputFilter\[Hotfix\ Missing check for allowEmpty()](https://github.com/zendframework/zf2/issues/4567)
+- [4612: Templatemap generator: keys of templatemap not correct?](https://github.com/zendframework/zf2/issues/4612)
+- [4631: remove redundance @copyright and @license docblock because of already written](https://github.com/zendframework/zf2/issues/4631)
+- [4640: Split multiple implements into multiple lines](https://github.com/zendframework/zf2/issues/4640)
+- [4643: Add use statements](https://github.com/zendframework/zf2/issues/4643)
+- [4644: Make ValidatorPluginManager aware of PhoneNumber validator](https://github.com/zendframework/zf2/issues/4644)
+- [4646: Docblock subject misspelling](https://github.com/zendframework/zf2/issues/4646)
+- [4649: [code\ Implement logic for include a file in FileReflection if this exists and is not already included](https://github.com/zendframework/zf2/issues/4649)
+- [4650: Some doc block fixes](https://github.com/zendframework/zf2/issues/4650)
+- [4652: router defaults not being set properly in console](https://github.com/zendframework/zf2/issues/4652)
+- [4654: Make AbstractRestController rest methods non-abstract #4209](https://github.com/zendframework/zf2/issues/4654)
+- [4665: Make ValidatorPluginManager aware of DateTime validator](https://github.com/zendframework/zf2/issues/4665)
+- [4676: Fix file post redirect get redirection with ModuleRouteListener](https://github.com/zendframework/zf2/issues/4676)
+- [4688: Add @todo docblock](https://github.com/zendframework/zf2/issues/4688)
+- [4690: Zend\Mail\Protocol\Smtp does not reset protected $auth after disconnect](https://github.com/zendframework/zf2/issues/4690)
+- [4692: added zendframework/zend-resources to the global composer.json](https://github.com/zendframework/zf2/issues/4692)
+- [4696: [WIP\ Enforcing composer version in travis builds](https://github.com/zendframework/zf2/issues/4696)
+- [4699: Add use statements](https://github.com/zendframework/zf2/issues/4699)
+- [4700: PHP 5.5 can't fail anymore](https://github.com/zendframework/zf2/issues/4700)
+- [4702: DocBlock and CS fixes](https://github.com/zendframework/zf2/issues/4702)
+- [4705: add zendframework/zend-json to Zend\ProgressBar\composer.json as suggest](https://github.com/zendframework/zf2/issues/4705)
+- [4722: remove bloated LICENSE description at header for consistency ](https://github.com/zendframework/zf2/issues/4722)
+- [4725: Add sorting to classmap generator](https://github.com/zendframework/zf2/issues/4725)
+- [4729: Provide ability to configure ReCaptcha Service public and private keys via options](https://github.com/zendframework/zf2/issues/4729)
+- [4734: Fix for #4727](https://github.com/zendframework/zf2/issues/4734)
+- [4738: remove unnecessary space after function name](https://github.com/zendframework/zf2/issues/4738)
+- [4741: Hotfix/4740](https://github.com/zendframework/zf2/issues/4741)
+- [4743: Update PluginManager.php](https://github.com/zendframework/zf2/issues/4743)
+- [4744: Remove ZendTest from Composer](https://github.com/zendframework/zf2/issues/4744)
+- [4746: Bumping supported ProxyManager version](https://github.com/zendframework/zf2/issues/4746)
+- [4754: Update SimpleStreamResponseSenderTest.php](https://github.com/zendframework/zf2/issues/4754)
+- [4759: Added pluginmap_generator + templatemap_generator to BIN directory](https://github.com/zendframework/zf2/issues/4759)
+- [4761: Remove exceptions from #4734](https://github.com/zendframework/zf2/issues/4761)
+- [4762: [Hotfix\ Fix conflicting use statement](https://github.com/zendframework/zf2/issues/4762)
+- [4771: Form\View\Helper\FormRow label position gets overwritten by __invoke()](https://github.com/zendframework/zf2/issues/4771)
+- [4776: Zend\Http\Header\SetCookie Allow unsetting cookie attibutes by resetting to null](https://github.com/zendframework/zf2/issues/4776)
+- [4777: Change file mode from 644 to 755 templatemap_generator.php](https://github.com/zendframework/zf2/issues/4777)
+- [4778: Zend\Validator depends on Zend\Filter](https://github.com/zendframework/zf2/issues/4778)
+- [4783: Make methods setUp and tearDown protected](https://github.com/zendframework/zf2/issues/4783)
+- [4787: Update Zend_Validate.php](https://github.com/zendframework/zf2/issues/4787)
+- [4788: set factory in CollectionInputFilter](https://github.com/zendframework/zf2/issues/4788)
+- [4790: Add check to DI to see if we have a class to instantiate](https://github.com/zendframework/zf2/issues/4790)
+- [4793: [validator\ Validate quoted local part of email addresses](https://github.com/zendframework/zf2/issues/4793)
+- [4798: Default mode variables HeadScript and InlineScript](https://github.com/zendframework/zf2/issues/4798)
+- [4804: Possible Typo in Zend / Cache / Storage / Adapter / RedisResourceManager](https://github.com/zendframework/zf2/issues/4804)
+- [4805: Zend\I18n\View\Helper\CurrencyFormat | showDecimals parameter overrides the default value](https://github.com/zendframework/zf2/issues/4805)
+- [4808: Unimplemented REST methods should set a 405 status](https://github.com/zendframework/zf2/issues/4808)
+- [4818: Issue4817](https://github.com/zendframework/zf2/issues/4818)
+- [4830: Correct spelling of function getMajorVersion](https://github.com/zendframework/zf2/issues/4830)
+- [4835: Update templatemap_generator.php](https://github.com/zendframework/zf2/issues/4835)
+- [4838: Little fix in InputFilter/Factory](https://github.com/zendframework/zf2/issues/4838)
+- [4847: Fix Version::getLatest docblock](https://github.com/zendframework/zf2/issues/4847)
+- [4850: Allow form elements created via Annotations to have same default InputFilter as created via array specification](https://github.com/zendframework/zf2/issues/4850)
+- [4854: Allow FormElementErrors view helper to translate messages](https://github.com/zendframework/zf2/issues/4854)
+- [4856: Zend\Validator\File\MimeType warning with no params](https://github.com/zendframework/zf2/issues/4856)
+- [4857: `fault` property must be an instance of \Zend\XmlRpc\Fault](https://github.com/zendframework/zf2/issues/4857)
+- [4858: Removed @category, @package and @subpackage docblock tags in ZendTest\Config](https://github.com/zendframework/zf2/issues/4858)
+- [4859: doc block changes in head view helpers](https://github.com/zendframework/zf2/issues/4859)
+- [4866: update tests/ZendTest/Mvc/ApplicationTest.php](https://github.com/zendframework/zf2/issues/4866)
+- [4870: Use MvcTranslator to inject view helpers](https://github.com/zendframework/zf2/issues/4870)
+
## 2.2.1 (2013-06-12):
- [3647: Problems in the way Zend\Paginator\Adapter\DbSelect count()s](https://github.com/zendframework/zf2/issues/3647)
diff --git a/vendor/zendframework/zendframework/README.md b/vendor/zendframework/zendframework/README.md
index 7aa9ae85e2d..58121ad7b55 100644
--- a/vendor/zendframework/zendframework/README.md
+++ b/vendor/zendframework/zendframework/README.md
@@ -5,13 +5,13 @@ Develop: [.
diff --git a/vendor/zendframework/zendframework/bin/autoload_example.php b/vendor/zendframework/zendframework/bin/autoload_example.php
index bce3058de79..39c5dea36df 100644
--- a/vendor/zendframework/zendframework/bin/autoload_example.php
+++ b/vendor/zendframework/zendframework/bin/autoload_example.php
@@ -5,7 +5,7 @@ $loader->registerAutoloadMap(__DIR__ . '/../library/Zend/.classmap.php');
$loader->register();
if (!class_exists('Zend\Controller\Action')) {
- echo "Could not find action class?\n";
+ echo "Could not find action class!\n";
} else {
echo "Found action class!\n";
}
diff --git a/vendor/zendframework/zendframework/bin/autoload_examples.php b/vendor/zendframework/zendframework/bin/autoload_examples.php
index bae2cc3793f..57334d95c75 100644
--- a/vendor/zendframework/zendframework/bin/autoload_examples.php
+++ b/vendor/zendframework/zendframework/bin/autoload_examples.php
@@ -6,7 +6,7 @@ if (!class_exists('Zend\Controller\Action')) {
echo "Found action class!\n";
}
if (!class_exists('Zend\Version')) {
- echo "Could not find version class?\n";
+ echo "Could not find version class!\n";
} else {
echo "Found version class!\n";
}
diff --git a/vendor/zendframework/zendframework/bin/classmap_generator.php b/vendor/zendframework/zendframework/bin/classmap_generator.php
index b4f17a3325f..ea3f8d60310 100755
--- a/vendor/zendframework/zendframework/bin/classmap_generator.php
+++ b/vendor/zendframework/zendframework/bin/classmap_generator.php
@@ -25,6 +25,7 @@ use Zend\Loader\StandardAutoloader;
* --overwrite|-w Whether or not to overwrite existing autoload
* file
* --ignore|-i [ <string> ] Comma-separated namespaces to ignore
+ * --sort|-s Alphabetically sort classes
*/
$zfLibraryPath = getenv('LIB_PATH') ? getenv('LIB_PATH') : __DIR__ . '/../library';
@@ -55,6 +56,7 @@ $rules = array(
'append|a' => 'Append to autoload file if it exists',
'overwrite|w' => 'Whether or not to overwrite existing autoload file',
'ignore|i-s' => 'Comma-separated namespaces to ignore',
+ 'sort|s' => 'Alphabetically sort classes',
);
try {
@@ -174,8 +176,13 @@ foreach ($l as $file) {
}
}
+$map = (array) $map;
+if ($opts->getOption('s')) {
+ ksort($map);
+}
+
if ($appending) {
- $content = var_export((array) $map, true) . ';';
+ $content = var_export($map, true) . ';';
// Prefix with __DIR__; modify the generated content
$content = preg_replace("#(=> ')#", "=> __DIR__ . '/", $content);
@@ -198,7 +205,7 @@ if ($appending) {
// Stupid syntax highlighters make separating < from PHP declaration necessary
$content = '<' . "?php\n"
. "// Generated by ZF2's ./bin/classmap_generator.php\n"
- . 'return ' . var_export((array) $map, true) . ';';
+ . 'return ' . var_export($map, true) . ';';
// Prefix with __DIR__; modify the generated content
$content = preg_replace("#(=> ')#", "=> __DIR__ . '/", $content);
diff --git a/vendor/zendframework/zendframework/bin/pluginmap_generator.php b/vendor/zendframework/zendframework/bin/pluginmap_generator.php
old mode 100644
new mode 100755
index cffeb66738e..297f28b5925
--- a/vendor/zendframework/zendframework/bin/pluginmap_generator.php
+++ b/vendor/zendframework/zendframework/bin/pluginmap_generator.php
@@ -1,18 +1,9 @@
#!/usr/bin/env php
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * Zend Framework (http://framework.zend.com/)
*
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
* @category Zend
* @package Zend_Loader
* @subpackage Exception
diff --git a/vendor/zendframework/zendframework/bin/templatemap_generator.php b/vendor/zendframework/zendframework/bin/templatemap_generator.php
old mode 100644
new mode 100755
index 5f5d50763dd..1cbec65eca4
--- a/vendor/zendframework/zendframework/bin/templatemap_generator.php
+++ b/vendor/zendframework/zendframework/bin/templatemap_generator.php
@@ -178,7 +178,7 @@ foreach ($l as $file) {
// Add in relative path to library
$filename = $relativePathForMap . $filename;
$baseName = $file->getBasename('.' . $file->getExtension());
- $mapName = str_replace($libraryPath . '/', '', str_replace(DIRECTORY_SEPARATOR, '/', $file->getPath()) . '/' . $baseName);
+ $mapName = str_replace(str_replace(DIRECTORY_SEPARATOR, '/', realpath($viewPath)) . '/', '', str_replace(DIRECTORY_SEPARATOR, '/', $file->getPath()) . '/' . $baseName);
$map->{$mapName} = $filename;
}
diff --git a/vendor/zendframework/zendframework/composer.json b/vendor/zendframework/zendframework/composer.json
index 152acf3b470..b165a6b9b04 100644
--- a/vendor/zendframework/zendframework/composer.json
+++ b/vendor/zendframework/zendframework/composer.json
@@ -15,7 +15,7 @@
"doctrine/annotations": ">=1.0",
"ircmaxell/random-lib": "dev-master",
"ircmaxell/security-lib": "dev-master",
- "ocramius/proxy-manager": "0.3.*",
+ "ocramius/proxy-manager": "0.4.*",
"phpunit/PHPUnit": "3.7.*"
},
"suggest": {
@@ -28,12 +28,13 @@
},
"autoload": {
"psr-0": {
- "Zend\\": "library/",
- "ZendTest\\": "tests/"
+ "Zend\\": "library/"
}
},
"bin": [
- "bin/classmap_generator.php"
+ "bin/classmap_generator.php",
+ "bin/pluginmap_generator.php",
+ "bin/templatemap_generator.php"
],
"replace": {
"zendframework/zend-authentication": "self.version",
@@ -72,6 +73,7 @@
"zendframework/zend-permissions-acl": "self.version",
"zendframework/zend-permissions-rbac": "self.version",
"zendframework/zend-progressbar": "self.version",
+ "zendframework/zend-resources": "self.version",
"zendframework/zend-serializer": "self.version",
"zendframework/zend-server": "self.version",
"zendframework/zend-servicemanager": "self.version",
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 94b7c8c3817..af4ac75a815 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php
@@ -226,7 +226,7 @@ class Redis extends AbstractAdapter implements
try {
if ($ttl) {
- if ($this->resourceManager->getMayorVersion($this->resourceId) < 2) {
+ if ($this->resourceManager->getMajorVersion($this->resourceId) < 2) {
throw new Exception\UnsupportedMethodCallException("To use ttl you need version >= 2.0.0");
}
$success = $redis->setex($this->namespacePrefix . $normalizedKey, $ttl, $value);
@@ -260,7 +260,7 @@ class Redis extends AbstractAdapter implements
try {
if ($ttl > 0) {
//check if ttl is supported
- if ($this->resourceManager->getMayorVersion($this->resourceId) < 2) {
+ if ($this->resourceManager->getMajorVersion($this->resourceId) < 2) {
throw new Exception\UnsupportedMethodCallException("To use ttl you need version >= 2.0.0");
}
//mSet does not allow ttl, so use transaction
@@ -402,7 +402,7 @@ class Redis extends AbstractAdapter implements
{
if ($this->capabilities === null) {
$this->capabilityMarker = new stdClass();
- $minTtl = $this->resourceManager->getMayorVersion($this->resourceId) < 2 ? 0 : 1;
+ $minTtl = $this->resourceManager->getMajorVersion($this->resourceId) < 2 ? 0 : 1;
//without serialization redis supports only strings for simple
//get/set methods
$this->capabilities = new Capabilities(
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 b167dd9ba5f..84c75de2fe7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
@@ -21,7 +21,7 @@ class RedisOptions extends AdapterOptions
protected $namespaceSeparator = ':';
/**
- * The memcached resource manager
+ * The redis resource manager
*
* @var null|RedisResourceManager
*/
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 691f827b73d..2fb6b8011f0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
@@ -508,11 +508,25 @@ class RedisResourceManager
/**
* Get redis server version
*
+ * @deprecated 2.2.2 Use getMajorVersion instead
+ *
* @param string $id
* @return int
* @throws Exception\RuntimeException
*/
public function getMayorVersion($id)
+ {
+ return $this->getMajorVersion($id);
+ }
+
+ /**
+ * Get redis server version
+ *
+ * @param string $id
+ * @return int
+ * @throws Exception\RuntimeException
+ */
+ public function getMajorVersion($id)
{
if (!$this->hasResource($id)) {
throw new Exception\RuntimeException("No resource with id '{$id}'");
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php
index f95f7537a97..7c0a942bc01 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php
@@ -172,7 +172,7 @@ abstract class AbstractWord extends AbstractAdapter
* @param string $id
* @return AbstractWord
*/
- protected function setId ($id)
+ protected function setId($id)
{
$this->id = $id;
return $this;
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/ReCaptcha.php b/vendor/zendframework/zendframework/library/Zend/Captcha/ReCaptcha.php
index 64c51c9bec9..64d2f56ff77 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/ReCaptcha.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/ReCaptcha.php
@@ -126,6 +126,12 @@ class ReCaptcha extends AbstractAdapter
parent::__construct($options);
if (!empty($options)) {
+ if (array_key_exists('private_key', $options)) {
+ $this->getService()->setPrivateKey($options['private_key']);
+ }
+ if (array_key_exists('public_key', $options)) {
+ $this->getService()->setPublicKey($options['public_key']);
+ }
$this->setOptions($options);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json b/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json
index 06eaa278634..35bbd0db503 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json
@@ -21,7 +21,8 @@
"zendframework/zendservice-recaptcha": "*"
},
"suggest": {
- "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
+ "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component",
+ "zendframework/zend-resources": "Translations of captcha messages"
},
"extra": {
"branch-alias": {
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
index 5478b329db3..4b0c2ace343 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
@@ -44,19 +44,6 @@ class Tag extends AbstractGenerator
*/
protected $description = null;
- /**
- * @param array $options
- */
- public function __construct(array $options = array())
- {
- if (isset($options['name'])) {
- $this->setName($options['name']);
- }
- if (isset($options['description'])) {
- $this->setDescription($options['description']);
- }
- }
-
/**
* Build a Tag generator object from a reflection object
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php
index 79381d0e0b2..f9cd83a7b1e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php
@@ -9,6 +9,7 @@
namespace Zend\Code\Generator;
+use Zend\Code\Reflection\Exception as ReflectionException;
use Zend\Code\Reflection\FileReflection;
class FileGenerator extends AbstractGenerator
@@ -66,30 +67,13 @@ class FileGenerator extends AbstractGenerator
*
* @param string $filePath
* @param bool $includeIfNotAlreadyIncluded
- * @throws Exception\InvalidArgumentException If file does not exists
- * @throes Exception\RuntimeException If file exists but is not included or required
+ * @throws ReflectionException\InvalidArgumentException If file does not exists
+ * @throws ReflectionException\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 = stream_resolve_include_path($filePath);
- }
-
- if (!$realpath) {
- throw new Exception\InvalidArgumentException(sprintf(
- 'No file for %s was found.',
- $filePath
- ));
- }
-
- if ($includeIfNotAlreadyIncluded && !in_array($realpath, get_included_files())) {
- include $realpath;
- }
-
- $fileReflector = new FileReflection($realpath);
+ $fileReflector = new FileReflection($filePath, $includeIfNotAlreadyIncluded);
$codeGenerator = static::fromReflection($fileReflector);
return $codeGenerator;
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FileReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FileReflection.php
index 541dc5479fa..122198e9329 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FileReflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FileReflection.php
@@ -65,21 +65,34 @@ class FileReflection implements ReflectionInterface
/**
* @param string $filename
- * @throws Exception\RuntimeException
+ * @param bool $includeIfNotAlreadyIncluded
+ * @throws Exception\InvalidArgumentException If file does not exists
+ * @throws Exception\RuntimeException If file exists but is not included or required
*/
- public function __construct($filename)
+ public function __construct($filename, $includeIfNotAlreadyIncluded = false)
{
if (($fileRealPath = realpath($filename)) === false) {
$fileRealPath = stream_resolve_include_path($filename);
}
- if (!$fileRealPath || !in_array($fileRealPath, get_included_files())) {
- throw new Exception\RuntimeException(sprintf(
- 'File %s must be required before it can be reflected',
+ if (!$fileRealPath) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'No file for %s was found.',
$filename
));
}
+ if (!in_array($fileRealPath, get_included_files())) {
+ if (!$includeIfNotAlreadyIncluded) {
+ throw new Exception\RuntimeException(sprintf(
+ 'File %s must be required before it can be reflected',
+ $filename
+ ));
+ }
+
+ include $fileRealPath;
+ }
+
$this->filePath = $fileRealPath;
$this->reflect();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Reader/Ini.php b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Ini.php
index 9159bc86de6..8f682d28847 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Reader/Ini.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Ini.php
@@ -12,7 +12,7 @@ namespace Zend\Config\Reader;
use Zend\Config\Exception;
/**
- * XML config reader.
+ * INI config reader.
*/
class Ini implements ReaderInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
index 45b33704431..8dfa3cb262e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
@@ -90,7 +90,7 @@ class Bcrypt implements PasswordInterface
// check if the password contains 8-bit character
if (preg_match('/[\x80-\xFF]/', $password)) {
throw new Exception\RuntimeException(
- 'The bcrypt implementation used by PHP can contains a security flaw ' .
+ 'The bcrypt implementation used by PHP can contain a security flaw ' .
'using password with 8-bit character. ' .
'We suggest to upgrade to PHP 5.3.7+ or use passwords with only 7-bit characters'
);
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
index 2033d12b6d7..375dc3705eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
@@ -9,10 +9,11 @@
namespace Zend\Db\Adapter\Driver\Oci8;
+use Iterator;
use Zend\Db\Adapter\Driver\ResultInterface;
use Zend\Db\Adapter\Exception;
-class Result implements \Iterator, ResultInterface
+class Result implements Iterator, ResultInterface
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
index 3018600083e..77a22d8fdb0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
@@ -9,9 +9,10 @@
namespace Zend\Db\Adapter\Driver\Sqlsrv;
+use Iterator;
use Zend\Db\Adapter\Driver\ResultInterface;
-class Result implements \Iterator, ResultInterface
+class Result implements Iterator, ResultInterface
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php
index 8745c412b55..cefe0eea45a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php
@@ -9,7 +9,11 @@
namespace Zend\Db\Adapter;
-class ParameterContainer implements \Iterator, \ArrayAccess, \Countable
+use ArrayAccess;
+use Countable;
+use Iterator;
+
+class ParameterContainer implements Iterator, ArrayAccess, Countable
{
const TYPE_AUTO = 'auto';
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSetInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSetInterface.php
index ca393e6bc37..f3839cbafdd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSetInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSetInterface.php
@@ -9,7 +9,10 @@
namespace Zend\Db\ResultSet;
-interface ResultSetInterface extends \Traversable, \Countable
+use Countable;
+use Traversable;
+
+interface ResultSetInterface extends Traversable, Countable
{
/**
* Can be anything traversable|array
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Di.php b/vendor/zendframework/zendframework/library/Zend/Di/Di.php
index b68791d7d33..d7700196b1e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Di.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Di.php
@@ -446,6 +446,19 @@ class Di implements DependencyInjectionInterface
$callParameters = $this->resolveMethodParameters($class, '__construct', $params, $alias, self::METHOD_IS_CONSTRUCTOR, true);
}
+ if (!class_exists($class)) {
+ if (interface_exists($class)) {
+ throw new Exception\ClassNotFoundException(sprintf(
+ 'Cannot instantiate interface "%s"',
+ $class
+ ));
+ }
+ throw new Exception\ClassNotFoundException(sprintf(
+ 'Class "%s" does not exist; cannot instantiate',
+ $class
+ ));
+ }
+
// Hack to avoid Reflection in most common use cases
switch (count($callParameters)) {
case 0:
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection.php
index 32144dfa23c..7385655e1ef 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection.php
@@ -9,9 +9,9 @@
namespace Zend\Feed\Reader;
-class Collection extends \ArrayObject
-{
-
+use ArrayObject;
+class Collection extends ArrayObject
+{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/AbstractCollection.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/AbstractCollection.php
index 8c64ec99cc2..bf7d7ab2b75 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/AbstractCollection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/AbstractCollection.php
@@ -9,7 +9,9 @@
namespace Zend\Feed\Reader\Collection;
-abstract class AbstractCollection extends \ArrayObject
+use ArrayObject;
+
+abstract class AbstractCollection extends ArrayObject
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Collection.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Collection.php
index 820a695ab92..0e9d242dd3c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Collection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Collection.php
@@ -9,9 +9,9 @@
namespace Zend\Feed\Reader\Collection;
-class Collection extends \ArrayObject
-{
-
+use ArrayObject;
+class Collection extends ArrayObject
+{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Syndication/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
index 75f031b2899..ae659d64f7a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
@@ -13,7 +13,7 @@ use DateTime;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Extension;
-class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
+class Feed extends Extension\AbstractFeed
{
/**
* Get update period
@@ -46,6 +46,7 @@ class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
/**
* Get update frequency
+ *
* @return int
*/
public function getUpdateFrequency()
@@ -63,6 +64,7 @@ class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
/**
* Get update frequency as ticks
+ *
* @return int
*/
public function getUpdateFrequencyAsTicks()
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
index 679b6c48f42..3cefe3e3007 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
@@ -12,17 +12,17 @@ namespace Zend\Feed\Writer\Renderer\Entry\Atom;
use DateTime;
use DOMDocument;
use DOMElement;
+use Zend\Feed\Writer;
+use Zend\Feed\Writer\Renderer;
-class Deleted
- extends \Zend\Feed\Writer\Renderer\AbstractRenderer
- implements \Zend\Feed\Writer\Renderer\RendererInterface
+class Deleted extends Renderer\AbstractRenderer implements Renderer\RendererInterface
{
/**
* Constructor
*
- * @param \Zend\Feed\Writer\Deleted $container
+ * @param Writer\Deleted $container
*/
- public function __construct (\Zend\Feed\Writer\Deleted $container)
+ public function __construct (Writer\Deleted $container)
{
parent::__construct($container);
}
@@ -30,7 +30,7 @@ class Deleted
/**
* Render atom entry
*
- * @return \Zend\Feed\Writer\Renderer\Entry\Atom
+ * @return Writer\Renderer\Entry\Atom
*/
public function render()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
index f9fbf2d957f..e02844390ef 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
@@ -11,16 +11,18 @@ namespace Zend\Feed\Writer\Renderer\Feed\Atom;
use DOMDocument;
use DOMElement;
+use Zend\Feed\Writer;
+use Zend\Feed\Writer\Renderer;
-class Source extends AbstractAtom implements \Zend\Feed\Writer\Renderer\RendererInterface
+class Source extends AbstractAtom implements Renderer\RendererInterface
{
/**
* Constructor
*
- * @param \Zend\Feed\Writer\Source $container
+ * @param Writer\Source $container
*/
- public function __construct (\Zend\Feed\Writer\Source $container)
+ public function __construct (Writer\Source $container)
{
parent::__construct($container);
}
@@ -28,7 +30,7 @@ class Source extends AbstractAtom implements \Zend\Feed\Writer\Renderer\Renderer
/**
* Render Atom Feed Metadata (Source element)
*
- * @return \Zend\Feed\Writer\Renderer\Feed\Atom
+ * @return Writer\Renderer\Feed\Atom
*/
public function render()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/AbstractFilter.php b/vendor/zendframework/zendframework/library/Zend/Filter/AbstractFilter.php
index 2b14b6bd553..22e805eb488 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/AbstractFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/AbstractFilter.php
@@ -32,7 +32,7 @@ abstract class AbstractFilter implements FilterInterface
/**
* @param array|Traversable $options
- * @return AbstractFilter
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setOptions($options)
@@ -86,7 +86,6 @@ abstract class AbstractFilter implements FilterInterface
}
/**
- *
* @param mixed $options
* @return bool
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/AbstractUnicode.php b/vendor/zendframework/zendframework/library/Zend/Filter/AbstractUnicode.php
index 8e89306357f..1c399c6689d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/AbstractUnicode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/AbstractUnicode.php
@@ -15,7 +15,7 @@ abstract class AbstractUnicode extends AbstractFilter
* Set the input encoding for the given string
*
* @param string|null $encoding
- * @return StringToLower
+ * @return self
* @throws Exception\InvalidArgumentException
* @throws Exception\ExtensionNotLoadedException
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/BaseName.php b/vendor/zendframework/zendframework/library/Zend/Filter/BaseName.php
index 0b25b500e2e..d3a0d0e0a62 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/BaseName.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/BaseName.php
@@ -14,13 +14,32 @@ class BaseName extends AbstractFilter
/**
* Defined by Zend\Filter\FilterInterface
*
- * Returns basename($value)
+ * Returns basename($value).
+ *
+ * If the value provided is non-scalar, the value will remain unfiltered
+ * and an E_USER_WARNING will be raised indicating it's unfilterable.
*
* @param string $value
- * @return string
+ * @return string|mixed
*/
public function filter($value)
{
+ if (null === $value) {
+ return null;
+ }
+
+ if (!is_scalar($value)){
+ trigger_error(
+ sprintf(
+ '%s expects parameter to be scalar, "%s" given; cannot filter',
+ __METHOD__,
+ (is_object($value) ? get_class($value) : gettype($value))
+ ),
+ E_USER_WARNING
+ );
+ return $value;
+ }
+
return basename((string) $value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php b/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php
index 38f22298866..9de8b9363d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php
@@ -90,7 +90,7 @@ class Boolean extends AbstractFilter
*
* @param int|array $type
* @throws Exception\InvalidArgumentException
- * @return bool
+ * @return self
*/
public function setType($type = null)
{
@@ -137,7 +137,7 @@ class Boolean extends AbstractFilter
* @param bool $flag When true this filter works like cast
* When false it recognises only true and false
* and all other values are returned as is
- * @return bool
+ * @return self
*/
public function setCasting($flag = true)
{
@@ -158,7 +158,7 @@ class Boolean extends AbstractFilter
/**
* @param array|Traversable $translations
* @throws Exception\InvalidArgumentException
- * @return bool
+ * @return self
*/
public function setTranslations($translations)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Callback.php b/vendor/zendframework/zendframework/library/Zend/Filter/Callback.php
index e389b9fc268..c41399242bf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Callback.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Callback.php
@@ -68,7 +68,7 @@ class Callback extends AbstractFilter
* Sets parameters for the callback
*
* @param mixed $params
- * @return Callback
+ * @return self
*/
public function setCallbackParams($params)
{
@@ -79,7 +79,7 @@ class Callback extends AbstractFilter
/**
* Get parameters for the callback
*
- * @return mixed
+ * @return array
*/
public function getCallbackParams()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php
index d63f484688a..4c61179e014 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php
@@ -51,7 +51,7 @@ class Compress extends AbstractFilter
*
* @param array $options
* @throws Exception\InvalidArgumentException if options is not an array or Traversable
- * @return Compress
+ * @return self
*/
public function setOptions($options)
{
@@ -122,7 +122,7 @@ class Compress extends AbstractFilter
* Sets compression adapter
*
* @param string|Compress\CompressionAlgorithmInterface $adapter Adapter to use
- * @return Compress
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setAdapter($adapter)
@@ -153,7 +153,7 @@ class Compress extends AbstractFilter
* Set adapter options
*
* @param array $options
- * @return Compress
+ * @return self
*/
public function setAdapterOptions(array $options)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
index 5d42b3a9f44..079d083d0a9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
@@ -61,7 +61,7 @@ abstract class AbstractCompressionAlgorithm implements CompressionAlgorithmInter
* Sets all or one option
*
* @param array $options
- * @return AbstractCompressionAlgorithm
+ * @return self
*/
public function setOptions(array $options)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php
index 71a91839c2d..376bbd45250 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php
@@ -59,7 +59,7 @@ class Bz2 extends AbstractCompressionAlgorithm
*
* @param int $blocksize
* @throws Exception\InvalidArgumentException
- * @return Bz2
+ * @return self
*/
public function setBlocksize($blocksize)
{
@@ -85,7 +85,7 @@ class Bz2 extends AbstractCompressionAlgorithm
* Sets the archive to use for de-/compression
*
* @param string $archive Archive to use
- * @return Bz2
+ * @return self
*/
public function setArchive($archive)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php
index 02411731b66..5e8d50a9667 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php
@@ -61,7 +61,7 @@ class Gz extends AbstractCompressionAlgorithm
*
* @param int $level
* @throws Exception\InvalidArgumentException
- * @return Gz
+ * @return self
*/
public function setLevel($level)
{
@@ -87,7 +87,7 @@ class Gz extends AbstractCompressionAlgorithm
* Sets a new compression mode
*
* @param string $mode Supported are 'compress', 'deflate' and 'file'
- * @return Gz
+ * @return self
* @throws Exception\InvalidArgumentException for invalid $mode value
*/
public function setMode($mode)
@@ -114,7 +114,7 @@ class Gz extends AbstractCompressionAlgorithm
* Sets the archive to use for de-/compression
*
* @param string $archive Archive to use
- * @return Gz
+ * @return self
*/
public function setArchive($archive)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Rar.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Rar.php
index e6281f759b7..0de26b2b7cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Rar.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Rar.php
@@ -62,7 +62,7 @@ class Rar extends AbstractCompressionAlgorithm
* Sets the callback to use
*
* @param string $callback
- * @return Rar
+ * @return self
* @throws Exception\InvalidArgumentException if invalid callback provided
*/
public function setCallback($callback)
@@ -89,7 +89,7 @@ class Rar extends AbstractCompressionAlgorithm
* Sets the archive to use for de-/compression
*
* @param string $archive Archive to use
- * @return Rar
+ * @return self
*/
public function setArchive($archive)
{
@@ -113,7 +113,7 @@ class Rar extends AbstractCompressionAlgorithm
* Sets the password to use
*
* @param string $password
- * @return Rar
+ * @return self
*/
public function setPassword($password)
{
@@ -135,7 +135,7 @@ class Rar extends AbstractCompressionAlgorithm
* Sets the targetpath to use
*
* @param string $target
- * @return Rar
+ * @return self
* @throws Exception\InvalidArgumentException if specified target directory does not exist
*/
public function setTarget($target)
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Tar.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Tar.php
index 4eae005c3fe..10a0cc15ff0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Tar.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Tar.php
@@ -65,7 +65,7 @@ class Tar extends AbstractCompressionAlgorithm
* Sets the archive to use for de-/compression
*
* @param string $archive Archive to use
- * @return Tar
+ * @return self
*/
public function setArchive($archive)
{
@@ -89,7 +89,7 @@ class Tar extends AbstractCompressionAlgorithm
* Sets the target path to use
*
* @param string $target
- * @return Tar
+ * @return self
* @throws Exception\InvalidArgumentException if target path does not exist
*/
public function setTarget($target)
@@ -119,7 +119,7 @@ class Tar extends AbstractCompressionAlgorithm
* Either Gz or Bz2.
*
* @param string $mode
- * @return Tar
+ * @return self
* @throws Exception\InvalidArgumentException for invalid $mode values
* @throws Exception\ExtensionNotLoadedException if bz2 mode selected but extension not loaded
* @throws Exception\ExtensionNotLoadedException if gz mode selected but extension not loaded
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Zip.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Zip.php
index b27045e48d6..f0e94982eee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Zip.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Zip.php
@@ -60,7 +60,7 @@ class Zip extends AbstractCompressionAlgorithm
* Sets the archive to use for de-/compression
*
* @param string $archive Archive to use
- * @return Zip
+ * @return self
*/
public function setArchive($archive)
{
@@ -85,7 +85,7 @@ class Zip extends AbstractCompressionAlgorithm
*
* @param string $target
* @throws Exception\InvalidArgumentException
- * @return Zip
+ * @return self
*/
public function setTarget($target)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php b/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
index 08fcc2025a0..fa484a8cb4a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
@@ -36,7 +36,7 @@ class DateTimeFormatter extends AbstractFilter
* Set the format string accepted by date() to use when formatting a string
*
* @param string $format
- * @return \Zend\Filter\DateTimeFormatter
+ * @return self
*/
public function setFormat($format)
{
@@ -66,8 +66,8 @@ class DateTimeFormatter extends AbstractFilter
/**
* Normalize the provided value to a formatted string
*
- * @param string|int|DateTime $value
- * @returns string
+ * @param string|int|DateTime $value
+ * @return string
*/
protected function normalizeDateTime($value)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Digits.php b/vendor/zendframework/zendframework/library/Zend/Filter/Digits.php
index 6d175196b4b..15cfc55e87e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Digits.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Digits.php
@@ -18,11 +18,30 @@ class Digits extends AbstractFilter
*
* Returns the string $value, removing all but digit characters
*
+ * If the value provided is non-scalar, the value will remain unfiltered
+ * and an E_USER_WARNING will be raised indicating it's unfilterable.
+ *
* @param string $value
- * @return string
+ * @return string|mixed
*/
public function filter($value)
{
+ if (null === $value) {
+ return null;
+ }
+
+ if (!is_scalar($value)){
+ trigger_error(
+ sprintf(
+ '%s expects parameter to be scalar, "%s" given; cannot filter',
+ __METHOD__,
+ (is_object($value) ? get_class($value) : gettype($value))
+ ),
+ E_USER_WARNING
+ );
+ return $value;
+ }
+
if (!StringUtils::hasPcreUnicodeSupport()) {
// POSIX named classes are not supported, use alternative 0-9 match
$pattern = '/[^0-9]/';
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt.php b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt.php
index 7ba7065e4a8..d03104ea7bd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt.php
@@ -50,7 +50,7 @@ class Encrypt extends AbstractFilter
* Sets new encryption options
*
* @param string|array $options (Optional) Encryption options
- * @return Encrypt
+ * @return self
* @throws Exception\DomainException
* @throws Exception\InvalidArgumentException
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/BlockCipher.php b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/BlockCipher.php
index 2de6461aa76..1415ed7a2cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/BlockCipher.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/BlockCipher.php
@@ -98,7 +98,7 @@ class BlockCipher implements EncryptionAlgorithmInterface
* Sets new encryption options
*
* @param string|array $options Encryption options
- * @return BlockCipher
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setEncryption($options)
@@ -162,7 +162,7 @@ class BlockCipher implements EncryptionAlgorithmInterface
* Set the inizialization vector
*
* @param string $vector
- * @return BlockCipher
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setVector($vector)
@@ -180,7 +180,7 @@ class BlockCipher implements EncryptionAlgorithmInterface
* Set the encryption key
*
* @param string $key
- * @return BlockCipher
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setKey($key)
@@ -218,7 +218,7 @@ class BlockCipher implements EncryptionAlgorithmInterface
* Sets a internal compression for values to encrypt
*
* @param string|array $compression
- * @return BlockCipher
+ * @return self
*/
public function setCompression($compression)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/Openssl.php b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/Openssl.php
index c5652fbb3c0..4e433a2be7d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/Openssl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/Openssl.php
@@ -104,7 +104,7 @@ class Openssl implements EncryptionAlgorithmInterface
* Sets the encryption keys
*
* @param string|array $keys Key with type association
- * @return Openssl
+ * @return self
* @throws Exception\InvalidArgumentException
*/
protected function _setKeys($keys)
@@ -168,7 +168,7 @@ class Openssl implements EncryptionAlgorithmInterface
* Sets public keys
*
* @param string|array $key Public keys
- * @return \Zend\Filter\Encrypt\Openssl
+ * @return self
*/
public function setPublicKey($key)
{
@@ -202,7 +202,7 @@ class Openssl implements EncryptionAlgorithmInterface
*
* @param string $key Private key
* @param string $passphrase
- * @return Openssl
+ * @return self
*/
public function setPrivateKey($key, $passphrase = null)
{
@@ -239,7 +239,7 @@ class Openssl implements EncryptionAlgorithmInterface
* Sets envelope keys
*
* @param string|array $key Envelope keys
- * @return \Zend\Filter\Encrypt\Openssl
+ * @return self
*/
public function setEnvelopeKey($key)
{
@@ -271,7 +271,7 @@ class Openssl implements EncryptionAlgorithmInterface
* Sets a new passphrase
*
* @param string $passphrase
- * @return Openssl
+ * @return self
*/
public function setPassphrase($passphrase)
{
@@ -293,7 +293,7 @@ class Openssl implements EncryptionAlgorithmInterface
* Sets a internal compression for values to encrypt
*
* @param string|array $compression
- * @return Openssl
+ * @return self
*/
public function setCompression($compression)
{
@@ -319,7 +319,7 @@ class Openssl implements EncryptionAlgorithmInterface
* Sets if the envelope keys should be included in the encrypted value
*
* @param bool $package
- * @return Openssl
+ * @return self
*/
public function setPackage($package)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/Decrypt.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/Decrypt.php
index ff2528efb70..8f8de27d36a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/Decrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/Decrypt.php
@@ -38,7 +38,7 @@ class Decrypt extends Filter\Decrypt
* Sets the new filename where the content will be stored
*
* @param string $filename (Optional) New filename to set
- * @return Decrypt
+ * @return self
*/
public function setFilename($filename = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/Encrypt.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/Encrypt.php
index 196fade373f..038e5e00825 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/Encrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/Encrypt.php
@@ -38,7 +38,7 @@ class Encrypt extends Filter\Encrypt
* Sets the new filename where the content will be stored
*
* @param string $filename (Optional) New filename to set
- * @return Encrypt
+ * @return self
*/
public function setFilename($filename = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
index 83c437e9e0e..55a68834c37 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
@@ -69,7 +69,7 @@ class Rename extends Filter\AbstractFilter
* 'randomize' => Shall target files have a random postfix attached?
*
* @param string|array $options Old file or directory to be rewritten
- * @return \Zend\Filter\File\Rename
+ * @return self
*/
public function setFile($options)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php
index a1451361315..ff6756850d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php
@@ -51,7 +51,7 @@ class RenameUpload extends AbstractFilter
/**
* @param string $target Target file path or directory
- * @return RenameUpload
+ * @return self
*/
public function setTarget($target)
{
@@ -76,7 +76,7 @@ class RenameUpload extends AbstractFilter
* @param bool $flag When true, this filter will use the $_FILES['name']
* as the target filename.
* Otherwise, it uses the default 'target' rules.
- * @return RenameUpload
+ * @return self
*/
public function setUseUploadName($flag = true)
{
@@ -95,7 +95,7 @@ class RenameUpload extends AbstractFilter
/**
* @param bool $flag When true, this filter will use the original file
* extension for the target filename
- * @return RenameUpload
+ * @return self
*/
public function setUseUploadExtension($flag = true)
{
@@ -113,7 +113,7 @@ class RenameUpload extends AbstractFilter
/**
* @param bool $flag Shall existing files be overwritten?
- * @return RenameUpload
+ * @return self
*/
public function setOverwrite($flag = true)
{
@@ -131,7 +131,7 @@ class RenameUpload extends AbstractFilter
/**
* @param bool $flag Shall target files have a random postfix attached?
- * @return RenameUpload
+ * @return self
*/
public function setRandomize($flag = true)
{
@@ -198,7 +198,7 @@ class RenameUpload extends AbstractFilter
/**
* @param string $sourceFile Source file path
* @param string $targetFile Target file path
- * @throws \Zend\Filter\Exception\RuntimeException
+ * @throws Exception\RuntimeException
* @return bool
*/
protected function moveUploadedFile($sourceFile, $targetFile)
@@ -218,7 +218,7 @@ class RenameUpload extends AbstractFilter
/**
* @param string $targetFile Target file path
- * @throws \Zend\Filter\Exception\InvalidArgumentException
+ * @throws Exception\InvalidArgumentException
*/
protected function checkFileExists($targetFile)
{
@@ -281,6 +281,7 @@ class RenameUpload extends AbstractFilter
}
/**
+ * @param string $source
* @param string $filename
* @return string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/FilterChain.php b/vendor/zendframework/zendframework/library/Zend/Filter/FilterChain.php
index 25576d1a1b5..92ce1ddc45e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/FilterChain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/FilterChain.php
@@ -34,6 +34,7 @@ class FilterChain extends AbstractFilter implements Countable
/**
* Initialize filter chain
*
+ * @param null|array|Traversable $options
*/
public function __construct($options = null)
{
@@ -44,6 +45,11 @@ class FilterChain extends AbstractFilter implements Countable
}
}
+ /**
+ * @param array|Traversable $options
+ * @return self
+ * @throws Exception\InvalidArgumentException
+ */
public function setOptions($options)
{
if (!is_array($options) && !$options instanceof \Traversable) {
@@ -110,7 +116,7 @@ class FilterChain extends AbstractFilter implements Countable
* Set plugin manager instance
*
* @param FilterPluginManager $plugins
- * @return FilterChain
+ * @return self
*/
public function setPluginManager(FilterPluginManager $plugins)
{
@@ -137,7 +143,7 @@ class FilterChain extends AbstractFilter implements Countable
* @param callable|FilterInterface $callback A Filter implementation or valid PHP callback
* @param int $priority Priority at which to enqueue filter; defaults to 1000 (higher executes earlier)
* @throws Exception\InvalidArgumentException
- * @return FilterChain
+ * @return self
*/
public function attach($callback, $priority = self::DEFAULT_PRIORITY)
{
@@ -163,7 +169,7 @@ class FilterChain extends AbstractFilter implements Countable
* @param string $name
* @param mixed $options
* @param int $priority Priority at which to enqueue filter; defaults to 1000 (higher executes earlier)
- * @return FilterChain
+ * @return self
*/
public function attachByName($name, $options = array(), $priority = self::DEFAULT_PRIORITY)
{
@@ -180,7 +186,7 @@ class FilterChain extends AbstractFilter implements Countable
* Merge the filter chain with the one given in parameter
*
* @param FilterChain $filterChain
- * @return FilterChain
+ * @return self
*/
public function merge(FilterChain $filterChain)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php b/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php
index 2cbce4b0ad2..c518e0f7c99 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php
@@ -89,7 +89,7 @@ class HtmlEntities extends AbstractFilter
* Sets the quoteStyle option
*
* @param int $quoteStyle
- * @return HtmlEntities Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setQuoteStyle($quoteStyle)
{
@@ -112,7 +112,7 @@ class HtmlEntities extends AbstractFilter
* Set encoding
*
* @param string $value
- * @return HtmlEntities
+ * @return self
*/
public function setEncoding($value)
{
@@ -138,7 +138,7 @@ class HtmlEntities extends AbstractFilter
* Proxies to {@link setEncoding()}
*
* @param string $charSet
- * @return HtmlEntities Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setCharSet($charSet)
{
@@ -159,7 +159,7 @@ class HtmlEntities extends AbstractFilter
* Sets the doubleQuote option
*
* @param bool $doubleQuote
- * @return HtmlEntities Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setDoubleQuote($doubleQuote)
{
@@ -173,12 +173,31 @@ class HtmlEntities extends AbstractFilter
* Returns the string $value, converting characters to their corresponding HTML entity
* equivalents where they exist
*
+ * If the value provided is non-scalar, the value will remain unfiltered
+ * and an E_USER_WARNING will be raised indicating it's unfilterable.
+ *
* @param string $value
- * @throws Exception\DomainException
- * @return string
+ * @return string|mixed
+ * @throws Exception\DomainException on encoding mismatches
*/
public function filter($value)
{
+ if (null === $value) {
+ return null;
+ }
+
+ if (!is_scalar($value)){
+ trigger_error(
+ sprintf(
+ '%s expects parameter to be scalar, "%s" given; cannot filter',
+ __METHOD__,
+ (is_object($value) ? get_class($value) : gettype($value))
+ ),
+ E_USER_WARNING
+ );
+ return $value;
+ }
+
$filtered = htmlentities((string) $value, $this->getQuoteStyle(), $this->getEncoding(), $this->getDoubleQuote());
if (strlen((string) $value) && !strlen($filtered)) {
if (!function_exists('iconv')) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php b/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php
index 0804569061f..eca78a5657f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php
@@ -96,7 +96,7 @@ class Inflector extends AbstractFilter
* Set plugin manager
*
* @param FilterPluginManager $manager
- * @return Inflector
+ * @return self
*/
public function setPluginManager(FilterPluginManager $manager)
{
@@ -108,7 +108,7 @@ class Inflector extends AbstractFilter
* Set options
*
* @param array|Traversable $options
- * @return Inflector
+ * @return self
*/
public function setOptions($options)
{
@@ -147,8 +147,8 @@ class Inflector extends AbstractFilter
* Set Whether or not the inflector should throw an exception when a replacement
* identifier is still found within an inflected target.
*
- * @param bool $throwTargetExceptionsOn
- * @return Inflector
+ * @param bool $throwTargetExceptionsOn
+ * @return self
*/
public function setThrowTargetExceptionsOn($throwTargetExceptionsOn)
{
@@ -169,8 +169,8 @@ class Inflector extends AbstractFilter
/**
* Set the Target Replacement Identifier, by default ':'
*
- * @param string $targetReplacementIdentifier
- * @return Inflector
+ * @param string $targetReplacementIdentifier
+ * @return self
*/
public function setTargetReplacementIdentifier($targetReplacementIdentifier)
{
@@ -195,8 +195,8 @@ class Inflector extends AbstractFilter
* Set a Target
* ex: 'scripts/:controller/:action.:suffix'
*
- * @param string
- * @return Inflector
+ * @param string $target
+ * @return self
*/
public function setTarget($target)
{
@@ -217,8 +217,8 @@ class Inflector extends AbstractFilter
/**
* Set Target Reference
*
- * @param reference $target
- * @return Inflector
+ * @param reference $target
+ * @return self
*/
public function setTargetReference(&$target)
{
@@ -227,13 +227,13 @@ class Inflector extends AbstractFilter
}
/**
- * SetRules() is the same as calling addRules() with the exception that it
+ * Is the same as calling addRules() with the exception that it
* clears the rules before adding them.
*
- * @param array $rules
- * @return Inflector
+ * @param array $rules
+ * @return self
*/
- public function setRules(Array $rules)
+ public function setRules(array $rules)
{
$this->clearRules();
$this->addRules($rules);
@@ -241,7 +241,7 @@ class Inflector extends AbstractFilter
}
/**
- * AddRules(): multi-call to setting filter rules.
+ * Multi-call to setting filter rules.
*
* If prefixed with a ":" (colon), a filter rule will be added. If not
* prefixed, a static replacement will be added.
@@ -253,10 +253,10 @@ class Inflector extends AbstractFilter
* 'suffix' => 'phtml'
* );
*
- * @param array
- * @return Inflector
+ * @param array $rules
+ * @return self
*/
- public function addRules(Array $rules)
+ public function addRules(array $rules)
{
$keys = array_keys($rules);
foreach ($keys as $spec) {
@@ -293,10 +293,10 @@ class Inflector extends AbstractFilter
}
/**
- * getRule() returns a rule set by setFilterRule(), a numeric index must be provided
+ * Returns a rule set by setFilterRule(), a numeric index must be provided
*
- * @param string $spec
- * @param int $index
+ * @param string $spec
+ * @param int $index
* @return FilterInterface|false
*/
public function getRule($spec, $index)
@@ -311,9 +311,9 @@ class Inflector extends AbstractFilter
}
/**
- * ClearRules() clears the rules currently in the inflector
+ * Clears the rules currently in the inflector
*
- * @return Inflector
+ * @return self
*/
public function clearRules()
{
@@ -325,9 +325,9 @@ class Inflector extends AbstractFilter
* Set a filtering rule for a spec. $ruleSet can be a string, Filter object
* or an array of strings or filter objects.
*
- * @param string $spec
- * @param array|string|\Zend\Filter\FilterInterface $ruleSet
- * @return Inflector
+ * @param string $spec
+ * @param array|string|\Zend\Filter\FilterInterface $ruleSet
+ * @return self
*/
public function setFilterRule($spec, $ruleSet)
{
@@ -339,9 +339,9 @@ class Inflector extends AbstractFilter
/**
* Add a filter rule for a spec
*
- * @param mixed $spec
- * @param mixed $ruleSet
- * @return Inflector
+ * @param mixed $spec
+ * @param mixed $ruleSet
+ * @return self
*/
public function addFilterRule($spec, $ruleSet)
{
@@ -370,9 +370,9 @@ class Inflector extends AbstractFilter
/**
* Set a static rule for a spec. This is a single string value
*
- * @param string $name
- * @param string $value
- * @return Inflector
+ * @param string $name
+ * @param string $value
+ * @return self
*/
public function setStaticRule($name, $value)
{
@@ -388,9 +388,9 @@ class Inflector extends AbstractFilter
* in to be referenced when its time to build the output string from the
* target.
*
- * @param string $name
- * @param mixed $reference
- * @return Inflector
+ * @param string $name
+ * @param mixed $reference
+ * @return self
*/
public function setStaticRuleReference($name, &$reference)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Int.php b/vendor/zendframework/zendframework/library/Zend/Filter/Int.php
index 47b912d7f9f..e82e96d3d5c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Int.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Int.php
@@ -16,11 +16,30 @@ class Int extends AbstractFilter
*
* Returns (int) $value
*
+ * If the value provided is non-scalar, the value will remain unfiltered
+ * and an E_USER_WARNING will be raised indicating it's unfilterable.
+ *
* @param string $value
- * @return int
+ * @return int|mixed
*/
public function filter($value)
{
+ if (null === $value) {
+ return null;
+ }
+
+ if (!is_scalar($value)){
+ trigger_error(
+ sprintf(
+ '%s expects parameter to be scalar, "%s" given; cannot filter',
+ __METHOD__,
+ (is_object($value) ? get_class($value) : gettype($value))
+ ),
+ E_USER_WARNING
+ );
+ return $value;
+ }
+
return (int) ((string) $value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Null.php b/vendor/zendframework/zendframework/library/Zend/Filter/Null.php
index 2f7ecca12f8..a47e86c2380 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Null.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Null.php
@@ -70,7 +70,7 @@ class Null extends AbstractFilter
*
* @param int|array $type
* @throws Exception\InvalidArgumentException
- * @return bool
+ * @return self
*/
public function setType($type = null)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/PregReplace.php b/vendor/zendframework/zendframework/library/Zend/Filter/PregReplace.php
index 2ae2a31d7b3..f5e4d756899 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/PregReplace.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/PregReplace.php
@@ -52,7 +52,7 @@ class PregReplace extends AbstractFilter
* @see preg_replace()
*
* @param string|array $pattern - same as the first argument of preg_replace
- * @return PregReplace
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setPattern($pattern)
@@ -94,7 +94,7 @@ class PregReplace extends AbstractFilter
* @see preg_replace()
*
* @param array|string $replacement - same as the second argument of preg_replace
- * @return PregReplace
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setReplacement($replacement)
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/RealPath.php b/vendor/zendframework/zendframework/library/Zend/Filter/RealPath.php
index b6217ce69d3..2ac2564b3a8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/RealPath.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/RealPath.php
@@ -43,7 +43,7 @@ class RealPath extends AbstractFilter
* FALSE when not existing paths can be given
*
* @param bool $flag Path must exist
- * @return RealPath
+ * @return self
*/
public function setExists($flag = true)
{
@@ -66,11 +66,30 @@ class RealPath extends AbstractFilter
*
* Returns realpath($value)
*
+ * If the value provided is non-scalar, the value will remain unfiltered
+ * and an E_USER_WARNING will be raised indicating it's unfilterable.
+ *
* @param string $value
- * @return string
+ * @return string|mixed
*/
public function filter($value)
{
+ if (null === $value) {
+ return null;
+ }
+
+ if (!is_scalar($value)){
+ trigger_error(
+ sprintf(
+ '%s expects parameter to be scalar, "%s" given; cannot filter',
+ __METHOD__,
+ (is_object($value) ? get_class($value) : gettype($value))
+ ),
+ E_USER_WARNING
+ );
+ return $value;
+ }
+
$path = (string) $value;
if ($this->options['exists']) {
return realpath($path);
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StringToLower.php b/vendor/zendframework/zendframework/library/Zend/Filter/StringToLower.php
index aeb4cf7856f..5087ead3600 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StringToLower.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StringToLower.php
@@ -41,11 +41,30 @@ class StringToLower extends AbstractUnicode
*
* Returns the string $value, converting characters to lowercase as necessary
*
+ * If the value provided is non-scalar, the value will remain unfiltered
+ * and an E_USER_WARNING will be raised indicating it's unfilterable.
+ *
* @param string $value
- * @return string
+ * @return string|mixed
*/
public function filter($value)
{
+ if (null === $value) {
+ return null;
+ }
+
+ if (!is_scalar($value)){
+ trigger_error(
+ sprintf(
+ '%s expects parameter to be scalar, "%s" given; cannot filter',
+ __METHOD__,
+ (is_object($value) ? get_class($value) : gettype($value))
+ ),
+ E_USER_WARNING
+ );
+ return $value;
+ }
+
if ($this->options['encoding'] !== null) {
return mb_strtolower((string) $value, $this->options['encoding']);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StringToUpper.php b/vendor/zendframework/zendframework/library/Zend/Filter/StringToUpper.php
index 02f90cc9fb3..078481651d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StringToUpper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StringToUpper.php
@@ -39,13 +39,32 @@ class StringToUpper extends AbstractUnicode
/**
* Defined by Zend\Filter\FilterInterface
*
- * Returns the string $value, converting characters to lowercase as necessary
+ * Returns the string $value, converting characters to uppercase as necessary
+ *
+ * If the value provided is non-scalar, the value will remain unfiltered
+ * and an E_USER_WARNING will be raised indicating it's unfilterable.
*
* @param string $value
- * @return string
+ * @return string|mixed
*/
public function filter($value)
{
+ if (null === $value) {
+ return null;
+ }
+
+ if (!is_scalar($value)){
+ trigger_error(
+ sprintf(
+ '%s expects parameter to be scalar, "%s" given; cannot filter',
+ __METHOD__,
+ (is_object($value) ? get_class($value) : gettype($value))
+ ),
+ E_USER_WARNING
+ );
+ return $value;
+ }
+
if ($this->options['encoding'] !== null) {
return mb_strtoupper((string) $value, $this->options['encoding']);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StringTrim.php b/vendor/zendframework/zendframework/library/Zend/Filter/StringTrim.php
index 3d777f3d03c..a85fcf9b84e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StringTrim.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StringTrim.php
@@ -42,7 +42,7 @@ class StringTrim extends AbstractFilter
* Sets the charList option
*
* @param string $charList
- * @return StringTrim Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setCharList($charList)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StripTags.php b/vendor/zendframework/zendframework/library/Zend/Filter/StripTags.php
index 9dc63eda8b7..21073853167 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StripTags.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StripTags.php
@@ -90,7 +90,7 @@ class StripTags extends AbstractFilter
* Sets the tagsAllowed option
*
* @param array|string $tagsAllowed
- * @return StripTags Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setTagsAllowed($tagsAllowed)
{
@@ -143,7 +143,7 @@ class StripTags extends AbstractFilter
* Sets the attributesAllowed option
*
* @param array|string $attributesAllowed
- * @return StripTags Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setAttributesAllowed($attributesAllowed)
{
@@ -166,13 +166,31 @@ class StripTags extends AbstractFilter
/**
* Defined by Zend\Filter\FilterInterface
*
- * @todo improve docblock descriptions
+ * If the value provided is non-scalar, the value will remain unfiltered
+ * and an E_USER_WARNING will be raised indicating it's unfilterable.
*
+ * @todo improve docblock descriptions
* @param string $value
- * @return string
+ * @return string|mixed
*/
public function filter($value)
{
+ if (null === $value) {
+ return null;
+ }
+
+ if (!is_scalar($value)){
+ trigger_error(
+ sprintf(
+ '%s expects parameter to be scalar, "%s" given; cannot filter',
+ __METHOD__,
+ (is_object($value) ? get_class($value) : gettype($value))
+ ),
+ E_USER_WARNING
+ );
+ return $value;
+ }
+
$value = (string) $value;
// Strip HTML comments first
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php b/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
index 67dd6852dbc..a3c89c752e2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
@@ -50,7 +50,7 @@ class UriNormalize extends AbstractFilter
* normalize the URI and thus may affect the resulting normalize URI.
*
* @param string $defaultScheme
- * @return \Zend\Filter\UriNormalize
+ * @return self
*/
public function setDefaultScheme($defaultScheme)
{
@@ -70,7 +70,7 @@ class UriNormalize extends AbstractFilter
* real-world user mishaps, it may yield unexpected results at times.
*
* @param string $enforcedScheme
- * @return \Zend\Filter\UriNormalize
+ * @return self
*/
public function setEnforcedScheme($enforcedScheme)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php
index 3ea8a7262fe..3031d3b281b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php
@@ -37,8 +37,8 @@ abstract class AbstractSeparator extends AbstractFilter
/**
* Sets a new separator
*
- * @param string $separator Separator
- * @return AbstractSeparator
+ * @param string $separator Separator
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setSeparator($separator)
@@ -53,7 +53,7 @@ abstract class AbstractSeparator extends AbstractFilter
/**
* Returns the actual set separator
*
- * @return string
+ * @return string
*/
public function getSeparator()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToDash.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToDash.php
index 9f56804729b..c2b491d6433 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToDash.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToDash.php
@@ -14,7 +14,7 @@ class SeparatorToDash extends SeparatorToSeparator
/**
* Constructor
*
- * @param string $searchSeparator Separator to search for change
+ * @param string $searchSeparator Separator to search for change
*/
public function __construct($searchSeparator = ' ')
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToSeparator.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToSeparator.php
index 8559ee35d6a..a1d1135e6c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToSeparator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToSeparator.php
@@ -20,8 +20,8 @@ class SeparatorToSeparator extends AbstractFilter
/**
* Constructor
*
- * @param string $searchSeparator Separator to search for
- * @param string $replacementSeparator Separator to replace with
+ * @param string $searchSeparator Separator to search for
+ * @param string $replacementSeparator Separator to replace with
*/
public function __construct($searchSeparator = ' ', $replacementSeparator = '-')
{
@@ -32,8 +32,8 @@ class SeparatorToSeparator extends AbstractFilter
/**
* Sets a new seperator to search for
*
- * @param string $separator Seperator to search for
- * @return SeparatorToSeparator
+ * @param string $separator Seperator to search for
+ * @return self
*/
public function setSearchSeparator($separator)
{
@@ -44,7 +44,7 @@ class SeparatorToSeparator extends AbstractFilter
/**
* Returns the actual set separator to search for
*
- * @return string
+ * @return string
*/
public function getSearchSeparator()
{
@@ -54,8 +54,8 @@ class SeparatorToSeparator extends AbstractFilter
/**
* Sets a new separator which replaces the searched one
*
- * @param string $separator Separator which replaces the searched one
- * @return SeparatorToSeparator
+ * @param string $separator Separator which replaces the searched one
+ * @return self
*/
public function setReplacementSeparator($separator)
{
@@ -66,7 +66,7 @@ class SeparatorToSeparator extends AbstractFilter
/**
* Returns the actual set separator which replaces the searched one
*
- * @return string
+ * @return string
*/
public function getReplacementSeparator()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
index 532c4fd1cd2..b674ca21631 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
@@ -321,10 +321,12 @@ class AnnotationBuilder implements EventManagerAwareInterface, FormFactoryAwareI
// Since "type" is a reserved name in the filter specification,
// we need to add the specification without the name as the key.
// In all other cases, though, the name is fine.
- if ($name === 'type') {
- $filterSpec[] = $event->getParam('inputSpec');
- } else {
- $filterSpec[$name] = $event->getParam('inputSpec');
+ if ($event->getParam('inputSpec')->count() > 1) {
+ if ($name === 'type') {
+ $filterSpec[] = $event->getParam('inputSpec');
+ } else {
+ $filterSpec[$name] = $event->getParam('inputSpec');
+ }
}
$elementSpec = $event->getParam('elementSpec');
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Object.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Object.php
index a35859eaac8..75fc5799196 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Object.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Object.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ValidationGroup.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ValidationGroup.php
index 923a71602cf..1e7d7745f73 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ValidationGroup.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ValidationGroup.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Button.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Button.php
index b396df9ada7..cc65090e575 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Button.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Button.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -20,10 +11,6 @@ namespace Zend\Form\Element;
use Zend\Form\Element;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class Button extends Element
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php
index 1fa99e9d8c0..87447ad01d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -23,10 +14,6 @@ use Zend\Form\Element;
use Zend\InputFilter\InputProviderInterface;
use Zend\Validator\InArray as InArrayValidator;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class Checkbox extends Element implements InputProviderInterface
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php
index bff2af42e59..bc75b2ef1cb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -23,10 +14,6 @@ use Zend\Form\ElementPrepareAwareInterface;
use Zend\Form\FormInterface;
use Zend\InputFilter\InputProviderInterface;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class File extends Element implements InputProviderInterface, ElementPrepareAwareInterface
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Hidden.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Hidden.php
index 942f6a16565..ddf4aba8a68 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Hidden.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Hidden.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -20,10 +11,6 @@ namespace Zend\Form\Element;
use Zend\Form\Element;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class Hidden extends Element
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Image.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Image.php
index 438aec1d63c..e1c8f503f3b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Image.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Image.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -20,10 +11,6 @@ namespace Zend\Form\Element;
use Zend\Form\Element;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class Image extends Element
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php
index 950678c522a..6ff76b59cca 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php
@@ -9,7 +9,7 @@
namespace Zend\Form\Element;
-use DateTime;
+use DateTime as PhpDateTime;
use Zend\Form\Element;
use Zend\Form\ElementPrepareAwareInterface;
use Zend\Form\FormInterface;
@@ -265,7 +265,7 @@ class MonthSelect extends Element implements InputProviderInterface, ElementPrep
*/
public function setValue($value)
{
- if ($value instanceof DateTime) {
+ if ($value instanceof PhpDateTime) {
$value = array(
'year' => $value->format('Y'),
'month' => $value->format('m')
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php
index ee514c69e9c..18b971b1012 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -22,10 +13,6 @@ use Zend\Form\Element;
use Zend\Form\ElementPrepareAwareInterface;
use Zend\Form\FormInterface;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class Password extends Element implements ElementPrepareAwareInterface
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php
index 40601ffca04..5b9f830955f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -26,10 +17,6 @@ use Zend\InputFilter\InputProviderInterface;
use Zend\Validator\Explode as ExplodeValidator;
use Zend\Validator\InArray as InArrayValidator;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class Select extends Element implements InputProviderInterface
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Submit.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Submit.php
index 9562133bbbc..9c04726c018 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Submit.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Submit.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -20,10 +11,6 @@ namespace Zend\Form\Element;
use Zend\Form\Element;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class Submit extends Element
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Text.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Text.php
index 72281ffb5ff..1d229103ed8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Text.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Text.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -20,10 +11,6 @@ namespace Zend\Form\Element;
use Zend\Form\Element;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class Text extends Element
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Textarea.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Textarea.php
index e225b9ddc02..7c002a70f6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Textarea.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Textarea.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -20,10 +11,6 @@ namespace Zend\Form\Element;
use Zend\Form\Element;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class Textarea extends Element
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Factory.php b/vendor/zendframework/zendframework/library/Zend/Form/Factory.php
index f651744c444..9afd8abacc0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Factory.php
@@ -254,6 +254,9 @@ class Factory
$this->prepareAndInjectFieldsets($spec['fieldsets'], $fieldset, __METHOD__);
}
+ $factory = (isset($spec['factory']) ? $spec['factory'] : $this);
+ $this->prepareAndInjectFactory($factory, $fieldset, __METHOD__);
+
return $fieldset;
}
@@ -450,6 +453,46 @@ class Factory
$fieldset->setHydrator($hydrator);
}
+ /**
+ * Prepare and inject a named factory
+ *
+ * Takes a string indicating a factory class name (or a concrete instance), try first to instantiates the class
+ * by pulling it from service manager, and injects the factory instance into the fieldset.
+ *
+ * @param string|array|Factory $factoryOrName
+ * @param FieldsetInterface $fieldset
+ * @param string $method
+ * @return void
+ * @throws Exception\DomainException If $factoryOrName is not a string, does not resolve to a known class, or
+ * the class does not extend Form\Factory
+ */
+ protected function prepareAndInjectFactory($factoryOrName, FieldsetInterface $fieldset, $method)
+ {
+ if (is_array($factoryOrName)) {
+ if (!isset($factoryOrName['type'])) {
+ throw new Exception\DomainException(sprintf(
+ '%s expects array specification to have a type value',
+ $method
+ ));
+ }
+ $factoryOrName = $factoryOrName['type'];
+ }
+
+ if (is_string($factoryOrName)) {
+ $factoryOrName = $this->getFactoryFromName($factoryOrName);
+ }
+
+ if (!$factoryOrName instanceof Factory) {
+ throw new Exception\DomainException(sprintf(
+ '%s expects a valid extention of Zend\Form\Factory; received "%s"',
+ $method,
+ $factoryOrName
+ ));
+ }
+
+ $fieldset->setFormFactory($factoryOrName);
+ }
+
/**
* Prepare an input filter instance and inject in the provided form
*
@@ -559,4 +602,30 @@ class Factory
$hydrator = new $hydratorName;
return $hydrator;
}
+
+ /**
+ * Try to pull factory from service manager, or instantiates it from its name
+ *
+ * @param string $factoryName
+ * @return mixed
+ * @throws Exception\DomainException
+ */
+ protected function getFactoryFromName($factoryName)
+ {
+ $services = $this->getFormElementManager()->getServiceLocator();
+
+ if ($services && $services->has($factoryName)) {
+ return $services->get($factoryName);
+ }
+
+ if (!class_exists($factoryName)) {
+ throw new Exception\DomainException(sprintf(
+ 'Expects string factory name to be a valid class name; received "%s"',
+ $factoryName
+ ));
+ }
+
+ $factory = new $factoryName;
+ return $factory;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php
index 5508a5ef5c0..44600e39600 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php
@@ -92,8 +92,8 @@ class FormDateSelect extends FormMonthSelectHelper
$result = array();
for ($day = 1; $day <= 31; $day++) {
- $key = $keyFormatter->format($date);
- $value = $valueFormatter->format($date);
+ $key = $keyFormatter->format($date->getTimestamp());
+ $value = $valueFormatter->format($date->getTimestamp());
$result[$key] = $value;
$date->modify('+1 day');
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php
index b66bf067813..d75fd712c6f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php
@@ -78,9 +78,13 @@ class FormElementErrors extends AbstractHelper
// Flatten message array
$escapeHtml = $this->getEscapeHtmlHelper();
$messagesToPrint = array();
- array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml) {
- $messagesToPrint[] = $escapeHtml($item);
- });
+ $self = $this;
+ array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml, $self) {
+ if (null !== ($translator = $self->getTranslator())) {
+ $item = $translator->translate($item, $self->getTranslatorTextDomain());
+ }
+ $messagesToPrint[] = $escapeHtml($item);
+ });
if (empty($messagesToPrint)) {
return '';
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php
index 3979b7ded9c..dbea5d698f8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php
@@ -175,7 +175,7 @@ class FormMonthSelect extends AbstractHelper
}
/**
- * Retrive pattern to use for Date rendering
+ * Retrieve pattern to use for Date rendering
*
* @return string
*/
@@ -257,8 +257,8 @@ class FormMonthSelect extends AbstractHelper
$result = array();
for ($month = 1; $month <= 12; $month++) {
- $key = $keyFormatter->format($date);
- $value = $valueFormatter->format($date);
+ $key = $keyFormatter->format($date->getTimestamp());
+ $value = $valueFormatter->format($date->getTimestamp());
$result[$key] = $value;
$date->modify('+1 month');
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 7b688c5a5b3..a4e358c9c78 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
@@ -92,7 +92,7 @@ class FormRow extends AbstractHelper
if ($labelPosition !== null) {
$this->setLabelPosition($labelPosition);
- } else {
+ } elseif ($this->labelPosition === null) {
$this->setLabelPosition(self::LABEL_PREPEND);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Curl.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Curl.php
index 2f0af52746f..08d82271138 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Curl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Curl.php
@@ -427,6 +427,14 @@ class Curl implements HttpAdapter, StreamInterface
$this->response = str_ireplace("Transfer-Encoding: chunked\r\n", '', $this->response);
}
+ // cURL can automatically handle content encoding; prevent double-decoding from occurring
+ if (isset($this->config['curloptions'][CURLOPT_ENCODING])
+ && '' == $this->config['curloptions'][CURLOPT_ENCODING]
+ && stripos($this->response, "Content-Encoding: gzip\r\n")
+ ) {
+ $this->response = str_ireplace("Content-Encoding: gzip\r\n", '', $this->response);
+ }
+
// Eliminate multiple HTTP responses.
do {
$parts = preg_split('|(?:\r?\n){2}|m', $this->response, 2);
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php
index 4fd163c5a73..38af3d68a0e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php
@@ -18,6 +18,9 @@ use Zend\Http\Header\Accept\FieldValuePart;
*/
class Accept extends AbstractAccept
{
+ /**
+ * @var string
+ */
protected $regexAddType = '#^([a-zA-Z+-]+|\*)/(\*|[a-zA-Z0-9+-]+)$#';
/**
@@ -67,9 +70,9 @@ class Accept extends AbstractAccept
/**
* Parse the keys contained in the header line
*
- * @param string $fieldValuePart
- * @return \Zend\Http\Header\Accept\FieldValuePart\CharsetFieldValuePart
- * @see \Zend\Http\Header\AbstractAccept::parseFieldValuePart()
+ * @param string $fieldValuePart
+ * @return FieldValuePart\AcceptFieldValuePart
+ * @see \Zend\Http\Header\AbstractAccept::parseFieldValuePart()
*/
protected function parseFieldValuePart($fieldValuePart)
{
@@ -87,7 +90,7 @@ class Accept extends AbstractAccept
}
if ($pos = strpos($fieldValuePart, '/')) {
- $subtypeWhole = $format = $subtype = trim(substr($fieldValuePart, strpos($fieldValuePart, '/')+1));
+ $subtypeWhole = $format = $subtype = trim(substr($fieldValuePart, strpos($fieldValuePart, '/') + 1));
} else {
$subtypeWhole = '';
$format = '*';
@@ -96,19 +99,19 @@ class Accept extends AbstractAccept
$pos = strpos($subtype, '+');
if (false !== $pos) {
- $format = trim(substr($subtype, $pos+1));
+ $format = trim(substr($subtype, $pos + 1));
$subtype = trim(substr($subtype, 0, $pos));
}
$aggregated = array(
- 'typeString' => trim($fieldValuePart),
- 'type' => $type,
- 'subtype' => $subtype,
- 'subtypeRaw' => $subtypeWhole,
- 'format' => $format,
- 'priority' => isset($params['q']) ? $params['q'] : 1,
- 'params' => $params,
- 'raw' => trim($raw)
+ 'typeString' => trim($fieldValuePart),
+ 'type' => $type,
+ 'subtype' => $subtype,
+ 'subtypeRaw' => $subtypeWhole,
+ 'format' => $format,
+ 'priority' => isset($params['q']) ? $params['q'] : 1,
+ 'params' => $params,
+ 'raw' => trim($raw),
);
return new FieldValuePart\AcceptFieldValuePart((object) $aggregated);
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
index 093be4ed066..7a36cf3aed8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
@@ -23,56 +23,56 @@ class SetCookie implements MultipleHeaderInterface
/**
* Cookie name
*
- * @var string
+ * @var string|null
*/
protected $name = null;
/**
* Cookie value
*
- * @var string
+ * @var string|null
*/
protected $value = null;
/**
* Version
*
- * @var int
+ * @var int|null
*/
protected $version = null;
/**
* Max Age
*
- * @var int
+ * @var int|null
*/
protected $maxAge = null;
/**
* Cookie expiry date
*
- * @var int
+ * @var int|null
*/
protected $expires = null;
/**
* Cookie domain
*
- * @var string
+ * @var string|null
*/
protected $domain = null;
/**
* Cookie path
*
- * @var string
+ * @var string|null
*/
protected $path = null;
/**
* Whether the cookie is secure or not
*
- * @var bool
+ * @var bool|null
*/
protected $secure = null;
@@ -161,56 +161,30 @@ class SetCookie implements MultipleHeaderInterface
*
* @todo Add validation of each one of the parameters (legal domain, etc.)
*
- * @param string $name
- * @param string $value
- * @param int $expires
- * @param string $path
- * @param string $domain
- * @param bool $secure
- * @param bool $httponly
- * @param string $maxAge
- * @param int $version
- * @return SetCookie
+ * @param string $name
+ * @param string $value
+ * @param int|string $expires
+ * @param string $path
+ * @param string $domain
+ * @param bool $secure
+ * @param bool $httponly
+ * @param string $maxAge
+ * @param int $version
+ * @return SetCookie
*/
public function __construct($name = null, $value = null, $expires = null, $path = null, $domain = null, $secure = false, $httponly = false, $maxAge = null, $version = null)
{
$this->type = 'Cookie';
- if ($name) {
- $this->setName($name);
- }
-
- if ($value) {
- $this->setValue($value); // in parent
- }
-
- if ($version!==null) {
- $this->setVersion($version);
- }
-
- if ($maxAge!==null) {
- $this->setMaxAge($maxAge);
- }
-
- if ($domain) {
- $this->setDomain($domain);
- }
-
- if ($expires) {
- $this->setExpires($expires);
- }
-
- if ($path) {
- $this->setPath($path);
- }
-
- if ($secure) {
- $this->setSecure($secure);
- }
-
- if ($httponly) {
- $this->setHttpOnly($httponly);
- }
+ $this->setName($name)
+ ->setValue($value)
+ ->setVersion($version)
+ ->setMaxAge($maxAge)
+ ->setDomain($domain)
+ ->setExpires($expires)
+ ->setPath($path)
+ ->setSecure($secure)
+ ->setHttpOnly($httponly);
}
/**
@@ -282,7 +256,7 @@ class SetCookie implements MultipleHeaderInterface
*/
public function setName($name)
{
- if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {
+ if ($name !== null && preg_match("/[=,; \t\r\n\013\014]/", $name)) {
throw new Exception\InvalidArgumentException("Cookie name cannot contain these characters: =,; \\t\\r\\n\\013\\014 ({$name})");
}
@@ -300,10 +274,12 @@ class SetCookie implements MultipleHeaderInterface
/**
* @param string $value
+ * @return SetCookie
*/
public function setValue($value)
{
$this->value = $value;
+ return $this;
}
/**
@@ -319,13 +295,15 @@ class SetCookie implements MultipleHeaderInterface
*
* @param int $version
* @throws Exception\InvalidArgumentException
+ * @return SetCookie
*/
public function setVersion($version)
{
- if (!is_int($version)) {
+ if ($version !== null && !is_int($version)) {
throw new Exception\InvalidArgumentException('Invalid Version number specified');
}
$this->version = $version;
+ return $this;
}
/**
@@ -343,13 +321,15 @@ class SetCookie implements MultipleHeaderInterface
*
* @param int $maxAge
* @throws Exception\InvalidArgumentException
+ * @return SetCookie
*/
public function setMaxAge($maxAge)
{
- if (!is_int($maxAge) || ($maxAge<0)) {
+ if ($maxAge !== null && (!is_int($maxAge) || ($maxAge < 0))) {
throw new Exception\InvalidArgumentException('Invalid Max-Age number specified');
}
$this->maxAge = $maxAge;
+ return $this;
}
/**
@@ -363,30 +343,36 @@ class SetCookie implements MultipleHeaderInterface
}
/**
- * @param int $expires
+ * @param int|string $expires
* @throws Exception\InvalidArgumentException
* @return SetCookie
*/
public function setExpires($expires)
{
- if (!empty($expires)) {
- if (is_string($expires)) {
- $expires = strtotime($expires);
- } elseif (!is_int($expires)) {
- throw new Exception\InvalidArgumentException('Invalid expires time specified');
- }
- $this->expires = (int) $expires;
+ if ($expires === null) {
+ $this->expires = null;
+ return $this;
+ }
+
+ if (is_string($expires)) {
+ $expires = strtotime($expires);
}
+
+ if (!is_int($expires) || $expires < 0) {
+ throw new Exception\InvalidArgumentException('Invalid expires time specified');
+ }
+
+ $this->expires = $expires;
return $this;
}
/**
* @param bool $inSeconds
- * @return int
+ * @return int|string
*/
public function getExpires($inSeconds = false)
{
- if ($this->expires == null) {
+ if ($this->expires === null) {
return;
}
if ($inSeconds) {
@@ -397,10 +383,12 @@ class SetCookie implements MultipleHeaderInterface
/**
* @param string $domain
+ * @return SetCookie
*/
public function setDomain($domain)
{
$this->domain = $domain;
+ return $this;
}
/**
@@ -413,10 +401,12 @@ class SetCookie implements MultipleHeaderInterface
/**
* @param string $path
+ * @return SetCookie
*/
public function setPath($path)
{
$this->path = $path;
+ return $this;
}
/**
@@ -429,10 +419,12 @@ class SetCookie implements MultipleHeaderInterface
/**
* @param bool $secure
+ * @return SetCookie
*/
public function setSecure($secure)
{
$this->secure = $secure;
+ return $this;
}
/**
@@ -445,10 +437,12 @@ class SetCookie implements MultipleHeaderInterface
/**
* @param bool $httponly
+ * @return SetCookie
*/
public function setHttponly($httponly)
{
$this->httponly = $httponly;
+ return $this;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
index e80e44271f5..e78004cab41 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
@@ -9,6 +9,8 @@
namespace Zend\I18n\Validator;
+use Traversable;
+use Zend\Stdlib\ArrayUtils;
use Zend\Validator\AbstractValidator;
class PhoneNumber extends AbstractValidator
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php
index b43f08e0600..ee7347db9f5 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php
@@ -90,13 +90,33 @@ class CurrencyFormat extends AbstractHelper
if (null === $currencyCode) {
$currencyCode = $this->getCurrencyCode();
}
- if (null !== $showDecimals) {
- $this->setShouldShowDecimals($showDecimals);
+ if (null === $showDecimals) {
+ $showDecimals = $this->shouldShowDecimals();
}
if (null === $pattern) {
$pattern = $this->getCurrencyPattern();
}
+ return $this->formatCurrency($number, $currencyCode, $showDecimals, $locale, $pattern);
+ }
+
+ /**
+ * Format a number
+ *
+ * @param float $number
+ * @param string $currencyCode
+ * @param bool $showDecimals
+ * @param string $locale
+ * @param string $pattern
+ * @return string
+ */
+ protected function formatCurrency(
+ $number,
+ $currencyCode,
+ $showDecimals,
+ $locale,
+ $pattern
+ ) {
$formatterId = md5($locale);
if (!isset($this->formatters[$formatterId])) {
@@ -110,7 +130,7 @@ class CurrencyFormat extends AbstractHelper
$this->formatters[$formatterId]->setPattern($pattern);
}
- if ($this->shouldShowDecimals()) {
+ if ($showDecimals) {
$this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
} else {
$this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 0);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/composer.json b/vendor/zendframework/zendframework/library/Zend/I18n/composer.json
index a2b1993c209..606194d6b0b 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/composer.json
@@ -21,7 +21,8 @@
"zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
"zendframework/zend-filter": "You should install this package to use the provided filters",
"zendframework/zend-validator": "You should install this package to use the provided validators",
- "zendframework/zend-view": "You should install this package to use the provided view helpers"
+ "zendframework/zend-view": "You should install this package to use the provided view helpers",
+ "zendframework/zend-resources": "Translation resources"
},
"extra": {
"branch-alias": {
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php
index 0348a9d6844..a6e5bb0a8be 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php
@@ -236,6 +236,7 @@ class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInter
&& '' === $this->data[$name]
&& $input instanceof InputInterface
&& !$input->isRequired()
+ && $input->allowEmpty()
) {
$this->validInputs[$name] = $input;
continue;
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
index d75e4c7deac..b1f74b0a7c2 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
@@ -197,8 +197,8 @@ class Factory
break;
case 'required':
$input->setRequired($value);
- if (!isset($inputSpecification['allow_empty'])) {
- $input->setAllowEmpty(!$value);
+ if (isset($inputSpecification['allow_empty'])) {
+ $input->setAllowEmpty($inputSpecification['allow_empty']);
}
break;
case 'allow_empty':
@@ -212,6 +212,7 @@ class Factory
break;
case 'error_message':
$input->setErrorMessage($value);
+ break;
case 'fallback_value':
$input->setFallbackValue($value);
break;
@@ -283,6 +284,7 @@ class Factory
$inputFilter = $this->getInputFilterManager()->get($type);
if ($inputFilter instanceof CollectionInputFilter) {
+ $inputFilter->setFactory($this);
if (isset($inputFilterSpecification['input_filter'])) {
$inputFilter->setInputFilter($inputFilterSpecification['input_filter']);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
index ca7688f5f68..da84df9e174 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
@@ -142,6 +142,7 @@ class Input implements InputInterface, EmptyContextInterface
public function setRequired($required)
{
$this->required = (bool) $required;
+ $this->setAllowEmpty(!$required);
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Error.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Error.php
index c2d6227c217..87104364e0b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Error.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Error.php
@@ -11,7 +11,7 @@ namespace Zend\Json\Server;
class Error
{
- const ERROR_PARSE = -32768;
+ const ERROR_PARSE = -32700;
const ERROR_INVALID_REQUEST = -32600;
const ERROR_INVALID_METHOD = -32601;
const ERROR_INVALID_PARAMS = -32602;
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Request.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Request.php
index 29682862f2b..21b455f1b6f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Request.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Request.php
@@ -28,6 +28,12 @@ class Request
*/
protected $isMethodError = false;
+ /**
+ * Flag
+ * @var bool
+ */
+ protected $isParseError = false;
+
/**
* Requested method
* @var string
@@ -178,6 +184,16 @@ class Request
return $this->isMethodError;
}
+ /**
+ * Was a malformed JSON provided?
+ *
+ * @return bool
+ */
+ public function isParseError()
+ {
+ return $this->isParseError;
+ }
+
/**
* Set request identifier
*
@@ -234,8 +250,12 @@ class Request
*/
public function loadJson($json)
{
- $options = Json\Json::decode($json, Json\Json::TYPE_ARRAY);
- $this->setOptions($options);
+ try {
+ $options = Json\Json::decode($json, Json\Json::TYPE_ARRAY);
+ $this->setOptions($options);
+ } catch(\Exception $e) {
+ $this->isParseError = true;
+ }
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php
index 6597dcc6914..200c6acd584 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php
@@ -483,6 +483,10 @@ class Server extends AbstractServer
{
$request = $this->getRequest();
+ if($request->isParseError()){
+ return $this->fault('Parse error', Error::ERROR_PARSE);
+ }
+
if (!$request->isMethodError() && (null === $request->getMethod())) {
return $this->fault('Invalid Request', Error::ERROR_INVALID_REQUEST);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php
index 1dd517e0930..9f7bef654ec 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php
@@ -9,10 +9,13 @@
namespace Zend\Ldap;
+use Countable;
+use Iterator;
+
/**
* Zend\Ldap\Collection wraps a list of LDAP entries.
*/
-class Collection implements \Iterator, \Countable
+class Collection implements Iterator, Countable
{
/**
* Iterator
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php
index 1e83855b5d2..82b0ca7c37b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php
@@ -9,6 +9,8 @@
namespace Zend\Ldap\Collection;
+use Countable;
+use Iterator;
use Zend\Ldap;
use Zend\Ldap\Exception;
use Zend\Stdlib\ErrorHandler;
@@ -17,7 +19,7 @@ use Zend\Stdlib\ErrorHandler;
* Zend\Ldap\Collection\DefaultIterator is the default collection iterator implementation
* using ext/ldap
*/
-class DefaultIterator implements \Iterator, \Countable
+class DefaultIterator implements Iterator, Countable
{
const ATTRIBUTE_TO_LOWER = 1;
const ATTRIBUTE_TO_UPPER = 2;
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php
index cb872f8f1b5..988e9ee8758 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php
@@ -9,10 +9,12 @@
namespace Zend\Ldap;
+use ArrayAccess;
+
/**
* Zend\Ldap\Dn provides an API for DN manipulation
*/
-class Dn implements \ArrayAccess
+class Dn implements ArrayAccess
{
const ATTR_CASEFOLD_NONE = 'none';
const ATTR_CASEFOLD_UPPER = 'upper';
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php
index fd433e00be8..dea86f187ee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php
@@ -9,12 +9,14 @@
namespace Zend\Ldap;
+use Iterator;
+use RecursiveIterator;
use Zend\EventManager\EventManager;
/**
* Zend\Ldap\Node provides an object oriented view into a LDAP node.
*/
-class Node extends Node\AbstractNode implements \Iterator, \RecursiveIterator
+class Node extends Node\AbstractNode implements Iterator, RecursiveIterator
{
/**
* Holds the node's new Dn if node is renamed.
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php
index f92042c6fdd..a5162bc9c7e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php
@@ -9,13 +9,15 @@
namespace Zend\Ldap\Node;
+use ArrayAccess;
+use Countable;
use Zend\Ldap;
use Zend\Ldap\Exception;
/**
* This class provides a base implementation for LDAP nodes
*/
-abstract class AbstractNode implements \ArrayAccess, \Countable
+abstract class AbstractNode implements ArrayAccess, Countable
{
protected static $systemAttributes = array('createtimestamp', 'creatorsname',
'entrycsn', 'entrydn', 'entryuuid', 'hassubordinates', 'modifiersname',
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/ChildrenIterator.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/ChildrenIterator.php
index 2674d9d1a46..da67dbccb39 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/ChildrenIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/ChildrenIterator.php
@@ -9,12 +9,16 @@
namespace Zend\Ldap\Node;
+use ArrayAccess;
+use Countable;
+use Iterator;
+use RecursiveIterator;
use Zend\Ldap;
/**
* Zend\Ldap\Node\ChildrenIterator provides an iterator to a collection of children nodes.
*/
-class ChildrenIterator implements \Iterator, \Countable, \RecursiveIterator, \ArrayAccess
+class ChildrenIterator implements Iterator, Countable, RecursiveIterator, ArrayAccess
{
/**
* An array of Zend\Ldap\Node objects
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AbstractItem.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AbstractItem.php
index e1946e4fd54..384c4d614ed 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AbstractItem.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AbstractItem.php
@@ -9,13 +9,15 @@
namespace Zend\Ldap\Node\Schema;
+use ArrayAccess;
+use Countable;
use Zend\Ldap\Exception;
/**
* This class provides a base implementation for managing schema
* items like objectClass and attributeType.
*/
-abstract class AbstractItem implements \ArrayAccess, \Countable
+abstract class AbstractItem implements ArrayAccess, Countable
{
/**
* The underlying data
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLocator.php b/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLocator.php
index ef9556eade7..0c79601077b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLocator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLocator.php
@@ -9,12 +9,13 @@
namespace Zend\Loader;
+use IteratorAggregate;
use Traversable;
/**
* Plugin class locator interface
*/
-interface PluginClassLocator extends ShortNameLocator, \IteratorAggregate
+interface PluginClassLocator extends ShortNameLocator, IteratorAggregate
{
/**
* Register a class to a given short name
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
index 941ead5969f..6e31b3767de 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
@@ -348,6 +348,7 @@ class Smtp extends AbstractProtocol
public function quit()
{
if ($this->sess) {
+ $this->auth = false;
$this->_send('QUIT');
$this->_expect(221, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
$this->_stopSession();
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
index dbcaa07ccd4..5b5ca611c7e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
@@ -9,6 +9,7 @@
namespace Zend\Mail\Protocol\Smtp\Auth;
+use Zend\Crypt\Hmac;
use Zend\Mail\Protocol\Smtp;
/**
@@ -66,8 +67,7 @@ class Crammd5 extends Smtp
/**
- * @todo Perform CRAM-MD5 authentication with supplied credentials
- *
+ * Performs CRAM-MD5 authentication with supplied credentials
*/
public function auth()
{
@@ -132,23 +132,11 @@ class Crammd5 extends Smtp
*
* @param string $key Challenge key (usually password)
* @param string $data Challenge data
- * @param int $block Length of blocks
+ * @param int $block Length of blocks (deprecated; unused)
* @return string
*/
protected function _hmacMd5($key, $data, $block = 64)
{
- if (strlen($key) > 64) {
- $key = pack('H32', md5($key));
- } elseif (strlen($key) < 64) {
- $key = str_pad($key, $block, "\0");
- }
-
- $kIpad = substr($key, 0, 64) ^ str_repeat(chr(0x36), 64);
- $kOpad = substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64);
-
- $inner = pack('H32', md5($kIpad . $data));
- $digest = md5($kOpad . $inner);
-
- return $digest;
+ return Hmac::compute($key, 'md5', $data);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/Maildir.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/Maildir.php
index 90a571e3078..46d8630ec6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/Maildir.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/Maildir.php
@@ -9,6 +9,7 @@
namespace Zend\Mail\Storage\Writable;
+use RecursiveIteratorIterator;
use Zend\Mail\Exception as MailException;
use Zend\Mail\Storage;
use Zend\Mail\Storage\Exception as StorageException;
@@ -754,7 +755,7 @@ class Maildir extends Folder\Maildir implements WritableInterface
}
}
- $folders = new \RecursiveIteratorIterator($this->getFolders(), \RecursiveIteratorIterator::SELF_FIRST);
+ $folders = new RecursiveIteratorIterator($this->getFolders(), RecursiveIteratorIterator::SELF_FIRST);
foreach ($folders as $folder) {
$subdir = $folder->getGlobalName();
if ($subdir == 'INBOX') {
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/composer.json b/vendor/zendframework/zendframework/library/Zend/Mail/composer.json
index ec390bae252..bdb440ce230 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/composer.json
@@ -14,6 +14,7 @@
"target-dir": "Zend/Mail",
"require": {
"php": ">=5.3.3",
+ "zendframework/zend-crypt": "self.version",
"zendframework/zend-loader": "self.version",
"zendframework/zend-mime": "self.version",
"zendframework/zend-stdlib": "self.version"
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php b/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php
index 37a90cea3df..f20d30031f3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php
@@ -115,7 +115,7 @@ class Decode
// see @ZF2-372, pops the first line off a message if it doesn't contain a header
if (!$strict) {
- $parts = explode(': ', $firstline, 2);
+ $parts = explode(':', $firstline, 2);
if (count($parts) != 2) {
$message = substr($message, strpos($message, $EOL)+1);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
index 3ae583acddf..60a9e6a5e4a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
@@ -85,7 +85,14 @@ abstract class AbstractRestfulController extends AbstractController
* @param mixed $data
* @return mixed
*/
- abstract public function create($data);
+ public function create($data)
+ {
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
+ }
/**
* Delete an existing resource
@@ -93,7 +100,14 @@ abstract class AbstractRestfulController extends AbstractController
* @param mixed $id
* @return mixed
*/
- abstract public function delete($id);
+ public function delete($id)
+ {
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
+ }
/**
* Delete the entire resource collection
@@ -102,13 +116,14 @@ abstract class AbstractRestfulController extends AbstractController
* (introduced in 2.1.0); instead, raises an exception if not implemented.
*
* @return mixed
- * @throws Exception\RuntimeException
*/
public function deleteList()
{
- throw new Exception\RuntimeException(sprintf(
- '%s is unimplemented', __METHOD__
- ));
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
}
/**
@@ -117,14 +132,28 @@ abstract class AbstractRestfulController extends AbstractController
* @param mixed $id
* @return mixed
*/
- abstract public function get($id);
+ public function get($id)
+ {
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
+ }
/**
* Return list of resources
*
* @return mixed
*/
- abstract public function getList();
+ public function getList()
+ {
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
+ }
/**
* Retrieve HEAD metadata for the resource
@@ -134,13 +163,14 @@ abstract class AbstractRestfulController extends AbstractController
*
* @param null|mixed $id
* @return mixed
- * @throws Exception\RuntimeException
*/
public function head($id = null)
{
- throw new Exception\RuntimeException(sprintf(
- '%s is unimplemented', __METHOD__
- ));
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
}
/**
@@ -153,13 +183,14 @@ abstract class AbstractRestfulController extends AbstractController
* (introduced in 2.1.0); instead, raises an exception if not implemented.
*
* @return mixed
- * @throws Exception\RuntimeException
*/
public function options()
{
- throw new Exception\RuntimeException(sprintf(
- '%s is unimplemented', __METHOD__
- ));
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
}
/**
@@ -170,13 +201,14 @@ abstract class AbstractRestfulController extends AbstractController
*
* @param $id
* @param $data
- * @throws Exception\RuntimeException
*/
public function patch($id, $data)
{
- throw new Exception\RuntimeException(sprintf(
- '%s is unimplemented', __METHOD__
- ));
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
}
/**
@@ -187,13 +219,14 @@ abstract class AbstractRestfulController extends AbstractController
*
* @param mixed $data
* @return mixed
- * @throws Exception\RuntimeException
*/
public function replaceList($data)
{
- throw new Exception\RuntimeException(sprintf(
- '%s is unimplemented', __METHOD__
- ));
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
}
/**
@@ -204,13 +237,14 @@ abstract class AbstractRestfulController extends AbstractController
*
* @param mixed $data
* @return mixed
- * @throws Exception\RuntimeException
*/
public function patchList($data)
{
- throw new Exception\RuntimeException(sprintf(
- '%s is unimplemented', __METHOD__
- ));
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
}
/**
@@ -220,7 +254,14 @@ abstract class AbstractRestfulController extends AbstractController
* @param mixed $data
* @return mixed
*/
- abstract public function update($id, $data);
+ public function update($id, $data)
+ {
+ $this->response->setStatusCode(405);
+
+ return array(
+ 'content' => 'Method Not Allowed'
+ );
+ }
/**
* Basic functionality for when a page is not available
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
index d23955ae25b..ccf2f15ba28 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
@@ -295,14 +295,17 @@ class FilePostRedirectGet 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')) {
@@ -321,7 +324,7 @@ class FilePostRedirectGet 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/Controller/PluginManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php
index 98896fae666..3ef6a56691b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php
@@ -11,7 +11,6 @@ namespace Zend\Mvc\Controller;
use Zend\Mvc\Exception;
use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\ConfigInterface;
use Zend\Stdlib\DispatchableInterface;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
index 5fb85f4298d..f3a5652014d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * Zend Framework (http://framework.zend.com/)
*
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteInterface.php
index 86f55889063..167de70d2ae 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteInterface.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php
index 4d5619b4414..6a7fb6bd32a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
index 7d043480a24..14e2c91fe11 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * Zend Framework (http://framework.zend.com/)
*
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
index 248776bb029..76bea595339 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
@@ -41,12 +41,9 @@ class RouterFactory implements FactoryInterface
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'];
- }
-
+ // We are in a console, use console router defaults.
$routerClass = 'Zend\Mvc\Router\Console\SimpleRouteStack';
+ $routerConfig = isset($config['console']['router']) ? $config['console']['router'] : array();
}
// Obtain the configured router class, if any
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php
index 0adbd7bf2a0..4e9d67e6aa1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
index 3642bf68761..4059bebf959 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
@@ -111,7 +111,7 @@ abstract class AbstractPage extends AbstractContainer
/**
* Permission associated with this page
*
- * @var string|null
+ * @var mixed|null
*/
protected $permission;
@@ -710,7 +710,7 @@ abstract class AbstractPage extends AbstractContainer
/**
* Sets permission associated with this page
*
- * @param string|null $permission [optional] permission to associate
+ * @param mixed|null $permission [optional] permission to associate
* with this page. Default is null, which
* sets no permission.
*
@@ -718,14 +718,14 @@ abstract class AbstractPage extends AbstractContainer
*/
public function setPermission($permission = null)
{
- $this->permission = is_string($permission) ? $permission : null;
+ $this->permission = $permission;
return $this;
}
/**
* Returns permission associated with this page
*
- * @return string|null permission or null
+ * @return mixed|null permission or null
*/
public function getPermission()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/SerializableLimitIterator.php b/vendor/zendframework/zendframework/library/Zend/Paginator/SerializableLimitIterator.php
index 529e7073d98..f9b1570e52f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/SerializableLimitIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/SerializableLimitIterator.php
@@ -9,9 +9,12 @@
namespace Zend\Paginator;
+use ArrayAccess;
use Iterator;
+use LimitIterator;
+use Serializable;
-class SerializableLimitIterator extends \LimitIterator implements \Serializable, \ArrayAccess
+class SerializableLimitIterator extends LimitIterator implements Serializable, ArrayAccess
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php
index df75d79a958..c0d0787d3d3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php
@@ -9,7 +9,9 @@
namespace Zend\Permissions\Rbac;
-interface RoleInterface extends \RecursiveIterator
+use RecursiveIterator;
+
+interface RoleInterface extends RecursiveIterator
{
/**
* Get the name of the role.
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json b/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json
index 42f61b62d9f..4fbe59c0f61 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json
@@ -16,6 +16,9 @@
"php": ">=5.3.3",
"zendframework/zend-stdlib": "self.version"
},
+ "suggest": {
+ "zendframework/zend-json": "Zend\\Json component"
+ },
"extra": {
"branch-alias": {
"dev-master": "2.2-dev",
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Definition.php b/vendor/zendframework/zendframework/library/Zend/Server/Definition.php
index d32f1bfa1d2..f969ce8dda9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Definition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Definition.php
@@ -9,10 +9,13 @@
namespace Zend\Server;
+use Countable;
+use Iterator;
+
/**
* Server methods metadata
*/
-class Definition implements \Countable, \Iterator
+class Definition implements Countable, Iterator
{
/**
* @var array Array of \Zend\Server\Method\Definition objects
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
index 8a1cf09bab8..984bd49f960 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
@@ -19,7 +19,10 @@ use Zend\Session\Exception;
* Replaces the $_SESSION superglobal with an ArrayObject that allows for
* property access, metadata storage, locking, and immutability.
*/
-abstract class AbstractSessionArrayStorage implements IteratorAggregate, StorageInterface, StorageInitializationInterface
+abstract class AbstractSessionArrayStorage implements
+ IteratorAggregate,
+ StorageInterface,
+ StorageInitializationInterface
{
/**
* Constructor
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 87dbbf8f18c..84a5fc60510 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -53,7 +53,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Reset the application for isolation
*/
- public function setUp()
+ protected function setUp()
{
$this->usedConsoleBackup = Console::isConsole();
$this->reset();
@@ -62,7 +62,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Restore params
*/
- public function tearDown()
+ protected function tearDown()
{
Console::overrideIsConsole($this->usedConsoleBackup);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/zend-framework.flf b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/zend-framework.flf
index b44705424f2..81727b80699 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/zend-framework.flf
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/zend-framework.flf
@@ -17,7 +17,7 @@ Version: 1.0
obtain it through the world-wide-web, please send an email
to license@zend.com so we can send you a copy immediately.
- Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
-------------------------------------------------------------------------------
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php b/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php
index e362fbdfe0a..40255e9bb73 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php
@@ -337,15 +337,12 @@ class EmailAddress extends AbstractValidator
if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->localPart)) {
$result = true;
} else {
- // Try quoted string format
-
- // Quoted-string characters are: DQUOTE *([FWS] qtext/quoted-pair) [FWS] DQUOTE
- // qtext: Non white space controls, and the rest of the US-ASCII characters not
- // including "\" or the quote character
- $noWsCtl = '\x01-\x08\x0b\x0c\x0e-\x1f\x7f';
- $qtext = $noWsCtl . '\x21\x23-\x5b\x5d-\x7e';
- $ws = '\x20\x09';
- if (preg_match('/^\x22([' . $ws . $qtext . '])*[$ws]?\x22$/', $this->localPart)) {
+ // Try quoted string format (RFC 5321 Chapter 4.1.2)
+
+ // Quoted-string characters are: DQUOTE *(qtext/quoted-pair) DQUOTE
+ $qtext = '\x20-\x21\x23-\x5b\x5d-\x7e'; // %d32-33 / %d35-91 / %d93-126
+ $quotedPair = '\x20-\x7e'; // %d92 %d32-126
+ if (preg_match('/^"(['. $qtext .']|\x5c[' . $quotedPair . '])*"$/', $this->localPart)) {
$result = true;
} else {
$this->error(self::DOT_ATOM);
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php
index 240d426d5bd..28a5a3471ee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php
@@ -101,31 +101,31 @@ class MimeType extends AbstractValidator
} elseif (is_string($options)) {
$this->setMimeType($options);
$options = array();
- }
-
- if (isset($options['magicFile'])) {
- $this->setMagicFile($options['magicFile']);
- unset($options['magicFile']);
- }
+ } elseif (is_array($options)) {
+ if (isset($options['magicFile'])) {
+ $this->setMagicFile($options['magicFile']);
+ unset($options['magicFile']);
+ }
- if (isset($options['enableHeaderCheck'])) {
- $this->enableHeaderCheck($options['enableHeaderCheck']);
- unset($options['enableHeaderCheck']);
- }
+ if (isset($options['enableHeaderCheck'])) {
+ $this->enableHeaderCheck($options['enableHeaderCheck']);
+ unset($options['enableHeaderCheck']);
+ }
- if (array_key_exists('mimeType', $options)) {
- $this->setMimeType($options['mimeType']);
- unset($options['mimeType']);
- }
+ if (array_key_exists('mimeType', $options)) {
+ $this->setMimeType($options['mimeType']);
+ unset($options['mimeType']);
+ }
- // Handle cases where mimetypes are interspersed with options, or
- // options are simply an array of mime types
- foreach (array_keys($options) as $key) {
- if (!is_int($key)) {
- continue;
+ // Handle cases where mimetypes are interspersed with options, or
+ // options are simply an array of mime types
+ foreach (array_keys($options) as $key) {
+ if (!is_int($key)) {
+ continue;
+ }
+ $this->addMimeType($options[$key]);
+ unset($options[$key]);
}
- $this->addMimeType($options[$key]);
- unset($options[$key]);
}
parent::__construct($options);
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php
index adc6f133766..8e4aee85884 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php
@@ -56,6 +56,7 @@ class ValidatorPluginManager extends AbstractPluginManager
'csrf' => 'Zend\Validator\Csrf',
'date' => 'Zend\Validator\Date',
'datestep' => 'Zend\Validator\DateStep',
+ 'datetime' => 'Zend\I18n\Validator\DateTime',
'dbnorecordexists' => 'Zend\Validator\Db\NoRecordExists',
'dbrecordexists' => 'Zend\Validator\Db\RecordExists',
'digits' => 'Zend\Validator\Digits',
@@ -93,6 +94,7 @@ class ValidatorPluginManager extends AbstractPluginManager
'isinstanceof' => 'Zend\Validator\IsInstanceOf',
'lessthan' => 'Zend\Validator\LessThan',
'notempty' => 'Zend\Validator\NotEmpty',
+ 'phonenumber' => 'Zend\I18n\Validator\PhoneNumber',
'postcode' => 'Zend\I18n\Validator\PostCode',
'regex' => 'Zend\Validator\Regex',
'sitemapchangefreq' => 'Zend\Validator\Sitemap\Changefreq',
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/composer.json b/vendor/zendframework/zendframework/library/Zend/Validator/composer.json
index 3cc7b1853e9..165564d8d28 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/composer.json
@@ -17,14 +17,17 @@
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
+ "zendframework/zend-filter": "self.version",
"zendframework/zend-i18n": "self.version",
"zendframework/zend-math": "self.version",
"zendframework/zend-servicemanager": "self.version"
},
"suggest": {
"zendframework/zend-db": "Zend\\Db component",
+ "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
"zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators",
"zendframework/zend-math": "Zend\\Math component",
+ "zendframework/zend-resources": "Translations of validator messages",
"zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains"
},
"extra": {
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/Version.php b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
index 8de7371b0a1..b35ccf62545 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.1';
+ const VERSION = '2.2.2';
/**
* Github Service Identifier for version information is retreived from
@@ -58,14 +58,14 @@ final class Version
/**
* Fetches the version of the latest stable release.
*
- * By Default, this uses the GitHub API (v3) and only returns refs that begin with
- * 'tags/release-'. Because GitHub returns the refs in alphabetical order,
- * we need to reduce the array to a single value, comparing the version
- * numbers with version_compare().
- *
- * If $service is set to VERSION_SERVICE_ZEND this will fall back to calling the
- * classic style of version retreival.
+ * By default, this uses the API provided by framework.zend.com for version
+ * retrieval.
*
+ * If $service is set to VERSION_SERVICE_GITHUB, this will use the GitHub
+ * API (v3) and only returns refs that begin with * 'tags/release-'.
+ * Because GitHub returns the refs in alphabetical order, we need to reduce
+ * the array to a single value, comparing the version numbers with
+ * version_compare().
*
* @see http://developer.github.com/v3/git/refs/#get-all-references
* @link https://api.github.com/repos/zendframework/zf2/git/refs/tags/release-
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php
index 4932fd8aaf0..1df5a60113a 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php
@@ -13,6 +13,8 @@ abstract class AbstractHtmlElement extends AbstractHelper
{
/**
* EOL character
+ *
+ * @deprecated just use PHP_EOL
*/
const EOL = PHP_EOL;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php
index c116b0a8ef1..c3b750ebccc 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php
@@ -9,13 +9,16 @@
namespace Zend\View\Helper;
+use Iterator;
+
/**
* Helper for alternating between set of values
*/
-class Cycle extends AbstractHelper implements \Iterator
+class Cycle extends AbstractHelper implements Iterator
{
/**
* Default name
+ *
* @var string
*/
const DEFAULT_NAME = 'default';
@@ -180,9 +183,9 @@ class Cycle extends AbstractHelper implements \Iterator
{
if ($this->pointers[$this->name] < 0) {
return 0;
- } else {
- return $this->pointers[$this->name];
}
+
+ return $this->pointers[$this->name];
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php
index f1079f99d2c..872cc669e5e 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php
@@ -17,6 +17,16 @@ use Zend\View\Exception;
* Zend_Layout_View_Helper_HeadLink
*
* @see http://www.w3.org/TR/xhtml1/dtds.html
+ *
+ * Creates the following virtual methods:
+ * @method HeadLink appendStylesheet($href, $media, $conditionalStylesheet, $extras)
+ * @method HeadLink offsetSetStylesheet($index, $href, $media, $conditionalStylesheet, $extras)
+ * @method HeadLink prependStylesheet($href, $media, $conditionalStylesheet, $extras)
+ * @method HeadLink setStylesheet($href, $media, $conditionalStylesheet, $extras)
+ * @method HeadLink appendAlternate($href, $type, $title, $extras)
+ * @method HeadLink offsetSetAlternate($index, $href, $type, $title, $extras)
+ * @method HeadLink prependAlternate($href, $type, $title, $extras)
+ * @method HeadLink setAlternate($href, $type, $title, $extras)
*/
class HeadLink extends Placeholder\Container\AbstractStandalone
{
@@ -46,6 +56,21 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
$this->setSeparator(PHP_EOL);
}
+ /**
+ * Proxy to __invoke()
+ *
+ * Allows calling $helper->headLink(), but, more importantly, chaining calls
+ * like ->appendStylesheet()->headLink().
+ *
+ * @param array $attributes
+ * @param string $placement
+ * @return HeadLink
+ */
+ public function headLink(array $attributes = null, $placement = Placeholder\Container\AbstractContainer::APPEND)
+ {
+ return call_user_func_array(array($this, '__invoke'), func_get_args());
+ }
+
/**
* headLink() - View Helper Method
*
@@ -80,16 +105,6 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
/**
* Overload method access
*
- * Creates the following virtual methods:
- * - appendStylesheet($href, $media, $conditionalStylesheet, $extras)
- * - offsetSetStylesheet($index, $href, $media, $conditionalStylesheet, $extras)
- * - prependStylesheet($href, $media, $conditionalStylesheet, $extras)
- * - setStylesheet($href, $media, $conditionalStylesheet, $extras)
- * - appendAlternate($href, $type, $title, $extras)
- * - offsetSetAlternate($index, $href, $type, $title, $extras)
- * - prependAlternate($href, $type, $title, $extras)
- * - setAlternate($href, $type, $title, $extras)
- *
* Items that may be added in the future:
* - Navigation? need to find docs on this
* - public function appendStart()
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
index 9927d46bc15..4feecd79495 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
@@ -17,6 +17,20 @@ use Zend\View\Exception;
* Zend\View\Helper\HeadMeta
*
* @see http://www.w3.org/TR/xhtml1/dtds.html
+ *
+ * Allows the following 'virtual' methods:
+ * @method HeadMeta appendName($keyValue, $content, $modifiers = array())
+ * @method HeadMeta offsetGetName($index, $keyValue, $content, $modifiers = array())
+ * @method HeadMeta prependName($keyValue, $content, $modifiers = array())
+ * @method HeadMeta setName($keyValue, $content, $modifiers = array())
+ * @method HeadMeta appendHttpEquiv($keyValue, $content, $modifiers = array())
+ * @method HeadMeta offsetGetHttpEquiv($index, $keyValue, $content, $modifiers = array())
+ * @method HeadMeta prependHttpEquiv($keyValue, $content, $modifiers = array())
+ * @method HeadMeta setHttpEquiv($keyValue, $content, $modifiers = array())
+ * @method HeadMeta appendProperty($keyValue, $content, $modifiers = array())
+ * @method HeadMeta offsetGetProperty($index, $keyValue, $content, $modifiers = array())
+ * @method HeadMeta prependProperty($keyValue, $content, $modifiers = array())
+ * @method HeadMeta setProperty($keyValue, $content, $modifiers = array())
*/
class HeadMeta extends Placeholder\Container\AbstractStandalone
{
@@ -94,20 +108,6 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
/**
* Overload method access
*
- * Allows the following 'virtual' methods:
- * - appendName($keyValue, $content, $modifiers = array())
- * - offsetGetName($index, $keyValue, $content, $modifiers = array())
- * - prependName($keyValue, $content, $modifiers = array())
- * - setName($keyValue, $content, $modifiers = array())
- * - appendHttpEquiv($keyValue, $content, $modifiers = array())
- * - offsetGetHttpEquiv($index, $keyValue, $content, $modifiers = array())
- * - prependHttpEquiv($keyValue, $content, $modifiers = array())
- * - setHttpEquiv($keyValue, $content, $modifiers = array())
- * - appendProperty($keyValue, $content, $modifiers = array())
- * - offsetGetProperty($index, $keyValue, $content, $modifiers = array())
- * - prependProperty($keyValue, $content, $modifiers = array())
- * - setProperty($keyValue, $content, $modifiers = array())
- *
* @param string $method
* @param array $args
* @throws Exception\BadMethodCallException
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php
index 30609be1d36..f2bea24a3f3 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php
@@ -15,6 +15,16 @@ use Zend\View\Exception;
/**
* Helper for setting and retrieving script elements for HTML head section
+ *
+ * Allows the following method calls:
+ * @method HeadScript appendFile($src, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript offsetSetFile($index, $src, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript prependFile($src, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript setFile($src, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript appendScript($script, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript offsetSetScript($index, $src, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript prependScript($script, $type = 'text/javascript', $attrs = array())
+ * @method HeadScript setScript($script, $type = 'text/javascript', $attrs = array())
*/
class HeadScript extends Placeholder\Container\AbstractStandalone
{
@@ -115,7 +125,7 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
* @param string $type Script type and/or array of script attributes
* @return HeadScript
*/
- public function __invoke($mode = HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
+ public function __invoke($mode = self::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
{
if ((null !== $spec) && is_string($spec)) {
$action = ucfirst(strtolower($mode));
@@ -139,16 +149,6 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
/**
* Overload method access
*
- * Allows the following method calls:
- * - appendFile($src, $type = 'text/javascript', $attrs = array())
- * - offsetSetFile($index, $src, $type = 'text/javascript', $attrs = array())
- * - prependFile($src, $type = 'text/javascript', $attrs = array())
- * - setFile($src, $type = 'text/javascript', $attrs = array())
- * - appendScript($script, $type = 'text/javascript', $attrs = array())
- * - offsetSetScript($index, $src, $type = 'text/javascript', $attrs = array())
- * - prependScript($script, $type = 'text/javascript', $attrs = array())
- * - setScript($script, $type = 'text/javascript', $attrs = array())
- *
* @param string $method Method to call
* @param array $args Arguments of method
* @throws Exception\BadMethodCallException if too few arguments or invalid method
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php
index 66e2103e259..fa81431e1d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php
@@ -15,6 +15,12 @@ use Zend\View\Exception;
/**
* Helper for setting and retrieving stylesheets
+ *
+ * Allows the following method calls:
+ * @method HeadStyle appendStyle($content, $attributes = array())
+ * @method HeadStyle offsetSetStyle($index, $content, $attributes = array())
+ * @method HeadStyle prependStyle($content, $attributes = array())
+ * @method HeadStyle setStyle($content, $attributes = array())
*/
class HeadStyle extends Placeholder\Container\AbstractStandalone
{
@@ -109,12 +115,6 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
/**
* Overload method calls
*
- * Allows the following method calls:
- * - appendStyle($content, $attributes = array())
- * - offsetSetStyle($index, $content, $attributes = array())
- * - prependStyle($content, $attributes = array())
- * - setStyle($content, $attributes = array())
- *
* @param string $method
* @param array $args
* @throws Exception\BadMethodCallException When no $content provided or invalid method
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php
index 6c17f2a9f51..3096870582a 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php
@@ -35,7 +35,7 @@ class InlineScript extends HeadScript
* @param string $type Script type and/or array of script attributes
* @return InlineScript
*/
- public function __invoke($mode = HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
+ public function __invoke($mode = self::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
{
return parent::__invoke($mode, $spec, $placement, $attrs, $type);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
index 6ff12bf3e65..fa81dfeacc0 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
@@ -9,12 +9,13 @@
namespace Zend\View\Helper\Placeholder\Container;
+use ArrayObject;
use Zend\View\Exception;
/**
* Abstract class representing container for placeholder values
*/
-abstract class AbstractContainer extends \ArrayObject
+abstract class AbstractContainer extends ArrayObject
{
/**
* Whether or not to override all contents of placeholder
diff --git a/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php b/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php
index 02d9ef85d1a..1938ecacaba 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php
@@ -145,7 +145,9 @@ class HelperPluginManager extends AbstractPluginManager
{
if ($helper instanceof TranslatorAwareInterface) {
$locator = $this->getServiceLocator();
- if ($locator && $locator->has('translator')) {
+ if ($locator && $locator->has('MvcTranslator')) {
+ $helper->setTranslator($locator->get('MvcTranslator'));
+ } elseif ($locator && $locator->has('translator')) {
$helper->setTranslator($locator->get('translator'));
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Model/ConsoleModel.php b/vendor/zendframework/zendframework/library/Zend/View/Model/ConsoleModel.php
index 77400f14d57..20b057588a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Model/ConsoleModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Model/ConsoleModel.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
@@ -19,10 +10,6 @@
namespace Zend\View\Model;
-/**
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
class ConsoleModel extends ViewModel
{
const RESULT = 'result';
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php
index 058204b7c44..6d3ce934dc9 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php
@@ -10,7 +10,7 @@
namespace Zend\XmlRpc\Request;
use Zend\XmlRpc\Request as XmlRpcRequest;
-use Zend\XmlRpc\Server\Exception as ServerException;
+use Zend\XmlRpc\Fault;
/**
* XmlRpc Request object -- Request via STDIN
@@ -39,7 +39,7 @@ class Stdin extends XmlRpcRequest
{
$fh = fopen('php://stdin', 'r');
if (!$fh) {
- $this->fault = new ServerException(630);
+ $this->fault = new Fault(630);
return;
}
diff --git a/vendor/zendframework/zendframework/resources/languages/ar/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/ar/Zend_Captcha.php
index 03bb216050a..89b8aae06dd 100644
--- a/vendor/zendframework/zendframework/resources/languages/ar/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/ar/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/ar/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/ar/Zend_Validate.php
index bcc80ba5976..f44ea49ca38 100644
--- a/vendor/zendframework/zendframework/resources/languages/ar/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/ar/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/bg/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/bg/Zend_Captcha.php
index 1395f691d62..6df39100ac5 100644
--- a/vendor/zendframework/zendframework/resources/languages/bg/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/bg/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/bg/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/bg/Zend_Validate.php
index 648d7e8b2ad..6e735146299 100644
--- a/vendor/zendframework/zendframework/resources/languages/bg/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/bg/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/ca/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/ca/Zend_Captcha.php
index a4393741dc7..eadea10b9c4 100644
--- a/vendor/zendframework/zendframework/resources/languages/ca/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/ca/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/ca/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/ca/Zend_Validate.php
index 12072384148..ee8ecf16979 100644
--- a/vendor/zendframework/zendframework/resources/languages/ca/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/ca/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php
index 0d96a831718..7dbed9b1e2e 100644
--- a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php
index 92dda8b2d1c..fedaa39f423 100644
--- a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/de/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/de/Zend_Captcha.php
index 7397cb1e823..f4669f67cef 100644
--- a/vendor/zendframework/zendframework/resources/languages/de/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/de/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/de/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/de/Zend_Validate.php
index e8133dd04e0..6d576e9b647 100644
--- a/vendor/zendframework/zendframework/resources/languages/de/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/de/Zend_Validate.php
@@ -116,7 +116,7 @@ return array(
"File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_Exists
- "File '%value%' does not exist" => "File '%value%' does not exist",
+ "File '%value%' does not exist" => "Die Datei '%value%' existiert nicht",
// Zend_Validator_File_Extension
"File '%value%' has a false extension" => "Die Datei '%value%' hat einen falschen Dateityp",
diff --git a/vendor/zendframework/zendframework/resources/languages/en/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/en/Zend_Captcha.php
index de731545e9a..74440ed09ec 100644
--- a/vendor/zendframework/zendframework/resources/languages/en/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/en/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/en/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/en/Zend_Validate.php
index 17623e8bd0d..df198cd8c72 100644
--- a/vendor/zendframework/zendframework/resources/languages/en/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/en/Zend_Validate.php
@@ -1,23 +1,14 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
/**
- * EN-Revision: 04.Apr.2013
+ * EN-Revision: 16.Jul.2013
*/
return array(
// Zend\I18n\Validator\Alnum
@@ -30,6 +21,10 @@ return array(
"The input contains non alphabetic characters" => "The input contains non alphabetic characters",
"The input is an empty string" => "The input is an empty string",
+ // Zend\I18n\Validator\DateTime
+ "Invalid type given. String expected" => "Invalid type given. String expected",
+ "The input does not appear to be a valid datetime" => "The input does not appear to be a valid datetime",
+
// Zend\I18n\Validator\Float
"Invalid type given. String, integer or float expected" => "Invalid type given. String, integer or float expected",
"The input does not appear to be a float" => "The input does not appear to be a float",
@@ -38,6 +33,11 @@ return array(
"Invalid type given. String or integer expected" => "Invalid type given. String or integer expected",
"The input does not appear to be an integer" => "The input does not appear to be an integer",
+ // Zend\I18n\Validator\PhoneNumber
+ "The input does not match a phone number format" => "The input does not match a phone number format",
+ "The country provided is currently unsupported" => "The country provided is currently unsupported",
+ "Invalid type given. String expected" => "Invalid type given. String expected",
+
// Zend\I18n\Validator\PostCode
"Invalid type given. String or integer expected" => "Invalid type given. String or integer expected",
"The input does not appear to be a postal code" => "The input does not appear to be a postal code",
diff --git a/vendor/zendframework/zendframework/resources/languages/es/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/es/Zend_Validate.php
index 5b33eaee9b7..63c8bd86ed6 100644
--- a/vendor/zendframework/zendframework/resources/languages/es/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/es/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/fi/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/fi/Zend_Validate.php
index b9cc21e619c..ae494f73af7 100644
--- a/vendor/zendframework/zendframework/resources/languages/fi/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/fi/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/fr/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/fr/Zend_Captcha.php
index 8e8ef73d7e9..704d65e6bed 100644
--- a/vendor/zendframework/zendframework/resources/languages/fr/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/fr/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php
index 0e686280227..e568e9aff35 100644
--- a/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/hr/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/hr/Zend_Validate.php
index d6c4ef9b190..4b8e5b2964d 100644
--- a/vendor/zendframework/zendframework/resources/languages/hr/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/hr/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/it/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/it/Zend_Captcha.php
index c9d94fd5868..d5403db464f 100644
--- a/vendor/zendframework/zendframework/resources/languages/it/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/it/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/it/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/it/Zend_Validate.php
index 445b98d5129..9e3113f52f0 100644
--- a/vendor/zendframework/zendframework/resources/languages/it/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/it/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php
index e8d86a89ebd..9f063d26375 100644
--- a/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/nl/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/nl/Zend_Validate.php
index 8b9fd1e058a..443ff4707d5 100644
--- a/vendor/zendframework/zendframework/resources/languages/nl/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/nl/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/no/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/no/Zend_Captcha.php
index 9bae46b1f8a..2c04e61df98 100644
--- a/vendor/zendframework/zendframework/resources/languages/no/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/no/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/no/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/no/Zend_Validate.php
index 729dcc2bcc1..2100db00cf3 100644
--- a/vendor/zendframework/zendframework/resources/languages/no/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/no/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/pl/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/pl/Zend_Validate.php
index 7834892c811..c332697c61e 100644
--- a/vendor/zendframework/zendframework/resources/languages/pl/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/pl/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Captcha.php
index 06ab6c1ab18..f4229d148f1 100644
--- a/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Validate.php
index d20e6c196a2..298560c0fb9 100644
--- a/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/ru/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/ru/Zend_Validate.php
index 083007fb05a..059818a398f 100644
--- a/vendor/zendframework/zendframework/resources/languages/ru/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/ru/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/se/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/se/Zend_Captcha.php
index ba51e141b14..f55a5a976fc 100644
--- a/vendor/zendframework/zendframework/resources/languages/se/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/se/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/se/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/se/Zend_Validate.php
index 092661faed8..1e7f30a6ccf 100644
--- a/vendor/zendframework/zendframework/resources/languages/se/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/se/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/sk/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/sk/Zend_Captcha.php
index 88add819645..dfbebd3c294 100644
--- a/vendor/zendframework/zendframework/resources/languages/sk/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/sk/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/sk/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/sk/Zend_Validate.php
index 0e346cf733f..20cb2ce4670 100644
--- a/vendor/zendframework/zendframework/resources/languages/sk/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/sk/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/sl/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/sl/Zend_Captcha.php
index f902185dafa..fc3aa5097a7 100644
--- a/vendor/zendframework/zendframework/resources/languages/sl/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/sl/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/sl/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/sl/Zend_Validate.php
index a0540460064..5d718338fa1 100644
--- a/vendor/zendframework/zendframework/resources/languages/sl/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/sl/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/sr/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/sr/Zend_Validate.php
index ea81070d3c4..d3149fe2c00 100644
--- a/vendor/zendframework/zendframework/resources/languages/sr/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/sr/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/tr/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/tr/Zend_Captcha.php
index 1243a2c29cc..7d8803dec1e 100644
--- a/vendor/zendframework/zendframework/resources/languages/tr/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/tr/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/tr/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/tr/Zend_Validate.php
index c8b9a8585b5..c202f6e9d6d 100644
--- a/vendor/zendframework/zendframework/resources/languages/tr/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/tr/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/uk/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/uk/Zend_Validate.php
index d99b4dea7be..2381a3ecb11 100644
--- a/vendor/zendframework/zendframework/resources/languages/uk/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/uk/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/zh/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/zh/Zend_Captcha.php
index e7c0c2560b0..e555499e652 100644
--- a/vendor/zendframework/zendframework/resources/languages/zh/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/zh/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/zh/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/zh/Zend_Validate.php
index 1261c1bfd77..32edca5c0b8 100644
--- a/vendor/zendframework/zendframework/resources/languages/zh/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/zh/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
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 3e130ee54e0..a722bbcac2d 100644
--- a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php
index 7e0da9faeef..a7c1851d2ef 100644
--- a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php
@@ -1,17 +1,8 @@
<?php
/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * 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
*/
--
GitLab